hypha-rpc 0.21.19 → 0.21.22

package/coverage/html/index.html

@@ -86,7 +86,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2026-02-24T16:05:09.783Z
+                at 2026-02-25T19:07:57.766Z
             </div>
         <script src="prettify.js"></script>
         <script>

package/dist/hypha-rpc-websocket.js

@@ -2850,7 +2850,7 @@ class HTTPStreamingRPCConnection {
         body: body,
       });
       if (response.ok) {
-        console.debug("Token refresh requested successfully");
+        // console.debug("Token refresh requested successfully");
       } else {
         console.warn(`Token refresh request failed: ${response.status}`);
       }
@@ -3848,10 +3848,10 @@ class RPC extends _utils_index_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
           reasonStr.includes("Client disconnected") ||
           reasonStr.includes("RPC connection closed")
         ) {
-          console.debug(
-            "Ignoring expected disconnection/method error:",
-            reason,
-          );
+          // console.debug(
+            // "Ignoring expected disconnection/method error:",
+            // reason,
+          // );
           event.preventDefault();
           return;
         }
@@ -3908,6 +3908,7 @@ class RPC extends _utils_index_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
       this._boundHandleError = console.error;
       this.on("method", this._boundHandleMethod);
       this.on("error", this._boundHandleError);
+      this.on("peer_not_found", this._handlePeerNotFound.bind(this));
 
       (0,_utils_index_js__WEBPACK_IMPORTED_MODULE_0__.assert)(connection.emit_message && connection.on_message);
       (0,_utils_index_js__WEBPACK_IMPORTED_MODULE_0__.assert)(
@@ -3919,7 +3920,7 @@ class RPC extends _utils_index_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
       this._connection = connection;
       const onConnected = async (connectionInfo) => {
         if (!this._silent && this._connection.manager_id) {
-          console.debug("Connection established, reporting services...");
+          // console.debug("Connection established, reporting services...");
           try {
             // Retry getting manager service with exponential backoff
             const manager = await this.get_manager_service({
@@ -3944,9 +3945,9 @@ class RPC extends _utils_index_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
                   `Timeout registering service ${service.id || "unknown"}`,
                 );
                 registeredCount++;
-                console.debug(
-                  `Successfully registered service: ${service.id || "unknown"}`,
-                );
+                // console.debug(
+                  // `Successfully registered service: ${service.id || "unknown"}`,
+                // );
               } catch (serviceError) {
                 failedServices.push(service.id || "unknown");
                 if (
@@ -3987,23 +3988,51 @@ class RPC extends _utils_index_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
                 manager.subscribe &&
                 typeof manager.subscribe === "function"
               ) {
-                console.debug("Subscribing to client_disconnected events");
+                // Clean up previous subscription and handler to prevent
+                // duplicates on reconnection (listener leak fix)
+                if (this._clientDisconnectedSubscription) {
+                  try {
+                    if (
+                      typeof this._clientDisconnectedSubscription.unsubscribe ===
+                      "function"
+                    ) {
+                      this._clientDisconnectedSubscription.unsubscribe();
+                    }
+                  } catch (e) {
+                    // console.debug(`Error unsubscribing old client_disconnected: ${e}`);
+                  }
+                  this._clientDisconnectedSubscription = null;
+                }
+                if (this._boundHandleClientDisconnected) {
+                  try {
+                    this.off(
+                      "client_disconnected",
+                      this._boundHandleClientDisconnected,
+                    );
+                  } catch (e) {
+                    // Handler may not be in list if previous setup was interrupted
+                  }
+                  this._boundHandleClientDisconnected = null;
+                }
+
+                // console.debug("Subscribing to client_disconnected events");
 
-                const handleClientDisconnected = async (event) => {
+                // Store handler at instance level so it can be removed later
+                this._boundHandleClientDisconnected = async (event) => {
                   // The client ID is in event.data.id based on the event structure
                   const clientId = event.data?.id || event.client;
                   const workspace = event.data?.workspace;
                   if (clientId && workspace) {
                     // Construct the full client path with workspace prefix
                     const fullClientId = `${workspace}/${clientId}`;
-                    console.debug(
-                      `Client ${fullClientId} disconnected, cleaning up sessions`,
-                    );
+                    // console.debug(
+                      // `Client ${fullClientId} disconnected, cleaning up sessions`,
+                    // );
                     await this._handleClientDisconnected(fullClientId);
                   } else if (clientId) {
-                    console.debug(
-                      `Client ${clientId} disconnected, cleaning up sessions`,
-                    );
+                    // console.debug(
+                      // `Client ${clientId} disconnected, cleaning up sessions`,
+                    // );
                     await this._handleClientDisconnected(clientId);
                   }
                 };
@@ -4016,21 +4045,24 @@ class RPC extends _utils_index_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
                 );
 
                 // Then register the local event handler
-                this.on("client_disconnected", handleClientDisconnected);
-
-                console.debug(
-                  "Successfully subscribed to client_disconnected events",
+                this.on(
+                  "client_disconnected",
+                  this._boundHandleClientDisconnected,
                 );
+
+                // console.debug(
+                  // "Successfully subscribed to client_disconnected events",
+                // );
               } else {
-                console.debug(
-                  "Manager does not support subscribe method, skipping client_disconnected handling",
-                );
+                // console.debug(
+                  // "Manager does not support subscribe method, skipping client_disconnected handling",
+                // );
                 this._clientDisconnectedSubscription = null;
               }
             } catch (subscribeError) {
-              console.debug(
-                `Failed to subscribe to client_disconnected events: ${subscribeError}`,
-              );
+              // console.debug(
+                // `Failed to subscribe to client_disconnected events: ${subscribeError}`,
+              // );
               this._clientDisconnectedSubscription = null;
             }
           } catch (managerError) {
@@ -4327,7 +4359,7 @@ class RPC extends _utils_index_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
       this._boundHandleError = null;
     }
 
-    // Clean up client_disconnected subscription
+    // Clean up client_disconnected subscription and handler
     if (this._clientDisconnectedSubscription) {
       try {
         if (
@@ -4336,11 +4368,14 @@ class RPC extends _utils_index_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
           this._clientDisconnectedSubscription.unsubscribe();
         }
       } catch (e) {
-        console.debug(`Error unsubscribing client_disconnected: ${e}`);
+        // console.debug(`Error unsubscribing client_disconnected: ${e}`);
       }
-      this.off("client_disconnected");
       this._clientDisconnectedSubscription = null;
     }
+    if (this._boundHandleClientDisconnected) {
+      this.off("client_disconnected", this._boundHandleClientDisconnected);
+      this._boundHandleClientDisconnected = null;
+    }
 
     // Remove the global unhandled rejection handler
     this._removeRejectionHandler();
@@ -4356,13 +4391,13 @@ class RPC extends _utils_index_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
           try {
             task.cancel();
           } catch (e) {
-            console.debug(`Error canceling background task: ${e}`);
+            // console.debug(`Error canceling background task: ${e}`);
           }
         }
       }
       this._background_tasks.clear();
     } catch (e) {
-      console.debug(`Error cleaning up background tasks: ${e}`);
+      // console.debug(`Error cleaning up background tasks: ${e}`);
     }
 
     // Clear session sweep interval
@@ -4375,11 +4410,11 @@ class RPC extends _utils_index_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
     try {
       this._connection = null;
       this._emit_message = function () {
-        console.debug("RPC connection closed, ignoring message");
+        // console.debug("RPC connection closed, ignoring message");
         return Promise.reject(new Error("Connection is closed"));
       };
     } catch (e) {
-      console.debug(`Error during connection cleanup: ${e}`);
+      // console.debug(`Error during connection cleanup: ${e}`);
     }
 
     this._fire("disconnected");
@@ -4387,15 +4422,15 @@ class RPC extends _utils_index_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
 
   async _handleClientDisconnected(clientId) {
     try {
-      console.debug(`Handling disconnection for client: ${clientId}`);
+      // console.debug(`Handling disconnection for client: ${clientId}`);
 
       // Clean up all sessions for the disconnected client
       const sessionsCleaned = this._cleanupSessionsForClient(clientId);
 
       if (sessionsCleaned > 0) {
-        console.debug(
-          `Cleaned up ${sessionsCleaned} sessions for disconnected client: ${clientId}`,
-        );
+        // console.debug(
+          // `Cleaned up ${sessionsCleaned} sessions for disconnected client: ${clientId}`,
+        // );
       }
 
       // Fire an event to notify about the client disconnection
@@ -4410,6 +4445,35 @@ class RPC extends _utils_index_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
     }
   }
 
+  _handlePeerNotFound(data) {
+    /**
+     * Handle server notification that target peer is not connected.
+     *
+     * When the server detects that an RPC message targets a disconnected
+     * client, it sends back a 'peer_not_found' message instead of silently
+     * dropping it. This allows pending calls to fail immediately.
+     */
+    const sessionId = data.session;
+    const peerId = data.peer_id || data.from || "unknown";
+    const errorMsg = data.error || `Peer ${peerId} is not connected`;
+    // console.debug(`Peer not found: ${peerId} (session=${sessionId})`);
+
+    // Reject the specific pending call identified by sessionId
+    if (sessionId) {
+      const session = this._object_store[sessionId];
+      if (session && typeof session === "object") {
+        this._cleanupSessionEntry(session, errorMsg);
+        delete this._object_store[sessionId];
+        this._removeFromTargetIdIndex(sessionId);
+      }
+    }
+
+    // Also clean up all other sessions targeting this peer
+    if (peerId) {
+      this._cleanupSessionsForClient(peerId);
+    }
+  }
+
   _removeFromTargetIdIndex(sessionId) {
     /**
      * Remove a session from the target_id index.
@@ -4444,7 +4508,7 @@ class RPC extends _utils_index_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
       try {
         session.reject(new Error(rejectReason));
       } catch (e) {
-        console.debug(`Error rejecting session: ${e}`);
+        // console.debug(`Error rejecting session: ${e}`);
       }
     }
     if (session.heartbeat_task) {
@@ -4483,7 +4547,7 @@ class RPC extends _utils_index_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
       this._cleanupSessionEntry(session, reason);
       delete this._object_store[sessionKey];
       sessionsCleaned++;
-      console.debug(`Cleaned up session: ${sessionKey}`);
+      // console.debug(`Cleaned up session: ${sessionKey}`);
     }
 
     delete this._targetIdIndex[clientId];
@@ -4519,7 +4583,7 @@ class RPC extends _utils_index_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
 
   _cleanupOnDisconnect() {
     try {
-      console.debug("Cleaning up all sessions due to local RPC disconnection");
+      // console.debug("Cleaning up all sessions due to local RPC disconnection");
 
       const keysToDelete = [];
       for (const key of Object.keys(this._object_store)) {
@@ -4549,7 +4613,7 @@ class RPC extends _utils_index_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
       try {
         await connection.disconnect();
       } catch (e) {
-        console.debug(`Error disconnecting underlying connection: ${e}`);
+        // console.debug(`Error disconnecting underlying connection: ${e}`);
       }
     }
   }
@@ -5043,14 +5107,14 @@ class RPC extends _utils_index_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
      * Clean session management - all logic in one place.
      */
     if (!session_id) {
-      console.debug("Cannot cleanup session: session_id is empty");
+      // console.debug("Cannot cleanup session: session_id is empty");
       return;
     }
 
     try {
       const store = this._get_session_store(session_id, false);
       if (!store) {
-        console.debug(`Session ${session_id} not found for cleanup`);
+        // console.debug(`Session ${session_id} not found for cleanup`);
         return;
       }
 
@@ -5068,9 +5132,9 @@ class RPC extends _utils_index_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
               promise_manager.settle();
             }
             should_cleanup = true;
-            console.debug(
-              `Promise session ${session_id} settled and marked for cleanup`,
-            );
+            // console.debug(
+              // `Promise session ${session_id} settled and marked for cleanup`,
+            // );
           }
         } catch (e) {
           console.warn(
@@ -5088,9 +5152,9 @@ class RPC extends _utils_index_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
           Object.keys(store._callbacks).includes(callback_name)
         ) {
           should_cleanup = true;
-          console.debug(
-            `Regular session ${session_id} marked for cleanup after ${callback_name}`,
-          );
+          // console.debug(
+            // `Regular session ${session_id} marked for cleanup after ${callback_name}`,
+          // );
         }
       }
 
