hypha-rpc 0.1.0 → 0.1.1

package/dist/hypha-rpc-websocket.js

@@ -190,13 +190,12 @@ class RPC extends _utils_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
     (0,_utils_js__WEBPACK_IMPORTED_MODULE_0__.assert)(client_id, "client_id is required");
     this._client_id = client_id;
     this._name = name;
-    this._app_id = app_id;
+    this._app_id = app_id || "*";
     this._local_workspace = workspace;
     this.manager_id = manager_id;
     this._silent = silent;
     this.default_context = default_context || {};
     this._method_annotations = new WeakMap();
-    this._manager_service = null;
     this._max_message_buffer_size = max_message_buffer_size;
     this._chunk_store = {};
     this._method_timeout = method_timeout || 30;
@@ -229,19 +228,21 @@ class RPC extends _utils_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
       this._emit_message = connection.emit_message.bind(connection);
       connection.on_message(this._on_message.bind(this));
       this._connection = connection;
-      connection.on_connect(async () => {
+      const updateServices = async () => {
         if (!this._silent && this.manager_id) {
           console.log("Connection established, reporting services...");
           for (let service of Object.values(this._services)) {
             const serviceInfo = this._extract_service_info(service);
             await this.emit({
               type: "service-added",
-              to: this.manager_id,
+              to: "*/" + this.manager_id,
               service: serviceInfo,
             });
           }
         }
-      });
+      };
+      connection.on_connect(updateServices);
+      updateServices();
     } else {
       this._emit_message = function () {
         console.log("No connection to emit message");
@@ -393,12 +394,12 @@ class RPC extends _utils_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
   }
 
   async get_manager_service(timeout) {
-    if (this.manager_id && !this._manager_service) {
-      this._manager_service = await this.get_remote_service(
-        `${this.manager_id}:default`,
-        timeout,
-      );
-    }
+    (0,_utils_js__WEBPACK_IMPORTED_MODULE_0__.assert)(this.manager_id, "Manager id is not set");
+    const svc = await this.get_remote_service(
+      `*/${this.manager_id}:default`,
+      timeout,
+    );
+    return svc;
   }
 
   get_all_local_services() {
@@ -424,18 +425,18 @@ class RPC extends _utils_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
     }
 
     // allow access for the same workspace
-    if (context["from"].startsWith(ws + "/")) {
+    if (context["ws"] === ws) {
       return service;
     }
 
     throw new Error(
-      `Permission denied for protected service: ${service_id}, workspace mismatch: ${ws} != ${context["from"]}`,
+      `Permission denied for getting protected service: ${service_id}, workspace mismatch: ${ws} != ${context["ws"]}`,
     );
   }
   async get_remote_service(service_uri, timeout) {
     timeout = timeout === undefined ? this._method_timeout : timeout;
     if (!service_uri && this.manager_id) {
-      service_uri = this.manager_id;
+      service_uri = "*/" + this.manager_id;
     } else if (!service_uri.includes(":")) {
       service_uri = this._client_id + ":" + service_uri;
     }
@@ -444,7 +445,7 @@ class RPC extends _utils_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
     if (service_id.includes("@")) {
       service_id = service_id.split("@")[0];
       const app_id = service_uri.split("@")[1];
-      if (this._app_id)
+      if (this._app_id && this._app_id !== "*")
         (0,_utils_js__WEBPACK_IMPORTED_MODULE_0__.assert)(
           app_id === this._app_id,
           `Invalid app id: ${app_id} != ${this._app_id}`,
@@ -603,7 +604,7 @@ class RPC extends _utils_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
       const [workspace, client_id] = context["to"].split("/");
       (0,_utils_js__WEBPACK_IMPORTED_MODULE_0__.assert)(client_id === this._client_id);
       (0,_utils_js__WEBPACK_IMPORTED_MODULE_0__.assert)(
-        workspace === context["from"].split("/")[0],
+        workspace === context["ws"],
         "Services can only be registered from the same workspace",
       );
     }
@@ -611,13 +612,17 @@ class RPC extends _utils_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
     const serviceInfo = this._extract_service_info(service);
     if (notify) {
       if (this.manager_id) {
-        this.emit({
+        await this.emit({
           type: "service-added",
-          to: this.manager_id,
+          to: "*/" + this.manager_id,
           service: serviceInfo,
         });
       } else {
-        this.emit({ type: "service-added", to: "*", service: serviceInfo });
+        await this.emit({
+          type: "service-added",
+          to: "*",
+          service: serviceInfo,
+        });
       }
     }
     return serviceInfo;
@@ -636,7 +641,7 @@ class RPC extends _utils_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
       if (this.manager_id) {
         this.emit({
           type: "service-removed",
-          to: this.manager_id,
+          to: "*/" + this.manager_id,
           service: serviceInfo,
         });
       } else {
@@ -844,8 +849,6 @@ class RPC extends _utils_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
         let from_client;
         if (!self._local_workspace) {
           from_client = self._client_id;
-        } else if (self._local_workspace === "*") {
-          from_client = target_id.split("/")[0] + "/" + self._client_id;
         } else {
           from_client = self._local_workspace + "/" + self._client_id;
         }
@@ -947,26 +950,6 @@ class RPC extends _utils_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
     return remote_method;
   }
 
-  async _notify_service_update() {
-    if (this.manager_id) {
-      // try to get the root service
-      try {
-        await this.get_manager_service(30.0);
-        (0,_utils_js__WEBPACK_IMPORTED_MODULE_0__.assert)(this._manager_service);
-        await this._manager_service.update_client_info(this.get_client_info());
-      } catch (exp) {
-        // pylint: disable=broad-except
-        console.warn(
-          "Failed to notify service update to",
-          this.manager_id,
-          exp,
-        );
-      }
-    } else {
-      console.warn("No manager id provided, cannot notify service update");
-    }
-  }
-
   get_client_info() {
     const services = [];
     for (let service of Object.values(this._services)) {
@@ -983,9 +966,10 @@ class RPC extends _utils_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
     let reject = null;
     let heartbeat_task = null;
     try {
-      (0,_utils_js__WEBPACK_IMPORTED_MODULE_0__.assert)(data["method"] && data["ctx"] && data["from"]);
+      (0,_utils_js__WEBPACK_IMPORTED_MODULE_0__.assert)(data.method && data.ctx && data.from);
       const method_name = data.from + ":" + data.method;
       const remote_workspace = data.from.split("/")[0];
+      const remote_client_id = data.from.split("/")[1];
       // Make sure the target id is an absolute id
       data["to"] = data["to"].includes("/")
         ? data["to"]
@@ -994,10 +978,8 @@ class RPC extends _utils_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
       let local_workspace;
       if (!this._local_workspace) {
         local_workspace = data["to"].split("/")[0];
-      } else if (this._local_workspace === "*") {
-        local_workspace = remote_workspace;
       } else {
-        if (this._local_workspace) {
+        if (this._local_workspace && this._local_workspace !== "*") {
           (0,_utils_js__WEBPACK_IMPORTED_MODULE_0__.assert)(
             data["to"].split("/")[0] === this._local_workspace,
             "Workspace mismatch: " +
@@ -1041,8 +1023,10 @@ class RPC extends _utils_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
       try {
         method = indexObject(this._object_store, data["method"]);
       } catch (e) {
-        console.debug("Failed to find method", method_name, e);
-        throw new Error(`Method not found: ${method_name}`);
+        console.debug("Failed to find method", method_name, this._client_id, e);
+        throw new Error(
+          `Method not found: ${method_name} at ${this._client_id}`,
+        );
       }
 
       (0,_utils_js__WEBPACK_IMPORTED_MODULE_0__.assert)(
@@ -1054,9 +1038,12 @@ class RPC extends _utils_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
       if (this._method_annotations.has(method)) {
         // For services, it should not be protected
         if (this._method_annotations.get(method).visibility === "protected") {
-          if (local_workspace !== remote_workspace) {
+          if (
+            local_workspace !== remote_workspace &&
+            (remote_workspace !== "*" || remote_client_id !== this.manager_id)
+          ) {
             throw new Error(
-              "Permission denied for protected method " +
+              "Permission denied for invoking protected method " +
                 method_name +
                 ", workspace mismatch: " +
                 local_workspace +
@@ -1076,7 +1063,7 @@ class RPC extends _utils_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
         ) {
           session_target_id = local_workspace + "/" + session_target_id;
         }
-        if (this._local_workspace !== "*" && session_target_id !== data.from) {
+        if (session_target_id !== data.from) {
           throw new Error(
             "Access denied for method call (" +
               method_name +
@@ -1993,10 +1980,6 @@ class WebRTCConnection {
     };
   }
 
-  set_reconnection_token(token) {
-    this._reconnection_token = token;
-  }
-
   on_message(handler) {
     (0,_utils_js__WEBPACK_IMPORTED_MODULE_1__.assert)(handler, "handler is required");
     this._handle_message = handler;
@@ -2131,7 +2114,9 @@ async function getRTCService(server, service_id, config) {
           const rpc = await _setupRPC(config);
           pc.rpc = rpc;
           async function getService(name) {
-            return await rpc.get_remote_service(config.peer_id + ":" + name);
+            return await rpc.get_remote_service(
+              config.workspace + "/" + config.peer_id + ":" + name,
+            );
           }
           async function disconnect() {
             await rpc.disconnect();
@@ -4073,16 +4058,6 @@ function utf8DecodeTD(bytes, inputOffset, byteLength) {
 }
 //# sourceMappingURL=utf8.mjs.map
 
-/***/ }),
-
-/***/ "./package.json":
-/*!**********************!*\
-  !*** ./package.json ***!
-  \**********************/
-/***/ ((module) => {
-
-module.exports = /*#__PURE__*/JSON.parse('{"name":"hypha-rpc","version":"0.1.0","description":"Hypha RPC client for connecting to Hypha server for data management and AI model serving.","main":"index.js","types":"index.d.ts","scripts":{"build":"rm -rf dist && npm run build-umd","build-umd":"webpack --config webpack.config.js --mode development && NODE_ENV=production webpack --config webpack.config.js --mode production --devtool source-map","watch":"NODE_ENV=production webpack --watch --progress --config webpack.config.js --mode production --devtool source-map","publish-npm":"npm install && npm run build && npm publish","serve":"webpack serve","stats":"webpack --profile --json > stats.json","stats-prod":"webpack --profile --json --mode production > stats-prod.json","clean":"rimraf dist/*","format":"prettier --write \\"{src,tests}/**/**\\"","check-format":"prettier --check \\"{src,tests}/**/**\\"","test":"karma start --single-run --browsers ChromeHeadless,FirefoxHeadless karma.conf.js","test-watch":"karma start --auto-watch --browsers ChromeDebugging karma.conf.js --debug"},"repository":{"type":"git","url":"git+https://github.com/oeway/hypha-rpc.git"},"keywords":["hypha","rpc"],"author":"Wei Ouyang","license":"MIT","bugs":{"url":"https://github.com/oeway/hypha-rpc/issues"},"homepage":"https://github.com/oeway/hypha-rpc","engines":{"node":">=19.0.0"},"dependencies":{"@msgpack/msgpack":"^2.7.1"},"devDependencies":{"@babel/core":"^7.24.9","@babel/plugin-syntax-dynamic-import":"^7.8.3","@babel/preset-env":"^7.24.8","babel-loader":"^9.1.3","chai":"^5.1.1","clean-webpack-plugin":"^4.0.0","copy-webpack-plugin":"^12.0.2","eslint":"^7.32.0","eslint-config-prettier":"^9.1.0","eslint-loader":"^4.0.2","karma":"^6.4.3","karma-chrome-launcher":"^3.2.0","karma-firefox-launcher":"^2.1.3","karma-mocha":"^2.0.1","karma-sourcemap-loader":"^0.4.0","karma-spec-reporter":"^0.0.36","karma-webpack":"^5.0.1","mocha":"^10.6.0","prettier":"^3.3.3","webpack":"^5.93.0","webpack-cli":"^5.1.4","webpack-dev-server":"^5.0.4"}}');
-
 /***/ })
 
 /******/ 	});
@@ -4149,7 +4124,6 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   API_VERSION: () => (/* reexport safe */ _rpc_js__WEBPACK_IMPORTED_MODULE_0__.API_VERSION),
 /* harmony export */   RPC: () => (/* reexport safe */ _rpc_js__WEBPACK_IMPORTED_MODULE_0__.RPC),
-/* harmony export */   VERSION: () => (/* reexport safe */ _package_json__WEBPACK_IMPORTED_MODULE_3__.version),
 /* harmony export */   connectToServer: () => (/* binding */ connectToServer),
 /* harmony export */   getRTCService: () => (/* reexport safe */ _webrtc_client_js__WEBPACK_IMPORTED_MODULE_2__.getRTCService),
 /* harmony export */   loadRequirements: () => (/* reexport safe */ _utils_js__WEBPACK_IMPORTED_MODULE_1__.loadRequirements),
@@ -4160,8 +4134,6 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _rpc_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./rpc.js */ "./src/rpc.js");
 /* harmony import */ var _utils_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./utils.js */ "./src/utils.js");
 /* harmony import */ var _webrtc_client_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./webrtc-client.js */ "./src/webrtc-client.js");
-/* harmony import */ var _package_json__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../package.json */ "./package.json");
-
 
 
 
@@ -4193,7 +4165,6 @@ class WebsocketRPCConnection {
     this._disconnect_handler = null; // Disconnection event handler
     this._timeout = timeout * 1000; // Convert seconds to milliseconds
     this._WebSocketClass = WebSocketClass || WebSocket; // Allow overriding the WebSocket class
-    this._opening = null;
     this._closing = false;
     this._legacy_auth = null;
     this.connection_info = null;
@@ -4206,19 +4177,12 @@ class WebsocketRPCConnection {
 
   on_connect(handler) {
     this._handle_connect = handler;
-    if (this._websocket && this._websocket.readyState === WebSocket.OPEN) {
-      this._handle_connect(this);
-    }
   }
 
   on_disconnected(handler) {
     this._disconnect_handler = handler;
   }
 
-  set_reconnection_token(token) {
-    this._reconnection_token = token;
-  }
-
   async _attempt_connection(server_url, attempt_fallback = true) {
     return new Promise((resolve, reject) => {
       this._legacy_auth = false;
@@ -4282,7 +4246,6 @@ class WebsocketRPCConnection {
       return; // Avoid opening a new connection if closing or already open
     }
     try {
-      this._opening = true;
       this._websocket = await this._attempt_connection(this._server_url);
       if (!this._legacy_auth) {
         // Send authentication info as the first message if connected without query params
@@ -4302,13 +4265,17 @@ class WebsocketRPCConnection {
               if (!first_message.success) {
                 const error = first_message.error || "Unknown error";
                 console.error("Failed to connect, " + error);
-                this.connection_info = None;
+                this.connection_info = null;
                 reject(new Error(error));
               } else if (first_message) {
                 console.log(
                   "Successfully connected: " + JSON.stringify(first_message),
                 );
                 this.connection_info = first_message;
+                if (this.connection_info.reconnection_token) {
+                  this._reconnection_token =
+                    this.connection_info.reconnection_token;
+                }
               }
               resolve();
             };
@@ -4319,8 +4286,7 @@ class WebsocketRPCConnection {
       }
 
       this._websocket.onmessage = (event) => {
-        const data = event.data;
-        this._handle_message(data);
+        this._handle_message(event.data);
       };
 
       if (this._handle_connect) {
@@ -4328,8 +4294,6 @@ class WebsocketRPCConnection {
       }
     } catch (error) {
       console.error("Failed to connect to", this._server_url, error);
-    } finally {
-      this._opening = false;
     }
   }
 
@@ -4337,9 +4301,8 @@ class WebsocketRPCConnection {
     if (this._closing) {
       throw new Error("Connection is closing");
     }
-    await this._opening;
     if (!this._websocket || this._websocket.readyState !== WebSocket.OPEN) {
-      throw new Error("WebSocket connection is not open");
+      await this.open();
     }
     try {
       this._websocket.send(data);
@@ -4418,27 +4381,33 @@ async function connectToServer(config) {
     config.WebSocketClass,
   );
   await connection.open();
-  let workspace = config.workspace;
-  if (connection.connection_info) {
-    workspace = connection.connection_info.workspace;
+  (0,_utils_js__WEBPACK_IMPORTED_MODULE_1__.assert)(connection.connection_info, "Failed to connect to the server");
+  if (
+    config.workspace &&
+    connection.connection_info.workspace !== config.workspace
+  ) {
+    throw new Error(
+      `Connected to the wrong workspace: ${connection.connection_info.workspace}, expected: ${config.workspace}`,
+    );
   }
+  const workspace = connection.connection_info.workspace;
+  const manager_id = connection.connection_info.manager_id;
   const rpc = new _rpc_js__WEBPACK_IMPORTED_MODULE_0__.RPC(connection, {
     client_id: clientId,
     workspace,
-    manager_id: "workspace-manager",
+    manager_id,
     default_context: { connection_type: "websocket" },
     name: config.name,
     method_timeout: config.method_timeout,
     app_id: config.app_id,
   });
-  const wm = await rpc.get_remote_service("workspace-manager:default");
+  const wm = await rpc.get_manager_service();
   wm.rpc = rpc;
 
   async function _export(api) {
     api.id = "default";
     api.name = api.name || config.name || api.id;
     api.description = api.description || config.description;
-    api.docs = api.docs || config.docs;
     await rpc.register_service(api, true);
   }
 
@@ -4450,8 +4419,9 @@ async function connectToServer(config) {
     await rpc.disconnect();
     await connection.disconnect();
   }
-
-  wm.config["client_id"] = clientId;
+  if (connection.connection_info) {
+    wm.config = Object.assign(wm.config, connection.connection_info);
+  }
   wm.export = _export;
   wm.getPlugin = getPlugin;
   wm.listPlugins = wm.listServices;
@@ -4461,7 +4431,7 @@ async function connectToServer(config) {
   wm.on = rpc.on;
   if (rpc.manager_id) {
     rpc.on("force-exit", async (message) => {
-      if (message.from.endsWith("/" + rpc.manager_id)) {
+      if (message.from === "*/" + rpc.manager_id) {
         console.log("Disconnecting from server, reason:", message.reason);
         await disconnect();
       }
@@ -4714,11 +4684,6 @@ function setupLocalClient({
               }
               resolve(server);
             } catch (e) {
-              // If any script fails to load, send an error message
-              await server.update_client_info({
-                id: client_id,
-                error: e.message,
-              });
               reject(e);
             }
           });