Arguments: --port --masterPort --sslPort --config --rcon-port --rcon-password

This commit is contained in:
Daniel Vestøl committed 2018-06-24 16:46:31 +02:00
1 parent 8267dae10e
commit 443e5dc286
4 files changed
+58 -48

No files matched your search

+13 -10
View File
@@ -21,6 +21,9 @@ const stringUtils = require("./lib/stringUtils.js");
const modManager = require("./lib/manager/modManager.js"); const modManager = require("./lib/manager/modManager.js");
const configManager = require("./lib/manager/configManager.js"); const configManager = require("./lib/manager/configManager.js");
// argument parsing
const args = require('minimist')(process.argv.slice(2));
// require config.json // require config.json
var config = require('./config'); var config = require('./config');
var global = {}; var global = {};
@@ -271,9 +274,9 @@ write-data=${ path.resolve(config.instanceDirectory, instance) }\r\n
// this line is probably not needed anymore but Im not gonna remove it // this line is probably not needed anymore but Im not gonna remove it
fs.copySync('sharedMods', instancedirectory + "/mods"); fs.copySync('sharedMods', instancedirectory + "/mods");
let instconf = { let instconf = {
"factorioPort": process.env.FACTORIOPORT || Math.floor(Math.random() * 65535), "factorioPort": args.port || process.env.FACTORIOPORT || Math.floor(Math.random() * 65535),
"clientPort": process.env.RCONPORT || Math.floor(Math.random() * 65535), "clientPort": args["rcon-port"] || process.env.RCONPORT || Math.floor(Math.random() * 65535),
"clientPassword": Math.random().toString(36).replace(/[^a-z]+/g, '').substr(0, 8), "clientPassword": args["rcon-password"] || Math.random().toString(36).replace(/[^a-z]+/g, '').substr(0, 8),
} }
console.log("Clusterio | Created instance with settings:") console.log("Clusterio | Created instance with settings:")
console.log(instconf); console.log(instconf);
@@ -305,7 +308,7 @@ write-data=${ path.resolve(config.instanceDirectory, instance) }\r\n
fs.writeFileSync(instancedirectory + "/server-settings.json", JSON.stringify(serversettings, null, 4)); fs.writeFileSync(instancedirectory + "/server-settings.json", JSON.stringify(serversettings, null, 4));
let createSave = child_process.spawnSync( let createSave = child_process.spawnSync(
'./' + config.factorioDirectory + '/bin/x64/factorio', [ './' + config.factorioDirectory + '/bin/x64/factorio', [
'-c', instancedirectory + '/config.ini', '-c', path.resolve(instancedirectory, '/config.ini'),
'--create', instancedirectory + '/saves/save.zip', '--create', instancedirectory + '/saves/save.zip',
] ]
); );
@@ -376,10 +379,10 @@ write-data=${ path.resolve(config.instanceDirectory, instance) }\r\n
'./' + config.factorioDirectory + '/bin/x64/factorio', [ './' + config.factorioDirectory + '/bin/x64/factorio', [
'-c', instancedirectory + '/config.ini', '-c', instancedirectory + '/config.ini',
'--start-server', latestSave.file, '--start-server', latestSave.file,
'--rcon-port', Number(process.env.RCONPORT) || instanceconfig.clientPort, '--rcon-port', args["rcon-port"] || Number(process.env.RCONPORT) || instanceconfig.clientPort,
'--rcon-password', instanceconfig.clientPassword, '--rcon-password', args["rcon-password"] || instanceconfig.clientPassword,
'--server-settings', instancedirectory + '/server-settings.json', '--server-settings', instancedirectory + '/server-settings.json',
'--port', Number(process.env.FACTORIOPORT) || instanceconfig.factorioPort '--port', args.port || Number(process.env.FACTORIOPORT) || instanceconfig.factorioPort
], { ], {
'stdio': ['pipe', 'pipe', 'pipe'] 'stdio': ['pipe', 'pipe', 'pipe']
} }
@@ -398,7 +401,7 @@ write-data=${ path.resolve(config.instanceDirectory, instance) }\r\n
client.connect(); client.connect();
} }
// we have to do this to make logs visible on linux and in powershell. Causes log duplication for people with CMD. // we have to do this to make logs visible on linux and in powershell. Causes log duplication for people with CMD.
console.log('Fact: ' + data); console.log('Fact: ' + data.toString("utf8").replace("\n", ""));
}); });
serverprocess.stderr.on('data', (chunk) => { serverprocess.stderr.on('data', (chunk) => {
console.log('ERR: ' + chunk); console.log('ERR: ' + chunk);
@@ -417,8 +420,8 @@ write-data=${ path.resolve(config.instanceDirectory, instance) }\r\n
if(data && data.indexOf('Starting RCON interface') > 0){ if(data && data.indexOf('Starting RCON interface') > 0){
client.connect({ client.connect({
host: 'localhost', host: 'localhost',
port: Number(process.env.RCONPORT) || instanceconfig.clientPort, port: args["rcon-port"] || Number(process.env.RCONPORT) || instanceconfig.clientPort,
password: instanceconfig.clientPassword, password: args["rcon-password"] || instanceconfig.clientPassword,
timeout: 5000 timeout: 5000
}); });
} else { } else {
+1
View File
@@ -2,6 +2,7 @@
"__comment": "Where factorio folder. Should be in the same folder as this config file.", "__comment": "Where factorio folder. Should be in the same folder as this config file.",
"factorioDirectory": "factorio", "factorioDirectory": "factorio",
"instanceDirectory": "instances", "instanceDirectory": "instances",
"databaseDirectory": "database",
"__comment1": "IP players should connect to to join your servers, should be portforwarded and stuff", "__comment1": "IP players should connect to to join your servers, should be portforwarded and stuff",
"publicIP": "localhost", "publicIP": "localhost",
+43 -38
View File
@@ -24,9 +24,27 @@ debug = false;
// tested by logging Date.now() here and when the webserver started listening // tested by logging Date.now() here and when the webserver started listening
require('cache-require-paths'); require('cache-require-paths');
// argument parsing
const args = require('minimist')(process.argv.slice(2));
// Library for create folder recursively if it does not exist
const mkdirp = require("mkdirp");
const averagedTimeSeries = require("averaged-timeseries");
const deepmerge = require("deepmerge");
const path = require("path");
const fs = require("fs");
const nedb = require("nedb");
const jwt = require('jsonwebtoken');
const bcrypt = require('bcryptjs');
const crypto = require('crypto');
const base64url = require('base64url');
// constants // constants
const masterModFolder = "./database/masterMods/";
const config = require('./config'); const config = require('./config');
config.databaseDirectory = args.databaseDirectory || config.databaseDirectory || "./database";
const masterModFolder = path.join(config.databaseDirectory, "/masterMods/");
mkdirp.sync(config.databaseDirectory);
mkdirp.sync(masterModFolder);
// homebrew modules // homebrew modules
const getFactorioLocale = require("./lib/getFactorioLocale"); const getFactorioLocale = require("./lib/getFactorioLocale");
@@ -36,23 +54,6 @@ const fileOps = require("_app/fileOps");
// homemade express middleware for token auth // homemade express middleware for token auth
const authenticate = require("./lib/authenticate"); const authenticate = require("./lib/authenticate");
// Library for create folder recursively if it does not exist
const mkdirp = require("mkdirp");
mkdirp.sync("./database");
mkdirp.sync(masterModFolder);
const averagedTimeSeries = require("averaged-timeseries");
const deepmerge = require("deepmerge");
const path = require("path");
const fs = require("fs");
const nedb = require("nedb");
const https = require("https");
const jwt = require('jsonwebtoken');
const bcrypt = require('bcryptjs');
const crypto = require('crypto');
const base64url = require('base64url');
/** Sync */ /** Sync */
function randomStringAsBase64Url(size) { function randomStringAsBase64Url(size) {
return base64url(crypto.randomBytes(size)); return base64url(crypto.randomBytes(size));
@@ -217,12 +218,12 @@ app.get('/metrics', (req, res) => {
var Datastore = require('nedb'); var Datastore = require('nedb');
db = {}; db = {};
var LinvoDB = require("linvodb3"); var LinvoDB = require("linvodb3");
LinvoDB.dbPath = "./database/linvodb/"; LinvoDB.dbPath = path.resolve(config.databaseDirectory, "/linvodb/");
// database for items in system // database for items in system
// db.items = new Datastore({ filename: 'database/items.db', autoload: true }); // db.items = new Datastore({ filename: 'database/items.db', autoload: true });
// in memory database for combinator signals // in memory database for combinator signals
db.signals = new Datastore({ filename: 'database/signals.db', autoload: true, inMemoryOnly: true}); db.signals = new Datastore({ filename: path.resolve(config.databaseDirectory, '/signals.db'), autoload: true, inMemoryOnly: true});
db.signals.ensureIndex({ fieldName: 'time', expireAfterSeconds: 3600 }, function (err) {}); db.signals.ensureIndex({ fieldName: 'time', expireAfterSeconds: 3600 }, function (err) {});
// production chart database // production chart database
@@ -231,16 +232,16 @@ db.flows = new LinvoDB("flows", {}, {});
(function(){ (function(){
try{ try{
let x = fs.statSync("database/slaves.json"); let x = fs.statSync(path.resolve(config.databaseDirectory, "/slaves.json"));
console.log("loading slaves from database/slaves.json"); console.log(`loading slaves from path.resolve(config.databaseDirectory, "slaves.json")`);
slaves = JSON.parse(fs.readFileSync("database/slaves.json")); slaves = JSON.parse(fs.readFileSync(path.resolve(config.databaseDirectory, "slaves.json")));
} catch (e){ } catch (e){
slaves = {}; slaves = {};
} }
try{ try{
x = fs.statSync("database/items.json"); x = fs.statSync(path.resolve(config.databaseDirectory, "items.json"));
console.log("loading items from database/items.json"); console.log(`loading items from ${path.resolve(config.databaseDirectory, "items.json")}`);
db.items = JSON.parse(fs.readFileSync("database/items.json")); db.items = JSON.parse(fs.readFileSync(path.resolve(config.databaseDirectory, "items.json")));
} catch (e){ } catch (e){
db.items = {}; db.items = {};
} }
@@ -280,13 +281,13 @@ process.on('SIGINT', async function () {
// set insane limit to slave length, if its longer than this we are probably being ddosed or something // set insane limit to slave length, if its longer than this we are probably being ddosed or something
if(slaves && Object.keys(slaves).length < 2000000){ if(slaves && Object.keys(slaves).length < 2000000){
console.log("saving to slaves.json"); console.log("saving to slaves.json");
fs.writeFileSync("database/slaves.json", JSON.stringify(slaves)); fs.writeFileSync(path.resolve(config.databaseDirectory, "slaves.json"), JSON.stringify(slaves));
} else if(slaves) { } else if(slaves) {
console.log("Slave database too large, not saving ("+Object.keys(slaves).length+")"); console.log("Slave database too large, not saving ("+Object.keys(slaves).length+")");
} }
if(db.items && Object.keys(db.items).length < 50000){ if(db.items && Object.keys(db.items).length < 50000){
console.log("saving to items.json"); console.log("saving to items.json");
fs.writeFileSync("database/items.json", JSON.stringify(db.items)); fs.writeFileSync(path.resolve(config.databaseDirectory, "items.json"), JSON.stringify(db.items));
} else if(slaves) { } else if(slaves) {
console.log("Item database too large, not saving ("+Object.keys(slaves).length+")"); console.log("Item database too large, not saving ("+Object.keys(slaves).length+")");
} }
@@ -417,7 +418,7 @@ app.post("/api/uploadMod", authenticate.middleware, function(req,res) {
let reqStartTime = Date.now(); let reqStartTime = Date.now();
if (req.files && req.files.file) { if (req.files && req.files.file) {
console.log(req.files.file); console.log(req.files.file);
req.files.file.mv('./database/masterMods/'+req.files.file.name, function(err) { req.files.file.mv(path.resolve(config.databaseDirectory, "masterMods", req.files.file.name), function(err) {
if (err) { if (err) {
res.status(500).send(err); res.status(500).send(err);
} else { } else {
@@ -937,18 +938,22 @@ app.get("/api/getFactorioLocale", function(req,res){
httpRequestDurationMilliseconds.labels(req.route.path).observe(Date.now()-reqStartTime); httpRequestDurationMilliseconds.labels(req.route.path).observe(Date.now()-reqStartTime);
}); });
}); });
if(config.sslPort){ if(args.sslPort || config.sslPort){
var certificate = fs.readFileSync( 'database/certificates/cert.crt' ); try{
var privateKey = fs.readFileSync( 'database/certificates/cert.key' ); var certificate = fs.readFileSync(path.resolve(config.databaseDirectory, 'certificates/cert.crt'));
var privateKey = fs.readFileSync(path.resolve(config.databaseDirectory, 'certificates/cert.key'));
httpsServer = https.createServer({ httpsServer = require("https").createServer({
key: privateKey, key: privateKey,
cert: certificate cert: certificate
}, app).listen(config.sslPort); }, app).listen(args.sslPort || config.sslPort);
} catch(e){
console.error(e)
}
} }
if(config.masterPort){ if(args.masterPort || config.masterPort){
server = require("http").Server(app); server = require("http").Server(app);
server.listen(config.masterPort || 8080, function () { server.listen(args.masterPort || config.masterPort || 8080, function () {
console.log("Listening on port %s...", server.address().port); console.log("Listening on port %s...", server.address().port);
}); });
} }
+1
View File
@@ -44,6 +44,7 @@
"leveldown": "^1.9.0", "leveldown": "^1.9.0",
"linvodb3": "^3.25.1", "linvodb3": "^3.25.1",
"luamin": "^1.0.4", "luamin": "^1.0.4",
"minimist": "^1.2.0",
"mkdirp": "^0.5.1", "mkdirp": "^0.5.1",
"mkdirp-promise": "^5.0.1", "mkdirp-promise": "^5.0.1",
"moment": "^2.20.1", "moment": "^2.20.1",