Listen to close instead of exit, to improve process handling

Notably useful on Windows, where some processes seem to trigger exit
when handing off to another process somehow, whilst close only comes
later when the process exits for real. Very noticeable with FF.

Author: pimterry

src/interceptors/fresh-chrome.ts

@@ -79,7 +79,7 @@ export class FreshChrome implements Interceptor {
         await hideWarningServer.stop();
 
         browsers[proxyPort] = browser;
-        browser.process.once('exit', () => {
+        browser.process.once('close', () => {
             delete browsers[proxyPort];
 
             if (Object.keys(browsers).length === 0 && chromeDetails && _.isString(chromeDetails.profile)) {
@@ -102,7 +102,7 @@ export class FreshChrome implements Interceptor {
     async deactivate(proxyPort: number | string) {
         if (this.isActive(proxyPort)) {
             const browser = browsers[proxyPort];
-            const exitPromise = new Promise((resolve) => browser!.process.once('exit', resolve));
+            const exitPromise = new Promise((resolve) => browser!.process.once('close', resolve));
             browser!.stop();
             await exitPromise;
         }

src/interceptors/fresh-firefox.ts

@@ -129,7 +129,7 @@ export class FreshFirefox implements Interceptor {
         const certInstalled = certCheckServer.waitForSuccess().catch(reportError);
 
         certInstallBrowser = await this.startFirefox(certCheckServer);
-        certInstallBrowser.process.once('exit', () => {
+        certInstallBrowser.process.once('close', () => {
             certCheckServer.stop();
             certInstallBrowser = undefined;
         });
@@ -183,7 +183,7 @@ export class FreshFirefox implements Interceptor {
         }).catch(reportError);
 
         browsers[proxyPort] = browser;
-        browser.process.once('exit', () => {
+        browser.process.once('close', () => {
             certCheckServer.stop();
             delete browsers[proxyPort];
             if (!success) {
@@ -199,9 +199,9 @@ export class FreshFirefox implements Interceptor {
     async deactivate(proxyPort: number | string) {
         if (this.isActive(proxyPort)) {
             const browser = browsers[proxyPort];
-            const exitPromise = new Promise((resolve) => browser!.process.once('exit', resolve));
+            const closePromise = new Promise((resolve) => browser!.process.once('close', resolve));
             browser!.stop();
-            await exitPromise;
+            await closePromise;
         }
     }
 
@@ -211,7 +211,7 @@ export class FreshFirefox implements Interceptor {
         );
         if (certInstallBrowser) {
             certInstallBrowser.stop();
-            return new Promise((resolve) => certInstallBrowser!.process.once('exit', resolve));
+            return new Promise((resolve) => certInstallBrowser!.process.once('close', resolve));
         }
     }
 };

src/interceptors/terminal/fresh-terminal-interceptor.ts

@@ -40,7 +40,7 @@ const spawnAndCollectOutput = (command: string, args: string[] = []): Promise<{
         stderr.on('data', (d) => stderrData.push(d));
 
         childProc.once('error', reject);
-        childProc.once('exit', () => {
+        childProc.once('close', () => {
             // Note that we do _not_ check the error code
             resolve({
                 stdout: Buffer.concat(stdoutData).toString(),
@@ -270,7 +270,7 @@ export class FreshTerminalInterceptor implements Interceptor {
                 if (_.every(terminals, ts => _.isEmpty(ts))) resetShellStartupScripts();
             }, 500);
         };
-        childProc.once('exit', onTerminalClosed);
+        childProc.once('close', onTerminalClosed);
         childProc.once('error', (e) => {
             reportError(e);
             onTerminalClosed();
@@ -282,7 +282,7 @@ export class FreshTerminalInterceptor implements Interceptor {
 
         await Promise.all((terminals[proxyPort] || []).map((proc) => {
             return new Promise((resolve) => {
-                proc.once('exit', resolve);
+                proc.once('close', resolve);
                 proc.kill();
             });
         }));

test/interceptors/fresh-terminal.spec.ts

@@ -54,7 +54,7 @@ describe('Fresh terminal interceptor', function () {
                 env: Object.assign({}, process.env, terminalEnvOverrides)
             });
             await new Promise((resolve, reject) => {
-                nodeScript.on('exit', resolve);
+                nodeScript.on('close', resolve);
                 nodeScript.on('error', reject);
             });