Merge pull request #393 from Hornwitser/abandon-1.2.x

Abandon 1.2.x

[skip ci]

.gitignore

@@ -11,8 +11,9 @@ pids
 # Directory for instrumented libs generated by jscoverage/JSCover
 lib-cov
 
-# Coverage directory used by tools like istanbul
+# Coverage directories used by tools like nyc and codecov
 coverage
+.nyc_output
 
 # Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
 .grunt
@@ -25,7 +26,6 @@ build/Release
 dist/
 
 node_modules/*
-!node_modules/_app
 
 Factorio*
 /factorio
@@ -63,4 +63,5 @@ sharedPlugins/scenario_loader/scenarios
 # File used for marking plugins as disabled
 sharedPlugins/*/DISABLED
 
-\.cache-require-paths\.json
+# IDE
+.idea/

.snyk

@@ -1,45 +0,0 @@
-# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
-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'

.travis.yml

@@ -1,10 +0,0 @@
-language: node_js
-node_js:
-  - "9"
-before_install:
-  - sudo apt-get -qq update
-  - sudo apt-get install -y curl git tar
-  - curl -o factorio.tar.gz -L https://www.factorio.com/get-download/latest/headless/linux64
-  - tar -xvf factorio.tar.gz
-script:
-  - npm run cover

CHANGELOG.md

