moved isFactorioCommand, more tests, researchSync stability

This commit is contained in:
Danielv123 committed 2018-04-13 12:32:09 +02:00
1 parent 181cb1179c
commit f131a83103
7 files changed
+76 -12

No files matched your search

@@ -2,7 +2,7 @@ const assert = require("assert");
const child_process = require("child_process");
const functions = require("./interfacingFunctions");
const luamin = require("luamin");
const isFactorioCommand = require("./isFactorioCommand");
const isFactorioCommand = require("_app/isFactorioCommand");
const nock = require("nock");
// sinon does weird prototype manipulation and so doen't need to be saved to anything.
@@ -1,23 +0,0 @@
const luamin = require("luamin");
function isFactorioCommand(command){
if(typeof command != "string"){
return false;
} else if(!command.includes("/silent-command ") && !command.includes("/c ")){
return false;
} else if(command[0] != "/"){
return false;
} else {
// check that what follows /c is valid LUA
let x = command.replace("/silent-command ", "").replace("/c ","");
let y
try{
y = luamin.minify(x);
} catch (e) {
return false;
}
// by this point it is surely a LUA command
return true;
}
}
module.exports = isFactorioCommand;
@@ -1,18 +0,0 @@
const isFactorioCommand = require("./isFactorioCommand");
const assert = require("assert");
describe("inventoryImports/isFactorioCommand.js()", function(){
it("Returns false if input is not a factorio command", function(){
assert(isFactorioCommand({}) == false, "This is not even a string so should return false");
assert(isFactorioCommand("Howdy boys!") == false, "This is not a command so should return false");
assert(isFactorioCommand("/c this ain't a command because its invalid LUA") == false, "This is not valid LUA so it should return false");
assert(isFactorioCommand("Trying to trick the system /c game.print('Hello world!')") == false, "this is still not a command");
});
it("Returns true if it is a valid command", function(){
assert(isFactorioCommand("/c game.print('hello world')"), "This is a valid command, should output true not false")
});
it("Fails to understand that leading spaces are valid", function(){
assert(isFactorioCommand(" /c game.print('Hello world!')") == false, "This should be true but often returns false unintentionally. If you see this you probably fixed the bug so change this test, OK?")
});
});
+12 -5
View File
@@ -3,18 +3,17 @@ const needle = require("needle");
class ResearchSync {
constructor(slaveConfig, messageInterface){
constructor(slaveConfig, messageInterface, extras = {}){
this.functions = this.loadFunctions();
this.config = slaveConfig;
this.messageInterface = messageInterface;
this.research = {};
messageInterface("ResearchSync enabled");
setInterval(() => {
this.doSync();
this.pollResearch();
}, 30000);
}, extras.researchSyncPollInterval || 30000);
}
pollResearch() {
@@ -29,7 +28,7 @@ class ResearchSync {
if (err) throw err;
if (resp.statusCode != 200){
console.log("got error when calling getSlaveMeta", resp.statusCode, resp.body);
this.messageInterface("got error when calling getSlaveMeta", resp.statusCode, resp.body);
return;
}
var allmeta = JSON.parse(resp.body);
@@ -92,7 +91,15 @@ class ResearchSync {
}
scriptOutput(data){
try {
let research = JSON.parse(data.replace("=",":").replace("[","").replace("]",""));
// remove Lua table junk
let currentResearch = data.replace("=",":").replace("[","").replace("]","").replace('"', "").replace('"', "");
// add first " before key
currentResearch = '{"' + currentResearch.slice(1);
// add second " after the key to make it a string
currentResearch = currentResearch.split(" ")[0] + '"' + currentResearch.slice(currentResearch.split(" ")[0].length);
// turn our constructed JSON string into an object
currentResearch = JSON.parse(currentResearch);
// console.log(currentResearch)
this.research = Object.assign(this.research, currentResearch);
} catch (e) {
}
+57 -1
View File
@@ -1,5 +1,7 @@
const assert = require("assert");
const isFactorioCommand = require("_app/isFactorioCommand");
const researchSync = require("./index.js");
describe("researchSync/index.js", ()=>{
@@ -8,7 +10,7 @@ describe("researchSync/index.js", ()=>{
});
describe("class researchSync()", ()=>{
it(".diff(object1, object2) returns key:value pairs that exist in object2 but not object1", ()=>{
let reSync = new researchSync();
let reSync = new researchSync({}, function(){});
let obj1 = {
a:"str",
@@ -30,5 +32,59 @@ describe("researchSync/index.js", ()=>{
assert(diffResult.d === undefined);
assert(diffResult.e === "truthy");
});
it(".pollResearch() dumps a long Lua command", ()=>{
let reSync = new researchSync({}, io);
let ioRecieved;
function io(str){
ioRecieved = true;
assert(isFactorioCommand(str), "pollResearch should run a command");
}
assert(!ioRecieved);
reSync.pollResearch();
assert(ioRecieved);
});
describe(".scriptOutput(data) handles file writes from factorio", ()=>{
it("wants a Lua table of a single research, parses and saves it", ()=>{
let reSync = new researchSync({hi:"hello"}, console.log);
let researches = [
'{automation = false}',
'{["automation-2"] = false}',
'{["automation-3"] = false}',
'{electronics = false}',
'{["advanced-electronics"] = false}',
'{["advanced-electronics-2"] = false}',
'{["circuit-network"] = false}',
'{explosives = false}',
'{logistics = false}',
'{["logistics-2"] = false}',
]
researches.forEach(research => {
reSync.scriptOutput(research);
assert(isFactorioCommand("/c x = "+research));
});
assert(Object.keys(reSync.research).length == researches.length);
});
});
it("regularily polls and syncs research (configurable delay)", (done)=>{
let reSync = new researchSync({}, io, {
researchSyncPollInterval: 100,
});
let ioRecieved;
function io(str){
ioRecieved = true;
assert(isFactorioCommand(str), "pollResearch should run a command");
}
function waitForIo(){
if(!ioRecieved){
setTimeout(waitForIo,50);
} else {
done();
}
}
waitForIo();
});
});
});