houdini 2.0.4 → 2.0.5

package/build/cmd/init.js

@@ -472,12 +472,12 @@ async function packageJSON(targetPath, frameworkInfo) {
   }
   packageJSON2.devDependencies = {
     ...packageJSON2.devDependencies,
-    houdini: "^2.0.4"
+    houdini: "^2.0.5"
   };
   if (frameworkInfo.framework === "svelte" || frameworkInfo.framework === "kit") {
     packageJSON2.devDependencies = {
       ...packageJSON2.devDependencies,
-      "houdini-svelte": "^3.0.1"
+      "houdini-svelte": "^3.0.2"
     };
   } else {
     throw new Error(`Unmanaged framework: "${JSON.stringify(frameworkInfo)}"`);

package/build/lib/codegen.js

@@ -302,49 +302,72 @@ async function codegen_setup(config, mode, db, db_file) {
   });
   _db.run("DELETE FROM plugins");
   _db.flush();
-  logger.time("Start Plugins");
-  await Promise.all(
-    config.plugins.map(async (plugin) => {
-      let executable = plugin.executable;
-      const args = ["--database", db_file];
-      const jsExtensions = [".js", ".mjs", ".cjs"];
-      if (jsExtensions.includes(path.extname(plugin.executable))) {
-        executable = "node";
-        args.unshift(plugin.executable);
-      } else if (path.extname(plugin.executable) === ".wasm") {
-        executable = "node";
-        args.unshift(wasiRunnerPath, plugin.executable);
-      }
-      const dbKey = plugin_db_key(plugin.name);
-      args.push("--plugin-key", dbKey);
-      const pluginUsesStdio = useStdio || path.extname(plugin.executable) === ".wasm";
-      if (pluginUsesStdio) {
-        args.push("--transport", "stdio");
+  const spawnedChildren = [];
+  const kill_spawned = () => {
+    for (const { child, detached } of spawnedChildren) {
+      if (child.pid === void 0 || child.exitCode !== null) continue;
+      try {
+        if (process.platform === "win32") {
+          child.kill();
+        } else {
+          process.kill(detached ? -child.pid : child.pid, "SIGINT");
+        }
+      } catch {
       }
-      logger.time(`Spawn ${plugin.name}`);
-      const child = spawn(executable, args, {
-        // stdio/WASM plugins carry the protocol over stdin+stdout, so those must be pipes.
-        // websocket plugins talk over TCP, so let stdout/stderr through to the console.
-        stdio: pluginUsesStdio ? ["pipe", "pipe", "inherit"] : ["inherit", "inherit", "inherit"],
-        // stdio plugins can't be detached: WebContainers doesn't plumb the pipe
-        // to a detached child's fd 0, so the plugin gets EBADF reading stdin.
-        // They're torn down by closing stdin, so they don't need a process group.
-        detached: process.platform !== "win32" && !pluginUsesStdio
-      });
-      if (pluginUsesStdio) {
-        stdioStdin.set(dbKey, child.stdin);
-        child.stdin.on("error", (err) => {
-          if (err.code !== "EPIPE") {
-            console.error(`[${plugin.name}] stdin error:`, err.message);
-          }
+    }
+  };
+  const guarded = async (fn) => {
+    try {
+      return await fn();
+    } catch (err) {
+      kill_spawned();
+      throw err;
+    }
+  };
+  logger.time("Start Plugins");
+  await guarded(
+    () => Promise.all(
+      config.plugins.map(async (plugin) => {
+        let executable = plugin.executable;
+        const args = ["--database", db_file];
+        const jsExtensions = [".js", ".mjs", ".cjs"];
+        if (jsExtensions.includes(path.extname(plugin.executable))) {
+          executable = "node";
+          args.unshift(plugin.executable);
+        } else if (path.extname(plugin.executable) === ".wasm") {
+          executable = "node";
+          args.unshift(wasiRunnerPath, plugin.executable);
+        }
+        const dbKey = plugin_db_key(plugin.name);
+        args.push("--plugin-key", dbKey);
+        const pluginUsesStdio = useStdio || path.extname(plugin.executable) === ".wasm";
+        if (pluginUsesStdio) {
+          args.push("--transport", "stdio");
+        }
+        logger.time(`Spawn ${plugin.name}`);
+        const detached = process.platform !== "win32" && !pluginUsesStdio;
+        const child = spawn(executable, args, {
+          // stdio/WASM plugins carry the protocol over stdin+stdout, so those must be pipes.
+          // websocket plugins talk over TCP, so let stdout/stderr through to the console.
+          stdio: pluginUsesStdio ? ["pipe", "pipe", "inherit"] : ["inherit", "inherit", "inherit"],
+          detached
         });
-      }
-      plugins[plugin.name] = {
-        process: child,
-        ...await (pluginUsesStdio ? wait_for_plugin_stdio(plugin.name, child) : wait_for_plugin_db(plugin.name, dbKey))
-      };
-      logger.timeEnd(`Spawn ${plugin.name}`, LogLevel.Verbose);
-    })
+        spawnedChildren.push({ child, detached });
+        if (pluginUsesStdio) {
+          stdioStdin.set(dbKey, child.stdin);
+          child.stdin.on("error", (err) => {
+            if (err.code !== "EPIPE") {
+              console.error(`[${plugin.name}] stdin error:`, err.message);
+            }
+          });
+        }
+        plugins[plugin.name] = {
+          process: child,
+          ...await (pluginUsesStdio ? wait_for_plugin_stdio(plugin.name, child) : wait_for_plugin_db(plugin.name, dbKey))
+        };
+        logger.timeEnd(`Spawn ${plugin.name}`, LogLevel.Verbose);
+      })
+    )
   );
   for (const plugin of config.plugins) {
     plugin_specs.push(spec_results[plugin.name]);
@@ -484,11 +507,13 @@ async function codegen_setup(config, mode, db, db_file) {
     return result;
   };
   triggerHookRef.fn = trigger_hook;
-  await write_config(_db, config, invoke_hook, plugin_specs, mode, logger);
-  _db.flush();
-  await trigger_hook("Config");
-  await trigger_hook("AfterLoad");
-  await trigger_hook("Schema");
+  await guarded(async () => {
+    await write_config(_db, config, invoke_hook, plugin_specs, mode, logger);
+    _db.flush();
+    await trigger_hook("Config");
+    await trigger_hook("AfterLoad");
+    await trigger_hook("Schema");
+  });
   let pipelineQueue = Promise.resolve();
   return {
     database_path: db_file,

package/build/package.json

@@ -1,6 +1,6 @@
 {
     "name": "houdini",
-    "version": "2.0.4",
+    "version": "2.0.5",
     "description": "The disappearing GraphQL clients",
     "keywords": [
         "typescript",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "houdini",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "description": "The disappearing GraphQL clients",
   "keywords": [
     "typescript",
@@ -52,7 +52,7 @@
     "recast": "^0.23.11",
     "sql.js": "^1.14.1",
     "ws": "^8.21.0",
-    "houdini-core": "^2.0.3"
+    "houdini-core": "^2.0.4"
   },
   "peerDependencies": {
     "graphql": ">=16",