@onyx-p/imlib-web 1.8.7 → 1.8.9

package/index.esm.js

@@ -28414,6 +28414,72 @@ class MessageCache {
       }
     });
   }
+  updateMessageReceiptStatus(event, type) {
+    if (!event || !event.messageUIdList || event.messageUIdList.length === 0) {
+      return;
+    }
+    const {
+      conversation
+    } = event;
+    const dialogId = getFullDialogId(conversation);
+    const cachedMessages = this.messageCache.get(dialogId);
+    if (!cachedMessages || cachedMessages.length === 0) {
+      return;
+    }
+    const messageUIdSet = new Set(event.messageUIdList);
+    let updated = false;
+    for (let i = 0; i < cachedMessages.length; i++) {
+      const message = cachedMessages[i];
+      if (messageUIdSet.has(message.messageUId)) {
+        if (type === 0) {
+          if (message.receivedStatus < ReceivedStatus.RECEIVED) {
+            message.receivedStatus = ReceivedStatus.RECEIVED;
+            updated = true;
+          }
+        } else {
+          if (message.receivedStatus < ReceivedStatus.READ) {
+            message.receivedStatus = ReceivedStatus.READ;
+            updated = true;
+          }
+        }
+      }
+    }
+    if (updated) {
+      this.messageCache.set(dialogId, cachedMessages);
+    }
+  }
+  clearBurnAfterReadingExpiredMessages(conversation) {
+    const dialogId = getFullDialogId(conversation);
+    const cachedMessages = this.messageCache.get(dialogId);
+    if (!cachedMessages || cachedMessages.length === 0) {
+      return [];
+    }
+    const currentTime = Date.now();
+    const expiredMessageUIds = [];
+    const remainingMessages = cachedMessages.filter(message => {
+      if (!message.burnAfterReadingFlag) {
+        return true;
+      }
+      const burnTime = message.burnAfterReadingTime || 0;
+      if (burnTime === 0) {
+        expiredMessageUIds.push(message.messageUId);
+        return false;
+      }
+      const sentTimeLong = Long.fromString(message.sentTime);
+      const currentTimeLong = Long.fromNumber(currentTime);
+      const burnTimeLong = Long.fromNumber(burnTime);
+      const expirationTime = sentTimeLong.add(burnTimeLong);
+      if (currentTimeLong.greaterThan(expirationTime)) {
+        expiredMessageUIds.push(message.messageUId);
+        return false;
+      }
+      return true;
+    });
+    if (remainingMessages.length < cachedMessages.length) {
+      this.messageCache.set(dialogId, remainingMessages);
+    }
+    return expiredMessageUIds;
+  }
 }
 
 class IMClient extends EventEmitter {
@@ -28489,6 +28555,7 @@ class IMClient extends EventEmitter {
         });
       },
       onReceiptReceived: (event, type) => {
+        MessageCache.get().updateMessageReceiptStatus(event, type);
         if (type === 0) {
           this.emit(Events.ARRIVAL_RECEIPT_RECEIVED, event);
         } else {
@@ -28561,8 +28628,8 @@ class IMClient extends EventEmitter {
     });
   }
   async getPreviousHistoryMessages(conversation, timestamp, count = 20) {
-    const cachedMessages = MessageCache.get().getPreviousMessages(conversation, timestamp, count);
-    if (!timestamp) {
+    const cachedMessages = MessageCache.get().getPreviousMessages(conversation, timestamp ?? "0", count);
+    if (!timestamp && cachedMessages.length) {
       ConversationManager$1.get().refreshLatestMessage(conversation, cachedMessages[cachedMessages.length - 1]);
     }
     if (cachedMessages.length >= count) {
@@ -28780,6 +28847,9 @@ class IMClient extends EventEmitter {
     }
     return conversationObj;
   }
+  clearBurnAfterReadingExpiredMessages(conversation) {
+    return MessageCache.get().clearBurnAfterReadingExpiredMessages(conversation);
+  }
 }
 
 /*eslint-disable block-scoped-var, id-length, no-control-regex, no-magic-numbers, no-prototype-builtins, no-redeclare, no-shadow, no-var, sort-vars*/
@@ -29973,7 +30043,6 @@ const getHistoryMessages = async (conversation, options) => {
   return response;
 };
 const getRemoteHistoryMessages = async (conversation, options) => {
-  assert('options.timestamp', options.timestamp ?? 0, AssertRules.NUMBER);
   assert('options.count', options.count ?? 0, AssertRules.NUMBER);
   assert('options.order', options.order ?? 0, value => {
     return value === 0 || value === 1;
@@ -29981,8 +30050,11 @@ const getRemoteHistoryMessages = async (conversation, options) => {
   assert('conversation', conversation, AssertRules.CONVERSATION, true);
   const paramsStr = 'conversationType:' + conversation.conversationType + ',targetId:' + conversation.targetId;
   logger.debug('get remote history message ->' + paramsStr);
+  if (isDef(options.timestamp)) {
+    options.timestamp = options.timestamp.toString();
+  }
   let response;
-  if (options.order === 0) {
+  if (!options.order) {
     response = await imClient.getPreviousHistoryMessages(conversation, options.timestamp, options.count);
   } else {
     response = await imClient.getRemoteHistoryMessages(conversation, options);
@@ -30063,5 +30135,18 @@ const _logSendError = (conversation, errorCode) => {
     logger.warn('send message fail ->' + errorCode + ':' + ErrorDesc(errorCode) + ',' + paramsStr);
   }
 };
+const clearBurnAfterReadingExpiredMessages = conversation => {
+  assert('conversation', conversation, AssertRules.CONVERSATION, true);
+  const paramsStr = 'conversationType:' + conversation.conversationType + ',targetId:' + conversation.targetId;
+  logger.debug('clear burn after reading expired messages ->' + paramsStr);
+  const expiredMessageUIds = imClient.clearBurnAfterReadingExpiredMessages(conversation);
+  if (expiredMessageUIds.length > 0) {
+    logger.debug(`已清除会话 ${paramsStr} 中的 ${expiredMessageUIds.length} 条阅后即焚过期消息`);
+  }
+  return Promise.resolve({
+    code: ErrorCode.SUCCESS,
+    data: expiredMessageUIds
+  });
+};
 
-export { ChatRecordMessage, ConnectionStatus, ContactMessage, ConversationType, ErrorCode, ErrorDesc, Events, FileMessage, GIFMessage, GroupCloseBurnAfterReadingMessage, GroupOpenBurnAfterReadingMessage, VoiceMessage as HQVoiceMessage, ImageMessage, InvitationMessage, LocationMessage, LogLevel, MentionedType, MessageDirection, MessageTypes, NotiMessageTypes, NotificationLevel, NotificationStatus, PrivateCloseBurnAfterReadingMessage, PrivateOpenBurnAfterReadingMessage, RecallCommandMessage, ReceivedStatus, RedEnvelopeMessage, SentStatus, TextMessage, TransferMessage, VideoMessage, addEventListener, clearAllMessagesUnreadStatus, clearHistoryMessages, clearMessagesUnreadStatus, clearTextMessageDraft, connect, deleteMessages, disconnect, getAllConversationState, getAllUnreadMentionedCount, getBlockedConversationList, getConnectionStatus, getConversation, getConversationList, getConversationNotificationLevel, getConversationNotificationStatus, getConversationState, getHistoryMessages, getRemoteHistoryMessages, getServerTime, getTextMessageDraft, getTopConversationList, getTotalUnreadCount, getUnreadCount, getUnreadMentionedCount, init, logOut, mockLogin, onceEventListener, parseChatRecordMsgDetails, recallMessage, registerMessageType, removeConversation, removeEventListener, request, saveTextMessageDraft, sendFileMessage, sendGIFMessage, sendHQVoiceMessage, sendImageMessage, sendMessage, sendReadReceipts, sendSightMessage, sendTextMessage, setConversationNotificationStatus, setConversationToTop, setUserLogged };
+export { ChatRecordMessage, ConnectionStatus, ContactMessage, ConversationType, ErrorCode, ErrorDesc, Events, FileMessage, GIFMessage, GroupCloseBurnAfterReadingMessage, GroupOpenBurnAfterReadingMessage, VoiceMessage as HQVoiceMessage, ImageMessage, InvitationMessage, LocationMessage, LogLevel, MentionedType, MessageDirection, MessageTypes, NotiMessageTypes, NotificationLevel, NotificationStatus, PrivateCloseBurnAfterReadingMessage, PrivateOpenBurnAfterReadingMessage, RecallCommandMessage, ReceivedStatus, RedEnvelopeMessage, SentStatus, TextMessage, TransferMessage, VideoMessage, addEventListener, clearAllMessagesUnreadStatus, clearBurnAfterReadingExpiredMessages, clearHistoryMessages, clearMessagesUnreadStatus, clearTextMessageDraft, connect, deleteMessages, disconnect, getAllConversationState, getAllUnreadMentionedCount, getBlockedConversationList, getConnectionStatus, getConversation, getConversationList, getConversationNotificationLevel, getConversationNotificationStatus, getConversationState, getHistoryMessages, getRemoteHistoryMessages, getServerTime, getTextMessageDraft, getTopConversationList, getTotalUnreadCount, getUnreadCount, getUnreadMentionedCount, init, logOut, mockLogin, onceEventListener, parseChatRecordMsgDetails, recallMessage, registerMessageType, removeConversation, removeEventListener, request, saveTextMessageDraft, sendFileMessage, sendGIFMessage, sendHQVoiceMessage, sendImageMessage, sendMessage, sendReadReceipts, sendSightMessage, sendTextMessage, setConversationNotificationStatus, setConversationToTop, setUserLogged };

package/index.umd.js

@@ -28420,6 +28420,72 @@
         }
       });
     }
+    updateMessageReceiptStatus(event, type) {
+      if (!event || !event.messageUIdList || event.messageUIdList.length === 0) {
+        return;
+      }
+      const {
+        conversation
+      } = event;
+      const dialogId = getFullDialogId(conversation);
+      const cachedMessages = this.messageCache.get(dialogId);
+      if (!cachedMessages || cachedMessages.length === 0) {
+        return;
+      }
+      const messageUIdSet = new Set(event.messageUIdList);
+      let updated = false;
+      for (let i = 0; i < cachedMessages.length; i++) {
+        const message = cachedMessages[i];
+        if (messageUIdSet.has(message.messageUId)) {
+          if (type === 0) {
+            if (message.receivedStatus < exports.ReceivedStatus.RECEIVED) {
+              message.receivedStatus = exports.ReceivedStatus.RECEIVED;
+              updated = true;
+            }
+          } else {
+            if (message.receivedStatus < exports.ReceivedStatus.READ) {
+              message.receivedStatus = exports.ReceivedStatus.READ;
+              updated = true;
+            }
+          }
+        }
+      }
+      if (updated) {
+        this.messageCache.set(dialogId, cachedMessages);
+      }
+    }
+    clearBurnAfterReadingExpiredMessages(conversation) {
+      const dialogId = getFullDialogId(conversation);
+      const cachedMessages = this.messageCache.get(dialogId);
+      if (!cachedMessages || cachedMessages.length === 0) {
+        return [];
+      }
+      const currentTime = Date.now();
+      const expiredMessageUIds = [];
+      const remainingMessages = cachedMessages.filter(message => {
+        if (!message.burnAfterReadingFlag) {
+          return true;
+        }
+        const burnTime = message.burnAfterReadingTime || 0;
+        if (burnTime === 0) {
+          expiredMessageUIds.push(message.messageUId);
+          return false;
+        }
+        const sentTimeLong = Long.fromString(message.sentTime);
+        const currentTimeLong = Long.fromNumber(currentTime);
+        const burnTimeLong = Long.fromNumber(burnTime);
+        const expirationTime = sentTimeLong.add(burnTimeLong);
+        if (currentTimeLong.greaterThan(expirationTime)) {
+          expiredMessageUIds.push(message.messageUId);
+          return false;
+        }
+        return true;
+      });
+      if (remainingMessages.length < cachedMessages.length) {
+        this.messageCache.set(dialogId, remainingMessages);
+      }
+      return expiredMessageUIds;
+    }
   }
 
   class IMClient extends EventEmitter {
@@ -28495,6 +28561,7 @@
           });
         },
         onReceiptReceived: (event, type) => {
+          MessageCache.get().updateMessageReceiptStatus(event, type);
           if (type === 0) {
             this.emit(exports.Events.ARRIVAL_RECEIPT_RECEIVED, event);
           } else {
@@ -28567,8 +28634,8 @@
       });
     }
     async getPreviousHistoryMessages(conversation, timestamp, count = 20) {
-      const cachedMessages = MessageCache.get().getPreviousMessages(conversation, timestamp, count);
-      if (!timestamp) {
+      const cachedMessages = MessageCache.get().getPreviousMessages(conversation, timestamp ?? "0", count);
+      if (!timestamp && cachedMessages.length) {
         ConversationManager$1.get().refreshLatestMessage(conversation, cachedMessages[cachedMessages.length - 1]);
       }
       if (cachedMessages.length >= count) {
@@ -28786,6 +28853,9 @@
       }
       return conversationObj;
     }
+    clearBurnAfterReadingExpiredMessages(conversation) {
+      return MessageCache.get().clearBurnAfterReadingExpiredMessages(conversation);
+    }
   }
 
   /*eslint-disable block-scoped-var, id-length, no-control-regex, no-magic-numbers, no-prototype-builtins, no-redeclare, no-shadow, no-var, sort-vars*/
