cleanup p2p init and fix breakge with blank ssl object
parent
9c010901fd
commit
e2f53d2cd2
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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':
|
||||
|
|
|
|||
Loading…
Reference in New Issue