@staff0rd/assist 0.567.1 → 0.568.1

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.567.1",
+  version: "0.568.1",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -35264,14 +35264,24 @@ import { spawn as spawn11 } from "child_process";
 
 // src/commands/sessions/daemon/logChildStream.ts
 import { createInterface as createInterface8 } from "readline";
-function logChildStream(stream, label2) {
+function logChildStream(stream, label2, onLine) {
   if (!stream) return;
   const lines2 = createInterface8({ input: stream });
-  lines2.on("line", (line) => daemonLog(`[${label2}] ${line}`));
+  lines2.on("line", (line) => {
+    daemonLog(`[${label2}] ${line}`);
+    onLine?.(line);
+  });
   lines2.on("error", () => {
   });
 }
 
+// src/commands/sessions/daemon/windowsBridgeFailureCause.ts
+var WINDOWS_BRIDGE_FAILURE_PREFIX = "windows bridge unavailable:";
+function windowsBridgeFailureCause(line) {
+  const index3 = line.indexOf(WINDOWS_BRIDGE_FAILURE_PREFIX);
+  return index3 === -1 ? null : line.slice(index3).trim();
+}
+
 // src/commands/sessions/daemon/ensureWindowsDaemonRunning.ts
 var SPAWN_TIMEOUT_MS2 = 3e4;
 var RETRY_DELAY_MS3 = 300;
@@ -35281,27 +35291,31 @@ async function ensureWindowsDaemonRunning() {
     return;
   }
   daemonLog("windows daemon: not running, launching via pwsh.exe");
-  launchWindowsDaemon();
-  await waitForWindowsDaemon();
+  await waitForWindowsDaemon(launchWindowsDaemon());
 }
 function launchWindowsDaemon() {
   const child = spawn11("pwsh.exe", ["-Command", "assist daemon run"], {
     detached: true,
     stdio: ["ignore", "pipe", "pipe"]
   });
-  logChildStream(child.stdout, "windows daemon run");
-  logChildStream(child.stderr, "windows daemon run");
-  child.on(
-    "error",
-    (e) => daemonLog(`failed to launch windows daemon: ${e.message}`)
-  );
+  let cause = null;
+  const watchForFailure = (line) => {
+    cause ??= windowsBridgeFailureCause(line);
+  };
+  logChildStream(child.stdout, "windows daemon run", watchForFailure);
+  logChildStream(child.stderr, "windows daemon run", watchForFailure);
+  child.on("error", (e) => {
+    daemonLog(`failed to launch windows daemon: ${e.message}`);
+    cause ??= `could not launch pwsh.exe: ${e.message}`;
+  });
   child.on("exit", (code) => {
     if (code !== 0)
       daemonLog(`windows daemon launch exited early with code ${code}`);
   });
   child.unref();
+  return { failureCause: () => cause };
 }
