diff --git a/.gitignore b/.gitignore index e8abab14..9ec251c9 100644 --- a/.gitignore +++ b/.gitignore @@ -22,6 +22,7 @@ coverage # Compiled binary addons (http://nodejs.org/api/addons.html) build/Release +dist/ node_modules/* !node_modules/_app diff --git a/.snyk b/.snyk index fcb500f1..d7f0b403 100644 --- a/.snyk +++ b/.snyk @@ -1,8 +1,45 @@ # Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities. -version: v1.12.0 +version: v1.13.3 ignore: {} # patches apply the minimum changes required to fix a vulnerability patch: 'npm:lodash:20180130': - html5-validator > caporal > cli-table2 > lodash: patched: '2018-07-03T06:07:55.532Z' + 'npm:hawk:20160119': + - node-factorio-api > documentation > highlight.js > gear-lib > less > request > hawk: + patched: '2019-02-25T06:48:21.845Z' + 'npm:http-signature:20150122': + - node-factorio-api > documentation > highlight.js > gear-lib > less > request > http-signature: + patched: '2019-02-25T06:48:21.845Z' + 'npm:mime:20170907': + - node-factorio-api > documentation > highlight.js > gear-lib > mime: + patched: '2019-02-25T06:48:21.845Z' + - node-factorio-api > documentation > highlight.js > gear-lib > less > mime: + patched: '2019-02-25T06:48:21.845Z' + - node-factorio-api > documentation > highlight.js > gear-lib > less > request > form-data > mime: + patched: '2019-02-25T06:48:21.845Z' + 'npm:minimatch:20160620': + - node-factorio-api > documentation > highlight.js > gear > liftoff > findup-sync > glob > minimatch: + patched: '2019-02-25T06:48:21.845Z' + - node-factorio-api > documentation > highlight.js > gear-lib > gear > liftoff > findup-sync > glob > minimatch: + patched: '2019-02-25T06:48:21.845Z' + - node-factorio-api > documentation > highlight.js > gear-lib > glob > minimatch: + patched: '2019-02-25T06:48:21.845Z' + - node-factorio-api > documentation > highlight.js > gear-lib > jslint > glob > minimatch: + patched: '2019-02-25T06:48:21.845Z' + - node-factorio-api > documentation > highlight.js > gear-lib > jshint > cli > glob > minimatch: + patched: '2019-02-25T06:48:21.845Z' + - node-factorio-api > documentation > highlight.js > gear-lib > jshint > minimatch: + patched: '2019-02-25T06:48:21.845Z' + 'npm:request:20160119': + - node-factorio-api > documentation > highlight.js > gear-lib > less > request: + patched: '2019-02-25T06:48:21.845Z' + 'npm:tunnel-agent:20170305': + - node-factorio-api > documentation > highlight.js > gear-lib > less > request > tunnel-agent: + patched: '2019-02-25T06:48:21.845Z' + 'npm:uglify-js:20151024': + - node-factorio-api > documentation > highlight.js > gear-lib > handlebars > uglify-js: + patched: '2019-02-25T06:48:21.845Z' + - node-factorio-api > documentation > highlight.js > gear-lib > uglify-js: + patched: '2019-02-25T06:48:21.845Z' diff --git a/.vs/ProjectSettings.json b/.vs/ProjectSettings.json new file mode 100644 index 00000000..f8b48885 --- /dev/null +++ b/.vs/ProjectSettings.json @@ -0,0 +1,3 @@ +{ + "CurrentProjectSetting": null +} \ No newline at end of file diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json new file mode 100644 index 00000000..29e0e1d2 --- /dev/null +++ b/.vs/VSWorkspaceState.json @@ -0,0 +1,8 @@ +{ + "ExpandedNodes": [ + "", + "\\sharedPlugins" + ], + "SelectedNode": "\\.gitignore", + "PreviewInSolutionExplorer": false +} \ No newline at end of file diff --git a/.vs/config/applicationhost.config b/.vs/config/applicationhost.config new file mode 100644 index 00000000..46c8854e --- /dev/null +++ b/.vs/config/applicationhost.config @@ -0,0 +1,1025 @@ + + + + + + + +
+
+
+
+
+
+
+
+ + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+ +
+
+
+
+
+
+ +
+
+
+
+
+ +
+
+
+ +
+
+ +
+
+ +
+
+
+ + +
+
+
+
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite new file mode 100644 index 00000000..a2f63943 Binary files /dev/null and b/.vs/slnx.sqlite differ diff --git a/README.md b/README.md index 41f5bb0e..56a67441 100644 --- a/README.md +++ b/README.md @@ -78,7 +78,7 @@ Clusterio exploits one of the games logging features, game.write_file and RCON t 7. client.js on server2: We were allowed to import x of item y, run command /c remote.call("clusterio", "importMany", "{'copper-plate':120}") -This process works the same for both items and liquids, independant on what mods are used. Yes, modded items are fully supported. +This process works the same for both items and liquids, independent on what mods are used. Yes, modded items are fully supported. Clusterio can also do a few other neat things, such as giving you access to epoch time, syncing player inventories between servers, keeping track of playtime (playerManager plugin), teleporting trains between servers (trainTeleports) and exporting tons of factorio related statistics to Prometheus for graphing in grafana. diff --git a/bin/Microsoft.NodejsTools.WebRole.dll b/bin/Microsoft.NodejsTools.WebRole.dll new file mode 100644 index 00000000..879bdfc4 Binary files /dev/null and b/bin/Microsoft.NodejsTools.WebRole.dll differ diff --git a/config.json.dist b/config.json.dist index 3ca02906..1c598664 100644 --- a/config.json.dist +++ b/config.json.dist @@ -47,7 +47,9 @@ "entriesPerSecond": 0.01666666667 }, "logItemTransfers": false, + "__comment6.5": "When the master is undersupplied, we have 3 different modes to 'fairly' distribute items. First to ask gets all, dole division using weird formula or experimental neural net tries to make stuff as fair as possible. Feel free to play around.", "disableFairItemDistribution": false, + "useNeuralNetDoleDivider": false, "uploadModsToMaster": true, "msBetweenCommands": 10, "allowRemoteCommandExecution": true, diff --git a/lib/dole_nn_base.js b/lib/dole_nn_base.js new file mode 100644 index 00000000..e4dda0b6 --- /dev/null +++ b/lib/dole_nn_base.js @@ -0,0 +1,118 @@ +//Sigmoids... + +function sigmoid0(x) +{ + return x/(1+Math.abs(x)); +} +function sigmoid1(x) +{ + if (x>=0.0) { + return 1.0 + } else { + return 0.0 + } +} +function sigmoid2(x) +{ + if (x>=0.0){ + return x + } else { + return 0.0 + } +} +function sigmoid3(x) +{ + return x; +} + +//DOSE - Doses items for item X slave Y +//Numreq - number of items that are requested for item X for slave Y +//Instore - number of items for item X in master gauge (currently) +//store_last_tick - Number of items for item X in master gauge at time of last tick +//dole - Current dole for item X +//carry - carry for item X slave Y +//prev_req - Numreq for previous request for item X slave Y +//* doleinfo_last - Object with 2 values for last "tick period": numreq - total number or requests for item, numslave - number of slaves requesting that item + +//Returns: Array of 3 elements +//0.Number of items to give in that dose +//1.New dole for item X +//2.New carry for item X slave Y +function Dose(numreq,instore,store_last_tick,dole,carry,prev_req,numreq_total_adj) +{ + numreq=Number(numreq); + instore=Number(instore); + var instore_adj=instore; + if (instore_adj==0) instore_adj=0.1; + + var b=Math.trunc(prev_req/instore_adj*numreq); + var inp1=[numreq,instore_adj,store_last_tick/numreq,dole,carry];//0..4 + var inp2=[prev_req/numreq,numreq/numreq_total_adj,store_last_tick/numreq_total_adj,prev_req/instore_adj,b];//5..9 + var inputs=inp1.concat(inp2); + var internal=[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]; + var outputs=[0,0,0]; + //NN: Please don't touch :), code is generated + +outputs[0]=inputs[2]*3.101320028; +outputs[0]=outputs[0]+inputs[7]*0.5471593142; +outputs[0]=outputs[0]+inputs[3]*2.691268921; +outputs[0]=outputs[0]+outputs[1]*-1.64255929; +outputs[0]=outputs[0]+inputs[6]*0.7746122479; +outputs[0]=sigmoid0(outputs[0]); +outputs[1]=inputs[2]*-0.9946503043; +outputs[1]=outputs[1]+inputs[1]*0.2128598392; +outputs[1]=sigmoid0(outputs[1]); +outputs[2]=sigmoid2(outputs[2]); + + outputs[0]=Number(outputs[0]); + if (outputs[0]<0) outputs[0]=0; + outputs[0]=outputs[0]*numreq; + var res1=Math.round(outputs[0]); + if (res1>numreq) res1=numreq; + if (res1>instore) res1=instore; + if (res1<0) res1=0; + carry=sigmoid0(outputs[2]); + return [res1,sigmoid0(outputs[1]),carry]; +} + +//TICK - Updates values for item X, should be called once for each item for each round of all slaves requesting that item +//Instore - number of items for item X in master gauge (currently) +//dole - Current dole for item X +//store_last_tick - Number of items for item X in master gauge at time of last tick (not this one) +//* doleinfo_last - Object with 2 values for last "tick period": numreq - total number or requests for item, numslave - number of slaves requesting that item +//* doleinfo_new - Object with 2 values for new "tick period": numreq - total number or requests for item, numslave - number of slaves requesting that item + + +//Returns: Array of 2 elements +//0.New dole for item X +//1.Guessed percentage average of items supplied in last 10 ticks +function Tick(instore,dole,store_last_tick,numreq_total_adj) +{ + var instore_adj=instore; + if (instore_adj==0) instore_adj=0.1; + var inputs=[instore,dole,store_last_tick/instore_adj,store_last_tick/numreq_total_adj]; + var internal=[0,0,0,0,0]; + var outputs=[0,0]; + //NN: Please don't touch :), code is generated + +internal[2]=sigmoid0(internal[2]); +outputs[0]=internal[2]*0.4049594998; +outputs[0]=outputs[0]+1.0*-5.026565075; +outputs[0]=outputs[0]+inputs[0]*0.9100194573; +outputs[0]=outputs[0]+inputs[1]*-1.063795686; +outputs[0]=sigmoid1(outputs[0]); +outputs[1]=outputs[0]*1.049500823; +outputs[1]=outputs[1]*inputs[0]*3.437163115; +outputs[1]=sigmoid0(outputs[1]); + + + + avg=outputs[1]; + if (numreq_total_adj<0.11) avg=1;//When no item's are requested, result is 0.1 ; In that case there is no deficit, so return 1 = 100% demand fulfilled + if (avg>1) avg=1; + if (avg<0) avg=0; + + return [sigmoid0(outputs[0]),avg]; +} + +module.exports = {Dose,Tick} diff --git a/lib/manager/instanceManager.js b/lib/manager/instanceManager.js new file mode 100644 index 00000000..1b0162a9 --- /dev/null +++ b/lib/manager/instanceManager.js @@ -0,0 +1,2 @@ +const fs = require("fs-extra"); +const needle = require("needle"); diff --git a/lib/scenarios/Hotpatch/control.lua b/lib/scenarios/Hotpatch/control.lua index b5b66946..907de7fa 100644 --- a/lib/scenarios/Hotpatch/control.lua +++ b/lib/scenarios/Hotpatch/control.lua @@ -36,53 +36,97 @@ require 'hotpatch.gui' -- Any other use would require licensing/permission from Wube -- If you don't want to run this, either comment this out before creating your scenario, OR uninstall freeplay at runtime hotpatch_tools.static_mod('freeplay', '1.0.0', [===[ +local util = require("util") local silo_script = require("silo-script") -local version = 1 + +local created_items = function() + return + { + ["iron-plate"] = 8, + ["wood"] = 1, + ["pistol"] = 1, + ["firearm-magazine"] = 10, + ["burner-mining-drill"] = 1, + ["stone-furnace"] = 1 + } +end + +local respawn_items = function() + return + { + ["pistol"] = 1, + ["firearm-magazine"] = 10 + } +end + +for k,v in pairs(silo_script.get_events()) do + script.on_event(k, v) +end script.on_event(defines.events.on_player_created, function(event) local player = game.players[event.player_index] - player.insert{name="iron-plate", count=8} - player.insert{name="pistol", count=1} - player.insert{name="firearm-magazine", count=10} - player.insert{name="burner-mining-drill", count = 1} - player.insert{name="stone-furnace", count = 1} - player.force.chart(player.surface, {{player.position.x - 200, player.position.y - 200}, {player.position.x + 200, player.position.y + 200}}) - if (#game.players <= 1) then - game.show_message_dialog{text = {"msg-intro"}} - else - player.print({"msg-intro"}) + util.insert_safe(player, global.created_items) + + local r = global.chart_distance or 200 + player.force.chart(player.surface, {{player.position.x - r, player.position.y - r}, {player.position.x + r, player.position.y + r}}) + + if not global.skip_intro then + if game.is_multiplayer() then + player.print({"msg-intro"}) + else + game.show_message_dialog{text = {"msg-intro"}} + end end - silo_script.on_player_created(event) + + silo_script.on_event(event) end) script.on_event(defines.events.on_player_respawned, function(event) local player = game.players[event.player_index] - player.insert{name="pistol", count=1} - player.insert{name="firearm-magazine", count=10} -end) - -script.on_event(defines.events.on_gui_click, function(event) - silo_script.on_gui_click(event) -end) - -script.on_init(function() - global.version = version - silo_script.on_init() -end) - -script.on_event(defines.events.on_rocket_launched, function(event) - silo_script.on_rocket_launched(event) + util.insert_safe(player, global.respawn_items) + silo_script.on_event(event) end) script.on_configuration_changed(function(event) - if global.version ~= version then - global.version = version - end + global.created_items = global.created_items or created_items() + global.respawn_items = global.respawn_items or respawn_items() silo_script.on_configuration_changed(event) end) +script.on_load(function() + silo_script.on_load() +end) + +script.on_init(function() + global.created_items = created_items() + global.respawn_items = respawn_items() + silo_script.on_init() +end) + silo_script.add_remote_interface() silo_script.add_commands() + +remote.add_interface("freeplay", +{ + get_created_items = function() + return global.created_items + end, + set_created_items = function(map) + global.created_items = map + end, + get_respawn_items = function() + return global.respawn_items + end, + set_respawn_items = function(map) + global.respawn_items = map + end, + set_skip_intro = function(bool) + global.skip_intro = bool + end, + set_chart_distance = function(value) + global.chart_distance = tonumber(value) + end +}) ]===]) -- Multi-file test @@ -98,7 +142,7 @@ files['testfolder.test'] = [===[ ]===] files['test'] = [===[ - require 'testfolder.test' + require 'testfolder.test' ]===] hotpatch_tools.static_mod('require-test', '1.0.0', [===[ diff --git a/lib/scenarios/Hotpatch/hotpatch/commands.lua b/lib/scenarios/Hotpatch/hotpatch/commands.lua index 43ffbc80..efd02d0a 100644 --- a/lib/scenarios/Hotpatch/hotpatch/commands.lua +++ b/lib/scenarios/Hotpatch/hotpatch/commands.lua @@ -61,11 +61,11 @@ sub_commands = { if (not param) or (param == '') then caller.print('Usage: /hotpatch [command] [parameters]') caller.print('Available commands:') - for k, v in pairs(sub_commands) do caller.print(k) end + for k, _ in pairs(sub_commands) do caller.print(k) end caller.print('Use /hotpatch help [command] for help on a particular command') else local text = help_commands[param] - if text then + if text then caller.print(text) end end @@ -82,7 +82,7 @@ sub_commands = { caller.print(table.concat{'[', k, '] ', v.name, ' ', v.version, ' ', (v.loaded and 'loaded') or 'not loaded', ' ', (v.running and 'running') or 'not running'}) end else - + end end, } @@ -113,7 +113,7 @@ local admin_commands = { _ENV.commands.add_command('hotpatch', 'Commands for hotpatch. Run /hotpatch help for details.', function(e) local caller = (e.player_index and game.players[e.player_index]) or console - if (not e.parameter) or (e.parameter == '') then + if (not e.parameter) or (e.parameter == '') then sub_commands['help'](e.player_index) return end @@ -130,6 +130,6 @@ _ENV.commands.add_command('hotpatch', 'Commands for hotpatch. Run /hotpatch help end end) -]===]) +--]===]) return true \ No newline at end of file diff --git a/lib/scenarios/Hotpatch/hotpatch/gui.lua b/lib/scenarios/Hotpatch/hotpatch/gui.lua index 06acdbb1..481eb4b6 100644 --- a/lib/scenarios/Hotpatch/hotpatch/gui.lua +++ b/lib/scenarios/Hotpatch/hotpatch/gui.lua @@ -55,26 +55,26 @@ script.on_event(defines.events.on_player_joined_game, function(e) local top = mod_gui.get_button_flow(player) local left = mod_gui.get_frame_flow(player) local center = player.gui.center - + local button = top['hotpatch-button'] if button then button.destroy() end local menu = left['hotpatch-menu'] - if menu then + if menu then menu.destroy() end - + local IDE = center['hotpatch-IDE'] - if IDE then + if IDE then IDE.destroy() end - + local main = center['hotpatch-main'] - if main then + if main then main.destroy() end - + button = top.add{type = 'sprite-button', name = 'hotpatch-button', sprite='utility/heat_exchange_indication', tooltip = 'Hotpatch', style = mod_gui.button_style} end) @@ -89,26 +89,26 @@ on_gui_click_handlers = { local top = mod_gui.get_button_flow(player) local left = mod_gui.get_frame_flow(player) local center = player.gui.center - + local menu = left['hotpatch-menu'] if not menu then menu = left.add{type = 'frame', name = 'hotpatch-menu', direction = 'vertical'} menu.add{type = 'button', name = 'hotpatch-menu.IDE', caption = 'Mod IDE', tooltip = 'Open debugging GUI'} menu.add{type = 'button', name = 'hotpatch-menu.console', caption = 'Mod Console', tooltip = 'Open debugging console'} - menu.style.visible = true + menu.visible = true return end - menu.style.visible = not menu.style.visible + menu.visible = not menu.visible end, ['hotpatch-menu'] = function(e) local player = game.players[e.player_index] local top = mod_gui.get_button_flow(player) local left = mod_gui.get_frame_flow(player) local center = player.gui.center - + local menu = left['hotpatch-menu'] - menu.style.visible = not menu.style.visible - + menu.visible = not menu.visible + on_gui_click_handlers[e.element.name](e) end, ['hotpatch-menu.IDE'] = function(e) @@ -116,7 +116,7 @@ on_gui_click_handlers = { local top = mod_gui.get_button_flow(player) local left = mod_gui.get_frame_flow(player) local center = player.gui.center - + local IDE = center['hotpatch-IDE'] if not IDE then IDE = center.add{type = 'frame', name = 'hotpatch-IDE', direction = 'vertical', caption = 'Hotpatch IDE', style = mod_gui.frame_style} @@ -132,22 +132,22 @@ on_gui_click_handlers = { local code = IDE_table.add{type = 'text-box', name = 'hotpatch-IDE-code'} code.word_wrap = true files.style.width = 400 - files.style.cell_spacing = 0 + files.style.cell_padding = 0 files.style.top_padding = 0 files.style.bottom_padding = 0 code.style.width = 600 code.style.height = 600 - IDE.style.visible = false + IDE.visible = false end - + local IDE_dropdown = IDE['hotpatch-IDE-top']['hotpatch-IDE-mod-selector'] IDE_dropdown.clear_items() - for k, v in ipairs(installed_mods) do + for _, v in ipairs(installed_mods) do IDE_dropdown.add_item(v.name) end - - IDE.style.visible = not IDE.style.visible - if IDE.style.visible then + + IDE.visible = not IDE.visible + if IDE.visible then player.opened = IDE else player.opened = nil @@ -158,15 +158,15 @@ on_gui_click_handlers = { local top = mod_gui.get_button_flow(player) local left = mod_gui.get_frame_flow(player) local center = player.gui.center - - local console = center['hotpatch-console'] - if not console then - console = center.add{type = 'frame', name = 'hotpatch-console', direction = 'vertical', caption = 'Hotpatch Console'} - local top_flow = console.add{type = 'flow', name = 'hotpatch-console-top', direction = 'horizontal'} + + local hotpatch_console = center['hotpatch-console'] + if not hotpatch_console then + hotpatch_console = center.add{type = 'frame', name = 'hotpatch-console', direction = 'vertical', caption = 'Hotpatch Console'} + local top_flow = hotpatch_console.add{type = 'flow', name = 'hotpatch-console-top', direction = 'horizontal'} top_flow.add{type = 'label', name = 'hotpatch-console-mod-label', caption = 'Mod: '} local console_dropdown = top_flow.add{type = 'drop-down', name = 'hotpatch-console-mod-selector'} top_flow.add{type = 'label', name = 'hotpatch-console-mod-version', caption = 'Version: No mod selected'} - local bottom_flow = console.add{type = 'flow', name = 'hotpatch-console-bottom', direction = 'vertical'} + local bottom_flow = hotpatch_console.add{type = 'flow', name = 'hotpatch-console-bottom', direction = 'vertical'} local output = bottom_flow.add{type = 'text-box', name = 'hotpatch-console-output'} local bottom_input_flow = bottom_flow.add{type = 'flow', name = 'hotpatch-console-bottom-input', direction = 'horizontal'} local input = bottom_input_flow.add{type = 'textfield', name = 'hotpatch-console-input'} @@ -174,53 +174,54 @@ on_gui_click_handlers = { output.style.width = 800 output.style.height = 600 input.style.width = 600 + hotpatch_console.visible = false end - - local console_dropdown = console['hotpatch-console-top']['hotpatch-console-mod-selector'] + + local console_dropdown = hotpatch_console['hotpatch-console-top']['hotpatch-console-mod-selector'] console_dropdown.clear_items() - for k, v in ipairs(loaded_mods) do + for _, v in ipairs(loaded_mods) do console_dropdown.add_item(v.name) end - - console.style.visible = not console.style.visible - if console.style.visible then - player.opened = console + + hotpatch_console.visible = not hotpatch_console.visible + if hotpatch_console.visible then + player.opened = hotpatch_console else player.opened = nil end end, ['hotpatch-console-run'] = function(e) local player = game.players[e.player_index] - + local top = mod_gui.get_button_flow(player) local left = mod_gui.get_frame_flow(player) local center = player.gui.center - - local console = center['hotpatch-console'] - local output = console['hotpatch-console-bottom']['hotpatch-console-output'] - local input = console['hotpatch-console-bottom']['hotpatch-console-bottom-input']['hotpatch-console-input'] - local console_dropdown = console['hotpatch-console-top']['hotpatch-console-mod-selector'] - + + local hotpatch_console = center['hotpatch-console'] + local output = hotpatch_console['hotpatch-console-bottom']['hotpatch-console-output'] + local input = hotpatch_console['hotpatch-console-bottom']['hotpatch-console-bottom-input']['hotpatch-console-input'] + local console_dropdown = hotpatch_console['hotpatch-console-top']['hotpatch-console-mod-selector'] + if not player.admin then output.text = table.concat{output.text, '\n', 'Only admins!'} return end - + if not (console_dropdown.selected_index > 0) then output.text = table.concat{output.text, '\n', 'Select a mod!'} return end - + local mod_name = console_dropdown.items[console_dropdown.selected_index] local loaded_index = find_loaded_mod(mod_name) local env = loaded_mods[loaded_index].env local old_print = env.print local old_log = env.log - - - - - + + + + + env.print = function(...) --local count = select('#', ...) local t = table.pack(...) @@ -230,21 +231,22 @@ on_gui_click_handlers = { local text = table.concat(t, '\t') output.text = table.concat{output.text, '\n', text} end - + env.log = function(text) output.text = table.concat{output.text, '\n', text} end - + + local success local code, err = load(input.text, input.text, 't', env) - if code then - local success, err = pcall(code) + if code then + success, err = pcall(code) if not success then output.text = table.concat{output.text, '\n', err} end else output.text = table.concat{output.text, '\n', err} end - + env.print = old_print env.log = old_log end, @@ -253,10 +255,10 @@ on_gui_click_handlers = { local top = mod_gui.get_button_flow(player) local left = mod_gui.get_frame_flow(player) local center = player.gui.center - + local element = e.element local previous - for k, v in pairs(center['hotpatch-IDE']['hotpatch-IDE-table']['hotpatch-IDE-files']['hotpatch-IDE-files-table'].children) do + for _, v in pairs(center['hotpatch-IDE']['hotpatch-IDE-table']['hotpatch-IDE-files']['hotpatch-IDE-files-table'].children) do if table.compare(v.style.font_color or {}, {r=1.0, g=1.0, b=0.0, a=1.0}) then previous = v break @@ -297,7 +299,7 @@ on_gui_selection_state_changed_handlers = { local top = mod_gui.get_button_flow(player) local left = mod_gui.get_frame_flow(player) local center = player.gui.center - + local element = e.element local name = element.items[element.selected_index] if name then @@ -306,8 +308,8 @@ on_gui_selection_state_changed_handlers = { local mod = loaded_mods[index] local version_label = center['hotpatch-console']['hotpatch-console-top']['hotpatch-console-mod-version'] version_label.caption = 'Version: ' .. mod.version - local console = center['hotpatch-console'] - local output = console['hotpatch-console-bottom']['hotpatch-console-output'] + local hotpatch_console = center['hotpatch-console'] + local output = hotpatch_console['hotpatch-console-bottom']['hotpatch-console-output'] output.text = '' end end @@ -317,9 +319,9 @@ on_gui_selection_state_changed_handlers = { local top = mod_gui.get_button_flow(player) local left = mod_gui.get_frame_flow(player) local center = player.gui.center - + local element = e.element - + local name = element.items[element.selected_index] if name then local index = find_installed_mod(name) @@ -332,7 +334,7 @@ on_gui_selection_state_changed_handlers = { local file = list.add{type = 'label', style = 'hoverable_bold_label', caption = 'control', name = 'hotpatch-IDE-file.control'} file.style.bottom_padding = 0 file.style.top_padding = 0 - for k, v in pairs(mod.files) do + for k, _ in pairs(mod.files) do file = list.add{type = 'label', style = 'hoverable_bold_label', caption = k, name = 'hotpatch-IDE-file.' .. k} file.style.bottom_padding = 0 file.style.top_padding = 0 @@ -356,20 +358,20 @@ script.on_event(defines.events.on_gui_closed, function(e) if e.gui_type == defines.gui_type.custom then if element and element.valid then if element.name == 'hotpatch-IDE' then - if element.style.visible then + if element.visible then player.play_sound{path = "utility/gui_click"} end - element.style.visible = false + element.visible = false elseif element.name == 'hotpatch-console' then - if element.style.visible then + if element.visible then player.play_sound{path = "utility/gui_click"} end - element.style.visible = false + element.visible = false end end end end) -]===]) +--]===]) return true \ No newline at end of file diff --git a/lib/scenarios/Hotpatch/hotpatch/mod-tools.lua b/lib/scenarios/Hotpatch/hotpatch/mod-tools.lua index 860e3b59..d5356d3f 100644 --- a/lib/scenarios/Hotpatch/hotpatch/mod-tools.lua +++ b/lib/scenarios/Hotpatch/hotpatch/mod-tools.lua @@ -67,7 +67,7 @@ local mod_obj_template = { } -- this is for the core factorio libraries; hotpatch MUST load these now, as they cannot be dynamically loaded due to factorio limitation -local loaded_libraries = {} +local loaded_libraries = {} -- mod installation/uninstallation support functions -- These take a mod NAME as a first argument @@ -101,6 +101,8 @@ local mod_on_configuration_changed local on_event local on_nth_tick +local register_all_events + -- core handlers local on_init -- installs static mods, loads, runs, and calls mod_on_init local on_load -- loads, runs, and calls mod_on_load @@ -222,12 +224,12 @@ local function build_locale(ini) local t = {} local section = '' local temp - + -- line must end with a linefeed - single line file with no LF will fail if not ini:match('[\r\n]+$') then ini = ini .. '\n' end - + -- for each non-empty line do local key, value for l in ini:gmatch('[\r\n]*(.-)[\r\n]+') do @@ -261,7 +263,7 @@ local function static_translate(t, recursive) -- only translate tables that have a string as the first item local k = t[1] if type(k) ~= 'string' then return t end - + -- make a copy, don't destroy the original table, after we copy we can translate in place if not recursive then t = table.deepcopy(t) @@ -285,12 +287,12 @@ local function static_translate(t, recursive) -- substitution of parameters: use literal value of parameter n -- __n__ local result = (pattern:gsub('__(%d+)__', function(s) return tostring(t[tonumber(s)+1]) end)) - + -- re-substitution engine: match value of parameter n to provide additional translation; use for pluralization -- __n:(pattern-1)=substitution-1;(pattern-2)=substitution-2;...(pattern-i)=substitution-i;__ for n, p in result:gmatch('__(%d+)(:.-;)__') do for x, y in p:gmatch('%((.-)%)=(.-[^%%]);') do - if t[tonumber(n)+1]:match(x) then + if t[tonumber(n)+1]:match(x) then result = result:gsub(table.concat{'__', n, escape(p), '__'}, unescape(y)) break end @@ -324,7 +326,7 @@ local hidden_log = hidden(static_translate) -- logs localized data local function debug_log(message, mod_name, stack_level) - if debug_level > -1 then + if debug_level > -1 then if not stack_level then stack_level = 2 end local di = debug.getinfo(stack_level) local line = di.currentline @@ -363,7 +365,7 @@ debug_log({'hotpatch-info.logging-enabled'}) -- track _ENV accesses setmetatable(_ENV, { - __index = function(t, k) + __index = function(_, k) debug_log({'hotpatch-trace.nil-var-access', k}, nil, 3) return nil end, @@ -382,7 +384,6 @@ debug_log({'hotpatch-info.loading-libs'}) local libraries = { 'camera', 'flying_tags', - 'inspect', 'math3d', 'mod-gui', 'noise', @@ -429,14 +430,14 @@ uninstall_mod = function(mod_name) return end local loaded_index = find_loaded_mod(mod_name) - + if loaded_index then unload_mod(loaded_index) end - + debug_log({'hotpatch-info.uninstalling', mod_name}) - + table.remove(global.mods, index) end @@ -447,7 +448,7 @@ install_mod_file = function(mod_name, mod_file, mod_file_code) return end local mod = global.mods[index] - + debug_log({'hotpatch-info.installing-file', mod_file}, mod_name) mod_file = mod_file:gsub('/', '.') @@ -475,7 +476,7 @@ install_mod = function(mod_name, mod_version, mod_code, mod_files) end debug_log({'hotpatch-warning.contains-comments-console'}, mod_name) end - + mod_code = mod_code:gsub('\t', ' ') mod.name = mod_name @@ -483,7 +484,7 @@ install_mod = function(mod_name, mod_version, mod_code, mod_files) mod.code = mod_code mod.version = mod_version mod.global = mod.global or {} - + if mod_files then for k,v in pairs(mod_files) do install_mod_file(mod_name, k, v) @@ -501,7 +502,7 @@ load_mod = function(installed_index) --TODO notify that mod was already loaded unload_mod(loaded_index) end - + local mod_obj = { name = mod_name, -- name of the current mod version = mod.version, @@ -516,7 +517,7 @@ load_mod = function(installed_index) on_nth_tick = {}, -- list of on_nth_tick handlers registered loaded_files = {}, -- list of files loaded by require() that were installed into the virtual file system } - + debug_log({'hotpatch-info.script-shim'}, mod_name) --mods private script table/shim local mod_script = {} @@ -541,7 +542,7 @@ load_mod = function(installed_index) mod_script.on_nth_tick = function(tick, f) if tick then if type(tick) == 'table' then - for k, v in pairs(tick) do + for _, v in pairs(tick) do mod_script.on_nth_tick(v, f) end return @@ -551,12 +552,12 @@ load_mod = function(installed_index) mod_obj.on_nth_tick = {} end end - else + else mod_script.on_event = function(event, f) if event == defines.events.on_tick then mod_obj.on_tick = f if mod_obj.running then - register_on_tick(mod_name, event) + register_on_tick(mod_name) end else mod_obj.on_event[event] = f @@ -568,7 +569,7 @@ load_mod = function(installed_index) mod_script.on_nth_tick = function(tick, f) if tick then if type(tick) == 'table' then - for k, v in pairs(tick) do + for _, v in pairs(tick) do mod_script.on_nth_tick(v, f) end return @@ -578,11 +579,11 @@ load_mod = function(installed_index) register_nth_tick(mod_name, tick) end else - local on_nth_tick = mod_obj.on_nth_tick + local mod_on_nth_tick = mod_obj.on_nth_tick mod_obj.on_nth_tick = {} if mod_obj.running then - for k, v in pairs(on_nth_tick) do - register_nth_tick(mod_name, tick) + for _, v in pairs(mod_on_nth_tick) do + register_nth_tick(mod_name, v) end end end @@ -604,7 +605,7 @@ load_mod = function(installed_index) mod_script.mod_name = function() return script.mod_name() end - + debug_log({'hotpatch-info.setting-env'}, mod_name) -- mods private env local env = mod_obj.env @@ -621,20 +622,20 @@ load_mod = function(installed_index) loaded[k] = v end loaded._G = env - + -- so many ways to escape sandboxes... - + for k,v in pairs(_ENV.package) do pack[k] = v end pack.loaded = loaded env.package = pack loaded.package = pack - + env.script = mod_script env.global = mod.global env._G = env - + env['remote'] = { add_interface = function(name, functions) if remote.interfaces[name] then @@ -650,7 +651,7 @@ load_mod = function(installed_index) return remote.call(...) end, interfaces = setmetatable({}, { - __index = function(t, k) return remote.interfaces[k] end, + __index = function(_, k) return remote.interfaces[k] end, __pairs = function(t) local function iter(t, k) local v; k, v = next(remote.interfaces, k); if v then return k, t[k] end; end; return iter, t, nil end }) } @@ -666,16 +667,16 @@ load_mod = function(installed_index) return commands.remove_command(name) end, commands = setmetatable({}, { - __index = function(t, k) return commands.commands[k] end, + __index = function(_, k) return commands.commands[k] end, __pairs = function(t) local function iter(t, k) local v; k, v = next(commands.commands, k); if v then return k, t[k] end; end; return iter, t, nil end }), game_commands = setmetatable({}, { - __index = function(t, k) return commands.game_commands[k] end, + __index = function(_, k) return commands.game_commands[k] end, __pairs = function(t) local function iter(t, k) local v; k, v = next(commands.game_commands, k); if v then return k, t[k] end; end; return iter, t, nil end }) } - - + + env.require = function(path) -- I blame Nexela for this path = path:gsub('/', '.') @@ -710,7 +711,7 @@ load_mod = function(installed_index) error(err) end end - local file = global.mods[installed_index].files[alt_path] + file = global.mods[installed_index].files[alt_path] if file then debug_log({'hotpatch-trace.load-require', alt_path}, mod_name) local code, err = load(file, '[' .. mod_name .. '] ' .. alt_path .. '.lua', 'bt', env) @@ -724,31 +725,31 @@ load_mod = function(installed_index) error(err) end end - + debug_log({'hotpatch-trace.load-core-lib', path}, mod_name) env.package._current_path_in_package = oldbase local lib = package.loaded[path] - if not lib then - debug_log(path .. ' not found', nil, 3) + if not lib then + debug_log({'hotpatch-error.path-not-found', path}, mod_name, 3) error(path .. ' not found') end return lib end end - + env['load'] = function(l, s, m, e) return load(l, s, m, e or env) end env['loadstring'] = env['load'] - - + + env['game'] = setmetatable({}, { - __index = function(t, k) return game[k] end, + __index = function(_, k) return game[k] end, __pairs = function(t) local function iter(t, k) local v; k, v = next(game, k); if v then return k, t[k] end; end; return iter, t, nil end }) - + local mt = {} - mt.__index = function(t, k) + mt.__index = function(_, k) debug_log({'hotpatch-trace.nil-var-access', k}, nil, 3) return nil end @@ -762,7 +763,7 @@ load_mod = function(installed_index) --load/run code debug_log({'hotpatch-info.loading'}, mod_name) - + local mod_code, message = load(mod.code, '[' .. mod_name .. '] control.lua', 'bt', env) if not mod_code then debug_log({'hotpatch-error.compilation-failed'}, mod_name) @@ -816,12 +817,12 @@ reset_mod = function(loaded_index) end reset_mod_events = function(loaded_index) - local loaded_index = find_loaded_mod(mod_name) - - if not loaded_index then - debug_log({'hotpatch-warning.reset-events-not-running'}, mod_name) - else - local loaded_mod = loaded_mods[loaded_index] + --local loaded_index = find_loaded_mod(mod_name) + local loaded_mod = loaded_mods[loaded_index] + + if not loaded_mod then + --debug_log({'hotpatch-warning.reset-events-not-running'}, mod_name) + else loaded_mod.on_event = {} loaded_mod.on_nth_tick = {} loaded_mod.on_init = nil @@ -842,7 +843,7 @@ run_mod = function(loaded_index) --mod.env.global = {} end debug_log({'hotpatch-info.running'}, mod_name) - + local success, result = xpcall(mod.code, debug.traceback) if not success then debug_log({'hotpatch-error.execution-failed'}, mod_name) @@ -851,22 +852,22 @@ run_mod = function(loaded_index) if game and game.player then game.player.print(result) end - + return false end - + if strict_mode then --if mod.env.global ~= {} then --TODO: error, mod touched global inappropriately during load --end --mod.env.global = old_global - + end - + -- if a mod is being loaded that already has global data, it must be restored after -- running control.lua, discarding any changes made if not table.compare(old_global, {}) then - for k,v in pairs(mod.env.global) do + for k,_ in pairs(mod.env.global) do mod.env.global[k] = nil end for k,v in pairs(old_global) do @@ -875,16 +876,16 @@ run_mod = function(loaded_index) --mod.env.global = old_global end old_global = nil - + mod.running = true debug_log({'hotpatch-info.complete', {'hotpatch-info.running'}}, mod_name) - + --load complete, start notifying on event subscriptions if not compat_mode then mod.env.script.on_event = function(event, f) if event == defines.events.on_tick then mod.on_tick = f - register_on_tick(mod_name, event) + register_on_tick(mod_name) else mod.on_event[event] = f register_event(mod_name, event) @@ -893,18 +894,18 @@ run_mod = function(loaded_index) mod.env.script.on_nth_tick = function(tick, f) if tick then if type(tick) == 'table' then - for k, v in pairs(tick) do - mod_script.on_nth_tick(v, f) + for _, v in pairs(tick) do + mod.env.script.on_nth_tick(v, f) end return end mod.on_nth_tick[tick] = f register_nth_tick(mod_name, tick) else - local on_nth_tick = mod.on_nth_tick + local mod_on_nth_tick = mod.on_nth_tick mod.on_nth_tick = {} - for k, v in pairs(on_nth_tick) do - register_nth_tick(mod_name, tick) + for _, v in pairs(mod_on_nth_tick) do + register_nth_tick(mod_name, v) end end end @@ -924,7 +925,7 @@ on_event = function(event) for i = 1, #loaded_mods do mod = loaded_mods[i] f = mod.on_event[event.name] - if f then + if f then debug_log({'hotpatch-trace.event-running', event_name}, mod.name) f(event) end @@ -940,7 +941,7 @@ if debug_log_on_tick then for i = 1, #loaded_mods do mod = loaded_mods[i] f = mod.on_nth_tick[event.nth_tick] - if f then + if f then debug_log({'hotpatch-trace.nth-tick-event-running', tick}, mod.name) f(event) end @@ -954,7 +955,7 @@ else for i = 1, #loaded_mods do mod = loaded_mods[i] f = mod.on_nth_tick[event.nth_tick] - if f then + if f then debug_log({'hotpatch-trace.nth-tick-event-running', tick}, mod.name) f(event) end @@ -962,7 +963,7 @@ else end end -local register_all_events = function() +register_all_events = function() --unregister all events script.on_event(defines.events, nil) script.on_nth_tick(nil, nil) @@ -981,12 +982,12 @@ register_mod_events = function(loaded_index) debug_log({'hotpatch-trace.on-tick-event-registered'}, mod_name) script.on_event(defines.events.on_tick, on_tick) end - for k,v in pairs(mod.on_event) do + for k,_ in pairs(mod.on_event) do local event_name = (event_names[k] or k) debug_log({'hotpatch-trace.on-event-registered', event_name}, mod_name) script.on_event(k, on_event) end - for k,v in pairs(mod.on_nth_tick) do + for k,_ in pairs(mod.on_nth_tick) do debug_log({'hotpatch-trace.on-nth-tick-event-registered', k}, mod_name) script.on_nth_tick(k, on_nth_tick) end @@ -994,14 +995,14 @@ end mod_on_init = function(loaded_index) local mod = loaded_mods[loaded_index] - + if mod then debug_log({'hotpatch-trace.mod-on-init'}, mod.name) - if mod.on_init then + if mod.on_init then local success, result = xpcall(mod.on_init, debug.traceback) if not success then - debug_log('on_init failed for ' .. mod.name) - debug_log(result) + debug_log({'hotpatch-error.on-init-failed'}, mod_name) + debug_log(result, mod_name) return false end end @@ -1013,15 +1014,15 @@ end mod_on_load = function(loaded_index) local mod = loaded_mods[loaded_index] - + if mod then debug_log({'hotpatch-trace.mod-on-load'}, mod.name) - if mod.on_load then + if mod.on_load then --local old_global = table.deepcopy(mod.env.global) local success, result = xpcall(mod.on_load, debug.traceback) if not success then - debug_log('on_load failed for ' .. mod.name) - debug_log(result) + debug_log({'hotpatch-error.on-load-failed'}, mod_name) + debug_log(result, mod_name) return false end end @@ -1033,14 +1034,14 @@ end mod_on_configuration_changed = function(loaded_index, config) local mod = loaded_mods[loaded_index] - + if mod then debug_log({'hotpatch-trace.mod-on-configuration-changed'}, mod.name) - if mod.on_configuration_changed then + if mod.on_configuration_changed then local success, result = xpcall(mod.on_configuration_changed, debug.traceback, config) if not success then - debug_log('on_configuration_changed failed for ' .. mod.name) - debug_log(result) + debug_log({'hotpatch-error.on-configuration-changed-failed'}, mod_name) + debug_log(result, mod_name) return false end end @@ -1058,9 +1059,9 @@ register_on_tick = function(mod_name) for i = 1, #loaded_mods do mod = loaded_mods[i] local f = mod.on_tick - if f then - found_event = true - break + if f then + found_event = true + break end end debug_log({'hotpatch-trace.on-tick-event-registered'}, mod_name) @@ -1078,9 +1079,9 @@ register_nth_tick = function(mod_name, nth_tick) for i = 1, #loaded_mods do mod = loaded_mods[i] local f = mod.on_nth_tick[nth_tick] - if f then - found_event = true - break + if f then + found_event = true + break end end debug_log({'hotpatch-trace.on-nth-tick-event-registered', nth_tick}, mod_name) @@ -1126,7 +1127,7 @@ on_init = function() debug_log({'hotpatch-info.on-init'}) --juuuuust in case global.mods = global.mods or {} - + debug_log({'hotpatch-info.installing-included-mods'}) local mod for i = 1, #static_mods do @@ -1137,7 +1138,7 @@ on_init = function() for i = 1, #global.mods do load_mod(i) end - + for i = 1, #loaded_mods do run_mod(i) mod_on_init(i) @@ -1153,10 +1154,10 @@ on_load = function() hidden_log = hidden() debug_log({'hotpatch-info.on-load'}) debug_log({'hotpatch-info.loading-installed-mods'}) - + if global.globals then error('Upgrading from Hotpatch 1.0.X to 1.1.0 is not currently supported!') - + -- untested migration: use a tick to do the migration script.on_event(defines.events.on_tick, function(e) global.mods = {} @@ -1174,19 +1175,19 @@ on_load = function() global.mod_code = nil global.mod_files = nil global.globals = nil - + on_load() -- jump back into loading on_tick(e) -- need to test if factorio auto calls this or not after assigning the handler script.on_event(defines.events.on_tick, on_tick) -- restore old on_tick handler end) return end - + -- load installed mods for i = 1, #global.mods do load_mod(i) end - + -- run mods which loaded successfully local failed_mods = {} for i = 1, #loaded_mods do @@ -1198,12 +1199,12 @@ on_load = function() table.insert(failed_mods, i) end end - + -- unload mods which failed to run for i = 1, #failed_mods do unload_mod(failed_mods[i]) end - + debug_log({'hotpatch-info.complete', {'hotpatch-info.loading-installed-mods'}}) debug_log({'hotpatch-info.complete', {'hotpatch-info.on-load'}}) end @@ -1212,11 +1213,11 @@ on_configuration_changed = function(config) debug_log({'hotpatch-info.on-configuration-changed'}) local failed_mods = {} for i = 1, #loaded_mods do - if not mod_on_configuration_changed(i) then + if not mod_on_configuration_changed(i, config) then table.insert(failed_mods, i) end end - + for i = 1, #failed_mods do unload_mod(failed_mods[i]) end @@ -1231,7 +1232,7 @@ if debug_log_on_tick then for i = 1, #loaded_mods do mod = loaded_mods[i] f = mod.on_tick - if f then + if f then debug_log({'hotpatch-trace.event-running', 'on_tick'}, mod.name) f(e) end @@ -1244,7 +1245,7 @@ else for i = 1, #loaded_mods do mod = loaded_mods[i] f = mod.on_tick - if f then + if f then f(e) end end @@ -1286,31 +1287,31 @@ local mod_tools_internal = setmetatable({ mod_on_init = mod_on_init, mod_on_load = mod_on_load, mod_on_configuration_changed = mod_on_configuration_changed, - + static_mods = static_mods, console = console, debug_log = debug_log, loaded_mods = loaded_mods, loaded_libraries = loaded_libraries, installed_mods = setmetatable({}, { - __index = function(t, k) + __index = function(_, k) return global.mods[k] end, - __newindex = function(t, k, v) + __newindex = function(_, __, ___) -- do nothing end, - __len = function(t) + __len = function(_) return #global.mods end, - __pairs = function(t) local function iter(t, k) local v; v = global.mods[k+1]; if v then return k+1, v end; end; return iter, t, 0 end, - __ipairs = function(t) local function iter(t, k) local v; v = global.mods[k+1]; if v then return k+1, v end; end; return iter, t, 0 end, + __pairs = function(t) local function iter(_, k) local v; v = global.mods[k+1]; if v then return k+1, v end; end; return iter, t, 0 end, + __ipairs = function(t) local function iter(_, k) local v; v = global.mods[k+1]; if v then return k+1, v end; end; return iter, t, 0 end, __metatable = false, }) },{ - __index = function(t, k) + __index = function(_, k) debug_log({'hotpatch-error.invalid-API-access', k}, nil, 3) end, - __newindex = function(t, k, v) + __newindex = function(_, __, ___) -- do nothing end, -- Don't let mods muck around @@ -1322,11 +1323,12 @@ local mod_tools = setmetatable({ -- most code should use static_mod static_mod = static_mod, -- (name, version, code, files) set_debug_level = function(level) - debug_level = tonumber(_ENV.debug_settings.level) or debug_levels[_ENV.debug_settings.level] + --debug_level = tonumber(_ENV.debug_settings.level) or debug_levels[_ENV.debug_settings.level] + debug_level = tonumber(level) or debug_levels[level] end, },{ __index = mod_tools_internal, - __newindex = function(t, k, v) + __newindex = function(_, __, ___) -- do nothing, read-only table end, -- Don't let mods muck around diff --git a/lib/scenarios/Hotpatch/hotpatch/remote-interface.lua b/lib/scenarios/Hotpatch/hotpatch/remote-interface.lua index 13844c31..6fa8c434 100644 --- a/lib/scenarios/Hotpatch/hotpatch/remote-interface.lua +++ b/lib/scenarios/Hotpatch/hotpatch/remote-interface.lua @@ -65,7 +65,7 @@ remote_interface['install'] = function(mod_name, mod_version, mod_code, mod_file local caller = game.player or console if caller.admin then if mod_files then - for k,v in pairs(mod_files) do + for k,_ in pairs(mod_files) do if k == 'control' then caller.print('ERROR: control.lua loaded twice for mod ' .. mod_name) return @@ -77,14 +77,14 @@ remote_interface['install'] = function(mod_name, mod_version, mod_code, mod_file if installed_index then local old_version = installed_mods[installed_index].version if old_version then - debug_log('WARNING: mod already exists: ' .. mod_name .. ' ' .. old_version) - debug_log('WARNING: reinstalling mod in-place: ' .. mod_name .. ' ' .. mod_version) + debug_log({'hotpatch-warning.already-exists', mod_name, old_version}) + debug_log({'hotpatch-warning.reinstalling', mod_name, old_version}) end if loaded_index then unload_mod(loaded_index) end end - + install_mod(mod_name, mod_version, mod_code, mod_files) if not only_install then installed_index = find_installed_mod(mod_name) @@ -131,6 +131,8 @@ remote_interface['run'] = function(mod_name) if caller.admin then local installed_index = find_installed_mod(mod_name) local loaded_index = find_loaded_mod(mod_name) + local mod + local version if installed_index and not loaded_index then if not load_mod(installed_index) then caller.print('compilation failed for mod ' .. mod_name) @@ -139,13 +141,13 @@ remote_interface['run'] = function(mod_name) loaded_index = find_loaded_mod(mod_name) else if loaded_index then - local mod = loaded_mods[loaded_index] - local version = mod.version - debug_log('WARNING: mod already loaded: ' .. mod_name .. ' ' .. version) - debug_log('WARNING: reinitializing: ' .. mod_name .. ' ' .. version) + mod = loaded_mods[loaded_index] + version = mod.version + debug_log({'hotpatch-warning.already-loaded', mod_name, version}) + debug_log({'hotpatch-warning.reinitializing', mod_name, version}) end end - + if loaded_index then if not run_mod(loaded_index) then caller.print('execution failed for mod ' .. mod_name) @@ -164,7 +166,7 @@ remote_interface['run'] = function(mod_name) unload_mod(loaded_index) return end - end + end else caller.print('You must be an admin to run this command.') end @@ -178,7 +180,7 @@ remote_interface['update'] = function(mod_name, mod_version, mod_code, mod_files local caller = game.player or console if caller.admin then if mod_files then - for k,v in pairs(mod_files) do + for k,_ in pairs(mod_files) do if k == 'control' then caller.print('ERROR: control.lua loaded twice for mod ' .. mod_name) return @@ -186,6 +188,9 @@ remote_interface['update'] = function(mod_name, mod_version, mod_code, mod_files end end local installed_index = find_installed_mod(mod_name) + if installed_index then + ; + end local loaded_index = find_loaded_mod(mod_name) local old_version if loaded_index then @@ -245,16 +250,40 @@ remote_interface['install_mod_file'] = function(mod_name, mod_file, mod_file_cod end end +remote_interface['exec'] = function(mod_name, exec_code) + local caller = game.player or console + if caller.admin then + local loaded_index = find_loaded_mod(mod_name) + local env = loaded_mods[loaded_index].env + + local success + local code, err = load(exec_code, exec_code, 't', env) + if code then + success, err = pcall(code) + if not success then + debug_log(err) + end + else + debug_log(err) + end + else + caller.print('You must be an admin to run this command.') + end +end + --TODO: most of this function remote_interface['clean'] = function(mod_name) -- Removes ALL mod data and reinitializes -- doesn't remove things a mod may add like surfaces, etc local caller = game.player or console if caller.admin then - mod_reset(mod_name) - run_mod(mod_name) - mod_on_init(mod_name) - mod_on_configuration_changed(mod_name, {mod_changes = {mod_name={new_version=mod_version}}}) + --mod_reset(mod_name) + --run_mod(mod_name) + --mod_on_init(mod_name) + local loaded_index = find_loaded_mod(mod_name) + local mod = loaded_mods[loaded_index] + local version = mod.version + mod_on_configuration_changed(loaded_index, {mod_changes = {mod_name={new_version=version}}}) else caller.print('You must be an admin to run this command.') end @@ -274,13 +303,13 @@ remote.add_interface('hotpatch', remote_interface) debug_log({'hotpatch-info.complete', {'hotpatch-info.remote-installing'}}) -]===]) +--]===]) --[[ -remote.call('hotpatch, 'install', 'test', '1.0.0', [===[ -script.on_event(defines.events.on_player_changed_position, function(e) - game.print('changed position') +remote.call('hotpatch, 'install', 'test', '1.0.0', [===[ +script.on_event(defines.events.on_player_changed_position, function(e) + game.print('changed position') end ]===] diff --git a/lib/scenarios/Hotpatch/locale/en/hotpatch.cfg b/lib/scenarios/Hotpatch/locale/en/hotpatch.cfg index d0c51230..50c9f6f8 100644 --- a/lib/scenarios/Hotpatch/locale/en/hotpatch.cfg +++ b/lib/scenarios/Hotpatch/locale/en/hotpatch.cfg @@ -65,13 +65,17 @@ contains-comments-console=comments from console will comment out the entire code reset-events-not-running=tried to reset events for mod that isn't running! remote-interface-exists=remote interface __1__ already exists, removing... command-exists=command __1__ already exists, removing... -already-loaded=mod already loaded -reinitializing=reinitializing... -already-exists=mod already exists -reinstalling=reinstalling mod in-place +already-exists=mod already exists: __1__ __2__ +reinstalling=reinstalling mod in-place: __1__ __2__ +already-loaded=mod already loaded: __1__ __2__ +reinitializing=reinitializing: __1__ __2__ [hotpatch-error] invalid-API-access=Invalid API access: __1__ not-installed=mod not installed, cannot install file for mod that does not exist compilation-failed=compilation failed for mod execution-failed=execution failed for mod +path-not-found=path '__1__' not found +on-init-failed=on_init failed +on-load-failed=on_load failed +on-configuration-changed-failed=on_configuration_changed failed \ No newline at end of file diff --git a/master.js b/master.js index b3bec6a9..b72cb590 100644 --- a/master.js +++ b/master.js @@ -131,7 +131,7 @@ if(!config.disablePrometheusPushgateway){ setInterval(() => { registerMoreMetrics(); pushgateway.push({ jobName: 'clusterio', groupings: {instance: config.publicIP + ":" + config.masterPort, owner: config.username}}, function(err, resp, body) {}) - }, 5000) + }, 15000) } // collect express request durations ms @@ -258,7 +258,7 @@ db.items.addItem = function(object) { if(this[object.name] && Number(this[object.name]) != NaN){ this[object.name] = Number(this[object.name]) + Number(object.count); } else { - this[object.name] = object.count; + this[object.name] = Number(object.count); } return true; } @@ -283,29 +283,35 @@ process.on('SIGHUP', shutdown); // terminal closed async function shutdown() { console.log('Ctrl-C...'); let exitStartTime = Date.now(); - // set insane limit to slave length, if its longer than this we are probably being ddosed or something - if(slaves && Object.keys(slaves).length < 2000000){ - console.log("saving to slaves.json"); - fs.writeFileSync(path.resolve(config.databaseDirectory, "slaves.json"), JSON.stringify(slaves)); - } else if(slaves) { - console.log("Slave database too large, not saving ("+Object.keys(slaves).length+")"); - } - if(db.items && Object.keys(db.items).length < 50000){ - console.log("saving to items.json"); - fs.writeFileSync(path.resolve(config.databaseDirectory, "items.json"), JSON.stringify(db.items)); - } else if(slaves) { - console.log("Item database too large, not saving ("+Object.keys(slaves).length+")"); - } - for(let i in masterPlugins){ - let plugin = masterPlugins[i]; - if(plugin.main && plugin.main.onExit && typeof plugin.main.onExit == "function"){ - let startTime = Date.now(); - await plugin.main.onExit(); - console.log("Plugin "+plugin.pluginConfig.name+" exited in "+(Date.now()-startTime)+"ms"); + try { + // set insane limit to slave length, if its longer than this we are probably being ddosed or something + if(slaves && Object.keys(slaves).length < 2000000){ + console.log("saving to slaves.json"); + fs.writeFileSync(path.resolve(config.databaseDirectory, "slaves.json"), JSON.stringify(slaves)); + } else if(slaves) { + console.log("Slave database too large, not saving ("+Object.keys(slaves).length+")"); } + if(db.items && Object.keys(db.items).length < 50000){ + console.log("saving to items.json"); + fs.writeFileSync(path.resolve(config.databaseDirectory, "items.json"), JSON.stringify(db.items)); + } else if(slaves) { + console.log("Item database too large, not saving ("+Object.keys(slaves).length+")"); + } + for(let i in masterPlugins){ + let plugin = masterPlugins[i]; + if(plugin.main && plugin.main.onExit && typeof plugin.main.onExit == "function"){ + let startTime = Date.now(); + await plugin.main.onExit(); + console.log("Plugin "+plugin.pluginConfig.name+" exited in "+(Date.now()-startTime)+"ms"); + } + } + console.log("Clusterio cleanly exited in "+(Date.now()-exitStartTime)+"ms"); + process.exit(0); + } catch(e) { + console.log(e) + console.log("Clusterio failed to exit cleanly. Time elapsed: "+(Date.now()-exitStartTime)+"ms") + process.exit(1) } - console.log("Clusterio cleanly exited in "+(Date.now()-exitStartTime)+"ms"); - process.exit(0); } /** @@ -528,6 +534,13 @@ app.post("/api/place", authenticate.middleware, function(req, res) { res.send("failure"); } }); +const routes_api_remove = require("./routes/api/remove.js") +var neuralDole = null + +if(config.useNeuralNetDoleDivider)//Only initialize neural network when it's enabled, otherwise it might override gauge + neuralDole=new routes_api_remove.neuralDole({ + items: db.items, gaugePrefix: prometheusPrefix + }) /** POST endpoint to remove items from DB when client orders items. @@ -539,11 +552,8 @@ POST endpoint to remove items from DB when client orders items. @param {string} [itemStack.instanceName="unknown"] the name of an instance for identification in statistics, as provided when launching it. ex node client.js start [name] @returns {itemStack} the number of items actually removed, may be lower than what was asked for due to shortages. */ -_doleDivisionFactor = {}; //If the server regularly can't fulfill requests, this number grows until it can. Then it slowly shrinks back down. app.post("/api/remove", authenticate.middleware, function(req, res) { endpointHitCounter.labels(req.route.path).inc(); - const doleDivisionRetardation = 10; //lower rates will equal more dramatic swings - const maxDoleDivision = 250; //a higher cap will divide the store more ways, but will take longer to recover as supplies increase res.header("Access-Control-Allow-Origin", "*"); res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept"); // save items we get @@ -557,7 +567,7 @@ app.post("/api/remove", authenticate.middleware, function(req, res) { if(slaves[object.instanceID]) object.instanceName = slaves[object.instanceID].instanceName; let item = db.items[object.name] // console.dir(doc); - if(!item + if((item === undefined) ||(( config.disableImportsOfEverythingExceptElectricity === true || config.disableImportsOfEverythingExceptElectricity === "true" ) && object.name != "electricity") @@ -567,6 +577,7 @@ app.post("/api/remove", authenticate.middleware, function(req, res) { } res.send({name:object.name, count:0}); } else if(config.disableFairItemDistribution){ + // Give out as much items as possible until there are 0 left. This might lead to one slave getting all the items and the rest nothing. let numberToRemove = Math.min(Math.abs(Number(object.count)),Number(item)); db.items.removeItem({count: numberToRemove, name: object.name}); res.send({count: numberToRemove, name: object.name}); @@ -587,45 +598,27 @@ app.post("/api/remove", authenticate.middleware, function(req, res) { }); //console.log(sentItemStatistics.data) sentItemStatisticsBySlaveID[object.instanceID] = sentItemStatistics; + } else if(config.useNeuralNetDoleDivider){ + // use fancy neural net to calculate a "fair" dole division rate. + neuralDole.divider({ + res, + object, + config, + sentItemStatisticsBySlaveID, + prometheusImportGauge + }) } else { - const originalCount = Number(object.count) || 0; - object.count /= ((_doleDivisionFactor[object.name]||0)+doleDivisionRetardation)/doleDivisionRetardation; - object.count = Math.round(object.count); - if(item.length > 40) console.info(`Serving ${object.count}/${originalCount} ${object.name} from ${item} ${object.name} with dole division factor ${(_doleDivisionFactor[object.name]||0)} (real=${((_doleDivisionFactor[object.name]||0)+doleDivisionRetardation)/doleDivisionRetardation}), item is ${Number(item) > Number(object.count)?'stocked':'short'}.`); - - // Update existing items if item name already exists - if(Number(item) > Number(object.count)) { - //If successful, increase dole - _doleDivisionFactor[object.name] = Math.max((_doleDivisionFactor[object.name]||0)||1, 1) - 1; - if(config.logItemTransfers){ - console.log("removed: " + object.name + " " + object.count + " . " + item + " and sent to " + object.instanceID + " | " + object.instanceName); - } - if(db.items.removeItem({count: object.count, name: object.name})){ - let sentItemStatistics = sentItemStatisticsBySlaveID[object.instanceID]; - if(sentItemStatistics === undefined){ - sentItemStatistics = new averagedTimeSeries({ - maxEntries: config.itemStats.maxEntries, - entriesPerSecond: config.itemStats.entriesPerSecond, - mergeMode: "add", - }, console.log); - } - sentItemStatistics.add({ - key:object.name, - value:object.count, - }); - //console.log(sentItemStatistics.data) - sentItemStatisticsBySlaveID[object.instanceID] = sentItemStatistics; - } - - prometheusDoleFactorGauge.labels(object.name).set(_doleDivisionFactor[object.name] || 0); - prometheusImportGauge.labels(object.instanceID, object.name).inc(Number(object.count) || 0); - res.send({count: object.count, name: object.name}); - } else { - // if we didn't have enough, attempt giving out a smaller amount next time - _doleDivisionFactor[object.name] = Math.min(maxDoleDivision, Math.max((_doleDivisionFactor[object.name]||0)||1, 1) * 2); - res.send({name:object.name, count:0}); - //console.log('failure out of ' + object.name + " | " + object.count + " from " + object.instanceID + " ("+object.instanceName+")"); - } + // Use dole division. Makes it really slow to drain out the last little bit. + routes_api_remove.doleDivider({ + item, + object, + db, + sentItemStatisticsBySlaveID, + config, + prometheusDoleFactorGauge, + prometheusImportGauge, + req,res, + }) } }); diff --git a/package.json b/package.json index dfc5977e..ecda9e2a 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,9 @@ "docs": "documentation build index.js --config documentation.yml -f html -o docs", "livedocs": "documentation serve --watch *.js lib/** --config documentation.yml", "install": "node lib/npmPostinstall.js", - "bundle-dependencies": "bundle-dependencies" + "bundle-dependencies": "bundle-dependencies", + "snyk-protect": "snyk protect", + "prepublish": "npm run snyk-protect" }, "keywords": [ "factorio" @@ -65,7 +67,8 @@ "socket.io-client": "^2.0.4", "socket.io-prometheus": "^0.2.1", "sync-request": "^4.0.1", - "underscore": "^1.8.3" + "underscore": "^1.8.3", + "snyk": "^1.134.2" }, "devDependencies": { "documentation": "^5.4.0", diff --git a/routes/api/remove.js b/routes/api/remove.js new file mode 100644 index 00000000..18feabb1 --- /dev/null +++ b/routes/api/remove.js @@ -0,0 +1,180 @@ +const averagedTimeSeries = require("averaged-timeseries") + +const doleNN = require("./../../lib/dole_nn_base.js") + +const Prometheus = require('prom-client'); + +class neuralDole { + + getRequestStats(itemname,samples) + { + var sum=0; + samples=Math.min(samples,(this.stats[itemname] || []).length-1); + if (samples<1) return 0.1; + for (var i = 1; i <= samples; i++) { + sum+=this.stats[itemname][i].req; + } + if (sum==0) return 0.1; + return sum/samples; + } + + constructor({ + items, gaugePrefix + }){ + // Set some storage variables for the dole divider + this.prometheusNNDoleGauge = new Prometheus.Gauge({ + name: gaugePrefix+'nn_dole_gauge', + help: 'Current demand being supplied by Neural Network ; 1 means all demand covered, 0.5 means about half of each supply is covered, 0 means no items are given', + labelNames: ["itemName"], + }); + this.items = items + this.itemsLastTick = JSON.parse(JSON.stringify(items)) + this.dole = {} + this.carry = {} + this.lastRequest = {} + this.stats=[] + + setInterval(()=>{ + for(let name in this.items){ + // The items object have 2 functions tied to it - addItem and removeItem. A for loop will reveal those properties. + if(typeof this.items[name] !== "number") continue + + let count = this.items[name] + let magicData = doleNN.Tick( + count, + this.dole[name], + this.itemsLastTick[name], + this.getRequestStats(name,5) + ) + this.stats[name]=this.stats[name] || [] + this.stats[name].unshift({req:0,given:0});//stats[name][0] is the one we currently collect + if (this.stats[name].length>10) this.stats[name].pop();//remove if too many samples in stats + + this.dole[name] = magicData[0] + // DONE handle magicData[1] for graphing for our users + this.prometheusNNDoleGauge.labels(name).set(magicData[1] || 0); + } + this.itemsLastTick = JSON.parse(JSON.stringify(this.items)) + }, 1000) + } + divider({ + res, + object, + config, + sentItemStatisticsBySlaveID, + prometheusImportGauge + }){ + let magicData = doleNN.Dose( + object.count, // numReq + this.items[object.name], + this.itemsLastTick[object.name] || 0, + this.dole[object.name], + this.carry[object.name+" "+object.instanceID] || 0, + this.lastRequest[object.name+"_"+object.instanceID+"_"+object.instanceName] || 0, + this.getRequestStats(object.name,5) + ) + if ((this.stats[object.name] || []).length>0) + { + this.stats[object.name][0].req+=Number(object.count); + this.stats[object.name][0].given+=Number(magicData[0]); + } + this.lastRequest[object.name+"_"+object.instanceID+"_"+object.instanceName] = object.count + //0.Number of items to give in that dose + //1.New dole for item X + //2.New carry for item X slave Y + this.dole[object.name] = magicData[1] + this.carry[object.name+" "+object.instanceID] = magicData[2] + + // Remove item from DB and send it + if(this.items.removeItem({count: magicData[0], name: object.name})){ + if(config.logItemTransfers){ + console.log("removed: " + object.name + " " + magicData[0] + " . " + this.items[object.name] + " and sent to " + object.instanceID + " | " + object.instanceName); + } + let sentItemStatistics = sentItemStatisticsBySlaveID[object.instanceID]; + if(sentItemStatistics === undefined){ + sentItemStatistics = new averagedTimeSeries({ + maxEntries: config.itemStats.maxEntries, + entriesPerSecond: config.itemStats.entriesPerSecond, + mergeMode: "add", + }, console.log); + } + sentItemStatistics.add({ + key:object.name, + value:magicData[0], + }); + //console.log(sentItemStatistics.data) + sentItemStatisticsBySlaveID[object.instanceID] = sentItemStatistics; + prometheusImportGauge.labels(object.instanceID, object.name).inc(Number(magicData[0]) || 0); + + res.send({ + name: object.name, + count: magicData[0], + }) + } else { + res.send({ + name: object.name, + count: 0, + }) + } + } +} + +_doleDivisionFactor = {}; //If the server regularly can't fulfill requests, this number grows until it can. Then it slowly shrinks back down. +function doleDivider({ + item, + object, + db, + sentItemStatisticsBySlaveID, + config, + prometheusDoleFactorGauge, + prometheusImportGauge, + req,res, +}){ + const doleDivisionRetardation = 10; //lower rates will equal more dramatic swings + const maxDoleDivision = 250; //a higher cap will divide the store more ways, but will take longer to recover as supplies increase + + const originalCount = Number(object.count) || 0; + object.count /= ((_doleDivisionFactor[object.name]||0)+doleDivisionRetardation)/doleDivisionRetardation; + object.count = Math.round(object.count); + if(item.length > 40) console.info(`Serving ${object.count}/${originalCount} ${object.name} from ${item} ${object.name} with dole division factor ${(_doleDivisionFactor[object.name]||0)} (real=${((_doleDivisionFactor[object.name]||0)+doleDivisionRetardation)/doleDivisionRetardation}), item is ${Number(item) > Number(object.count)?'stocked':'short'}.`); + + // Update existing items if item name already exists + if(Number(item) > Number(object.count)) { + //If successful, increase dole + _doleDivisionFactor[object.name] = Math.max((_doleDivisionFactor[object.name]||0)||1, 1) - 1; + if(config.logItemTransfers){ + console.log("removed: " + object.name + " " + object.count + " . " + item + " and sent to " + object.instanceID + " | " + object.instanceName); + } + if(db.items.removeItem({count: object.count, name: object.name})){ + let sentItemStatistics = sentItemStatisticsBySlaveID[object.instanceID]; + if(sentItemStatistics === undefined){ + sentItemStatistics = new averagedTimeSeries({ + maxEntries: config.itemStats.maxEntries, + entriesPerSecond: config.itemStats.entriesPerSecond, + mergeMode: "add", + }, console.log); + } + sentItemStatistics.add({ + key:object.name, + value:object.count, + }); + //console.log(sentItemStatistics.data) + sentItemStatisticsBySlaveID[object.instanceID] = sentItemStatistics; + } + + prometheusDoleFactorGauge.labels(object.name).set(_doleDivisionFactor[object.name] || 0); + prometheusImportGauge.labels(object.instanceID, object.name).inc(Number(object.count) || 0); + res.send({count: object.count, name: object.name}); + } else { + // if we didn't have enough, attempt giving out a smaller amount next time + _doleDivisionFactor[object.name] = Math.min(maxDoleDivision, Math.max((_doleDivisionFactor[object.name]||0)||1, 1) * 2); + prometheusDoleFactorGauge.labels(object.name).set(_doleDivisionFactor[object.name] || 0); + res.send({name:object.name, count:0}); + //console.log('failure out of ' + object.name + " | " + object.count + " from " + object.instanceID + " ("+object.instanceName+")"); + } +} + +module.exports = { + doleDivider, + neuralDole +} diff --git a/sharedPlugins/scenario_loader/index.js b/sharedPlugins/scenario_loader/index.js index 99170cf0..bcce9c8d 100644 --- a/sharedPlugins/scenario_loader/index.js +++ b/sharedPlugins/scenario_loader/index.js @@ -12,14 +12,6 @@ module.exports = class remoteCommands { messageInterface("Hotpach installation status: "+hotpatchInstallStatus); if(hotpatchInstallStatus){ await this.loadScenariosFromFolder("scenarios") // located in project root folder (with sharedMods, sharedPlugins etc) - let plugins = new AsyncArray((await fs.readdir(path.join(__dirname, "../")))) - plugins.filterAsync(async plugin => { - // check if plugin is a folder and if plugin has a scenarios folder - - }) - for(let g = 0; g < plugins.length; g++){ - - } } })(); } @@ -27,7 +19,7 @@ module.exports = class remoteCommands { await fs.ensureDir(scenarioDir) let scenarios = await fs.readdir(scenarioDir); for(let i = 0; i < scenarios.length; i++){ - messageInterface(`Loading scenario ${scenarios[i]}`) + this.messageInterface(`Loading scenario ${scenarios[i]}`) let startTime = Date.now(); let scenPath = path.join(scenarioDir, scenarios[i]); let stat = await fs.stat(scenPath); @@ -68,9 +60,9 @@ module.exports = class remoteCommands { if(name != "control") fileImportString += `["${name}"] = '${files[k]}', `; } fileImportString += `\}`; - if(files.control) var returnValue = await messageInterface(`/silent-command remote.call('hotpatch', 'update', '${scenarios[i]}', '1.0.0', '${files.control}', ${fileImportString})`); - if(returnValue) messageInterface(returnValue); - messageInterface(`Loaded scenario ${scenarios[i]} in ${Math.floor(Date.now()-startTime)}ms`); + if(files.control) var returnValue = await this.messageInterface(`/silent-command remote.call('hotpatch', 'update', '${scenarios[i]}', '1.0.0', '${files.control}', ${fileImportString})`); + if(returnValue) this.messageInterface(returnValue); + this.messageInterface(`Loaded scenario ${scenarios[i]} in ${Math.floor(Date.now()-startTime)}ms`); } } } @@ -108,8 +100,10 @@ function readDirectorySynchronously(directory) { } class AsyncArray extends Array { constructor(arr) { - // this.data = arr; // In place of Array subclassing + super(arr) + this.data = arr; // In place of Array subclassing } +} filterAsync(predicate) { // Take a copy of the array, it might mutate by the time we've finished