@onyx-p/imlib-web 2.0.9 → 2.1.1

package/index.esm.js

@@ -9516,7 +9516,7 @@ var CmdIds;
   CmdIds[CmdIds["GetRemoteMessages"] = 1610682419] = "GetRemoteMessages";
   CmdIds[CmdIds["GetSuperGroupRemoteMessages"] = 1610776956] = "GetSuperGroupRemoteMessages";
   CmdIds[CmdIds["DeleteChatMessages"] = 1610682381] = "DeleteChatMessages";
-  CmdIds[CmdIds["ClearChatHistoryMessage"] = 1610777164] = "ClearChatHistoryMessage";
+  CmdIds[CmdIds["ClearChatHistoryMessage"] = 1610682421] = "ClearChatHistoryMessage";
   CmdIds[CmdIds["GetDialogList"] = 1610711096] = "GetDialogList";
   CmdIds[CmdIds["GetBriefDialogList"] = 1610682399] = "GetBriefDialogList";
   CmdIds[CmdIds["UpdatePrivateChatMuteConfig"] = 1610682379] = "UpdatePrivateChatMuteConfig";
@@ -15446,9 +15446,10 @@ const CleanHistoryMessageReq = $root$2.CleanHistoryMessageReq = (() => {
    * Properties of a CleanHistoryMessageReq.
    * @exports ICleanHistoryMessageReq
    * @interface ICleanHistoryMessageReq
-   * @property {Long|null} [destId] CleanHistoryMessageReq destId
-   * @property {number|null} [type] CleanHistoryMessageReq type
-   * @property {Long|null} [msgTime] CleanHistoryMessageReq msgTime
+   * @property {string|null} [destId] CleanHistoryMessageReq destId
+   * @property {Long|null} [msgId] CleanHistoryMessageReq msgId
+   * @property {Array.<Long>|null} [msgIdList] CleanHistoryMessageReq msgIdList
+   * @property {Array.<string>|null} [destIdList] CleanHistoryMessageReq destIdList
    */
 
   /**
@@ -15460,32 +15461,42 @@ const CleanHistoryMessageReq = $root$2.CleanHistoryMessageReq = (() => {
    * @param {ICleanHistoryMessageReq=} [properties] Properties to set
    */
   function CleanHistoryMessageReq(properties) {
+    this.msgIdList = [];
+    this.destIdList = [];
     if (properties) for (let keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) this[keys[i]] = properties[keys[i]];
   }
 
   /**
    * CleanHistoryMessageReq destId.
-   * @member {Long} destId
+   * @member {string} destId
    * @memberof CleanHistoryMessageReq
    * @instance
    */
-  CleanHistoryMessageReq.prototype.destId = $util$2.Long ? $util$2.Long.fromBits(0, 0, false) : 0;
+  CleanHistoryMessageReq.prototype.destId = "";
 
   /**
-   * CleanHistoryMessageReq type.
-   * @member {number} type
+   * CleanHistoryMessageReq msgId.
+   * @member {Long} msgId
+   * @memberof CleanHistoryMessageReq
+   * @instance
+   */
+  CleanHistoryMessageReq.prototype.msgId = $util$2.Long ? $util$2.Long.fromBits(0, 0, false) : 0;
+
+  /**
+   * CleanHistoryMessageReq msgIdList.
+   * @member {Array.<Long>} msgIdList
    * @memberof CleanHistoryMessageReq
    * @instance
    */
-  CleanHistoryMessageReq.prototype.type = 0;
+  CleanHistoryMessageReq.prototype.msgIdList = $util$2.emptyArray;
 
   /**
-   * CleanHistoryMessageReq msgTime.
-   * @member {Long} msgTime
+   * CleanHistoryMessageReq destIdList.
+   * @member {Array.<string>} destIdList
    * @memberof CleanHistoryMessageReq
    * @instance
    */
-  CleanHistoryMessageReq.prototype.msgTime = $util$2.Long ? $util$2.Long.fromBits(0, 0, false) : 0;
+  CleanHistoryMessageReq.prototype.destIdList = $util$2.emptyArray;
 
   /**
    * Encodes the specified CleanHistoryMessageReq message. Does not implicitly {@link CleanHistoryMessageReq.verify|verify} messages.
@@ -15498,9 +15509,14 @@ const CleanHistoryMessageReq = $root$2.CleanHistoryMessageReq = (() => {
    */
   CleanHistoryMessageReq.encode = function encode(message, writer) {
     if (!writer) writer = $Writer$2.create();
-    if (message.destId != null && Object.hasOwnProperty.call(message, "destId")) writer.uint32(/* id 1, wireType 0 =*/8).int64(message.destId);
-    if (message.type != null && Object.hasOwnProperty.call(message, "type")) writer.uint32(/* id 2, wireType 0 =*/16).int32(message.type);
-    if (message.msgTime != null && Object.hasOwnProperty.call(message, "msgTime")) writer.uint32(/* id 3, wireType 0 =*/24).int64(message.msgTime);
+    if (message.destId != null && Object.hasOwnProperty.call(message, "destId")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.destId);
+    if (message.msgId != null && Object.hasOwnProperty.call(message, "msgId")) writer.uint32(/* id 2, wireType 0 =*/16).int64(message.msgId);
+    if (message.msgIdList != null && message.msgIdList.length) {
+      writer.uint32(/* id 3, wireType 2 =*/26).fork();
+      for (let i = 0; i < message.msgIdList.length; ++i) writer.int64(message.msgIdList[i]);
+      writer.ldelim();
+    }
+    if (message.destIdList != null && message.destIdList.length) for (let i = 0; i < message.destIdList.length; ++i) writer.uint32(/* id 4, wireType 2 =*/34).string(message.destIdList[i]);
     return writer;
   };
 
@@ -15524,17 +15540,27 @@ const CleanHistoryMessageReq = $root$2.CleanHistoryMessageReq = (() => {
       switch (tag >>> 3) {
         case 1:
           {
-            message.destId = reader.int64();
+            message.destId = reader.string();
             break;
           }
         case 2:
           {
-            message.type = reader.int32();
+            message.msgId = reader.int64();
             break;
           }
         case 3:
           {
-            message.msgTime = reader.int64();
+            if (!(message.msgIdList && message.msgIdList.length)) message.msgIdList = [];
+            if ((tag & 7) === 2) {
+              let end2 = reader.uint32() + reader.pos;
+              while (reader.pos < end2) message.msgIdList.push(reader.int64());
+            } else message.msgIdList.push(reader.int64());
+            break;
+          }
+        case 4:
+          {
+            if (!(message.destIdList && message.destIdList.length)) message.destIdList = [];
+            message.destIdList.push(reader.string());
             break;
           }
         default:
@@ -19247,11 +19273,9 @@ const deleteMessages$1 = (dialogId, messageUIds) => {
   });
   return reqPromise;
 };
-const clearHistoryMessage = (dialogId, timestamp) => {
+const clearHistoryMessage = dialogId => {
   return webSocketServer.send(CmdIds$1.ClearChatHistoryMessage, {
-    destId: Long.fromString(dialogId),
-    type: extractConversationType(dialogId) == ConversationType.GROUP ? 1 : 0,
-    msgTime: Long.fromNumber(timestamp)
+    destId: dialogId
   }, {
     encoder: CleanHistoryMessageReq,
     decoder: BaseResp
@@ -20278,6 +20302,7 @@ class ConversationManager {
   }
   remove(conOpt) {
     this.store.remove(conOpt);
+    this.localConversationSet.delete(this.getConversationKey(conOpt));
   }
   clearHistoryMessages(conOpt) {
     this.clearUnreadCount(conOpt);
@@ -29170,10 +29195,10 @@ class IMClient extends EventEmitter {
     MessageCache$1.get()?.removeMessagesByUId(list.map(e => e.messageUId));
     return deleteMessages$1(getFullDialogId(conversation), list.map(e => e.messageUId)).then(result => result.code);
   }
-  async deleteRemoteMessageByTimestamp(conversation, timestamp) {
+  async deleteRemoteMessageByTimestamp(conversation) {
     MessageCache$1.get()?.clearConversationCache(conversation);
     ConversationManager$1.get().clearHistoryMessages(conversation);
-    return clearHistoryMessage(getFullDialogId(conversation), timestamp === 0 ? Number.MAX_VALUE : timestamp).then(result => result.code);
+    return clearHistoryMessage(getFullDialogId(conversation)).then(result => result.code);
   }
   async getConversationList(count, conversationType, startTime, order) {
     const params = {
@@ -30573,12 +30598,11 @@ const deleteMessages = async (conversation, messages) => {
     code: ErrorCode.SUCCESS
   };
 };
-const clearHistoryMessages = async (conversation, timestamp) => {
-  assert('timestamp', timestamp, val => AssertRules.NUMBER(val) && val >= 0, true);
+const clearHistoryMessages = async conversation => {
   assert('conversation', conversation, AssertRules.CONVERSATION);
   const paramsStr = 'conversationType:' + conversation.conversationType + ',targetId:' + conversation.targetId;
   logger.debug('clear message ->' + paramsStr);
-  const code = await imClient.deleteRemoteMessageByTimestamp(conversation, timestamp);
+  const code = await imClient.deleteRemoteMessageByTimestamp(conversation);
   if (code !== ErrorCode.SUCCESS) {
     logger.warn('clear message ->' + code + ':' + ErrorDesc(code) + ',' + paramsStr);
     return {

package/index.umd.js

@@ -9522,7 +9522,7 @@
     CmdIds[CmdIds["GetRemoteMessages"] = 1610682419] = "GetRemoteMessages";
     CmdIds[CmdIds["GetSuperGroupRemoteMessages"] = 1610776956] = "GetSuperGroupRemoteMessages";
     CmdIds[CmdIds["DeleteChatMessages"] = 1610682381] = "DeleteChatMessages";
-    CmdIds[CmdIds["ClearChatHistoryMessage"] = 1610777164] = "ClearChatHistoryMessage";
+    CmdIds[CmdIds["ClearChatHistoryMessage"] = 1610682421] = "ClearChatHistoryMessage";
     CmdIds[CmdIds["GetDialogList"] = 1610711096] = "GetDialogList";
     CmdIds[CmdIds["GetBriefDialogList"] = 1610682399] = "GetBriefDialogList";
     CmdIds[CmdIds["UpdatePrivateChatMuteConfig"] = 1610682379] = "UpdatePrivateChatMuteConfig";
@@ -15452,9 +15452,10 @@
      * Properties of a CleanHistoryMessageReq.
      * @exports ICleanHistoryMessageReq
      * @interface ICleanHistoryMessageReq
-     * @property {Long|null} [destId] CleanHistoryMessageReq destId
-     * @property {number|null} [type] CleanHistoryMessageReq type
-     * @property {Long|null} [msgTime] CleanHistoryMessageReq msgTime
+     * @property {string|null} [destId] CleanHistoryMessageReq destId
+     * @property {Long|null} [msgId] CleanHistoryMessageReq msgId
+     * @property {Array.<Long>|null} [msgIdList] CleanHistoryMessageReq msgIdList
+     * @property {Array.<string>|null} [destIdList] CleanHistoryMessageReq destIdList
      */
 
     /**
@@ -15466,32 +15467,42 @@
      * @param {ICleanHistoryMessageReq=} [properties] Properties to set
      */
     function CleanHistoryMessageReq(properties) {
+      this.msgIdList = [];
+      this.destIdList = [];
       if (properties) for (let keys = Object.keys(properties), i = 0; i < keys.length; ++i) if (properties[keys[i]] != null) this[keys[i]] = properties[keys[i]];
     }
 
     /**
      * CleanHistoryMessageReq destId.
-     * @member {Long} destId
+     * @member {string} destId
      * @memberof CleanHistoryMessageReq
      * @instance
      */
-    CleanHistoryMessageReq.prototype.destId = $util$2.Long ? $util$2.Long.fromBits(0, 0, false) : 0;
+    CleanHistoryMessageReq.prototype.destId = "";
 
     /**
-     * CleanHistoryMessageReq type.
-     * @member {number} type
+     * CleanHistoryMessageReq msgId.
+     * @member {Long} msgId
+     * @memberof CleanHistoryMessageReq
+     * @instance
+     */
+    CleanHistoryMessageReq.prototype.msgId = $util$2.Long ? $util$2.Long.fromBits(0, 0, false) : 0;
+
+    /**
+     * CleanHistoryMessageReq msgIdList.
+     * @member {Array.<Long>} msgIdList
      * @memberof CleanHistoryMessageReq
      * @instance
      */
-    CleanHistoryMessageReq.prototype.type = 0;
+    CleanHistoryMessageReq.prototype.msgIdList = $util$2.emptyArray;
 
     /**
-     * CleanHistoryMessageReq msgTime.
-     * @member {Long} msgTime
+     * CleanHistoryMessageReq destIdList.
+     * @member {Array.<string>} destIdList
      * @memberof CleanHistoryMessageReq
      * @instance
      */
-    CleanHistoryMessageReq.prototype.msgTime = $util$2.Long ? $util$2.Long.fromBits(0, 0, false) : 0;
+    CleanHistoryMessageReq.prototype.destIdList = $util$2.emptyArray;
 
     /**
      * Encodes the specified CleanHistoryMessageReq message. Does not implicitly {@link CleanHistoryMessageReq.verify|verify} messages.
@@ -15504,9 +15515,14 @@
      */
     CleanHistoryMessageReq.encode = function encode(message, writer) {
       if (!writer) writer = $Writer$2.create();
-      if (message.destId != null && Object.hasOwnProperty.call(message, "destId")) writer.uint32(/* id 1, wireType 0 =*/8).int64(message.destId);
-      if (message.type != null && Object.hasOwnProperty.call(message, "type")) writer.uint32(/* id 2, wireType 0 =*/16).int32(message.type);
-      if (message.msgTime != null && Object.hasOwnProperty.call(message, "msgTime")) writer.uint32(/* id 3, wireType 0 =*/24).int64(message.msgTime);
+      if (message.destId != null && Object.hasOwnProperty.call(message, "destId")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.destId);
+      if (message.msgId != null && Object.hasOwnProperty.call(message, "msgId")) writer.uint32(/* id 2, wireType 0 =*/16).int64(message.msgId);
+      if (message.msgIdList != null && message.msgIdList.length) {
+        writer.uint32(/* id 3, wireType 2 =*/26).fork();
+        for (let i = 0; i < message.msgIdList.length; ++i) writer.int64(message.msgIdList[i]);
+        writer.ldelim();
+      }
+      if (message.destIdList != null && message.destIdList.length) for (let i = 0; i < message.destIdList.length; ++i) writer.uint32(/* id 4, wireType 2 =*/34).string(message.destIdList[i]);
       return writer;
     };
 
@@ -15530,17 +15546,27 @@
         switch (tag >>> 3) {
           case 1:
             {
-              message.destId = reader.int64();
+              message.destId = reader.string();
               break;
             }
           case 2:
             {
-              message.type = reader.int32();
+              message.msgId = reader.int64();
               break;
             }
           case 3:
             {
-              message.msgTime = reader.int64();
+              if (!(message.msgIdList && message.msgIdList.length)) message.msgIdList = [];
+              if ((tag & 7) === 2) {
+                let end2 = reader.uint32() + reader.pos;
+                while (reader.pos < end2) message.msgIdList.push(reader.int64());
+              } else message.msgIdList.push(reader.int64());
+              break;
+            }
+          case 4:
+            {
+              if (!(message.destIdList && message.destIdList.length)) message.destIdList = [];
+              message.destIdList.push(reader.string());
               break;
             }
           default:
@@ -19253,11 +19279,9 @@
     });
     return reqPromise;
   };
-  const clearHistoryMessage = (dialogId, timestamp) => {
+  const clearHistoryMessage = dialogId => {
     return webSocketServer.send(CmdIds$1.ClearChatHistoryMessage, {
-      destId: Long.fromString(dialogId),
-      type: extractConversationType(dialogId) == exports.ConversationType.GROUP ? 1 : 0,
-      msgTime: Long.fromNumber(timestamp)
+      destId: dialogId
     }, {
       encoder: CleanHistoryMessageReq,
       decoder: BaseResp
@@ -20284,6 +20308,7 @@
     }
     remove(conOpt) {
       this.store.remove(conOpt);
+      this.localConversationSet.delete(this.getConversationKey(conOpt));
     }
     clearHistoryMessages(conOpt) {
       this.clearUnreadCount(conOpt);
@@ -29176,10 +29201,10 @@
       MessageCache$1.get()?.removeMessagesByUId(list.map(e => e.messageUId));
       return deleteMessages$1(getFullDialogId(conversation), list.map(e => e.messageUId)).then(result => result.code);
     }
-    async deleteRemoteMessageByTimestamp(conversation, timestamp) {
+    async deleteRemoteMessageByTimestamp(conversation) {
       MessageCache$1.get()?.clearConversationCache(conversation);
       ConversationManager$1.get().clearHistoryMessages(conversation);
-      return clearHistoryMessage(getFullDialogId(conversation), timestamp === 0 ? Number.MAX_VALUE : timestamp).then(result => result.code);
+      return clearHistoryMessage(getFullDialogId(conversation)).then(result => result.code);
     }
     async getConversationList(count, conversationType, startTime, order) {
       const params = {
@@ -30579,12 +30604,11 @@
       code: exports.ErrorCode.SUCCESS
     };
   };
-  const clearHistoryMessages = async (conversation, timestamp) => {
-    assert('timestamp', timestamp, val => AssertRules.NUMBER(val) && val >= 0, true);
+  const clearHistoryMessages = async conversation => {
     assert('conversation', conversation, AssertRules.CONVERSATION);
     const paramsStr = 'conversationType:' + conversation.conversationType + ',targetId:' + conversation.targetId;
     logger.debug('clear message ->' + paramsStr);
-    const code = await imClient.deleteRemoteMessageByTimestamp(conversation, timestamp);
+    const code = await imClient.deleteRemoteMessageByTimestamp(conversation);
     if (code !== exports.ErrorCode.SUCCESS) {
       logger.warn('clear message ->' + code + ':' + ErrorDesc(code) + ',' + paramsStr);
       return {

package/package.json

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

package/types/index.d.ts

@@ -222,7 +222,7 @@ export declare const deleteMessages: (conversation: IConversationOption, message
  * @param conversation 会话
  * @param timestamp 清除时间点, 该时间之前的消息将被清除
  */
-export declare const clearHistoryMessages: (conversation: IConversationOption, timestamp: number) => IPromiseResult<void>;
+export declare const clearHistoryMessages: (conversation: IConversationOption) => IPromiseResult<void>;
 export declare const parseChatRecordMsgDetails: (conversation: IConversationOption, detailItems: IChatRecordMsgDetail[]) => IReceivedMessage[];
 /**
  * 发送已读回执