@onyx-p/imlib-web 2.6.0 → 2.6.2

package/index.esm.js

@@ -22273,6 +22273,28 @@ class MessageCache {
       return null;
     }
   }
+  decryptMessage(message) {
+    const decryptedMessage = {
+      ...message
+    };
+    if (typeof decryptedMessage.content === 'string' && decryptedMessage.content) {
+      try {
+        decryptedMessage.content = this.decryptContent(decryptedMessage.content);
+      } catch (error) {
+        logger.error('解密消息内容失败', error);
+        decryptedMessage.content = null;
+      }
+    }
+    if (decryptedMessage.quotedReply && typeof decryptedMessage.quotedReply.content === 'string' && decryptedMessage.quotedReply.content) {
+      try {
+        decryptedMessage.quotedReply.content = this.decryptContent(decryptedMessage.quotedReply.content);
+      } catch (error) {
+        logger.error('解密引用消息内容失败', error);
+        decryptedMessage.quotedReply.content = null;
+      }
+    }
+    return decryptedMessage;
+  }
   async addMessages(messages, toConversation, isEnd = undefined) {
     const dialogId = getFullDialogId(toConversation);
     if (isDef(isEnd)) {
@@ -22339,25 +22361,7 @@ class MessageCache {
           const cursor = event.target.result;
           if (cursor) {
             if (processedCount < count) {
-              const message = {
-                ...cursor.value
-              };
-              if (typeof message.content === 'string' && message.content) {
-                try {
-                  message.content = this.decryptContent(message.content);
-                } catch (error) {
-                  logger.error('Failed to decrypt message content', error);
-                  message.content = null;
-                }
-              }
-              if (message.quotedReply && typeof message.quotedReply.content === 'string' && message.quotedReply.content) {
-                try {
-                  message.quotedReply.content = this.decryptContent(message.quotedReply.content);
-                } catch (error) {
-                  logger.error('Failed to decrypt reference message content', error);
-                  message.quotedReply.content = null;
-                }
-              }
+              const message = this.decryptMessage(cursor.value);
               messages.push(message);
               processedCount++;
               cursor.continue();
@@ -22566,17 +22570,7 @@ class MessageCache {
       cursorRequest.onsuccess = event => {
         const cursor = event.target.result;
         if (cursor) {
-          const message = {
-            ...cursor.value
-          };
-          if (typeof message.content === 'string' && message.content) {
-            try {
-              message.content = this.decryptContent(message.content);
-            } catch (error) {
-              logger.error('Failed to decrypt message content', error);
-              message.content = null;
-            }
-          }
+          const message = this.decryptMessage(cursor.value);
           resolve(message);
         } else {
           resolve(null);
@@ -22602,17 +22596,7 @@ class MessageCache {
       request.onsuccess = () => {
         const message = request.result;
         if (message) {
-          const decryptedMessage = {
-            ...message
-          };
-          if (typeof decryptedMessage.content === 'string' && decryptedMessage.content) {
-            try {
-              decryptedMessage.content = this.decryptContent(decryptedMessage.content);
-            } catch (error) {
-              logger.error('解密消息内容失败', error);
-              decryptedMessage.content = null;
-            }
-          }
+          const decryptedMessage = this.decryptMessage(message);
           resolve(decryptedMessage);
         } else {
           resolve(null);
@@ -22719,6 +22703,30 @@ class MessageCache {
       };
     });
   }
+  async getMessageByUId(messageUId) {
+    if (!this.db) {
+      return null;
+    }
+    return new Promise((resolve, reject) => {
+      const transaction = this.db.transaction(this.STORE_NAME, 'readonly');
+      const store = transaction.objectStore(this.STORE_NAME);
+      const index = store.index('messageUId');
+      const request = index.get(messageUId);
+      request.onsuccess = () => {
+        const message = request.result;
+        if (message) {
+          const decryptedMessage = this.decryptMessage(message);
+          resolve(decryptedMessage);
+        } else {
+          resolve(null);
+        }
+      };
+      request.onerror = event => {
+        logger.error('查询消息失败', event);
+        resolve(null);
+      };
+    });
+  }
 }
 let cache = null;
 var MessageCache$1 = {
@@ -30371,7 +30379,7 @@ const sendQuoteReplyMessage$1 = async (message, quoteReply, sendOptions) => {
       code: checkResult.code
     };
   }
-  let receivedMessage = transSentAttrs2IReceivedMessage(checkResult.message, checkResult.sentArgs);
+  const receivedMessage = transSentAttrs2IReceivedMessage(checkResult.message, checkResult.sentArgs);
   receivedMessage.quotedReply = quoteReply;
   await saveSentMessage(receivedMessage, checkResult.sentArgs);
   const dialogId = getFullDialogId(quoteReply);
@@ -30451,18 +30459,19 @@ const sendQuoteReplyMessage$1 = async (message, quoteReply, sendOptions) => {
     };
     response = await sendQuotePrivateChatMessage(privateParams);
   }
+  const finalMessage = deepClone(receivedMessage);
   if (response.code === ErrorCode.SUCCESS) {
-    receivedMessage.sentTime = response.data.msgSendTime.toString();
-    receivedMessage.messageUId = response.data.msgId.toString();
-    receivedMessage.sentStatus = SentStatus.SENT;
-    await saveSentMessage(receivedMessage, checkResult.sentArgs);
+    finalMessage.sentTime = response.data.msgSendTime.toString();
+    finalMessage.messageUId = response.data.msgId.toString();
+    finalMessage.sentStatus = SentStatus.SENT;
+    await saveSentMessage(finalMessage, checkResult.sentArgs);
   } else {
-    receivedMessage.sentStatus = SentStatus.FAILED;
-    await saveSentMessage(receivedMessage, checkResult.sentArgs);
+    finalMessage.sentStatus = SentStatus.FAILED;
+    await saveSentMessage(finalMessage, checkResult.sentArgs);
   }
   return {
     code: response.code,
-    data: receivedMessage
+    data: finalMessage
   };
 };
 async function internal_sendMessage(conversation, message, options, uploadOptions) {
@@ -31026,6 +31035,12 @@ class IMClient extends EventEmitter {
     }
     return removedMsgUids;
   }
+  async getMessageById(messageId) {
+    return MessageCache$1.get()?.getMessageById(messageId);
+  }
+  async getMessageByUId(messageUId) {
+    return MessageCache$1.get()?.getMessageByUId(messageUId);
+  }
 }
 
 /*eslint-disable block-scoped-var, id-length, no-control-regex, no-magic-numbers, no-prototype-builtins, no-redeclare, no-shadow, no-var, sort-vars*/
@@ -32300,5 +32315,19 @@ const clearBurnAfterReadingExpiredMessages = async conversation => {
 const sendQuoteReplyMessage = async (message, quoteReply, options) => {
   return await imClient.sendQuoteReplyMessage(message, quoteReply, options);
 };
+const getMessageById = async messageId => {
+  const message = await imClient.getMessageById(messageId);
+  return {
+    code: ErrorCode.SUCCESS,
+    data: message
+  };
+};
+const getMessageByUId = async messageUId => {
+  const message = await imClient.getMessageByUId(messageUId);
+  return {
+    code: ErrorCode.SUCCESS,
+    data: message
+  };
+};
 
-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, sendQuoteReplyMessage, 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, getMessageById, getMessageByUId, getRemoteHistoryMessages, getServerTime, getTextMessageDraft, getTopConversationList, getTotalUnreadCount, getUnreadCount, getUnreadMentionedCount, init, logOut, mockLogin, onceEventListener, parseChatRecordMsgDetails, recallMessage, registerMessageType, removeConversation, removeEventListener, request, saveTextMessageDraft, sendFileMessage, sendGIFMessage, sendHQVoiceMessage, sendImageMessage, sendMessage, sendQuoteReplyMessage, sendReadReceipts, sendSightMessage, sendTextMessage, setConversationNotificationStatus, setConversationToTop, setUserLogged };

package/index.umd.js

@@ -22279,6 +22279,28 @@
         return null;
       }
     }
+    decryptMessage(message) {
+      const decryptedMessage = {
+        ...message
+      };
+      if (typeof decryptedMessage.content === 'string' && decryptedMessage.content) {
+        try {
+          decryptedMessage.content = this.decryptContent(decryptedMessage.content);
+        } catch (error) {
+          logger.error('解密消息内容失败', error);
+          decryptedMessage.content = null;
+        }
+      }
+      if (decryptedMessage.quotedReply && typeof decryptedMessage.quotedReply.content === 'string' && decryptedMessage.quotedReply.content) {
+        try {
+          decryptedMessage.quotedReply.content = this.decryptContent(decryptedMessage.quotedReply.content);
+        } catch (error) {
+          logger.error('解密引用消息内容失败', error);
+          decryptedMessage.quotedReply.content = null;
+        }
+      }
+      return decryptedMessage;
+    }
     async addMessages(messages, toConversation, isEnd = undefined) {
       const dialogId = getFullDialogId(toConversation);
       if (isDef(isEnd)) {
@@ -22345,25 +22367,7 @@
             const cursor = event.target.result;
             if (cursor) {
               if (processedCount < count) {
-                const message = {
-                  ...cursor.value
-                };
-                if (typeof message.content === 'string' && message.content) {
-                  try {
-                    message.content = this.decryptContent(message.content);
-                  } catch (error) {
-                    logger.error('Failed to decrypt message content', error);
-                    message.content = null;
-                  }
-                }
-                if (message.quotedReply && typeof message.quotedReply.content === 'string' && message.quotedReply.content) {
-                  try {
-                    message.quotedReply.content = this.decryptContent(message.quotedReply.content);
-                  } catch (error) {
-                    logger.error('Failed to decrypt reference message content', error);
-                    message.quotedReply.content = null;
-                  }
-                }
+                const message = this.decryptMessage(cursor.value);
                 messages.push(message);
                 processedCount++;
                 cursor.continue();
@@ -22572,17 +22576,7 @@
         cursorRequest.onsuccess = event => {
           const cursor = event.target.result;
           if (cursor) {
-            const message = {
-              ...cursor.value
-            };
-            if (typeof message.content === 'string' && message.content) {
-              try {
-                message.content = this.decryptContent(message.content);
-              } catch (error) {
-                logger.error('Failed to decrypt message content', error);
-                message.content = null;
-              }
-            }
+            const message = this.decryptMessage(cursor.value);
             resolve(message);
           } else {
             resolve(null);
@@ -22608,17 +22602,7 @@
         request.onsuccess = () => {
           const message = request.result;
           if (message) {
-            const decryptedMessage = {
-              ...message
-            };
-            if (typeof decryptedMessage.content === 'string' && decryptedMessage.content) {
-              try {
-                decryptedMessage.content = this.decryptContent(decryptedMessage.content);
-              } catch (error) {
-                logger.error('解密消息内容失败', error);
-                decryptedMessage.content = null;
-              }
-            }
+            const decryptedMessage = this.decryptMessage(message);
             resolve(decryptedMessage);
           } else {
             resolve(null);
@@ -22725,6 +22709,30 @@
         };
       });
     }
+    async getMessageByUId(messageUId) {
+      if (!this.db) {
+        return null;
+      }
+      return new Promise((resolve, reject) => {
+        const transaction = this.db.transaction(this.STORE_NAME, 'readonly');
+        const store = transaction.objectStore(this.STORE_NAME);
+        const index = store.index('messageUId');
+        const request = index.get(messageUId);
+        request.onsuccess = () => {
+          const message = request.result;
+          if (message) {
+            const decryptedMessage = this.decryptMessage(message);
+            resolve(decryptedMessage);
+          } else {
+            resolve(null);
+          }
+        };
+        request.onerror = event => {
+          logger.error('查询消息失败', event);
+          resolve(null);
+        };
+      });
+    }
   }
   let cache = null;
   var MessageCache$1 = {
@@ -30377,7 +30385,7 @@
         code: checkResult.code
       };
     }
-    let receivedMessage = transSentAttrs2IReceivedMessage(checkResult.message, checkResult.sentArgs);
+    const receivedMessage = transSentAttrs2IReceivedMessage(checkResult.message, checkResult.sentArgs);
     receivedMessage.quotedReply = quoteReply;
     await saveSentMessage(receivedMessage, checkResult.sentArgs);
     const dialogId = getFullDialogId(quoteReply);
@@ -30457,18 +30465,19 @@
       };
       response = await sendQuotePrivateChatMessage(privateParams);
     }
+    const finalMessage = deepClone(receivedMessage);
     if (response.code === exports.ErrorCode.SUCCESS) {
-      receivedMessage.sentTime = response.data.msgSendTime.toString();
-      receivedMessage.messageUId = response.data.msgId.toString();
-      receivedMessage.sentStatus = exports.SentStatus.SENT;
-      await saveSentMessage(receivedMessage, checkResult.sentArgs);
+      finalMessage.sentTime = response.data.msgSendTime.toString();
+      finalMessage.messageUId = response.data.msgId.toString();
+      finalMessage.sentStatus = exports.SentStatus.SENT;
+      await saveSentMessage(finalMessage, checkResult.sentArgs);
     } else {
-      receivedMessage.sentStatus = exports.SentStatus.FAILED;
-      await saveSentMessage(receivedMessage, checkResult.sentArgs);
+      finalMessage.sentStatus = exports.SentStatus.FAILED;
+      await saveSentMessage(finalMessage, checkResult.sentArgs);
     }
     return {
       code: response.code,
-      data: receivedMessage
+      data: finalMessage
     };
   };
   async function internal_sendMessage(conversation, message, options, uploadOptions) {
@@ -31032,6 +31041,12 @@
       }
       return removedMsgUids;
     }
