@holochain/client 0.12.3 → 0.12.5

package/lib/api/app-agent/websocket.js

@@ -93,9 +93,7 @@ export class AppAgentWebsocket {
      */
     async callZome(request, timeout) {
         if ("provenance" in request) {
-            if (request.provenance !== this.myPubKey &&
-                "role_name" in request &&
-                request.role_name) {
+            if ("role_name" in request && request.role_name) {
                 throw new Error("Cannot find other agent's cells based on role name. Use cell id when providing a provenance.");
             }
         }

package/lib/api/client.d.ts

@@ -42,5 +42,5 @@ export declare class WsClient extends Emittery {
     /**
      * Close the websocket connection.
      */
-    close(): Promise<void>;
+    close(code?: number): Promise<void>;
 }

package/lib/api/client.js

@@ -48,7 +48,7 @@ export class WsClient extends Emittery {
                     return;
                 }
                 const encodedAppSignal = deserializedSignal[SignalType.App];
-                // In order to return readible content to the UI, the signal payload must also be deserialized.
+                // In order to return readable content to the UI, the signal payload must also be deserialized.
                 const payload = decode(encodedAppSignal.signal);
                 const signal = {
                     cell_id: encodedAppSignal.cell_id,
@@ -64,6 +64,16 @@ export class WsClient extends Emittery {
                 console.error(`Got unrecognized Websocket message type: ${message.type}`);
             }
         };
+        socket.onclose = (event) => {
+            const pendingRequestIds = Object.keys(this.pendingRequests).map((id) => parseInt(id));
+            if (pendingRequestIds.length) {
+                pendingRequestIds.forEach((id) => {
+                    const error = new Error(`Websocket closed with pending requests. Close event code: ${event.code}, request id: ${id}`);
+                    this.pendingRequests[id].reject(error);
+                    delete this.pendingRequests[id];
+                });
+            }
+        };
     }
     /**
      * Instance factory for creating WsClients.
@@ -105,23 +115,23 @@ export class WsClient extends Emittery {
      * @returns
      */
     request(request) {
-        const id = this.index;
-        this.index += 1;
-        const encodedMsg = encode({
-            id,
-            type: "request",
-            data: encode(request),
-        });
-        const promise = new Promise((resolve, reject) => {
-            this.pendingRequests[id] = { resolve, reject };
-        });
         if (this.socket.readyState === this.socket.OPEN) {
+            const id = this.index;
+            const encodedMsg = encode({
+                id,
+                type: "request",
+                data: encode(request),
+            });
+            const promise = new Promise((resolve, reject) => {
+                this.pendingRequests[id] = { resolve, reject };
+            });
             this.socket.send(encodedMsg);
+            this.index += 1;
+            return promise;
         }
         else {
             return Promise.reject(new Error("Socket is not open"));
         }
-        return promise;
     }
     handleResponse(msg) {
         const id = msg.id;
@@ -141,9 +151,9 @@ export class WsClient extends Emittery {
     /**
      * Close the websocket connection.
      */
-    close() {
+    close(code) {
         const closedPromise = new Promise((resolve) => this.socket.on("close", resolve));
-        this.socket.close();
+        this.socket.close(code);
         return closedPromise;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@holochain/client",
-  "version": "0.12.3",
+  "version": "0.12.5",
   "description": "A JavaScript client for the Holochain Conductor API",
   "author": "Holochain Foundation <info@holochain.org> (http://holochain.org)",
   "license": "CAL-1.0",