@onyx-p/imlib-web 1.3.0 → 1.3.2

package/package.json

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

package/types/index.d.ts

@@ -6,8 +6,8 @@ import IReceivedMessage from './model/iReceivedMessage';
 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, CommandMessage } from './model/messages';
-export type { ITextMessageBody, IImageMessageBody, IGIFMessageBody, IFileMessageBody, IHQVoiceMessageBody, IRecallCommandMessageBody, ICommandMessageBody } from './model/messages';
+export { TextMessage, ImageMessage, HQVoiceMessage, GIFMessage, FileMessage, } from './model/messages';
+export type { ITextMessageBody, IImageMessageBody, IGIFMessageBody, IFileMessageBody, IHQVoiceMessageBody, IRecallCommandMessageBody, } from './model/messages';
 export type { IBaseMessageBody, IReceivedMessage, IReceivedConversation };
 export * from './types';
 export * from './model/statusTypes';
@@ -168,7 +168,6 @@ export declare const getTopConversationList: () => IPromiseResult<IBaseConversat
  * @param prototypes  消息属性名称
  * @param isStatusMessage  是否是状态消息
  */
-export declare const registerMessageType: <T extends IBaseMessageBody>(messageType: string, isPersited: boolean, isCounted: boolean, prototypes?: string[], isStatusMessage?: boolean) => new (content: T) => BaseMessage<T>;
 /**
  * 发送消息
  * @param options

package/types/model/baseMessage.d.ts

@@ -1,3 +1,4 @@
+import Long from 'long';
 import MentionedInfo from './mentionedInfo';
 export interface IMentionedInfo {
     /**
@@ -16,7 +17,7 @@ export interface IUserInfo {
         /**
          * 用户 ID
          */
-        userId?: string;
+        userId?: Long;
         /**
          * 用户名
          */
