easemob-chat-uikit 2.4.2 → 3.0.0

package/types/eventHandler/index.d.ts

@@ -1,12 +1,11 @@
-import { ChatSDK } from '../module/SDK';
-export type EventName = 'joinChatRoom' | 'leaveChatRoom' | 'reportMessage' | 'getChatRoomDetails' | 'sendMessage' | 'fetchUserInfoById' | 'translateMessage' | 'recallMessage' | 'deleteConversation' | 'modifyMessage' | 'createChatThread' | 'destroyChatThread' | 'leaveChatThread' | 'setGroupMemberAttributes' | 'muteChatRoomMember' | 'getChatRoomMutelist' | 'unmuteChatRoomMember' | 'removeChatRoomMember' | 'getSilentModeForConversations' | 'setSilentModeForConversation' | 'clearRemindTypeForConversation' | 'getGroupInfo' | 'modifyGroup' | 'destroyGroup' | 'leaveGroup' | 'createGroup' | 'inviteToGroup' | 'removeGroupMembers' | 'changeGroupOwner' | 'pinConversation' | 'getServerPinnedConversations' | 'removeHistoryMessages' | 'addReaction' | 'deleteReaction' | 'getReactionDetail' | 'joinChatThread' | 'getChatThreads' | 'getChatThreadLastMessage' | 'getAllContacts' | 'getJoinedGroups' | 'open' | 'setContactRemark' | 'addContact' | 'deleteContact' | 'getPinnedMessages' | 'pinMessage' | 'unpinMessage' | 'jumpToPinnedMessage' | 'addUsersToBlocklist' | 'removeUserFromBlocklist' | 'publishPresence' | 'getBlockList' | 'getConversationlist';
+export type EventName = 'joinChatRoom' | 'leaveChatRoom' | 'getChatRoomDetails' | 'sendMessage' | 'fetchUserInfoById' | 'translateMessage' | 'recallMessage' | 'deleteConversation' | 'modifyMessage' | 'createChatThread' | 'destroyChatThread' | 'leaveChatThread' | 'setGroupMemberAttributes' | 'muteChatRoomMember' | 'getChatRoomMutelist' | 'unmuteChatRoomMember' | 'removeChatRoomMember' | 'getSilentModeForConversations' | 'setSilentModeForConversation' | 'clearRemindTypeForConversation' | 'getGroupInfo' | 'modifyGroup' | 'destroyGroup' | 'leaveGroup' | 'createGroup' | 'inviteToGroup' | 'removeGroupMembers' | 'changeGroupOwner' | 'pinConversation' | 'getServerPinnedConversations' | 'removeHistoryMessages' | 'addReaction' | 'deleteReaction' | 'getReactionDetail' | 'joinChatThread' | 'getChatThreads' | 'getChatThreadLastMessage' | 'getAllContacts' | 'getJoinedGroups' | 'open' | 'setContactRemark' | 'addContact' | 'deleteContact' | 'getPinnedMessages' | 'pinMessage' | 'unpinMessage' | 'jumpToPinnedMessage' | 'addUsersToBlocklist' | 'removeUserFromBlocklist' | 'publishPresence' | 'getBlockList' | 'getConversationlist' | 'clearConversationUnreadMessageCount';
 export type EventHandlerData = {
     [key in EventName]?: {
         success?: () => void;
-        error?: (err: ChatSDK.ErrorEvent) => void;
+        error?: (err: unknown) => void;
     };
 } & {
-    onError: (err: ChatSDK.ErrorEvent) => void;
+    onError: (err: unknown) => void;
 };
 export declare class EventHandler {
     handlerData: {
@@ -18,6 +17,6 @@ export declare class EventHandler {
     addEventHandler(eventHandlerId: string, eventHandler: EventHandlerData): void;
     removeEventHandler(eventHandlerId: string): void;
     dispatchSuccess(eventName: EventName): void;
-    dispatchError(eventName: EventName, error: ChatSDK.ErrorEvent): void;
+    dispatchError(eventName: EventName, error: unknown): void;
 }
 export declare const eventHandler: EventHandler;

package/types/index.d.ts

@@ -0,0 +1,15 @@
+/// <reference types="react" />
+import { AudioMessage, BaseMessage, FileMessage, ImageMessage, NoticeMessage, TextMessage, VideoMessage, CombinedMessage, RepliedMsg, UnsentRepliedMsg, MessageStatus, Chat, MessageList, ContactList, ConversationList, ConversationItem, MessageInput, Header, Empty, RecalledMessage, rootStore, RootContext, RootProvider, RootConsumer, Provider, useClient, useConversations, useHistoryMessages, useSDK, useIsMobile, useScreen, useConversationContext, useChatroomContext, useChatContext, useAddressContext, useThreadContext, Thread, UserProfile, Blocklist, Chatroom, ChatroomMember, ChatroomMessage, ContactDetail, ContactItem, GroupDetail, GroupMember, UserCardMessage, UserSelect, usePinnedMessage, PinnedMessage } from './module/index';
+import CallKit, { InvitationInfo, InvitationNotificationProps, CallKitProps, VideoWindowProps, LayoutMode, InvitationContent, CallKitRef, CallKitRTCProvider, RTCTokenInfo, RTCUidUserIdMap } from './module/callkit';
+declare const UIKitProvider: import("react").NamedExoticComponent<import("./module/index").ProviderProps>;
+import { Avatar, Button, Input, Badge, Checkbox, Dropdown, Icon, List, Modal, Popover, Switch, Tooltip, ScrollList, Collapse, UserItem } from './component/entry';
+import { eventHandler, EventHandlerData, EventName } from './eventHandler';
+import { MessageInputProps } from './module/index';
+declare const MessageEditor: import("react").MemoExoticComponent<import("react").ForwardRefExoticComponent<Omit<MessageInputProps & import("react").RefAttributes<import("./module/messageInput").MessageInputRef>, "ref"> & import("react").RefAttributes<import("./module/messageInput").MessageInputRef>>>;
+type MessageEditorProps = MessageInputProps;
+export type { MessageEditorProps };
+export { AudioMessage, BaseMessage, FileMessage, ImageMessage, NoticeMessage, TextMessage, VideoMessage, CombinedMessage, RepliedMsg, UnsentRepliedMsg, MessageStatus, Chat, MessageList, ContactList, ConversationList, ConversationItem, MessageInput, MessageEditor, Header, Empty, PinnedMessage, RecalledMessage, rootStore, RootContext, RootProvider, RootConsumer, Provider, useClient, useConversations, useHistoryMessages, useSDK, useConversationContext, useChatroomContext, useChatContext, useAddressContext, useThreadContext, usePinnedMessage, useIsMobile, useScreen, Avatar, Button, Input, Badge, Checkbox, Dropdown, Icon, List, Modal, Popover, UIKitProvider, Switch, Tooltip, ScrollList, Collapse, Thread, UserProfile, Blocklist, Chatroom, ChatroomMember, ChatroomMessage, eventHandler, ContactDetail, ContactItem, GroupDetail, GroupMember, UserCardMessage, UserItem, UserSelect, CallKit, InvitationContent, };
+export type { AvatarProps, ButtonProps, ButtonShape, ButtonSize, ButtonType, InputProps, BadgeProps, CheckboxProps, DropdownProps, IconProps, ICON_TYPES, ListProps, ModalProps, PopoverProps, SwitchProps, ScrollListProps, CollapseProps, UserItemProps, } from './component/entry';
+export type { AudioMessageProps, BaseMessageProps, FileMessageProps, ImageMessageProps, ImagePreviewProps, NoticeMessageProps, TextMessageProps, VideoMessageProps, MessageStatusProps, CombinedMessageProps, RepliedMsgProps, UnsentRepliedMsgProps, ChatProps, MsgListProps, ConversationItemProps, ConversationListProps, ConversationData, MessageInputProps, MoreActionProps, RecorderProps, EmojiProps, SelectedControlsProps, SuggestListProps, TextareaProps, HeaderProps, EmptyProps, RecalledMessageProps, RootStore, InitConfig, MessageStore, Message, SelectedMessage, Typing, ConversationStore, AT_TYPE, Conversation, CurrentConversation, ById, AddressStore, MemberRole, MemberItem, GroupItem, AppUserInfo, ThreadStore, ThreadData, CurrentThread, ProviderProps, ContextProps, ThreadProps, UserProfileProps, BlocklistProps, ContactListProps, ContactDetailProps, GroupDetailProps, GroupMemberProps, UserCardMessageProps, UserSelectProps, PinnedMessageProps, } from './module/index';
+export type { InvitationInfo, InvitationNotificationProps, CallKitProps, VideoWindowProps, LayoutMode, CallKitRef, CallKitRTCProvider, RTCTokenInfo, RTCUidUserIdMap, };
+export type { EventHandlerData, EventName };

package/types/local/resource.d.ts

@@ -0,0 +1,10 @@
+export namespace resource {
+    namespace zh {
+        export { zh as translation };
+    }
+    namespace en {
+        export { en as translation };
+    }
+}
+import zh_1 from "./zh.json";
+import en_1 from "./en.json";

package/types/module/SDK.d.ts

@@ -1,2 +1,15 @@
-import easemobChat, { EasemobChat } from 'easemob-websdk';
-export { easemobChat as chatSDK, EasemobChat as ChatSDK };
+import { ChatClient, ChatManager, ChatRoomManager, ChatThreadManager, ContactManager, GroupManager, PresenceManager, PushManager, UserInfoManager } from 'easemob-websdk';
+import type * as ChatSDK from 'easemob-websdk';
+export declare const UIKitManagers: readonly [typeof ChatManager, typeof ContactManager, typeof GroupManager, typeof ChatRoomManager, typeof PresenceManager, typeof PushManager, typeof UserInfoManager, typeof ChatThreadManager];
+export { ChatClient, ChatManager, ChatRoomManager, ChatThreadManager, ContactManager, GroupManager, PresenceManager, PushManager, UserInfoManager, };
+export type UIKitChatClient = ChatClient & {
+    readonly chatManager: ChatManager;
+    readonly contactManager: ContactManager;
+    readonly groupManager: GroupManager;
+    readonly chatRoomManager: ChatRoomManager;
+    readonly presenceManager: PresenceManager;
+    readonly pushManager: PushManager;
+    readonly userInfoManager: UserInfoManager;
+    readonly chatThreadManager: ChatThreadManager;
+};
+export type { ChatSDK };

package/types/module/baseMessage/BaseMessage.d.ts

@@ -1,7 +1,7 @@
 import React, { ReactNode } from 'react';
 import { MessageStatusProps } from '../messageStatus';
 import { CustomMessageQuoteRenderer } from '../repliedMessage';
-import { ChatSDK } from '../SDK';
+import type { ChatSDK } from '../SDK';
 import { ReactionData, ReactionMessageProps } from '../reaction';
 interface CustomAction {
     visible: boolean;
@@ -13,7 +13,31 @@ interface CustomAction {
         onClick?: (message: BaseMessageType) => void;
     }[];
 }
-export type BaseMessageType = Exclude<ChatSDK.MessageBody, ChatSDK.DeliveryMsgBody | ChatSDK.ReadMsgBody | ChatSDK.ChannelMsgBody>;
+type BaseSdkMessageFields = Omit<Partial<ChatSDK.Message>, 'body' | 'status' | 'type' | 'chatThreadOverview' | 'chatThread'>;
+export type BaseMessageType = BaseSdkMessageFields & {
+    msgLocalId?: string;
+    msgServerId?: string;
+    from?: string;
+    to?: string;
+    sender?: ChatSDK.Sender;
+    conversationId?: string;
+    conversationType?: ChatSDK.ChatConversationType;
+    type?: string;
+    body?: Record<string, any>;
+    ext?: Record<string, any>;
+    status?: string;
+    timestamp?: number;
+    bySelf?: boolean;
+    isChatThread?: boolean;
+    chatThread?: {
+        parentId?: string;
+    };
+    chatThreadOverview?: ChatSDK.ChatThreadSummary | Record<string, any>;
+    chatType?: ChatSDK.ChatConversationType;
+    id?: string;
+    mid?: string;
+    msg?: string;
+};
 export interface renderUserProfileProps {
     userId: string;
 }
@@ -37,7 +61,7 @@ export interface BaseMessageProps {
     style?: React.CSSProperties;
     time?: number;
     hasRepliedMsg?: boolean;
-    repliedMessage?: ChatSDK.MessageBody;
+    repliedMessage?: BaseMessageType;
     customAction?: CustomAction;
     reaction?: boolean;
     select?: boolean;
@@ -55,18 +79,17 @@ export interface BaseMessageProps {
     onSelectMessage?: () => void;
     onResendMessage?: () => void;
     onForwardMessage?: (message: BaseMessageType) => void;
-    onReportMessage?: (message: BaseMessageType) => void;
     onPinMessage?: () => void;
     onMessageCheckChange?: (checked: boolean) => void;
     renderUserProfile?: (props: renderUserProfileProps) => React.ReactNode;
     onCreateThread?: () => void;
     thread?: boolean;
-    chatThreadOverview?: ChatSDK.ChatThreadOverview;
+    chatThreadOverview?: ChatSDK.ChatThreadSummary;
     showNicknamesForAllMessages?: boolean;
     onClickThreadTitle?: () => void;
     reactionConfig?: ReactionMessageProps['reactionConfig'];
     formatDateTime?: (time: number) => string;
-    onClick?: (message: ChatSDK.MessageBody) => boolean;
+    onClick?: (message: BaseMessageType) => boolean;
     /** 自定义消息被引用时的渲染器 */
     renderCustomMessageQuote?: CustomMessageQuoteRenderer;
 }

package/types/module/baseMessage/index.d.ts

@@ -1,3 +1,4 @@
 import { BaseMessage } from './BaseMessage';
 export type { BaseMessageProps, renderUserProfileProps } from './BaseMessage';
+export type { BaseMessageType } from './BaseMessage';
 export default BaseMessage;

package/types/module/callkit/index.d.ts

@@ -1,7 +1,7 @@
 import { CallKit } from './CallKit';
 import VideoLayout from './VideoLayout';
 import CallControls from './components/CallControls';
-export type { CallKitProps, CallKitRef, VideoWindowProps, LayoutMode, InvitationInfo, InvitationNotificationProps, } from './types/index';
+export type { CallKitProps, CallKitRef, VideoWindowProps, LayoutMode, InvitationInfo, InvitationNotificationProps, CallKitRTCProvider, RTCTokenInfo, RTCUidUserIdMap, } from './types/index';
 export type { CallError, CallErrorCode } from './services/CallError';
 export type { CallInfo } from './services/CallService';
 export type { VideoLayoutProps } from './VideoLayout';

package/types/module/callkit/services/CallService.d.ts

@@ -1,7 +1,6 @@
 import { VideoEncoderConfigurationPreset } from 'agora-rtc-sdk-ng';
-import { VideoWindowProps } from '../types/index';
+import type { CallKitRTCProvider, VideoWindowProps } from '../types/index';
 import CallError from './CallError';
-import { ChatSDK } from 'module/SDK';
 export declare enum CALL_STATUS {
     IDLE = 0,
     INVITING = 1,
@@ -88,6 +87,7 @@ export interface CallServiceConfig {
     onRingtoneStart?: (type: 'outgoing' | 'incoming') => void;
     onRingtoneEnd?: (type: 'outgoing' | 'incoming') => void;
     useRTCToken?: boolean;
+    rtcProvider?: CallKitRTCProvider;
 }
 export declare class CallService {
     private client;
@@ -97,11 +97,11 @@ export declare class CallService {
     private userId;
     private connection;
     private accessToken?;
+    private rtcTokenChannelName;
     private currentCallInfo;
     private callStatus;
-    private callDuration;
+    private callTimer;
     private timer;
-    private intervalTimer;
     private joinedMembers;
     private invitedMembers;
     private userInfos;
@@ -135,27 +135,33 @@ export declare class CallService {
     private onRingtoneEnd?;
     private cachedGroupInfos;
     private speakingVolumeThreshold;
-    private outgoingRingtoneAudio;
-    private incomingRingtoneAudio;
-    private outgoingRingtoneSrc?;
-    private incomingRingtoneSrc?;
-    private enableRingtone;
-    private ringtoneVolume;
-    private ringtoneLoop;
-    private isRingtonePlaying;
-    private currentRingtoneType;
+    private ringtoneManager;
     private creatingVideoTrack;
     private encoderConfig?;
     private creatingAudioTrack;
     private UIdToUserIdMap;
     private enableMic;
     private useRTCToken;
+    private rtcProvider?;
     constructor(config: CallServiceConfig);
     setUIdToUserIdMap(uid: string, userId: string): void;
-    getAccessToken(): Promise<string | null>;
+    private toUidKey;
+    private getUserIdFromUid;
+    private mapUidToUserId;
+    /** 1v1 场景：映射失败时回退到通话对端 IM userId */
+    private get1v1PeerUserId;
+    /** Provider 优先，否则使用 SDK5 connection.getUserIdsWithRTCUids。 */
+    private resolveUserIdByRtcUid;
+    private getCurrentUserId;
+    private getClientResource;
+    private createCallCmdMessage;
+    private sendCallMessage;
+    getAccessToken(channelName?: string): Promise<string | null>;
+    private hasValidRTCJoinInfo;
     setUserInfo(userInfo: {
         [key: string]: any;
     }): void;
+    getCachedUserInfo(userId: string): any;
     getCallStatus(): CALL_STATUS;
     getCurrentCallInfo(): CallInfo | null;
     startCall(options: {
@@ -171,7 +177,7 @@ export declare class CallService {
         groupAvatar?: string;
         members?: string[];
         ext?: Record<string, any>;
-    }): Promise<ChatSDK.TextMsgBody | null>;
+    }): Promise<any>;
     private sendInvitationMessage;
     answerCall(result: boolean): Promise<void>;
     private sendAlertingMessage;
@@ -180,7 +186,6 @@ export declare class CallService {
     hangup(reason?: string, isCancel?: boolean): Promise<void>;
     private sendCancelMessage;
     sendHangupMessage(): void;
-    private startCallTimer;
     private addAgoraRTCListeners;
     private handleUserLeft;
     private addMessageListener;
@@ -238,9 +243,6 @@ export declare class CallService {
     setVideoElementReadyCallback(callback: (videoId: string) => void): void;
     notifyVideoElementReady(videoId: string): void;
     private waitForVideoElement;
-    private initRingtone;
-    private playRingtone;
-    private stopRingtone;
     setRingtoneConfig(config: {
         outgoingRingtoneSrc?: string;
         incomingRingtoneSrc?: string;

package/types/module/callkit/services/CallTimerService.d.ts

@@ -0,0 +1,12 @@
+/**
+ * 通话计时器服务
+ */
+export declare class CallTimerService {
+    private intervalTimer;
+    private seconds;
+    private _duration;
+    get duration(): string;
+    start(onUpdate?: (duration: string) => void): void;
+    stop(): void;
+    reset(): void;
+}

package/types/module/callkit/types/index.d.ts

@@ -1,7 +1,7 @@
 import CallError from '../services/CallError';
 import { VideoEncoderConfigurationPreset } from 'agora-rtc-sdk-ng';
 import { CallInfo } from '../services/CallService';
-import { ChatSDK } from 'module/SDK';
+import type { ChatSDK, UIKitChatClient } from 'module/SDK';
 export interface VideoWindowProps {
     id: string;
     stream?: MediaStream;
@@ -98,12 +98,12 @@ export interface CallKitRef {
         groupId: string;
         msg: string;
         ext?: Record<string, any>;
-    }) => Promise<ChatSDK.TextMsgBody | null>;
+    }) => Promise<ChatSDK.Message | null>;
     startSingleCall: (options: {
         to: string;
         callType: 'video' | 'audio';
         msg: string;
-    }) => Promise<ChatSDK.TextMsgBody | null>;
+    }) => Promise<ChatSDK.Message | null>;
     answerCall: (result: boolean) => void;
     exitCall: (reason?: string) => void;
     setUserInfo: (userInfo: {
@@ -124,6 +124,22 @@ export interface CallKitRef {
         height: number;
     }) => void;
 }
+export interface RTCTokenInfo {
+    appId: string;
+    rtcToken: string;
+    rtcUid: number;
+}
+export type RTCUidUserIdMap = Record<string, string>;
+/**
+ * RTC 数据提供器。方法签名和返回值与 IM SDK 的同名方法保持一致。
+ * 配置某个方法后 CallKit 会优先使用该方法，否则回退到 IM SDK。
+ */
+export interface CallKitRTCProvider {
+    getRTCTokenInfo?: (params: {
+        channelName: string;
+    }) => Promise<RTCTokenInfo>;
+    getUserIdsWithRTCUids?: (rtcUids: number[]) => Promise<RTCUidUserIdMap>;
+}
 export interface CallKitProps {
     className?: string;
     style?: React.CSSProperties;
@@ -139,9 +155,10 @@ export interface CallKitProps {
     cameraEnabled?: boolean;
     speakerEnabled?: boolean;
     screenSharing?: boolean;
-    chatClient?: ChatSDK.Connection;
+    chatClient?: UIKitChatClient;
     enableRealCall?: boolean;
     useRTCToken?: boolean;
+    rtcProvider?: CallKitRTCProvider;
     outgoingRingtoneSrc?: string;
     incomingRingtoneSrc?: string;
     enableRingtone?: boolean;

package/types/module/callkit/utils/ringtoneManager.d.ts

@@ -0,0 +1,38 @@
+/**
+ * 铃声管理器
+ */
+export declare class RingtoneManager {
+    private outgoingRingtoneAudio;
+    private incomingRingtoneAudio;
+    private outgoingRingtoneSrc?;
+    private incomingRingtoneSrc?;
+    private enableRingtone;
+    private ringtoneVolume;
+    private ringtoneLoop;
+    private isRingtonePlaying;
+    private currentRingtoneType;
+    private onStart?;
+    private onEnd?;
+    constructor(config?: {
+        outgoingRingtoneSrc?: string;
+        incomingRingtoneSrc?: string;
+        enableRingtone?: boolean;
+        ringtoneVolume?: number;
+        ringtoneLoop?: boolean;
+        onStart?: (type: 'outgoing' | 'incoming') => void;
+        onEnd?: (type: 'outgoing' | 'incoming') => void;
+    });
+    private init;
+    playRingtone(type: 'outgoing' | 'incoming'): Promise<void>;
+    stopRingtone(): void;
+    setConfig(config: {
+        outgoingRingtoneSrc?: string;
+        incomingRingtoneSrc?: string;
+        enableRingtone?: boolean;
+        ringtoneVolume?: number;
+        ringtoneLoop?: boolean;
+    }): void;
+    destroy(): void;
+    get isPlaying(): boolean;
+    get currentType(): 'outgoing' | 'incoming' | null;
+}

package/types/module/chat/Chat.d.ts

@@ -2,7 +2,7 @@ import React, { ReactNode } from 'react';
 import { HeaderProps } from '../header';
 import { MessageInputProps } from '../messageInput';
 import { MsgListProps } from './MessageList';
-import { ChatSDK } from 'module/SDK';
+import type { ChatSDK } from 'module/SDK';
 import { CallKitProps } from '../callkit';
 export interface RtcRoomInfo {
     callId: string;
@@ -34,7 +34,7 @@ export interface ChatProps {
     renderMessageList?: () => ReactNode;
     renderMessageInput?: () => ReactNode;
     renderEmpty?: () => ReactNode;
-    renderRepliedMessage?: (repliedMessage: ChatSDK.MessageBody | null) => ReactNode;
+    renderRepliedMessage?: (repliedMessage: ChatSDK.Message | null) => ReactNode;
     headerProps?: Omit<HeaderProps, 'suffixIcon'> & {
         suffixIcon?: ('PIN' | 'THREAD' | 'AUDIO' | 'VIDEO' | ReactNode)[];
     };

package/types/module/chat/MessageList.d.ts

@@ -1,20 +1,21 @@
 import React, { FC, ReactNode } from 'react';
-import { ChatSDK } from '../SDK';
+import type { ChatSDK } from '../SDK';
 import { renderUserProfileProps } from '../baseMessage';
 import { CurrentConversation } from '../store/ConversationStore';
 import { BaseMessageProps } from '../baseMessage';
 import { NoticeMessageBody } from '../noticeMessage/NoticeMessage';
+export type MessageListItem = ChatSDK.Message | NoticeMessageBody;
 export interface MessageRenderContext {
-    message: ChatSDK.MessageBody | NoticeMessageBody;
+    message: MessageListItem;
     style: React.CSSProperties;
     renderUserProfile?: (props: renderUserProfileProps) => React.ReactNode;
     isThread?: boolean;
     messageProps?: BaseMessageProps;
     onOpenThreadPanel?: (threadId: string) => void;
-    onRtcInviteMessageClick?: (message: ChatSDK.MessageBody) => void;
+    onRtcInviteMessageClick?: (message: ChatSDK.Message) => void;
     scrollToBottom?: () => void;
 }
-export type MessageType = 'txt' | 'img' | 'audio' | 'video' | 'file' | 'loc' | 'combine' | 'custom' | 'notice' | 'recall';
+export type MessageType = 'txt' | 'text' | 'img' | 'image' | 'audio' | 'voice' | 'video' | 'file' | 'loc' | 'location' | 'combine' | 'custom' | 'cmd' | 'notice' | 'recall';
 export type MessageRenderer = (context: MessageRenderContext) => ReactNode;
 export interface MsgListProps {
     prefix?: string;
@@ -22,14 +23,14 @@ export interface MsgListProps {
     style?: React.CSSProperties;
     isThread?: boolean;
     /** @deprecated 使用 customRenderers 替代，支持按类型自定义 */
-    renderMessage?: (message: ChatSDK.MessageBody | NoticeMessageBody) => ReactNode;
+    renderMessage?: (message: MessageListItem) => ReactNode;
     /** 按消息类型自定义渲染器，只需要传入想自定义的类型即可，其他类型会使用默认渲染 */
     customRenderers?: Partial<Record<MessageType, MessageRenderer>>;
     renderUserProfile?: (props: renderUserProfileProps) => React.ReactNode;
     conversation?: CurrentConversation;
     messageProps?: BaseMessageProps;
     onOpenThreadPanel?: (threadId: string) => void;
-    onRtcInviteMessageClick?: (message: ChatSDK.MessageBody) => void;
+    onRtcInviteMessageClick?: (message: ChatSDK.Message) => void;
 }
 declare let MessageList: FC<MsgListProps>;
 export { MessageList };

package/types/module/chatroom/Chatroom.d.ts

@@ -6,7 +6,6 @@ import { ChatroomMessageActionConfig } from '../chatroomMessage';
 import { BroadcastProps } from '../../component/broadcast';
 import { ChatroomInfo } from '../store/AddressStore';
 import { MessageRenderer } from '../chat/MessageList';
-export declare let reportType: Record<string, string>;
 export interface ChatroomProps {
     prefix?: string;
     className?: string;
@@ -26,9 +25,10 @@ export interface ChatroomProps {
     renderBroadcast?: () => ReactNode;
     broadcastProps?: BroadcastProps;
     chatroomId: string;
-    reportType?: Record<string, string>;
     messageActionConfig?: ChatroomMessageActionConfig;
     customMessageRenderers?: {
+        text?: MessageRenderer;
+        /** @deprecated SDK5 文本消息类型为 text */
         txt?: MessageRenderer;
         custom?: MessageRenderer;
     };

package/types/module/chatroomMessage/ChatroomMessage.d.ts

@@ -1,25 +1,23 @@
 import React, { ReactNode } from 'react';
-import { ChatSDK } from '../SDK';
+import type { ChatSDK } from '../SDK';
 export interface ChatroomMessageActionConfig {
     recall?: boolean;
     translate?: boolean;
     mute?: boolean;
-    report?: boolean;
     pin?: boolean;
     customActions?: Array<{
         content: string | ReactNode;
         icon?: ReactNode;
-        onClick: (message: ChatSDK.MessageBody) => void;
-        visible?: (message: ChatSDK.MessageBody) => boolean;
+        onClick: (message: ChatSDK.Message) => void;
+        visible?: (message: ChatSDK.Message) => boolean;
     }>;
 }
 export interface ChatroomMessageProps {
     prefix?: string;
     className?: string;
     style?: React.CSSProperties;
-    message: ChatSDK.MessageBody;
+    message: ChatSDK.Message;
     targetLanguage?: string;
-    onReport?: (message: ChatSDK.MessageBody) => void;
     actionConfig?: ChatroomMessageActionConfig;
 }
 declare const ChatroomMessageOut: ((props: ChatroomMessageProps) => import("react/jsx-runtime").JSX.Element) & {

package/types/module/combinedMessage/CombinedMessage.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { BaseMessageProps, renderUserProfileProps } from '../baseMessage';
-import { ChatSDK } from '../SDK';
+import type { ChatSDK } from '../SDK';
 import { BaseMessageType } from '../baseMessage/BaseMessage';
 export interface CombinedMessageProps extends BaseMessageProps {
     prefix?: string;

package/types/module/contactList/ContactList.d.ts

@@ -1,5 +1,7 @@
 import React, { FC } from 'react';
 import { UserInfoData } from '../../component/userItem';
+import type { GroupItem } from '../store/AddressStore';
+type ContactListGroupItem = Pick<GroupItem, 'groupId' | 'name' | 'groupName' | 'avatarUrl'>;
 export interface ContactListProps {
     style?: React.CSSProperties;
     className?: string;
@@ -15,10 +17,7 @@ export interface ContactListProps {
         data: ({
             remark?: string;
             userId: string;
-        } | {
-            groupname: string;
-            groupid: string;
-        })[];
+        } | ContactListGroupItem)[];
     })[];
     hasMenu?: boolean;
     checkable?: boolean;

package/types/module/fileMessage/FileMessage.d.ts

@@ -2,8 +2,9 @@ import React from 'react';
 import { BaseMessageProps, renderUserProfileProps } from '../baseMessage';
 import { IconProps } from '../../component/icon';
 import type { FileMessageType } from '../types/messageType';
+import type { ChatSDK } from '../SDK';
 export interface FileMessageProps extends BaseMessageProps {
-    fileMessage: FileMessageType;
+    fileMessage: FileMessageType | ChatSDK.Message;
     iconType?: IconProps['type'];
     prefix?: string;
     className?: string;
@@ -13,7 +14,7 @@ export interface FileMessageProps extends BaseMessageProps {
     type?: 'primary' | 'secondly';
     renderUserProfile?: (props: renderUserProfileProps) => React.ReactNode;
 }
-declare const FileMessageOut: ((props: FileMessageProps) => import("react/jsx-runtime").JSX.Element) & {
+declare const FileMessageOut: ((props: FileMessageProps) => import("react/jsx-runtime").JSX.Element | null) & {
     displayName: string;
 };
 export default FileMessageOut;

package/types/module/hooks/chat.d.ts

@@ -1,3 +1,3 @@
 import { ProviderProps } from '../store/Provider';
-declare const useEventHandler: (props: ProviderProps) => void;
+declare const useEventHandler: (props: ProviderProps, client: any) => void;
 export { useEventHandler };

package/types/module/hooks/useAddress.d.ts

@@ -2,7 +2,7 @@ declare const useContacts: () => {
     userId: string;
     nickname: string;
 }[];
-declare const useUserInfo: (userList: 'conversation' | 'contacts' | 'blocklist', withPresence?: boolean) => void;
+declare const useUserInfo: (userList: 'conversation' | 'contacts' | 'blocklist' | null, withPresence?: boolean) => void;
 declare const useGroups: () => {
     getJoinedGroupList: () => void;
 };

package/types/module/hooks/useAddressContext.d.ts

@@ -4,9 +4,19 @@ declare const useAddressContext: () => {
     setAppUserInfo: (appUsersInfo: Record<string, import("..").AppUserInfo>) => void;
     setGroups: (groups: import("..").GroupItem[]) => void;
     updateGroupName: (groupId: string, groupName: string) => void;
-    setGroupMembers: (groupId: string, membersList: import("easemob-websdk").EasemobChat.GroupMember[]) => void;
+    setGroupMembers: (groupId: string, membersList: ({
+        userId?: string | undefined;
+        member?: string | undefined;
+        owner?: string | undefined;
+        role?: import("..").MemberRole | undefined;
+    } | {
+        user?: {
+            userId?: string | undefined;
+        } | undefined;
+        role?: import("..").MemberRole | undefined;
+    })[]) => void;
     removeGroupMember: (groupId: string, userId: string) => void;
-    setGroupMemberAttributes: (groupId: string, userId: string, attributes: import("easemob-websdk").EasemobChat.MemberAttributes) => void;
+    setGroupMemberAttributes: (groupId: string, userId: string, attributes: Record<string, string>) => void;
     setGroupAdmins: (groupId: string, admins: string[]) => void;
     getGroupMembers: (groupId: string, withUserInfo: boolean) => Promise<void> | undefined;
 };

package/types/module/hooks/useChatContext.d.ts

@@ -1,18 +1,18 @@
 declare const useChatContext: () => {
     messages: import("..").Message;
-    repliedMessage: import("easemob-websdk").EasemobChat.ReadMsgBody | import("easemob-websdk").EasemobChat.DeliveryMsgBody | import("easemob-websdk").EasemobChat.ChannelMsgBody | import("easemob-websdk").EasemobChat.TextMsgBody | import("easemob-websdk").EasemobChat.CmdMsgBody | import("easemob-websdk").EasemobChat.CustomMsgBody | import("easemob-websdk").EasemobChat.LocationMsgBody | import("easemob-websdk").EasemobChat.ImgMsgBody | import("easemob-websdk").EasemobChat.AudioMsgBody | import("easemob-websdk").EasemobChat.VideoMsgBody | import("easemob-websdk").EasemobChat.FileMsgBody | import("easemob-websdk").EasemobChat.CombineMsgBody | import("easemob-websdk").EasemobChat.StreamMsgBody | null;
+    repliedMessage: import("easemob-websdk").Message | null;
     typing: import("..").Typing;
-    sendMessage: (message: import("easemob-websdk").EasemobChat.MessageBody) => Promise<void>;
+    sendMessage: (message: import("easemob-websdk").Message) => Promise<void>;
     deleteMessage: (cvs: import("..").CurrentConversation, messageId: string | string[]) => void | Promise<void>;
     recallMessage: (cvs: import("..").CurrentConversation, messageId: string, isChatThread?: boolean, recallMySelfMsg?: boolean) => Promise<void> | undefined;
     addReaction: (cvs: import("..").CurrentConversation, messageId: string, emoji: string) => Promise<void> | undefined;
     deleteReaction: (cvs: import("..").CurrentConversation, messageId: string, emoji: string) => Promise<void>;
     translateMessage: (cvs: import("..").CurrentConversation, messageId: string, language: string) => Promise<unknown>;
-    modifyMessage: (messageId: string, msg: import("easemob-websdk").EasemobChat.ExcludeAckMessageBody) => Promise<void>;
-    modifyLocalMessage: (id: string, message: import("easemob-websdk").EasemobChat.MessageBody | import("../noticeMessage/NoticeMessage").NoticeMessageBody) => void;
+    modifyMessage: (messageId: string, msg: import("easemob-websdk").Message) => Promise<void>;
+    modifyLocalMessage: (id: string, message: import("../noticeMessage/NoticeMessage").NoticeMessageBody | import("easemob-websdk").Message) => void;
     updateMessageStatus: (msgId: string, status: string) => void;
     sendTypingCommand: (cvs: import("..").CurrentConversation) => void;
-    setRepliedMessage: (message: import("easemob-websdk").EasemobChat.MessageBody | null) => void;
+    setRepliedMessage: (message: import("easemob-websdk").Message | null) => void;
     clearMessages: (cvs: import("..").CurrentConversation) => void;
 };
 export { useChatContext };

package/types/module/hooks/usePinnedMessage.d.ts

@@ -1,12 +1,12 @@
 import { ChatType } from '../../module/types/messageType';
 declare const usePinnedMessage: (params?: {
     conversation?: {
-        conversationType?: ChatType | undefined;
+        conversationType?: "singleChat" | "groupChat" | "chatRoom" | undefined;
         conversationId?: string | undefined;
     } | undefined;
     pageSize?: number | undefined;
 } | undefined) => {
-    list: import("easemob-websdk").EasemobChat.PinnedMessageInfo[];
+    list: import("easemob-websdk").PinnedMessageSummary[];
     cursor: string | null;
     pageSize: number;
     visible: boolean;