hypha-rpc 0.20.18 → 0.20.19

package/dist/hypha-rpc-websocket.js

@@ -742,7 +742,9 @@ class RPC extends _utils__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
     return _get_schema(service, null, skipContext);
   }
 
-  async register_service(api, overwrite, notify = true, check_type = false) {
+  async register_service(api, config) {
+    let { check_type, notify, overwrite } = config || {};
+    notify = notify === undefined ? true : notify;
     let manager;
     if (check_type && api.type) {
       try {
@@ -2423,13 +2425,22 @@ async function getRTCService(server, service_id, config) {
             pc.close();
           }
           pc.getService = (0,_utils_schema_js__WEBPACK_IMPORTED_MODULE_2__.schemaFunction)(get_service, {
-            name: "get_service",
+            name: "getService",
             description: "Get a remote service via webrtc",
             parameters: {
               type: "object",
               properties: {
-                name: { type: "string", description: "Name of the service" },
+                service_id: {
+                  type: "string",
+                  description:
+                    "Service ID. This should be a service id in the format: 'workspace/service_id', 'workspace/client_id:service_id' or 'workspace/client_id:service_id@app_id'",
+                },
+                config: {
+                  type: "object",
+                  description: "Options for the service",
+                },
               },
+              required: ["id"],
             },
           });
           pc.disconnect = (0,_utils_schema_js__WEBPACK_IMPORTED_MODULE_2__.schemaFunction)(disconnect, {
@@ -4816,7 +4827,7 @@ async function webrtcGetService(wm, rtc_service_id, query, config) {
       try {
         // Assuming that the client registered a webrtc service with the client_id + "-rtc"
         const peer = await (0,_webrtc_client_js__WEBPACK_IMPORTED_MODULE_3__.getRTCService)(wm, rtc_service_id, webrtc_config);
-        const rtcSvc = await peer.get_service(svc.id.split(":")[1], config);
+        const rtcSvc = await peer.getService(svc.id.split(":")[1], config);
         rtcSvc._webrtc = true;
         rtcSvc._peer = peer;
         rtcSvc._service = svc;
@@ -4887,7 +4898,7 @@ async function connectToServer(config) {
     api.id = "default";
     api.name = api.name || config.name || api.id;
     api.description = api.description || config.description;
-    await rpc.register_service(api, true);
+    await rpc.register_service(api, { overwrite: true });
   }
 
   async function getApp(clientId) {
@@ -5051,29 +5062,18 @@ async function connectToServer(config) {
     });
   }
   if (config.webrtc) {
-    await (0,_webrtc_client_js__WEBPACK_IMPORTED_MODULE_3__.registerRTCService)(wm, clientId + "-rtc", config.webrtc_config);
+    await (0,_webrtc_client_js__WEBPACK_IMPORTED_MODULE_3__.registerRTCService)(wm, `${clientId}-rtc`, config.webrtc_config);
     // make a copy of wm, so webrtc can use the original wm.getService
     const _wm = Object.assign({}, wm);
+    const description = _wm.getService.__schema__.description;
+    // TODO: Fix the schema for adding options for webrtc
+    const parameters = _wm.getService.__schema__.parameters;
     wm.getService = (0,_utils_schema_js__WEBPACK_IMPORTED_MODULE_2__.schemaFunction)(
-      webrtcGetService.bind(null, _wm, clientId + "-rtc"),
+      webrtcGetService.bind(null, _wm, `${workspace}/${clientId}-rtc`),
       {
         name: "getService",
-        description: "Get a service via webrtc.",
-        parameters: {
-          properties: {
-            query: {
-              description: "The query to get the service",
-              type: "object",
-            },
-            config: {
-              description:
-                "The config for the service, including `webrtc`, `webrtc_config` and other get_service options",
-              type: "object",
-            },
-          },
-          required: ["query"],
-          type: "object",
-        },
+        description,
+        parameters,
       },
     );
 
@@ -5093,32 +5093,12 @@ async function connectToServer(config) {
     });
   } else {
     const _getService = wm.getService;
-    wm.getService = (0,_utils_schema_js__WEBPACK_IMPORTED_MODULE_2__.schemaFunction)(
-      (query, config) => {
-        config = config || {};
-        config.case_conversion = config.case_conversion || "camel";
-        return _getService(query, config);
-      },
-      {
-        name: "getService",
-        description: "Get a service.",
-        parameters: {
-          properties: {
-            query: {
-              description: "The query to get the service",
-              type: "object",
-            },
-            config: {
-              description:
-                "The config for the service, including `webrtc`, `webrtc_config` and other get_service options",
-              type: "object",
-            },
-          },
-          required: ["query"],
-          type: "object",
-        },
-      },
-    );
+    wm.getService = (query, config) => {
+      config = config || {};
+      config.case_conversion = config.case_conversion || "camel";
+      return _getService(query, config);
+    };
+    wm.getService.__schema__ = _getService.__schema__;
   }
   return wm;
 }