Merge pull request #34 from tmcw/allow-esrch

Allow process.kill to fail with ESRCH. Fixes #32.

Author: KallynGowdy

src/DenoWorker.spec.ts

@@ -22,6 +22,7 @@ describe('DenoWorker', () => {
     const failScript = readFileSync(failFile, { encoding: 'utf-8' });
     const envFile = path.resolve(__dirname, './test/env.js');
     const envScript = readFileSync(envFile, { encoding: 'utf-8' });
+    const memoryCrashFile = path.resolve(__dirname, './test/memory.js');
 
     afterEach(() => {
         if (worker) {
@@ -1118,6 +1119,33 @@ describe('DenoWorker', () => {
                 expect(exitSignal).toBe('SIGKILL');
             }
         });
+
+        it('should gracefully handle Deno out-of-memory', async () => {
+            let denoProcesses = await getDenoProcesses();
+            expect(denoProcesses).toEqual([]);
+            worker = new DenoWorker(memoryCrashFile, {
+                denoV8Flags: ['--max-heap-size=10'],
+                logStdout: true,
+            });
+            worker.postMessage({});
+
+            const exitValues = await new Promise<
+                [number | null, string | null]
+            >((resolve) => {
+                worker.onexit = (...args) => resolve(args);
+            });
+
+            const isWindows = /^win/.test(process.platform);
+
+            if (isWindows) {
+                expect(typeof exitValues[0]).toEqual('number');
+                expect(exitValues[1]).toEqual(null);
+            } else {
+                expect(exitValues).toEqual([null, 'SIGTRAP']);
+            }
+
+            worker.terminate();
+        });
     });
 });
 

src/DenoWorker.ts

@@ -420,7 +420,7 @@ export class DenoWorker {
     }
 
     /**
-     * Terminiates the worker and cleans up unused resources.
+     * Terminates the worker and cleans up unused resources.
      */
     terminate() {
         this._terminated = true;

src/Utils.ts

@@ -29,8 +29,18 @@ function killWindows(pid: number) {
 }
 
 function killUnix(pid: number) {
-    const signal = 'SIGKILL';
-    process.kill(pid, signal);
+    try {
+        const signal = 'SIGKILL';
+        process.kill(pid, signal);
+    } catch (e) {
+        // Allow this call to fail with
+        // ESRCH, which meant that the process
+        // to be killed was already dead.
+        // But re-throw on other codes.
+        if (e.code !== 'ESRCH') {
+            throw e;
+        }
+    }
 }
 
 export interface ExecResult {

src/test/memory.js

@@ -0,0 +1,7 @@
+self.onmessage = (event) => {
+    let arrays = [];
+    for (;;) {
+        arrays.push(new Uint32Array(128));
+        console.log(arrays.length);
+    }
+};