hypha-rpc 0.1.0-post5 → 0.1.0-post6

package/dist/hypha-rpc-websocket.js

@@ -430,7 +430,7 @@ class RPC extends _utils_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
     }
 
     throw new Error(
-      `Permission denied for protected service: ${service_id}, workspace mismatch: ${ws} != ${context["ws"]}`,
+      `Permission denied for getting protected service: ${service_id}, workspace mismatch: ${ws} != ${context["ws"]}`,
     );
   }
   async get_remote_service(service_uri, timeout) {
@@ -612,13 +612,13 @@ 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,
           service: serviceInfo,
         });
       } else {
-        this.emit({ type: "service-added", to: "*", service: serviceInfo });
+        await this.emit({ type: "service-added", to: "*", service: serviceInfo });
       }
     }
     return serviceInfo;
@@ -962,9 +962,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 && data.ws);
+      (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"]
@@ -1031,9 +1032,9 @@ 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 +
@@ -2104,7 +2105,7 @@ 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();