build: Properly shut down watch mode

Also fixes argument passing to the application.

Signed-off-by: Kristóf Marussy <kristof@marussy.com>

1 files changed, 53 insertions, 16 deletions

diff --git a/scripts/watch.js b/scripts/watch.js
index 9fa6a57..9cd65c8 100644
--- a/scripts/watch.js
+++ b/scripts/watch.js
@@ -1,5 +1,6 @@
 import { spawn } from 'node:child_process';
 import path from 'node:path';
+import { exit, kill } from 'node:process';
 
 import { watch } from 'chokidar';
 import electronPath from 'electron';
@@ -171,31 +172,67 @@ function setupMainPackageWatcher(viteDevServer) {
 
   /** @type {import('child_process').ChildProcessByStdio<null, null, import('stream').Readable>
     | undefined} */
-  let spawnProcess;
+  let childProcess;
+
+  // Prevent overlapping restarts and restarting while exiting.
+  let mayRestart = true;
+
+  function spawnProcess() {
+    childProcess = spawn(
+      String(electronPath),
+      ['.', ...process.argv.slice(2)],
+      {
+        stdio: ['inherit', 'inherit', 'pipe'],
+      },
+    );
+
+    childProcess.stderr.on('data', (/** @type {Buffer} */ data) => {
+      const stderrString = data.toString('utf8').trimEnd();
+      if (!stderrIgnorePatterns.some((r) => r.test(stderrString))) {
+        console.error(stderrString);
+      }
+    });
+
+    childProcess.on('exit', () => process.exit());
+  }
+
+  function killProcess() {
+    mayRestart = false;
+    if (childProcess === undefined) {
+      return;
+    }
+    childProcess.stderr.removeAllListeners('data');
+    childProcess.kill('SIGINT');
+  }
+
+  process.on('SIGINT', () => {
+    if (childProcess !== undefined) {
+      childProcess.removeAllListeners('exit');
+      childProcess.on('exit', process.exit());
+      killProcess();
+    }
+  });
 
   return setupEsbuildWatcher(
     'main',
     [serviceSharedModule, sharedModule],
     () => {
-      if (spawnProcess !== undefined) {
-        spawnProcess.kill('SIGINT');
-        spawnProcess = undefined;
+      if (!mayRestart) {
+        // We're already about to restart electron.
+        return;
       }
 
-      spawnProcess = spawn(
-        String(electronPath),
-        ['.', ...process.argv.splice(2)],
-        {
-          stdio: ['inherit', 'inherit', 'pipe'],
-        },
-      );
+      if (childProcess === undefined) {
+        spawnProcess();
+        return;
+      }
 
-      spawnProcess.stderr.on('data', (/** @type {Buffer} */ data) => {
-        const stderrString = data.toString('utf8').trimEnd();
-        if (!stderrIgnorePatterns.some((r) => r.test(stderrString))) {
-          console.error(stderrString);
-        }
+      childProcess.removeAllListeners('exit');
+      childProcess.on('exit', () => {
+        spawnProcess();
+        mayRestart = true;
       });
+      killProcess();
     },
   );
 }