polfan-server-js-client 0.2.64 → 0.2.66

package/build/types/WebSocketChatClient.d.ts

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

package/build/types/state-tracker/TopicHistoryWindow.d.ts

@@ -83,7 +83,6 @@ export declare class TopicHistoryWindow extends TraversableRemoteCollection<Mess
      */
     _updateMessageReference(refTopic: Topic): void;
     private handleNewMessage;
-    private handleSession;
     protected fetchItemsAfter(): Promise<Message[] | null>;
     protected fetchItemsBefore(): Promise<Message[] | null>;
     protected fetchLatestItems(): Promise<Message[]>;

package/package.json

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

package/src/WebSocketChatClient.ts

@@ -37,7 +37,7 @@ export class WebSocketChatClient extends AbstractChatClient implements Observabl
     }
 
     public async connect(): Promise<void> {
-        if (this.isReadyToSendWsState() || this.isPendingReadyWsState()) {
+        if (this.isOpenWsState() || this.isConnectingWsState()) {
             return;
         }
 
@@ -67,7 +67,7 @@ export class WebSocketChatClient extends AbstractChatClient implements Observabl
         const envelope = this.createEnvelope<CommandsMap[CommandType][0]>(commandType, commandData);
         const promise = this.createPromiseFromCommandEnvelope<CommandType>(envelope);
 
-        if (this.isPendingReadyWsState()) {
+        if (this.isConnectingWsState() || !this.authenticated && this.isOpenWsState()) {
             this.sendQueue.push(envelope);
             return promise;
         }
@@ -77,18 +77,18 @@ export class WebSocketChatClient extends AbstractChatClient implements Observabl
     }
 
     public get isReady(): boolean {
-        return this.isReadyToSendWsState();
+        return this.isOpenWsState() && this.authenticated;
     }
 
     private sendEnvelope(envelope: Envelope): void {
-        if (this.isReadyToSendWsState()) {
+        if (this.isReady) {
             this.ws.send(JSON.stringify(envelope));
             return;
         }
 
         this.handleEnvelopeSendError(
             envelope,
-            new Error(`Cannot send; invalid websocket state=${this.ws?.readyState ?? '[no connection]'}`)
+            new Error(`Cannot send - client is not ready (state=${this.ws?.readyState ?? '[no connection]'}; authenticated=${this.authenticated})`)
         );
     }
 
@@ -138,11 +138,11 @@ export class WebSocketChatClient extends AbstractChatClient implements Observabl
         this.emit(this.Event.error, new Error('Connection timeout'));
     }
 
-    private isPendingReadyWsState(): boolean {
-        return this.ws && this.ws.readyState === this.ws.CONNECTING || !this.authenticated;
+    private isConnectingWsState(): boolean {
+        return this.ws && this.ws.readyState === this.ws.CONNECTING;
     }
 
-    private isReadyToSendWsState(): boolean {
-        return this.ws && this.ws.readyState === this.ws.OPEN && this.authenticated;
+    private isOpenWsState(): boolean {
+        return this.ws && this.ws.readyState === this.ws.OPEN;
     }
 }

package/src/state-tracker/MessagesManager.ts

@@ -1,6 +1,5 @@
 import {ChatStateTracker} from "./ChatStateTracker";
 import {
-    ChatLocation,
     NewMessage,
     FollowedTopic,
     TopicFollowed,

package/src/state-tracker/TopicHistoryWindow.ts

@@ -222,7 +222,6 @@ export class TopicHistoryWindow extends TraversableRemoteCollection<Message> {
         this.internalState.traverseLock = false;
 
         if (bindEvents) {
-            this.tracker.client.on('Session', ev => this.handleSession(ev));
             this.tracker.client.on('NewMessage', ev => this.handleNewMessage(ev));
         }
     }
@@ -291,16 +290,6 @@ export class TopicHistoryWindow extends TraversableRemoteCollection<Message> {
         }
     }
 
-    private handleSession(ev: Session): void {
-        const rooms = ev.state.rooms;
-
-        if (rooms.find(room => room.id === this.roomId)) {
-            void this.resetToLatest();
-        } else {
-            this.deleteAll();
-        }
-    }
-
     protected async fetchItemsAfter(): Promise<Message[] | null> {
         const afterId = this.getAt(this.length - 1)?.id;