Prevent dev runtime from crashing upon HMR error

Prevent development runtime from crashing miserably in an event of subsequent `ready` event received from the `ChildServer`. Also, force kill the underlying `ChildServer` process when terminating gracefully to make sure it does not spam to `stdout` after the dev process's terminated (often a case when the termination signal received, while the `ChildServer`'s still starting up in the background).
fusionjs · Aug 31, 2022 · f20c2cb · f20c2cb
1 parent fdd282a
commit f20c2cb
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 31 deletions.
diff --git a/fusion-cli/build/child-server.js b/fusion-cli/build/child-server.js
@@ -10,6 +10,7 @@
 
 const child_process = require('child_process');
 const ChildServerError = require('./child-server-error.js');
+const {renderTerminalError} = require('./server-error.js');
 
 /*::
 type ChildServerOptions = {
@@ -34,7 +35,12 @@ class ChildServer {
   }
 
   onReady() {
-    throw new Error('Did not expect to receive another ready event from child');
+    const err = new Error(
+      'Did not expect to receive another ready event from child'
+    );
+    console.error(renderTerminalError(err));
+
+    this.onError(err);
   }
 
   onError(err /*: Error */) {
@@ -90,6 +96,8 @@ class ChildServer {
             stdio: ['inherit', 'inherit', 'inherit', 'ipc'],
           });
           this.proc.on('error', (err) => {
+            console.error(renderTerminalError(err));
+
             handleChildError(err);
           });
           this.proc.on('exit', (code, signal) => {
@@ -101,8 +109,8 @@ class ChildServer {
                 .filter(Boolean)
                 .join('; ')}`
             );
+            console.error(renderTerminalError(err));
 
-            console.error(err);
             handleChildError(err);
           });
           this.proc.on('message', async (message) => {
@@ -150,7 +158,7 @@ class ChildServer {
   }
 
   _stopPromise = null;
-  stop() {
+  stop(isForced /*: boolean */ = false) {
     if (this._stopPromise) {
       return this._stopPromise;
     }
@@ -164,7 +172,7 @@ class ChildServer {
       this._startPromise = null;
 
       this.proc.removeAllListeners();
-      if (this.options.debug) {
+      if (this.options.debug || isForced) {
         this.proc.on('error', reject);
         this.proc.on('exit', resolve);
         this.proc.kill('SIGKILL');

diff --git a/fusion-cli/build/dev-runtime.js b/fusion-cli/build/dev-runtime.js
@@ -230,15 +230,15 @@ module.exports.DevelopmentRuntime = function (
     lifecycle.stop();
   };
 
-  async function killProc() {
+  async function killProc(isForced) {
     if (state.proxy) {
       state.proxy.close();
       state.proxy = null;
     }
 
     if (state.childServer) {
       try {
-        await state.childServer.stop();
+        await state.childServer.stop(isForced);
       } catch (err) {} // eslint-disable-line
 
       state.childServer = null;
@@ -360,7 +360,7 @@ module.exports.DevelopmentRuntime = function (
       state.server = null; // ensure we can call .run() again after stopping
     }
 
-    await killProc();
+    await killProc(true);
   };
 
   return this;

diff --git a/fusion-cli/commands/dev.js b/fusion-cli/commands/dev.js
@@ -144,31 +144,32 @@ exports.run = async function (
   const EXIT_SIGNALS = ['SIGINT', 'SIGTERM'];
   let forceExit = false;
   EXIT_SIGNALS.forEach((signal) => {
-    process.on(signal, function onSignalExit() {
-      function exit(exitCode = 0) {
-        EXIT_SIGNALS.forEach((signal) => process.off(signal, onSignalExit));
-        process.exit(exitCode);
-      }
-
-      if (forceExit || TERMINATION_GRACE_PERIOD === 0) {
-        return exit(1);
-      }
-      // User may force exit by sending termination signal a second time
-      forceExit = true;
-
-      console.log(
-        '\nGracefully shutting down... To force exit the process, press ^C again\n'
-      );
-
-      // Force exit should compiler take long time to close
-      if (Number.isFinite(TERMINATION_GRACE_PERIOD)) {
-        setTimeout(function () {
-          exit(1);
-        }, TERMINATION_GRACE_PERIOD);
-      }
-      stop(exit);
-    });
+    process.on(signal, onSignalExit);
   });
+  function onSignalExit() {
+    function exit(exitCode = 0) {
+      EXIT_SIGNALS.forEach((signal) => process.off(signal, onSignalExit));
+      process.exit(exitCode);
+    }
+
+    if (forceExit || TERMINATION_GRACE_PERIOD === 0) {
+      return exit(1);
+    }
+    // User may force exit by sending termination signal a second time
+    forceExit = true;
+
+    console.log(
+      '\nGracefully shutting down... To force exit the process, press ^C again\n'
+    );
+
+    // Force exit should compiler take long time to close
+    if (Number.isFinite(TERMINATION_GRACE_PERIOD)) {
+      setTimeout(function () {
+        exit(1);
+      }, TERMINATION_GRACE_PERIOD);
+    }
+    stop(exit);
+  }
 
   return {
     compiler,