hypha-rpc 0.1.7 → 0.1.10

package/dist/hypha-rpc-websocket.js

@@ -483,7 +483,7 @@ class RPC extends _utils_js__WEBPACK_IMPORTED_MODULE_0__.MessageEmitter {
       svc.id = `${provider}:${service_id}`;
       return svc;
     } catch (e) {
-      console.error("Failed to get remote service: " + service_uri, e);
+      console.warn("Failed to get remote service: " + service_uri, e);
       throw e;
     }
   }
@@ -4306,13 +4306,13 @@ class WebsocketRPCConnection {
           }
           resolve(this.connection_info);
         } else if (first_message.type == "error") {
-          const error = first_message.error || "Unknown error";
+          const error = "ConnectionAbortedError: " + first_message.message;
           console.error("Failed to connect, " + error);
           reject(new Error(error));
           return;
         } else {
-          console.error("Unexpected message received from the server:", data);
-          reject(new Error("Unexpected message received from the server"));
+          console.error("ConnectionAbortedError: Unexpected message received from the server:", data);
+          reject(new Error("ConnectionAbortedError: Unexpected message received from the server"));
           return;
         }
       };
@@ -4374,11 +4374,9 @@ class WebsocketRPCConnection {
       this._websocket &&
       this._websocket.readyState === WebSocket.CLOSED
     ) {
-      if ([1000].includes(event.code)) {
+      if ([1000, 1001].includes(event.code)) {
         console.info(
-          "Websocket connection closed (code: %s): %s",
-          event.code,
-          event.reason,
+          `Websocket connection closed (code: ${event.code}): ${event.reason}`  
         );
         if (this._handle_disconnected) {
           this._handle_disconnected(event.reason);
@@ -4478,6 +4476,7 @@ async function login(config) {
   });
   try {
     const svc = await server.get_service(service_id);
+    (0,_utils_js__WEBPACK_IMPORTED_MODULE_1__.assert)(svc, `Failed to get the login service: ${service_id}`);
     const context = await svc.start();
     if (callback) {
       await callback(context);
@@ -4548,17 +4547,13 @@ async function connectToServer(config) {
     return await wm.get_service(query + ":default");
   }
 
-  async function disconnect() {
-    await rpc.disconnect();
-    await connection.disconnect();
-  }
   if (connection_info) {
     wm.config = Object.assign(wm.config, connection_info);
   }
   wm.export = _export;
   wm.getPlugin = getPlugin;
   wm.listPlugins = wm.listServices;
-  wm.disconnect = disconnect;
+  wm.disconnect = rpc.disconnect.bind(rpc);
   wm.registerCodec = rpc.register_codec.bind(rpc);
   wm.emit = rpc.emit;
   wm.on = rpc.on;
@@ -4566,7 +4561,7 @@ async function connectToServer(config) {
     rpc.on("force-exit", async (message) => {
       if (message.from === "*/" + connection.manager_id) {
         console.log("Disconnecting from server, reason:", message.reason);
-        await disconnect();
+        await rpc.disconnect();
       }
     });
   }
@@ -4580,7 +4575,9 @@ async function connectToServer(config) {
         [undefined, true, false, "auto"].includes(webrtc),
         "webrtc must be true, false or 'auto'",
       );
-      const svc = await _get_service(query);
+      // pass other arguments to get_service
+      const otherArgs = Array.prototype.slice.call(arguments, 3);
+      const svc = await _get_service(query, ...otherArgs);
       if (webrtc === true || webrtc === "auto") {
         if (svc.id.includes(":") && svc.id.includes("/")) {
           const client = svc.id.split(":")[0];