hypha-rpc 0.20.25 → 0.20.27

package/dist/hypha-rpc-websocket.js

@@ -295,6 +295,7 @@ class RPC extends _utils__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
       workspace = null,
       silent = false,
       app_id = null,
+      server_base_url = null,
     },
   ) {
     super(debug);
@@ -311,6 +312,7 @@ class RPC extends _utils__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
     this._max_message_buffer_size = max_message_buffer_size;
     this._chunk_store = {};
     this._method_timeout = method_timeout || 30;
+    this._server_base_url = server_base_url;
 
     // make sure there is an execute function
     this._services = {};
@@ -346,7 +348,7 @@ class RPC extends _utils__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
       this._connection = connection;
       const onConnected = async (connectionInfo) => {
         if (!this._silent && this._connection.manager_id) {
-          console.log("Connection established, reporting services...");
+          console.debug("Connection established, reporting services...");
           const manager = await this.get_manager_service({
             timeout: 10,
             case_conversion: "camel",
@@ -356,9 +358,14 @@ class RPC extends _utils__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
             await manager.registerService(serviceInfo);
           }
         } else {
-          console.log("Connection established", connectionInfo);
+          console.debug("Connection established", connectionInfo);
+        }
+        if (connectionInfo) {
+          if (connectionInfo.public_base_url) {
+            this._server_base_url = connectionInfo.public_base_url;
+          }
+          this._fire("connected", connectionInfo);
         }
-        this._fire("connected", connectionInfo);
       };
       connection.on_connected(onConnected);
       onConnected();
@@ -394,6 +401,7 @@ class RPC extends _utils__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
 
   async ping(client_id, timeout) {
     let method = this._generate_remote_method({
+      _rserver: this._server_base_url,
       _rtarget: client_id,
       _rmethod: "services.built-in.ping",
       _rpromise: true,
@@ -583,6 +591,7 @@ class RPC extends _utils__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
 
     try {
       const method = this._generate_remote_method({
+        _rserver: this._server_base_url,
         _rtarget: provider,
         _rmethod: "services.built-in.get_service",
         _rpromise: true,
@@ -822,6 +831,7 @@ class RPC extends _utils__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
     let method_id = `${session_id}.${name}`;
     let encoded = {
       _rtype: "method",
+      _rserver: this._server_base_url,
       _rtarget: local_workspace
         ? `${local_workspace}/${this._client_id}`
         : this._client_id,
@@ -915,7 +925,7 @@ class RPC extends _utils__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
         data.slice(start_byte, start_byte + CHUNK_SIZE),
         !!session_id,
       );
-      console.log(
+      console.debug(
         `Sending chunk ${idx + 1}/${chunk_num} (${total_size} bytes)`,
       );
     }
@@ -1077,7 +1087,7 @@ class RPC extends _utils__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
             ._send_chunks(message_package, target_id, remote_parent)
             .then(function () {
               if (timer) {
-                // console.log(`Start watchdog timer.`);
+                console.debug(`Start watchdog timer.`);
                 // Only start the timer after we send the message successfully
                 timer.start();
               }
@@ -1094,6 +1104,9 @@ class RPC extends _utils__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
     remote_method.__rpc_object__ = encoded_method;
     const parts = method_id.split(".");
     remote_method.__name__ = parts[parts.length - 1];
+    if (remote_method.__name__.includes("#")) {
+      remote_method.__name__ = remote_method.__name__.split("#")[1];
+    }
     remote_method.__doc__ =
       encoded_method._rdoc || `Remote method: ${method_id}`;
     remote_method.__schema__ = encoded_method._rschema;
@@ -1158,7 +1171,7 @@ class RPC extends _utils__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
         if (promise.heartbeat && promise.interval) {
           async function heartbeat() {
             try {
-              console.log("Reset heartbeat timer: " + data.method);
+              console.debug("Reset heartbeat timer: " + data.method);
               await promise.heartbeat();
             } catch (err) {
               console.error(err);
@@ -1263,7 +1276,7 @@ class RPC extends _utils__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
           `Runtime Error: Invalid number of arguments for method ${method_name}, expected ${method.length} but got ${args.length}`,
         );
       }
-      // console.log("Executing method: " + method_name);
+      console.debug("Executing method: " + method_name);
       if (data.promise) {
         const result = method.apply(null, args);
         if (result instanceof Promise) {
@@ -1356,7 +1369,14 @@ class RPC extends _utils__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
     }
     // Reuse the remote object
     if (aObject.__rpc_object__) {
-      return aObject.__rpc_object__;
+      const _server = aObject.__rpc_object__._rserver || this._server_base_url;
+      if (_server === this._server_base_url) {
+        return aObject.__rpc_object__;
+      } else {
+        console.debug(
+          `Encoding remote function from a different server ${_server}, current server: ${this._server_base_url}`,
+        );
+      }
     }
 
     let bObject;
@@ -1376,6 +1396,7 @@ class RPC extends _utils__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
         let annotation = this._method_annotations.get(aObject);
         bObject = {
           _rtype: "method",
+          _rserver: this._server_base_url,
           _rtarget: this._client_id,
           _rmethod: annotation.method_id,
           _rpromise: true,
@@ -1384,12 +1405,13 @@ class RPC extends _utils__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
         (0,_utils__WEBPACK_IMPORTED_MODULE_0__.assert)(typeof session_id === "string");
         let object_id;
         if (aObject.__name__) {
-          object_id = `${(0,_utils__WEBPACK_IMPORTED_MODULE_0__.randId)()}-${aObject.__name__}`;
+          object_id = `${(0,_utils__WEBPACK_IMPORTED_MODULE_0__.randId)()}#${aObject.__name__}`;
         } else {
           object_id = (0,_utils__WEBPACK_IMPORTED_MODULE_0__.randId)();
         }
         bObject = {
           _rtype: "method",
+          _rserver: this._server_base_url,
           _rtarget: this._client_id,
           _rmethod: `${session_id}.${object_id}`,
           _rpromise: true,
@@ -4920,6 +4942,7 @@ async function connectToServer(config) {
     name: config.name,
     method_timeout: config.method_timeout,
     app_id: config.app_id,
+    server_base_url: connection_info.public_base_url,
   });
   const wm = await rpc.get_manager_service({
     timeout: config.method_timeout,
@@ -5190,9 +5213,9 @@ async function connectToServer(config) {
   return wm;
 }
 
-async function getRemoteService(url, config = {}) {
+async function getRemoteService(serviceUri, config = {}) {
   const { serverUrl, workspace, clientId, serviceId, appId } =
-    (0,_utils__WEBPACK_IMPORTED_MODULE_1__.parseServiceUrl)(url);
+    (0,_utils__WEBPACK_IMPORTED_MODULE_1__.parseServiceUrl)(serviceUri);
   const fullServiceId = `${workspace}/${clientId}:${serviceId}@${appId}`;
 
   if (config.serverUrl) {