gdharness 1.1.52 → 1.1.53

package/build/cli.js

@@ -38117,6 +38117,21 @@ var init_wrapper = __esm(() => {
 import { randomUUID } from "node:crypto";
 import { EventEmitter } from "node:events";
 import http from "node:http";
+function closeReason(text, keep) {
+  if (Buffer.byteLength(text) <= MOST_CLOSE_REASON_BYTES) {
+    return text;
+  }
+  const characters = Array.from(text);
+  const marker = "...";
+  while (Buffer.byteLength(characters.join("")) + marker.length > MOST_CLOSE_REASON_BYTES) {
+    if (keep === "end") {
+      characters.shift();
+    } else {
+      characters.pop();
+    }
+  }
+  return keep === "end" ? `${marker}${characters.join("")}` : `${characters.join("")}${marker}`;
+}
 function resolveDefaultBridgePort() {
   return portFromEnv("GDHARNESS_BRIDGE_PORT", DEFAULT_PORT);
 }
@@ -38143,7 +38158,7 @@ function getDefaultBridge(ownProject = null) {
   defaultBridge ??= new GodotBridge(resolveDefaultBridgePort(), resolveDefaultBridgeHost(), DEFAULT_TIMEOUT_MS, ownProject);
   return defaultBridge;
 }
-var DEFAULT_PORT = 6505, DEFAULT_HOST = "127.0.0.1", DEFAULT_TIMEOUT_MS = 30000, KEEPALIVE_INTERVAL_MS = 1e4, SECOND_CONNECTION_CLOSE_CODE = 4000, OTHER_PROJECT_CLOSE_CODE = 4001, ONE_SHOT_CLOSE_CODE = 4002, CONNECT_WINDOW_MS = 35000, GodotBridge, defaultBridge = null;
+var DEFAULT_PORT = 6505, DEFAULT_HOST = "127.0.0.1", DEFAULT_TIMEOUT_MS = 30000, KEEPALIVE_INTERVAL_MS = 1e4, SECOND_CONNECTION_CLOSE_CODE = 4000, MOST_CLOSE_REASON_BYTES = 123, OTHER_PROJECT_CLOSE_CODE = 4001, ONE_SHOT_CLOSE_CODE = 4002, CONNECT_WINDOW_MS = 35000, GodotBridge, defaultBridge = null;
 var init_godot_bridge = __esm(() => {
   init_wrapper();
   init_errors();
@@ -38293,7 +38308,7 @@ var init_godot_bridge = __esm(() => {
       const editor = identifying ? null : this.connectionInfo;
       return {
         host: this.host,
-        port: this.port,
+        port: this.boundPort,
         connected: this.isConnected(),
         projectPath: editor?.projectPath,
         connectedAt: editor?.connectedAt,
@@ -38550,7 +38565,8 @@ var init_godot_bridge = __esm(() => {
       this.socket = null;
       this.connectionInfo = null;
       this.stopKeepalive();
-      stranger?.close(OTHER_PROJECT_CLOSE_CODE, said);
+      const fits = closeReason(said, "start") === said;
+      stranger?.close(OTHER_PROJECT_CLOSE_CODE, fits ? said : closeReason(`this server serves ${this.ownProject ?? ""}`, "end"));
     }
     identify(pid) {
       const known = this.oneShots.get(pid);
@@ -38589,7 +38605,7 @@ var init_godot_bridge = __esm(() => {
       this.socket = null;
       this.connectionInfo = null;
       this.stopKeepalive();
-      run?.close(ONE_SHOT_CLOSE_CODE, said);
+      run?.close(ONE_SHOT_CLOSE_CODE, closeReason(said, "start"));
     }
     handleDisconnect(disconnectedSocket, reason) {
       if (disconnectedSocket && this.socket && disconnectedSocket !== this.socket) {
@@ -42904,8 +42920,12 @@ class GodotServer {
     console.error("gdharness running on stdio");
     sweepAbandonedScratch();
     try {
-      await this.takeOverFromAPredecessor();
-      await this.godotBridge.start();
+      try {
+        await this.takeOverFromAPredecessor();
+        await this.godotBridge.start();
+      } finally {
+        this.handingOverFrom = null;
+      }
       this.bridgeStartupError = null;
       const bridgeStatus = this.godotBridge.getStatus();
       console.error(`[SERVER] Godot Editor Bridge started on ${bridgeStatus.host}:${bridgeStatus.port}`);
@@ -42945,7 +42965,6 @@ class GodotServer {
         await delay3(HANDOVER_POLL_MS);
       }
     }
-    this.handingOverFrom = null;
     this.notHandedOverBy = taken ? null : announced.pid;
   }
   keepTryingTheBridge() {
@@ -42977,10 +42996,9 @@ class GodotServer {
     if (this.ownProject === null) {
       return;
     }
-    const status = this.godotBridge.getStatus();
     this.announcedAt = announceBridge(this.ownProject, {
-      host: status.host,
-      port: status.port,
+      host: this.godotBridge.getStatus().host,
+      port: this.godotBridge.port,
       version: SERVER_VERSION
     });
     this.watchForASuccessor();
@@ -44923,19 +44941,22 @@ class GodotServer {
     return { note: owed, underway: restartUnderway(owed) };
   }
   async getEditorStatusPayload() {
+    const wasConnected = this.godotBridge.getStatus().connected;
+    const launchedWasUp = !wasConnected && await this.launchedEditorIsUp();
+    const arrivingFound = wasConnected || this.ownProject === null ? [] : await this.editorsNotYetConnected(this.ownProject) ?? [];
     const status = this.godotBridge.getStatus();
-    const launchedIsUp = !status.connected && await this.launchedEditorIsUp();
+    const launchedIsUp = !status.connected && launchedWasUp;
+    const arriving = status.connected ? [] : arrivingFound;
     const isPortConflict = this.bridgeStartupError?.includes("EADDRINUSE") ?? false;
     const greeted = hasSaidWhoItIs(status);
     const stale = greeted && editorIsStale(status.addonVersion, SERVER_VERSION, status.addonDigest, shippedEditorDigest());
     const unfinished = this.restartLeftUnfinished(status.connected);
-    const arriving = status.connected || this.ownProject === null ? [] : await this.editorsNotYetConnected(this.ownProject) ?? [];
     return {
       ...status,
       serverVersion: SERVER_VERSION,
       addonIsStale: greeted ? stale : undefined,
       greeting: status.connected && !greeted ? "The editor has connected and has not yet said who it is: its project, pid, addon version and ports arrive with its greeting a moment after the socket opens, later while it imports. Ask again for them." : undefined,
-      bridgeAvailable: this.bridgeStartupError === null,
+      bridgeAvailable: this.bridgeStartupError === null && status.port !== null,
       mayYetConnect: status.connected ? undefined : arriving.length > 0 ? true : unfinished !== null ? unfinished.underway : anEditorIsStillComing(status.listeningSince, launchedIsUp),
       editorsNotYetConnected: arriving.length > 0 ? arriving : undefined,
       restartInterrupted: unfinished === null || unfinished.underway || arriving.length > 0 ? undefined : {

package/build/index.js

@@ -28181,6 +28181,22 @@ var DEFAULT_HOST = "127.0.0.1";
 var DEFAULT_TIMEOUT_MS = 30000;
 var KEEPALIVE_INTERVAL_MS = 1e4;
 var SECOND_CONNECTION_CLOSE_CODE = 4000;
+var MOST_CLOSE_REASON_BYTES = 123;
+function closeReason(text, keep) {
+  if (Buffer.byteLength(text) <= MOST_CLOSE_REASON_BYTES) {
+    return text;
+  }
+  const characters = Array.from(text);
+  const marker = "...";
+  while (Buffer.byteLength(characters.join("")) + marker.length > MOST_CLOSE_REASON_BYTES) {
+    if (keep === "end") {
+      characters.shift();
+    } else {
+      characters.pop();
+    }
+  }
+  return keep === "end" ? `${marker}${characters.join("")}` : `${characters.join("")}${marker}`;
+}
 var OTHER_PROJECT_CLOSE_CODE = 4001;
 var ONE_SHOT_CLOSE_CODE = 4002;
 function resolveDefaultBridgePort() {
@@ -28351,7 +28367,7 @@ class GodotBridge extends EventEmitter {
     const editor = identifying ? null : this.connectionInfo;
     return {
       host: this.host,
-      port: this.port,
+      port: this.boundPort,
       connected: this.isConnected(),
       projectPath: editor?.projectPath,
       connectedAt: editor?.connectedAt,
@@ -28608,7 +28624,8 @@ class GodotBridge extends EventEmitter {
     this.socket = null;
     this.connectionInfo = null;
     this.stopKeepalive();
-    stranger?.close(OTHER_PROJECT_CLOSE_CODE, said);
+    const fits = closeReason(said, "start") === said;
+    stranger?.close(OTHER_PROJECT_CLOSE_CODE, fits ? said : closeReason(`this server serves ${this.ownProject ?? ""}`, "end"));
   }
   identify(pid) {
     const known = this.oneShots.get(pid);
@@ -28647,7 +28664,7 @@ class GodotBridge extends EventEmitter {
     this.socket = null;
     this.connectionInfo = null;
     this.stopKeepalive();
-    run?.close(ONE_SHOT_CLOSE_CODE, said);
+    run?.close(ONE_SHOT_CLOSE_CODE, closeReason(said, "start"));
   }
   handleDisconnect(disconnectedSocket, reason) {
     if (disconnectedSocket && this.socket && disconnectedSocket !== this.socket) {
@@ -35391,8 +35408,12 @@ class GodotServer {
     console.error("gdharness running on stdio");
     sweepAbandonedScratch();
     try {
-      await this.takeOverFromAPredecessor();
-      await this.godotBridge.start();
+      try {
+        await this.takeOverFromAPredecessor();
+        await this.godotBridge.start();
+      } finally {
+        this.handingOverFrom = null;
+      }
       this.bridgeStartupError = null;
       const bridgeStatus = this.godotBridge.getStatus();
       console.error(`[SERVER] Godot Editor Bridge started on ${bridgeStatus.host}:${bridgeStatus.port}`);
@@ -35432,7 +35453,6 @@ class GodotServer {
         await delay3(HANDOVER_POLL_MS);
       }
     }
-    this.handingOverFrom = null;
     this.notHandedOverBy = taken ? null : announced.pid;
   }
   keepTryingTheBridge() {
@@ -35464,10 +35484,9 @@ class GodotServer {
     if (this.ownProject === null) {
       return;
     }
-    const status = this.godotBridge.getStatus();
     this.announcedAt = announceBridge(this.ownProject, {
-      host: status.host,
-      port: status.port,
+      host: this.godotBridge.getStatus().host,
+      port: this.godotBridge.port,
       version: SERVER_VERSION
     });
     this.watchForASuccessor();
@@ -37410,19 +37429,22 @@ class GodotServer {
     return { note: owed, underway: restartUnderway(owed) };
   }
   async getEditorStatusPayload() {
+    const wasConnected = this.godotBridge.getStatus().connected;
+    const launchedWasUp = !wasConnected && await this.launchedEditorIsUp();
+    const arrivingFound = wasConnected || this.ownProject === null ? [] : await this.editorsNotYetConnected(this.ownProject) ?? [];
     const status = this.godotBridge.getStatus();
-    const launchedIsUp = !status.connected && await this.launchedEditorIsUp();
+    const launchedIsUp = !status.connected && launchedWasUp;
+    const arriving = status.connected ? [] : arrivingFound;
     const isPortConflict = this.bridgeStartupError?.includes("EADDRINUSE") ?? false;
     const greeted = hasSaidWhoItIs(status);
     const stale = greeted && editorIsStale(status.addonVersion, SERVER_VERSION, status.addonDigest, shippedEditorDigest());
     const unfinished = this.restartLeftUnfinished(status.connected);
-    const arriving = status.connected || this.ownProject === null ? [] : await this.editorsNotYetConnected(this.ownProject) ?? [];
     return {
       ...status,
       serverVersion: SERVER_VERSION,
       addonIsStale: greeted ? stale : undefined,
       greeting: status.connected && !greeted ? "The editor has connected and has not yet said who it is: its project, pid, addon version and ports arrive with its greeting a moment after the socket opens, later while it imports. Ask again for them." : undefined,
-      bridgeAvailable: this.bridgeStartupError === null,
+      bridgeAvailable: this.bridgeStartupError === null && status.port !== null,
       mayYetConnect: status.connected ? undefined : arriving.length > 0 ? true : unfinished !== null ? unfinished.underway : anEditorIsStillComing(status.listeningSince, launchedIsUp),
       editorsNotYetConnected: arriving.length > 0 ? arriving : undefined,
       restartInterrupted: unfinished === null || unfinished.underway || arriving.length > 0 ? undefined : {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gdharness",
-  "version": "1.1.52",
+  "version": "1.1.53",
   "mcpName": "io.github.Aureliolo/gdharness",
   "description": "A harness for driving a Godot 4 project from an agent: editor addons, a runtime bridge into the running game, an MCP server in front of them, and a CLI that installs and diagnoses the Godot side.",
   "type": "module",