Move node_modules/_app/ into lib/ as a package (#190)

Move the contents of node_modules/_app into lib/ as there shouldn't be
any content in node_modules.  This directory is automatically managed
and pruned by npm.

Add lib/ as a local package in package.json, this allows scripts
everywhere to require it's content as "lib/path" instead of relying on
local paths.  This shadows the StdLib Node.js Bindings package, but I
could care less.

Change all requires with lib as a local path and _app to use just lib.

.gitignore

@@ -25,7 +25,6 @@ build/Release
 dist/
 
 node_modules/*
-!node_modules/_app
 
 Factorio*
 /factorio

client.js

@@ -15,10 +15,10 @@ const rmdirSync = require('rmdir-sync');
 const ioClient = require("socket.io-client");
 
 // internal libraries
-const objectOps = require("./lib/objectOps.js");
-const fileOps = require("_app/fileOps");
-const stringUtils = require("./lib/stringUtils.js");
-const configManager = require("./lib/manager/configManager.js");
+const objectOps = require("lib/objectOps.js");
+const fileOps = require("lib/fileOps");
+const stringUtils = require("lib/stringUtils.js");
+const configManager = require("lib/manager/configManager.js");
 
 // argument parsing
 const args = require('minimist')(process.argv.slice(2));
@@ -187,7 +187,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 +227,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"){
@@ -300,7 +300,7 @@ if (!command || command == "help" || command == "--help") {
 	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)
     });
 
@@ -576,7 +576,7 @@ 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 = [];
 	

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/factorioServer/index.js

@@ -17,7 +17,7 @@ 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({
@@ -165,4 +165,4 @@ module.exports = class factorioServer {
 			});
 		});
 	}
-}
+}

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("fileOps");
 // const config = require("./../config");
 
 module.exports = function(config) {

lib/manager/modManager.js

@@ -13,7 +13,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/package.json

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

master.js

@@ -55,12 +55,12 @@ mkdirp.sync(config.databaseDirectory);
 mkdirp.sync(masterModFolder);
 
 // homebrew modules
-const getFactorioLocale = require("./lib/getFactorioLocale");
-const stringUtils = require("./lib/stringUtils");
-const fileOps = require("_app/fileOps");
+const getFactorioLocale = require("lib/getFactorioLocale");
+const stringUtils = require("lib/stringUtils");
+const fileOps = require("lib/fileOps");
 
 // homemade express middleware for token auth
-const authenticate = require("./lib/authenticate")(config);
+const authenticate = require("lib/authenticate")(config);
 
 /** Sync */
 function randomStringAsBase64Url(size) {
@@ -991,7 +991,7 @@ async function pluginManagement(){
 }
 
 async function getPlugins(){
-	const pluginManager = require("./lib/manager/pluginManager.js")(config);
+	const pluginManager = require("lib/manager/pluginManager.js")(config);
 	let plugins = [];
 	let pluginsToLoad = await pluginManager.getPlugins();
 	for(let i = 0; i < pluginsToLoad.length; i++){

package.json

@@ -5,9 +5,9 @@
   "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": "./node_modules/.bin/istanbul cover ./node_modules/mocha/bin/_mocha -- \"./{,!(node_modules)/**/}*.spec.js\" -R spec || echo .",
     "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",
+    "cover": "./node_modules/.bin/istanbul cover ./node_modules/mocha/bin/_mocha -- \"./{,!(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",
@@ -47,6 +47,7 @@
     "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",

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');
 

sharedPlugins/clusterioMod/index.js

@@ -1,9 +1,9 @@
 const needle = require("needle");
 const fs = require("fs-extra");
 
-const objectOps = require("./../../lib/objectOps.js");
-const fileOps = require("_app/fileOps");
-const stringUtils = require("./../../lib/stringUtils.js");
+const objectOps = require("lib/objectOps.js");
+const fileOps = require("lib/fileOps");
+const stringUtils = require("lib/stringUtils.js");
 
 const pluginConfig = require("./config");
 const COMPRESS_LUA = false;

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")

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.

sharedPlugins/remoteMap/chunkStore.js

@@ -4,7 +4,7 @@ var fs = require("fs");
 var events = require("events");
 var path = require("path");
 
-var objectOps = require("./../../lib/objectOps");
+var objectOps = require("lib/objectOps");
 
 var LinvoDB = require("linvodb3");
 // LinvoDB.dbPath = "./database/linvodb/";

sharedPlugins/researchSync/index.spec.js

@@ -1,6 +1,6 @@
 const assert = require("assert");
 
-const isFactorioCommand = require("_app/isFactorioCommand");
+const isFactorioCommand = require("lib/isFactorioCommand");
 
 const researchSync = require("./index.js");
 

sharedPlugins/scenario_loader/index.js

@@ -1,6 +1,6 @@
 const fs = require("fs-extra");
 const path = require("path");
-const clusterTools = require("_app/clusterTools")();
+const clusterTools = require("lib/clusterTools")();
 
 module.exports = class remoteCommands {
 	constructor(mergedConfig, messageInterface, extras){

sharedPlugins/serverManager/index.js

@@ -9,9 +9,9 @@ module.exports = class remoteCommands {
 		this.messageInterface = messageInterface;
 		this.config = mergedConfig;
 		this.socket = extras.socket;
-		const pluginManager = require("./../../lib/manager/pluginManager.js")(this.config);
-		const configManager = require("./../../lib/manager/configManager.js");
-		// const modManager = require("./../../lib/manager/modManager.js")(this.config);
+		const pluginManager = require("lib/manager/pluginManager.js")(this.config);
+		const configManager = require("lib/manager/configManager.js");
+		// const modManager = require("lib/manager/modManager.js")(this.config);
 		this.socket.on("hello", () => {
 			this.socket.emit("registerServerManager");
 		});

sharedPlugins/statisticsExporter/index.js

@@ -2,7 +2,7 @@ const needle = require("needle");
 const fs = require("fs-extra");
 const path = require("path");
 
-const clusterTools = require("_app/clusterTools")();
+const clusterTools = require("lib/clusterTools")();
 const pluginConfig = require("./config");
 
 module.exports = class remoteCommands {

sharedPlugins/statisticsExporter/masterPlugin.js

@@ -3,7 +3,7 @@ const path = require("path");
 
 class masterPlugin {
 	constructor({config, socketio, express, Prometheus}){
-		const authenticate = require("./../../lib/authenticate")(config);
+		const authenticate = require("lib/authenticate")(config);
 		
 		this.config = config;
 		this.io = socketio;

static/remoteMap.js

@@ -19,8 +19,8 @@
 console.log(":)")
 /// ES6 imports
 // rules for how entities are drawn (sizes, offset etc)
-import {entityDrawRules} from "./lib/entityDrawRules.js";
-import {getParameterByName, drawImageWithRotation, isImageOk} from "./lib/utility.js";
+import {entityDrawRules} from "lib/entityDrawRules.js";
+import {getParameterByName, drawImageWithRotation, isImageOk} from "lib/utility.js";
 import spritesheetJson from "./pictures/spritesheet.js";
 import {itemSelector} from "./remoteMap/itemSelection.js";
 var global = {};