@onyx-p/imlib-web 2.2.0 → 2.2.2

package/index.esm.js

@@ -21697,6 +21697,7 @@ class LibLoader {
         code: ErrorCode.BIZ_ERROR_CONNECTING
       };
     }
+    webSocketServer.close();
     const code = await webSocketServer.connect();
     this.isInternalConnected = true;
     return {
@@ -21789,6 +21790,9 @@ class LibLoader {
   }
   handleUserConnected() {
     logger.info('user connected -> ', accountStore.uid.toString());
+    if (!this.messageLoader) {
+      this.messageLoader = new MessageLoader(this.watcher, this.options);
+    }
     this.messageLoader?.start();
     setTimeout(() => {
       if (this.connectionStatus !== ConnectionStatus.CONNECTED) return;
@@ -29162,8 +29166,10 @@ class IMClient extends EventEmitter {
     return this.libLoader.disconnect();
   }
   setUserLogged(info) {
-    accountStore.setLogged(info);
-    this.libLoader.setUserLogged();
+    if (info.uid !== accountStore.uid.toString()) {
+      accountStore.setLogged(info);
+      this.libLoader.setUserLogged();
+    }
   }
   logOut() {
     accountStore.logOut();
@@ -29224,6 +29230,7 @@ class IMClient extends EventEmitter {
     });
   }
   async getPreviousHistoryMessages(conversation, timestamp, count = 20) {
+    debugger;
     const cachedResult = await MessageCache$1.get().getPreviousMessages(conversation, timestamp ?? '0', count);
     if (!timestamp && cachedResult.messages.length) {
       ConversationManager$1.get().updateLatestMessage(conversation, cachedResult.messages[cachedResult.messages.length - 1]);
@@ -29247,7 +29254,8 @@ class IMClient extends EventEmitter {
       return remotesResult;
     }
     const remotesMessages = remotesResult.data.list;
-    if (!remotesTimestamp) {
+    if (!remotesTimestamp || remotesTimestamp == '0') {
+      debugger;
       ConversationManager$1.get().updateLatestMessage(conversation, remotesMessages[remotesMessages.length - 1]);
     }
     MessageCache$1.get().addMessages(remotesMessages, conversation, !remotesResult.data.hasMore);
@@ -29294,6 +29302,7 @@ class IMClient extends EventEmitter {
     }
     const dialogIdList = data.fullDialog.map(item => item.dialog?.destId).filter(isDef);
     await DialogSecretKey$1.getDialogAesKeyList(dialogIdList.map(e => e.toString()));
+    let time = 10000;
     const contentList = [];
     for (const dialogInfo of data.fullDialog) {
       const conversationObj = this.formatConversation(dialogInfo);
@@ -29306,9 +29315,10 @@ class IMClient extends EventEmitter {
       };
       const serverLatestMessage = conversationObj.latestMessage;
       conversationObj.latestMessage = await MessageCache$1.get()?.getLatestMessage(conOpt);
-      ConversationManager$1.get().addLocalConversation(conversationObj);
       const localConversation = ConversationManager$1.get().get(conOpt);
-      Object.assign(conversationObj, localConversation);
+      if (!localConversation) {
+        Object.assign(conversationObj, localConversation);
+      }
       if (isDef(conversationObj.latestMessage) && !conversationObj.updateTime) {
         conversationObj.updateTime = parseInt(conversationObj.latestMessage.sentTime);
       }
@@ -29316,9 +29326,11 @@ class IMClient extends EventEmitter {
         if (serverLatestMessage) {
           conversationObj.updateTime = parseInt(serverLatestMessage.sentTime);
         } else {
-          conversationObj.updateTime = 10000;
+          conversationObj.updateTime = time;
+          time++;
         }
       }
+      ConversationManager$1.get().addLocalConversation(conversationObj);
       contentList.push(conversationObj);
     }
     contentList.sort((a, b) => {

package/index.umd.js

@@ -21703,6 +21703,7 @@
           code: exports.ErrorCode.BIZ_ERROR_CONNECTING
         };
       }
+      webSocketServer.close();
       const code = await webSocketServer.connect();
       this.isInternalConnected = true;
       return {
@@ -21795,6 +21796,9 @@
     }
     handleUserConnected() {
       logger.info('user connected -> ', accountStore.uid.toString());
+      if (!this.messageLoader) {
+        this.messageLoader = new MessageLoader(this.watcher, this.options);
+      }
       this.messageLoader?.start();
       setTimeout(() => {
         if (this.connectionStatus !== exports.ConnectionStatus.CONNECTED) return;
@@ -29168,8 +29172,10 @@
       return this.libLoader.disconnect();
     }
     setUserLogged(info) {
-      accountStore.setLogged(info);
-      this.libLoader.setUserLogged();
+      if (info.uid !== accountStore.uid.toString()) {
+        accountStore.setLogged(info);
+        this.libLoader.setUserLogged();
+      }
     }
     logOut() {
       accountStore.logOut();
@@ -29230,6 +29236,7 @@
       });
     }
     async getPreviousHistoryMessages(conversation, timestamp, count = 20) {
+      debugger;
       const cachedResult = await MessageCache$1.get().getPreviousMessages(conversation, timestamp ?? '0', count);
       if (!timestamp && cachedResult.messages.length) {
         ConversationManager$1.get().updateLatestMessage(conversation, cachedResult.messages[cachedResult.messages.length - 1]);
@@ -29253,7 +29260,8 @@
         return remotesResult;
       }
       const remotesMessages = remotesResult.data.list;
-      if (!remotesTimestamp) {
+      if (!remotesTimestamp || remotesTimestamp == '0') {
+        debugger;
         ConversationManager$1.get().updateLatestMessage(conversation, remotesMessages[remotesMessages.length - 1]);
       }
       MessageCache$1.get().addMessages(remotesMessages, conversation, !remotesResult.data.hasMore);
@@ -29300,6 +29308,7 @@
       }
       const dialogIdList = data.fullDialog.map(item => item.dialog?.destId).filter(isDef);
       await DialogSecretKey$1.getDialogAesKeyList(dialogIdList.map(e => e.toString()));
+      let time = 10000;
       const contentList = [];
       for (const dialogInfo of data.fullDialog) {
         const conversationObj = this.formatConversation(dialogInfo);
@@ -29312,9 +29321,10 @@
         };
         const serverLatestMessage = conversationObj.latestMessage;
         conversationObj.latestMessage = await MessageCache$1.get()?.getLatestMessage(conOpt);
-        ConversationManager$1.get().addLocalConversation(conversationObj);
         const localConversation = ConversationManager$1.get().get(conOpt);
-        Object.assign(conversationObj, localConversation);
+        if (!localConversation) {
+          Object.assign(conversationObj, localConversation);
+        }
         if (isDef(conversationObj.latestMessage) && !conversationObj.updateTime) {
           conversationObj.updateTime = parseInt(conversationObj.latestMessage.sentTime);
         }
@@ -29322,9 +29332,11 @@
           if (serverLatestMessage) {
             conversationObj.updateTime = parseInt(serverLatestMessage.sentTime);
           } else {
-            conversationObj.updateTime = 10000;
+            conversationObj.updateTime = time;
+            time++;
           }
         }
+        ConversationManager$1.get().addLocalConversation(conversationObj);
         contentList.push(conversationObj);
       }
       contentList.sort((a, b) => {

package/package.json

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