@@ -29979,7 +30049,6 @@
     return response;
   };
   const getRemoteHistoryMessages = async (conversation, options) => {
-    assert('options.timestamp', options.timestamp ?? 0, AssertRules.NUMBER);
     assert('options.count', options.count ?? 0, AssertRules.NUMBER);
     assert('options.order', options.order ?? 0, value => {
       return value === 0 || value === 1;
@@ -29987,8 +30056,11 @@
     assert('conversation', conversation, AssertRules.CONVERSATION, true);
     const paramsStr = 'conversationType:' + conversation.conversationType + ',targetId:' + conversation.targetId;
     logger.debug('get remote history message ->' + paramsStr);
+    if (isDef(options.timestamp)) {
+      options.timestamp = options.timestamp.toString();
+    }
     let response;
-    if (options.order === 0) {
+    if (!options.order) {
       response = await imClient.getPreviousHistoryMessages(conversation, options.timestamp, options.count);
     } else {
       response = await imClient.getRemoteHistoryMessages(conversation, options);
@@ -30069,6 +30141,19 @@
       logger.warn('send message fail ->' + errorCode + ':' + ErrorDesc(errorCode) + ',' + paramsStr);
     }
   };
+  const clearBurnAfterReadingExpiredMessages = conversation => {
+    assert('conversation', conversation, AssertRules.CONVERSATION, true);
+    const paramsStr = 'conversationType:' + conversation.conversationType + ',targetId:' + conversation.targetId;
+    logger.debug('clear burn after reading expired messages ->' + paramsStr);
+    const expiredMessageUIds = imClient.clearBurnAfterReadingExpiredMessages(conversation);
+    if (expiredMessageUIds.length > 0) {
+      logger.debug(`已清除会话 ${paramsStr} 中的 ${expiredMessageUIds.length} 条阅后即焚过期消息`);
+    }
+    return Promise.resolve({
+      code: exports.ErrorCode.SUCCESS,
+      data: expiredMessageUIds
+    });
+  };
 
   exports.ChatRecordMessage = ChatRecordMessage;
   exports.ContactMessage = ContactMessage;
@@ -30092,6 +30177,7 @@
   exports.VideoMessage = VideoMessage;
   exports.addEventListener = addEventListener;
   exports.clearAllMessagesUnreadStatus = clearAllMessagesUnreadStatus;
+  exports.clearBurnAfterReadingExpiredMessages = clearBurnAfterReadingExpiredMessages;
   exports.clearHistoryMessages = clearHistoryMessages;
   exports.clearMessagesUnreadStatus = clearMessagesUnreadStatus;
   exports.clearTextMessageDraft = clearTextMessageDraft;

package/package.json

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

package/types/index.d.ts

@@ -239,3 +239,9 @@ export declare const mockLogin: (config: {
     phone: string;
     password: string;
 }) => CommonReqResult<import("./net/pbs/rpc.login").AuthSignIn2Resp>;
+/**
+ * 清除指定会话中阅后即焚过期的消息
+ * @param conversation 会话信息
+ * @returns 被清除的消息ID列表
+ */
+export declare const clearBurnAfterReadingExpiredMessages: (conversation: IConversationOption) => IPromiseResult<string[]>;