+    async getMessageById(messageId) {
+      return MessageCache$1.get()?.getMessageById(messageId);
+    }
+    async getMessageByUId(messageUId) {
+      return MessageCache$1.get()?.getMessageByUId(messageUId);
+    }
   }
 
   /*eslint-disable block-scoped-var, id-length, no-control-regex, no-magic-numbers, no-prototype-builtins, no-redeclare, no-shadow, no-var, sort-vars*/
@@ -32306,6 +32321,20 @@
   const sendQuoteReplyMessage = async (message, quoteReply, options) => {
     return await imClient.sendQuoteReplyMessage(message, quoteReply, options);
   };
+  const getMessageById = async messageId => {
+    const message = await imClient.getMessageById(messageId);
+    return {
+      code: exports.ErrorCode.SUCCESS,
+      data: message
+    };
+  };
+  const getMessageByUId = async messageUId => {
+    const message = await imClient.getMessageByUId(messageUId);
+    return {
+      code: exports.ErrorCode.SUCCESS,
+      data: message
+    };
+  };
 
   exports.ChatRecordMessage = ChatRecordMessage;
   exports.ContactMessage = ContactMessage;
@@ -32345,6 +32374,8 @@
   exports.getConversationNotificationLevel = getConversationNotificationLevel;
   exports.getConversationNotificationStatus = getConversationNotificationStatus;
   exports.getConversationState = getConversationState;
