test: fix test cases

taskforcesh · Oct 5, 2024 · 6e02943 · 6e02943
1 parent 9a43a3f
commit 6e02943
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 12 deletions.
diff --git a/src/classes/child-pool.ts b/src/classes/child-pool.ts
@@ -27,7 +27,7 @@ export class ChildPool {
     };
   }
 
-  async retain(processFile: string, rejectCb: Function): Promise<Child> {
+  async retain(processFile: string, exitHandler: any): Promise<Child> {
     let child = this.getFree(processFile).pop();
 
     if (child) {
@@ -41,12 +41,7 @@ export class ChildPool {
       workerThreadsOptions: this.opts.workerThreadsOptions,
     });
 
-    child.on('exit', (exitCode: any, signal: any) => {
-      this.remove.bind(this, child);
-      rejectCb(
-        new Error('Unexpected exit code: ' + exitCode + ' signal: ' + signal),
-      );
-    });
+    child.on('exit', exitHandler);
 
     try {
       await child.init();

diff --git a/src/classes/sandbox.ts b/src/classes/sandbox.ts
@@ -11,11 +11,20 @@ const sandbox = <T, R, N extends string>(
   return async function process(job: Job<T, R, N>, token?: string): Promise<R> {
     let child: Child;
     let msgHandler: any;
+    let exitHandler: any;
     try {
       const done: Promise<R> = new Promise((resolve, reject) => {
         const initChild = async () => {
           try {
-            child = await childPool.retain(processFile, reject);
+            exitHandler = (exitCode: any, signal: any) => {
+              reject(
+                new Error(
+                  'Unexpected exit code: ' + exitCode + ' signal: ' + signal,
+                ),
+              );
+            };
+
+            child = await childPool.retain(processFile, exitHandler);
 
             msgHandler = async (msg: ChildMessage) => {
               switch (msg.cmd) {
@@ -66,7 +75,7 @@ const sandbox = <T, R, N extends string>(
     } finally {
       if (child) {
         child.off('message', msgHandler);
-
+        child.off('exit', exitHandler);
         if (child.exitCode !== null || /SIG.*/.test(`${child.signalCode}`)) {
           childPool.remove(child);
         } else {

diff --git a/tests/test_sandboxed_process.ts b/tests/test_sandboxed_process.ts
@@ -1092,7 +1092,7 @@ function sandboxProcessTests(
       });
     });
 
-    it('should remove exited process', async () => {
+    it('should release exited process', async () => {
       const processFile = __dirname + '/fixtures/fixture_processor_exit.js';
 
       const worker = new Worker(queueName, processFile, {
@@ -1114,7 +1114,7 @@ function sandboxProcessTests(
             expect(Object.keys(worker['childPool'].retained)).to.have.lengthOf(
               0,
             );
-            expect(worker['childPool'].getAllFree()).to.have.lengthOf(0);
+            expect(worker['childPool'].getAllFree()).to.have.lengthOf(1);
             resolve();
           } catch (err) {
             reject(err);
@@ -1139,7 +1139,10 @@ function sandboxProcessTests(
       });
 
       // acquire and release a child here so we know it has it's full termination handler setup
-      const initializedChild = await worker['childPool'].retain(processFile);
+      const initializedChild = await worker['childPool'].retain(
+        processFile,
+        () => {},
+      );
       await worker['childPool'].release(initializedChild);
 
       // await this After we've added the job