dont hang if wql up fails to start children

Author: luludotdev

deno.json

@@ -7,7 +7,7 @@
 
     "init-local-env": "deno run --no-lock -A ./scripts/init-local-env.ts",
     "init-project": "deno run --no-lock -A ./scripts/init-project.ts",
-    "run-server": "cd multiplayer && deno task start --spawn-dir",
+    "run-server": "cd multiplayer && deno task start --spawn-fail --spawn-dir",
     "run-editor": "cd editor && deno task build && deno run -A --no-lock jsr:@std/http/file-server --port=5173 web"
   },
   "imports": {

multiplayer/server-host/instance.ts

@@ -66,6 +66,11 @@ export class GameInstance {
   #state: GameInstanceState = GameInstanceState.Idle;
   #status: string = "Idle";
   #statusDetail: string | undefined;
+  #statusChangeListeners: ((
+    state: GameInstanceState,
+    status: string,
+    detail?: string,
+  ) => void)[] = [];
   // prettier-ignore
   get state() { return this.#state; }
   // prettier-ignore
@@ -78,9 +83,26 @@ export class GameInstance {
     this.#statusDetail = detail;
 
     this.logs.debug("Status updated", { ...{ status }, ...(detail ? { detail } : {}) });
+    for (const listener of this.#statusChangeListeners) {
+      listener(this.#state, this.#status, this.#statusDetail);
+    }
+
     this.bumpIdleTime();
   }
 
+  onStatusChange(
+    listener: (state: GameInstanceState, status: string, detail?: string) => void,
+  ): { unsubscribe: () => void } {
+    this.#statusChangeListeners.push(listener);
+    return {
+      unsubscribe: () => {
+        const idx = this.#statusChangeListeners.indexOf(listener);
+        if (idx === -1) return;
+        this.#statusChangeListeners.splice(idx, 1);
+      },
+    };
+  }
+
   #notifyBooted: (() => void) | undefined;
   // deno-lint-ignore no-explicit-any
   #notifyBootFail: ((reason?: any) => void) | undefined;

multiplayer/server-host/main.ts

@@ -4,7 +4,7 @@ import * as path from "@std/path";
 import { NIL_UUID } from "@std/uuid/constants";
 import { CONFIG } from "./config.ts";
 import { startInstanceCollector } from "./instance-collector.ts";
-import { createInstance, GameInstance } from "./instance.ts";
+import { createInstance, GameInstance, GameInstanceState } from "./instance.ts";
 import { report } from "./metrics.ts";
 import { setupWeb } from "./web/setup.ts";
 import { fetchWorld } from "./world-fetch.ts";
@@ -65,7 +65,7 @@ try {
 
 const args = cli.parseArgs(Deno.args, {
   string: ["spawn", "spawn-dir", "spawn-repo", "clone"],
-  boolean: ["play-mode"],
+  boolean: ["play-mode", "spawn-fail"],
 });
 
 if (args.clone !== undefined) {
@@ -101,6 +101,14 @@ await Promise.all([
         inspect: "127.0.0.1:9229",
       });
 
+      instance.onStatusChange(state => {
+        if (!args["spawn-fail"]) return;
+        if (state !== GameInstanceState.Errored) return;
+
+        shutdown();
+        Deno.exit(1);
+      });
+
       await instance.waitForSessionBoot();
     } else if (args["spawn-dir"]) {
       const worldDirectory = args["spawn-dir"];
@@ -114,6 +122,14 @@ await Promise.all([
         inspect: "127.0.0.1:9229",
       });
 
+      instance.onStatusChange(state => {
+        if (!args["spawn-fail"]) return;
+        if (state !== GameInstanceState.Errored) return;
+
+        shutdown();
+        Deno.exit(1);
+      });
+
       await instance.waitForSessionBoot();
     }
   })(),

scripts/wql.ts

@@ -60,10 +60,24 @@ const cli = new Command()
     const serverHandle = serverCmd.spawn();
     const editorHandle = editorCmd.spawn();
 
+    const shutdown = (code?: number) => {
+      try {
+        serverHandle.kill();
+      } catch {
+        // pass
+      }
+
+      try {
+        editorHandle.kill();
+      } catch {
+        // pass
+      }
+
+      Deno.exit(code);
+    };
+
     Deno.addSignalListener("SIGINT", () => {
-      serverHandle.kill();
-      editorHandle.kill();
-      Deno.exit();
+      shutdown();
     });
 
     const serverStarted = Promise.withResolvers<void>();
@@ -79,6 +93,16 @@ const cli = new Command()
       }
     })();
 
+    serverHandle.status.then(({ success }) => {
+      if (!success) {
+        serverStarted.reject();
+        return;
+      }
+
+      console.log("Dreamlab server exited");
+      shutdown();
+    });
+
     const editorStarted = Promise.withResolvers<void>();
     void (async () => {
       const decoder = new TextDecoder();
@@ -92,12 +116,32 @@ const cli = new Command()
       }
     })();
 
+    editorHandle.status.then(({ success }) => {
+      if (!success) {
+        editorStarted.reject();
+        return;
+      }
+
+      console.log("Dreamlab Editor exited");
+      shutdown();
+    });
+
     const s1 = spinner();
     s1.start("Starting Dreamlab server");
-    await serverStarted.promise;
+    try {
+      await serverStarted.promise;
+    } catch {
+      s1.stop("Failed to start Dreamlab server", 2);
+      shutdown(1);
+    }
     s1.stop("Dreamlab server ready");
 
-    await editorStarted.promise;
+    try {
+      await editorStarted.promise;
+    } catch {
+      log.error("Failed to start Editor");
+      shutdown(1);
+    }
 
     outro(`Open Dreamlab @ http://localhost:5173`);