+  exports.getMessageById = getMessageById;
+  exports.getMessageByUId = getMessageByUId;
   exports.getRemoteHistoryMessages = getRemoteHistoryMessages;
   exports.getServerTime = getServerTime;
   exports.getTextMessageDraft = getTextMessageDraft;

package/package.json

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

package/types/index.d.ts

@@ -241,4 +241,21 @@ export declare const mockLogin: (config: {
  * @returns 被清除的消息ID列表
  */
 export declare const clearBurnAfterReadingExpiredMessages: (conversation: IConversationOption) => IPromiseResult<string[]>;
+/**
+ * 发送引用回复消息
+ * @param message 消息
+ * @param quoteReply 引用回复消息
+ * @param options 发送选项
+ * @returns 发送结果
+ */
 export declare const sendQuoteReplyMessage: (message: BaseMessage, quoteReply: IReceivedMessage, options?: ISendMessageOptions) => IPromiseResult<IReceivedMessage>;
+/**
+ * 获取消息
+ * @param messageId 消息ID
+ * @returns 消息
+ */
+export declare const getMessageById: (messageId: number) => IPromiseResult<IReceivedMessage | null | undefined>;
+/**
+ * 获取消息
+ */
+export declare const getMessageByUId: (messageUId: string) => IPromiseResult<IReceivedMessage | null | undefined>;