hypha-rpc 0.20.12 → 0.20.14

package/dist/hypha-rpc-websocket.js

@@ -706,12 +706,13 @@ class RPC extends _utils__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
 
   _extract_service_info(service) {
     const config = service.config || {};
-    config.workspace = config.workspace || self._local_workspace;
+    config.workspace =
+      config.workspace || this._local_workspace || this._connection.workspace;
     const skipContext = config.require_context;
     const serviceSchema = _get_schema(service, null, skipContext);
     const serviceInfo = {
       config: config,
-      id: `${this._client_id}:${service["id"]}`,
+      id: `${config.workspace}/${this._client_id}:${service["id"]}`,
       name: service.name || service["id"],
       description: service.description || "",
       type: service.type || "generic",
@@ -4864,18 +4865,14 @@ async function connectToServer(config) {
   async function getApp(clientId) {
     clientId = clientId || "*";
     (0,_utils__WEBPACK_IMPORTED_MODULE_1__.assert)(!clientId.includes(":"), "clientId should not contain ':'");
-    let workspace;
-    if (clientId.includes("/")) {
-      [workspace, clientId] = clientId.split("/");
-    } else {
-      workspace = connection_info.workspace;
+    if (!clientId.includes("/")) {
+      clientId = connection_info.workspace + "/" + clientId;
     }
-    const query = {
-      workspace: workspace,
-      client_id: clientId,
-      service_id: "default",
-    };
-    return await wm.getService(query);
+    (0,_utils__WEBPACK_IMPORTED_MODULE_1__.assert)(
+      clientId.split("/").length === 2,
+      "clientId should match pattern workspace/clientId",
+    );
+    return await wm.getService(`${clientId}:default`);
   }
 
   async function listApps(ws) {