Fix workerd dispose reaping and declare effect peer dependency

Rhys Sullivan committed 4 months ago

Commit 02cc5e11 parent 21afc264 files · +14 −3Browse files

Unified · Split

4 files

         "tsup": "catalog:",
         "vitest": "catalog:",
       },
+      "peerDependencies": {
+        "effect": "catalog:",
+      },
     },
     "packages/plugins/desktop-settings": {
       "name": "@executor-js/plugin-desktop-settings",

 };
 const waitUntilGone = async (pid: number): Promise<boolean> => {
-  for (let index = 0; index < 100; index += 1) {
+  // kill(pid, 0) still succeeds for an exited-but-unreaped child, so poll on a
+  // real timer long enough for Node to reap it after the exit event.
+  const deadline = Date.now() + 5_000;
+  while (Date.now() < deadline) {
     if (pidIsGone(pid)) return true;
-    await new Promise((resolve) => setImmediate(resolve));
+    await new Promise((resolve) => setTimeout(resolve, 10));
   }
   return pidIsGone(pid);
 };

     const state = processState;
     processState = undefined;
     if (!state) return;
-    if (kill && !state.proc.killed) {
+    if (kill && state.proc.exitCode === null && state.proc.signalCode === null) {
       // workerd serve ignores SIGTERM in this version. SIGKILL is the verified immediate shutdown path.
+      const exited = new Promise<void>((resolve) => state.proc.once("exit", () => resolve()));
       state.proc.kill("SIGKILL");
+      await exited;
     }
     await closeServer(state.hostServer).catch(() => undefined);
     await rm(state.tmp, { recursive: true, force: true }).catch(() => undefined);

     "effect": "catalog:",
     "tsup": "catalog:",
     "vitest": "catalog:"
+  },
+  "peerDependencies": {
+    "effect": "catalog:"
   }
 }