beeos-claw 0.5.65-staging.3 → 0.5.65-staging.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "beeos-claw",
-  "version": "0.5.65-staging.3",
+  "version": "0.5.65-staging.4",
   "description": "OpenClaw plugin that bridges the BeeOS platform with the local OpenClaw Gateway, providing file transfer, ACP bridge, and observability.",
   "license": "MIT",
   "author": "BeeOS <dev@beeos.ai>",

package/scripts/runtime-blackbox-worker-lifecycle.mjs

@@ -38,14 +38,7 @@ export async function withinDeadline(run, deadline) {
  * invoking start() again would create competing reconnect loops.
  */
 export async function startGatewayWithinDeadline(gateway, deadline) {
-  try {
-    await withinDeadline(() => gateway.start(), deadline);
-    return;
-  } catch (error) {
-    if (!isRetryableGatewayHandshake(error)) throw error;
-  }
-
-  await withinDeadline((signal) => waitForGatewayConnection(gateway, signal), deadline);
+  await withinDeadline((signal) => startAndObserveGateway(gateway, signal), deadline);
 }
 
 export async function closeRuntimeResources({ consumer, gateway }, cleanupTimeoutMs = 5_000) {
@@ -116,13 +109,15 @@ function isRetryableGatewayHandshake(error) {
     ((error.retryable === true) || error.code === "UNAVAILABLE");
 }
 
-function waitForGatewayConnection(gateway, signal) {
+function startAndObserveGateway(gateway, signal) {
   return new Promise((resolve, reject) => {
     let settled = false;
+    let observedTransportFailure = false;
     const cleanup = () => {
       gateway.off("connected", onConnected);
       gateway.off("auth-failed", onAuthFailed);
       gateway.off("error", onError);
+      gateway.off("disconnected", onDisconnected);
       signal.removeEventListener("abort", onAbort);
     };
     const settle = (callback, value) => {
@@ -138,10 +133,12 @@ function waitForGatewayConnection(gateway, signal) {
         : "Gateway authentication failed";
       settle(reject, new Error(reason));
     };
-    // GatewayClient emits `error` for each failed reconnect before scheduling
-    // the next one. Keep an error listener while waiting so EventEmitter does
-    // not crash the worker; auth-failed remains the immediate terminal signal.
-    const onError = () => {};
+    // GatewayClient owns reconnect scheduling for a WebSocket-level startup
+    // failure. Install this observer before `start()` so its first error cannot
+    // become EventEmitter's fatal unhandled `error` event. The subsequent
+    // `start()` rejection is intentionally held open for that owned retry.
+    const onError = () => { observedTransportFailure = true; };
+    const onDisconnected = () => { observedTransportFailure = true; };
     const onAbort = () => settle(reject, signal.reason ?? new Error("Gateway connection aborted"));
 
     if (signal.aborted) {
@@ -151,7 +148,22 @@ function waitForGatewayConnection(gateway, signal) {
     gateway.on("connected", onConnected);
     gateway.on("auth-failed", onAuthFailed);
     gateway.on("error", onError);
+    gateway.on("disconnected", onDisconnected);
     signal.addEventListener("abort", onAbort, { once: true });
+
+    Promise.resolve()
+      .then(() => gateway.start())
+      .then(
+        () => settle(resolve),
+        (error) => {
+          // Typed handshake UNAVAILABLE and a pre-auth transport failure both
+          // leave GatewayClient's single bounded reconnect loop authoritative.
+          // A nonretryable handshake instead emits auth-failed and settles
+          // above without waiting for the worker deadline.
+          if (isRetryableGatewayHandshake(error) || observedTransportFailure) return;
+          settle(reject, error);
+        },
+      );
   });
 }