@@ -37,12 +38,11 @@ export interface IUserInfo {
 export type IBaseMessageBody = IUserInfo & IExtraData & IMentionedInfo;
 export type MessageCodingData = Record<string, any>;
 export declare class BaseMessage<T extends IBaseMessageBody = any> {
-    readonly messageType: string;
     content: T;
     readonly isPersited: boolean;
     readonly isCounted: boolean;
     readonly isStatusMessage: boolean;
-    constructor(messageType: string, content: T, isPersited?: boolean, isCounted?: boolean, isStatusMessage?: boolean);
+    constructor(content: T, isPersited?: boolean, isCounted?: boolean, isStatusMessage?: boolean);
     get objectId(): number;
     static getObjectId(): number;
     static decode(aDecoder: MessageCodingData): BaseMessage<any>;

package/types/model/iReceivedConversation.d.ts

@@ -1,13 +1,10 @@
 import { ConversationType, NotificationLevel, NotificationStatus } from './statusTypes';
 import IReceivedMessage from './iReceivedMessage';
+import Long from 'long';
 /**
  * 从服务器拉取到的会话数据结构
  */
 export default interface IReceivedConversation {
-    /**
-     * 会话的业务标识
-     */
-    channelId?: string;
     /**
      * 会话类型
      */
@@ -18,7 +15,7 @@ export default interface IReceivedConversation {
      * 1. 当 `conversationType` 为 `ConversationType.GROUP` 时，该值为群组 Id
      * 1. 当 `conversationType` 为 `ConversationType.PRIVATE` 时，该值为对方用户 Id
      */
-    targetId: string;
+    targetId: Long;
     /**
      * 当前会话的未读消息数
      */
@@ -46,7 +43,7 @@ export default interface IReceivedConversation {
     /**
      * 会话中消息的最后未读时间
      */
-    lastUnreadTime: number;
+    lastUnreadTime: Long;
     /**
      * @ 消息未读数
      */

package/types/model/iReceivedMessage.d.ts

@@ -1,12 +1,9 @@
+import Long from 'long';
 import { ConversationType, MessageDirection, SentStatus } from './statusTypes';
 /**
  * 消息数据
  */
 export default interface IReceivedMessage {
-    /**
-     * 会话的业务标识
-     */
-    channelId?: string;
     /**
      * 会话类型
      */
@@ -14,11 +11,11 @@ export default interface IReceivedMessage {
     /**
      * 会话 targetId
      */
-    targetId: string;
+    targetId: Long;
     /**
      * 消息发送者的用户 Id
      */
-    senderUserId: string;
+    senderUserId: Long;
     /**
      * 消息内容
      */
@@ -27,11 +24,11 @@ export default interface IReceivedMessage {
      * 消息结构名称，即消息类型
      * @example RC:TxtMsg
      */
-    messageType: string;
+    messageType: number;
     /**
      * 服务端存储的消息 Id
      */
-    messageUId: string;
+    messageUId: Long;
     /**
      * 消息方向是发出 or 收取
      */
@@ -43,12 +40,12 @@ export default interface IReceivedMessage {
     /**
      * 消息在服务器端的发送时间
      */
-    sentTime: number;
+    sentTime: Long;
     /**
      * 消息接收时间，该时间通过消息的 `sentTime` 值在本地进行计算得出，不推荐使用
      * @description 当 isOffLineMessage 为 true 时，该值无效
      */
-    receivedTime: number;
+    receivedTime: Long;
     /**
      * 是否存储
      * @default true
@@ -79,7 +76,7 @@ export default interface IReceivedMessage {
     /**
      * CPP 独有字段 消息本地 ID
      */
-    messageId?: number;
+    messageId?: Long;
     /**
      * 消息发送状态
      */

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

@@ -4,7 +4,5 @@ import GIFMessage, { IGIFMessageBody } from './gifMessage';
 import HQVoiceMessage, { IHQVoiceMessageBody } from './voiceMessage';
 import FileMessage, { IFileMessageBody } from './fileMessage';
 import RecallCommandMessage, { IRecallCommandMessageBody } from './recallCommandMessage';
-import CommandMessage, { ICommandMessageBody } from './commandMessage';
-import { CustCommandMessage, CustNormalMessage, CustStorageMessage, CustStatusMessage } from './custMessage';
-export { TextMessage, ImageMessage, GIFMessage, HQVoiceMessage, FileMessage, CustCommandMessage, CustNormalMessage, CustStorageMessage, CustStatusMessage, RecallCommandMessage, CommandMessage };
-export type { ITextMessageBody, IImageMessageBody, IGIFMessageBody, IHQVoiceMessageBody, IFileMessageBody, IRecallCommandMessageBody, ICommandMessageBody };
+export { TextMessage, ImageMessage, GIFMessage, HQVoiceMessage, FileMessage, RecallCommandMessage, };
+export type { ITextMessageBody, IImageMessageBody, IGIFMessageBody, IHQVoiceMessageBody, IFileMessageBody, IRecallCommandMessageBody };

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

@@ -1,14 +1,14 @@
 import { BaseMessage, IBaseMessageBody, MessageCodingData } from '../baseMessage';
 import { ConversationType } from '../statusTypes';
+import Long from 'long';
 /**
  *  撤回通知消息（被撤回消息摘要）
  */
 export interface IRecallCommandMessageBody extends IBaseMessageBody {
-    sentTime: number;
-    messageUId: string;
+    sentTime: Long;
+    messageUId: Long;
     conversationType: ConversationType;
-    targetId: string;
-    channelId?: string;
+    targetId: Long;
 }
 export default class RecallCommandMessage extends BaseMessage<IRecallCommandMessageBody> {
     constructor(content: IRecallCommandMessageBody);

package/types/model/statusTypes.d.ts

@@ -281,11 +281,7 @@ export declare enum ConversationType {
     /**
      * 群组聊天
      */
-    GROUP = 3,
-    /**
-     * 超级群
-     */
-    ULTRA_GROUP = 10
+    GROUP = 3
 }
 /**
  * 群组 @ 类型

package/types/types.d.ts

@@ -35,7 +35,8 @@ export declare enum Events {
     SUSPEND = "SUSPEND",
     MESSAGES = "MESSAGES",
     PULL_OFFLINE_MESSAGE_FINISHED = "PULL_OFFLINE_MESSAGE_FINISHED",
-    CONVERSATION = "CONVERSATION"
+    CONVERSATION = "CONVERSATION",
+    PUSH = "PUSH"
 }
 export type EventListeners = {
     [Events.CONNECTING]: () => void;
@@ -49,11 +50,14 @@ export type EventListeners = {
     [Events.CONVERSATION]: (event: {
         conversations: IUpdatedConversation[];
     }) => void;
+    [Events.PUSH]: (event: {
+        cmdId: number;
+        body: Uint8Array;
+    }) => void;
 };
 export interface IBaseConversationInfo {
     conversationType: ConversationType;
-    targetId: string;
-    channelId?: string;
+    targetId: Long;
 }
 export interface IConversationState extends IBaseConversationInfo {
     unreadCount: number;
@@ -68,7 +72,7 @@ export interface IConversationState extends IBaseConversationInfo {
 export type IConversationOption = IBaseConversationInfo;
 export type IUpdatedConversationItemKeys = Extract<keyof IReceivedConversation, 'isTop' | 'notificationStatus' | 'notificationLevel' | 'unreadMessageCount' | 'hasMentioned' | 'unreadMentionedCount' | 'latestMessage'>;
 export type IUpdatedConversationItem = Partial<Record<IUpdatedConversationItemKeys, {
-    time: number;
+    time: Long;
     val: any;
 }>>;
 /**
@@ -118,7 +122,7 @@ export interface ISendMessageOptions {
      * 当要重发消息时所有参数需与原始消息参数一致，messageId 必须存在。
      * 正常发消息时无需传该参数。
      */
-    messageId?: number;
+    messageId?: Long;
     /**
      * 推送配置，用于配置移动端远程推送的推送栏显示内容
      */
@@ -172,11 +176,11 @@ export interface IRecallMessageOptions {
     /**
      * 消息的唯一id，客户端依赖此属性查找要撤回的消息
      */
-    messageUId: string;
+    messageUId: Long;
     /**
      * 消息发送时间，服务端依赖此属性查找要撤回的消息
      */
-    sentTime: number;
+    sentTime: Long;
     /**
      * 撤回消息携带用户信息
      */

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

@@ -1,20 +0,0 @@
-import { BaseMessage, IExtraData, IUserInfo, MessageCodingData } from '../baseMessage';
-/**
- * 命令消息
- */
-export interface ICommandMessageBody extends IUserInfo, IExtraData {
-    /**
-     * 命令名称
-     */
-    name: string;
-    /**
-     * 命令的扩展数据，可以为任意字符串，如存放您定义的json数据。
-     */
-    data: string;
-}
-export default class CommandMessage extends BaseMessage<ICommandMessageBody> {
-    constructor(content: ICommandMessageBody);
-    static getObjectId(): number;
-    static decode(aDecoder: MessageCodingData): BaseMessage<ICommandMessageBody>;
-    encode(): MessageCodingData;
-}

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

@@ -1,34 +0,0 @@
-import { BaseMessage, IBaseMessageBody, MessageCodingData } from '../baseMessage';
-declare class CustBaseMessage extends BaseMessage {
-    static decode(aDecoder: MessageCodingData): BaseMessage<IBaseMessageBody>;
-    encode(): MessageCodingData;
-}
-/**
- * 自定义命令消息(不存储，不计数)
- */
-export declare class CustCommandMessage<T> extends CustBaseMessage {
-    constructor(messageType: string, content: T);
-    static getObjectId(): number;
-}
-/**
- * 自定义存储消息(存储，不计数)
- */
-export declare class CustStorageMessage<T> extends CustBaseMessage {
-    constructor(messageType: string, content: T);
-    static getObjectId(): number;
-}
-/**
- * 自定义普通消息(存储，且计数)
- */
-export declare class CustNormalMessage<T> extends CustBaseMessage {
-    constructor(messageType: string, content: T);
-    static getObjectId(): number;
-}
-/**
- * 自定义状态消息
- */
-export declare class CustStatusMessage<T> extends CustBaseMessage {
-    constructor(messageType: string, content: T);
-    static getObjectId(): number;
-}
-export {};