@onyx-p/imlib-web 1.8.8 → 1.9.0

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 {
@@ -28575,7 +28642,7 @@ class IMClient extends EventEmitter {
       };
     }
     const remotesResult = await this.getRemoteHistoryMessages(conversation, {
-      timestamp: cachedMessages[0].sentTime ?? timestamp,
+      timestamp: cachedMessages[0]?.sentTime ?? timestamp,
       count: count - cachedMessages.length,
       order: 0
     });
@@ -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*/
@@ -29957,21 +30027,6 @@ const recallMessage = async (conversation, options) => {
   }
   return response;
 };
-const getHistoryMessages = async (conversation, options) => {
-  assert('options.timestamp', options.timestamp ?? '0', AssertRules.ONLY_STRING);
-  assert('options.count', options.count ?? 0, AssertRules.NUMBER);
-  assert('options.order', options.order ?? 0, value => {
-    return value === 0 || value === 1;
-  });
-  assert('conversation', conversation, AssertRules.CONVERSATION, true);
-  const paramsStr = 'conversationType:' + conversation.conversationType + ',targetId:' + conversation.targetId;
-  logger.debug('get  history message ->' + paramsStr);
-  const response = await imClient.getRemoteHistoryMessages(conversation, options);
-  if (response.code !== ErrorCode.SUCCESS) {
-    logger.warn('get history message fail ->' + response.code + ':' + ErrorDesc(response.code) + ',' + paramsStr);
-  }
-  return response;
-};
 const getRemoteHistoryMessages = async (conversation, options) => {
   assert('options.count', options.count ?? 0, AssertRules.NUMBER);
   assert('options.order', options.order ?? 0, value => {
@@ -30065,5 +30120,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, 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 {
@@ -28581,7 +28648,7 @@
         };
       }
       const remotesResult = await this.getRemoteHistoryMessages(conversation, {
-        timestamp: cachedMessages[0].sentTime ?? timestamp,
+        timestamp: cachedMessages[0]?.sentTime ?? timestamp,
         count: count - cachedMessages.length,
         order: 0
       });
@@ -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*/
@@ -29963,21 +30033,6 @@
     }
     return response;
   };
-  const getHistoryMessages = async (conversation, options) => {
-    assert('options.timestamp', options.timestamp ?? '0', AssertRules.ONLY_STRING);
-    assert('options.count', options.count ?? 0, AssertRules.NUMBER);
-    assert('options.order', options.order ?? 0, value => {
-      return value === 0 || value === 1;
-    });
-    assert('conversation', conversation, AssertRules.CONVERSATION, true);
-    const paramsStr = 'conversationType:' + conversation.conversationType + ',targetId:' + conversation.targetId;
-    logger.debug('get  history message ->' + paramsStr);
-    const response = await imClient.getRemoteHistoryMessages(conversation, options);
-    if (response.code !== exports.ErrorCode.SUCCESS) {
-      logger.warn('get history message fail ->' + response.code + ':' + ErrorDesc(response.code) + ',' + paramsStr);
-    }
-    return response;
-  };
   const getRemoteHistoryMessages = async (conversation, options) => {
     assert('options.count', options.count ?? 0, AssertRules.NUMBER);
     assert('options.order', options.order ?? 0, value => {
@@ -30071,6 +30126,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;
@@ -30094,6 +30162,7 @@
   exports.VideoMessage = VideoMessage;
   exports.addEventListener = addEventListener;
   exports.clearAllMessagesUnreadStatus = clearAllMessagesUnreadStatus;
+  exports.clearBurnAfterReadingExpiredMessages = clearBurnAfterReadingExpiredMessages;
   exports.clearHistoryMessages = clearHistoryMessages;
   exports.clearMessagesUnreadStatus = clearMessagesUnreadStatus;
   exports.clearTextMessageDraft = clearTextMessageDraft;
@@ -30109,7 +30178,6 @@
   exports.getConversationNotificationLevel = getConversationNotificationLevel;
   exports.getConversationNotificationStatus = getConversationNotificationStatus;
   exports.getConversationState = getConversationState;
-  exports.getHistoryMessages = getHistoryMessages;
   exports.getRemoteHistoryMessages = getRemoteHistoryMessages;
   exports.getServerTime = getServerTime;
   exports.getTextMessageDraft = getTextMessageDraft;

package/package.json

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

package/types/index.d.ts

@@ -209,10 +209,6 @@ export declare const sendSightMessage: (conversation: IConversationOption, msgBo
  * @param options
  */
 export declare const recallMessage: (conversation: IConversationOption, options: IRecallMessageOptions) => IPromiseResult<IReceivedMessage>;
-/**
- * 获取历史消息
- */
-export declare const getHistoryMessages: (conversation: IConversationOption, options: GetHistoryMessageOption) => IPromiseResult<GetHistoryMessageResult>;
 /**
  * 获取远程历史消息
  */
@@ -239,3 +235,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[]>;