1 files changed, 139 insertions, 64 deletions

diff --git a/scripts/watch.js b/scripts/watch.js
index 91f3583..5db0d30 100644
--- a/scripts/watch.js
+++ b/scripts/watch.js
@@ -1,4 +1,5 @@
 import { spawn } from 'node:child_process';
+import os from 'node:os';
 import path from 'node:path';
 
 import { watch } from 'chokidar';
@@ -20,15 +21,32 @@ const serviceSharedModule = path.join(
   '../packages/service-shared/dist/index.mjs',
 );
 
+/** @type {string} */
+const serviceInjectModule = path.join(
+  thisDir,
+  '../packages/service-inject/dist/index.js',
+);
+
+/** @type {string} */
+const userDataDir = path.join(thisDir, '../userDataDir/development');
+
 /** @type {RegExp[]} */
 const stderrIgnorePatterns = [
-  // warning about devtools extension
+  // Warning about devtools extension
   // https://github.com/cawa-93/vite-electron-builder/issues/492
   // https://github.com/MarshallOfSound/electron-devtools-installer/issues/143
   /ExtensionLoadWarning/,
   // GPU sandbox error with the mesa GLSL cache
   // https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=918433
   /InitializeSandbox\(\) called with multiple threads in process gpu-process/,
+  // Very spammy GPU error reporting
+  // https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=901831
+  /GetVSyncParametersIfAvailable\(\) failed/,
+  // Does not seem to occur in production
+  // https://github.com/electron/electron/issues/32133#issuecomment-1079916988
+  /(sandbox_bundle\.js script failed to run|object null is not iterable).+ node:electron\/js2c\/sandbox_bundle \(160\)$/,
+  // Warning when GPU-accelerated video decoding is not available (some wayland configs)
+  /Passthrough is not supported, GL is/,
 ];
 
 /**
@@ -104,50 +122,6 @@ async function setupEsbuildWatcher(packageName, extraPaths, callback) {
 }
 
 /**
- * @param {string} packageName
- * @returns {Promise<import('vite').ViteDevServer>}
- */
-async function setupDevServer(packageName) {
-  const viteDevServer = await createServer({
-    build: {
-      watch: {
-        skipWrite: true,
-        clearScreen: false,
-      },
-    },
-    configFile: path.join(thisDir, `../packages/${packageName}/vite.config.js`),
-  });
-  await viteDevServer.listen();
-  return viteDevServer;
-}
-
-/**
- * @param {(event: import('vite').HMRPayload) => void} sendEvent
- * @returns {Promise<void>}
- */
-function setupPreloadPackageWatcher(sendEvent) {
-  return setupEsbuildWatcher('preload', [sharedModule], () => {
-    sendEvent({
-      type: 'full-reload',
-    });
-  });
-}
-
-/**
- * @param {string} packageName
- * @param {(event: import('vite').HMRPayload) => void} sendEvent
- * @returns {Promise<void>}
- */
-function setupServicePackageWatcher(packageName, sendEvent) {
-  return setupEsbuildWatcher(packageName, [serviceSharedModule], () => {
-    sendEvent({
-      type: 'custom',
-      event: 'sophie:reload-services',
-    });
-  });
-}
-
-/**
  * @param {import('vite').ViteDevServer} viteDevServer
  * @returns {Promise<void>}
  */
@@ -163,34 +137,112 @@ function setupMainPackageWatcher(viteDevServer) {
   const portOrDefault = port || 3000;
   process.env.VITE_DEV_SERVER_URL = `${protocol}//${hostOrDefault}:${portOrDefault}/`;
 
+  /** @type {string[]} */
+  let extraArgs = [];
+
+  if (['aix', 'freebsd', 'linux', 'openbsd', 'sunos'].includes(os.platform())) {
+    // Use wayland display server if available.
+    extraArgs =
+      'WAYLAND_DISPLAY' in process.env
+        ? [
+            '--enable-features=WaylandWindowDecorations,WebRTCPipeWireCapturer',
+            '--ozone-platform=wayland',
+          ]
+        : ['--ozone-platform=x11'];
+  }
+
   /** @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),
+      [
+        '.',
+        `--user-data-dir=${userDataDir}`,
+        ...extraArgs,
+        ...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), ['.'], {
-        stdio: ['inherit', 'inherit', 'pipe'],
-      });
+      if (childProcess === undefined) {
+        spawnProcess();
+        return;
+      }
 
-      spawnProcess.stderr.on('data', (/** @type {Buffer} */ data) => {
-        const stderrString = data.toString('utf-8').trimEnd();
-        if (!stderrIgnorePatterns.some((r) => r.test(stderrString))) {
-          console.error(stderrString);
-        }
+      childProcess.removeAllListeners('exit');
+      childProcess.on('exit', () => {
+        spawnProcess();
+        mayRestart = true;
       });
+      killProcess();
     },
   );
 }
 
 /**
+ * @param {(event: import('vite').HMRPayload) => void} sendEvent
+ */
+function setupTranslationsWatcher(sendEvent) {
+  const localesDir = path.join(thisDir, '../locales');
+  const watcher = watch(localesDir, {
+    ignored: /\.missing\.json$/,
+    ignoreInitial: true,
+    persistent: true,
+  });
+  watcher.on('change', () => {
+    console.log(`\u26A1 Reloading translations`);
+    sendEvent({
+      type: 'custom',
+      event: 'sophie:reload-translations',
+    });
+  });
+}
+
+/**
  * @returns {Promise<void>}
  */
 async function setupDevEnvironment() {
@@ -214,7 +266,16 @@ async function setupDevEnvironment() {
    * @returns {Promise<void>}
    */
   async function startDevServer() {
-    viteDevServer = await setupDevServer('renderer');
+    viteDevServer = await createServer({
+      build: {
+        watch: {
+          skipWrite: true,
+          clearScreen: false,
+        },
+      },
+      configFile: path.join(thisDir, `../packages/renderer/vite.config.js`),
+    });
+    await viteDevServer.listen();
   }
 
   /**
@@ -223,7 +284,11 @@ async function setupDevEnvironment() {
   async function watchRendererPackages() {
     await setupEsbuildWatcher('shared');
     await Promise.all([
-      setupPreloadPackageWatcher(sendEvent),
+      setupEsbuildWatcher('preload', [sharedModule], () =>
+        sendEvent({
+          type: 'full-reload',
+        }),
+      ),
       startDevServer(),
     ]);
   }
@@ -233,13 +298,23 @@ async function setupDevEnvironment() {
    */
   async function watchServicePackages() {
     await setupEsbuildWatcher('service-shared');
-    await Promise.all([
-      setupServicePackageWatcher('service-inject', sendEvent),
-      setupServicePackageWatcher('service-preload', sendEvent),
-    ]);
+    await setupEsbuildWatcher('service-inject', [serviceSharedModule]);
+    await setupEsbuildWatcher(
+      'service-preload',
+      [serviceSharedModule, serviceInjectModule],
+      () =>
+        sendEvent({
+          type: 'custom',
+          event: 'sophie:reload-services',
+        }),
+    );
   }
 
-  await Promise.all([watchRendererPackages(), watchServicePackages()]);
+  await Promise.all([
+    watchRendererPackages(),
+    watchServicePackages(),
+    setupTranslationsWatcher(sendEvent),
+  ]);
 
   if (viteDevServer === undefined) {
     console.error('Failed to create vite dev server');