polfan-server-js-client 0.2.51 → 0.2.53

package/.idea/workspace.xml

@@ -4,10 +4,10 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="831dae43-0da1-47fd-a5f7-33dd5eec2992" name="Changes" comment="Ephemeral room history support">
-      <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/types" beforeDir="false" afterPath="$PROJECT_DIR$/src/types" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/types/src/schemes/events/Session.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/types/src/schemes/events/Session.ts" afterDir="false" />
+    <list default="true" id="831dae43-0da1-47fd-a5f7-33dd5eec2992" name="Changes" comment="Update room on recipient user change">
+      <change beforePath="$PROJECT_DIR$/build/types/types/src/schemes/events/Session.d.ts" beforeDir="false" afterPath="$PROJECT_DIR$/build/types/types/src/schemes/events/Session.d.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/AbstractChatClient.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/AbstractChatClient.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/WebSocketChatClient.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/WebSocketChatClient.ts" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -131,23 +131,13 @@
       <workItem from="1755452202060" duration="1749000" />
       <workItem from="1755600989345" duration="1221000" />
       <workItem from="1755609872522" duration="1114000" />
-      <workItem from="1756051973155" duration="643000" />
-    </task>
-    <task id="LOCAL-00009" summary="Emoticons support">
-      <option name="closed" value="true" />
-      <created>1738005832363</created>
-      <option name="number" value="00009" />
-      <option name="presentableId" value="LOCAL-00009" />
-      <option name="project" value="LOCAL" />
-      <updated>1738005832363</updated>
-    </task>
-    <task id="LOCAL-00010" summary="Emoticon permissions support">
-      <option name="closed" value="true" />
-      <created>1738413231680</created>
-      <option name="number" value="00010" />
-      <option name="presentableId" value="LOCAL-00010" />
-      <option name="project" value="LOCAL" />
-      <updated>1738413231680</updated>
+      <workItem from="1756051973155" duration="2903000" />
+      <workItem from="1756461761500" duration="6231000" />
+      <workItem from="1756802984919" duration="1908000" />
+      <workItem from="1757108361675" duration="5000" />
+      <workItem from="1759771277022" duration="584000" />
+      <workItem from="1759848250548" duration="413000" />
+      <workItem from="1761857165939" duration="2585000" />
     </task>
     <task id="LOCAL-00011" summary="Emoticon permissions support">
       <option name="closed" value="true" />
@@ -525,7 +515,23 @@
       <option name="project" value="LOCAL" />
       <updated>1756051989192</updated>
     </task>
-    <option name="localTasksCounter" value="58" />
+    <task id="LOCAL-00058" summary="Protocol version support">
+      <option name="closed" value="true" />
+      <created>1756053336494</created>
+      <option name="number" value="00058" />
+      <option name="presentableId" value="LOCAL-00058" />
+      <option name="project" value="LOCAL" />
+      <updated>1756053336494</updated>
+    </task>
+    <task id="LOCAL-00059" summary="Update room on recipient user change">
+      <option name="closed" value="true" />
+      <created>1756804976724</created>
+      <option name="number" value="00059" />
+      <option name="presentableId" value="LOCAL-00059" />
+      <option name="project" value="LOCAL" />
+      <updated>1756804976724</updated>
+    </task>
+    <option name="localTasksCounter" value="60" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -543,8 +549,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="Client data and room stream support" />
-    <MESSAGE value="New collections mutationCounter property and map method remove" />
     <MESSAGE value="Private rooms and space summaries" />
     <MESSAGE value="Custom nicks support" />
     <MESSAGE value="CustomNickChange message type" />
@@ -568,6 +572,8 @@
     <MESSAGE value="Version bump" />
     <MESSAGE value="RoomSummaryUpdated event support" />
     <MESSAGE value="Ephemeral room history support" />
-    <option name="LAST_COMMIT_MESSAGE" value="Ephemeral room history support" />
+    <MESSAGE value="Protocol version support" />
+    <MESSAGE value="Update room on recipient user change" />
+    <option name="LAST_COMMIT_MESSAGE" value="Update room on recipient user change" />
   </component>
 </project>

package/build/index.cjs.js

@@ -135,7 +135,7 @@ 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);
   }
 }
@@ -1099,6 +1099,8 @@ class RoomsManager {
     const member = members.get(ev.userId);
     const newMember = ev.member;
     const user = member.spaceMember?.user ?? member.user;
+
+    // Preserving user object, because it's not included in event
     if (newMember.spaceMember) {
       newMember.spaceMember.user = user;
     } else {
@@ -1201,6 +1203,7 @@ class RoomsManager {
     this.deferredSession.resolve();
   }
   handleUserUpdated(ev) {
+    // Update room members users
     this.members.items.forEach(members => {
       const member = members.get(ev.user.id);
       if (!member) {
@@ -1217,6 +1220,18 @@ class RoomsManager {
       }
       members.set(newMember);
     });
+
+    // Update recipients users
+    const newRooms = [];
+    this.list.items.forEach(room => {
+      if (room.recipients?.some(user => user.id === ev.user.id)) {
+        room.recipients = room.recipients.map(user => user.id === ev.user.id ? ev.user : user);
+        newRooms.push({
+          ...room
+        });
+      }
+    });
+    this.list.set(...newRooms);
   }
   handleNewMessage(ev) {
     const topics = this.topics.get(ev.message.location.roomId);
@@ -2130,23 +2145,21 @@ class WebSocketChatClient extends AbstractChatClient {
     this.ws = null;
   }
   async send(commandType, commandData) {
-    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(commandType, commandData);
     const promise = this.createPromiseFromCommandEnvelope(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;
   }
   sendEnvelope(envelope) {
-    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}`));
   }
   onMessage(event) {
     const envelope = JSON.parse(event.data);
@@ -2171,7 +2184,7 @@ class WebSocketChatClient extends AbstractChatClient {
     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);
   }
@@ -2190,6 +2203,12 @@ class WebSocketChatClient extends AbstractChatClient {
     this.disconnect();
     this.emit(this.Event.error, new Error('Connection timeout'));
   }
+  isPendingReadyWsState() {
+    return this.ws.readyState === this.ws.CONNECTING || !this.authenticated;
+  }
+  isReadyToSendWsState() {
+    return this.ws?.readyState === this.ws.OPEN && this.authenticated;
+  }
 }
 ;// CONCATENATED MODULE: ./src/WebApiChatClient.ts
 function WebApiChatClient_defineProperty(obj, key, value) { key = WebApiChatClient_toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }