@buda-ai/connector 0.1.4 → 0.1.6

package/dist/cli.js

@@ -1081,6 +1081,7 @@ var BASE_CONNECTOR_CAPABILITIES = [
   "git"
 ];
 var browserAvailabilityWarningLogged = false;
+var getBrowserAvailabilityWarning = (browserAvailability) => browserAvailability.available ? null : `${browserAvailability.error} Browser automation is disabled, but shell, filesystem, Git, and coding capabilities remain available.`;
 var getAdvertisedCapabilities = (browserAvailability = resolveBrowserAvailability(), deviceToken) => [
   ...BASE_CONNECTOR_CAPABILITIES,
   ...browserAvailability.available ? ["browser"] : [],
@@ -1089,9 +1090,10 @@ var getAdvertisedCapabilities = (browserAvailability = resolveBrowserAvailabilit
 async function buildPayload(config, extra) {
   const bundle = await readBundledManifest();
   const browserAvailability = resolveBrowserAvailability();
-  if (!browserAvailability.available && !browserAvailabilityWarningLogged) {
+  const browserWarning = getBrowserAvailabilityWarning(browserAvailability);
+  if (browserWarning && !browserAvailabilityWarningLogged) {
     browserAvailabilityWarningLogged = true;
-    await writeLog("warn", browserAvailability.error);
+    await writeLog("warn", browserWarning);
   }
   return {
     connectorId: config.connectorId,
@@ -2113,6 +2115,7 @@ var isAlreadyExists3 = (error) => error instanceof Error && "code" in error && e
 // src/relay.ts
 var RELAY_PING_INTERVAL_MS = 2e4;
 var RELAY_PONG_TIMEOUT_MS = 1e4;
+var RELAY_HANDSHAKE_TIMEOUT_MS = 1e4;
 var RELAY_RECONNECT_MAX_MS = 3e4;
 var RELAY_RECONNECT_JITTER = 0.2;
 var RELAY_FAST_RECONNECT_MS = 500;
@@ -2120,12 +2123,29 @@ var CONNECTOR_SOCKET_REPLACED_CLOSE_CODE = 4001;
 var CONNECTOR_SOCKET_REVOKED_CLOSE_CODE = 4003;
 var shouldReconnectConnectorRelay = (closeCode) => closeCode !== CONNECTOR_SOCKET_REPLACED_CLOSE_CODE && closeCode !== CONNECTOR_SOCKET_REVOKED_CLOSE_CODE;
 var getConnectorRelayReconnectBaseDelay = (hadOpenConnection, backoffMs) => hadOpenConnection ? RELAY_FAST_RECONNECT_MS : backoffMs;
+var formatConnectorRelayError = (error, depth = 0) => {
+  if (depth >= 3) return String(error);
+  const details = [String(error)];
+  if (error && typeof error === "object") {
+    const candidate = error;
+    if (candidate.cause !== void 0) {
+      details.push(`cause=${formatConnectorRelayError(candidate.cause, depth + 1)}`);
+    }
+    if (Array.isArray(candidate.errors) && candidate.errors.length > 0) {
+      details.push(
+        `errors=[${candidate.errors.map((nestedError) => formatConnectorRelayError(nestedError, depth + 1)).join(", ")}]`
+      );
+    }
+  }
+  return [...new Set(details.filter(Boolean))].join(" ") || "Unknown relay error";
+};
 function startConnectorRelay(config, bunnyDaemon, relayProtocol, workspaceRegistry, launchConfig) {
   let socket = null;
   let reconnectTimer = null;
   let pingTimer = null;
   let pongTimer = null;
   let stopped = false;
+  let suspendedForAccessRevocation = false;
   let reconnectDelayMs = RELAY_RECONNECT_INTERVAL_MS;
   let hadOpenConnection = false;
   let activeRelayProtocol = relayProtocol;
@@ -2152,7 +2172,7 @@ function startConnectorRelay(config, bunnyDaemon, relayProtocol, workspaceRegist
     return Math.max(reconnectingEstablishedSocket ? 250 : 500, Math.round(base + jitter));
   };
   const scheduleReconnect = (reason) => {
-    if (stopped || reconnectTimer) return;
+    if (stopped || suspendedForAccessRevocation || reconnectTimer) return;
     const delay = nextReconnectDelay();
     void writeLog("info", `relay reconnecting in ${delay}ms (${reason})`);
     clearTimers();
@@ -2161,16 +2181,13 @@ function startConnectorRelay(config, bunnyDaemon, relayProtocol, workspaceRegist
       try {
         connect();
       } catch (error) {
-        void writeLog(
-          "warn",
-          `relay reconnect threw: ${error instanceof Error ? error.message : error}`
-        );
+        void writeLog("warn", `relay reconnect threw: ${formatConnectorRelayError(error)}`);
         scheduleReconnect("connect-throw");
       }
     }, delay);
   };
   const connect = () => {
-    if (stopped) return;
+    if (stopped || suspendedForAccessRevocation) return;
     const relayUrl = getConnectorRelayUrl(config.serverUrl, config.connectorId);
     const oauthToken = launchConfig?.oauthToken?.trim();
     const token = config.token?.trim() || getConnectorToken(launchConfig);
@@ -2180,7 +2197,8 @@ function startConnectorRelay(config, bunnyDaemon, relayProtocol, workspaceRegist
     headers["X-Buda-Connector-Id"] = config.connectorId;
     if (config.deviceToken) headers["X-Buda-Connector-Device-Token"] = config.deviceToken;
     const ws = new WebSocket(relayUrl, {
-      headers: Object.keys(headers).length > 0 ? headers : void 0
+      headers: Object.keys(headers).length > 0 ? headers : void 0,
+      handshakeTimeout: RELAY_HANDSHAKE_TIMEOUT_MS
     });
     socket = ws;
     const inflight = /* @__PURE__ */ new Map();
@@ -2201,10 +2219,7 @@ function startConnectorRelay(config, bunnyDaemon, relayProtocol, workspaceRegist
         try {
           ws.ping();
         } catch (error) {
-          void writeLog(
-            "warn",
-            `relay ping failed: ${error instanceof Error ? error.message : error}`
-          );
+          void writeLog("warn", `relay ping failed: ${formatConnectorRelayError(error)}`);
           ws.terminate();
           return;
         }
@@ -2236,18 +2251,21 @@ function startConnectorRelay(config, bunnyDaemon, relayProtocol, workspaceRegist
     ws.on("close", (code) => {
       detach();
       if (!shouldReconnectConnectorRelay(code)) {
-        stopped = true;
-        void writeLog(
-          "warn",
-          code === CONNECTOR_SOCKET_REPLACED_CLOSE_CODE ? "relay replaced by another process for this connector" : "relay access revoked; restore access and restart the Connector to reconnect"
-        );
+        clearTimers();
+        if (code === CONNECTOR_SOCKET_REPLACED_CLOSE_CODE) {
+          stopped = true;
+          void writeLog("warn", "relay replaced by another process for this connector");
+        } else {
+          suspendedForAccessRevocation = true;
+          void writeLog("warn", "relay access revoked; waiting for access to be restored");
+        }
         return;
       }
       void writeLog("warn", "relay disconnected");
       scheduleReconnect("close");
     });
     ws.on("error", (error) => {
-      void writeLog("warn", `relay error: ${error instanceof Error ? error.message : error}`);
+      void writeLog("warn", `relay error: ${formatConnectorRelayError(error)}`);
       detach();
       scheduleReconnect("error");
     });
@@ -2255,10 +2273,7 @@ function startConnectorRelay(config, bunnyDaemon, relayProtocol, workspaceRegist
   try {
     connect();
   } catch (error) {
-    void writeLog(
-      "warn",
-      `relay initial connect threw: ${error instanceof Error ? error.message : error}`
-    );
+    void writeLog("warn", `relay initial connect threw: ${formatConnectorRelayError(error)}`);
     scheduleReconnect("connect-throw");
   }
   return {
@@ -2269,6 +2284,19 @@ function startConnectorRelay(config, bunnyDaemon, relayProtocol, workspaceRegist
         void writeLog("info", `relay protocol key updated ${nextRelayProtocol.keyId}`);
       }
     },
+    resumeAfterAccessRestore() {
+      if (stopped || !suspendedForAccessRevocation) return;
+      suspendedForAccessRevocation = false;
+      reconnectDelayMs = RELAY_RECONNECT_INTERVAL_MS;
+      hadOpenConnection = false;
+      void writeLog("info", "relay access restored; reconnecting");
+      try {
+        connect();
+      } catch (error) {
+        void writeLog("warn", `relay reconnect threw: ${formatConnectorRelayError(error)}`);
+        scheduleReconnect("access-restored");
+      }
+    },
     stop() {
       stopped = true;
       if (reconnectTimer) {
@@ -3034,6 +3062,7 @@ async function runConnectorDaemon(launchConfig) {
     const interval = setInterval(() => {
       heartbeatConnector(config, launchConfig, activeBunnyDaemon).then(({ relayProtocol: nextRelayProtocol }) => {
         relay.updateRelayProtocol(nextRelayProtocol);
+        relay.resumeAfterAccessRestore();
       }).catch((error) => {
         void writeLog(
           "warn",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@buda-ai/connector",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "private": false,
   "type": "module",
   "publishConfig": {