messageInterface now returns a promise as well

This commit is contained in:
Danielv123 committed 2018-05-31 21:18:05 +02:00
1 parent da6f96a34b
commit 812265d0fd
1 file changed
+23 -12
+23 -12
View File
@@ -57,8 +57,16 @@ const needleOptionsWithTokenAuthHeader = {
var instanceInfo = {}; var instanceInfo = {};
var commandBuffer=[]; var commandBuffer=[];
// messageInterface Management
setInterval(function(){
let command=commandBuffer.shift();
if(command){
messageInterfaceInternal(command[0], command[1], command[2], command[3]);
}
},config.msBetweenCommands || 50);
// function to handle sending commands into the game // function to handle sending commands into the game
function messageInterfaceInternal(command, callback) { async function messageInterfaceInternal(command, callback, resolve, reject) {
// try to save us if you send a buffer instead of string // try to save us if you send a buffer instead of string
if(typeof command == "object") { if(typeof command == "object") {
command = command.toString('utf8'); command = command.toString('utf8');
@@ -73,20 +81,26 @@ function messageInterfaceInternal(command, callback) {
if(typeof callback == "function"){ if(typeof callback == "function"){
callback(); callback();
} }
resolve();
} else if(typeof command == "string" && client && client.send && typeof client.send == "function") { } else if(typeof command == "string" && client && client.send && typeof client.send == "function") {
try { try {
client.send(command+"\n").then(str => { let str = await client.send(command+"\n");
if(typeof callback == "function") callback(str) if(typeof callback == "function") callback(str)
}); resolve(str)
} catch (err) { } catch (err) {
console.log(err); console.log(err);
if(typeof callback == "function"){ if(typeof callback == "function"){
callback(); callback();
} }
reject(err)
} }
} }
} }
function messageInterface(command, callback) {commandBuffer.push([command,callback]);} function messageInterface(command, callback) {
return new Promise((resolve,reject) => {
commandBuffer.push([command,callback, resolve, reject]);
});
}
// handle commandline parameters // handle commandline parameters
@@ -466,11 +480,12 @@ function instanceManagement() {
if(pluginConfig.binary == "nodePackage"){ if(pluginConfig.binary == "nodePackage"){
// require index.js.main() of plugin and execute it as a class // require index.js.main() of plugin and execute it as a class
let pluginClass = require("./sharedPlugins/" + pluginDirectories[I] + "/index.js"); let pluginClass = require("./sharedPlugins/" + pluginDirectories[I] + "/index.js");
plugins[I] = new pluginClass(combinedConfig, function(data, callback){ plugins[I] = new pluginClass(combinedConfig, async function(data, callback){
if(data.toString('utf8')[0] != "/") { if(data.toString('utf8')[0] != "/") {
log("Stdout: " + data.toString('utf8')); log("Stdout: " + data.toString('utf8'));
return true;
} else { } else {
messageInterface(data.toString('utf8'), callback); return messageInterface(data.toString('utf8'), callback);
} }
}, { // extra functions to pass in object. Should have done it like this from the start, but won't break backwards compat. }, { // extra functions to pass in object. Should have done it like this from the start, but won't break backwards compat.
socket, // socket.io connection to master (and ES6 destructuring, yay) socket, // socket.io connection to master (and ES6 destructuring, yay)
@@ -631,10 +646,6 @@ function instanceManagement() {
}); });
} }
}); });
// messageInterface Management
setInterval(function(){let command=commandBuffer.pop();if(command){messageInterfaceInternal(command[0],command[1])}},config.msBetweenCommands || 50);
// Mod uploading and management ----------------------------------------------- // Mod uploading and management -----------------------------------------------
// get mod names and hashes // get mod names and hashes
// string: instance, function: callback // string: instance, function: callback
@@ -650,7 +661,7 @@ function instanceManagement() {
needle.post(config.masterIP + ":" + config.masterPort + '/api/checkMod', payload, needleOptionsWithTokenAuthHeader, function (err, response, body) { needle.post(config.masterIP + ":" + config.masterPort + '/api/checkMod', payload, needleOptionsWithTokenAuthHeader, function (err, response, body) {
if(err) console.log(new Error("Unable to contact master server! Please check your config.json.")); if(err) console.log(new Error("Unable to contact master server! Please check your config.json."));
if(response && body && body == "found") { if(response && body && body == "found") {
console.log("master has mod"); console.log("master has mod "+modHashes[i].modName);
} else if (response && body && typeof body == "string") { } else if (response && body && typeof body == "string") {
let mod = response.body; let mod = response.body;
if(config.uploadModsToMaster){ if(config.uploadModsToMaster){