@@ -5112,7 +5176,7 @@ class RPC extends _utils_index_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
 
       const store = this._get_session_store(session_id, false);
       if (!store) {
-        console.debug(`Session ${session_id} already cleaned up`);
+        // console.debug(`Session ${session_id} already cleaned up`);
         return;
       }
 
@@ -5154,9 +5218,9 @@ class RPC extends _utils_index_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
       for (let i = 0; i < levels.length - 1; i++) {
         const level = levels[i];
         if (!current_store[level]) {
-          console.debug(
-            `Session path ${session_id} not found at level ${level}`,
-          );
+          // console.debug(
+            // `Session path ${session_id} not found at level ${level}`,
+          // );
           return;
         }
         current_store = current_store[level];
@@ -5166,7 +5230,7 @@ class RPC extends _utils_index_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
       const final_key = levels[levels.length - 1];
       if (current_store[final_key]) {
         delete current_store[final_key];
-        console.debug(`Cleaned up session ${session_id}`);
+        // console.debug(`Cleaned up session ${session_id}`);
 
         // Clean up empty parent containers
         this._cleanup_empty_containers(levels.slice(0, -1));
@@ -5204,9 +5268,9 @@ class RPC extends _utils_index_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
           Object.keys(container).length === 0
         ) {
           delete current_store[container_key];
-          console.debug(
-            `Cleaned up empty container at depth ${depth}: ${path_levels.slice(0, depth + 1).join(".")}`,
-          );
+          // console.debug(
+            // `Cleaned up empty container at depth ${depth}: ${path_levels.slice(0, depth + 1).join(".")}`,
+          // );
         } else {
           // Container is not empty, stop cleanup
           break;
@@ -5281,7 +5345,7 @@ class RPC extends _utils_index_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
      * Force cleanup all sessions (for testing purposes).
      */
     if (!this._object_store) {
-      console.debug("Force cleaning up 0 sessions");
+      // console.debug("Force cleaning up 0 sessions");
       return;
     }
 
@@ -5311,7 +5375,7 @@ class RPC extends _utils_index_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
     // Clear the target_id index since all sessions are removed
     this._targetIdIndex = {};
 
-    console.debug(`Force cleaning up ${cleaned_count} sessions`);
+    // console.debug(`Force cleaning up ${cleaned_count} sessions`);
   }
 
   _sweepStaleSessions() {
@@ -5347,7 +5411,7 @@ class RPC extends _utils_index_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
       }
     }
     if (swept > 0) {
-      console.debug(`Swept ${swept} stale session(s)`);
+      // console.debug(`Swept ${swept} stale session(s)`);
     }
   }
 
