From 3f29a722bbf2f649431a0374587d72865b404fc4 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Mon, 25 Feb 2019 06:48:23 +0000 Subject: [PATCH 01/16] fix: .snyk & package.json to reduce vulnerabilities The following vulnerabilities are fixed with a Snyk patch: - https://snyk.io/vuln/npm:hawk:20160119 - https://snyk.io/vuln/npm:http-signature:20150122 - https://snyk.io/vuln/npm:mime:20170907 - https://snyk.io/vuln/npm:minimatch:20160620 - https://snyk.io/vuln/npm:request:20160119 - https://snyk.io/vuln/npm:tunnel-agent:20170305 - https://snyk.io/vuln/npm:uglify-js:20151024 --- .snyk | 39 ++++++++++++++++++++++++++++++++++++++- package.json | 7 +++++-- 2 files changed, 43 insertions(+), 3 deletions(-) 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/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", From c15709ddc1945d7a87fc0bc6219ab17e4bfe9c7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Vest=C3=B8l?= Date: Wed, 27 Feb 2019 11:05:39 +0100 Subject: [PATCH 02/16] 0.17 update: Fixed hotpatch and scenario_loader --- lib/manager/instanceManager.js | 2 + lib/scenarios/Hotpatch/hotpatch/mod-tools.lua | 1 - sharedPlugins/scenario_loader/index.js | 82 ++++++++++++------- 3 files changed, 55 insertions(+), 30 deletions(-) create mode 100644 lib/manager/instanceManager.js 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/hotpatch/mod-tools.lua b/lib/scenarios/Hotpatch/hotpatch/mod-tools.lua index 860e3b59..89371cd6 100644 --- a/lib/scenarios/Hotpatch/hotpatch/mod-tools.lua +++ b/lib/scenarios/Hotpatch/hotpatch/mod-tools.lua @@ -382,7 +382,6 @@ debug_log({'hotpatch-info.loading-libs'}) local libraries = { 'camera', 'flying_tags', - 'inspect', 'math3d', 'mod-gui', 'noise', diff --git a/sharedPlugins/scenario_loader/index.js b/sharedPlugins/scenario_loader/index.js index 2f4e8223..5889ee4b 100644 --- a/sharedPlugins/scenario_loader/index.js +++ b/sharedPlugins/scenario_loader/index.js @@ -11,35 +11,36 @@ module.exports = class remoteCommands { let hotpatchInstallStatus = await this.checkHotpatchInstallation(); messageInterface("Hotpach installation status: "+hotpatchInstallStatus); if(hotpatchInstallStatus){ - let scenarioDir = "scenarios"; - await fs.ensureDir(scenarioDir) - let scenarios = await fs.readdir(scenarioDir); - for(let i = 0; i < scenarios.length; i++){ - messageInterface(`Loading scenario ${scenarios[i]}`) - let startTime = Date.now(); - let scenPath = path.join(scenarioDir, scenarios[i]); - let stat = await fs.stat(scenPath); - if(stat.isDirectory){ - async function loadFiles(dir, rootdir){ - let returnFiles = []; - let entries = await fs.readdir(path.join(rootdir, dir)); - for(let o = 0; o < entries.length; o++){ - let stat = await fs.stat(path.join(rootdir, dir, entries[o])); - if(stat.isDirectory()){ - // recurse - let subFolder = await loadFiles(path.join(dir, entries[o]), rootdir); - returnFiles = returnFiles.concat(subFolder); - } else if(entries[o].split(".")[entries[o].split(".").length-1].toLowerCase() == "lua"){ - // if it is a Lua file, read its contents - // let data = await fs.readFile(path.join(rootdir, dir, entries[o])); - let data = await clusterTools.getLua(path.join(rootdir, dir, entries[o]), false); - returnFiles.push({ - name: path.join(dir, entries[o].split(".")[0]), - data, - }); - } - } - return returnFiles; + await this.loadScenariosFromFolder("scenarios") // located in project root folder (with sharedMods, sharedPlugins etc) + } + })(); + } + async loadScenariosFromFolder(scenarioDir){ + await fs.ensureDir(scenarioDir) + let scenarios = await fs.readdir(scenarioDir); + for(let i = 0; i < scenarios.length; i++){ + this.messageInterface(`Loading scenario ${scenarios[i]}`) + let startTime = Date.now(); + let scenPath = path.join(scenarioDir, scenarios[i]); + let stat = await fs.stat(scenPath); + if(stat.isDirectory){ + async function loadFiles(dir, rootdir){ + let returnFiles = []; + let entries = await fs.readdir(path.join(rootdir, dir)); + for(let o = 0; o < entries.length; o++){ + let stat = await fs.stat(path.join(rootdir, dir, entries[o])); + if(stat.isDirectory()){ + // recurse + let subFolder = await loadFiles(path.join(dir, entries[o]), rootdir); + returnFiles = returnFiles.concat(subFolder); + } else if(entries[o].split(".")[entries[o].split(".").length-1].toLowerCase() == "lua"){ + // if it is a Lua file, read its contents + // let data = await fs.readFile(path.join(rootdir, dir, entries[o])); + let data = await clusterTools.getLua(path.join(rootdir, dir, entries[o]), false); + returnFiles.push({ + name: path.join(dir, entries[o].split(".")[0]), + data, + }); } let fileMap = await loadFiles("", scenPath); let files = {}; @@ -61,6 +62,24 @@ module.exports = class remoteCommands { messageInterface(`Loaded scenario ${scenarios[i]} in ${Math.floor(Date.now()-startTime)}ms`); } } + let fileMap = await loadFiles("", scenPath); + let files = {}; + fileMap.forEach(map => { + files[map.name] = map.data; + console.log(map.name); + }); + + let fileImportString = `\{`; + for(let k in files){ + let name = k.replace(/\\/g, '/'); + name = name.replace(/ /g, ''); + // make sure *not* to include control.lua as it is provided as a seperate argument + if(name != "control") fileImportString += `["${name}"] = '${files[k]}', `; + } + fileImportString += `\}`; + 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`); } })(); } @@ -96,3 +115,8 @@ function readDirectorySynchronously(directory) { } }); } +class AsyncArray extends Array { + constructor(arr) { + super(arr) + this.data = arr; // In place of Array subclassing + } From d189a8249490f5ddb39d77379ef382f52fa0a127 Mon Sep 17 00:00:00 2001 From: "Christian Walde (Mithaldu)" Date: Thu, 7 Mar 2019 05:03:45 +0100 Subject: [PATCH 03/16] independant -> independent --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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. From a2be560b8b826e8d9b6cf68c9317846fa84a26e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Vest=C3=B8l?= Date: Wed, 13 Mar 2019 20:13:03 +0100 Subject: [PATCH 04/16] Updated hotpatch --- lib/scenarios/Hotpatch/control.lua | 2 +- lib/scenarios/Hotpatch/hotpatch/commands.lua | 10 +- lib/scenarios/Hotpatch/hotpatch/gui.lua | 134 ++++++----- lib/scenarios/Hotpatch/hotpatch/mod-tools.lua | 225 +++++++++--------- .../Hotpatch/hotpatch/remote-interface.lua | 67 ++++-- lib/scenarios/Hotpatch/locale/en/hotpatch.cfg | 12 +- 6 files changed, 244 insertions(+), 206 deletions(-) diff --git a/lib/scenarios/Hotpatch/control.lua b/lib/scenarios/Hotpatch/control.lua index b5b66946..e4cdb947 100644 --- a/lib/scenarios/Hotpatch/control.lua +++ b/lib/scenarios/Hotpatch/control.lua @@ -98,7 +98,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 89371cd6..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, @@ -428,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 @@ -446,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('/', '.') @@ -474,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 @@ -482,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) @@ -500,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, @@ -515,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 = {} @@ -540,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 @@ -550,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 @@ -567,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 @@ -577,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 @@ -603,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 @@ -620,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 @@ -649,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 }) } @@ -665,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('/', '.') @@ -709,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) @@ -723,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 @@ -761,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) @@ -815,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 @@ -841,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) @@ -850,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 @@ -874,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) @@ -892,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 @@ -923,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 @@ -939,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 @@ -953,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 @@ -961,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) @@ -980,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 @@ -993,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 @@ -1012,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 @@ -1032,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 @@ -1057,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) @@ -1077,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) @@ -1125,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 @@ -1136,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) @@ -1152,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 = {} @@ -1173,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 @@ -1197,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 @@ -1211,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 @@ -1230,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 @@ -1243,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 @@ -1285,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 @@ -1321,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 From 56cf131c7077d78bc51e54bc6d18c3978b0185ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Vest=C3=B8l?= Date: Fri, 22 Mar 2019 19:29:56 +0100 Subject: [PATCH 05/16] Moved most of /api/remove to its own file --- config.json.dist | 2 + lib/dole_nn_base.js | 139 +++++++++++++++++++++++++++++++++++++++++++ master.js | 54 ++++------------- routes/api/remove.js | 63 ++++++++++++++++++++ 4 files changed, 217 insertions(+), 41 deletions(-) create mode 100644 lib/dole_nn_base.js create mode 100644 routes/api/remove.js diff --git a/config.json.dist b/config.json.dist index 3ca02906..d7f6a6b3 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": true, "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..faf19070 --- /dev/null +++ b/lib/dole_nn_base.js @@ -0,0 +1,139 @@ +//Sigmoids... + +function sigmoid0(x) +{ + return x/(1+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 + +//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) +{ + var inputs=[numreq,instore,store_last_tick,dole,carry,prev_req]; + var internal=[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]; + var outputs=[0,0]; + //NN: Please don't touch :), code is generated + +internal[1]=internal[8]*-1.643964648; +internal[1]=internal[1]+internal[3]*1.475263; +internal[1]=internal[1]+internal[10]*1.137161493; +internal[1]=internal[1]+1.0*0.581692636; +internal[1]=internal[1]+inputs[3]*-0.7429554462; +internal[1]=internal[1]+inputs[1]*-4.860008717; +internal[1]=internal[1]+inputs[0]*0.8682486415; +internal[1]=internal[1]+inputs[5]*-2.332767725; +internal[1]=sigmoid0(internal[1]); +internal[2]=internal[1]*0.8746165037; +internal[2]=sigmoid0(internal[2]); +internal[3]=inputs[0]*-5.502003193; +internal[3]=internal[3]+inputs[4]*0.2463098913; +internal[3]=internal[3]+inputs[5]*2.313313961; +internal[3]=internal[3]+1.0*-0.3230940998; +internal[3]=internal[3]+inputs[3]*-0.7781001329; +internal[3]=internal[3]+inputs[2]*7.295908451; +internal[3]=sigmoid0(internal[3]); +internal[6]=internal[1]*1.406680346; +internal[6]=internal[6]+inputs[3]*0.5068955421; +internal[6]=internal[6]+inputs[1]*-0.4729067087; +internal[6]=internal[6]+inputs[2]*0.8344552517; +internal[6]=internal[6]+inputs[0]*2.739265203; +internal[6]=sigmoid0(internal[6]); +internal[7]=inputs[0]*-0.9354650974; +internal[7]=internal[7]+inputs[5]*1.853131294; +internal[7]=internal[7]+inputs[2]*-0.5912416577; +internal[7]=internal[7]+inputs[1]*1.000927806; +internal[7]=sigmoid0(internal[7]); +internal[8]=1.0*-2.179960728; +internal[8]=internal[8]+inputs[1]*1.66548419; +internal[8]=internal[8]+inputs[0]*1.550180197; +internal[8]=sigmoid0(internal[8]); +internal[10]=inputs[2]*1.491255403; +internal[10]=internal[10]+1.0*1.035691857; +internal[10]=sigmoid0(internal[10]); +outputs[0]=inputs[2]*0.5093510151; +outputs[0]=outputs[0]+inputs[4]*0.9384511113; +outputs[0]=outputs[0]+outputs[1]*-3.595440626; +outputs[0]=sigmoid1(outputs[0]); +outputs[1]=inputs[2]*1.534054637; +outputs[1]=outputs[1]+internal[2]*-2.732098818; +outputs[1]=outputs[1]+outputs[2]*1.163635135; +outputs[1]=outputs[1]+internal[1]*-0.2005333602; +outputs[1]=outputs[1]+internal[6]*0.6757783294; +outputs[1]=sigmoid0(outputs[1]); +outputs[2]=1.0*-0.9311643243; +outputs[2]=outputs[2]+inputs[1]*-1.85346806; +outputs[2]=outputs[2]+inputs[2]*-1.232177019; +outputs[2]=outputs[2]+inputs[0]*1.937278271; +outputs[2]=outputs[2]+internal[7]*-0.728112638; +outputs[2]=sigmoid0(outputs[2]); + + if (outputs[0]<0) outputs[0]=0; + outputs[0]=outputs[0]*numreq; + var res1=trunc(outputs[0]); + if (res1>numreq) res1=numreq; + if (res1>instore) res1=instore; + if (res1<0) res1=0; + carry=outputs[2]+outputs[0]-res1; + return [res1,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) + +//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) +{ + var inputs=[instore,dole,store_last_tick]; + var internal=[0,0,0,0,0]; + var outputs=[0,0]; + //NN: Please don't touch :), code is generated + +outputs[0]=1.0*0.5381062031; +outputs[0]=sigmoid1(outputs[0]); +outputs[1]=1.0*-0.5653554201; +outputs[1]=outputs[1]+inputs[0]*0.65881145; +outputs[1]=outputs[1]+inputs[1]*0.6852278709; +outputs[1]=sigmoid0(outputs[1]); + + + avg=outputs[1]; + if (avg>1) avg=1; + if (avg<0) avg=0; + return [outputs[0],avg]; +} + +module.exports = {Dose,Tick} \ No newline at end of file diff --git a/master.js b/master.js index ea764a90..14a76436 100644 --- a/master.js +++ b/master.js @@ -539,11 +539,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 @@ -587,45 +584,20 @@ app.post("/api/remove", authenticate.middleware, function(req, res) { }); //console.log(sentItemStatistics.data) sentItemStatisticsBySlaveID[object.instanceID] = sentItemStatistics; - } 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'}.`); + } else if(config.useNeuralNetDoleDivider){ - // 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+")"); - } + } else { + // Use dole division + require("./routes/api/remove.js").doleDivider({ + item, + object, + db, + sentItemStatisticsBySlaveID, + config, + prometheusDoleFactorGauge, + prometheusImportGauge, + req,res, + }) } }); diff --git a/routes/api/remove.js b/routes/api/remove.js new file mode 100644 index 00000000..ed7000c6 --- /dev/null +++ b/routes/api/remove.js @@ -0,0 +1,63 @@ +const averagedTimeSeries = require("averaged-timeseries") + +const doleNN = require("./../../lib/dole_nn_base.js") + +module.exports = { + doleDivider +} + +_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+")"); + } +} \ No newline at end of file From 94d434c8ef0f5f965060bfb60ca733199b3c39cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Vest=C3=B8l?= Date: Sat, 23 Mar 2019 00:14:23 +0100 Subject: [PATCH 06/16] Initial release of neural net based dole divider --- lib/dole_nn_base.js | 4 +- master.js | 66 ++++++++++++++++++++------------ routes/api/remove.js | 89 ++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 130 insertions(+), 29 deletions(-) diff --git a/lib/dole_nn_base.js b/lib/dole_nn_base.js index faf19070..ace6650c 100644 --- a/lib/dole_nn_base.js +++ b/lib/dole_nn_base.js @@ -2,7 +2,7 @@ function sigmoid0(x) { - return x/(1+abs(x)); + return x/(1+Math.abs(x)); } function sigmoid1(x) { @@ -99,7 +99,7 @@ outputs[2]=sigmoid0(outputs[2]); if (outputs[0]<0) outputs[0]=0; outputs[0]=outputs[0]*numreq; - var res1=trunc(outputs[0]); + var res1=Math.trunc(outputs[0]); if (res1>numreq) res1=numreq; if (res1>instore) res1=instore; if (res1<0) res1=0; diff --git a/master.js b/master.js index 14a76436..c99a00bc 100644 --- a/master.js +++ b/master.js @@ -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,10 @@ app.post("/api/place", authenticate.middleware, function(req, res) { res.send("failure"); } }); +const routes_api_remove = require("./routes/api/remove.js") +const neuralDole = new routes_api_remove.neuralDole({ + items: db.items, +}) /** POST endpoint to remove items from DB when client orders items. @@ -564,6 +574,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}); @@ -585,10 +596,17 @@ 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 { - // Use dole division - require("./routes/api/remove.js").doleDivider({ + // Use dole division. Makes it really slow to drain out the last little bit. + routes_api_remove.doleDivider({ item, object, db, diff --git a/routes/api/remove.js b/routes/api/remove.js index ed7000c6..23476749 100644 --- a/routes/api/remove.js +++ b/routes/api/remove.js @@ -2,12 +2,90 @@ const averagedTimeSeries = require("averaged-timeseries") const doleNN = require("./../../lib/dole_nn_base.js") -module.exports = { - doleDivider +class neuralDole { + constructor({ + items, + }){ + // Set some storage variables for the dole divider + this.items = items + this.itemsLastTick = JSON.parse(JSON.stringify(items)) + this.dole = {} + this.carry = {} + this.lastRequest = {} + + 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.dole[name] = magicData[0] + // TODO handle magicData[1] for graphing for our users + } + 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] || 0, + this.lastRequest[object.name+"_"+object.instanceID+"_"+object.instanceName] || 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] = 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, @@ -60,4 +138,9 @@ function doleDivider({ 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 } \ No newline at end of file From 8357fa23ce0444dbbacafea03402c3d4bdbe4722 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Vest=C3=B8l?= Date: Sun, 24 Mar 2019 20:14:47 +0100 Subject: [PATCH 07/16] Fixed bug in scenarioLoader --- sharedPlugins/scenario_loader/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sharedPlugins/scenario_loader/index.js b/sharedPlugins/scenario_loader/index.js index 5889ee4b..79503b88 100644 --- a/sharedPlugins/scenario_loader/index.js +++ b/sharedPlugins/scenario_loader/index.js @@ -81,7 +81,7 @@ module.exports = class remoteCommands { if(returnValue) this.messageInterface(returnValue); this.messageInterface(`Loaded scenario ${scenarios[i]} in ${Math.floor(Date.now()-startTime)}ms`); } - })(); + } } async checkHotpatchInstallation(){ let yn = await this.messageInterface("/silent-command if remote.interfaces['hotpatch'] then rcon.print('true') else rcon.print('false') end"); From 2ef6c93b05402e57c8320eebcbf6bda8c70caafa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Vest=C3=B8l?= Date: Sun, 24 Mar 2019 20:18:03 +0100 Subject: [PATCH 08/16] Use old doledivision as default, new NN based dole is optional --- .vs/ProjectSettings.json | 3 + .vs/VSWorkspaceState.json | 8 + .vs/config/applicationhost.config | 1025 +++++++++++++++++++++++++ .vs/slnx.sqlite | Bin 0 -> 233472 bytes bin/Microsoft.NodejsTools.WebRole.dll | Bin 0 -> 32816 bytes 5 files changed, 1036 insertions(+) create mode 100644 .vs/ProjectSettings.json create mode 100644 .vs/VSWorkspaceState.json create mode 100644 .vs/config/applicationhost.config create mode 100644 .vs/slnx.sqlite create mode 100644 bin/Microsoft.NodejsTools.WebRole.dll 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 0000000000000000000000000000000000000000..a2f63943b570c77e67ef025558926445985bb65a GIT binary patch literal 233472 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�o>XOR4&cAiTkiJTUX%ZX~ALGq8a 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
uq1v);rJZ^VQ)d-a`a9sg{Nl(LW+a|HP=2?OUk# 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�m-F{@`;iQ)C-z=4GdNygdy37?y$OMRh?LNtxvM( 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 Gq5lGp?M5B| literal 0 HcmV?d00001 diff --git a/bin/Microsoft.NodejsTools.WebRole.dll b/bin/Microsoft.NodejsTools.WebRole.dll new file mode 100644 index 0000000000000000000000000000000000000000..879bdfc44fb7664780d2e635b7262a442b93d36c GIT binary patch literal 32816 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 LcWZ6>5P|*=apMW+ literal 0 HcmV?d00001 From 00dfae8bd19c939dc11d6d89fd6ad63a0f3c9717 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Vest=C3=B8l?= Date: Sun, 24 Mar 2019 20:34:34 +0100 Subject: [PATCH 09/16] Fixed another bug in scenarioLoader --- .gitignore | 1 + config.json.dist | 2 +- sharedPlugins/scenario_loader/index.js | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 7af470c1..d12f04bb 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/config.json.dist b/config.json.dist index d7f6a6b3..1c598664 100644 --- a/config.json.dist +++ b/config.json.dist @@ -49,7 +49,7 @@ "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": true, + "useNeuralNetDoleDivider": false, "uploadModsToMaster": true, "msBetweenCommands": 10, "allowRemoteCommandExecution": true, diff --git a/sharedPlugins/scenario_loader/index.js b/sharedPlugins/scenario_loader/index.js index 79503b88..dfeb627b 100644 --- a/sharedPlugins/scenario_loader/index.js +++ b/sharedPlugins/scenario_loader/index.js @@ -120,3 +120,4 @@ class AsyncArray extends Array { super(arr) this.data = arr; // In place of Array subclassing } +} From abf4b5d926b7f4d4a004cb4d5e049761596ca92d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Vest=C3=B8l?= Date: Sun, 31 Mar 2019 17:56:34 +0200 Subject: [PATCH 10/16] Updated freeplay script to 0.17 version --- lib/scenarios/Hotpatch/control.lua | 104 ++++++++++++++++++++--------- master.js | 2 +- 2 files changed, 75 insertions(+), 31 deletions(-) diff --git a/lib/scenarios/Hotpatch/control.lua b/lib/scenarios/Hotpatch/control.lua index e4cdb947..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 diff --git a/master.js b/master.js index c99a00bc..3c8a5ac3 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 From fddafaec09a19beb5643a2245cd4f78eae3929f3 Mon Sep 17 00:00:00 2001 From: axapaxa123 <49201376+axapaxa123@users.noreply.github.com> Date: Wed, 3 Apr 2019 14:39:29 +0200 Subject: [PATCH 11/16] Update remove.js --- routes/api/remove.js | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/routes/api/remove.js b/routes/api/remove.js index 23476749..83f334b2 100644 --- a/routes/api/remove.js +++ b/routes/api/remove.js @@ -4,14 +4,17 @@ const doleNN = require("./../../lib/dole_nn_base.js") class neuralDole { constructor({ - items, + items, gauge }){ // Set some storage variables for the dole divider + this.prometheusDoleFactorGauge = gauge this.items = items this.itemsLastTick = JSON.parse(JSON.stringify(items)) this.dole = {} this.carry = {} this.lastRequest = {} + this.doleinfo_last = {} + this.doleinfo_new = {} setInterval(()=>{ for(let name in this.items){ @@ -22,10 +25,15 @@ class neuralDole { let magicData = doleNN.Tick( count, this.dole[name], - this.itemsLastTick[name] + this.itemsLastTick[name], + this.doleinfo_last[name] || {numreq:0 , numslave:0}, + this.doleinfo_new[name] || {numreq:0 , numslave:0} ) this.dole[name] = magicData[0] - // TODO handle magicData[1] for graphing for our users + // DONE handle magicData[1] for graphing for our users + this.prometheusDoleFactorGauge.labels(name).set(magicData[1] || 0); + this.doleinfo_last[name]=this.doleinfo_new[name] + this.doleinfo_new[name]={numreq:0 , numslave:0} } this.itemsLastTick = JSON.parse(JSON.stringify(this.items)) }, 1000) @@ -42,15 +50,20 @@ class neuralDole { this.items[object.name], this.itemsLastTick[object.name] || 0, this.dole[object.name], - this.carry[object.name] || 0, - this.lastRequest[object.name+"_"+object.instanceID+"_"+object.instanceName] || 0 + this.carry[object.name+" "+object.instanceID] || 0, + this.lastRequest[object.name+"_"+object.instanceID+"_"+object.instanceName] || 0, + this.doleinfo_last[object.name] || {numreq:0 , numslave: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] = magicData[2] + this.carry[object.name+" "+object.instanceID] = magicData[2] + + this.doleinfo_new[object.name].numreq=magicData[0] + (this.doleinfo_new[object.name].numreq || 0) + this.doleinfo_new[object.name].numslave=1 + (this.doleinfo_new[object.name].numslave || 0) + // Remove item from DB and send it if(this.items.removeItem({count: magicData[0], name: object.name})){ if(config.logItemTransfers){ @@ -96,7 +109,7 @@ function doleDivider({ prometheusImportGauge, req,res, }){ - const doleDivisionRetardation = 10; //lower rates will equal more dramatic swings + 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; @@ -143,4 +156,4 @@ function doleDivider({ module.exports = { doleDivider, neuralDole -} \ No newline at end of file +} From 7d2ac5808fccfb11c649bd5204bf8728a87efb68 Mon Sep 17 00:00:00 2001 From: axapaxa123 <49201376+axapaxa123@users.noreply.github.com> Date: Wed, 3 Apr 2019 14:40:11 +0200 Subject: [PATCH 12/16] Update dole_nn_base.js --- lib/dole_nn_base.js | 107 +++++++++++++++++++------------------------- 1 file changed, 45 insertions(+), 62 deletions(-) diff --git a/lib/dole_nn_base.js b/lib/dole_nn_base.js index ace6650c..0aeaf97c 100644 --- a/lib/dole_nn_base.js +++ b/lib/dole_nn_base.js @@ -32,69 +32,43 @@ function sigmoid3(x) //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) +function Dose(numreq,instore,store_last_tick,dole,carry,prev_req,doleinfo_last) { - var inputs=[numreq,instore,store_last_tick,dole,carry,prev_req]; + var instore_adj=instore; + if (instore_adj==0) instore_adj=0.1; + var numreq_total_adj=doleinfo_last.numreq; + if (numreq_total_adj==0) numreq_total_adj=0.1; + + var a=(doleinfo_last.numslave)*numreq; + if (a>0) {a=(doleinfo_last.numreq)/a;} else {a=1000;} + var b=Math.trunc(prev_req/instore_adj*numreq); + var inputs=[numreq,instore_adj,store_last_tick/numreq,dole,carry,prev_req/numreq,doleinfo_last.numslave,numreq/numreq_total_adj,a,store_last_tick/numreq_total_adj,prev_req/instore,b]; var internal=[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]; - var outputs=[0,0]; + var outputs=[0,0,0]; //NN: Please don't touch :), code is generated -internal[1]=internal[8]*-1.643964648; -internal[1]=internal[1]+internal[3]*1.475263; -internal[1]=internal[1]+internal[10]*1.137161493; -internal[1]=internal[1]+1.0*0.581692636; -internal[1]=internal[1]+inputs[3]*-0.7429554462; -internal[1]=internal[1]+inputs[1]*-4.860008717; -internal[1]=internal[1]+inputs[0]*0.8682486415; -internal[1]=internal[1]+inputs[5]*-2.332767725; -internal[1]=sigmoid0(internal[1]); -internal[2]=internal[1]*0.8746165037; -internal[2]=sigmoid0(internal[2]); -internal[3]=inputs[0]*-5.502003193; -internal[3]=internal[3]+inputs[4]*0.2463098913; -internal[3]=internal[3]+inputs[5]*2.313313961; -internal[3]=internal[3]+1.0*-0.3230940998; -internal[3]=internal[3]+inputs[3]*-0.7781001329; -internal[3]=internal[3]+inputs[2]*7.295908451; -internal[3]=sigmoid0(internal[3]); -internal[6]=internal[1]*1.406680346; -internal[6]=internal[6]+inputs[3]*0.5068955421; -internal[6]=internal[6]+inputs[1]*-0.4729067087; -internal[6]=internal[6]+inputs[2]*0.8344552517; -internal[6]=internal[6]+inputs[0]*2.739265203; -internal[6]=sigmoid0(internal[6]); -internal[7]=inputs[0]*-0.9354650974; -internal[7]=internal[7]+inputs[5]*1.853131294; -internal[7]=internal[7]+inputs[2]*-0.5912416577; -internal[7]=internal[7]+inputs[1]*1.000927806; -internal[7]=sigmoid0(internal[7]); -internal[8]=1.0*-2.179960728; -internal[8]=internal[8]+inputs[1]*1.66548419; -internal[8]=internal[8]+inputs[0]*1.550180197; -internal[8]=sigmoid0(internal[8]); -internal[10]=inputs[2]*1.491255403; -internal[10]=internal[10]+1.0*1.035691857; -internal[10]=sigmoid0(internal[10]); -outputs[0]=inputs[2]*0.5093510151; -outputs[0]=outputs[0]+inputs[4]*0.9384511113; -outputs[0]=outputs[0]+outputs[1]*-3.595440626; -outputs[0]=sigmoid1(outputs[0]); -outputs[1]=inputs[2]*1.534054637; -outputs[1]=outputs[1]+internal[2]*-2.732098818; -outputs[1]=outputs[1]+outputs[2]*1.163635135; -outputs[1]=outputs[1]+internal[1]*-0.2005333602; -outputs[1]=outputs[1]+internal[6]*0.6757783294; +internal[11]=inputs[1]*2.584747791; +internal[11]=internal[11]+inputs[4]*0.9939581156; +internal[11]=internal[11]+inputs[5]*-0.5315227509; +internal[11]=internal[11]+inputs[3]*0.2037106603; +internal[11]=internal[11]+inputs[2]*1.38696003; +internal[11]=internal[11]+inputs[6]*-0.5434055328; +internal[11]=internal[11]+inputs[8]*-0.4344435036; +internal[11]=internal[11]+1.0*-1.461762667; +internal[11]=sigmoid0(internal[11]); +outputs[0]=inputs[0]*0.4289886355; +outputs[0]=outputs[0]+internal[11]*1.96782124; +outputs[0]=outputs[0]+inputs[3]*-2.196558237; +outputs[0]=sigmoid3(outputs[0]); +outputs[1]=outputs[0]*3.200549364; +outputs[1]=outputs[1]+inputs[7]*-0.3701510429; outputs[1]=sigmoid0(outputs[1]); -outputs[2]=1.0*-0.9311643243; -outputs[2]=outputs[2]+inputs[1]*-1.85346806; -outputs[2]=outputs[2]+inputs[2]*-1.232177019; -outputs[2]=outputs[2]+inputs[0]*1.937278271; -outputs[2]=outputs[2]+internal[7]*-0.728112638; outputs[2]=sigmoid0(outputs[2]); if (outputs[0]<0) outputs[0]=0; @@ -103,7 +77,7 @@ outputs[2]=sigmoid0(outputs[2]); if (res1>numreq) res1=numreq; if (res1>instore) res1=instore; if (res1<0) res1=0; - carry=outputs[2]+outputs[0]-res1; + carry=outputs[2]; return [res1,outputs[1],carry]; } @@ -111,29 +85,38 @@ outputs[2]=sigmoid0(outputs[2]); //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) +function Tick(instore,dole,store_last_tick,doleinfo_last,doleinfo_new) { - var inputs=[instore,dole,store_last_tick]; + var instore_adj=instore; + if (instore_adj==0) instore_adj=0.1; + var numreq_total_adj=doleinfo_last.numreq; + if (numreq_total_adj==0) numreq_total_adj=0.1; + var a=doleinfo_new.numreq; + if (a>0) {a=doleinfo_last.numreq/doleinfo_new.numreq;} else {a=1000;} + var aa=doleinfo_last.numslave*instore; + if (aa>0) {doleinfo_last.numreq/aa;} else {aa=1000;} + var inputs=[instore,dole,store_last_tick/instore_adj,a,doleinfo_last.numslave,doleinfo_new.numslave,aa,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 -outputs[0]=1.0*0.5381062031; -outputs[0]=sigmoid1(outputs[0]); -outputs[1]=1.0*-0.5653554201; -outputs[1]=outputs[1]+inputs[0]*0.65881145; -outputs[1]=outputs[1]+inputs[1]*0.6852278709; +outputs[0]=sigmoid0(outputs[0]); +outputs[1]=inputs[7]*4.376355648; outputs[1]=sigmoid0(outputs[1]); avg=outputs[1]; if (avg>1) avg=1; if (avg<0) avg=0; + return [outputs[0],avg]; } -module.exports = {Dose,Tick} \ No newline at end of file +module.exports = {Dose,Tick} From 595b4e5ac905cb0ba2fec859b25439ea60286d50 Mon Sep 17 00:00:00 2001 From: axapaxa123 <49201376+axapaxa123@users.noreply.github.com> Date: Wed, 3 Apr 2019 14:40:42 +0200 Subject: [PATCH 13/16] Update master.js --- master.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/master.js b/master.js index 3c8a5ac3..f2029ba8 100644 --- a/master.js +++ b/master.js @@ -536,7 +536,7 @@ app.post("/api/place", authenticate.middleware, function(req, res) { }); const routes_api_remove = require("./routes/api/remove.js") const neuralDole = new routes_api_remove.neuralDole({ - items: db.items, + items: db.items, gauge: prometheusDoleFactorGauge }) /** POST endpoint to remove items from DB when client orders items. From 0fe5633926fdb8a6efc6c4ca81ee0437ef503125 Mon Sep 17 00:00:00 2001 From: axapaxa123 <49201376+axapaxa123@users.noreply.github.com> Date: Wed, 10 Apr 2019 01:11:32 +0200 Subject: [PATCH 14/16] Moved gauge creation, 0 items don't fail requests --- master.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/master.js b/master.js index f2029ba8..276af857 100644 --- a/master.js +++ b/master.js @@ -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; } @@ -535,9 +535,12 @@ app.post("/api/place", authenticate.middleware, function(req, res) { } }); const routes_api_remove = require("./routes/api/remove.js") -const neuralDole = new routes_api_remove.neuralDole({ - items: db.items, gauge: prometheusDoleFactorGauge -}) +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. @@ -564,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") From 86d4f3dba47fda9a4a6ad27f79e5ec50e68a67eb Mon Sep 17 00:00:00 2001 From: axapaxa123 <49201376+axapaxa123@users.noreply.github.com> Date: Wed, 10 Apr 2019 01:13:06 +0200 Subject: [PATCH 15/16] Longer accounting period, moved creation of gauge --- routes/api/remove.js | 47 ++++++++++++++++++++++++++++++++------------ 1 file changed, 34 insertions(+), 13 deletions(-) diff --git a/routes/api/remove.js b/routes/api/remove.js index 83f334b2..18feabb1 100644 --- a/routes/api/remove.js +++ b/routes/api/remove.js @@ -2,19 +2,37 @@ 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, gauge + items, gaugePrefix }){ // Set some storage variables for the dole divider - this.prometheusDoleFactorGauge = gauge + 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.doleinfo_last = {} - this.doleinfo_new = {} + this.stats=[] setInterval(()=>{ for(let name in this.items){ @@ -26,14 +44,15 @@ class neuralDole { count, this.dole[name], this.itemsLastTick[name], - this.doleinfo_last[name] || {numreq:0 , numslave:0}, - this.doleinfo_new[name] || {numreq:0 , numslave:0} + 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.prometheusDoleFactorGauge.labels(name).set(magicData[1] || 0); - this.doleinfo_last[name]=this.doleinfo_new[name] - this.doleinfo_new[name]={numreq:0 , numslave:0} + this.prometheusNNDoleGauge.labels(name).set(magicData[1] || 0); } this.itemsLastTick = JSON.parse(JSON.stringify(this.items)) }, 1000) @@ -52,8 +71,13 @@ class neuralDole { this.dole[object.name], this.carry[object.name+" "+object.instanceID] || 0, this.lastRequest[object.name+"_"+object.instanceID+"_"+object.instanceName] || 0, - this.doleinfo_last[object.name] || {numreq:0 , numslave: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 @@ -61,9 +85,6 @@ class neuralDole { this.dole[object.name] = magicData[1] this.carry[object.name+" "+object.instanceID] = magicData[2] - this.doleinfo_new[object.name].numreq=magicData[0] + (this.doleinfo_new[object.name].numreq || 0) - this.doleinfo_new[object.name].numslave=1 + (this.doleinfo_new[object.name].numslave || 0) - // Remove item from DB and send it if(this.items.removeItem({count: magicData[0], name: object.name})){ if(config.logItemTransfers){ From ce9e1d876af8b772944ad4a5186f4ef210a6abdf Mon Sep 17 00:00:00 2001 From: axapaxa123 <49201376+axapaxa123@users.noreply.github.com> Date: Wed, 10 Apr 2019 01:14:39 +0200 Subject: [PATCH 16/16] Updated neural network and interface --- lib/dole_nn_base.js | 68 +++++++++++++++++++++------------------------ 1 file changed, 32 insertions(+), 36 deletions(-) diff --git a/lib/dole_nn_base.js b/lib/dole_nn_base.js index 0aeaf97c..e4dda0b6 100644 --- a/lib/dole_nn_base.js +++ b/lib/dole_nn_base.js @@ -38,47 +38,41 @@ function sigmoid3(x) //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,doleinfo_last) +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 numreq_total_adj=doleinfo_last.numreq; - if (numreq_total_adj==0) numreq_total_adj=0.1; - var a=(doleinfo_last.numslave)*numreq; - if (a>0) {a=(doleinfo_last.numreq)/a;} else {a=1000;} var b=Math.trunc(prev_req/instore_adj*numreq); - var inputs=[numreq,instore_adj,store_last_tick/numreq,dole,carry,prev_req/numreq,doleinfo_last.numslave,numreq/numreq_total_adj,a,store_last_tick/numreq_total_adj,prev_req/instore,b]; + 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 -internal[11]=inputs[1]*2.584747791; -internal[11]=internal[11]+inputs[4]*0.9939581156; -internal[11]=internal[11]+inputs[5]*-0.5315227509; -internal[11]=internal[11]+inputs[3]*0.2037106603; -internal[11]=internal[11]+inputs[2]*1.38696003; -internal[11]=internal[11]+inputs[6]*-0.5434055328; -internal[11]=internal[11]+inputs[8]*-0.4344435036; -internal[11]=internal[11]+1.0*-1.461762667; -internal[11]=sigmoid0(internal[11]); -outputs[0]=inputs[0]*0.4289886355; -outputs[0]=outputs[0]+internal[11]*1.96782124; -outputs[0]=outputs[0]+inputs[3]*-2.196558237; -outputs[0]=sigmoid3(outputs[0]); -outputs[1]=outputs[0]*3.200549364; -outputs[1]=outputs[1]+inputs[7]*-0.3701510429; +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]=sigmoid0(outputs[2]); +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.trunc(outputs[0]); + var res1=Math.round(outputs[0]); if (res1>numreq) res1=numreq; if (res1>instore) res1=instore; if (res1<0) res1=0; - carry=outputs[2]; - return [res1,outputs[1],carry]; + 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 @@ -92,31 +86,33 @@ outputs[2]=sigmoid0(outputs[2]); //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,doleinfo_last,doleinfo_new) +function Tick(instore,dole,store_last_tick,numreq_total_adj) { var instore_adj=instore; if (instore_adj==0) instore_adj=0.1; - var numreq_total_adj=doleinfo_last.numreq; - if (numreq_total_adj==0) numreq_total_adj=0.1; - var a=doleinfo_new.numreq; - if (a>0) {a=doleinfo_last.numreq/doleinfo_new.numreq;} else {a=1000;} - var aa=doleinfo_last.numslave*instore; - if (aa>0) {doleinfo_last.numreq/aa;} else {aa=1000;} - var inputs=[instore,dole,store_last_tick/instore_adj,a,doleinfo_last.numslave,doleinfo_new.numslave,aa,store_last_tick/numreq_total_adj]; + 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 -outputs[0]=sigmoid0(outputs[0]); -outputs[1]=inputs[7]*4.376355648; +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 [outputs[0],avg]; + return [sigmoid0(outputs[0]),avg]; } module.exports = {Dose,Tick}