-async function waitForWindowsDaemon() {
+async function waitForWindowsDaemon(launch) {
   const start3 = Date.now();
   const deadline = start3 + SPAWN_TIMEOUT_MS2;
   let attempts = 0;
@@ -35314,6 +35328,13 @@ async function waitForWindowsDaemon() {
       );
       return;
     }
+    const cause = launch.failureCause();
+    if (cause) {
+      daemonLog(
+        `windows daemon: launch failed after ${attempts} attempts: ${cause}`
+      );
+      throw new Error(`Windows daemon failed to start: ${cause}`);
+    }
   }
   daemonLog(
     `windows daemon: did NOT start within ${SPAWN_TIMEOUT_MS2}ms (${attempts} attempts)`
@@ -36327,7 +36348,7 @@ var SessionManager = class {
 
 // src/commands/sessions/daemon/startDaemonServer.ts
 import { unlinkSync as unlinkSync24 } from "fs";
-import * as net3 from "net";
+import * as net4 from "net";
 
 // src/commands/sessions/daemon/handleConnection.ts
 import { createInterface as createInterface10 } from "readline";
@@ -36770,12 +36791,67 @@ function cleanupOwnedFiles() {
   }
 }
 
+// src/commands/sessions/daemon/startWindowsBridge.ts
+import * as net3 from "net";
+var BIND_ATTEMPTS = 3;
+var BIND_RETRY_DELAY_MS = 250;
+var KEEPALIVE_PROBE_MS2 = 1e4;
+async function startWindowsBridge(manager) {
+  const port = windowsDaemonPort();
+  for (let attempt = 1; attempt <= BIND_ATTEMPTS; attempt++) {
+    const error = await bindBridge(manager, port);
+    if (!error) {
+      daemonLog(`windows bridge listening on :${port}`);
+      return true;
+    }
+    daemonLog(
+      `windows bridge bind attempt ${attempt}/${BIND_ATTEMPTS} on :${port} failed: ${error.message}`
+    );
+    if (attempt < BIND_ATTEMPTS) await delay3(BIND_RETRY_DELAY_MS);
+  }
+  daemonLog(
+    `${WINDOWS_BRIDGE_FAILURE_PREFIX} could not bind port ${port} after ${BIND_ATTEMPTS} attempts; the port is held by another process or reserved by a Hyper-V/WSL dynamic port range \u2014 set sessions.windowsDaemonPort to a free port outside 49152-65535`
+  );
+  return false;
+}
+function bindBridge(manager, port) {
+  return new Promise((resolve24) => {
+    const bridge = net3.createServer((socket) => {
+      socket.setKeepAlive(true, KEEPALIVE_PROBE_MS2);
+      handleConnection(socket, manager);
+    });
+    bridge.once("error", (error) => {
+      bridge.close(() => {
+      });
+      resolve24(error);
+    });
+    bridge.listen(port, () => {
+      bridge.removeAllListeners("error");
+      bridge.on("error", (error) => {
+        daemonLog(
+          `${WINDOWS_BRIDGE_FAILURE_PREFIX} ${error.message} after listening; exiting so the next launch can take over`
+        );
+        process.exit(1);
+      });
+      resolve24(null);
+    });
+  });
+}
+function delay3(ms) {
+  return new Promise((resolve24) => setTimeout(resolve24, ms));
+}
+
 // src/commands/sessions/daemon/startDaemonServer.ts
-function startDaemonServer(manager, checkAutoExit) {
-  const server = net3.createServer(
+async function startDaemonServer(manager, checkAutoExit) {
+  if (process.platform === "win32" && !await startWindowsBridge(manager)) {
+    daemonLog(
+      "exiting before binding the pipe so the next launch can take over"
+    );
+    process.exit(1);
+  }
+  const server = net4.createServer(
     (socket) => handleConnection(socket, manager)
   );
-  if (process.platform === "win32") startWindowsBridge(manager);
   let retried = false;
   server.on("error", (e) => {
     if (e.code !== "EADDRINUSE" || retried) {
@@ -36791,18 +36867,6 @@ function listenWithSingleOnListening(server, manager, checkAutoExit) {
   server.removeAllListeners("listening");
   server.listen(daemonPaths.socket, () => onListening(manager, checkAutoExit));
 }
-function startWindowsBridge(manager) {
-  const port = windowsDaemonPort();
-  const bridge = net3.createServer((socket) => {
-    socket.setKeepAlive(true, 1e4);
-    handleConnection(socket, manager);
-  });
-  bridge.on(
-    "error",
-    (e) => daemonLog(`windows bridge error: ${e.message}`)
-  );
-  bridge.listen(port, () => daemonLog(`windows bridge listening on :${port}`));
-}
 async function recoverFromAddrInUse(server, manager, checkAutoExit) {
   if (await isDaemonRunning()) {
     daemonLog("another daemon owns the socket; exiting");
@@ -36835,7 +36899,7 @@ async function runDaemon() {
   });
   const manager = new SessionManager(checkAutoExit);
   setDaemonLogSink(manager.clients.emitLog);
-  startDaemonServer(manager, checkAutoExit);
+  await startDaemonServer(manager, checkAutoExit);
 }
 
 // src/commands/sessions/daemon/registerDaemon.ts

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@staff0rd/assist",
-	"version": "0.567.1",
+	"version": "0.568.1",
 	"type": "module",
 	"main": "dist/index.js",
 	"bin": {