@onyx-p/imlib-web 1.5.0 → 1.5.2

package/index.esm.js

@@ -18486,9 +18486,9 @@ const getRemoteMessages = params => {
     rows: params.count
   };
   if (params.newToOld) {
-    reqParams.offset = Long.fromNumber(params.offset);
+    reqParams.offset = Long.fromString(params.offset);
   } else {
-    reqParams.oldOffset = Long.fromNumber(params.offset);
+    reqParams.oldOffset = Long.fromString(params.offset);
   }
   return webSocketServer.send(CmdIds$1.GetRemoteMessages, reqParams, {
     encoder: GetHistoryMessageReq,
@@ -18817,12 +18817,13 @@ const MessageTypes = {
   FILE: 0x3000100A,
   AUDIO: 0x30001011,
   VIDEO: 0x30001006,
-  CUST_COMMAND: 0x1000101d,
-  CUST_STORAGE: 0x1000102d,
-  CUST_NORMAL: 0x1000103d,
-  CUST_STATUS: 0x1000104d,
   RECALL: 0x6001001d,
-  CMD: 0x1000105d
+  LOCATION: 0x30001005,
+  CHAT_RECORD: 0x30001019,
+  CONTACT: 0x10001002,
+  GROUP_INVITATION: 0x30001003,
+  REDPACKET: 0x10001040,
+  TRANSFER: 0x10001030
 };
 
 const STATUSMESSAGE_ALIVE_TIMEMS = 6000;
@@ -18996,6 +18997,14 @@ const ConversationKey2StorageKey = {
   mentionedUIds: {
     keyName: 'mu',
     defaultVal: null
+  },
+  dialogTitle: {
+    keyName: 'dt',
+    defaultVal: null
+  },
+  smallAvatarUrl: {
+    keyName: 'sa',
+    defaultVal: null
   }
 };
 class ConversationStore {
@@ -19313,7 +19322,9 @@ class ConversationManager {
       targetId,
       isTop,
       notificationStatus,
-      notificationLevel
+      notificationLevel,
+      dialogTitle,
+      smallAvatarUrl
     } = conversation;
     this.localConversationSet.add(this.getConversationKey(conversation));
     this.addStatus({
@@ -19321,7 +19332,9 @@ class ConversationManager {
       targetId,
       isTop,
       notificationStatus,
-      notificationLevel
+      notificationLevel,
+      dialogTitle,
+      smallAvatarUrl
     }, false);
   }
   addStatus(statusItem, shouldNotify = false) {
@@ -19330,7 +19343,9 @@ class ConversationManager {
       targetId,
       notificationStatus,
       notificationLevel,
-      isTop
+      isTop,
+      dialogTitle,
+      smallAvatarUrl
     } = statusItem;
     const conOpt = {
       conversationType,
@@ -19357,10 +19372,24 @@ class ConversationManager {
         val: isTop
       };
     }
+    if (isDef(dialogTitle) && storageConversation.dialogTitle !== dialogTitle) {
+      updatedItems.dialogTitle = {
+        time: updatedTime,
+        val: dialogTitle
+      };
+    }
+    if (isDef(smallAvatarUrl) && storageConversation.smallAvatarUrl !== smallAvatarUrl) {
+      updatedItems.smallAvatarUrl = {
+        time: updatedTime,
+        val: smallAvatarUrl
+      };
+    }
     this.store.set(conOpt, {
       notificationStatus,
       isTop,
-      notificationLevel
+      notificationLevel,
+      dialogTitle,
+      smallAvatarUrl
     });
     if (Object.keys(updatedItems).length && shouldNotify) {
       this.setUpdatedConversation({
@@ -19544,7 +19573,9 @@ class ConversationManager {
       unreadMentionedCount,
       notificationLevel,
       notificationStatus,
-      isTop
+      isTop,
+      dialogTitle,
+      smallAvatarUrl
     }) => ({
       conversationType,
       targetId,
@@ -19552,7 +19583,9 @@ class ConversationManager {
       unreadMentionedCount: unreadMentionedCount ?? 0,
       notificationLevel,
       notificationStatus,
-      isTop
+      isTop,
+      dialogTitle,
+      smallAvatarUrl
     }));
   }
   destroyed() {
@@ -19600,7 +19633,9 @@ const nullConversationManager = {
     return [];
   },
   addLocalConversation: function (conversation) {},
-  loadConvsationsIfNotExist: function (list) {},
+  loadConvsationsIfNotExist: function (list) {
+    return Promise.resolve();
+  },
   destroyed() {},
   syncConversationStatus: function () {}
 };
@@ -19705,7 +19740,7 @@ class MessageLoader {
         targetId: dialogId
       };
     });
-    ConversationManager$1.get().loadConvsationsIfNotExist(cons);
+    await ConversationManager$1.get().loadConvsationsIfNotExist(cons);
     ServerMessageParser.parse(msg, (done, outputMsgs) => {
       const messages = [];
       const conversations = [];
@@ -27148,7 +27183,9 @@ function beforeSend(conversation, message, options) {
 async function send(message, sentArgs) {
   const dialogId = getFullDialogId(sentArgs.conversation);
   const receivedMessage = transSentAttrs2IReceivedMessage(message, sentArgs);
-  message.isPersited && ConversationManager$1.get().loadConvsationsIfNotExist([sentArgs.conversation]);
+  if (message.isPersited) {
+    await ConversationManager$1.get().loadConvsationsIfNotExist([sentArgs.conversation]);
+  }
   const secretKey = await DialogSecretKey$1.getDialogAesKey(dialogId.toString());
   if (!secretKey) {
     receivedMessage.sentStatus = SentStatus.FAILED;
@@ -27313,10 +27350,9 @@ class IMClient extends EventEmitter {
   recallMsg = sendRecallMessage;
   async getRemoteHistoryMessages(conversation, options) {
     const dialogId = getFullDialogId(conversation);
-    debugger;
     return getRemoteMessages({
       dialogId,
-      offset: options.timestamp ?? 0,
+      offset: options.timestamp ?? "0",
       count: options.count ?? 20,
       newToOld: options.order === 0
     }).then(({
@@ -27331,7 +27367,6 @@ class IMClient extends EventEmitter {
           });
           return;
         }
-        debugger;
         ServerMessageParser.parse({
           [dialogId]: data.msg ?? {}
         }, (_, outputMsgs) => {
@@ -28697,7 +28732,7 @@ const recallMessage = async (conversation, options) => {
   return response;
 };
 const getHistoryMessages = async (conversation, options) => {
-  assert('options.timestamp', options.timestamp ?? 0, AssertRules.NUMBER);
+  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;

package/index.umd.js

@@ -18492,9 +18492,9 @@
       rows: params.count
     };
     if (params.newToOld) {
-      reqParams.offset = Long.fromNumber(params.offset);
+      reqParams.offset = Long.fromString(params.offset);
     } else {
-      reqParams.oldOffset = Long.fromNumber(params.offset);
+      reqParams.oldOffset = Long.fromString(params.offset);
     }
     return webSocketServer.send(CmdIds$1.GetRemoteMessages, reqParams, {
       encoder: GetHistoryMessageReq,
@@ -18823,12 +18823,13 @@
     FILE: 0x3000100A,
     AUDIO: 0x30001011,
     VIDEO: 0x30001006,
-    CUST_COMMAND: 0x1000101d,
-    CUST_STORAGE: 0x1000102d,
-    CUST_NORMAL: 0x1000103d,
-    CUST_STATUS: 0x1000104d,
     RECALL: 0x6001001d,
-    CMD: 0x1000105d
+    LOCATION: 0x30001005,
+    CHAT_RECORD: 0x30001019,
+    CONTACT: 0x10001002,
+    GROUP_INVITATION: 0x30001003,
+    REDPACKET: 0x10001040,
+    TRANSFER: 0x10001030
   };
 
   const STATUSMESSAGE_ALIVE_TIMEMS = 6000;
@@ -19002,6 +19003,14 @@
     mentionedUIds: {
       keyName: 'mu',
       defaultVal: null
+    },
+    dialogTitle: {
+      keyName: 'dt',
+      defaultVal: null
+    },
+    smallAvatarUrl: {
+      keyName: 'sa',
+      defaultVal: null
     }
   };
   class ConversationStore {
@@ -19319,7 +19328,9 @@
         targetId,
         isTop,
         notificationStatus,
-        notificationLevel
+        notificationLevel,
+        dialogTitle,
+        smallAvatarUrl
       } = conversation;
       this.localConversationSet.add(this.getConversationKey(conversation));
       this.addStatus({
@@ -19327,7 +19338,9 @@
         targetId,
         isTop,
         notificationStatus,
-        notificationLevel
+        notificationLevel,
+        dialogTitle,
+        smallAvatarUrl
       }, false);
     }
     addStatus(statusItem, shouldNotify = false) {
@@ -19336,7 +19349,9 @@
         targetId,
         notificationStatus,
         notificationLevel,
-        isTop
+        isTop,
+        dialogTitle,
+        smallAvatarUrl
       } = statusItem;
       const conOpt = {
         conversationType,
@@ -19363,10 +19378,24 @@
           val: isTop
         };
       }
+      if (isDef(dialogTitle) && storageConversation.dialogTitle !== dialogTitle) {
+        updatedItems.dialogTitle = {
+          time: updatedTime,
+          val: dialogTitle
+        };
+      }
+      if (isDef(smallAvatarUrl) && storageConversation.smallAvatarUrl !== smallAvatarUrl) {
+        updatedItems.smallAvatarUrl = {
+          time: updatedTime,
+          val: smallAvatarUrl
+        };
+      }
       this.store.set(conOpt, {
         notificationStatus,
         isTop,
-        notificationLevel
+        notificationLevel,
+        dialogTitle,
+        smallAvatarUrl
       });
       if (Object.keys(updatedItems).length && shouldNotify) {
         this.setUpdatedConversation({
@@ -19550,7 +19579,9 @@
         unreadMentionedCount,
         notificationLevel,
         notificationStatus,
-        isTop
+        isTop,
+        dialogTitle,
+        smallAvatarUrl
       }) => ({
         conversationType,
         targetId,
@@ -19558,7 +19589,9 @@
         unreadMentionedCount: unreadMentionedCount ?? 0,
         notificationLevel,
         notificationStatus,
-        isTop
+        isTop,
+        dialogTitle,
+        smallAvatarUrl
       }));
     }
     destroyed() {
@@ -19606,7 +19639,9 @@
       return [];
     },
     addLocalConversation: function (conversation) {},
-    loadConvsationsIfNotExist: function (list) {},
+    loadConvsationsIfNotExist: function (list) {
+      return Promise.resolve();
+    },
     destroyed() {},
     syncConversationStatus: function () {}
   };
@@ -19711,7 +19746,7 @@
           targetId: dialogId
         };
       });
-      ConversationManager$1.get().loadConvsationsIfNotExist(cons);
+      await ConversationManager$1.get().loadConvsationsIfNotExist(cons);
       ServerMessageParser.parse(msg, (done, outputMsgs) => {
         const messages = [];
         const conversations = [];
@@ -27154,7 +27189,9 @@
   async function send(message, sentArgs) {
     const dialogId = getFullDialogId(sentArgs.conversation);
     const receivedMessage = transSentAttrs2IReceivedMessage(message, sentArgs);
-    message.isPersited && ConversationManager$1.get().loadConvsationsIfNotExist([sentArgs.conversation]);
+    if (message.isPersited) {
+      await ConversationManager$1.get().loadConvsationsIfNotExist([sentArgs.conversation]);
+    }
     const secretKey = await DialogSecretKey$1.getDialogAesKey(dialogId.toString());
     if (!secretKey) {
       receivedMessage.sentStatus = exports.SentStatus.FAILED;
@@ -27319,10 +27356,9 @@
     recallMsg = sendRecallMessage;
     async getRemoteHistoryMessages(conversation, options) {
       const dialogId = getFullDialogId(conversation);
-      debugger;
       return getRemoteMessages({
         dialogId,
-        offset: options.timestamp ?? 0,
+        offset: options.timestamp ?? "0",
         count: options.count ?? 20,
         newToOld: options.order === 0
       }).then(({
@@ -27337,7 +27373,6 @@
             });
             return;
           }
-          debugger;
           ServerMessageParser.parse({
             [dialogId]: data.msg ?? {}
           }, (_, outputMsgs) => {
@@ -28703,7 +28738,7 @@
     return response;
   };
   const getHistoryMessages = async (conversation, options) => {
-    assert('options.timestamp', options.timestamp ?? 0, AssertRules.NUMBER);
+    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;

package/package.json

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

package/types/constants/messageTypes.d.ts

@@ -5,10 +5,11 @@ export declare const MessageTypes: {
     FILE: number;
     AUDIO: number;
     VIDEO: number;
-    CUST_COMMAND: number;
-    CUST_STORAGE: number;
-    CUST_NORMAL: number;
-    CUST_STATUS: number;
     RECALL: number;
-    CMD: number;
+    LOCATION: number;
+    CHAT_RECORD: number;
+    CONTACT: number;
+    GROUP_INVITATION: number;
+    REDPACKET: number;
+    TRANSFER: number;
 };

package/types/index.d.ts

@@ -7,7 +7,7 @@ import IReceivedConversation from './model/iReceivedConversation';
 import { CommonReqResult, PBCodec } from './net/connection/webSocketServer';
 import { BaseResp } from './net/pbs/rpc.base';
 export { TextMessage, ImageMessage, HQVoiceMessage, GIFMessage, FileMessage, VideoMessage } from './model/messages';
-export type { ITextMessageBody, IImageMessageBody, IGIFMessageBody, IFileMessageBody, IHQVoiceMessageBody, IRecallCommandMessageBody, IVideoMessageBody } from './model/messages';
+export type { ITextMessageBody, IImageMessageBody, IGIFMessageBody, IFileMessageBody, IHQVoiceMessageBody, IRecallCommandMessageBody, IVideoMessageBody, ILocationMessageBody, IChatRecordMessageBody, IContactMessageBody, IInvitationMessageBody, IRedEnvelopeMessageBody, ITransferMessageBody } from './model/messages';
 export { MessageTypes } from './constants/messageTypes';
 export type { IBaseMessageBody, IReceivedMessage, IReceivedConversation };
 export * from './types';

package/types/model/messages/index.d.ts

@@ -5,5 +5,6 @@ import HQVoiceMessage, { IHQVoiceMessageBody } from './voiceMessage';
 import FileMessage, { IFileMessageBody } from './fileMessage';
 import VideoMessage, { IVideoMessageBody } from './videoMessage';
 import RecallCommandMessage, { IRecallCommandMessageBody } from './recallCommandMessage';
+import { ILocationMessageBody, IChatRecordMessageBody, IContactMessageBody, IInvitationMessageBody, IRedEnvelopeMessageBody, ITransferMessageBody } from './otherMediaMessages';
 export { TextMessage, ImageMessage, GIFMessage, HQVoiceMessage, FileMessage, RecallCommandMessage, VideoMessage };
-export type { ITextMessageBody, IImageMessageBody, IGIFMessageBody, IHQVoiceMessageBody, IFileMessageBody, IRecallCommandMessageBody, IVideoMessageBody };
+export type { ITextMessageBody, IImageMessageBody, IGIFMessageBody, IHQVoiceMessageBody, IFileMessageBody, IRecallCommandMessageBody, IVideoMessageBody, ILocationMessageBody, IChatRecordMessageBody, IContactMessageBody, IInvitationMessageBody, IRedEnvelopeMessageBody, ITransferMessageBody };

package/types/model/messages/otherMediaMessages.d.ts

@@ -0,0 +1,80 @@
+export interface ILocationMessageBody {
+    thumbnailObjectKey: string;
+    title: string;
+    desc: string;
+    locationType: number;
+    encryptKey?: string;
+    lat: number;
+    lon: number;
+}
+export interface IChatRecordMessageBody {
+    chatTitle: string;
+    msgDataFileKey: string;
+    msgList: Array<{
+        srcId: string;
+        senderNickname: string;
+        mediaConstructor: number;
+        msgPostContent: string;
+    }>;
+    encryptKey?: string;
+}
+export interface IContactMessageBody {
+    uid: string;
+    nickname: string;
+    phoneNumber: string;
+    langcode: string;
+    smallAvatarUrl?: string;
+    gender: number;
+}
+export interface IInvitationMessageBody {
+    groupUin: string;
+    groupTitle: string;
+    inviteFromUin: string;
+    inviteFromNickName: string;
+    totalMemberCount: number;
+    createTime: number;
+    smallAvatarUrl?: string;
+    groupMemberSmallAvatarUrlArr?: string[];
+}
+export interface IRedEnvelopeMessageBody {
+    id: number;
+    createTime: string;
+    updateTime: string;
+    amount: string;
+    count: number;
+    uid: string;
+    nativeNumber: string;
+    nativeType: number;
+    sendSign: string;
+    title: string;
+    symbol: string;
+    receivedStatus: number;
+    status: number;
+    expireTime: number;
+    currency: string;
+    currencyLogo: string;
+    refundAmount: string;
+    receivedAmount?: string;
+}
+export interface ITransferMessageBody {
+    id: number;
+    createTime: string;
+    updateTime: string;
+    uid: string;
+    orderId: string;
+    src: string;
+    symbol: string;
+    type: number;
+    toUid: string;
+    nativeType: number;
+    money: number;
+    refName: string;
+    transNo: string;
+    status: number;
+    pushStatus: number;
+    currency: string;
+    currencyLogo: string;
+    network: string;
+    networkLogo: string;
+    refId: string;
+}

package/types/types.d.ts

@@ -65,12 +65,14 @@ export interface IConversationState extends IBaseConversationInfo {
     notificationLevel: NotificationLevel;
     notificationStatus: NotificationStatus;
     isTop: boolean;
+    dialogTitle: string | null | undefined;
+    smallAvatarUrl: string | null | undefined;
 }
 /**
  * 会话信息
  */
 export type IConversationOption = IBaseConversationInfo;
-export type IUpdatedConversationItemKeys = Extract<keyof IReceivedConversation, 'isTop' | 'notificationStatus' | 'notificationLevel' | 'unreadMessageCount' | 'hasMentioned' | 'unreadMentionedCount' | 'latestMessage'>;
+export type IUpdatedConversationItemKeys = Extract<keyof IReceivedConversation, 'isTop' | 'notificationStatus' | 'notificationLevel' | 'unreadMessageCount' | 'hasMentioned' | 'unreadMentionedCount' | 'dialogTitle' | 'smallAvatarUrl' | 'latestMessage'>;
 export type IUpdatedConversationItem = Partial<Record<IUpdatedConversationItemKeys, {
     time: string;
     val: any;
@@ -214,7 +216,7 @@ export type GetHistoryMessageOption = {
     /**
      * 获取此时间之前的消息，0 为从当前时间拉取
      */
-    timestamp?: number;
+    timestamp?: string;
     /**
      * 获取消息的数量，范围: 1-20
      */