@onyx-p/imlib-web 2.1.9 → 2.2.1

package/index.esm.js

@@ -21788,6 +21788,7 @@ class LibLoader {
     this.watcher.onSuspend?.();
   }
   handleUserConnected() {
+    logger.info('user connected -> ', accountStore.uid.toString());
     this.messageLoader?.start();
     setTimeout(() => {
       if (this.connectionStatus !== ConnectionStatus.CONNECTED) return;
@@ -29223,6 +29224,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]);
@@ -29246,7 +29248,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);
@@ -29293,6 +29296,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);
@@ -29305,9 +29309,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);
       }
@@ -29315,9 +29320,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

@@ -21794,6 +21794,7 @@
       this.watcher.onSuspend?.();
     }
     handleUserConnected() {
+      logger.info('user connected -> ', accountStore.uid.toString());
       this.messageLoader?.start();
       setTimeout(() => {
         if (this.connectionStatus !== exports.ConnectionStatus.CONNECTED) return;
@@ -29229,6 +29230,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]);
@@ -29252,7 +29254,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);
@@ -29299,6 +29302,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);
@@ -29311,9 +29315,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);
         }
@@ -29321,9 +29326,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.1.9",
+  "version": "2.2.1",
   "main": "index.umd.js",
   "module": "index.esm.js",
   "types": "types/index.d.ts",