Handle SIGINT via async-exit-hook (closes DevExpress#1378)

package.json

@@ -54,6 +54,7 @@
     "prepublish": "publish-please guard"
   },
   "dependencies": {
+    "async-exit-hook": "^1.1.2",
     "babel-core": "^6.22.1",
     "babel-plugin-transform-class-properties": "^6.24.1",
     "babel-plugin-transform-runtime": "^6.22.0",
@@ -78,7 +79,7 @@
     "is-ci": "^1.0.10",
     "is-glob": "^2.0.1",
     "lodash": "^4.13.1",
-    "log-update": "^1.0.2",
+    "log-update-async-hook": "^2.0.1",
     "map-reverse": "^1.0.1",
     "mkdirp": "^0.5.1",
     "moment": "^2.10.3",

src/browser/connection/gateway.js

@@ -75,8 +75,9 @@ export default class BrowserConnectionGateway {
 
     static onHeartbeat (req, res, connection) {
         if (BrowserConnectionGateway.ensureConnectionReady(res, connection)) {
-            connection.heartbeat();
-            res.end();
+            var status = connection.heartbeat();
+
+            respondWithJSON(res, status);
         }
     }
 

src/browser/connection/index.js

@@ -7,6 +7,7 @@ import { readSync as read } from 'read-file-relative';
 import promisifyEvent from 'promisify-event';
 import shortId from 'shortid';
 import COMMAND from './command';
+import STATUS from './status';
 import { GeneralError } from '../../errors/runtime';
 import MESSAGE from '../../errors/runtime/message';
 
@@ -36,6 +37,7 @@ export default class BrowserConnection extends EventEmitter {
         this.provider = browserInfo.provider;
 
         this.permanent        = permanent;
+        this.closing          = false;
         this.closed           = false;
         this.ready            = false;
         this.opened           = false;
@@ -164,9 +166,11 @@ export default class BrowserConnection extends EventEmitter {
     }
 
     close () {
-        if (this.closed)
+        if (this.closed || this.closing)
             return;
 
+        this.closing = true;
+
         this._closeBrowser()
             .then(() => {
                 this.browserConnectionGateway.stopServingConnection(this);
@@ -193,6 +197,11 @@ export default class BrowserConnection extends EventEmitter {
     heartbeat () {
         clearTimeout(this.heartbeatTimeout);
         this._waitForHeartbeat();
+
+        return {
+            code: this.closing ? STATUS.closing : STATUS.ok,
+            url:  this.closing ? this.idleUrl : ''
+        };
     }
 
     renderIdlePage () {

src/browser/connection/status.js

@@ -0,0 +1,4 @@
+export default {
+    ok:      'ok',
+    closing: 'closing'
+};

src/cli/log.js

@@ -1,6 +1,6 @@
 import tty from 'tty';
 import elegantSpinner from 'elegant-spinner';
-import logUpdate from 'log-update';
+import logUpdate from 'log-update-async-hook';
 import chalk from 'chalk';
 import isCI from 'is-ci';
 

src/client/browser/index.js

@@ -1,9 +1,10 @@
 // TODO: once we'll have client commons load it from there instead of node modules (currently it's leads to two copies of this packages on client)
 import Promise from 'pinkie';
 import COMMAND from '../../browser/connection/command';
+import STATUS from '../../browser/connection/status';
 
 
-const HEARTBEAT_INTERVAL = 30 * 1000;
+const HEARTBEAT_INTERVAL = 2 * 1000;
 
 var allowInitScriptExecution = false;
 
@@ -36,9 +37,20 @@ function isCurrentLocation (url) {
 
 //API
 export function startHeartbeat (heartbeatUrl, createXHR) {
-    sendXHR(heartbeatUrl, createXHR);
 
-    window.setInterval(() => sendXHR(heartbeatUrl, createXHR), HEARTBEAT_INTERVAL);
+    function heartbit () {
+        sendXHR(heartbeatUrl, createXHR)
+            .then(status => {
+                if (status.code === STATUS.closing && !isCurrentLocation(status.url)) {
+                    stopInitScriptExecution();
+                    document.location = status.url;
+                }
+            });
+    }
+
+    window.setInterval(heartbit, HEARTBEAT_INTERVAL);
+
+    heartbit();
 }
 
 function executeInitScript (initScriptUrl, createXHR) {

src/index.js

@@ -1,6 +1,7 @@
 import Promise from 'pinkie';
 import TestCafe from './testcafe';
 import * as endpointUtils from 'endpoint-utils';
+import exitHook from 'async-exit-hook';
 import { GeneralError } from './errors/runtime';
 import MESSAGE from './errors/runtime/message';
 import embeddingUtils from './embedding-utils';
@@ -42,7 +43,11 @@ async function createTestCafe (hostname, port1, port2) {
         getValidPort(port2)
     ]);
 
-    return new TestCafe(hostname, port1, port2);
+    var testcafe = new TestCafe(hostname, port1, port2);
+
+    exitHook(cb => testcafe.close().then(cb));
+
+    return testcafe;
 }
 
 // Embedding utils

src/testcafe.js

@@ -19,6 +19,7 @@ const FAVICON           = read('./client/ui/favicon.ico', true);
 
 export default class TestCafe {
     constructor (hostname, port1, port2) {
+        this.closed                   = false;
         this.proxy                    = new Proxy(hostname, port1, port2);
         this.browserConnectionGateway = new BrowserConnectionGateway(this.proxy);
         this.runners                  = [];
@@ -62,6 +63,11 @@ export default class TestCafe {
     }
 
     async close () {
+        if (this.closed)
+            return;
+
+        this.closed = true;
+
         await Promise.all(this.runners.map(runner => runner.stop()));
 
         await browserProviderPool.dispose();