@onyx-p/imlib-web 1.5.5 → 1.5.7

package/index.esm.js

@@ -13305,6 +13305,7 @@ class WebSocketServer {
   failedCount = 0;
   reconnectTimer;
   connectResolve;
+  pendingMessages = [];
   constructor(options) {
     this.options = Object.assign(DefaultOptions, options);
   }
@@ -13383,21 +13384,15 @@ class WebSocketServer {
       };
     }
     const messageSeq = this.generateMessageSeq();
-    const networkReq = {
-      cmdId: cmdId,
-      messageSeq: Long.fromNumber(messageSeq),
-      deviceId: Long.fromString(accountStore.user.deviceId),
-      sessionId: Long.fromString(accountStore.user.sessionId),
-      uid: Long.fromString(accountStore.user.uid),
-      protocolVersion: SOCKET_PROTOCOL_VER,
-      destId: '',
-      body: body,
-      deviceType: 7
-    };
-    if (cmdId !== CmdIds$1.Heartbean) {
-      logger.info(`websocket send -> cmd: 0x${cmdId.toString(16)}, messageSeq: ${messageSeq}`);
+    if (this.isConnected) {
+      this.doSendRawData(cmdId, body, messageSeq);
+    } else {
+      this.pendingMessages.push({
+        cmdId,
+        body,
+        messageSeq
+      });
     }
-    this.socket.send(buildWsPacketData(rpc_baseExports.NetworkRequest.encode(networkReq).finish()));
     const respData = await new Promise(resolve => {
       this.responseCallbacks.set(messageSeq, resolve);
       setTimeout(() => {
@@ -13418,6 +13413,23 @@ class WebSocketServer {
       data: respData
     };
   }
+  doSendRawData(cmdId, body, messageSeq) {
+    const networkReq = {
+      cmdId: cmdId,
+      messageSeq: Long.fromNumber(messageSeq),
+      deviceId: Long.fromString(accountStore.user.deviceId),
+      sessionId: Long.fromString(accountStore.user.sessionId),
+      uid: Long.fromString(accountStore.user.uid),
+      protocolVersion: SOCKET_PROTOCOL_VER,
+      destId: '',
+      body: body,
+      deviceType: 7
+    };
+    if (cmdId !== CmdIds$1.Heartbean) {
+      logger.info(`websocket send -> cmd: 0x${cmdId.toString(16)}, messageSeq: ${messageSeq}`);
+    }
+    this.socket?.send(buildWsPacketData(rpc_baseExports.NetworkRequest.encode(networkReq).finish()));
+  }
   close() {
     this.autoReconnect = false;
     this.doClose();
@@ -13540,6 +13552,14 @@ class WebSocketServer {
       clearTimeout(this.reconnectTimer);
       this.reconnectTimer = null;
     }
+    while (this.pendingMessages.length > 0) {
+      let {
+        cmdId,
+        body,
+        messageSeq
+      } = this.pendingMessages.shift();
+      this.doSendRawData(cmdId, body, messageSeq);
+    }
   }
   onDisconnect(error) {
     if (!isDef(this.socket)) {
@@ -13556,6 +13576,7 @@ class WebSocketServer {
   }
   doClose() {
     if (isDef(this.socket)) {
+      this.pendingMessages.length = 0;
       const socket = this.socket;
       this.socket = null;
       socket.onClose(null);
@@ -28611,16 +28632,7 @@ const getAllUnreadMentionedCount = () => {
 };
 const getConversationState = options => {
   logger.debug('getConversationState');
-  const state = imClient.getConversationState(options);
-  if (state) {
-    return Promise.resolve({
-      code: ErrorCode.SUCCESS,
-      data: state
-    });
-  }
-  return Promise.resolve({
-    code: ErrorCode.UNKNOWN
-  });
+  return imClient.getConversationState(options);
 };
 const getAllConversationState = () => {
   logger.debug('getAllConversationState');

package/index.umd.js

@@ -13311,6 +13311,7 @@
     failedCount = 0;
     reconnectTimer;
     connectResolve;
+    pendingMessages = [];
     constructor(options) {
       this.options = Object.assign(DefaultOptions, options);
     }
@@ -13389,21 +13390,15 @@
         };
       }
       const messageSeq = this.generateMessageSeq();
-      const networkReq = {
-        cmdId: cmdId,
-        messageSeq: Long.fromNumber(messageSeq),
-        deviceId: Long.fromString(accountStore.user.deviceId),
-        sessionId: Long.fromString(accountStore.user.sessionId),
-        uid: Long.fromString(accountStore.user.uid),
-        protocolVersion: SOCKET_PROTOCOL_VER,
-        destId: '',
-        body: body,
-        deviceType: 7
-      };
-      if (cmdId !== CmdIds$1.Heartbean) {
-        logger.info(`websocket send -> cmd: 0x${cmdId.toString(16)}, messageSeq: ${messageSeq}`);
+      if (this.isConnected) {
+        this.doSendRawData(cmdId, body, messageSeq);
+      } else {
+        this.pendingMessages.push({
+          cmdId,
+          body,
+          messageSeq
+        });
       }
-      this.socket.send(buildWsPacketData(rpc_baseExports.NetworkRequest.encode(networkReq).finish()));
       const respData = await new Promise(resolve => {
         this.responseCallbacks.set(messageSeq, resolve);
         setTimeout(() => {
@@ -13424,6 +13419,23 @@
         data: respData
       };
     }
+    doSendRawData(cmdId, body, messageSeq) {
+      const networkReq = {
+        cmdId: cmdId,
+        messageSeq: Long.fromNumber(messageSeq),
+        deviceId: Long.fromString(accountStore.user.deviceId),
+        sessionId: Long.fromString(accountStore.user.sessionId),
+        uid: Long.fromString(accountStore.user.uid),
+        protocolVersion: SOCKET_PROTOCOL_VER,
+        destId: '',
+        body: body,
+        deviceType: 7
+      };
+      if (cmdId !== CmdIds$1.Heartbean) {
+        logger.info(`websocket send -> cmd: 0x${cmdId.toString(16)}, messageSeq: ${messageSeq}`);
+      }
+      this.socket?.send(buildWsPacketData(rpc_baseExports.NetworkRequest.encode(networkReq).finish()));
+    }
     close() {
       this.autoReconnect = false;
       this.doClose();
@@ -13546,6 +13558,14 @@
         clearTimeout(this.reconnectTimer);
         this.reconnectTimer = null;
       }
+      while (this.pendingMessages.length > 0) {
+        let {
+          cmdId,
+          body,
+          messageSeq
+        } = this.pendingMessages.shift();
+        this.doSendRawData(cmdId, body, messageSeq);
+      }
     }
     onDisconnect(error) {
       if (!isDef(this.socket)) {
@@ -13562,6 +13582,7 @@
     }
     doClose() {
       if (isDef(this.socket)) {
+        this.pendingMessages.length = 0;
         const socket = this.socket;
         this.socket = null;
         socket.onClose(null);
@@ -28617,16 +28638,7 @@
   };
   const getConversationState = options => {
     logger.debug('getConversationState');
-    const state = imClient.getConversationState(options);
-    if (state) {
-      return Promise.resolve({
-        code: exports.ErrorCode.SUCCESS,
-        data: state
-      });
-    }
-    return Promise.resolve({
-      code: exports.ErrorCode.UNKNOWN
-    });
+    return imClient.getConversationState(options);
   };
   const getAllConversationState = () => {
     logger.debug('getAllConversationState');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onyx-p/imlib-web",
-  "version": "1.5.5",
+  "version": "1.5.7",
   "main": "index.umd.js",
   "module": "index.esm.js",
   "types": "types/index.d.ts",

package/types/index.d.ts

@@ -101,7 +101,7 @@ export declare const getAllUnreadMentionedCount: () => IPromiseResult<number>;
 /**
  * 获取本地单个会话的状态
  */
-export declare const getConversationState: (options: IConversationOption) => IPromiseResult<IConversationState>;
+export declare const getConversationState: (options: IConversationOption) => IConversationState | null;
 /**
  * 获取本地全部会话的状态
  * @description