hypha-rpc 0.20.53 → 0.20.55

package/dist/hypha-rpc-websocket.js

@@ -1257,7 +1257,8 @@ class RPC extends _utils__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
     // Generate debugging information for the method
     remote_method.__rpc_object__ = encoded_method;
     const parts = method_id.split(".");
-    remote_method.__name__ = parts[parts.length - 1];
+
+    remote_method.__name__ = encoded_method._rname || parts[parts.length - 1];
     if (remote_method.__name__.includes("#")) {
       remote_method.__name__ = remote_method.__name__.split("#")[1];
     }
@@ -1609,6 +1610,7 @@ class RPC extends _utils__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
           _rtarget: this._client_id,
           _rmethod: annotation.method_id,
           _rpromise: "*",
+          _rname: aObject.name,
         };
       } else {
         (0,_utils__WEBPACK_IMPORTED_MODULE_0__.assert)(typeof session_id === "string");
@@ -1624,6 +1626,7 @@ class RPC extends _utils__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
           _rtarget: this._client_id,
           _rmethod: `${session_id}.${object_id}`,
           _rpromise: "*",
+          _rname: aObject.name,
         };
         let store = this._get_session_store(session_id, true);
         (0,_utils__WEBPACK_IMPORTED_MODULE_0__.assert)(
@@ -2736,6 +2739,7 @@ async function _setupRPC(config) {
   const connection = new WebRTCConnection(channel);
   config.context = config.context || {};
   config.context.connection_type = "webrtc";
+  config.context.ws = config.workspace;
   const rpc = new _rpc_js__WEBPACK_IMPORTED_MODULE_0__.RPC(connection, {
     client_id: clientId,
     default_context: config.context,
@@ -5266,7 +5270,12 @@ class WebsocketRPCConnection {
   disconnect(reason) {
     this._closed = true;
     this._last_message = null; // Clear last message on disconnect
-    if (this._websocket && this._websocket.readyState === WebSocket.OPEN) {
+    // Ensure websocket is closed if it exists and is not already closed or closing
+    if (
+      this._websocket &&
+      this._websocket.readyState !== WebSocket.CLOSED &&
+      this._websocket.readyState !== WebSocket.CLOSING
+    ) {
       this._websocket.close(1000, reason);
     }
     if (this._refresh_token_task) {