Merge pull request #3 from AndreyBelym/fixes

Unref timeout and proper disconnect
inikulin · Sep 11, 2017 · 235393b · 235393b
2 parents df63f4b + 5bb53d7
commit 235393b
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 6 deletions.
diff --git a/index.js b/index.js
@@ -54,7 +54,7 @@ module.exports = function (cliPath, opts) {
     var cliProc = spawn(process.execPath, args, { stdio: [process.stdin, process.stdout, process.stderr, useShutdownMessage ? 'ipc' : null] });
 
     cliProc.on('exit', function (code, signal) {
-        if (useShutdownMessage)
+        if (useShutdownMessage && process.disconnect)
             process.disconnect();
 
         process.on('exit', function () {
@@ -66,14 +66,16 @@ module.exports = function (cliPath, opts) {
     });
 
     process.on('SIGINT', function () {
+        function forceKill () {
+            cliProc.kill('SIGTERM');
+        }
+
         if (useShutdownMessage)
             cliProc.send('shutdown');
         else
             cliProc.kill('SIGINT');
 
-        setTimeout(function () {
-            cliProc.kill('SIGTERM');
-        }, forcedKillDelay);
+        setTimeout(forceKill, forcedKillDelay).unref();
     });
 
     if (useShutdownMessage) {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bin-v8-flags-filter",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Filters out v8 flags for your Node.js CLIs.",
   "main": "index.js",
   "directories": {

diff --git a/test/cli.js b/test/cli.js
@@ -2,6 +2,7 @@ var path   = require('path');
 var filter = require('../');
 
 var gracefulShutdown = process.argv.indexOf('--graceful-shutdown') > -1;
+var noIPCTest        = process.argv.indexOf('--no-ipc-test') > -1;
 
-filter(path.join(__dirname, './actual-cli.js'), { useShutdownMessage: gracefulShutdown });
+filter(path.join(__dirname, './actual-cli.js'), { useShutdownMessage: gracefulShutdown || noIPCTest });
 
diff --git a/test/test.js b/test/test.js
@@ -47,3 +47,29 @@ it('Should use shutdown message', function (done) {
 
     cliProcess.send('shutdown');
 });
+
+it('[Regression] Should not abort if using shutdown message and no parent IPC was established', function (done) {
+    var args = [
+        path.join(__dirname, './cli.js'),
+        '--hey',
+        '--allow-natives-syntax',
+        '-t=yo',
+        '--trace-gc',
+        '--no-ipc-test'
+    ];
+
+    var output     = '';
+    var cliProcess = spawn(process.execPath, args, { stdio: 'pipe' });
+
+    cliProcess.stdout.on('data', function (data) {
+        output += data.toString();
+    });
+
+    cliProcess.on('exit', function (code) {
+        assert.equal(code, 0);
+        assert.ok(output.indexOf('$$$ARGS:["--hey","-t=yo","--no-ipc-test"]$$$') > -1);
+        assert.ok(output.indexOf('$$$ISSMI:true$$$') > -1);
+
+        done();
+    });
+});