@notionhq/custom-blocks-dev-shell 0.1.37 → 0.1.38

package/dist-cli/process-supervisor.js

@@ -17,7 +17,7 @@ export class ProcessSupervisor {
     }
     addResource(resource) {
         if (this.shuttingDown) {
-            closeResource(resource);
+            void closeResource(resource);
             return;
         }
         this.resources.push(resource);
@@ -49,7 +49,11 @@ export class ProcessSupervisor {
                 this.shutdown("SIGTERM");
             });
             proc.on("exit", code => {
-                this.processes.delete(proc);
+                // Retain an unexpectedly failed process until cleanup. Its PID may
+                // still identify a detached process group with live descendants.
+                if (!this.shuttingDown && (code === 0 || code === null)) {
+                    this.processes.delete(proc);
+                }
                 if (this.shuttingDown || code === 0 || code === null) {
                     return;
                 }
@@ -61,6 +65,9 @@ export class ProcessSupervisor {
     }
     shutdown(signal) {
         if (this.shuttingDown) {
+            if (signal !== "exit") {
+                this.forceShutdown();
+            }
             return;
         }
         this.shuttingDown = true;
@@ -68,44 +75,82 @@ export class ProcessSupervisor {
             (this.processes.size > 0 || this.resources.length > 0)) {
             console.log(`\n${dim}Shutting down...${reset}`);
         }
-        for (const resource of this.resources) {
-            closeResource(resource);
-        }
         for (const [proc, detached] of this.processes) {
             killProcess(proc, detached, "SIGTERM");
         }
         if (signal === "exit") {
+            for (const resource of this.resources) {
+                void closeResource(resource);
+            }
             return;
         }
-        const timer = setTimeout(() => {
-            for (const [proc, detached] of this.processes) {
-                killProcess(proc, detached, "SIGKILL");
-            }
-            process.exit(process.exitCode ?? 0);
-        }, SHUTDOWN_GRACE_MS);
-        timer.unref();
+        void this.finishShutdown();
+    }
+    async finishShutdown() {
+        const resourceCleanup = Promise.all(this.resources.map(resource => closeResource(resource)));
+        const processCleanup = Promise.all([...this.processes.keys()].map(proc => waitForExit(proc)));
+        let finished = false;
+        await Promise.race([
+            Promise.all([resourceCleanup, processCleanup]).then(() => {
+                finished = true;
+            }),
+            delay(SHUTDOWN_GRACE_MS),
+        ]);
+        if (!finished) {
+            this.forceShutdown();
+            return;
+        }
+        // A process can exit before its descendants do. Re-signal every
+        // remaining process group even after the direct child has exited.
+        this.forceKillProcesses();
+        process.exit(process.exitCode ?? 0);
+    }
+    forceShutdown() {
+        this.forceKillProcesses();
+        process.exit(process.exitCode ?? 130);
+    }
+    forceKillProcesses() {
+        for (const [proc, detached] of this.processes) {
+            killProcess(proc, detached, "SIGKILL", true);
+        }
     }
 }
-function closeResource(resource) {
+async function closeResource(resource) {
     try {
-        resource();
+        await resource();
     }
     catch { }
 }
-function killProcess(proc, detached, signal) {
-    if (proc.pid === undefined || proc.killed) {
+function killProcess(proc, detached, signal, force = false) {
+    const pid = proc.pid;
+    if (pid === undefined) {
         return;
     }
     try {
         if (detached && process.platform !== "win32") {
-            process.kill(-proc.pid, signal);
+            process.kill(-pid, signal);
+            return;
         }
-        else {
+        if (force || isProcessRunning(proc)) {
             proc.kill(signal);
         }
     }
     catch { }
 }
+function isProcessRunning(proc) {
+    return proc.exitCode === null && proc.signalCode === null;
+}
+function waitForExit(proc) {
+    if (proc.exitCode !== null || proc.signalCode !== null) {
+        return Promise.resolve();
+    }
+    return new Promise(resolve => {
+        proc.once("exit", () => resolve());
+    });
+}
+function delay(milliseconds) {
+    return new Promise(resolve => setTimeout(resolve, milliseconds));
+}
 export function installProcessSignalHandlers(run) {
     for (const signal of ["SIGINT", "SIGTERM", "SIGHUP"]) {
         process.on(signal, () => run.shutdown(signal));

package/dist-cli/published-cli.js

@@ -51,7 +51,11 @@ const createShellLaunch = async ({ args, plan, log }) => {
     }
     return {
         processes: [],
-        resources: [() => server.close()],
+        resources: [
+            () => new Promise(resolve => {
+                server.close(() => resolve());
+            }),
+        ],
     };
 };
 async function main() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@notionhq/custom-blocks-dev-shell",
-  "version": "0.1.37",
+  "version": "0.1.38",
   "description": "Local preview shell for Notion custom block workers.",
   "license": "MIT",
   "repository": {
@@ -34,6 +34,7 @@
     "@types/react": "^19.2.14",
     "@types/react-dom": "^19.2.3",
     "@vitejs/plugin-react": "^6.0.1",
+    "@vitest/coverage-v8": "^4.1.5",
     "tailwindcss": "^4.2.4",
     "typescript": "^6.0.3",
     "vite": "^8.0.10",