juggleim-rnsdk 0.1.13 → 0.2.1

package/src/index.js

@@ -152,9 +152,10 @@ class JuggleIM {
     if (listener.onMessageReceive) {
       const subscription = juggleIMEmitter.addListener(
         "MessageReceived",
-        (event) => {
+        async (event) => {
+          const message = await this.buildMessageInfo(event.message);
           if (Platform.OS === "android" && event.key !== key) return;
-          listener.onMessageReceive(event.message);
+          listener.onMessageReceive(message);
         }
       );
       subscriptions.push(subscription);
@@ -356,8 +357,10 @@ class JuggleIM {
       const subscription = juggleIMEmitter.addListener(
         "ConversationInfoAdded",
         (event) => {
+          const convsList = this.buildConversationInfoList(event.conversations);
+          console.log("ConversationInfoAdded", convsList);
           if (Platform.OS === "android" && event.key !== key) return;
-          listener.onConversationInfoAdd(event.conversations);
+          listener.onConversationInfoAdd(convsList);
         }
       );
       subscriptions.push(subscription);
@@ -368,8 +371,10 @@ class JuggleIM {
       const subscription = juggleIMEmitter.addListener(
         "ConversationInfoUpdated",
         (event) => {
+          const convsList = this.buildConversationInfoList(event.conversations);
+          console.log("ConversationInfoUpdated", convsList);
           if (Platform.OS === "android" && event.key !== key) return;
-          listener.onConversationInfoUpdate(event.conversations);
+          listener.onConversationInfoUpdate(convsList);
         }
       );
       subscriptions.push(subscription);
@@ -380,8 +385,10 @@ class JuggleIM {
       const subscription = juggleIMEmitter.addListener(
         "ConversationInfoDeleted",
         (event) => {
+          const convsList = this.buildConversationInfoList(event.conversations);
+          console.log("ConversationInfoDeleted", convsList);
           if (Platform.OS === "android" && event.key !== key) return;
-          listener.onConversationInfoDelete(event.conversations);
+          listener.onConversationInfoDelete(convsList);
         }
       );
       subscriptions.push(subscription);
@@ -411,12 +418,68 @@ class JuggleIM {
    * @returns {Promise<ConversationInfo[]>} 会话信息列表
    */
   static getConversationInfoList(option) {
-    console.log("getConversationInfoList called with option:", option);
-    return JMI.getConversationInfoList(
-      option.count,
-      option.timestamp,
-      option.direction
-    );
+    return new Promise((resolve, reject) => {
+      JMI.getConversationInfoList(
+        option.count,
+        option.timestamp,
+        option.direction
+      ).then(convs => {
+        convs?.forEach(async (conv) => {
+          if (conv.conversation?.conversationType === 1) {
+            const userInfo = await JMI.getUserInfo(conv.conversation?.conversationId);
+            conv.name = userInfo?.nickname;
+            conv.avatar = userInfo?.avatar;
+            conv.extra = userInfo?.extra;
+          } else if (conv.conversation?.conversationType === 2) {
+            const groupInfo = await JMI.getGroupInfo(conv.conversation?.conversationId);
+            conv.name = groupInfo?.groupName;
+            conv.avatar = groupInfo?.portrait;
+            conv.extra = groupInfo?.extra;
+          }
+          if (conv.lastMessage) {
+            const userInfo = await JMI.getUserInfo(conv.lastMessage.senderUserId);
+            conv.lastMessage.senderUserName = userInfo?.nickname;
+            conv.lastMessage.senderUserAvatar = userInfo?.avatar;
+            conv.lastMessage.senderUserExtra = userInfo?.extra;
+          }
+        });
+        resolve(convs || []);
+      }).catch(err => {
+        console.error(err);
+        reject(err);
+      });
+    });
+  }
+
+  static buildConversationInfoList(convs) {
+    convs?.forEach(async (conv) => {
+      if (conv.conversation?.conversationType === 1) {
+        const userInfo = await JMI.getUserInfo(conv.conversation?.conversationId);
+        conv.name = userInfo?.nickname;
+        conv.avatar = userInfo?.avatar;
+        conv.extra = userInfo?.extra;
+      } else if (conv.conversation?.conversationType === 2) {
+        const groupInfo = await JMI.getGroupInfo(conv.conversation?.conversationId);
+        conv.name = groupInfo?.groupName;
+        conv.avatar = groupInfo?.portrait;
+        conv.extra = groupInfo?.extra;
+      }
+      if (conv.lastMessage) {
+        const userInfo = await JMI.getUserInfo(conv.lastMessage.senderUserId);
+        conv.lastMessage.senderUserName = userInfo?.nickname;
+        conv.lastMessage.senderUserAvatar = userInfo?.avatar;
+        conv.lastMessage.senderUserExtra = userInfo?.extra;
+      }
+    });
+    return convs;
+  }
+
+  static async buildMessageInfo(message) {
+    const userInfo = await JMI.getUserInfo(message.senderUserId);
+    message.senderUserName = userInfo?.nickname;
+    message.senderUserAvatar = userInfo?.avatar;
+    message.senderUserExtra = userInfo?.extra;
+    return message;
   }
 
   /**
@@ -425,7 +488,61 @@ class JuggleIM {
    * @returns {Promise<object>} 会话信息
    */
   static getConversationInfo(conversation) {
-    return JMI.getConversationInfo(conversation);
+    return new Promise((resolve, reject) => {
+      JMI.getConversationInfo(conversation).then(async conv => {
+        if (conv) {
+          if (conv.conversation?.conversationType === 1) {
+            const userInfo = await JMI.getUserInfo(conv.conversation?.conversationId);
+            conv.name = userInfo?.nickname;
+            conv.avatar = userInfo?.avatar;
+            conv.extra = userInfo?.extra;
+          } else if (conv.conversation?.conversationType === 2) {
+            const groupInfo = await JMI.getGroupInfo(conv.conversation?.conversationId);
+            conv.name = groupInfo?.groupName;
+            conv.avatar = groupInfo?.portrait;
+            conv.extra = groupInfo?.extra;
+          }
+          if (conv.lastMessage) {
+            const userInfo = await JMI.getUserInfo(conv.lastMessage.senderUserId);
+            conv.lastMessage.senderUserName = userInfo?.nickname;
+            conv.lastMessage.senderUserAvatar = userInfo?.avatar;
+            conv.lastMessage.senderUserExtra = userInfo?.extra;
+          }
+        }
+        resolve(conv);
+      }).catch(err => {
+        console.error(err);
+        reject(err);
+      });
+    });
+  }
+
+  /**
+   * 获取用户信息
+   * @param {string} userId - 用户ID
+   * @returns {Promise<UserInfo>} 用户信息
+   */
+  static getUserInfo(userId) {
+    return JMI.getUserInfo(userId);
+  }
+
+  /**
+   * 获取群组信息
+   * @param {string} groupId - 群组ID
+   * @returns {Promise<GroupInfo>} 群组信息
+   */
+  static getGroupInfo(groupId) {
+    return JMI.getGroupInfo(groupId);
+  }
+
+  /**
+   * 获取群成员信息
+   * @param {string} groupId - 群组ID
+   * @param {string} userId - 用户ID
+   * @returns {Promise<GroupMember>} 群成员信息
+   */
+  static getGroupMember(groupId, userId) {
+    return JMI.getGroupMember(groupId, userId);
   }
 
   /**
@@ -492,11 +609,18 @@ class JuggleIM {
    * @returns {Promise<boolean>} 清除结果
    */
   static clearUnreadCount(conversation) {
-    if (Platform.OS === "android") {
-      return JMI.clearUnreadCount(conversation);
-    } else if (Platform.OS === "ios") {
-      return JMI.clearUnreadCount(conversation);
-    }
+    // 参数检查
+    return new Promise((resolve, reject) => {
+      if (!conversation || !conversation.conversationId || !conversation.conversationType) {
+        reject('error', '会话参数错误');
+        return;
+      }
+      if (Platform.OS === "android") {
+        JMI.clearUnreadCount(conversation).then(resolve).catch(reject);
+      } else if (Platform.OS === "ios") {
+        JMI.clearUnreadCount(conversation).then(resolve).catch(reject);
+      }
+    });
   }
 
   /**
@@ -551,7 +675,33 @@ class JuggleIM {
    * @returns {Promise<Array>} 置顶会话列表
    */
   static getTopConversationInfoList(count = 20, timestamp = 0, direction = 0) {
-    return JMI.getTopConversationInfoList(count, timestamp, direction);
+    return new Promise((resolve, reject) => {
+      JMI.getTopConversationInfoList(count, timestamp, direction).then(convs => {
+        convs?.forEach(async (conv) => {
+          if (conv.conversation?.conversationType === 1) {
+            const userInfo = await JMI.getUserInfo(conv.conversation?.userId);
+            conv.name = userInfo?.nickname;
+            conv.avatar = userInfo?.avatar;
+            conv.extra = userInfo?.extra;
+          } else if (conv.conversation?.conversationType === 2) {
+            const groupInfo = await JMI.getGroupInfo(conv.conversation?.groupId);
+            conv.name = groupInfo?.groupName;
+            conv.avatar = groupInfo?.portrait;
+            conv.extra = groupInfo?.extra;
+          }
+          if (conv.lastMessage) {
+            const userInfo = await JMI.getUserInfo(conv.lastMessage.senderUserId);
+            conv.lastMessage.senderUserName = userInfo?.nickname;
+            conv.lastMessage.senderUserAvatar = userInfo?.avatar;
+            conv.lastMessage.senderUserExtra = userInfo?.extra;
+          }
+        });
+        resolve(convs || []);
+      }).catch(err => {
+        console.error(err);
+        reject(err);
+      });
+    });
   }
 
   /**
@@ -709,6 +859,10 @@ class JuggleIM {
 
     try {
       const localMsg = await JMI.sendImageMessage(message, messageId);
+      console.log("sendImageMessage localMsg:", localMsg);
+      if (localMsg.content?.local) {
+        localMsg.content.localPath = localMsg.content.local;
+      }
       return localMsg;
     } catch (error) {
       progressListener.remove();
@@ -822,6 +976,7 @@ class JuggleIM {
       "onMediaMessageSent",
       (event) => {
         if (event.messageId === messageId) {
+          console.log("onMediaMessageSent msg:", event);
           callback.onSuccess?.(event.message);
           progressListener.remove();
           successListener.remove();
@@ -858,9 +1013,7 @@ class JuggleIM {
     );
 
     try {
-      console.log("sendVoiceMessage message...:", message);
       const localMsg = await JMI.sendVoiceMessage(message, messageId);
-      console.log("sendVoiceMessage localMsg:", localMsg);
       return localMsg;
     } catch (error) {
       progressListener.remove();
@@ -873,7 +1026,7 @@ class JuggleIM {
 
   /**
    * 发送合并消息（构建 MergeMessage 并发送）
-   * @param {MergedMessageContent} mergedMessage - 要合并转发的消息 ID 列表
+   * @param {MergeMessageContent} mergedMessage - 要合并转发的消息 ID 列表
    * @param {Conversation} conversation - 目标会话（同时作为 MergeMessage 中的 conversation 字段）
    * @param {SendMessageCallback} callback - 回调对象，包含 onSuccess/onError
    */
@@ -894,7 +1047,21 @@ class JuggleIM {
    * @param {Object} options - 获取选项
    */
   static getMessageList(conversation, direction, options) {
-    return JMI.getMessages(conversation, direction, options);
+    return new Promise((resolve, reject) => {
+      JMI.getMessages(conversation, direction, options).then(res => {
+        const msgs = res?.messages;
+        msgs?.forEach(async (msg) => {
+          const userInfo = await JMI.getUserInfo(msg.senderUserId);
+          msg.senderUserName = userInfo?.nickname;
+          msg.senderUserAvatar = userInfo?.avatar;
+          msg.senderUserExtra = userInfo?.extra;
+        });
+        resolve(res);
+      }).catch(err => {
+        console.error(err);
+        reject(err);
+      });
+    });
   }
 
   /**
@@ -979,6 +1146,51 @@ class JuggleIM {
   static setMessageTop(messageId, conversation, isTop) {
     return JMI.setMessageTop(messageId, conversation, isTop);
   }
+
+  /**
+   * 获取合并消息列表
+   * @param {string} messageId - 合并消息ID
+   * @returns {Promise<Message[]>} 消息列表
+   */
+  static getMergedMessageList(messageId) {
+    return JMI.getMergedMessageList(messageId);
+  }
+
+  /**
+   * 从服务端获取用户信息
+   * @param {string} userId - 用户ID
+   * @returns {Promise<UserInfo>} 用户信息
+   */
+  static fetchUserInfo(userId) {
+    return JMI.fetchUserInfo(userId);
+  }
+
+  /**
+   * 从服务端获取群组信息
+   * @param {string} groupId - 群组ID
+   * @returns {Promise<GroupInfo>} 群组信息
+   */
+  static fetchGroupInfo(groupId) {
+    return JMI.fetchGroupInfo(groupId);
+  }
+
+  /**
+   * 批量获取用户信息
+   * @param {Array<string>} userIdList - 用户ID列表
+   * @returns {Promise<UserInfo[]>} 用户信息列表
+   */
+  static getUserInfoList(userIdList) {
+    return JMI.getUserInfoList(userIdList);
+  }
+
+  /**
+   * 批量获取群组信息
+   * @param {Array<string>} groupIdList - 群组ID列表
+   * @returns {Promise<GroupInfo[]>} 群组信息列表
+   */
+  static getGroupInfoList(groupIdList) {
+    return JMI.getGroupInfoList(groupIdList);
+  }
 }
 
 export * from './types';

package/src/types.d.ts

@@ -68,7 +68,11 @@ export class RecallInfoMessageContent extends MessageContent {
 }
 
 /**
- * 合并消息内容
+ * 合并消息内容:jg:merge
+ * @property {string} title - 合并消息标题
+ * @property {Conversation} conversation - 会话对象
+ * @property {string[]} messageIdList - 消息ID列表
+ * @property {MergeMessagePreviewUnit[]} previewList - 预览列表
  */
 export class MergeMessageContent extends MessageContent {
     contentType: string;
@@ -101,6 +105,8 @@ export class MergeMessageContent extends MessageContent {
 
 /**
  * 合并消息预览单元
+ * @property {string} previewContent - 预览内容
+ * @property {UserInfo} sender - 发送者
  */
 export class MergeMessagePreviewUnit {
     constructor(previewContent?: string, sender?: UserInfo);
@@ -178,6 +184,9 @@ export class VoiceMessageContent extends MessageContent {
  * @property {number} direction - 消息方向: 1-发送, 2-接收
  * @property {boolean} isDelete - 是否已删除
  * @property {string} senderUserId - 发送者用户ID
+ * @property {string} senderUserName - 发送者用户昵称
+ * @property {string} senderUserAvatar - 发送者用户头像
+ * @property {object} senderUserExtra - 发送者用户扩展信息
  * @property {string} messageId - 消息ID
  * @property {boolean} hasRead - 是否已读
  * @property {number} timestamp - 消息时间戳
@@ -195,6 +204,9 @@ export interface Message {
     direction: number;
     isDelete: boolean;
     senderUserId: string;
+    senderUserName?: string;
+    senderUserAvatar?: string;
+    senderUserExtra?: { [key: string]: string };
     messageId: string;
     hasRead: boolean;
     timestamp: number;
@@ -221,11 +233,56 @@ export interface MessageResponse {
 
 /**
  * 用户信息
+ * @property {string} userId - 用户ID
+ * @property {string} nickname - 昵称
+ * @property {string} [userName] - 用户名
+ * @property {string} avatar - 头像
+ * @property {string} [portrait] - 头像 (同 avatar)
+ * @property {string | object} [extra] - 扩展信息
+ * @property {number} [updateTime] - 更新时间
+ * @property {number} [type] - 用户类型
  */
 export interface UserInfo {
     userId: string;
     nickname: string;
+    userName?: string;
     avatar: string;
+    portrait?: string;
+    extra?: string | object;
+    updateTime?: number;
+    type?: number;
+}
+
+/**
+ * 群组信息
+ * @property {string} groupId - 群组ID
+ * @property {string} groupName - 群组名称
+ * @property {string} portrait - 群组头像
+ * @property {object} [extra] - 扩展信息
+ * @property {number} [updatedTime] - 更新时间
+ */
+export interface GroupInfo {
+    groupId: string;
+    groupName: string;
+    portrait: string;
+    extra?: { [key: string]: string };
+    updatedTime?: number;
+}
+
+/**
+ * 群成员信息
+ * @property {string} groupId - 群组ID
+ * @property {string} userId - 用户ID
+ * @property {string} groupDisplayName - 群昵称
+ * @property {object} [extra] - 扩展信息
+ * @property {number} [updatedTime] - 更新时间
+ */
+export interface GroupMember {
+    groupId: string;
+    userId: string;
+    groupDisplayName: string;
+    extra?: { [key: string]: string };
+    updatedTime?: number;
 }
 
 export interface MessageReactionItem {
@@ -290,6 +347,22 @@ export interface MentionMsg {
     type: number;
 }
 
+/**
+ * 会话信息
+ * @property {Conversation} conversation - 会话
+ * @property {number} unreadCount - 未读消息数
+ * @property {boolean} isTop - 是否置顶
+ * @property {boolean} isMute - 是否静音
+ * @property {Message} [lastMessage] - 最后一条消息
+ * @property {number} topTime - 置顶时间
+ * @property {number} sortTime - 排序时间
+ * @property {boolean} hasUnread - 是否有未读消息
+ * @property {string} draft - 草稿
+ * @property {ConversationMentionInfo} [mentionInfo] - 会话提及信息
+ * @property {string} [name] - 会话名称
+ * @property {string} [avatar] - 会话头像
+ * @property {object} [extra] - 会话"头像/名称"扩展信息
+ */
 export interface ConversationInfo {
     conversation: Conversation;
     unreadCount: number;
@@ -301,6 +374,9 @@ export interface ConversationInfo {
     hasUnread: boolean;
     draft: string;
     mentionInfo?: ConversationMentionInfo;
+    name?: string;
+    avatar?: string;
+    extra?: {};
 }
 
 /**
@@ -372,6 +448,22 @@ export interface SendMessageObject {
 }
 /**
  * 连接状态监听器回调函数
+ * @param {ConnectionStatus} status - 连接状态
+ * @param {number} code - 状态码
+ *        0: CONNECT_SUCCESS 链接成功
+ *        11000: CONNECT_ERROR 默认错误
+ *        11001: CONNECT_APPKEY_IS_REQUIRE 未传 Appkey
+ *        11002: CONNECT_TOKEN_NOT_EXISTS 未传 Token
+ *        11003: CONNECT_APPKEY_NOT_EXISTS Appkey 不存在
+ *        11004: CONNECT_TOKEN_ILLEGAL Token 不合法
+ *        11005: CONNECT_TOKEN_UNAUTHORIZED Token 未授权
+ *        11006: CONNECT_TOKEN_EXPIRE Token 已过期
+ *        11008: CONNECT_UNSUPPORT_PLATFORM 不支持的平台类型
+ *        11009: CONNECT_APP_BLOCKED App已封禁
+ *        11010: CONNECT_USER_BLOCKED 用户已封禁
+ *        11011: CONNECT_USER_KICKED 被踢下线
+ *        11012: CONNECT_USER_LOGOUT 注销下线
+ * @param {string} extra - 扩展信息
  */
 export type ConnectionStatusListener = (
     status: ConnectionStatus,