@@ -0,0 +1,71 @@
+Changelog
+=========
+
+Version 1.2.4
+-------------
+
+- Removed broken remote combinator signaling.
+- Fixed research sync endlessly updating already researched technologies
+- Removed obsolete item/fluid statistics from clusterioMod
+- Removed per mod upload logging when config.uploadModsToMaster disabled
+- Fixed bcrypt failing to install on windows due to the new version not
+  having Windows binaries.
+
+
+Version 1.2.3
+-------------
+
+- Disabled uploading mods to the master server by default as this is mostly
+  just a waste of bandwidth with the mod portal being integrated into the
+  game now.
+- Fixed researchSync breaking with heavily modded games due to the tech tree
+  exceeding the default 100kb limit on JSON payloads.
+- Fixed the command inventoryImport sends referencing player instead of
+  character, and trying to count the non-existant quick bar slots.
+- Fixed inventoryImport never receiving the script output after the default
+  mode for reading script output changed to tail mode.
+- Fixed desync caused by the mods and loaded mods arrays in Hotpatch getting
+  out of sync when plugins update their scenario mod code.  To fix existing
+  games you will need copy lib/scenarios/Hotpatch/hotpatch/mod-tools.lua
+  over the existing mod-tools.lua in the save's hotpatch folder.
+- Updated the Windows install instructions.
+
+
+Version 1.2.2
+-------------
+
+- Fixed possible crash with modded technologies named the same as a built-in
+  Object prototype property in researchSync.
+- Fixed progress of a current infinite tech carrying over to the next one
+  when researching it and another node completes it in researchSync.
+- Fixed progress of a previous infinite tech from another node being applied
+  to the current one in researchSync.
+- Fixed crash in researchSync when modded technologies are present only on some
+  nodes.
+- Fixed install failing due to bcrypt version less than 3 not being supported
+  on node v10.
+- Reordered install instructions to avoid problem with npm creating files owned
+  by root in the home directory.
+- Swapped curl out with wget in the install instructions as the latter comes
+  pre-installed on Ubuntu.
+
+### Breaking Changes
+
+- Node.js versions below 10 are no longer supported.
+
+
+Version 1.2.1
+-------------
+
+- Updated node-factorio-api to v0.3.8 to fix mod downloads randomly breaking
+  ([#229][#229].)
+- Fixed SIGINT being sent twice to Factorio server when interrupted by CTRL+C
+  on Linux ([#217][#217].)
+- Fixed package.json incorrectly reporting the license as ISC.
+
+[#217]: https://github.com/clusterio/factorioClusterio/issues/217
+[#229]: https://github.com/clusterio/factorioClusterio/issues/229
+
+### Breaking Changes
+
+- Added authentication to the socket.io server running on the master.

CLI tools/cluster_rcon.js

@@ -1,5 +1,13 @@
 const needle = require("needle");
-const config = require("./config.json");
+const cli = require("cli");
+const config = require("./../config.json");
+
+let options = cli.parse()
+cli.setUsage(`node cluster_rcon.js /c game.player.force = "player"`)
+if(process.argv.length < 3){
+	cli.getUsage()
+	process.exit(1)
+}
 
 const masterIP = `${config.masterIP}:${config.masterPort}`;
 const token = config.masterAuthToken

CLI tools/delete_player.js

@@ -0,0 +1,19 @@
+const needle = require("needle")
+const config = require("./../config.json")
+const cli = require("cli")
+
+let options = cli.parse({
+	name: ["n", "Name of the player to delete, case sensitive", "string"],
+	token: [false, "Factorio auth token", "string", config.masterAuthToken]
+})
+if(!options.name){
+	cli.getUsage()
+	process.exit(1)
+}
+
+needle.post(config.masterIP+":"+config.masterPort+"/api/playerManager/deletePlayer", {
+	name: options.name,
+	token: options.token
+}, (err, resp) => {
+	console.log(resp.body)
+});

Dockerfile

@@ -1,8 +1,8 @@
-FROM node:9.11.2
+FROM node:10
 RUN apt-get update && apt install git curl tar -y
 RUN mkdir factorioClusterio
 
-RUN git clone -b master https://github.com/Danielv123/factorioClusterio.git && cd factorioClusterio && npm install
+RUN git clone -b master https://github.com/Danielv123/factorioClusterio.git && cd factorioClusterio && npm install --only=production
 RUN cd factorioClusterio && curl -o factorio.tar.gz -L https://www.factorio.com/get-download/latest/headless/linux64 && tar -xf factorio.tar.gz
 
 WORKDIR factorioClusterio

README.md

@@ -8,6 +8,12 @@
 
 Discord for development/support/play: https://discord.gg/5XuDkje
 
+# ABANDONED VERSION
+
+**The 1.2.x version of Clusterio has been abandonded.
+Please go to the [main branch of the project](https://github.com/clusterio/clusterio) and continue from there.
+The information below is out of date and kept for archival purposes only.**
+
 ### Ways to support me/the project:
 
 * Contribute with code/documentation. Always nice to move the project forward
@@ -88,19 +94,21 @@ NodeJS does not support EOL ubuntu releases. Make sure you are on the most recen
 
 Master and all slaves:
 
-    sudo curl -sL https://deb.nodesource.com/setup_9.x | sudo -E bash -
+    wget -qO - https://deb.nodesource.com/setup_10.x | sudo -E bash -
-    sudo apt install -y nodejs python-dev git wget curl tar build-essential
+    sudo apt install -y nodejs python-dev git build-essential
-    sudo npm install pm2 -g
+    git clone -b 1.2.x https://github.com/Danielv123/factorioClusterio.git
-    git clone https://github.com/Danielv123/factorioClusterio.git
     cd factorioClusterio
-    curl -o factorio.tar.gz -L https://www.factorio.com/get-download/latest/headless/linux64
+    wget -O factorio.tar.gz https://www.factorio.com/get-download/latest/headless/linux64
     tar -xf factorio.tar.gz
-    npm install
+    npm install --only=production
     cp config.json.dist config.json
     node ./lib/npmPostinstall.js
 
+downloads and installs nodejs, git and clusterio. To specify a version, change "latest" in the link to a version number like 0.14.21.
 
-downloads and installs nodejs, pm2, git and clusterio. To specify a version, change "latest" in the link to a version number like 0.14.21.
+Optional step (if you want to use pm2):
+
+    sudo npm install pm2 -g
 
 Now you need to edit the `config.json` file. If you skip this step nothing will work.
 Pretty much all the blank fields should be filled in, except on the master where a few can be omitted.
@@ -113,11 +121,12 @@ Pretty much all the blank fields should be filled in, except on the master where
 
 **Master**
 
+    node master.js
+
+Or with pm2 (it's recommened to run it without pm2 first):
+
     pm2 start master.js --name master
 
-OR
-
-    node master.js
 
 **Server Host**
 
@@ -159,7 +168,7 @@ Game Client = The people connecting to the server
 
 **Requirements**
 
-download and install nodeJS 8 or 9 from http://nodejs.org
+download and install nodeJS 10 from http://nodejs.org
 
 download and install git from https://git-scm.com/
 
@@ -167,28 +176,47 @@ reboot when you are done, then proceed to the next steps. *reboots matter*
 
 **Master**
 
-1. download and run https://puu.sh/toFHl/01eebbb333.bat
+1. Open PowerShell or Command prompt in the directory you want to install to and run the following commands.
 
-2. Copy config.json.dist to config.json
+        git clone -b 1.2.x https://github.com/clusterio/factorioClusterio
+        cd factorioClusterio
+        npm install --only=production
+        copy config.json.dist config.json
 
-3. Follow the instructions in the bat file
+2. Obtain Factorio by either of these two methods:
-3. Some of the instructions are outdated. If you get stuck somewhere, look at the Ubuntu section.
 
-4. Run `node client.js manage shared mods add clusterio`
+    - Via the stand alone version on from their website
 
-5. type `node master.js` to start the server
+        1. Download the MS Windows (64-bit zip package) from https://www.factorio.com/download
+
+        2. Open the zip file and drag the folder called "Factorio_0.17.x" into the factorioClusterio folder
+
+        3. Rename the folder to "factorio"
+
+    - Via steam installation
+
+        1. Locate the game files by right clicking the game in steam, selecting properties, then Local Files, then Browse local files.
+
+        2. Go to the parent folder of the folder that Steam opened and copy the Factorio folder into the factorioClusterio folder
+
+        3. Rename the folder to "factorio"
+
+
+3. Open `config.json` with a text editor and configure as desired.
+
+4. Run `node master.js` to generate the athentication token into secret-api-token.txt
+
+5. Run `node master.js` again to start the master server.
 
 **Server Host**
 
-1. download and run https://puu.sh/toFHl/01eebbb333.bat
+1. Do step 1 and 2 of the Master section above *OR* use the same folder that was created in that section.
 
-2. Copy config.json.dist to config.json
+2. Open `config.json` with a text editor and configure as desired.  You will need to set masterAuthToken to string found in secret-api-token.txt on the master server.
 
-3. Follow the instructions given.
+3. Optionally run the command `node client.js manage shared mods add clusterio` to add the clusterio mod (needed for item teleports.)
 
-3.5 Some of the instructions are outdated. If you get stuck somewhere, look at the Ubuntu section.
+4. Run `node client.js start [instancename]` to create a new instance.  Repeat it again to start the instance.
-
-4. Type `node client.js start [instancename]` to create a new instance.
 
 To connect to a master server running on a remote machine, open config.json with your favourite text editor (notepad++). You can also set it up to use the official server browser.
 
@@ -226,17 +254,9 @@ Copy your config.json.dist to config.json and configure it.
 
 Some systems don't let non root processes listen to ports below 1000. Either run with `sudo` or change config.json to use higher port numbers.
 
-### InitializationError: First argument must be an abstract-leveldown compliant store
+According to [this link](https://askubuntu.com/questions/839520/open-port-443-for-a-node-web-app) if you manually installed node.js following the above instructions, you may need to run the following command to fix this issue:
 
-do:
+    sudo setcap 'cap_net_bind_service=+ep' $(readlink -f $(which node))
-
-    npm install linvodb3@3.25.1
-
-if that does not suffice do
-
-    npm install levelup@1.3.9
-
-If it still doesn't work, come over to our support discord linked at the top of this readme.
 
 ### Portforwarding doesn't work on the master server when running under WSL
 
@@ -279,7 +299,7 @@ node client.js list
 ```
 git pull
 
-npm install
+npm install --only=production
 ```
 
 3. Download the latest version of the factorioClusterioMod from its github repo

client.js

@@ -1,4 +1,5 @@
 const fs = require('fs-extra');
+const Tail = require('tail').Tail;
 const https = require('follow-redirects').https;
 const needle = require("needle");
 const child_process = require('child_process');
@@ -6,19 +7,18 @@ const path = require('path');
 const syncRequest = require('sync-request');
 const request = require("request");
 const ncp = require('ncp').ncp;
-const Rcon = require('rcon-client').Rcon;
+const Rcon = require('rcon-client-fork').Rcon;
-const hashFiles = require('hash-files');
-const _ = require('underscore');
 const deepmerge = require("deepmerge");
 const getMac = require('getmac').getMac;
 const rmdirSync = require('rmdir-sync');
 const ioClient = require("socket.io-client");
 
 // internal libraries
-const objectOps = require("./lib/objectOps.js");
+const objectOps = require("lib/objectOps.js");
-const fileOps = require("_app/fileOps");
+const fileOps = require("lib/fileOps");
-const stringUtils = require("./lib/stringUtils.js");
+const stringUtils = require("lib/stringUtils.js");
-const configManager = require("./lib/manager/configManager.js");
+const configManager = require("lib/manager/configManager.js");
+const hashFile = require('lib/hash').hashFile;
 
 // argument parsing
 const args = require('minimist')(process.argv.slice(2));
@@ -53,8 +53,11 @@ if(!config.masterAuthToken || typeof config.masterAuthToken !== "string"){
 	console.error("Master server now needs an access token for write operations. As clusterio slaves depends \
 	upon this, please add your token to config.json in the field named masterAuthToken. \
 	You can retrieve your auth token from the master in secret-api-token.txt after running it once.");
+	process.exitCode = 1;
+	return;
 }
 const needleOptionsWithTokenAuthHeader = {
+	compressed:true,
 	headers: {
 		'x-access-token': config.masterAuthToken
 	},
@@ -187,7 +190,7 @@ if (!command || command == "help" || command == "--help") {
 		if(tool == "mods"){
 			(async function(){try{
 				// do require down here to reduce master load time
-				const modManager = require("./lib/manager/modManager.js")(config);
+				const modManager = require("lib/manager/modManager.js")(config);
 				
 				// allow managing mods
 				if(action == "list"){
@@ -227,7 +230,7 @@ if (!command || command == "help" || command == "--help") {
 			}
 		} else if(tool == "plugins"){
 			(async function(){try{
-				const pluginManager = require("./lib/manager/pluginManager.js")(config);
+				const pluginManager = require("lib/manager/pluginManager.js")(config);
 				if(action == "list"){
 					await pluginManager.listPlugins();
 				} else if(action == "add" || action == "install" || action == "download"){
@@ -296,11 +299,10 @@ if (!command || command == "help" || command == "--help") {
 	fs.mkdirSync(instancedirectory + "/saves/");
 	fs.writeFileSync(instancedirectory + "/script-output/output.txt", "");
 	fs.writeFileSync(instancedirectory + "/script-output/orders.txt", "");
-	fs.writeFileSync(instancedirectory + "/script-output/txbuffer.txt", "");
 	fs.mkdirSync(instancedirectory + "/mods/");
 	fs.mkdirSync(instancedirectory + "/instanceMods/");
     fs.mkdirSync(instancedirectory + "/scenarios/");
-    ncp("./lib/scenarios", path.resolve(instancedirectory, "scenarios"), err => {
+    ncp("lib/scenarios", path.resolve(instancedirectory, "scenarios"), err => {
         if (err) console.error(err)
     });
 
@@ -317,6 +319,7 @@ write-data=${ path.resolve(config.instanceDirectory, instance) }\r\n
 		"clientPort": args["rcon-port"] || process.env.RCONPORT || Math.floor(Math.random() * 65535),
 		"__comment_clientPassword": "This is the rcon password. Its also used for making an instanceID. Make sure its unique and not blank.",
 		"clientPassword": args["rcon-password"] || Math.random().toString(36).replace(/[^a-z]+/g, '').substr(0, 8),
+		"info": {}
 	}
 	console.log("Clusterio | Created instance with settings:")
 	console.log(instconf);
@@ -357,19 +360,22 @@ write-data=${ path.resolve(config.instanceDirectory, instance) }\r\n
             '--rcon-port', Number(process.env.RCONPORT) || instconf.clientPort,
             '--rcon-password', instconf.clientPassword,
         ], {
-            'stdio': ['pipe', 'pipe', 'pipe']
+			'stdio': ['pipe', 'pipe', 'pipe'],
+			'detached': process.platform === "linux",
         }
     );
     factorio.stdout.on("data", data => {
         data = data.toString("utf8").replace(/(\r\n\t|\n|\r\t)/gm,"");
         console.log(data);
         if(data.includes("Starting RCON interface")){
-            let client = new Rcon();
+            let client = new Rcon({
+				packetResponseTimeout: 200000,
+			    maxPending: 5
+			});
             client.connect({
                 host: 'localhost',
                 port: Number(process.env.RCONPORT) || instconf.clientPort,
-                password: instconf.clientPassword,
+                password: instconf.clientPassword
-                timeout: 5000
             });
             client.onDidAuthenticate(() => {
                 console.log('Clusterio | RCON Authenticated!');
@@ -467,7 +473,8 @@ write-data=${ path.resolve(config.instanceDirectory, instance) }\r\n
 				'--server-settings', instancedirectory + '/server-settings.json',
 				'--port', args.port || Number(process.env.FACTORIOPORT) || instanceconfig.factorioPort
 			], {
-				'stdio': ['pipe', 'pipe', 'pipe']
+				'stdio': ['pipe', 'pipe', 'pipe'],
+				'detached': process.platform === "linux",
 			}
 		);
 
@@ -493,8 +500,10 @@ write-data=${ path.resolve(config.instanceDirectory, instance) }\r\n
 		// connect to the server with rcon
 		if(true || process.platform != "linux"){
 			// IP, port, password
-			client = new Rcon();
+			client = new Rcon({
-			
+				packetResponseTimeout: 200000, // 200s, should allow for commands up to 1250kB in length
+			    maxPending: 5
+			});
 			// check the logfile to see if the RCON interface is running as there is no way to continue without it
 			// we read the log every 2 seconds and stop looping when we start connecting to factorio
 			function checkRcon() {
@@ -505,7 +514,6 @@ write-data=${ path.resolve(config.instanceDirectory, instance) }\r\n
 							host: 'localhost',
 							port: args["rcon-port"] || Number(process.env.RCONPORT) || instanceconfig.clientPort,
 							password: args["rcon-password"] || instanceconfig.clientPassword,
-							timeout: 5000
 						});
 					} else {
 						setTimeout(function(){
@@ -557,12 +565,18 @@ write-data=${ path.resolve(config.instanceDirectory, instance) }\r\n
 }
 
 // ensure instancemanagement only ever runs once
-_.once(instanceManagement);
+var _instanceInitialized;
 async function instanceManagement(instanceconfig) {
+	if (_instanceInitialized) return;
+	_instanceInitialized = true;
+
     console.log("Started instanceManagement();");
 
     /* Open websocket connection to master */
-	var socket = ioClient("http://"+config.masterIP+":"+config.masterPort);
+	var socket = ioClient("http://"+config.masterIP+":"+config.masterPort+"?token="+config.masterAuthToken);
+	socket.on("error", err => {
+		console.log("SOCKET | Error: ", err);
+	});
 	socket.on("hello", data => {
 		console.log("SOCKET | registering slave!");
 		socket.emit("registerSlave", {
@@ -572,15 +586,12 @@ async function instanceManagement(instanceconfig) {
 	setInterval(B=> socket.emit("heartbeat"), 10000);
 
 	// load plugins and execute onLoad event
-	const pluginManager = require("./lib/manager/pluginManager.js")(config);
+	const pluginManager = require("lib/manager/pluginManager.js")(config);
 	let pluginsToLoad = await pluginManager.getPlugins();
 	let plugins = [];
 	
 	for(let i = 0; i < pluginsToLoad.length; i++){
 		let pluginLoadStarted = Date.now();
-		let log = function(message) {
-			console.log("Clusterio | "+ pluginsToLoad[i].name + " | " + message);
-		}
 		let combinedConfig = deepmerge(instanceconfig,config,{clone:true});
 		let pluginConfig = pluginsToLoad[i];
 		
@@ -592,7 +603,7 @@ async function instanceManagement(instanceconfig) {
 			let pluginClass = require(path.resolve(pluginConfig.pluginPath, "index.js"));
 			plugins[i] = new pluginClass(combinedConfig, async function(data, callback){
 				if(data && data.toString('utf8')[0] != "/") {
-					log(data.toString('utf8'));
+                    console.log("Clusterio | "+ pluginsToLoad[i].name + " | " + data.toString('utf8'));
 					return true;
 				} else if (data && data.toString('utf8')[0] == "/"){
 					return messageInterface(data.toString('utf8'), callback);
@@ -618,37 +629,50 @@ async function instanceManagement(instanceconfig) {
 				global.subscribedFiles[pluginConfig.scriptOutputFileSubscription] = true;
 				console.log("Clusterio | Registered file subscription on "+instancedirectory + "/script-output/" + pluginConfig.scriptOutputFileSubscription);
 				
-				fs.watch(instancedirectory + "/script-output/" + pluginConfig.scriptOutputFileSubscription, fileChangeHandler);
-				// run once in case a plugin wrote out information before the plugin loaded fully
-				// delay, so the socket got enough time to connect
-				setTimeout(()=> {
-                    fileChangeHandler(false, pluginConfig.scriptOutputFileSubscription);
-                }, 500);
-				// send file contents to plugin for processing
-				function fileChangeHandler(eventType, filename) {
-					if(filename != null){
-						setTimeout(
-							()=>{
-								// get array of lines in file
-								let stuff = fs.readFileSync(instancedirectory + "/script-output/" + filename, "utf8").split("\n");
 
-								// if you found anything, reset the file
+				if(!pluginConfig.fileReadDelay || pluginConfig.fileReadDelay == 0) {
-								if (stuff[0]) {
+					// only wipe the file on restart for now, should most likely be rotated during runtime too
-									fs.writeFileSync(instancedirectory + "/script-output/" + filename, "");
+                    fs.writeFileSync(instancedirectory + "/script-output/" + pluginConfig.scriptOutputFileSubscription, "");
-								}
+                    let tail = new Tail(instancedirectory + "/script-output/" + pluginConfig.scriptOutputFileSubscription);
-								for(let o = 0; o < stuff.length; o++) {
+                    tail.on("line", function (data) {
-									if(stuff[o] && !stuff[o].includes('\u0000\u0000')) {
+                        plugins[i].scriptOutput(data);
-										try{
+                    });
-											plugins[i].scriptOutput(stuff[o]);
+                } else {
-										}catch(e){console.error(e)}
+                    fs.watch(instancedirectory + "/script-output/" + pluginConfig.scriptOutputFileSubscription, fileChangeHandler);
-									}
+                    // run once in case a plugin wrote out information before the plugin loaded fully
-								}
+                    // delay, so the socket got enough time to connect
-							},
+                    setTimeout(() => {
-							pluginConfig.fileReadDelay || 0
+                        fileChangeHandler(false, pluginConfig.scriptOutputFileSubscription);
-						);
+                    }, 500);
-					}
+
-				}
+                    // send file contents to plugin for processing
-			}
+                    function fileChangeHandler(eventType, filename) {
+                        if (filename != null) {
+                            setTimeout(
+                                () => {
+                                    // get array of lines in file
+                                    let stuff = fs.readFileSync(instancedirectory + "/script-output/" + filename, "utf8").split("\n");
+
+                                    // if you found anything, reset the file
+                                    if (stuff[0]) {
+                                        fs.writeFileSync(instancedirectory + "/script-output/" + filename, "");
+                                    }
+                                    for (let o = 0; o < stuff.length; o++) {
+                                        if (stuff[o] && !stuff[o].includes('\u0000\u0000')) {
+                                            try {
+                                                plugins[i].scriptOutput(stuff[o]);
+                                            } catch (e) {
+                                                console.error(e)
+                                            }
+                                        }
+                                    }
+                                },
+                                pluginConfig.fileReadDelay || 0
+                            );
+                        }
+                    }
+                }
+            }
 			console.log(`Clusterio | Loaded plugin ${pluginsToLoad[i].name} in ${Date.now() - pluginLoadStarted}ms`);
 		} else {
 			// this plugin doesn't have a client portion. Maybe it runs on the master only?
@@ -670,7 +694,8 @@ async function instanceManagement(instanceconfig) {
 					publicIP: config.publicIP, // IP of the server should be global for all instances, so we pull that straight from the config
 					mods:modHashes,
 					instanceName: instance,
-				}
+					info: instanceconfig.info,
+				};
 				if(playerCount){
 					payload.playerCount = playerCount.replace(/(\r\n\t|\n|\r\t)/gm, "");
 				} else {
@@ -691,7 +716,7 @@ async function instanceManagement(instanceconfig) {
 							console.error(err);
 						} else if (response && response.body) {
 							// In the future we might be interested in whether or not we actually manage to send it, but honestly I don't care.
-							if(response.body !== "ok") {
+							if (typeof response.body !== "string" || response.body.toLowerCase() !== "ok") {
                                 console.log("Got no \"ok\" while registering our precense with master "+config.masterIP+" at " + payload.time);
                                 console.log(response.body);
                             }
@@ -712,19 +737,19 @@ async function instanceManagement(instanceconfig) {
 	
 	setTimeout(function(){hashMods(instance, uploadMods)}, 5000);
 	function uploadMods(modHashes) {
-		// [{modName:string,hash:string}, ... ]
+		if (config.uploadModsToMaster) {
-		for(let i=0;i<modHashes.length;i++){
+			// [{modName:string,hash:string}, ... ]
-			let payload = {
+			for(let i=0;i<modHashes.length;i++){
-				modName: modHashes[i].modName,
+				let payload = {
-				hash: modHashes[i].hash,
+					modName: modHashes[i].modName,
-			}
+					hash: modHashes[i].hash,
-			needle.post(config.masterIP + ":" + config.masterPort + '/api/checkMod', payload, needleOptionsWithTokenAuthHeader, function (err, response, body) {
+				};
-				if(err) console.error("Unable to contact master server /api/checkMod! Please check your config.json.");
+				needle.post(config.masterIP + ":" + config.masterPort + '/api/checkMod', payload, needleOptionsWithTokenAuthHeader, function (err, response, body) {
-				if(response && body && body == "found") {
+					if(err) console.error("Unable to contact master server /api/checkMod! Please check your config.json.");
-					console.log("master has mod "+modHashes[i].modName);
+					if(response && body && body == "found") {
-				} else if (response && body && typeof body == "string") {
+						console.log("master has mod "+modHashes[i].modName);
-					let mod = response.body;
+					} else if (response && body && typeof body == "string") {
-					if(config.uploadModsToMaster){
+						let mod = response.body;
 						console.log("Sending mod: " + mod);
 						// Send mods master says it wants
 						// response.body is a string which is a modName.zip
@@ -741,11 +766,11 @@ async function instanceManagement(instanceconfig) {
 						});
 						var form = req.form();
 						form.append('file', fs.createReadStream(config.instanceDirectory+"/"+instance+"/mods/"+mod));
-					} else {
-						console.log("Not sending mod: " + mod + " to master because config.uploadModsToMaster is not enabled")
 					}
-				}
+				});
-			});
+			}
+		} else {
+			console.log("Bypassing sending mods to master because config.uploadModsToMaster is not enabled")
 		}
 	}
 } // END OF INSTANCE START ---------------------------------------------------------------------
@@ -756,42 +781,22 @@ function hashMods(instanceName, callback) {
 	if(!callback) {
 		throw new Error("ERROR in function hashMods NO CALLBACK");
 	}
-	function callback2(hash, modName){
+
-		hashedMods[hashedMods.length] = {
+	let modsDir = config.instanceDirectory+"/"+instanceName+"/mods/";
-			modName: modName,
+	function hashMod(name) {
-			hash: hash,
+		if (path.extname(name) != ".zip") {
-		}
+			// Can't hash unzipped mods, return null that's filtered out later
-		// check if this callback has ran once for each mod
+			return null;
-		if(hashedMods.length == instanceMods.length) {
+		} else {
-			callback(hashedMods);
+			return hashFile(modsDir+name).then(hash => (
-		}
+				{modName: name, hash: hash}
-		//console.log(modname);
+			));
-	}
-	let hashedMods = [];
-	/*let mods = fs.readdirSync("./sharedMods/")*/
-	let instanceMods = fs.readdirSync(config.instanceDirectory+"/"+instanceName+"/mods/");
-	if(instanceMods.length == 0){
-		callback({}); // there are no mods installed, return an empty object
-	}
-	for(let o=0;o<instanceMods.length;o++) {
-		if(path.extname(instanceMods[o]) != ".zip") {
-			instanceMods.splice(instanceMods.indexOf(instanceMods[o]), 1); // remove element from array, we can't hash unzipped mods
 		}
 	}
-	for(let i=0; i<instanceMods.length; i++){
+
-		let path = config.instanceDirectory+"/"+instanceName+"/mods/"+instanceMods[i];
+	let promises = fs.readdirSync(modsDir).map(hashMod);
-		let name = instanceMods[i];
+	Promise.all(promises).then(hashes => {
-		let options = {
+		// Remove null entries from hashMod
-			files:path,
+		callback(hashes.filter(entry => entry !== null));
-		}
+	});
-		// options {files:[array of paths]}
-		hashFiles(options, function(error, hash) {
-			// hash will be a string if no error occurred
-			if(!error){
-				callback2(hash, name);
-			} else {
-				throw error;
-			}
-		});
-	}
 }

config.json.dist

@@ -14,7 +14,7 @@
 	"masterPort": 8080,
 	
 	"__commentsslPort": "HTTPS port for the master to listen to. Set to 0 or an empty string to not listen for HTTPS.",
-	"sslPort": 443,
+	"sslPort": 0,
 	"sslCert": "database/certificates/cert.crt",
 	"sslPrivKey": "database/certificates/cert.key",
 	
@@ -49,8 +49,8 @@
 	"logItemTransfers": false,
 	"__comment6.5": "When the master is undersupplied, we have 3 different modes to 'fairly' distribute items. First to ask gets all, dole division using weird formula or experimental neural net tries to make stuff as fair as possible. Feel free to play around.",
 	"disableFairItemDistribution": false,
-	"useNeuralNetDoleDivider": false,
+	"useNeuralNetDoleDivider": true,
-	"uploadModsToMaster": true,
+	"uploadModsToMaster": false,
 	"msBetweenCommands": 10,
 	"allowRemoteCommandExecution": true,
 	"enableCrossServerShout": true,

documentation.yml

@@ -1,10 +0,0 @@
-toc:
- - name: Master Server API
- - clusterioMaster
- - name: Type declarations
- - itemStack
- - name: Internal modules
-   description: |
-     Here are some helper functions for navigation.
- - modManager
- - getFactorioLocale

lib/Model/ClusterManager.js

@@ -0,0 +1,57 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const NodeInstance_1 = require("./NodeInstance");
+const Point_1 = require("./Point");
+const Grid_1 = require("./Grid");
+/**
+ * Manages all nodes within the cluster
+ */
+class ClusterManager {
+    constructor() {
+        this.Grid = new Grid_1.Grid();
+    }
+    /**
+     * Generates a x*y grid of 1x1 nodes
+     * @param width How wide to make the node grid
+     * @param height How high to make the node grid
+     * @param nodeNamePrefix The prefix used for the initial node names. The name will be in the format <prefix>_x_y.
+     */
+    GenerateBasicGridOfNodes(width, height, nodeNamePrefix) {
+        for (let x = 0; x < width; x++) {
+            for (let y = 0; y < height; y++) {
+                let newNode = new NodeInstance_1.NodeInstance(nodeNamePrefix + "-" + (x + 1) + "-" + (y + 1), new Point_1.Point(x, y), 1, 1);
+                this.Grid.AddNodeToGrid(newNode);
+            }
+        }
+    }
+    /**
+     * Assigns all nodes that currently do not have a server assigned to the given server
+     * @param server Server to assign all unassigned nodes to
+     */
+    AssignAllUnassignedNodesToServer(server) {
+        this.CheckServerArray(server);
+        this.Grid.GetNodes()
+            .filter(node => { node.Server === null; })
+            .forEach(node => {
+            server.AddNodeInstance(node);
+            node.Server = server;
+        });
+    }
+    /**
+     * Assigns a node to a server
+     * @param x x co-ordinate of the node
+     * @param y y co-ordinate of the node
+     * @param serverName server name
+     */
+    AssignNodeToServer(x, y, server) {
+        this._nodeArray[x][y].Server = server;
+    }
+    CheckServerArray(server) {
+        let s = this._servers[server.Name];
+        if (s == null) {
+            this._servers[server.Name] = server;
+        }
+    }
+}
+exports.ClusterManager = ClusterManager;
+//# sourceMappingURL=ClusterManager.js.map

lib/Model/ClusterioMasterProxy.js

@@ -0,0 +1,112 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const child_process = require("child_process");
+const needle = require("needle");
+const Helpers_1 = require("./Helpers");
+const fs = require("fs");
+const util = require("util");
+/**
+ * Contains all interactions between the cluster model, the
+ * Clusterio master.js/client.js infrastructure and the operating system.
+ */
+class ClusterioMasterProxy {
+    constructor(masterIP, masterPort, masterAuthToken, serviceHostType) {
+        this._masterIP = `${masterIP}:${masterPort}`;
+        this._needleOptionsWithTokenAuthHeader = {
+            headers: {
+                'x-access-token': masterAuthToken,
+            },
+        };
+    }
+    async RunRconCommand(instanceId, command, logDescription) {
+        console.log("Running command: " + logDescription);
+        let request = { instanceID: instanceId, command };
+        let response = await needle("post", this._masterIP + "/api/runCommand", request, this._needleOptionsWithTokenAuthHeader);
+    }
+    async GetSlaves() {
+        let response = await needle("get", this._masterIP + "/api/slaves", this._needleOptionsWithTokenAuthHeader);
+        let body = response.body;
+        let slaves = new Array();
+        Object.entries(body).forEach((keyValuePair, index, array) => {
+            let slave = keyValuePair[1];
+            slave.id = keyValuePair[0];
+            slaves.push(slave);
+        });
+        return slaves;
+    }
+    async CreateNodeInstancesOnLocalServer(nodes) {
+        await Helpers_1.asyncForEach(nodes, async (node) => {
+            await this.CreateNodeInstanceOnLocalServer(node);
+        });
+        await Helpers_1.asyncForEach(nodes, async (node) => {
+            await this.CreateTeleportZonesForANodeInstance(node);
+        });
+        await this.sleep(1000);
+        await Helpers_1.asyncForEach(nodes, async (node) => {
+            await this.CreateTeleportRestrictionsForANodeInstance(node);
+            await this.sleep(100);
+        });
+    }
+    async CreateNodeInstanceOnLocalServer(node) {
+        console.log(`Creating instance ${node.Name}...`);
+        await this.CreateNodeInstanceOnLocalServerUsingPm2(node);
+        console.log("Waiting for node to connect to cluster master...");
+        while (true) {
+            await this.sleep(1000);
+            //TODO: Use /api/getSlaveMeta/
+            let slaves = await this.GetSlaves();
+            let slave = slaves.find((slave, index, array) => slave.instanceName === node.Name);
+            if (slave != null) {
+                node.ClusterioWorldId = slave.id;
+                break;
+            }
+        }
+    }
+    async CreateNodeInstanceOnLocalServerUsingPm2(node) {
+        let proc = child_process.spawn("pm2", ['start', '--name', node.Name, 'client.js', '--', 'start', node.Name]);
+        proc.stdout.on('data', (data) => { console.log(`stdout: ${data}`); });
+        proc.stderr.on('data', data => { console.log(`stderr: ${data}`); });
+        proc.on('error', error => { console.log(`error: ${error}`); });
+    }
+    async CreateNodeInstanceOnLocalServerUsingScreen(node) {
+        // first call of client.js start for a new node creates map from HotPatch scenario then exits.
+        let proc = child_process.spawn("screen", ['-dmS', node.Name, '-L', '-Logfile', node.Name + '.log', 'node', 'client.js', 'start', node.Name]);
+        proc.stdout.on('data', (data) => { console.log(`stdout: ${data}`); });
+        proc.stderr.on('data', data => { console.log(`stderr: ${data}`); });
+        proc.on('error', error => { console.log(`error: ${error}`); });
+        console.log("Waiting for creation of new map...");
+        // create awaiter for fs.readFile
+        const readFile = util.promisify(fs.readFile);
+        while (true) {
+            await this.sleep(1000);
+            let fileData = await readFile(node.Name + '.log');
+            if (fileData.includes('Instance created')) {
+                break;
+            }
+        }
+        // start node
+        proc = child_process.spawn("screen", ['-dmS', node.Name, '-L', '-Logfile', node.Name + '.log', 'node', 'client.js', 'start', node.Name]);
+        proc.stdout.on('data', data => { console.log(`stdout: ${data}`); });
+        proc.stderr.on('data', data => { console.log(`stderr: ${data}`); });
+        proc.on('error', error => { console.log(`error: ${error}`); });
+    }
+    async CreateTeleportZonesForANodeInstance(nodeInstance) {
+        await Helpers_1.asyncForEach(nodeInstance.TeleportZones.values(), async (zone) => {
+            let o = zone.GenerateTeleportZoneInFactorioCoordinates();
+            let cmd = `CreateZone('${o[0]}',${o[1]},${o[2]},${o[3]},${o[4]},${o[5]},true)`;
+            await this.RunRconCommand(nodeInstance.ClusterioWorldId, `/c remote.call('trainTeleports','runCode',\"${cmd}\")`, cmd);
+        });
+    }
+    async CreateTeleportRestrictionsForANodeInstance(nodeInstance) {
+        await Helpers_1.asyncForEach(nodeInstance.TeleportZones.values(), async (zone) => {
+            let o = zone.GenerateZoneRestriction();
+            let cmd = `CreateZoneRestriction(${o[0]},'${o[1]}','${o[2]}')`;
+            await this.RunRconCommand(nodeInstance.ClusterioWorldId, `/c remote.call('trainTeleports','runCode',\"${cmd}\")`, cmd);
+        });
+    }
+    sleep(ms) {
+        return new Promise(resolve => setTimeout(resolve, ms));
+    }
+}
+exports.ClusterioMasterProxy = ClusterioMasterProxy;
+//# sourceMappingURL=ClusterioMasterProxy.js.map

lib/Model/Config.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+/** The multiplier used to convert from the grid's coordinate system to factorio's.
+ * 1000 means a 1x1 grid node will have a factorio map size of 1000x1000. */
+exports.GridToFactorioCoordinateSystemMultiplier = 1000;
+/** The width of teleport zones when they get created. */
+exports.TeleportZoneWidth = 50;
+//# sourceMappingURL=Config.js.map

lib/Model/Grid.js

@@ -0,0 +1,177 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const typescript_collections_1 = require("typescript-collections");
+const Point_1 = require("./Point");
+const TeleportZone_1 = require("./TeleportZone");
+const TeleportZoneDirection_1 = require("./TeleportZoneDirection");
+class Grid {
+    constructor() {
+        this._nodes = new typescript_collections_1.Dictionary();
+        this._minX = 0;
+        this._minY = 0;
+        this._maxX = 0;
+        this._maxY = 0;
+    }
+    GetNodes() {
+        return this._nodes.values();
+    }
+    /**
+     * Adds a node to the grid
+     * @param topLeftCoordinate The top left x,y coordinate of the node
+     * @param nodeInstance
+     */
+    AddNodeToGrid(nodeInstance) {
+        let topLeftCoordinate = nodeInstance.TopLeftCoordinate;
+        let pointsToSave = new Array();
+        // check all points that make up nodeInstance for existing nodes
+        for (let x = topLeftCoordinate.X; x < topLeftCoordinate.X + nodeInstance.Width; x++) {
+            for (let y = topLeftCoordinate.Y; y < topLeftCoordinate.Y + nodeInstance.Height; y++) {
+                let currentPoint = new Point_1.Point(x, y);
+                let existingNode = this._nodes.getValue(currentPoint);
+                if (existingNode != null) {
+                    throw new Error("Cannot add node to grid - collision detected with node '" + existingNode.Name + "'");
+                }
+                pointsToSave.push(currentPoint);
+            }
+        }
+        // no existing nodes found to assign node to these points
+        for (let i = 0; i < pointsToSave.length; i++) {
+            this._nodes.setValue(pointsToSave[i], nodeInstance);
+        }
+        //TODO: Refactor
+        //#region Set up teleport zones
+        // check surrounding points for nodes
+        // check north points
+        let y = topLeftCoordinate.Y - 1;
+        for (let x = topLeftCoordinate.X; x < topLeftCoordinate.X + nodeInstance.Width; x++) {
+            let currentPoint = new Point_1.Point(x, y);
+            let existingNode = this._nodes.getValue(currentPoint);
+            // found a node - set up teleport zone
+            if (existingNode != null) {
+                // Create/Update teleport node in existing node to new node
+                let teleportZoneFromExistingToNew = existingNode.TeleportZones.getValue(nodeInstance.Key);
+                if (teleportZoneFromExistingToNew == null) {
+                    teleportZoneFromExistingToNew = new TeleportZone_1.TeleportZone(existingNode, TeleportZoneDirection_1.TeleportZoneDirection.South, currentPoint, currentPoint, existingNode.TeleportZones.size(), nodeInstance);
+                    existingNode.TeleportZones.setValue(nodeInstance.Key, teleportZoneFromExistingToNew);
+                }
+                else {
+                    teleportZoneFromExistingToNew.BottomRightCoordinate = currentPoint;
+                }
+                // Create/Update teleport node in new node to existing node
+                let teleportZoneFromNewToExisting = nodeInstance.TeleportZones.getValue(existingNode.Key);
+                let pointInNewNode = new Point_1.Point(currentPoint.X, currentPoint.Y + 1);
+                if (teleportZoneFromNewToExisting == null) {
+                    teleportZoneFromNewToExisting = new TeleportZone_1.TeleportZone(nodeInstance, TeleportZoneDirection_1.TeleportZoneDirection.North, pointInNewNode, pointInNewNode, nodeInstance.TeleportZones.size(), existingNode);
+                    nodeInstance.TeleportZones.setValue(existingNode.Key, teleportZoneFromNewToExisting);
+                }
+                else {
+                    teleportZoneFromNewToExisting.BottomRightCoordinate = currentPoint;
+                }
+            }
+        }
+        // check south points
+        y = topLeftCoordinate.Y + nodeInstance.Height + 1;
+        for (let x = topLeftCoordinate.X; x < topLeftCoordinate.X + nodeInstance.Width; x++) {
+            let currentPoint = new Point_1.Point(x, y);
+            let existingNode = this._nodes.getValue(currentPoint);
+            // found a node - set up teleport zone
+            if (existingNode != null) {
+                // Create/Update teleport node in existing node to new node
+                let teleportZoneFromExistingToNew = existingNode.TeleportZones.getValue(nodeInstance.Key);
+                if (teleportZoneFromExistingToNew == null) {
+                    teleportZoneFromExistingToNew = new TeleportZone_1.TeleportZone(existingNode, TeleportZoneDirection_1.TeleportZoneDirection.North, currentPoint, currentPoint, existingNode.TeleportZones.size(), nodeInstance);
+                    existingNode.TeleportZones.setValue(nodeInstance.Key, teleportZoneFromExistingToNew);
+                }
+                else {
+                    teleportZoneFromExistingToNew.BottomRightCoordinate = currentPoint;
+                }
+                // Create/Update teleport node in new node to existing node
+                let teleportZoneFromNewToExisting = nodeInstance.TeleportZones.getValue(existingNode.Key);
+                let pointInNewNode = new Point_1.Point(currentPoint.X, currentPoint.Y - 1);
+                if (teleportZoneFromNewToExisting == null) {
+                    teleportZoneFromNewToExisting = new TeleportZone_1.TeleportZone(nodeInstance, TeleportZoneDirection_1.TeleportZoneDirection.South, pointInNewNode, pointInNewNode, nodeInstance.TeleportZones.size(), existingNode);
+                    nodeInstance.TeleportZones.setValue(existingNode.Key, teleportZoneFromNewToExisting);
+                }
+                else {
+                    teleportZoneFromNewToExisting.BottomRightCoordinate = currentPoint;
+                }
+            }
+        }
+        // check west points
+        let x = topLeftCoordinate.X - 1;
+        for (let y = topLeftCoordinate.Y; y < topLeftCoordinate.Y + nodeInstance.Height; y++) {
+            let currentPoint = new Point_1.Point(x, y);
+            let existingNode = this._nodes.getValue(currentPoint);
+            // found a node - set up teleport zone
+            if (existingNode != null) {
+                // Create/Update teleport node in existing node to new node
+                let teleportZoneFromExistingToNew = existingNode.TeleportZones.getValue(nodeInstance.Key);
+                if (teleportZoneFromExistingToNew == null) {
+                    teleportZoneFromExistingToNew = new TeleportZone_1.TeleportZone(existingNode, TeleportZoneDirection_1.TeleportZoneDirection.East, currentPoint, currentPoint, existingNode.TeleportZones.size(), nodeInstance);
+                    existingNode.TeleportZones.setValue(nodeInstance.Key, teleportZoneFromExistingToNew);
+                }
+                else {
+                    teleportZoneFromExistingToNew.BottomRightCoordinate = currentPoint;
+                }
+                // Create/Update teleport node in new node to existing node
+                let teleportZoneFromNewToExisting = nodeInstance.TeleportZones.getValue(existingNode.Key);
+                let pointInNewNode = new Point_1.Point(currentPoint.X + 1, currentPoint.Y);
+                if (teleportZoneFromNewToExisting == null) {
+                    teleportZoneFromNewToExisting = new TeleportZone_1.TeleportZone(nodeInstance, TeleportZoneDirection_1.TeleportZoneDirection.West, pointInNewNode, pointInNewNode, nodeInstance.TeleportZones.size(), existingNode);
+                    nodeInstance.TeleportZones.setValue(existingNode.Key, teleportZoneFromNewToExisting);
+                }
+                else {
+                    teleportZoneFromNewToExisting.BottomRightCoordinate = currentPoint;
+                }
+            }
+        }
+        // check east points        
+        x = topLeftCoordinate.X + nodeInstance.Width + 1;
+        for (let y = topLeftCoordinate.Y; y < topLeftCoordinate.Y + nodeInstance.Height; y++) {
+            let currentPoint = new Point_1.Point(x, y);
+            let existingNode = this._nodes.getValue(currentPoint);
+            // found a node - set up teleport zone
+            if (existingNode != null) {
+                // Create/Update teleport node in existing node to new node
+                let teleportZoneFromExistingToNew = existingNode.TeleportZones.getValue(nodeInstance.Key);
+                if (teleportZoneFromExistingToNew == null) {
+                    teleportZoneFromExistingToNew = new TeleportZone_1.TeleportZone(existingNode, TeleportZoneDirection_1.TeleportZoneDirection.West, currentPoint, currentPoint, existingNode.TeleportZones.size(), nodeInstance);
+                    existingNode.TeleportZones.setValue(nodeInstance.Key, teleportZoneFromExistingToNew);
+                }
+                else {
+                    teleportZoneFromExistingToNew.BottomRightCoordinate = currentPoint;
+                }
+                // Create/Update teleport node in new node to existing node
+                let teleportZoneFromNewToExisting = nodeInstance.TeleportZones.getValue(existingNode.Key);
+                let pointInNewNode = new Point_1.Point(currentPoint.X - 1, currentPoint.Y);
+                if (teleportZoneFromNewToExisting == null) {
+                    teleportZoneFromNewToExisting = new TeleportZone_1.TeleportZone(nodeInstance, TeleportZoneDirection_1.TeleportZoneDirection.East, pointInNewNode, pointInNewNode, nodeInstance.TeleportZones.size(), existingNode);
+                    nodeInstance.TeleportZones.setValue(existingNode.Key, teleportZoneFromNewToExisting);
+                }
+                else {
+                    teleportZoneFromNewToExisting.BottomRightCoordinate = currentPoint;
+                }
+            }
+        }
+        //#endregion
+        this._nodes.setValue(topLeftCoordinate, nodeInstance);
+        this._minX = Math.min(this._minX, topLeftCoordinate.X);
+        this._minY = Math.min(this._minY, topLeftCoordinate.Y);
+        this._maxX = Math.max(this._maxX, topLeftCoordinate.X + nodeInstance.Width);
+        this._maxY = Math.max(this._maxY, topLeftCoordinate.Y + nodeInstance.Height);
+    }
+    get Width() {
+        return this._maxX - this._minX;
+    }
+    get Height() {
+        return this._maxY - this._minY;
+    }
+    get TopLeftCoordinate() {
+        return new Point_1.Point(this._minX, this._minY);
+    }
+    get BottomRightCoordinate() {
+        return new Point_1.Point(this._maxX, this._maxY);
+    }
+}
+exports.Grid = Grid;
+//# sourceMappingURL=Grid.js.map

lib/Model/Helpers.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//TODO: Make generic
+async function asyncForEach(array, callback) {
+    for (let index = 0; index < array.length; index++) {
+        await callback(array[index], index, array);
+    }
+}
+exports.asyncForEach = asyncForEach;
+//# sourceMappingURL=Helpers.js.map

lib/Model/IApiSlaves.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=IApiSlaves.js.map

lib/Model/IClusterioMasterProxy.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=IClusterioMasterProxy.js.map

lib/Model/ModelController.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+console.log("started.");
+const ClusterioMasterProxy_1 = require("./ClusterioMasterProxy");
+const ClusterManager_1 = require("./ClusterManager");
+const argv = require('minimist')(process.argv.slice(2));
+let configPath = argv['configPath'];
+if (configPath === undefined || configPath === null || configPath === "") {
+    throw new Error("configPath is null.");
+}
+;
+let config = require(configPath);
+let proxy = new ClusterioMasterProxy_1.ClusterioMasterProxy(config.masterIP, config.masterPort, config.masterAuthToken);
+let manager = new ClusterManager_1.ClusterManager();
+manager.GenerateBasicGridOfNodes(2, 2, 'GridLockTest_');
+function sleep(ms) {
+    return new Promise(resolve => setTimeout(resolve, ms));
+}
+// async function test() {
+//     await asyncForEach([1,2,3], async (v, i, a) => {
+//         console.log("test" + i);
+//         await sleep(5000);
+//     });
+// }
+// test();
+proxy.CreateNodeInstancesOnLocalServer(manager.Grid.GetNodes());
+//# sourceMappingURL=ModelController.js.map

lib/Model/ModelDemo.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+console.log("started.");
+const ClusterioMasterProxy_1 = require("./ClusterioMasterProxy");
+const ClusterManager_1 = require("./ClusterManager");
+const argv = require('minimist')(process.argv.slice(2));
+let configPath = argv['configPath'];
+if (configPath === undefined || configPath === null || configPath === "") {
+    throw new Error("configPath is null.");
+}
+;
+let config = require(configPath);
+let proxy = new ClusterioMasterProxy_1.ClusterioMasterProxy(config.masterIP, config.masterPort, config.masterAuthToken);
+function sleep(ms) {
+    return new Promise(resolve => setTimeout(resolve, ms));
+}
+// main
+(async () => {
+    let manager = new ClusterManager_1.ClusterManager();
+    manager.GenerateBasicGridOfNodes(2, 2, 'GridLockTest');
+    await proxy.CreateNodeInstancesOnLocalServer(manager.Grid.GetNodes());
+    return;
+})();
+//# sourceMappingURL=ModelDemo.js.map

lib/Model/ModelRunner.js

@@ -0,0 +1,61 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+console.log("Started.");
+const ClusterioMasterProxy_1 = require("./ClusterioMasterProxy");
+const ClusterManager_1 = require("./ClusterManager");
+const argv = require('minimist')(process.argv.slice(2));
+// arg: configPath
+// description: should point to the clusterio config.json file.
+let configPath = argv['configPath'];
+if (configPath === undefined || configPath === null || configPath === "") {
+    configPath = "../../config.json";
+}
+;
+let config = require(configPath);
+// arg: mode
+// description: should be GenerateBasicGridOfNodes for now. Can extend in future.
+let mode = argv['mode'];
+if (mode === undefined || mode === null || mode === "") {
+    throw new Error("mode is null. mode must be 'GenerateBasicGridOfNodes' (for now).");
+}
+;
+// arg: serviceHostType
+// description: what program to use to host the client.js instances.
+let serviceHostType = argv['serviceHostType'];
+if (serviceHostType === undefined || serviceHostType === null || serviceHostType === "") {
+    throw new Error("serviceHostType is null. serviceHostType must be either 'pm2' or 'screen'.");
+}
+;
+if (serviceHostType != "pm2" && serviceHostType != "screen") {
+    throw new Error("serviceHostType must be either 'pm2' or 'screen'.");
+}
+// arg: width
+// description: width of node grid
+let width = argv['width'];
+if (width === undefined || width === null || width === "") {
+    throw new Error("width is null. width must be an int > 0.");
+}
+;
+// arg: height
+// description: height of node grid
+let height = argv['height'];
+if (height === undefined || height === null || height === "") {
+    throw new Error("height is null. height must be an int > 0.");
+}
+;
+// arg: namePrefix
+// description: namePrefix of node grid
+let namePrefix = argv['namePrefix'];
+if (namePrefix === undefined || namePrefix === null || namePrefix === "") {
+    throw new Error("namePrefix is null.");
+}
+;
+let proxy = new ClusterioMasterProxy_1.ClusterioMasterProxy(config.masterIP, config.masterPort, config.masterAuthToken, serviceHostType);
+// main
+(async () => {
+    let manager = new ClusterManager_1.ClusterManager();
+    manager.GenerateBasicGridOfNodes(width, height, namePrefix);
+    await proxy.CreateNodeInstancesOnLocalServer(manager.Grid.GetNodes());
+    return;
+})();
+//# sourceMappingURL=ModelRunner.js.map

lib/Model/NodeInstance.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const Point_1 = require("./Point");
+const typescript_collections_1 = require("typescript-collections");
+/**
+ * An instance of a Factorio server. Multiple nodes can run on the same server.
+ */
+class NodeInstance {
+    constructor(name, topLeftCoordinate, width, height) {
+        this.TeleportZones = new typescript_collections_1.Dictionary();
+        this.Name = name;
+        this.Width = width;
+        this.Height = height;
+        this.TopLeftCoordinate = topLeftCoordinate;
+    }
+    get BottomRightCoordinate() {
+        return new Point_1.Point(this.TopLeftCoordinate.X + this.Width, this.TopLeftCoordinate.Y + this.Height);
+    }
+    // public AddTeleportZone(name: string, topLeftCoordinate: Point, bottomRightCoordinate: Point) {
+    //     this.TeleportZones.push(new TeleportZone(this, topLeftCoordinate, bottomRightCoordinate, name));
+    // }
+    AddTeleportZonePoint() {
+    }
+    get Key() {
+        return this.Name;
+    }
+}
+exports.NodeInstance = NodeInstance;
+//# sourceMappingURL=NodeInstance.js.map

lib/Model/Point.js

@@ -0,0 +1,57 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class Point {
+    /**
+     * Constructs a Point. Will not accept NaNs.
+     * @param x A number. Cannot be NaN.
+     * @param y A number. Cannot be NaN.
+     */
+    constructor(x, y) {
+        this.toString = () => {
+            return "(" + this.X + "," + this.Y + ")";
+        };
+        if (Number.isNaN(x)) {
+            throw new Error("x is NaN. Will not construct Point.");
+        }
+        if (Number.isNaN(y)) {
+            throw new Error("y is NaN. Will not construct Point.");
+        }
+        this.X = x;
+        this.Y = y;
+    }
+    /**
+     * Constructs a Point from a string representation in the format (x,y). Will not accept NaNs.
+     * @param vectorAsString A string in the format (x,y). Will not accept NaNs.
+     */
+    static FromString(vectorAsString) {
+        this.CheckChar('(', vectorAsString[0], vectorAsString);
+        this.CheckChar(')', vectorAsString[vectorAsString.length - 1], vectorAsString);
+        if (vectorAsString.indexOf(',') === -1) {
+            throw new Error("vectorAsString is an invalid format. Cannot find ','. fullString: " + vectorAsString);
+        }
+        let splitStr = vectorAsString.substr(1, vectorAsString.length - 2).split(',');
+        if (splitStr.length != 2) {
+            throw new Error("vectorAsString is an invalid format. Expecting string in format (x,y). fullString: " + vectorAsString);
+        }
+        let x = parseInt(splitStr[0]);
+        let y = parseInt(splitStr[1]);
+        let v = new Point(x, y);
+        return v;
+    }
+    static CheckChar(expectedChar, actualChar, fullString) {
+        if (actualChar != expectedChar) {
+            throw new Error("vectorAsString is an invalid format. Expecting: '" + expectedChar + "'. Actual: '" + actualChar + "'. fullString: " + fullString);
+        }
+    }
+    equals(obj) {
+        return this.X === obj.X && this.Y === obj.Y;
+    }
+    Add(p) {
+        return new Point(this.X + p.X, this.Y + p.Y);
+    }
+    Subtract(p) {
+        return new Point(this.X - p.X, this.Y - p.Y);
+    }
+}
+exports.Point = Point;
+//# sourceMappingURL=Point.js.map

lib/Model/Server.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+/**
+ * A server. Can contain multiple nodes (Factorio server instances).
+ */
+class Server {
+    constructor(name) {
+        this.Nodes = new Array();
+        this.Name = name;
+    }
+    AddNodeInstance(node) {
+        this.Nodes.push(node);
+    }
+}
+exports.Server = Server;
+//# sourceMappingURL=Server.js.map

lib/Model/ServiceHostType.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var ServiceHostType;
+(function (ServiceHostType) {
+    ServiceHostType[ServiceHostType["pm2"] = 0] = "pm2";
+    ServiceHostType[ServiceHostType["screen"] = 1] = "screen";
+})(ServiceHostType = exports.ServiceHostType || (exports.ServiceHostType = {}));
+//# sourceMappingURL=ServiceHostType.js.map

lib/Model/TeleportZone.js

@@ -0,0 +1,64 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const Point_1 = require("./Point");
+const TeleportZoneDirection_1 = require("./TeleportZoneDirection");
+const Config = require("./Config");
+class TeleportZone {
+    constructor(parentNode, direction, topLeftCoordinate, bottomRightCoordinate, index, targetNode) {
+        this.TopLeftCoordinate = topLeftCoordinate;
+        this.BottomRightCoordinate = bottomRightCoordinate;
+        this.ParentNode = parentNode;
+        this.Direction = direction;
+        this.Index = index;
+        this.TargetNode = targetNode;
+    }
+    get Name() {
+        return TeleportZoneDirection_1.TeleportZoneDirection[this.Direction] + " to " + this.TargetNode.Name;
+    }
+    // public AddRestriction(restrictingTeleportZone: TeleportZone) {
+    //     this.Restrictions.push(new TeleportZoneRestriction(this, restrictingTeleportZone));
+    // }
+    /**
+     * Converts this teleport zone into Factorio map co-ordinates
+     * @returns [name, topleft.x, topleft.y, width, height, zoneIndex]
+     */
+    GenerateTeleportZoneInFactorioCoordinates() {
+        // get where this zone is relative to the node itself
+        let topLeftRelativeCoordinate = this.TopLeftCoordinate.Subtract(this.ParentNode.TopLeftCoordinate);
+        // a grid coordinate point is equivalent to a 1x1 node, so bottomright = topleft.
+        // add (1,1) to translate from area representation to coordinates representing actual points.
+        let bottomRightRelativeCoordinate = this.BottomRightCoordinate
+            .Subtract(this.ParentNode.TopLeftCoordinate)
+            .Add(new Point_1.Point(1, 1));
+        // Factorio map is e.g. (-500,-500) to (500, 500) for a 1000x1000 node.
+        // We therefore need to offset our co-ordinates so that (0,0) is the center and not (width/2, height/2)
+        let m = Config.GridToFactorioCoordinateSystemMultiplier;
+        let factorioTeleportZoneTopLeft = new Point_1.Point(topLeftRelativeCoordinate.X * m - m / 2, topLeftRelativeCoordinate.Y * m - m / 2);
+        let factorioTeleportZoneBottomRight = new Point_1.Point(bottomRightRelativeCoordinate.X * m - m / 2, bottomRightRelativeCoordinate.Y * m - m / 2);
+        let zoneWidth = factorioTeleportZoneBottomRight.X - factorioTeleportZoneTopLeft.X;
+        let zoneHeight = factorioTeleportZoneBottomRight.Y - factorioTeleportZoneTopLeft.Y;
+        let tl = factorioTeleportZoneTopLeft;
+        let br = factorioTeleportZoneBottomRight;
+        let zw = Config.TeleportZoneWidth;
+        switch (this.Direction) {
+            case TeleportZoneDirection_1.TeleportZoneDirection.North:
+                return [this.Name, tl.X, tl.Y, zoneWidth, zw, this.Index + 1];
+            case TeleportZoneDirection_1.TeleportZoneDirection.West:
+                return [this.Name, tl.X, tl.Y, zw, zoneHeight, this.Index + 1];
+            case TeleportZoneDirection_1.TeleportZoneDirection.South:
+                return [this.Name, tl.X, br.Y - zw, zoneWidth, zw, this.Index + 1];
+            case TeleportZoneDirection_1.TeleportZoneDirection.East:
+                return [this.Name, br.X - zw, tl.Y, zw, zoneHeight, this.Index + 1];
+        }
+    }
+    /**
+     * Generates a zone restriction from this teleport zone to target zone
+     * @returns [zoneIndex, targetNodeName, targetZoneName]
+     */
+    GenerateZoneRestriction() {
+        let targetZone = this.TargetNode.TeleportZones.getValue(this.ParentNode.Key);
+        return [this.Index + 1, this.TargetNode.Name, targetZone.Name];
+    }
+}
+exports.TeleportZone = TeleportZone;
+//# sourceMappingURL=TeleportZone.js.map

lib/Model/TeleportZoneDirection.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var TeleportZoneDirection;
+(function (TeleportZoneDirection) {
+    TeleportZoneDirection[TeleportZoneDirection["North"] = 0] = "North";
+    TeleportZoneDirection[TeleportZoneDirection["East"] = 1] = "East";
+    TeleportZoneDirection[TeleportZoneDirection["South"] = 2] = "South";
+    TeleportZoneDirection[TeleportZoneDirection["West"] = 3] = "West";
+})(TeleportZoneDirection = exports.TeleportZoneDirection || (exports.TeleportZoneDirection = {}));
+//# sourceMappingURL=TeleportZoneDirection.js.map

lib/Model/TeleportZoneRestriction.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class TeleportZoneRestriction {
+    constructor(parentTeleportZone, restrictingTeleportZone) {
+        this.ParentTeleportZone = parentTeleportZone;
+        this.RestrictingTeleportZone = restrictingTeleportZone;
+    }
+}
+exports.TeleportZoneRestriction = TeleportZoneRestriction;
+//# sourceMappingURL=TeleportZoneRestriction.js.map

lib/Model/index.js

@@ -0,0 +1,13 @@
+"use strict";
+function __export(m) {
+    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
+}
+Object.defineProperty(exports, "__esModule", { value: true });
+__export(require("./ClusterManager"));
+__export(require("./NodeInstance"));
+__export(require("./Server"));
+__export(require("./TeleportZone"));
+__export(require("./TeleportZoneRestriction"));
+__export(require("./Point"));
+__export(require("./Grid"));
+//# sourceMappingURL=index.js.map

lib/clusterTools/getInstanceName.js

@@ -32,7 +32,7 @@ module.exports = function(config){
 		}
 	} else {
 		return async function thisAintGonnaWork(){
-			let err = new Error("getInstanceName from _app/clusterTools needs to be called with {config} to work");
+			let err = new Error("getInstanceName from lib/clusterTools needs to be called with {config} to work");
 			console.log(err);
 			throw err;
 		}

lib/dole_nn_base.js

@@ -33,12 +33,14 @@ function sigmoid3(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
+//debt - debt 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,numreq_total_adj)
+//3.New debt
+function Dose(numreq,instore,store_last_tick,dole,carry,prev_req,numreq_total_adj,debt)
 {
 	numreq=Number(numreq);
 	instore=Number(instore);
@@ -47,32 +49,37 @@ function Dose(numreq,instore,store_last_tick,dole,carry,prev_req,numreq_total_ad
 	
 	var b=Math.trunc(prev_req/instore_adj*numreq);
 	var inp1=[numreq,instore_adj,store_last_tick/numreq,dole,carry];//0..4
-	var inp2=[prev_req/numreq,numreq/numreq_total_adj,store_last_tick/numreq_total_adj,prev_req/instore_adj,b];//5..9
+	var inp2=[prev_req/numreq,numreq/numreq_total_adj,store_last_tick/numreq_total_adj,prev_req/instore_adj,b,numreq_total_adj,store_last_tick,debt];//5..12
 	var inputs=inp1.concat(inp2);
-	var internal=[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0];
+	var internal=new Array(20).fill(0);
-	var outputs=[0,0,0];
+	var outputs=[0,0,0,0];
 	//NN: Please don't touch :), code is generated
 	
-outputs[0]=inputs[2]*3.101320028;
+outputs[0]=inputs[7]*0.8058582544;
-outputs[0]=outputs[0]+inputs[7]*0.5471593142;
+outputs[0]=sigmoid2(outputs[0]);
-outputs[0]=outputs[0]+inputs[3]*2.691268921;
-outputs[0]=outputs[0]+outputs[1]*-1.64255929;
-outputs[0]=outputs[0]+inputs[6]*0.7746122479;
-outputs[0]=sigmoid0(outputs[0]);
-outputs[1]=inputs[2]*-0.9946503043;
-outputs[1]=outputs[1]+inputs[1]*0.2128598392;
 outputs[1]=sigmoid0(outputs[1]);
-outputs[2]=sigmoid2(outputs[2]);
+outputs[2]=sigmoid0(outputs[2]);
+outputs[3]=inputs[6]*0.2294657379;
+outputs[3]=sigmoid0(outputs[3]);
 
-	outputs[0]=Number(outputs[0]);
+	debt=debt || 0;
-	if (outputs[0]<0) outputs[0]=0;
+	if (outputs[0]>0.99) outputs[0]=1.0;
-	outputs[0]=outputs[0]*numreq;
+	
-	var res1=Math.round(outputs[0]);
+	var res1=Number(outputs[0])*numreq+outputs[3]+debt;
-	if (res1>numreq) res1=numreq;
+	var res_capped=Math.round(res1);
-	if (res1>instore) res1=instore;
+	
-	if (res1<0) res1=0;
+	if (res_capped>numreq) res_capped=numreq;
-	carry=sigmoid0(outputs[2]);
+	if (res_capped>instore) res_capped=instore;
-	return [res1,sigmoid0(outputs[1]),carry];
+	if (res_capped<0) res_capped=0;
+	
+	res1=res1 || 0;
+	res_capped=res_capped || 0;//Safeguard against wrong values
+	debt=res1-res_capped;
+	debt_cap=Math.round(numreq*1.5)+5;
+	if (debt>debt_cap) debt=debt_cap;
+	
+	carry=sigmoid0(outputs[2]*carry+outputs[0]) || 0;
+	return [res_capped,dole+outputs[1],carry,debt];
 }
 
 //TICK - Updates values for item X, should be called once for each item for each round of all slaves requesting that item
@@ -90,22 +97,16 @@ function Tick(instore,dole,store_last_tick,numreq_total_adj)
 {
 	var instore_adj=instore;
 	if (instore_adj==0) instore_adj=0.1;
-	var inputs=[instore,dole,store_last_tick/instore_adj,store_last_tick/numreq_total_adj];
+	var inputs=[instore,dole,store_last_tick/instore_adj,store_last_tick/numreq_total_adj,store_last_tick,numreq_total_adj];
-	var internal=[0,0,0,0,0];
+	var internal=new Array(10).fill(0);
 	var outputs=[0,0];
 	//NN: Please don't touch :), code is generated
 	
-internal[2]=sigmoid0(internal[2]);
+outputs[0]=inputs[3]*0.9364774823;
-outputs[0]=internal[2]*0.4049594998;
+outputs[0]=outputs[0]*1.0*0.4590721726;
-outputs[0]=outputs[0]+1.0*-5.026565075;
+outputs[0]=sigmoid2(outputs[0]);
-outputs[0]=outputs[0]+inputs[0]*0.9100194573;
+outputs[1]=outputs[0]*1.828422785;
-outputs[0]=outputs[0]+inputs[1]*-1.063795686;
+outputs[1]=sigmoid3(outputs[1]);
-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

lib/factorioServer/index.js

@@ -15,9 +15,8 @@ const child_process = require("child_process");
 const path = require("path");
 
 const mkdirp = require("mkdirp");
-const appRootPath = require("app-root-path");
 
-const fileOps = require("_app/fileOps");
+const fileOps = require("lib/fileOps");
 
 module.exports = class factorioServer {
 	constructor({

lib/factorioServer/index.spec.js

@@ -2,7 +2,6 @@ const assert = require("assert");
 const fs = require("fs");
 const path = require("path");
 
-const appRootPath = require("app-root-path");
 const parallel = require("mocha.parallel");
 const mkdirp = require("mkdirp");
 
@@ -75,7 +74,7 @@ describe("class factorioServer/index.js", ()=>{
 	describe(".createMap(mapName.zip)", ()=>{
 		it("creates a map file as instanceDirectory/saves/map.zip", async function(){
 			this.timeout(20000); // these test often takes a lot of time in the map creation step (4500 ms on i3 dev system)
-			let relativePath = __dirname.replace(appRootPath, "").substr(1);
+			let relativePath = path.relative('.', __dirname);
 			let server = new factorioServer({
 				instanceDirectory: path.join(relativePath, "_testData_createMap"),
 				instanceName: "Unit testing instance",
@@ -93,7 +92,7 @@ describe("class factorioServer/index.js", ()=>{
 		});
 		it("supports custom filenames", async function(){
 			this.timeout(20000);
-			let relativePath = __dirname.replace(appRootPath, "").substr(1);
+			let relativePath = path.relative('.', __dirname);
 			let server = new factorioServer({
 				instanceDirectory: path.join(relativePath, "_testData_createMap_2"),
 				instanceName: "Unit testing instance",

lib/generateSSLcert.spec.js

@@ -1,7 +1,7 @@
 var assert = require("assert");
 var fs = require("fs");
 
-var fileOps = require("_app/fileOps");
+var fileOps = require("lib/fileOps");
 var generateSSLcert = require("./generateSSLcert.js")
 
 describe("generateSSLcert.js(options)", ()=>{

lib/getInstances.js

@@ -1,4 +1,4 @@
-const fileOps = require("_app/fileOps");
+const fileOps = require("lib/fileOps");
 // const config = require("./../config");
 
 module.exports = function(config) {

lib/hash.js

@@ -0,0 +1,22 @@
+const crypto = require('crypto');
+const fs = require('fs');
+
+/**
+ * Returns a promise that resolves to the SHA1 hash of the file given by path
+ */
+exports.hashFile = function(path) {
+	return new Promise(function(resolve, reject) {
+		let hasher = crypto.createHash('sha1')
+		hasher.setEncoding('hex')
+		hasher.on('finish', function() {
+			resolve(hasher.read());
+		});
+
+		let stream = fs.createReadStream(path);
+		stream.on('error', function(error) {
+			// the docs doesn't say anything about what's passed on error
+			reject(error);
+		});
+		stream.pipe(hasher);
+	});
+}

lib/manager/modManager.js

@@ -3,7 +3,6 @@ Provides tools to manage mods in a clusterio install
 @module modManager
 */
 
-const rightpad = require("right-pad");
 const asTable = require("as-table").configure({delimiter: ' | '});
 const moment = require("moment");
 const syncRequest = require("sync-request");
@@ -13,7 +12,7 @@ const factorioAPI = require("node-factorio-api");
 const sLog = require("single-line-log").stdout;
 const query = require('cli-interact').getYesNo;
 
-const fileOps = require("_app/fileOps");
+const fileOps = require("lib/fileOps");
 // const config = require("./../../config");
 
 

lib/npmPostinstall.js

@@ -56,7 +56,6 @@ function download(url, file, callback){
 }
 
 var directories = [
-	"database/linvodb",
 	"sharedMods",
 	"instances",
 ];

lib/package.json

@@ -0,0 +1,5 @@
+{
+    "name": "lib",
+    "description": "Internal library for factorioClusterio"
+}
+

lib/scenarios/Hotpatch/control.lua

@@ -35,7 +35,7 @@ require 'hotpatch.gui'
 -- As this is part of the base mod, the developers have given permission for modders to use/adapt the assets therein, for modding Factorio
 -- 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', [===[
+hotpatch_tools.static_mod('freeplay', '0.17.50', [===[
 local util = require("util")
 local silo_script = require("silo-script")
 
@@ -127,6 +127,7 @@ remote.add_interface("freeplay",
     global.chart_distance = tonumber(value)
   end
 })
+
 ]===])
 
 -- Multi-file test

lib/scenarios/Hotpatch/hotpatch/commands.lua

@@ -1,5 +1,5 @@
 local hotpatch_tools = require 'hotpatch.mod-tools'
-hotpatch_tools.static_mod('hotpatch-commands', '1.0.1', [===[
+hotpatch_tools.static_mod('hotpatch-commands', '1.0.2', [===[
 --[[
 
 Copyright 2018 Chrisgbk

lib/scenarios/Hotpatch/hotpatch/gui.lua

@@ -1,5 +1,5 @@
 local hotpatch_tools = require 'hotpatch.mod-tools'
-hotpatch_tools.static_mod('hotpatch-gui', '1.0.4', [===[
+hotpatch_tools.static_mod('hotpatch-gui', '1.0.6', [===[
 --[[
 
 Copyright 2018 Chrisgbk
@@ -86,7 +86,6 @@ on_gui_click_handlers = {
         --on_gui_click_handlers['hotpatch-menu.IDE'](e)
         --do return end
         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
 
@@ -100,21 +99,18 @@ on_gui_click_handlers = {
         end
         menu.visible = not menu.visible
     end,
-    ['hotpatch-menu'] = function(e)
+	['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']
+        if e.element.name ~= 'hotpatch-menu' then
-        menu.visible = not menu.visible
+		    local menu = left['hotpatch-menu']
-
+            menu.visible = not menu.visible
-        on_gui_click_handlers[e.element.name](e)
+            on_gui_click_handlers[e.element.name](e)
+		end
     end,
     ['hotpatch-menu.IDE'] = 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 IDE = center['hotpatch-IDE']
@@ -155,8 +151,6 @@ on_gui_click_handlers = {
     end,
     ['hotpatch-menu.console'] = 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 hotpatch_console = center['hotpatch-console']
@@ -192,9 +186,6 @@ on_gui_click_handlers = {
     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 hotpatch_console = center['hotpatch-console']
@@ -252,8 +243,6 @@ on_gui_click_handlers = {
     end,
     ['hotpatch-IDE-file'] = 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 element = e.element
@@ -296,8 +285,6 @@ end)
 on_gui_selection_state_changed_handlers = {
     ['hotpatch-console-mod-selector'] = 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 element = e.element
@@ -316,8 +303,6 @@ on_gui_selection_state_changed_handlers = {
     end,
     ['hotpatch-IDE-mod-selector'] = 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 element = e.element
@@ -374,4 +359,19 @@ end)
 
 --]===])
 
+--[===[
+-- keeping this as a reminder
+['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.visible = not menu.visible
+
+        on_gui_click_handlers[e.element.name](e)
+    end,
+--]===]
+
 return true

lib/scenarios/Hotpatch/hotpatch/mod-tools.lua

@@ -15,6 +15,9 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 log('Hotpatch runtime initializing...')
 local util = require 'util'
 
+local compat_mode = false -- enable some compatibility settings, which can help some mods load
+local strict_mode = false -- causes hotpatch to hard-stop on mods doing bad things
+
 local debug_levels = {['disabled'] = -1, ['severe'] = 1, ['error'] = 2, ['warning'] = 3, ['info'] = 4, ['verbose'] = 5, ['trace'] = 6}
 
 -- configuration options; these should be exposed via API one day
@@ -23,12 +26,15 @@ local debug_log_to_console_only = _ENV.debug_settings.log_to_console_only
 local debug_log_to_RCON = _ENV.debug_settings.log_to_RCON --only affects when log_to_console_only is in effect
 local debug_log_on_tick = _ENV.debug_settings.log_on_tick
 
-local compat_mode = false -- enable some compatibility settings, which can help some mods load
-local strict_mode = false -- causes hotpatch to hard-stop on mods doing bad things
-
 -- convenience object(rcon.print also prints to stdout when called from server console)
 local console = {name = 'Console', admin = true, print = function(...) rcon.print(...) end, color = {1,1,1,1}}
 
+-- mapping of events to names for logging
+local event_names = {}
+for k,v in pairs(defines.events) do
+    event_names[v] = k
+end
+
 -- these represent the mods as statically packaged with the scenario
 local static_mods = {}
 --      static_mods[i] = {}
@@ -127,12 +133,6 @@ local function static_mod(name, version, code, files)
     table.insert(static_mods, mod)
 end
 
--- mapping of events to names for logging
-local event_names = {}
-for k,v in pairs(defines.events) do
-    event_names[v] = k
-end
-
 -- This scenario contains an embedded locale, but it's unavailable until this file finishes loading
 -- ie: calls to log{...} will fail right now, but will work in events
 -- Rseding91 fixed it for 0.17 (https://forums.factorio.com/viewtopic.php?f=23&t=60767)
@@ -334,7 +334,7 @@ local function debug_log(message, mod_name, stack_level)
         local class = 'hotpatch.info'
         local log_type = (mod_name and 'hotpatch.log-mod') or 'hotpatch.log'
         local severity
-		if type(message) == 'table' then
+        if type(message) == 'table' then
             severity = message[1]:match('.-%-([^%-]*)%.')
             if not severity then
                 severity = message[1]:match('.-%-.-%-(.*)%.')
@@ -346,7 +346,7 @@ local function debug_log(message, mod_name, stack_level)
         else
             severity = 'always'
         end
-		local level = ((severity == 'always') and 0) or debug_levels[severity]
+        local level = ((severity == 'always') and 0) or debug_levels[severity]
         if debug_level >= level then
             if debug_log_to_console_only then
                 if debug_log_to_RCON then
@@ -365,15 +365,15 @@ debug_log({'hotpatch-info.logging-enabled'})
 
 -- track _ENV accesses
 setmetatable(_ENV, {
-	__index = function(_, k)
+    __index = function(_, k)
-		debug_log({'hotpatch-trace.nil-var-access', k}, nil, 3)
+        debug_log({'hotpatch-trace.nil-var-access', k}, nil, 3)
-		return nil
+        return nil
-	end,
+    end,
-	__newindex = function(t, k, v)
+    __newindex = function(t, k, v)
-		debug_log({'hotpatch-trace.nil-var-assignment', k}, nil, 3)
+        debug_log({'hotpatch-trace.nil-var-assignment', k}, nil, 3)
-		rawset(t,k,v)
+        rawset(t,k,v)
-	end,
+    end,
-	__metatable = false
+    __metatable = false
 })
 
 debug_log({'hotpatch-info.metatable-installed'})
@@ -395,7 +395,7 @@ local libraries = {
 
 for k, v in pairs(libraries) do
     debug_log({'hotpatch-info.loading-library', v})
-	loaded_libraries[k] = require(v)
+    loaded_libraries[k] = require(v)
 end
 
 debug_log({'hotpatch-info.complete', {'hotpatch-info.loading-libs'}})
@@ -461,8 +461,9 @@ install_mod = function(mod_name, mod_version, mod_code, mod_files)
     local index = find_installed_mod(mod_name)
     local mod = {}
     if index then
-        -- TODO: notify about installing over top of existing mod
+        debug_log('attempt to install mod that is already installed, reinstalling: ' .. mod_name)
-        mod = global.mods[index]
+        mod = table.remove(global.mods, index)
+        table.insert(global.mods, mod)
     else
         --next free index
         table.insert(global.mods, mod)
@@ -614,20 +615,20 @@ load_mod = function(installed_index)
         -- mods private package.loaded
         local loaded = {}
         -- copy the current environment
-		for k,v in pairs(_ENV) do
+        for k,v in pairs(_ENV) do
-			env[k] = v
+            env[k] = v
-		end
+        end
         -- copy package.loaded
         for k,v in pairs(_ENV.package.loaded) do
-			loaded[k] = v
+            loaded[k] = v
-		end
+        end
         loaded._G = env
 
         -- so many ways to escape sandboxes...
 
         for k,v in pairs(_ENV.package) do
-			pack[k] = v
+            pack[k] = v
-		end
+        end
         pack.loaded = loaded
         env.package = pack
         loaded.package = pack
@@ -681,15 +682,15 @@ load_mod = function(installed_index)
             -- I blame Nexela for this
             path = path:gsub('/', '.')
             path = path:gsub('\\', '.')
-			local alt_path = ''
+            local alt_path = ''
             if env.package._current_path_in_package then
                 alt_path = env.package._current_path_in_package .. path
             end
             if mod_obj.loaded_files[path] then
                 debug_log({'hotpatch-trace.cached-load-require', path}, mod_name)
                 return mod_obj.loaded_files[path]
-			elseif mod_obj.loaded_files[alt_path] then
+            elseif mod_obj.loaded_files[alt_path] then
-				debug_log({'hotpatch-trace.cached-load-require', alt_path}, mod_name)
+                debug_log({'hotpatch-trace.cached-load-require', alt_path}, mod_name)
                 return mod_obj.loaded_files[alt_path]
             else
                 local oldbase = env.package._current_path_in_package
@@ -711,7 +712,7 @@ load_mod = function(installed_index)
                         error(err)
                     end
                 end
-				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)
@@ -728,11 +729,11 @@ load_mod = function(installed_index)
 
                 debug_log({'hotpatch-trace.load-core-lib', path}, mod_name)
                 env.package._current_path_in_package = oldbase
-				local lib = package.loaded[path]
+                local lib = package.loaded[path]
-				if not lib then
+                if not lib then
-					debug_log({'hotpatch-error.path-not-found', path}, mod_name, 3)
+                    debug_log({'hotpatch-error.path-not-found', path}, mod_name, 3)
                     error(path .. ' not found')
-				end
+                end
                 return lib
             end
         end
@@ -808,10 +809,6 @@ reset_mod = function(loaded_index)
     local install_index = find_installed_mod(mod.name)
     mod = global.mods[install_index]
     mod.global = new_global
-    --local mod_global = global.mod_global[mod_name]
-    --for k, v in pairs(mod_global) do
-    --    mod_global[k] = nil
-    --end
 
     reset_mod_events(loaded_index)
 end
@@ -833,15 +830,38 @@ reset_mod_events = function(loaded_index)
     end
 end
 
+local wrap_table
+wrap_table = function(t, path)
+    local mt = {
+        __index = function(_, k)
+        local v = rawget(t, k)
+            if type(v) == 'table' then
+                if not v.__self then
+                    local p = (path or 'global') .. '[' .. tostring(k) .. ']'
+                    return wrap_table(v, p)
+                end
+            end
+            return v
+        end,
+        __newindex = function(_, k, v)
+            local k_type = type(k)
+            local wrap = ((k_type == 'string') and '"') or ''
+            local p = (path or 'global') .. '[' .. wrap .. tostring(k) .. wrap .. ']'
+            debug_log('WARN: Assignment to global table when none was expected: '.. p, nil, 3)
+            rawset(t, k, v)
+        end
+    }
+    return setmetatable({}, mt)
+end
+
+
 run_mod = function(loaded_index)
     local mod = loaded_mods[loaded_index]
     if mod then
         local mod_name = mod.name
-        local old_global = table.deepcopy(mod.env.global)
+        local old_global =  mod.env.global
+        mod.env.global = wrap_table(old_global)
         
-        if strict_mode then
-           --mod.env.global = {}
-        end
         debug_log({'hotpatch-info.running'}, mod_name)
 
         local success, result = xpcall(mod.code, debug.traceback)
@@ -856,26 +876,8 @@ run_mod = function(loaded_index)
             return false
         end
 
-        if strict_mode then
+        mod.env.global = old_global
-            --if mod.env.global ~= {} then
+        old_global = nil
-                --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,_ in pairs(mod.env.global) do
-				mod.env.global[k] = nil
-			end
-			for k,v in pairs(old_global) do
-				mod.env.global[k] = v
-			end
-			--mod.env.global = old_global
-		end
-		old_global = nil
 
         mod.running = true
         debug_log({'hotpatch-info.complete', {'hotpatch-info.running'}}, mod_name)
@@ -1001,7 +1003,7 @@ mod_on_init = function(loaded_index)
         if mod.on_init then
             local success, result = xpcall(mod.on_init, debug.traceback)
             if not success then
-				debug_log({'hotpatch-error.on-init-failed'}, mod_name)
+                debug_log({'hotpatch-error.on-init-failed'}, mod_name)
                 debug_log(result, mod_name)
                 return false
             end
@@ -1018,13 +1020,16 @@ mod_on_load = function(loaded_index)
     if mod then
         debug_log({'hotpatch-trace.mod-on-load'}, mod.name)
         if mod.on_load then
-			--local old_global = table.deepcopy(mod.env.global)
+            local old_global =  mod.env.global
+            mod.env.global = wrap_table(table.deepcopy(old_global))
             local success, result = xpcall(mod.on_load, debug.traceback)
             if not success then
                 debug_log({'hotpatch-error.on-load-failed'}, mod_name)
                 debug_log(result, mod_name)
                 return false
             end
+            mod.env.global = old_global
+
         end
         register_mod_events(loaded_index)
         return true
@@ -1040,7 +1045,7 @@ mod_on_configuration_changed = function(loaded_index, config)
         if mod.on_configuration_changed then
             local success, result = xpcall(mod.on_configuration_changed, debug.traceback, config)
             if not success then
-				debug_log({'hotpatch-error.on-configuration-changed-failed'}, mod_name)
+                debug_log({'hotpatch-error.on-configuration-changed-failed'}, mod_name)
                 debug_log(result, mod_name)
                 return false
             end
@@ -1189,21 +1194,27 @@ on_load = function()
     end
 
     -- run mods which loaded successfully
-	local failed_mods = {}
+    local failed_mods = {}
+    --log('before')
+    --log(serpent.block(global))
+    
     for i = 1, #loaded_mods do
         if run_mod(i) then
-			if not mod_on_load(i) then
+            if not mod_on_load(i) then
-				table.insert(failed_mods, i)
+                table.insert(failed_mods, i)
-			end
+            end
-		else
+        else
-			table.insert(failed_mods, i)
+            table.insert(failed_mods, i)
-		end
+        end
     end
     
-	-- unload mods which failed to run
+    --log('after')
-	for i = 1, #failed_mods do
+    --log(serpent.block(global))    
-		unload_mod(failed_mods[i])
+    
-	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'}})
@@ -1211,16 +1222,16 @@ end
 
 on_configuration_changed = function(config)
     debug_log({'hotpatch-info.on-configuration-changed'})
-	local failed_mods = {}
+    local failed_mods = {}
     for i = 1, #loaded_mods do
         if not mod_on_configuration_changed(i, config) then
-			table.insert(failed_mods, i)
+            table.insert(failed_mods, i)
-		end
+        end
     end
 
-	for i = 1, #failed_mods do
+    for i = 1, #failed_mods do
-		unload_mod(failed_mods[i])
+        unload_mod(failed_mods[i])
-	end
+    end
     debug_log({'hotpatch-info.complete', {'hotpatch-info.on-configuration-changed'}})
 end
 
@@ -1324,7 +1335,7 @@ local mod_tools = setmetatable({
     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(level) or debug_levels[level]
+        debug_level = tonumber(level) or debug_levels[level]
     end,
 },{
     __index = mod_tools_internal,

lib/scenarios/Hotpatch/hotpatch/remote-interface.lua

@@ -1,5 +1,5 @@
 local hotpatch_tools = require 'hotpatch.mod-tools'
-hotpatch_tools.static_mod('hotpatch-remote-interface', '1.0.2', [===[
+hotpatch_tools.static_mod('hotpatch-remote-interface', '1.0.3', [===[
 --[[
 
 Copyright 2018 Chrisgbk

lib/scenarios/Hotpatch/locale/af/freeplay.cfg

@@ -1,3 +1,3 @@
-msg-intro=Hierdie is Factorio vryspel. Jou taak is om 'n vuurpyl in die buitenste ruimte in te stuur. Doen dit deur die bou van 'n Vuurpyl Silo en van daar af 'n vuurpyl te lanseer met a satelliet aan boord. Jy sal baie gevorderde tegnologiëe moet navors om die Vuurpyl Silo te ontsluit. Begin klein, werk jou pad op met outomatisering en moenie vergeet om jouself te beskerm teen die inboorlinge nie.
+msg-intro=Hierdie is Factorio vryspel. Jou taak is om 'n vuurpyl in die ruimte in te stuur. Doen dit deur 'n vuurpyl te bou en hom te lanseer. Jy sal baie gevorderde tegnologiëe moet navors om die Vuurpyl Silo te ontsluit. Begin klein, werk jou pad op met outomatisering en moenie vergeet om jouself te beskerm teen die inboorlinge nie.
-
+scenario-name=Vryspel
 

lib/scenarios/Hotpatch/locale/ar/freeplay.cfg

@@ -1,3 +1,3 @@
-msg-intro=.نييلصألا ناكسلا نم كسفن ةيامح ىسنت الو ةياهنلا ىلإ لصتل كتقيرطب لمعأو ،رفصلا نم أدبتس .خيراوصلا عماوص حتف لجأ نم ةمدقتم ايجولونكت نع ثحبلل جاتحت فوس .ةيعانصلا رامقألاب خيراوصلا قالطإو خيراوصلا عماوص ءانب قيرط نع كلذب مايقلا عيطتست .ءاضفلل اخوراص قلطت نا يه كتمهم .Factorio ـل رحلا بعللا وه اذه
+msg-intro=.بكوكلا اذه ناكس م كسفن يمحت نا ىسنت الو ,ةيكيتاموتوألا ربع كقيرط ينبتسو ,رفصلا نم أدبتس .كلت خيراوصلا قالطإ ةطحم حتف عيطتست فيكل ةروطتملا ايجولونكتلل ثاحبأب مايقلا ىلإ جاتحتس .اهنم خوراص قالطإ مث خيراوص قالطإ ةطحم ءانب قيرط نع كلذب مايقلا كنكمي ,ءاضفلا ىلإ اخوراص قلطت نا يه كتمهم ,factorioـل رحلا بعللا روط وه اذه
-
+scenario-name=رحلا بعللا
 

lib/scenarios/Hotpatch/locale/be/freeplay.cfg

@@ -1,3 +1,3 @@
-msg-intro=Гэта рэжым свабоднай гульні Factorio. Вашая мэта - запусціць ракету ў космас. Дзеля гэтага вам трэба пабудаваць ракетную шахту і саму ракету з спадарожнікам. Вы мусіце даследваць перадавыя тэхналогіі, каб навучыцца будаваць ракетную шахту. Пачынайце з малога, працуйце над аўтаматызацыяй вытворчасці, даследуйце новыя тэхналогіі і не забывайцеся на абарону ад "тутэйшых"!
+msg-intro=Гэта рэжым свабоднай гульні Factorio. Вашая мэта - запусціць ракету ў космас. Дзеля гэтага вам трэба пабудаваць ракетную шахту і саму ракету са спадарожнікам. Вы мусіце даследаваць перадавыя тэхналогіі, каб навучыцца будаваць ракетную шахту. Пачынайце з малога, працуйце над аўтаматызацыяй вытворчасці, даследуйце новыя тэхналогіі і не забывайцеся на абарону ад «тутэйшых».
-
+scenario-name=Свабодная гульня
 

lib/scenarios/Hotpatch/locale/bg/freeplay.cfg

@@ -1,3 +1,3 @@
 msg-intro=Това е режимът на свободна игра. Задачата ви е да изстреляте ракета в космоса. За това ще е нужно да построите ракетна шахта и изстреляте ракетата със спътник. Ще трябва да проучите развити технологии, които ще отключат ракетната шахта. Започнете с малко и постепенно автоматизирайте процеса, като не забравяте да се защитавате от местните форми на живот.
-
+scenario-name=Свободна игра
 

lib/scenarios/Hotpatch/locale/ca/freeplay.cfg

@@ -1,3 +1,3 @@
-msg-intro=Aquest és el mode lliure del Factorio. La vostra tasca és construir un coet i enviar-lo a l'espai. Ho haureu de fer construint un centre de coets espacials i llençant un coet amb un satèl·lit. Necessitareu investigar tecnologies avançades per poder-ho fer. Aneu pas a pas, avanceu cap a l'automatització i no oblideu protegir-vos dels natius.
+msg-intro=Aquest és el mode lliure del Factorio. La vostra tasca és construir un coet i enviar-lo a l'espai. Ho haureu de fer construint un centre de coets espacials i llençant un coet. Necessitareu investigar tecnologies avançades per poder-ho fer. Aneu pas a pas, avanceu cap a l'automatització i no oblideu protegir-vos dels natius.
-
+scenario-name=Mode lliure
 

lib/scenarios/Hotpatch/locale/cs/freeplay.cfg

@@ -1,3 +1,3 @@
-msg-intro=Toto je volná hra Factorio. Tvým úkolem je vypustit raketu do vesmíru. Postav raketové silo a vypusť raketu se satelitem. Pro odemknutí raketového sila budeš muset vyzkoumat pokročilé technologie. Začni v malém, postupuj s automatizací a nezapomeň se chránit před domorodci.
+msg-intro=Toto je volná hra Factorio. Tvým úkolem je vypustit raketu do vesmíru. Postav raketové silo a vypusť raketu. Pro odemknutí raketového sila budeš muset vyzkoumat pokročilé technologie. Začni v malém, postupuj s automatizací a nezapomeň se chránit před domorodci.
-
+scenario-name=Volná hra
 

lib/scenarios/Hotpatch/locale/da/freeplay.cfg

@@ -1,3 +1,3 @@
-msg-intro=Det her er Factorio fri leg. Din opgave er at affyre en raket for at udforske rummet. For at gøre det skal du bygge en raket silo og affyre en raket med en satellit i. Du bliver nød til at udforske avancerede teknologier for at at kunne bygge en raket silo. Start småt, og arbejd din vej op med hjælp af automatisering, glem ikke at beskytte dig fra de indfødte.
+msg-intro=Dette er Factorio freeplay. Din opgave er at affyre en raket ud i rummet. Gør dette ved at konstruere en raketsilo og affyr en raket. Du bliver nød til at undersøge avancerede teknologier for at låse op for raketsiloen. Start småt og arbejd din vej op med automatisering og glem ikke at beskytte dig selv fra de indfødte.
-
+scenario-name=Fri lej
 

lib/scenarios/Hotpatch/locale/de/freeplay.cfg

@@ -1,3 +1,3 @@
-msg-intro=Dies ist das freie Spiel von Factorio. Deine Aufgabe ist es, eine Rakete in den Weltraum zu starten. Dazu musst Du ein Raketensilo bauen und eine Rakete mit einem Satelliten starten. Du wirst erweiterte Technologien erforschen müssen, um das Raketensilo freizuschalten. Fange klein an, arbeite Dich durch Automatisierung hoch und vergiss nicht, Dich vor den Einheimischen zu schützen.
+msg-intro=Du befindest dich im freien Spiel Modus von Factorio. Ziel ist es, eine Rakete ins Weltall zu schicken. Baue hierzu das Raketensilo um die Rakete starten zu können. Um das Raketensilo freischalten zu können wirst du fortgeschrittene Technologien erforschen müssen. Fange klein an und erforsche die Automation. Vergiss aber nicht, dich vor den Ureinwohner zu schützen.
-
+scenario-name=Freies Spiel
 

lib/scenarios/Hotpatch/locale/el/freeplay.cfg

@@ -1,3 +1,3 @@
-msg-intro=Αυτό είναι το ελεύθερο παιχνίδι του Factorio. Ο στόχος σου είναι να εκτοξεύσεις έναν πύραυλο στο διάστημα. Αυτό το κάνεις κατασκευάζοντας ένα σιλό πυραύλου και εκτοξεύοντας έναν πυραύλο με δορυφόρο. Θα πρέπει να ερευνήσεις προηγμένες τεχνολογίες για να ξεκλειδώσεις το σιλό πυραύλου. Ξεκινάς περιορισμένος, δούλεψε με αυτοματισμούς για την άνοδο σου και μην ξεχνάς να προστατέψεις τον εαυτό σου από τους ντόπιους.
+msg-intro=Αυτό είναι το ελεύθερο παιχνίδι του Factorio. Ο στόχος σας είναι να εκτοξεύσετε έναν πύραυλο στο διάστημα. Αυτό το κάνετε κατασκευάζοντας ένα σιλό πυραύλου και εκτοξεύοντας έναν πύραυλο. Θα πρέπει να ερευνήσετε προηγμένες τεχνολογίες για να ξεκλειδώσετε το σιλό πυραύλου. Ξεκινήστε χαμηλά, φτάστε ψηλά χρησιμοποιώντας αυτοματισμούς και μην ξεχάσετε να προστατέψετε τον εαυτό σας από τους ντόπιους.
-
+scenario-name=Ελεύθερο παιχνίδι
 

lib/scenarios/Hotpatch/locale/en/freeplay.cfg

@@ -1,2 +1,2 @@
-msg-intro=This is the Factorio freeplay. Your task is to launch a rocket into space. Do this by constructing a Rocket Silo and launching a rocket with a satellite. You will need to research advanced technologies in order to unlock the Rocket Silo. Start small, work your way up with automation and don't forget to protect yourself from the natives.
+msg-intro=This is the Factorio freeplay. Your task is to launch a rocket into space. Do this by constructing a rocket silo and launching a rocket. You will need to research advanced technologies in order to unlock the rocket silo. Start small, work your way up with automation and don't forget to protect yourself from the natives.
-
+scenario-name=Freeplay

lib/scenarios/Hotpatch/locale/eo/freeplay.cfg

@@ -1,3 +1,2 @@
-msg-intro=Tio estas la Factorio Libera Ludado. Via tasko estas ĵeti raketon en spacon. Fari tiun per konstruanta Raketo Silo kaj ĵeti raketon kun satelito. Vi bezonos esplori altnivelaj teknologioj por malŝlosi la Raketo Silo. Start malgranda, labori vian vojon supren per aŭtomatigo kaj ne forgesu protekti vin mem de la indiĝenoj.
+scenario-name=Libera Ludado
-
 

lib/scenarios/Hotpatch/locale/es-ES/freeplay.cfg

@@ -1,3 +1,3 @@
 msg-intro=Este es el modo de juego libre de Factorio. Tu tarea es la de lanzar un cohete al espacio. Logra esto construyendo un Silo de Cohetes y lanzando un cohete con un satélite. Necesitarás investigar tecnologías avanzadas para poder desbloquear el Silo de Cohetes. Comienza poco a poco, trabaja en tu sistema de automatización y no te olvides de protegerte de los nativos.
-
+scenario-name=Modo libre
 

lib/scenarios/Hotpatch/locale/et/freeplay.cfg

@@ -1,3 +1,2 @@
-msg-intro=See on Factorio vabamäng. Sinu eesmärgiks on saata rakett avakosmosesse. Seda saad teha ehitades Raketi Silotorni ja lennutades Raketti koos satelliidiga. Selleks pead õppima selgeks keerukad tehnoloogiaharud, et Raketi Silotorni lahti lukustada. Alusta väikselt ning liigu edasi automatiseerimise abil ja ära unusta ennast kaitsta kohalike eluvormide eest.
+scenario-name=Vabamäng
-
 

lib/scenarios/Hotpatch/locale/fi/freeplay.cfg

@@ -1,3 +1,3 @@
 msg-intro=Tämä on Factorion vapaapelimuoto. Tavoitteesi on lähettää satelliitti ulkoavaruuteen rakentamalla rakettisiilo ja laukaisemalla raketti. Rakettisiilon voit rakentaa vasta, kun olet kehittänyt siihen tarvittavat huipputeknologiat. Aloita pienestä ja automatisoi kaikki tarvittava, äläkä unohda suojella itseäsi alkuasukkailta.
-
+scenario-name=Vapaapeli
 

lib/scenarios/Hotpatch/locale/fr/freeplay.cfg

@@ -1,3 +1,3 @@
-msg-intro=Il s'agit du mode de jeu libre de Factorio. Votre tâche consiste à lancer une fusée dans l'espace. Ceci en construisant un silo à fusée, et en lançant un satellite avec la fusée. Vous aurez besoin de rechercher des technologies de pointe afin de débloquer le silo. Commencez petit, évoluez en automatisant et n'oubliez pas de vous protéger contre les autochtones.
+msg-intro=Il s'agit du mode de jeu libre de Factorio. Votre tâche consiste à lancer une fusée dans l'espace. Faites ceci en construisant une fusée et en la lançant dans l'espace. Vous aurez besoin de rechercher des technologies de pointe afin de débloquer le silo. Commencez petit, évoluez en automatisant et n'oubliez pas de vous protéger contre les autochtones.
-
+scenario-name=Jeu libre
 

lib/scenarios/Hotpatch/locale/he/freeplay.cfg

@@ -1,3 +1,3 @@
-msg-intro=.םיימוקמה םירוציה ינפמ םכמצע לע ןגהל וחכשת לאו ,יטמוטוא ןוכימ תועצמאב םכלש הישעתה תא וביחרה ,ןטקב וליחתה .ןקתמה תיינב תא רשפאל ידכ תומדקתמ תויגולונכט רוקחל םכילע היהי .ןייוול ליכמה ליט ותועצמאב רגשלו םיליט רוגיש ןקתמ תונבל םכילע .ללחל ליט רגשל איה םכתמישמ .ויִרֹוטְקַפ לש ישפוחה שיחרתה והז
+msg-intro=.םיימוקמה םירוציה ינפמ םכמצע לע ןגהל וחכשת לאו ,יטמוטוא ןוכימ תועצמאב םכלש הישעתה תא וביחרה ,ןטקב וליחתה .ןקתמה תיינב תא רשפאל ידכ תומדקתמ תויגולונכט רוקחל םכילע היהי .ליט ותועצמאב רגשלו םיליט רוגיש ןקתמ תונבל םכילע .ללחל ליט רגשל איה םכתמישמ .ויִרֹוטְקַפ לש ישפוחה שיחרתה והז
-
+scenario-name=ישפוח קחשמ
 

lib/scenarios/Hotpatch/locale/hu/freeplay.cfg

@@ -1,3 +1,3 @@
 msg-intro=Ez a Factorio szabad játék módja. A feladatod az, hogy kilőj egy rakétát az űr felderítésére. Ehhez egy Rakétasilót kell építened, melyből aztán egy műholddal felszerelt rakétát kell kilőnöd. A Rakétasiló kifejlesztéséhez különféle technológiákat kell fejlesztened. Kezdj kicsiben és küzdd fel magad az automatizálásban. Ne felejts el védekezni a honos fajok ellen.
-
+scenario-name=Szabad játék
 

lib/scenarios/Hotpatch/locale/it/freeplay.cfg

@@ -1,3 +1,3 @@
-msg-intro=Questa è la modalità libera di Factorio. Il tuo obiettivo è quello di lanciare il razzo nello spazio. Completalo costruendo un Silo per Razzi e lanciando il razzo con il satellite. Avrai bisogno di ricercare tecnologie avanzate per riuscire a sbloccare il Silo per Razzi. Inizia in piccolo, espandi con l'automazione e non dimenticare di proteggerti dai nativi.
+msg-intro=Questa è la modalità libera di Factorio. Il tuo obiettivo è quello di lanciare un razzo nello spazio e per farlo dovrai costruire un silo per razzi. Avrai bisogno di fare ricerche avanzate per sbloccare il silo. Inizia con poco, lavora sull'automazione e non dimenticarti di difenderti dai nativi.
-
+scenario-name=Gioco libero
 

lib/scenarios/Hotpatch/locale/ja/freeplay.cfg

@@ -1,3 +1,3 @@
-msg-intro=これは、Factorioのフリープレイです。ロケットサイロを建造し、衛星を載せたロケットを宇宙へ打ち上げるのがあなたの任務です。ロケットサイロをアンロックするためには高度な技術研究をする必要があります。小規模に始め、自動化しつつ進み、原住生物から身を守ることも忘れないでください。
+msg-intro=これは、Factorioのフリープレイです。ロケットサイロを建造し、ロケットを宇宙へ打ち上げるのがあなたの任務です。ロケットサイロの建造を行うためには高度な技術研究を行う必要があります。小規模に始め、自動化しつつ進み、原住生物から身を守ることも忘れないでください。
-
+scenario-name=フリープレイ
 

lib/scenarios/Hotpatch/locale/ko/freeplay.cfg

@@ -1,3 +1,3 @@
-msg-intro=Factorio 자유플레이입니다. 당신의 목표는 우주로 로켓을 발사하는 것입니다. 로켓 격납고를 건설하고 인공위성을 탑재한 로켓을 발사하여 이 목표를 달성하세요. 로켓 격납고의 잠금을 해제하기 위해 고급 기술들을 연구할 필요가 있습니다. 작은 것부터 시작해 자동화로 차근차근 발전하고, 토착 생물로부터 자신을 보호하는 것도 잊지 마세요.
+msg-intro=Factorio 자유플레이입니다. 당신의 목표는 우주로 로켓을 발사하는 것입니다. 로켓 격납고를 건설하고 로켓을 발사하여 이 목표를 달성하세요. 로켓 격납고의 잠금을 해제하기 위해 고급 기술들을 연구할 필요가 있습니다. 작은 것부터 시작해 자동화로 차근차근 발전하고, 토착 생물로부터 자신을 보호하는 것도 잊지 마세요.
-
+scenario-name=자유플레이
 

lib/scenarios/Hotpatch/locale/lt/freeplay.cfg

@@ -1,3 +1,3 @@
 msg-intro=Tai Factorio laisvas žaidimas. Jūsų užduotis - paleisti raketą į kosmosą. Tam reikia pastatyti Raketos šachtą ir paleisti raketą su palydovu. Reikės atrasti pažangias technologijas kad atrakintumėte Raketos šachtą. Pradėkite palengva, tobulinkite automatiką ir neužmirškite apsisaugoti nuo vietinių.
-
+scenario-name=Žaisti laisva forma
 

lib/scenarios/Hotpatch/locale/lv/freeplay.cfg

@@ -1,2 +1,2 @@
-msg-intro=Šis ir Factorio brīvais režīms. Tavs uzdevums ir palaist raķeti kosmosā. Lai to izdarītu, tev vajadzēs uzbūvēt palaišanas platformu un palaist raķeti ar satelītu. Tev būs jāizpēta sarežģītas tehnoloģijas, lai atbloķētu palaišanas platformu. Sāc no mazumiņa, strādā un neaizmirsti pasargāt sevi no šīs planētas iemītniekiem...
+scenario-name=Brīvspēle
 

lib/scenarios/Hotpatch/locale/nl/freeplay.cfg

@@ -1,3 +1,3 @@
-msg-intro=Dit is Factorio vrij spel. Je taak is om een raket te lanceren in de ruimte. Bouw hiervoor een raket-silo en lanceer een raket met een satelliet. Je zult geavanceerde technologieën moeten onderzoeken om de raket-silo vrij te spelen. Begin op kleine schaal, breidt uit en automatiseer je fabriek en vergeet niet jezelf te beschermen tegen de inheemse bewoners.
+msg-intro=Dit is Factorio vrij spel. Je taak is om een raket te lanceren in de ruimte. Bouw hiervoor een raket-silo en lanceer een raket. Je zult geavanceerde technologieën moeten onderzoeken om de raket-silo vrij te spelen. Begin op kleine schaal, breidt uit en automatiseer je fabriek en vergeet niet jezelf te beschermen tegen de inheemse bewoners.
-
+scenario-name=Freeplay
 

lib/scenarios/Hotpatch/locale/no/freeplay.cfg

@@ -1,3 +1,3 @@
-msg-intro=Dette er Factorio frispilling. Din oppgave er å sende en rakett til verdensrommet. Bygg en rakettsilo og send opp en rakett med en satellitt. Du blir nødt til å utforske avanserte teknologier for å få tilgang til rakettsiloen. Begynn i det små, jobb deg oppover med hjelp av automatisering, men ikke glem å beskytte deg mot de innfødte.
+msg-intro=Dette er Factorio freeplay. Din oppgave er å sende en rakett til verdensrommet. Bygg en rakettsilo og send opp en rakett med en satellitt. Du blir nødt til å utforske avanserte teknologier for å få tilgang til rakettsiloen. Begynn i det små, jobb deg oppover med hjelp av automatisering, men ikke glem å beskytte deg mot de innfødte.
-
+scenario-name=Frittspill
 

lib/scenarios/Hotpatch/locale/pl/freeplay.cfg

@@ -1,3 +1,3 @@
-msg-intro=To jest swobodna rozgrywka Factorio. Twoim zadaniem jest wysłanie rakiety w kosmos. Skonstruuj silos rakietowy i wystrzel z niego rakietę z satelitą. Żeby odblokować silos rakietowy będziesz musiał odkryć zaawansowane technologie. Rozpocznij od podstaw, rozwijaj się wykorzystując automatyzację i nie zapomnij o obronie przed rodzimymi mieszkańcami planety.
+msg-intro=Oto swobodna rozgrywka Factorio. Twoim zadaniem jest wysłanie rakiety w kosmos. Dokonaj tego przez skonstruowanie silosu rakietowego i wystrzelenie rakiety. Żeby odblokować silos rakietowy będziesz musiał odkryć zaawansowane technologie. Rozpocznij od podstaw, rozwijaj się wykorzystując automatyzację i nie zapomnij o obronie przed rodzimymi mieszkańcami planety.
-
+scenario-name=Gra swobodna
 

lib/scenarios/Hotpatch/locale/pt-BR/freeplay.cfg

@@ -1,3 +1,3 @@
-msg-intro=Este é o modo livre do Factorio. Sua missão é lançar um foguete no espaço. Para fazer isso construa um centro de lançamento de foguetes e lance o foguete com um satélite. Você vai precisar pesquisar tecnologias avançadas para conseguir desbloquear um Centro de lançamento. Comece do começo, continue na automação e não se esqueça de se proteger dos nativos.
+msg-intro=Este é o modo livre de Factorio. Sua tarefa é lançar um foguete no espaço. Faça isso construindo um silo de foguetes e lançando um foguete. Você precisará pesquisar tecnologias avançadas para desbloquear o silo de foguetes. Comece pequeno, trabalhe seu caminho com automação e não se esqueça de se proteger dos nativos.
-
+scenario-name=Jogo livre
 

lib/scenarios/Hotpatch/locale/pt-PT/freeplay.cfg

@@ -1,3 +1,3 @@
-msg-intro=Este é o jogo livre Factorio. A tua tarefa é lançar um foguetão para explorar o espaço. Faça isto, construindo um Silo de Foguetão e lançar um foguetão com um satélite. Tu vais precisar de pesquisar tecnologias avançadas para poderes desbloquear o Silo de Foguetão. Começa simples, trabalha e evolui com a automação e não te esqueças de proteger-te dos nativos.
+msg-intro=Este é o modo livre do Factorio. O teu objetivo é lançar um foguetão para o espaço. Faz isto, contruindo um silo de foguetão e lançando-o.\nVais precisar de pesquisar tecnologias avançadas para desploquear o silo de foguetão. Começa simples, e trabalha e evolui com automação mas não te esqueças de proteger do nativos.
-
+scenario-name=Modo Livre
 

lib/scenarios/Hotpatch/locale/ro/freeplay.cfg

@@ -1,3 +1,3 @@
-msg-intro=Acesta este modul Factorio freeplay. Sarcina ta este de a lansa o rachetă în spațiu. Fă acest lucru prin construirea unui siloz de rachete și lansarea unei rachete cu satelit. Va trebui să cercetezi tehnologiile avansate pentru a debloca silozul de rachete. Începe încet, avansează cu automatizarea și nu uita să te protejezi de inamici.
+msg-intro=Acesta este modul Factorio freeplay. Sarcina ta este de a lansa o racheta în spațiu. Fă acest lucru prin construirea unui siloz de rachete și lansarea unei rachete. Va trebui să cercetezi tehnologiile avansate pentru a debloca silozul de rachete. Începe mic, avansează cu automatizarea și nu uita să te protejezi de nativi.
-
+scenario-name=Freeplay
 

lib/scenarios/Hotpatch/locale/ru/freeplay.cfg

@@ -1,3 +1,3 @@
-msg-intro=Это режим свободной игры Factorio. Ваша задача запустить спутник в космос. Для его запуска потребуется создать ракету и ракетную шахту. Начните с малого, работайте над автоматизацией производства, исследуйте новые технологии и не забывайте о защите от местных форм жизни.
+msg-intro=Это режим свободной игры Factorio. Ваша задача - запустить ракету в космос. Для её запуска потребуется исследовать новые технологии и создать ракетную шахту. Начните с малого, работайте над автоматизацией производства и не забывайте о защите от местных форм жизни.
-
+scenario-name=Свободная игра
 

lib/scenarios/Hotpatch/locale/sk/freeplay.cfg

@@ -1,3 +1,3 @@
-msg-intro=Toto je voľná hra Factorio. Tvojou úlohou je vypustiť raketu do vesmíru. Postav raketové silo a vypusti raketu so satelitom. Pre odomknutie raketového sila budeš musieť vyskúmať pokročilé technológie. Začni v malom, postupuj s automatizáciou a nezabnudni sa chrániť pred domácimi.
+msg-intro=Toto je voľná hra Factorio. Tvojou úlohou je vypustiť raketu do vesmíru. Postav raketové silo a vypusti raketu. Pre odomknutie raketového sila budeš musieť vyskúmať pokročilé technológie. Začni v malom, postupuj s automatizáciou a nezabnudni sa chrániť pred domácimi.
-
+scenario-name=Voľná hra
 

lib/scenarios/Hotpatch/locale/sl/freeplay.cfg

@@ -1,3 +1,3 @@
 msg-intro=To je Factorio freeplay. Vaša naloga je poslati raketo v vesolje. To storite tako, da zgradite silos za raketo in jo skupaj s satelitom izstrelite v vesolje. Raziskati bo potrebno napredne tehnologije, da bi lahko odklenili Raketni silos. Začnete z majhnim, nato nadgradite vse s pomočjo avtomatizacije in ne pozabite, zaščitite se pred domorodci.
-
+scenario-name=Prosta igra
 

lib/scenarios/Hotpatch/locale/sv-SE/freeplay.cfg

@@ -1,3 +1,3 @@
 msg-intro=Det här är Factorio frispel. Ditt uppdrag är att avfyra en raket ut i rymden. Gör det genom att tillverka en raket silo och avfyra en raket med en satellit. Du kommer att behöva forska fram avancerade teknologier för att kunna låsa upp raket silon. Börja smått, jobba dig uppåt med hjälp av automatisering och glöm inte att försvara dig själv mot infödingarna.
-
+scenario-name=Frispel
 

lib/scenarios/Hotpatch/locale/th/freeplay.cfg

@@ -1,3 +1,2 @@
-msg-intro=นี้คือโหมดอิสระของ Factorio ภารกิจของคุณคือส่งจรวดสู่อวกาศ ซึ่งทำได้โดยการสร้างไซโลจรวดและส่งจรวดขึ้นไปพร้อมกับดาวเทียม คุณต้องวิจัยค้นคว้าเทคโนโลยีขั้นสูงเพื่อปลดล็อคไซโลจรวด เริ่มจากเล็กๆไปเรื่อยๆด้วยระบบอัตโนมัติและอย่าลืมป้องกันตัวเองจากคนพื้นเมืองด้วย
+scenario-name=โหมดอิสระ
-
 

lib/scenarios/Hotpatch/locale/tr/freeplay.cfg

@@ -1,3 +1,3 @@
-msg-intro=Bu Factorio'nun serbest oynanışı. Görevin roketleri uzaya yollamak. Bunu Roket Silosu yaparak ve uyduyla roket yollayarak yapacaksın. Roket Silo'sunu açmak için gelişmiş teknolojileri sırayla açmalısın. Yavaş başla, otomatikleş ve yerlilerden kendini korumayı untuma.
+msg-intro=Bu Factorio'nun serbest oynanışıdır. Göreviniz uzaya bir roket göndermek. Bunu roket rampası inşa edip ve Roket fırlatarak yapınız. Roket rampasını açmak için gelişmiş teknolojileri araştırmanız gerekecek. Ufaktan başlayın ve otomasyonla büyüyün, ve yerlilerden kendiniz korumayı unutmayın.
-
+scenario-name=Serbest Oyun
 

lib/scenarios/Hotpatch/locale/uk/freeplay.cfg

@@ -1,3 +1,3 @@
-msg-intro=Це один з типів гри в Factorio - "Вільна гра". Ваше завдання - запустити ракету у космічний простір. Зробіть це, побудувавши ракетну шахту та запустивши ракету зі супутником. Вам потрібно дослідити передові технології, щоб мати змогу побудувати ракетну шахту. Починайте з малого, розвивайтеся за допомогою автоматизації, але не забувайте і про оборону!
+msg-intro=Це один з типів гри в Factorio — "Вільна гра". Ваше завдання — запустити ракету у космічний простір. Зробіть це, побудувавши ракетну шахту та запустивши ракету. Вам потрібно дослідити передові технології, щоб мати змогу побудувати ракетну шахту. Починайте з малого, розвивайтеся за допомогою автоматизації, але не забувайте і про оборону.
-
+scenario-name=Вільна гра
 

lib/scenarios/Hotpatch/locale/vi/freeplay.cfg

@@ -1,3 +1,3 @@
-msg-intro=Đầy là chế độ freeplay của Factorio. Nhiệm cụ của bạn là phóng một chiếc tên lửa lên vũ trụ. Hãy xây dựng một bệ phóng tên lửa để phóng một chiếc tên lửa kèm theo vệ tinh. Bạn sẽ cần phải nghiên cứu nhiều công nghệ tiên tiến để có thể xây dựng bệ phóng tên lửa. Bắt đầu từ quy mô nhỏ, phát triển dần dần bằng tự động hóa, và đừng quên bảo vệ bản thân mình khỏi những sinh vật sinh sống ở đây.
+msg-intro=Đầy là chế độ chơi tự do của Factorio. Nhiệm vụ của bạn là phóng một chiếc tên lửa lên vũ trụ bằng cách xây dựng một bệ phóng. Bạn sẽ cần phải nghiên cứu nhiều công nghệ tiên tiến để có thể xây dựng bệ phóng đó. Hãy bắt đầu nhỏ, rồi phát triển từng bước bằng tự động hóa, và đừng quên bảo vệ chính mình khỏi những sinh vật ở đây.
-
+scenario-name=Chơi tự do
 

lib/scenarios/Hotpatch/locale/zh-CN/freeplay.cfg

@@ -1,3 +1,3 @@
-msg-intro=欢迎来到异星工厂标准模式，你的目标是要把火箭发射到太空。为此你需要研发一系列高等科技，解锁并修建火箭发射井，直到把携带有卫星的火箭发射出去。从小作坊生产起步，逐渐建立起属于自己的自动化大工厂吧！同时，别忘了防范异星虫子的骚扰 ...
+msg-intro=欢迎来到异星工厂标准模式，你的目标是要把火箭发射到太空。为此你需要研发一系列高等科技，修建火箭发射井，最后发射火箭。从小作坊生产起步，逐渐建立起属于自己的自动化大工厂吧！同时，别忘了防范异星虫子们的骚扰 ...
-
+scenario-name=标准模式
 

lib/scenarios/Hotpatch/locale/zh-TW/freeplay.cfg

@@ -1,3 +1,3 @@
-msg-intro=這是異星工廠的自由模式。你的任務是發射火箭，探索外太空。請建造一個火箭發射井，並發射攜帶著衛星的火箭。你會需要研究大量的進階科技以解鎖火箭發射井。從頭開始，靠著自動化科技的協助向目標邁進時，也別忘記從外星住民手的中保護你自己啊！
+msg-intro=這是異星工廠的自由模式。你的任務是發射火箭探索外太空。請建造火箭發射井並發射火箭。你會需要研究大量的進階科技以解鎖火箭發射井。從頭開始，靠著自動化的協助邁向目標的同時，也別忘了從外星住民手中保護你自己。
-
+scenario-name=自由模式
 

master.js

@@ -1,7 +1,6 @@
 /**
 Clusterio master server. Facilitates communication between slaves through
-a webserver, storing data related to slaves like production graphs and
+a webserver, storing data related to slaves like production graphs.
-combinator signals.
 
 @module clusterioMaster
 @author Danielv123
@@ -26,10 +25,6 @@ process.on('unhandledRejection', r => console.log(r));
 // configgy stuff
 debug = false;
 
-// reduces loadtime from 1700 ms to 1200 ms on my i3 + SSD
-// tested by logging Date.now() here and when the webserver started listening
-require('cache-require-paths');
-
 // argument parsing
 const args = require('minimist')(process.argv.slice(2));
 
@@ -40,14 +35,13 @@ const deepmerge = require("deepmerge");
 const path = require("path");
 const fs = require("fs-extra");
 const jwt = require('jsonwebtoken');
-const bcrypt = require('bcryptjs');
 const crypto = require('crypto');
 const base64url = require('base64url');
 const moment = require("moment");
-const request = require("request")
+const request = require("request");
 
 // constants
-console.log(`Requiring config from ${args.config || './config'}`)
+console.log(`Requiring config from ${args.config || './config'}`);
 const config = require(args.config || './config');
 config.databaseDirectory = args.databaseDirectory || config.databaseDirectory || "./database";
 const masterModFolder = path.join(config.databaseDirectory, "/masterMods/");
@@ -55,12 +49,10 @@ mkdirp.sync(config.databaseDirectory);
 mkdirp.sync(masterModFolder);
 
 // homebrew modules
-const getFactorioLocale = require("./lib/getFactorioLocale");
+const getFactorioLocale = require("lib/getFactorioLocale");
-const stringUtils = require("./lib/stringUtils");
-const fileOps = require("_app/fileOps");
 
 // homemade express middleware for token auth
-const authenticate = require("./lib/authenticate")(config);
+const authenticate = require("lib/authenticate")(config);
 
 /** Sync */
 function randomStringAsBase64Url(size) {
@@ -68,7 +60,7 @@ function randomStringAsBase64Url(size) {
 }
 if (!fs.existsSync("secret-api-token.txt")) {
 	config.masterAuthSecret = randomStringAsBase64Url(256);
-    fs.writeFileSync("config.json",JSON.stringify(config, null, 4));
+	fs.writeFileSync("config.json",JSON.stringify(config, null, 4));
 	fs.writeFileSync("secret-api-token.txt", jwt.sign({ id: "api" }, config.masterAuthSecret, {
 		expiresIn: 86400*365 // expires in 1 year
 	}));
@@ -90,7 +82,9 @@ const fileUpload = require('express-fileupload');
 var app = express();
 
 app.use(cookieParser());
-app.use(bodyParser.json());
+app.use(bodyParser.json({
+	limit: '10mb',
+}));
 app.use(bodyParser.urlencoded({
 	parameterLimit: 100000,
 	limit: '10mb',
@@ -176,18 +170,13 @@ const prometheusUPSGauge = new Prometheus.Gauge({
 	help: 'UPS of the current server',
 	labelNames: ["instanceID", "instanceName"],
 });
-const prometheusTickGauge = new Prometheus.Gauge({
-	name: prometheusPrefix+'tick_gauge',
-	help: 'Servers current gametick',
-	labelNames: ["instanceID", "instanceName"],
-});
 const prometheusMasterInventoryGauge = new Prometheus.Gauge({
 	name: prometheusPrefix+'master_inventory_gauge',
 	help: 'Amount of items stored on master',
 	labelNames: ["itemName"],
 });
 setInterval(()=>{
-    fs.writeFileSync("database/items.json", JSON.stringify(db.items));
+	fs.writeFileSync("database/items.json", JSON.stringify(db.items));
 },config.autosaveInterval || 60000);
 /**
 GET Prometheus metrics endpoint. Returns performance and usage metrics in a prometheus readable format.
@@ -235,7 +224,7 @@ const db = {};
 
 (function(){
 	try{
-		let x = fs.statSync(path.resolve(config.databaseDirectory, "/slaves.json"));
+		let x = fs.statSync(path.resolve(config.databaseDirectory, "slaves.json"));
 		console.log(`loading slaves from path.resolve(config.databaseDirectory, "slaves.json")`);
 		slaves = JSON.parse(fs.readFileSync(path.resolve(config.databaseDirectory, "slaves.json")));
 	} catch (e){
@@ -248,7 +237,7 @@ const db = {};
 	} catch (e){
 		db.items = {};
 	}
-})()
+})();
 
 db.items.addItem = function(object) {
 	if(object.name == "addItem" || object.name == "removeItem") {
@@ -262,7 +251,7 @@ db.items.addItem = function(object) {
 		}
 		return true;
 	}
-}
+};
 db.items.removeItem = function(object) {
 	if(object.name == "addItem" || object.name == "removeItem") {
 		console.error("Fuck you, that would screw everything up if you named your item that.");
@@ -275,7 +264,7 @@ db.items.removeItem = function(object) {
 		}
 		return true;
 	}
-}
+};
 
 // store slaves and inventory in a .json full of JSON data
 process.on('SIGINT', shutdown); // ctrl + c
@@ -308,8 +297,8 @@ async function shutdown() {
 		console.log("Clusterio cleanly exited in "+(Date.now()-exitStartTime)+"ms");
 		process.exit(0);
 	} catch(e) {
-		console.log(e)
+		console.log(e);
-		console.log("Clusterio failed to exit cleanly. Time elapsed: "+(Date.now()-exitStartTime)+"ms")
+		console.log("Clusterio failed to exit cleanly. Time elapsed: "+(Date.now()-exitStartTime)+"ms");
 		process.exit(1)
 	}
 }
@@ -340,6 +329,7 @@ app.post("/api/getID", authenticate.middleware, function(req,res) {
 		}
 		// console.log("Slave registered: " + slaves[req.body.unique].mac + " : " + slaves[req.body.unique].serverPort+" at " + slaves[req.body.unique].publicIP + " with name " + slaves[req.body.unique].instanceName);
 	}
+	res.sendStatus(200);
 });
 /**
 POST Allows you to add metadata related to slaves for other tools, like owner data, descriptions or statistics.
@@ -352,16 +342,18 @@ app.post("/api/editSlaveMeta", authenticate.middleware, function(req,res) {
 	// request.body should be an object
 	// {instanceID, pass, meta:{x,y,z}}
 
-	if(req.body && req.body.instanceID && req.body.password && req.body.meta){
+	if(req.body && req.body.instanceID && req.body.meta){
-		// check for editing permissions
+		if(slaves[req.body.instanceID]){
-		if(slaves[req.body.instanceID] && slaves[req.body.instanceID].rconPassword == req.body.password){
+			if(!slaves[req.body.instanceID].meta) {
-			if(!slaves[req.body.instanceID].meta){
 				slaves[req.body.instanceID].meta = {};
 			}
 			slaves[req.body.instanceID].meta = deepmerge(slaves[req.body.instanceID].meta, req.body.meta, {clone:true});
 			let metaPortion = JSON.stringify(req.body.meta);
-			if(metaPortion.length > 50) metaPortion = metaPortion.substring(0,20) + "...";
+			if(metaPortion.length > 50) {
+				metaPortion = metaPortion.substring(0,20) + "...";
+			}
 			// console.log("Updating slave "+slaves[req.body.instanceID].instanceName+": " + slaves[req.body.instanceID].mac + " : " + slaves[req.body.instanceID].serverPort+" at " + slaves[req.body.instanceID].publicIP, metaPortion);
+			res.sendStatus(200);
 		} else {
 			res.send("ERROR: Invalid instanceID or password")
 		}
@@ -377,12 +369,20 @@ POST Get metadata from a single slave. For whenever you find the data returned b
 app.post("/api/getSlaveMeta", function (req, res) {
 	endpointHitCounter.labels(req.route.path).inc();
 	console.log("body", req.body);
-    if(req.body && req.body.instanceID && req.body.password){
+	if(req.body && req.body.instanceID){
-    	console.log("returning meta for ", req.body.instanceID);
+		if (slaves[req.body.instanceID]) {
-    	res.send(JSON.stringify(slaves[req.body.instanceID].meta))
+			console.log("returning meta for ", req.body.instanceID);
+			if(!slaves[req.body.instanceID].meta) {
+				slaves[req.body.instanceID].meta = {};
+			}
+			res.send(JSON.stringify(slaves[req.body.instanceID].meta))
+		} else {
+			res.status(404);
+			res.send('{"status": 404, "info": "Slave not registered"}')
+		}
 	} else {
-    	res.status(400);
+		res.status(400);
-    	res.send('{"INVALID REQUEST":1}');
+		res.send('{"INVALID_REQUEST":1}');
 	}
 });
 // mod management
@@ -393,7 +393,7 @@ POST Check if a mod has been uploaded to the master before. Only checks against
 @instance
 @alias /api/checkMod
 */
-app.post("/api/checkMod", function(req,res) {
+app.post("/api/checkMod", authenticate.middleware, function(req,res) {
 	endpointHitCounter.labels(req.route.path).inc();
 	let files = fs.readdirSync(masterModFolder);
 	let found = false;
@@ -430,41 +430,63 @@ app.post("/api/uploadMod", authenticate.middleware, function(req,res) {
 		});
 	} else {
 		res.send('No files were uploaded.');
-		return;
+
-    }
+	}
 });
 /**
+Prepare the slaveCache for both /api/slaves calls
+*/
+let slaveCache = {
+	timestamp: Date.now(),
+};
+function getSlaves() {
+	if(!slaveCache.cache || Date.now() - slaveCache.timestamp > 5000) {
+		let copyOfSlaves = JSON.parse(JSON.stringify(slaves));
+		slaveCache.cache = copyOfSlaves;
+		slaveCache.timestamp = Date.now();
+	}
+	return slaveCache;
+}
+/**
 GET endpoint for getting information about all our slaves
 @memberof clusterioMaster
 @instance
 @alias /api/slaves
 */
-let slaveCache = {
-	timestamp: Date.now(),
-};
 app.get("/api/slaves", function(req, res) {
 	endpointHitCounter.labels(req.route.path).inc();
 	res.header("Access-Control-Allow-Origin", "*");
 	res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept");
-	if(!slaveCache.cache || Date.now() - slaveCache.timestamp > 5000){
+	let slaveCache = getSlaves();
-		let copyOfSlaves = JSON.parse(JSON.stringify(slaves));
+	for(key in slaveCache.cache) {
-		// filter out the rcon password because thats kindof not a safe thing to share
+		slaveCache.cache[key].rconPassword = "hidden";
-		for(key in copyOfSlaves){
+	}
-			copyOfSlaves[key].rconPassword = "hidden";
+	res.send(slaveCache.cache);
-		}
+});
-		slaveCache.cache = copyOfSlaves;
+/**
-		slaveCache.timestamp = Date.now();
+POST endpoint for getting the rconPasswords of all our slaves
+@memberof clusterioMaster
+@instance
+@alias /api/rconPasswords
+*/
+app.post("/api/rconPasswords", authenticate.middleware, function(req, res) {
+	endpointHitCounter.labels(req.route.path).inc();
+	res.header("Access-Control-Allow-Origin", "*");
+	res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept");
+	let slaveCache = getSlaves();
+	let validKeys = ['rconPort', 'rconPassword', 'publicIP'];
+	for(key in slaveCache.cache) {
+		slaveCache.cache[key] = {'publicIP': slaveCache.cache[key].publicIP, 'rconPort': slaveCache.cache[key].rconPort, 'rconPassword': slaveCache.cache[key].rconPassword};
 	}
-	
 	res.send(slaveCache.cache);
 });
-var recievedItemStatisticsBySlaveID = {};
-var sentItemStatisticsBySlaveID = {};
 /*
 var recievedItemStatistics = new averagedTimeSeries({
 	maxEntries: config.itemStats.maxEntries,
 	entriesPerSecond: config.itemStats.entriesPerSecond,
 }, console.log);*/
+var recievedItemStatisticsBySlaveID = {};
+var sentItemStatisticsBySlaveID = {};
 // 
 /**
 POST endpoint for storing items in master's inventory.
@@ -534,13 +556,13 @@ app.post("/api/place", authenticate.middleware, function(req, res) {
 		res.send("failure");
 	}
 });
-const routes_api_remove = require("./routes/api/remove.js")
+const routes_api_remove = require("./routes/api/remove.js");
-var neuralDole = null
+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.
 
@@ -565,7 +587,7 @@ app.post("/api/remove", authenticate.middleware, function(req, res) {
 		object.instanceName = "unknown";
 	}
 	if(slaves[object.instanceID]) object.instanceName = slaves[object.instanceID].instanceName;
-	let item = db.items[object.name]
+	let item = db.items[object.name];
 		// console.dir(doc);
 	if((item === undefined)
 	||((
@@ -670,19 +692,19 @@ app.get("/api/inventoryAsObject", function(req, res) {
  */
 
 // wrap a request in an promise
-    async function downloadPage(url) {
+	async function downloadPage(url) {
-        return new Promise((resolve, reject) => {
+		return new Promise((resolve, reject) => {
-            request(url, (error, response, body) => {
+			request(url, (error, response, body) => {
-                resolve(body);
+				resolve(body);
-            });
+			});
-        });
+		});
-    }
+	}
 
 app.get("/api/modmeta", async function(req, res) {
 	endpointHitCounter.labels(req.route.path).inc();
-    res.header("Access-Control-Allow-Origin", "*");
+	res.header("Access-Control-Allow-Origin", "*");
-    res.setHeader('Content-Type', 'application/json');
+	res.setHeader('Content-Type', 'application/json');
-    let modData = await downloadPage("https://mods.factorio.com/api/mods/" + req.query.modname);
+	let modData = await downloadPage("https://mods.factorio.com/api/mods/" + req.query.modname);
 	res.send(modData);
 });
 
@@ -697,45 +719,38 @@ Requires x-access-token header to be set. Find you api token in secret-api-token
 @param {object} JSON {instanceID:19412312, broadcast:false, command:"/c game.print('hello')"}
 @returns {object} Status {auth: bool, message: "Informative error", data:{}}
 */
-app.post("/api/runCommand", (req,res) => {
+app.post("/api/runCommand", authenticate.middleware, function(req,res) {
 	endpointHitCounter.labels(req.route.path).inc();
-	var token = req.headers['x-access-token'];
+	// validate request.body
-	if(!token) return res.status(401).send({ auth: false, message: 'No token provided.' });
+	let body = req.body;
 
-	jwt.verify(token, config.masterAuthSecret, function(err, decoded) {
+	if (
-		if(err) return res.status(500).send({ auth: false, message: 'Failed to authenticate token.' });
+		body.broadcast
-		
+		&& body.command
-		// validate request.body
+		&& typeof body.command == "string"
-        let body = req.body;
+		&& body.command[0] == "/")
-
+	{
-        if (
+		let instanceResponses = [];
-            body.broadcast
+		for (let instanceID in wsSlaves) {
-            && body.command
+			// skip loop if the property is from prototype
-            && typeof body.command == "string"
+			if (!wsSlaves.hasOwnProperty(instanceID)) continue;
-            && body.command[0] == "/")
+			wsSlaves[instanceID].runCommand(body.command);
-        {
+		}
-        	let instanceResponses = [];
+		res.status(200).send({auth: true, message: "success", response: "Cluster wide messaging initiated"});
-            for (let instanceID in wsSlaves) {
+	} else if (
-                // skip loop if the property is from prototype
+		body.instanceID
-                if (!wsSlaves.hasOwnProperty(instanceID)) continue;
+		&& wsSlaves[body.instanceID]
-                wsSlaves[instanceID].runCommand(body.command);
+		&& body.command
-            }
+		&& typeof body.command == "string"
-            res.status(200).send({auth: true, message: "success", response: "Cluster wide messaging initiated"});
+		&& body.command[0] == "/")
-        } else if (
+	{
-            body.instanceID
+		// execute command
-            && wsSlaves[body.instanceID]
+		wsSlaves[body.instanceID].runCommand(body.command, data => {
-            && body.command
+			res.status(200).send({auth: true, message: "success", data});
-            && typeof body.command == "string"
+		});
-            && body.command[0] == "/")
+	} else {
-        {
+		res.status(400).send({auth: true, message: "Error: invalid request.body"});
-            // execute command
+	}
-            wsSlaves[body.instanceID].runCommand(body.command, data => {
-                res.status(200).send({auth: true, message: "success", data});
-            });
-        } else {
-            res.status(400).send({auth: true, message: "Error: invalid request.body"});
-        }
-	});
 });
 /**
 GET endpoint. Returns factorio's base locale as a JSON object.
@@ -772,9 +787,10 @@ if(args.masterPort || config.masterPort){
 }
 
 /* Websockets for remoteMap */
-var io = require("socket.io")(server);
+var io = require("socket.io")();
 const ioMetrics = require("socket.io-prometheus");
 ioMetrics(io);
+
 var slaveMappers = {};
 class slaveMapper {
 	constructor(instanceID, socket) {
@@ -805,6 +821,8 @@ class slaveMapper {
 		});
 	}
 }
+
+
 var mapRequesters = {};
 class mapRequester {
 	constructor(requesterID, socket, instanceID){
@@ -844,6 +862,8 @@ class mapRequester {
 		});
 	}
 }
+
+
 /* Websockets for send and recieve combinators */
 var wsSlaves = {};
 class wsSlave {
@@ -856,14 +876,6 @@ class wsSlave {
 			prometheusWsUsageCounter.labels('heartbeat', this.instanceID).inc();
 			this.lastBeat = Date.now();
 		});
-		this.socket.on("combinatorSignal", circuitFrameWithMeta => {
-			prometheusWsUsageCounter.labels('combinatorSignal', this.instanceID).inc();
-			if(circuitFrameWithMeta && typeof circuitFrameWithMeta == "object"){
-				Object.keys(wsSlaves).forEach(instanceID => {
-					wsSlaves[instanceID].socket.emit("processCombinatorSignal", circuitFrameWithMeta);
-				});
-			}
-		});
 		// handle command return values
 		this.commandsWaitingForReturn = {};
 		this.socket.on("runCommandReturnValue", resp => {
@@ -902,6 +914,19 @@ class wsSlave {
 		if(commandID) this.commandsWaitingForReturn[commandID] = {callback, timestamp: Date.now()};
 	}
 }
+
+io.use((socket, next) => {
+	let token = socket.handshake.query.token;
+	authenticate.check(token).then((result) => {
+		if (result.ok) {
+			next();
+		} else {
+			console.error(`SOCKET | authentication failed for ${socket.handshake.address}`);
+			next(new Error(result.msg));
+		}
+	});
+});
+
 io.on('connection', function (socket) {
 	// cleanup dead sockets from disconnected people
 	let terminatedConnections = 0;
@@ -956,17 +981,9 @@ io.on('connection', function (socket) {
 });
 
 // handle plugins on the master
-pluginManagement();
-masterPlugins = [];
-async function pluginManagement(){
-	let startPluginLoad = Date.now();
-	masterPlugins = await getPlugins();
-	console.log("All plugins loaded in "+(Date.now() - startPluginLoad)+"ms");
-	return;
-}
-
 async function getPlugins(){
-	const pluginManager = require("./lib/manager/pluginManager.js")(config);
+	let startPluginLoad = Date.now();
+	const pluginManager = require("lib/manager/pluginManager.js")(config);
 	let plugins = [];
 	let pluginsToLoad = await pluginManager.getPlugins();
 	for(let i = 0; i < pluginsToLoad.length; i++){
@@ -996,8 +1013,15 @@ async function getPlugins(){
 		let plugin = plugins[i];
 		if(plugin.main.onLoadFinish && typeof plugin.main.onLoadFinish == "function") await plugin.main.onLoadFinish({plugins});
 	}
+	console.log("All plugins loaded in "+(Date.now() - startPluginLoad)+"ms");
 	return plugins;
 }
 
+
+masterPlugins = await getPlugins();
+
+
+io.attach(server);
+
 module.exports = app;
 })();

package.json

@@ -1,35 +1,32 @@
 {
   "name": "clusterio",
-  "version": "1.7.0",
+  "version": "1.2.4",
   "description": "Interserver communication for factorio",
   "repository": "https://github.com/Danielv123/factorioClusterio",
   "main": "master.js",
   "scripts": {
-    "test": "./node_modules/.bin/istanbul cover ./node_modules/mocha/bin/_mocha -- \"./{{,node_modules/_app/**/},!(node_modules)/**/}*.spec.js\" -R spec || echo .",
+    "test": "mocha -R spec -- \"./{,!(node_modules)/**/}*.spec.js\" || true",
+    "cover": "nyc --reporter=lcovonly npm run-script test && codecov -f coverage/lcov.info -t f7b38085-36eb-4d72-84e6-64721910171e",
     "start": "echo Run node client.js start [instance] to start slaves && node master.js",
-    "cover": "./node_modules/.bin/istanbul cover ./node_modules/mocha/bin/_mocha -- \"./{{,node_modules/_app/**/},!(node_modules)/**/}*.spec.js\" -R spec || echo . && codecov -t f7b38085-36eb-4d72-84e6-64721910171e",
-    "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"
   ],
   "author": "Danielv123",
-  "license": "ISC",
+  "license": "MIT",
+  "engines": {
+    "node": ">=10"
+  },
   "dependencies": {
-    "app-root-path": "^2.0.1",
     "as-table": "^1.0.31",
     "averaged-timeseries": "^1.4.0",
     "base64url": "^3.0.0",
-    "bcrypt": "^2.0.1",
+    "bcrypt": "=3.0.6",
     "bcrypt-promise": "^2.0.0",
-    "bcryptjs": "^2.4.3",
     "body-parser": "^1.18.2",
-    "cache-require-paths": "^0.3.0",
+    "cli": "^1.0.1",
     "cli-interact": "^0.1.9",
     "codecov": "^3.0.1",
     "compression": "^1.7.2",
@@ -42,10 +39,9 @@
     "follow-redirects": "^1.5.0",
     "fs-extra": "^6.0.1",
     "getmac": "^1.4.0",
-    "hash-files": "^1.1.1",
-    "html5-validator": "^1.0.7",
     "ini": "^1.3.5",
     "jsonwebtoken": "^8.2.1",
+    "lib": "file:./lib",
     "luamin": "^1.0.4",
     "minimist": "^1.2.0",
     "mkdirp": "^0.5.1",
@@ -53,12 +49,11 @@
     "moment": "^2.22.2",
     "ncp": "^2.0.0",
     "needle": "^2.2.4",
-    "node-factorio-api": "^0.3.1-alpha",
+    "node-factorio-api": "^0.3.8",
     "node-forge": "^0.7.1",
     "prom-client": "^10.2.3",
-    "rcon-client": "^3.0.2",
+    "rcon-client-fork": "^3.2.0",
     "request": "^2.83.0",
-    "right-pad": "^1.0.1",
     "rmdir-sync": "^1.0.1",
     "sanitizer": "^0.1.3",
     "simple-git": "^1.96.0",
@@ -67,18 +62,17 @@
     "socket.io-client": "^2.0.4",
     "socket.io-prometheus": "^0.2.1",
     "sync-request": "^4.0.1",
-    "underscore": "^1.8.3",
+    "tail": "^2.0.2",
-    "snyk": "^1.134.2"
+    "typescript-collections": "^1.3.2"
   },
   "devDependencies": {
-    "documentation": "^5.4.0",
+    "html5-validator": "^1.0.7",
-    "istanbul": "^0.4.5",
     "mocha": "^3.5.3",
     "mocha-sinon": "^2.0.0",
     "mocha.parallel": "^0.15.5",
     "nock": "^9.1.6",
+    "nyc": "^14.1.1",
     "sinon": "^2.4.1",
     "supertest": "^3.0.0"
-  },
+  }
-  "snyk": true
 }

routes/api/remove.js

@@ -1,6 +1,6 @@
 const averagedTimeSeries = require("averaged-timeseries")
 
-const doleNN = require("./../../lib/dole_nn_base.js")
+const doleNN = require("lib/dole_nn_base.js")
 
 const Prometheus = require('prom-client');
 
@@ -33,6 +33,7 @@ class neuralDole {
         this.carry = {}
         this.lastRequest = {}
         this.stats=[]
+		this.debt= {}
 
         setInterval(()=>{
             for(let name in this.items){
@@ -71,7 +72,8 @@ class neuralDole {
             this.dole[object.name],
             this.carry[object.name+" "+object.instanceID] || 0,
             this.lastRequest[object.name+"_"+object.instanceID+"_"+object.instanceName] || 0,
-            this.getRequestStats(object.name,5)
+            this.getRequestStats(object.name,5),
+			this.debt[object.name+" "+object.instanceID] || 0
         )
         if ((this.stats[object.name] || []).length>0)
         {
@@ -84,6 +86,7 @@ class neuralDole {
         //2.New carry for item X slave Y
         this.dole[object.name] = magicData[1]
         this.carry[object.name+" "+object.instanceID] = magicData[2]
+		this.debt[object.name+" "+object.instanceID] = magicData[3]
         
         // Remove item from DB and send it
         if(this.items.removeItem({count: magicData[0], name: object.name})){

sharedPlugins/clusterioMod/index.js

@@ -1,9 +1,9 @@
 const needle = require("needle");
 const fs = require("fs-extra");
 
-const objectOps = require("./../../lib/objectOps.js");
+const objectOps = require("lib/objectOps.js");
-const fileOps = require("_app/fileOps");
+const fileOps = require("lib/fileOps");
-const stringUtils = require("./../../lib/stringUtils.js");
+const stringUtils = require("lib/stringUtils.js");
 
 const pluginConfig = require("./config");
 const COMPRESS_LUA = false;
@@ -35,61 +35,6 @@ module.exports = class remoteCommands {
 			}
 		})().catch(e => console.log(e));
 		
-		// flow/production statistics ------------------------------------------------------------
-		var oldFlowStats = false;
-		var oldTimestamp;
-		var oldFlowStats;
-		setInterval(function(){
-			fs.readFile(instancedirectory + "/script-output/flows.txt", {encoding: "utf8"}, function(err, data) {
-				if(!err && data) {
-					let timestamp = Date.now();
-					data = data.split("\n");
-					let flowStats = [];
-					for(let i = 0; i < data.length; i++) {
-						// try catch to remove any invalid json
-						try{
-							flowStats[flowStats.length] = JSON.parse(data[i]);
-						} catch (e) {
-							// console.log(" invalid json: " + i);
-							// some lines of JSON are invalid but don't worry, we just filter em out
-						}
-					}
-					// fluids
-					let flowStat1 = flowStats[flowStats.length-1].flows.player.input_counts
-					// items
-					let flowStat2 = flowStats[flowStats.length-2].flows.player.input_counts
-					// merge fluid and item flows
-					let totalFlows = {};
-					for(let key in flowStat1) totalFlows[key] = flowStat1[key];
-					for(let key in flowStat2) totalFlows[key] = flowStat2[key];
-					if(oldFlowStats && totalFlows && oldTimestamp) {
-						let payload = objectOps.deepclone(totalFlows);
-						// change from total reported to per time unit
-						for(let key in oldFlowStats) {
-							// get production per minute
-							payload[key] = Math.floor((payload[key] - oldFlowStats[key])/(timestamp - oldTimestamp)*60000);
-							if(payload[key] < 0) {
-								payload[key] = 0;
-							}
-						}
-						for(let key in payload) {
-							if(payload[key] == '0') {
-								delete payload[key];
-							}
-						}
-						console.log("Recorded flows, copper plate since last time: " + payload["copper-plate"]);
-						needle.post(that.config.masterIP + ":" + that.config.masterPort + '/api/logStats', {timestamp: timestamp, instanceID: that.config.unique, data: payload}, needleOptionsWithTokenAuthHeader, function (err, response, body) {
-							// we did it, keep going
-						});
-					}
-					oldTimestamp = timestamp;
-					oldFlowStats = totalFlows;
-					fs.writeFileSync(instancedirectory + "/script-output/flows.txt", "");
-				}
-			});
-			// we don't need to update stats quickly as that could be expensive
-		}, 60000*5);
-		
 		// provide items --------------------------------------------------------------
 		// trigger when something happens to output.txt
 		fs.watch(instancedirectory + "/script-output/output.txt", function (eventType, filename) {
@@ -232,56 +177,6 @@ module.exports = class remoteCommands {
 		setTimeout(function(){
 			messageInterface("/silent-command remote.call('clusterio','setWorldID',"+that.config.unique+")")
 		}, 20000);
-		/* REMOTE SIGNALLING
-		 * send any signals the slave has been told to send
-		 * Fetch combinator signals from the server
-		*/
-		this.socket.on("processCombinatorSignal", circuitFrameWithMeta => {
-			if(circuitFrameWithMeta && typeof circuitFrameWithMeta == "object" && circuitFrameWithMeta.frame && Array.isArray(circuitFrameWithMeta.frame)){
-				messageInterface("/silent-command remote.call('clusterio', 'receiveFrame', '"+JSON.stringify(circuitFrameWithMeta.frame)+"')");
-			}
-		});
-		// get outbound frames from file and send to master
-		// get array of lines in file, each line should correspond to a JSON encoded frame
-		let signals = fs.readFileSync(instancedirectory + "/script-output/txbuffer.txt", "utf8").split("\n");
-		// if we actually got anything from the file, proceed and reset file
-		let readingTxBufferSoon = false;
-		let txBufferClearCounter = 0;
-		fs.watch(instancedirectory + "/script-output/txbuffer.txt", "utf-8", (eventType, filename) => {
-			if(!readingTxBufferSoon){ // use a 100ms delay to avoid messing with rapid sequential writes from factorio (I think that might be a problem maybe?)
-				readingTxBufferSoon = true;
-				setTimeout(()=>{
-					txBufferClearCounter++;
-					fs.readFile(instancedirectory + "/script-output/txbuffer.txt", "utf-8", (err, signals) => {
-						signals = signals.split("\n");
-						if (signals[0]) {
-							//if(txBufferClearCounter > 500){
-								fs.writeFileSync(instancedirectory + "/script-output/txbuffer.txt", "");
-							//	txBufferClearCounter = 0;
-							//}
-							
-							// loop through all our frames
-							for (let i = 0; i < signals.length; i++) {
-								if (signals[i] && objectOps.isJSON(signals[i])) {
-									// signals[i] is a JSON array called a "frame" of signals. We timestamp it for storage on master
-									// then we unpack and RCON in this.frame to the game later.
-									let framepart = JSON.parse(signals[i]);
-									let doneframe = {
-										time: Date.now(),
-										frame: framepart, // thats our array of objects(single signals);
-									}
-									// send to master using socket.io, opened at the top of instanceManagement()
-									this.socket.emit("combinatorSignal", doneframe);
-								} else {
-									// console.log("Invalid jsony: "+typeof signals[i])
-								}
-							}
-						}
-					});
-					readingTxBufferSoon = false;
-				},100);
-			}
-		});
 	}
 	async getCommand(file){
 		this.commandCache = this.commandCache || {};
@@ -307,7 +202,7 @@ module.exports = class remoteCommands {
 		return new Promise((resolve, reject) => {
 			let instance = this.instances[instanceID];
 			if(!instance){
-				needle.get(this.config.masterIP+":"+this.config.masterPort+ '/api/slaves', (err, response) => {
+				needle.get(this.config.masterIP+":"+this.config.masterPort+ '/api/slaves', { compressed: true }, (err, response) => {
 					if(err || response.statusCode != 200) {
 						console.log("Unable to get JSON master/api/slaves, master might be unaccessible");
 					} else if (response && response.body) {	

sharedPlugins/globalChat/index.js

@@ -22,12 +22,15 @@ module.exports = class remoteCommands {
 					words.shift();
 					words.shift();
 					words.shift();
-					let message = words.join(" ").replace(/[";]/g, " ").replace(/[']/g,"").replace("/shout ", "").replace("!shout", "");
+					                let message = words.join(" ").replace(/[";]/g, " ").replace(/[']/g,"").replace("/shout ", "").replace("!shout ","").replace(/\[gps=.*?\]/g, "").replace(/\[train=.*?\]/g, "");
 					
-					let instance = await this.getInstanceName(data.instanceID);
+                    let instance = await this.getInstanceName(data.instanceID);
-					
+                    if(data.data.includes("[gps=")){
-					this.messageInterface("/silent-command game.print('[" + instance + "] " + message + "')");
+                    	//Nothing
-				}
+                    }else{
+                    	this.messageInterface("/silent-command game.print('[" + instance + "] " + message + "')");
+                    }
+                }
 			}
 		});
 	}
@@ -52,7 +55,7 @@ module.exports = class remoteCommands {
 		return new Promise((resolve, reject) => {
 			let instance = this.instances[instanceID];
 			if(!instance){
-				needle.get(this.config.masterIP+":"+this.config.masterPort+ '/api/slaves', (err, response) => {
+				needle.get(this.config.masterIP+":"+this.config.masterPort+ '/api/slaves', { compressed: true }, (err, response) => {
 					if(err || response.statusCode != 200) {
 						console.log("Unable to get JSON master/api/slaves, master might be unaccessible");
 					} else if (response && response.body) {	

sharedPlugins/inventoryImports/config.js

@@ -17,4 +17,5 @@ module.exports = {
 	description: "Clusterio plugin to fill character logistic slots with master imports",
 	// We'll send everything in this file to your stdin. Beware.
 	scriptOutputFileSubscription: "inventoryImports.txt",
+	fileReadDelay: 100,
 }

sharedPlugins/inventoryImports/interfacingFunctions.js

@@ -1,4 +1,4 @@
-const objectOps = require("../../lib/objectOps.js");
+const objectOps = require("lib/objectOps.js");
 const needle = require("needle");
 const pluginConfig = require("./config")
 const isJson = require("./isJson")
@@ -141,7 +141,10 @@ function pollInventories(outputFile){
 	//console.log("/silent-command "+'local a=game.players["Danielv123"].get_inventory(defines.inventory.player_main).get_contents()local b=game.players["Danielv123"].get_quickbar().get_contents()local c={}for d=1,game.players["Danielv123"].force.character_logistic_slot_count do c[d]=game.players["Danielv123"].character.get_request_slot(d)end;local e="{inventory:{"for f,g in pairs(a)do e=e.."['+"'"+'"..f.."'+"'"+']:"..g..","end;for f,g in pairs(b)do e=e.."['+"'"+'"..f.."'+"'"+']:"..g..","end;e=e.."},requestSlots:{"for f,g in pairs(c)do e=e.."['+"'"+'"..g["name"].."'+"'"+']:"..g["count"]..", "end;e=e.."}}"game.write_file("'+pluginConfig.scriptOutputFileSubscription+'",e)')
 	// console.log("/silent-command "+'local a="{"for b,c in pairs(game.players)do local d=game.players[b].get_inventory(defines.inventory.player_main).get_contents()local e=game.players[b].get_quickbar().get_contents()local f={}for g=1,game.players[b].force.character_logistic_slot_count do f[g]=game.players[b].character.get_request_slot(g)end;a=a..b..":{inventory:{"for h,i in pairs(d)do a=a.."['+"'"+'"..h.."'+"'"+']:"..i..","end;for h,i in pairs(e)do a=a.."['+"'"+'"..h.."'+"'"+']:"..i..","end;a=a.."},requestSlots:{"for h,i in pairs(f)do a=a.."['+"'"+'"..i["name"].."'+"'"+']:"..i["count"]..", "end;a=a.."}},"end;a=a.."}"game.write_file("'+pluginConfig.scriptOutputFileSubscription+'",a)')
 	//return "/silent-command "+'local a="{"for b,c in pairs(game.players)do if c.connected then local d=game.players[b].get_inventory(defines.inventory.player_main).get_contents()local e=game.players[b].get_quickbar().get_contents()local f={}for g=1,game.players[b].force.character_logistic_slot_count do f[g]=game.players[b].character.get_request_slot(g)end;a=a..b..":{inventory:{"for h,i in pairs(d)do a=a.."['+"'"+'"..h.."'+"'"+']:"..i..","end;for h,i in pairs(e)do a=a.."['+"'"+'"..h.."'+"'"+']:"..i..","end;a=a.."},requestSlots:{"for h,i in pairs(f)do a=a.."['+"'"+'"..i["name"].."'+"'"+']:"..i["count"]..", "end;a=a.."}},"end end;a=a.."}"game.write_file("'+outputFile+'",a)'
-	return '/silent-command '+'local a='+"'"+'{"players":{'+"'"+'local b=false;for c,d in pairs(game.players)do if d.connected and d.character then if b then a=a..'+"'"+','+"'"+'else b=true end;local e=game.players[c].get_inventory(defines.inventory.player_main).get_contents()local f=game.players[c].get_quickbar().get_contents()local g={}local z={}for j,k in pairs(e)do if z[j] ~= nil then z[j] = z[j] + k else z[j] = k end end for j,k in pairs(f)do if z[j] ~= nil then z[j] = z[j] + k else z[j] = k end end for h=1,game.players[c].force.character_logistic_slot_count do g[h]=game.players[c].character.get_request_slot(h)end;a=a..'+"'"+'"'+"'"+'..c..'+"'"+'":{"inventory":{'+"'"+'local i=false;for j,k in pairs(z)do if i then a=a..'+"'"+','+"'"+'else i=true end;a=a..'+"'"+'"'+"'"+'..j..'+"'"+'":'+"'"+'..k end;a=a..'+"'"+'},"requestSlots":{'+"'"+'i=false;for j,k in pairs(g)do if i then a=a..'+"'"+','+"'"+'else i=true end;a=a..'+"'"+'"'+"'"+'..k['+"'"+'name'+"'"+']..'+"'"+'":'+"'"+'..k['+"'"+'count'+"'"+']end;a=a..'+"'"+'}}'+"'"+'end end;a=a.."}}"game.write_file("'+outputFile+'",a,true,0)'
+	//return '/silent-command '+'local a='+"'"+'{"players":{'+"'"+'local b=false;for c,d in pairs(game.players)do if d.connected and d.character then if b then a=a..'+"'"+','+"'"+'else b=true end;local e=game.players[c].get_inventory(defines.inventory.player_main).get_contents()local f=game.players[c].get_quickbar().get_contents()local g={}local z={}for j,k in pairs(e)do if z[j] ~= nil then z[j] = z[j] + k else z[j] = k end end for j,k in pairs(f)do if z[j] ~= nil then z[j] = z[j] + k else z[j] = k end end for h=1,game.players[c].force.character_logistic_slot_count do g[h]=game.players[c].character.get_request_slot(h)end;a=a..'+"'"+'"'+"'"+'..c..'+"'"+'":{"inventory":{'+"'"+'local i=false;for j,k in pairs(z)do if i then a=a..'+"'"+','+"'"+'else i=true end;a=a..'+"'"+'"'+"'"+'..j..'+"'"+'":'+"'"+'..k end;a=a..'+"'"+'},"requestSlots":{'+"'"+'i=false;for j,k in pairs(g)do if i then a=a..'+"'"+','+"'"+'else i=true end;a=a..'+"'"+'"'+"'"+'..k['+"'"+'name'+"'"+']..'+"'"+'":'+"'"+'..k['+"'"+'count'+"'"+']end;a=a..'+"'"+'}}'+"'"+'end end;a=a.."}}"game.write_file("'+outputFile+'",a,true,0)'
+
+	// Warning: This command is not in sync with lua commands.lua
+	return `/silent-command local a='{"players":{'local b=false;for c,d in pairs(game.players)do if d.connected and d.character then if b then a=a..','else b=true end;local e=game.players[c].get_inventory(defines.inventory.character_main).get_contents()local g={}for h=1,game.players[c].force.character_logistic_slot_count do g[h]=game.players[c].character.get_request_slot(h)end;a=a..'"'..c..'":{"inventory":{'local i=false;for j,k in pairs(e)do if i then a=a..','else i=true end;a=a..'"'..j..'":'..k end;a=a..'},"requestSlots":{'i=false;for j,k in pairs(g)do if i then a=a..','else i=true end;a=a..'"'..k['name']..'":'..k['count']end;a=a..'}}'end end;a=a.."}}"game.write_file("${outputFile}",a,true,0)`
 	/*
 	needle.post(config.masterIP+':'+config.masterPort+'/api/editSlaveMeta', {instanceID: config.unique, password: config.clientPassword, meta: {UPS:UPS}}, function(err, resp) {
 		// success?

sharedPlugins/inventoryImports/interfacingFunctions.spec.js

@@ -2,7 +2,7 @@ const assert = require("assert");
 const child_process = require("child_process");
 const functions = require("./interfacingFunctions");
 const luamin = require("luamin");
-const isFactorioCommand = require("_app/isFactorioCommand");
+const isFactorioCommand = require("lib/isFactorioCommand");
 const nock = require("nock");
 
 // sinon does weird prototype manipulation and so doen't need to be saved to anything.