@onyx-p/imlib-web 1.5.6 → 1.5.8

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();
@@ -13533,13 +13545,22 @@ class WebSocketServer {
       this.connect();
     }, 5000);
   }
-  onConnect() {
+  async onConnect() {
     this.setStatus(ConnectionStatus.CONNECTED);
     this.checkAlive();
     if (isDef(this.reconnectTimer)) {
       clearTimeout(this.reconnectTimer);
       this.reconnectTimer = null;
     }
+    while (this.pendingMessages.length > 0) {
+      let {
+        cmdId,
+        body,
+        messageSeq
+      } = this.pendingMessages.shift();
+      this.doSendRawData(cmdId, body, messageSeq);
+      await new Promise(resolve => setTimeout(resolve, 200));
+    }
   }
   onDisconnect(error) {
     if (!isDef(this.socket)) {
@@ -13556,6 +13577,7 @@ class WebSocketServer {
   }
   doClose() {
     if (isDef(this.socket)) {
+      this.pendingMessages.length = 0;
       const socket = this.socket;
       this.socket = null;
       socket.onClose(null);

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();
@@ -13539,13 +13551,22 @@
         this.connect();
       }, 5000);
     }
-    onConnect() {
+    async onConnect() {
       this.setStatus(exports.ConnectionStatus.CONNECTED);
       this.checkAlive();
       if (isDef(this.reconnectTimer)) {
         clearTimeout(this.reconnectTimer);
         this.reconnectTimer = null;
       }
+      while (this.pendingMessages.length > 0) {
+        let {
+          cmdId,
+          body,
+          messageSeq
+        } = this.pendingMessages.shift();
+        this.doSendRawData(cmdId, body, messageSeq);
+        await new Promise(resolve => setTimeout(resolve, 200));
+      }
     }
     onDisconnect(error) {
       if (!isDef(this.socket)) {
@@ -13562,6 +13583,7 @@
     }
     doClose() {
       if (isDef(this.socket)) {
+        this.pendingMessages.length = 0;
         const socket = this.socket;
         this.socket = null;
         socket.onClose(null);

package/package.json

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