polfan-server-js-client 0.2.52 → 0.2.53

package/build/types/WebSocketChatClient.d.ts

@@ -34,5 +34,7 @@ export declare class WebSocketChatClient extends AbstractChatClient implements O
     private onClose;
     private sendFromQueue;
     private triggerConnectionTimeout;
+    private isPendingReadyWsState;
+    private isReadyToSendWsState;
 }
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "polfan-server-js-client",
-  "version": "0.2.52",
+  "version": "0.2.53",
   "description": "JavaScript client library for handling communication with Polfan chat server.",
   "author": "Jarosław Żak",
   "license": "MIT",

package/src/AbstractChatClient.ts

@@ -154,7 +154,7 @@ export abstract class AbstractChatClient extends EventTarget {
         if (!this.awaitingResponse.has(envelope.ref)) {
             return;
         }
-        this.awaitingResponse.get(envelope.ref)[0](error);
+        this.awaitingResponse.get(envelope.ref)[1](error);
         this.awaitingResponse.delete(envelope.ref);
     }
 }

package/src/WebSocketChatClient.ts

@@ -60,28 +60,28 @@ export class WebSocketChatClient extends AbstractChatClient implements Observabl
 
     public async send<CommandType extends keyof CommandsMap>(commandType: CommandType, commandData: CommandsMap[CommandType][0]):
        Promise<CommandResult<CommandsMap[CommandType][1]>> {
-        if (!this.ws || [this.ws.CLOSED, this.ws.CLOSING].includes(this.ws.readyState)) {
-            throw new Error('Cannot send; close or closing connection state');
-        }
-
         const envelope = this.createEnvelope<CommandsMap[CommandType][0]>(commandType, commandData);
         const promise = this.createPromiseFromCommandEnvelope<CommandType>(envelope);
 
-        if (this.ws.readyState === this.ws.CONNECTING || !this.authenticated) {
+        if (this.isPendingReadyWsState()) {
             this.sendQueue.push(envelope);
             return promise;
         }
 
-        if (this.ws.readyState !== this.ws.OPEN) {
-            throw new Error(`Invalid websocket state=${this.ws.readyState}`);
-        }
-
         this.sendEnvelope(envelope);
         return promise;
     }
 
     private sendEnvelope(envelope: Envelope): void {
-        this.ws.send(JSON.stringify(envelope));
+        if (this.isReadyToSendWsState()) {
+            this.ws.send(JSON.stringify(envelope));
+            return;
+        }
+
+        this.handleEnvelopeSendError(
+            envelope,
+            new Error(`Cannot send; invalid websocket state=${this.ws?.readyState}`)
+        );
     }
 
     private onMessage(event: MessageEvent): void {
@@ -108,7 +108,7 @@ export class WebSocketChatClient extends AbstractChatClient implements Observabl
         clearTimeout(this.connectingTimeoutId);
         const reconnect = event.code !== 1000; // Connection was closed because of error
         if (reconnect) {
-            this.connect();
+            void this.connect();
         }
         this.emit(this.Event.disconnect, reconnect);
     }
@@ -129,4 +129,12 @@ export class WebSocketChatClient extends AbstractChatClient implements Observabl
         this.disconnect();
         this.emit(this.Event.error, new Error('Connection timeout'));
     }
+
+    private isPendingReadyWsState(): boolean {
+        return this.ws.readyState === this.ws.CONNECTING || !this.authenticated;
+    }
+
+    private isReadyToSendWsState(): boolean {
+        return this.ws?.readyState === this.ws.OPEN && this.authenticated;
+    }
 }