cleanup p2p init and fix breakge with blank ssl object

fix-multi-trigger
Moe 2023-03-14 21:33:17 -07:00
parent 9c010901fd
commit e2f53d2cd2
2 changed files with 11 additions and 10 deletions

View File

@ -100,7 +100,12 @@ module.exports = function(s,config,lang,app){
const startWorker = () => { const startWorker = () => {
stopWorker() stopWorker()
const pathToWorkerScript = __dirname + `/commander/${config.useBetterP2P ? 'workerv2' : 'worker'}.js` 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){ workerProcess.on('message',function(data){
switch(data.f){ switch(data.f){
case'debugLog': case'debugLog':
@ -114,8 +119,6 @@ module.exports = function(s,config,lang,app){
setTimeout(() => { setTimeout(() => {
workerProcess.postMessage({ workerProcess.postMessage({
f: 'init', f: 'init',
config: config,
lang: lang
}) })
},2000) },2000)
return workerProcess return workerProcess

View File

@ -1,10 +1,11 @@
const { parentPort } = require('worker_threads'); const { parentPort, workerData } = require('worker_threads');
process.on("uncaughtException", function(error) { process.on("uncaughtException", function(error) {
console.error(error); console.error(error);
}); });
let remoteConnectionPort = 8080 let config = workerData.config
let config = {} let lang = workerData.lang
let 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 net = require("net")
const bson = require('bson') const bson = require('bson')
const WebSocket = require('cws') const WebSocket = require('cws')
@ -25,9 +26,6 @@ const s = {
parentPort.on('message',(data) => { parentPort.on('message',(data) => {
switch(data.f){ switch(data.f){
case'init': 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() initialize()
break; break;
case'exit': case'exit':