From 37ed99a130fa0ec9f426fc6cea3f1ba4deea1f95 Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 9 Aug 2022 21:41:31 -0700 Subject: [PATCH] Replaced child_process with worker_threads per #630 --- src/worker-script/node/index.js | 5 +++-- src/worker/node/send.js | 4 ++-- src/worker/node/spawnWorker.js | 9 ++------- src/worker/node/terminateWorker.js | 2 +- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/worker-script/node/index.js b/src/worker-script/node/index.js index 15cb3fb..c00dba7 100644 --- a/src/worker-script/node/index.js +++ b/src/worker-script/node/index.js @@ -9,6 +9,7 @@ */ const fetch = require('node-fetch'); +const { parentPort } = require('worker_threads'); const worker = require('..'); const getCore = require('./getCore'); const gunzip = require('./gunzip'); @@ -17,8 +18,8 @@ const cache = require('./cache'); /* * register message handler */ -process.on('message', (packet) => { - worker.dispatchHandlers(packet, (obj) => process.send(obj)); +parentPort.on('message', (packet) => { + worker.dispatchHandlers(packet, (obj) => parentPort.postMessage(obj)); }); worker.setAdapter({ diff --git a/src/worker/node/send.js b/src/worker/node/send.js index 783c6e1..88f8aaf 100644 --- a/src/worker/node/send.js +++ b/src/worker/node/send.js @@ -5,6 +5,6 @@ * @function send packet to worker and create a job * @access public */ -module.exports = (worker, packet) => { - worker.send(packet); +module.exports = async (worker, packet) => { + worker.postMessage(packet); }; diff --git a/src/worker/node/spawnWorker.js b/src/worker/node/spawnWorker.js index c538244..9723c18 100644 --- a/src/worker/node/spawnWorker.js +++ b/src/worker/node/spawnWorker.js @@ -1,6 +1,4 @@ -const { fork } = require('child_process'); - -let debugPort = 9229; +const { Worker } = require('worker_threads'); /** * spawnWorker @@ -9,7 +7,4 @@ let debugPort = 9229; * @function fork a new process in node * @access public */ -module.exports = ({ workerPath }) => { - debugPort += 1; - return fork(workerPath, [], { execArgv: [`--debug-port=${debugPort}`] }); -}; +module.exports = ({ workerPath }) => new Worker(workerPath); diff --git a/src/worker/node/terminateWorker.js b/src/worker/node/terminateWorker.js index 0e8b67e..834760e 100644 --- a/src/worker/node/terminateWorker.js +++ b/src/worker/node/terminateWorker.js @@ -6,5 +6,5 @@ * @access public */ module.exports = (worker) => { - worker.kill(); + worker.terminate(); };