diff --git a/libs/commander.js b/libs/commander.js index d4a6d899..0a262cce 100644 --- a/libs/commander.js +++ b/libs/commander.js @@ -100,7 +100,12 @@ module.exports = function(s,config,lang,app){ const startWorker = () => { stopWorker() const pathToWorkerScript = __dirname + `/commander/${config.useBetterP2P ? 'workerv2' : 'worker'}.js` - const workerProcess = new Worker(pathToWorkerScript) + const workerProcess = new Worker(pathToWorkerScript,{ + workerData: { + config: config, + lang: lang + } + }) workerProcess.on('message',function(data){ switch(data.f){ case'debugLog': @@ -114,8 +119,6 @@ module.exports = function(s,config,lang,app){ setTimeout(() => { workerProcess.postMessage({ f: 'init', - config: config, - lang: lang }) },2000) return workerProcess diff --git a/libs/commander/workerv2.js b/libs/commander/workerv2.js index fdffd758..e4631b13 100644 --- a/libs/commander/workerv2.js +++ b/libs/commander/workerv2.js @@ -1,10 +1,11 @@ -const { parentPort } = require('worker_threads'); +const { parentPort, workerData } = require('worker_threads'); process.on("uncaughtException", function(error) { console.error(error); }); -let remoteConnectionPort = 8080 -let config = {} -let lang = {} +let config = workerData.config +let lang = workerData.lang +let sslInfo = config.ssl || {} +let remoteConnectionPort = config.easyRemotePort || (sslInfo && sslInfo.port && (sslInfo.enabled !== false) ? sslInfo.port : config.port || 8080) const net = require("net") const bson = require('bson') const WebSocket = require('cws') @@ -25,9 +26,6 @@ const s = { parentPort.on('message',(data) => { switch(data.f){ case'init': - config = Object.assign({},data.config) - lang = Object.assign({},data.lang) - remoteConnectionPort = config.ssl && JSON.stringify(config.ssl) !== '{}' ? config.ssl.port || 443 : config.port || 8080 initialize() break; case'exit':