@@ -5369,7 +5433,7 @@ class RPC extends _utils_index_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
       },
       settle: () => {
         // Promise is settled (resolved or rejected)
-        console.debug("Promise settled");
+        // console.debug("Promise settled");
       },
     };
   }
@@ -5640,9 +5704,9 @@ class RPC extends _utils_index_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
                 // Clean up target_id index before deleting the session
                 self._removeFromTargetIdIndex(local_session_id);
                 delete self._object_store[local_session_id];
-                console.debug(
-                  `Cleaned up session ${local_session_id} after timeout`,
-                );
+                // console.debug(
+                  // `Cleaned up session ${local_session_id} after timeout`,
+                // );
               }
             };
 
@@ -5925,9 +5989,9 @@ class RPC extends _utils_index_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
       } catch (e) {
         // Clean promise method detection - TYPE-BASED, not string-based
         if (this._is_promise_method_call(data["method"])) {
-          console.debug(
-            `Promise method ${data["method"]} not available (detected by session type), ignoring: ${method_name}`,
-          );
+          // console.debug(
+            // `Promise method ${data["method"]} not available (detected by session type), ignoring: ${method_name}`,
+          // );
           return;
         }
 
@@ -5937,18 +6001,18 @@ class RPC extends _utils_index_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
           const session_id = method_parts[0];
           // Check if the session exists but the specific method doesn't
           if (session_id in this._object_store) {
-            console.debug(
-              `Session ${session_id} exists but method ${data["method"]} not found, likely expired callback: ${method_name}`,
-            );
+            // console.debug(
+              // `Session ${session_id} exists but method ${data["method"]} not found, likely expired callback: ${method_name}`,
+            // );
             // For expired callbacks, don't throw an exception, just log and return
             if (typeof reject === "function") {
               reject(new Error(`Method expired or not found: ${method_name}`));
             }
             return;
           } else {
-            console.debug(
-              `Session ${session_id} not found for method ${data["method"]}, likely cleaned up: ${method_name}`,
-            );
+            // console.debug(
+              // `Session ${session_id} not found for method ${data["method"]}, likely cleaned up: ${method_name}`,
+            // );
             // For cleaned up sessions, just log and return without throwing
             if (typeof reject === "function") {
               reject(new Error(`Session not found: ${method_name}`));
@@ -5957,9 +6021,9 @@ class RPC extends _utils_index_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
           }
         }
 
-        console.debug(
-          `Failed to find method ${method_name} at ${this._client_id}`,
-        );
+        // console.debug(
+          // `Failed to find method ${method_name} at ${this._client_id}`,
+        // );
         const error = new Error(
           `Method not found: ${method_name} at ${this._client_id}`,
         );
@@ -9902,6 +9966,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   HTTPStreamingRPCConnection: () => (/* reexport safe */ _http_client_js__WEBPACK_IMPORTED_MODULE_5__.HTTPStreamingRPCConnection),
 /* harmony export */   LocalWebSocket: () => (/* binding */ LocalWebSocket),
 /* harmony export */   RPC: () => (/* reexport safe */ _rpc_js__WEBPACK_IMPORTED_MODULE_0__.RPC),
+/* harmony export */   WebsocketRPCConnection: () => (/* binding */ WebsocketRPCConnection),
 /* harmony export */   connectToServer: () => (/* binding */ connectToServer),
 /* harmony export */   connectToServerHTTP: () => (/* reexport safe */ _http_client_js__WEBPACK_IMPORTED_MODULE_5__.connectToServerHTTP),
 /* harmony export */   decryptPayload: () => (/* reexport safe */ _crypto_js__WEBPACK_IMPORTED_MODULE_1__.decryptPayload),
@@ -9983,6 +10048,7 @@ class WebsocketRPCConnection {
     this._reconnect_timeouts = new Set(); // Track reconnection timeouts
     this._additional_headers = additional_headers;
     this._reconnecting = false; // Mutex to prevent overlapping reconnection attempts
+    this._closedDuringReconnect = false; // Flag for close events during reconnection
     this._disconnectedNotified = false;
   }
 
@@ -10225,7 +10291,9 @@ class WebsocketRPCConnection {
       this._websocket.onclose = this._handle_close.bind(this);
 
       if (this._handle_connected) {
-        this._handle_connected(this.connection_info);
+        // Await async callbacks so errors (e.g. service re-registration
+        // failures) propagate instead of becoming unhandled rejections.
+        await this._handle_connected(this.connection_info);
       }
       return this.connection_info;
     } catch (error) {
@@ -10291,9 +10359,10 @@ class WebsocketRPCConnection {
         // Notify the RPC layer immediately so it can reject pending calls
         this._notifyDisconnected(event.reason);
 
-        // Prevent overlapping reconnection attempts
+        // If a reconnection is already in progress, signal it so the
+        // reconnect loop can detect that the newly-opened socket died and retry.
         if (this._reconnecting) {
-          console.debug("Reconnection already in progress, skipping");
+          this._closedDuringReconnect = true;
           return;
         }
         this._reconnecting = true;
@@ -10315,6 +10384,10 @@ class WebsocketRPCConnection {
             console.warn(
               `Reconnecting to ${this._server_url.split("?")[0]} (attempt #${retry})`,
             );
+            // Reset the flag before each attempt so we can detect new close
+            // events that arrive while open() and the settle period run.
+            this._closedDuringReconnect = false;
+
             // Open the connection, this will trigger the on_connected callback
             await this.open();
 
@@ -10323,6 +10396,22 @@ class WebsocketRPCConnection {
             // which includes re-registering all services to the server
             await new Promise((resolve) => setTimeout(resolve, 500));
 
+            // Check if the WebSocket died during the settle period.
+            // This handles the race where _handle_close fires while
+            // _reconnecting is true and sets _closedDuringReconnect.
+            if (
+              this._closedDuringReconnect ||
+              !this._websocket ||
+              this._websocket.readyState !== WebSocket.OPEN
+            ) {
+              console.warn(
+                "WebSocket closed during reconnection settle period, retrying...",
+              );
+              this._closedDuringReconnect = false;
+              // Fall through to the retry logic below
+              throw new Error("Connection lost during reconnection settle");
+            }
+
             console.warn(
               `Successfully reconnected to server ${this._server_url} (services re-registered)`,
             );
@@ -10366,9 +10455,7 @@ class WebsocketRPCConnection {
             const jitter = (Math.random() * 2 - 1) * maxJitter * delay;
             const finalDelay = Math.max(100, delay + jitter);
 
-            console.debug(
-              `Waiting ${(finalDelay / 1000).toFixed(2)}s before next reconnection attempt`,
-            );
+            // console.debug(`Waiting ${(finalDelay / 1000).toFixed(2)}s before next reconnection attempt`);
 
             // Track the reconnection timeout to prevent leaks
             const timeoutId = setTimeout(async () => {
@@ -10433,6 +10520,7 @@ class WebsocketRPCConnection {
   disconnect(reason) {
     this._closed = true;
     this._reconnecting = false;
+    this._closedDuringReconnect = false;
     // Ensure websocket is closed if it exists and is not already closed or closing
     if (
       this._websocket &&
@@ -11107,6 +11195,8 @@ class LocalWebSocket {
 // hypha-core's deno build does: import { hyphaWebsocketClient } from 'hypha-rpc'
 // The UMD build wraps everything under this name via webpack's `library` option,
 // but the ESM build exports flat, so we need this explicit re-export.
+
+
 const hyphaWebsocketClient = {
   RPC: _rpc_js__WEBPACK_IMPORTED_MODULE_0__.RPC,
   API_VERSION: _rpc_js__WEBPACK_IMPORTED_MODULE_0__.API_VERSION,