@staff0rd/assist 0.322.2 → 0.323.1

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.322.2",
+  version: "0.323.1",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -21038,7 +21038,18 @@ async function forwardWindowsCreate(conn, state, client, data) {
   try {
     await conn.ensure();
     daemonLog("windows proxy: connection ready, forwarding create");
-    state.pendingCreators.push(client);
+    const timer = setTimeout(() => {
+      const index3 = state.pendingCreators.findIndex((p) => p.timer === timer);
+      if (index3 === -1) return;
+      state.pendingCreators.splice(index3, 1);
+      daemonLog(`windows proxy: create timed out (cwd=${data.cwd})`);
+      sendTo(client, {
+        type: "error",
+        message: "Windows session did not start: the Windows daemon did not respond."
+      });
+    }, state.createTimeoutMs);
+    timer.unref?.();
+    state.pendingCreators.push({ client, timer });
     conn.write(stripOutboundSessionId(data));
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
@@ -21068,11 +21079,13 @@ function versionsMatch(a, b) {
 
 // src/commands/sessions/daemon/WindowsProxyState.ts
 var MAX_SCROLLBACK2 = 256 * 1024;
-function createState(broadcast2, onSessionsChanged, onVersionMismatch) {
+var DEFAULT_CREATE_TIMEOUT_MS = 15e3;
+function createState(broadcast2, onSessionsChanged, onVersionMismatch, createTimeoutMs = DEFAULT_CREATE_TIMEOUT_MS) {
   return {
     windowsSessions: [],
     scrollback: /* @__PURE__ */ new Map(),
     pendingCreators: [],
+    createTimeoutMs,
     broadcast: broadcast2,
     onSessionsChanged,
     onVersionMismatch
@@ -21081,6 +21094,20 @@ function createState(broadcast2, onSessionsChanged, onVersionMismatch) {
 function resetState(state) {
   state.windowsSessions = [];
   state.scrollback.clear();
+  for (const { timer } of state.pendingCreators) clearTimeout(timer);
+  state.pendingCreators = [];
+}
+function takePendingCreator(state) {
+  const pending = state.pendingCreators.shift();
+  if (!pending) return void 0;
+  clearTimeout(pending.timer);
+  return pending.client;
+}
+function failPendingCreators(state, message) {
+  for (const { client, timer } of state.pendingCreators) {
+    clearTimeout(timer);
+    sendTo(client, { type: "error", message });
+  }
   state.pendingCreators = [];
 }
 function replayScrollback2(state, client) {
@@ -21130,7 +21157,7 @@ function handleHello(state, msg) {
 }
 function handleCreated(state, msg) {
   daemonLog(`windows daemon: created session ${nsId(msg)}`);
-  const client = state.pendingCreators.shift();
+  const client = takePendingCreator(state);
   if (client)
     sendTo(client, {
       type: "created",
@@ -21165,11 +21192,7 @@ function nsId(msg) {
 // src/commands/sessions/daemon/handleWindowsClose.ts
 function handleWindowsClose(state) {
   daemonLog("windows proxy: connection to windows daemon closed");
-  for (const client of state.pendingCreators)
-    sendTo(client, {
-      type: "error",
-      message: "Windows daemon connection closed"
-    });
+  failPendingCreators(state, "Windows daemon connection closed");
   resetState(state);
   state.onSessionsChanged();
 }
@@ -21359,12 +21382,10 @@ async function autoHealWindowsDaemon(conn, state, heal, version2) {
   }
 }
 function notifyHealing(state) {
-  for (const client of state.pendingCreators)
-    sendTo(client, {
-      type: "error",
-      message: "Windows host is out of date; updating it now \u2014 reselect the repo once the update finishes."
-    });
-  state.pendingCreators = [];
+  failPendingCreators(
+    state,
+    "Windows host is out of date; updating it now \u2014 reselect the repo once the update finishes."
+  );
 }
 
 // src/commands/sessions/daemon/WindowsVersionHealer.ts
@@ -21412,11 +21433,12 @@ var WindowsProxy = class {
   healer;
   // why: on the Windows host the proxy would dial its own bridge, self-feeding a log loop and connect churn.
   enabled = process.platform !== "win32";
-  constructor(clients, onSessionsChanged, connect4 = defaultConnect, heal = healWindowsDaemon) {
+  constructor(clients, onSessionsChanged, connect4 = defaultConnect, heal = healWindowsDaemon, createTimeoutMs) {
     this.state = createState(
       (msg) => broadcast(clients, msg),
       onSessionsChanged,
-      (version2) => void this.healer.onMismatch(version2)
+      (version2) => void this.healer.onMismatch(version2),
+      createTimeoutMs
     );
     this.conn = new WindowsConnection({
       connect: connect4,

package/package.json

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