juggleim-rnsdk 0.0.11 → 0.0.15

package/README.md

@@ -6,7 +6,7 @@ React Native wrapper for Juggle IM SDK，提供即时通讯功能的React Native
 ## 安装
 
 ```bash
-npm install im-rn-sdk --registry=https://repo.juggle.im/repository/npm-hosted/ --legacy-peer-deps
+npm install juggleim-rnsdk --legacy-peer-deps
 ```
 
 ## 初始化
@@ -14,7 +14,7 @@ npm install im-rn-sdk --registry=https://repo.juggle.im/repository/npm-hosted/ -
 在使用Juggle IM SDK之前，需要先进行初始化设置：
 
 ```javascript
-import JuggleIM from 'im-rn-sdk';
+import JuggleIM from 'juggleim-rnsdk';
 
 // 设置服务器地址
 JuggleIM.setServerUrls(['your_server_url']);

package/ios/JuggleIMManager.m

@@ -1082,12 +1082,11 @@ RCT_EXPORT_METHOD(getMessages:(NSDictionary *)conversationDict
 /**
  * 撤回消息
  */
-RCT_EXPORT_METHOD(recallMessage:(NSDictionary *)messageDict
+RCT_EXPORT_METHOD(recallMessage:(NSString *)messageId
                   extras:(NSDictionary *)extras
                   resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject) {
     @try {
-        NSString *messageId = messageDict[@"messageId"];
         NSDictionary *extrasDict = extras ?: @{};
         
         [JIM.shared.messageManager recallMessage:messageId
@@ -1095,7 +1094,7 @@ RCT_EXPORT_METHOD(recallMessage:(NSDictionary *)messageDict
                                           success:^(JMessage *message){
             resolve(@YES);
         } error:^(JErrorCode errorCode) {
-            reject(@"RECALL_MESSAGE_ERROR", @"撤回消息失败", [NSError errorWithDomain:@"JuggleIM" code:errorCode userInfo:nil]);
+            reject(@"RECALL_MESSAGE_ERROR", [NSString stringWithFormat:@"Error code: %ld", (long)errorCode], nil);
         }];
     } @catch (NSException *exception) {
         reject(@"RECALL_MESSAGE_ERROR", exception.reason, nil);
@@ -1105,8 +1104,8 @@ RCT_EXPORT_METHOD(recallMessage:(NSDictionary *)messageDict
 /**
  * 根据clientMsgNo列表删除消息
  */
-RCT_EXPORT_METHOD(deleteMessagesByClientMsgNoList:(NSArray<NSNumber *> *)clientMsgNos
-                  conversation:(NSDictionary *)conversationMap
+RCT_EXPORT_METHOD(deleteMessagesByClientMsgNoList:(NSDictionary *)conversationMap
+                  clientMsgNos:(NSArray<NSNumber *> *)clientMsgNos
                   resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject) {
     @try {
@@ -1117,7 +1116,7 @@ RCT_EXPORT_METHOD(deleteMessagesByClientMsgNoList:(NSArray<NSNumber *> *)clientM
                                                            success:^{
             resolve(@YES);
         } error:^(JErrorCode errorCode) {
-            reject(@"DELETE_MESSAGES_ERROR", @"删除消息失败", [NSError errorWithDomain:@"JuggleIM" code:errorCode userInfo:nil]);
+            reject(@"DELETE_MESSAGES_ERROR", [NSString stringWithFormat:@"Error code: %ld", (long)errorCode], nil);
         }];
     } @catch (NSException *exception) {
         reject(@"DELETE_MESSAGES_ERROR", exception.reason, nil);
@@ -1141,7 +1140,7 @@ RCT_EXPORT_METHOD(addMessageReaction:(NSDictionary *)messageDict
                                                success:^{
             resolve(@YES);
         } error:^(JErrorCode errorCode) {
-            reject(@"ADD_REACTION_ERROR", @"添加反应失败", [NSError errorWithDomain:@"JuggleIM" code:errorCode userInfo:nil]);
+            reject(@"ADD_REACTION_ERROR", [NSString stringWithFormat:@"Error code: %ld", (long)errorCode], nil);
         }];
     } @catch (NSException *exception) {
         reject(@"ADD_REACTION_ERROR", exception.reason, nil);

package/{im-rn-sdk.podspec → juggleim-rnsdk.podspec}

@@ -3,14 +3,14 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "package.json")))
 
 Pod::Spec.new do |s|
-  s.name         = "im-rn-sdk"
+  s.name         = "juggleim-rnsdk"
   s.version      = package["version"]
   s.summary      = package["description"]
-  s.homepage     = "https://github.com/juggleim/im-rn-sdk"
+  s.homepage     = "https://github.com/juggleim/imsdk-rn"
   s.license      = "MIT"
   s.authors      = { "Juggle IM" => "support@juggleim.com" }
   s.platforms    = { :ios => "9.0" }
-  s.source       = { :git => "https://github.com/juggleim/im-rn-sdk.git", :tag => "#{s.version}" }
+  s.source       = { :git => "https://github.com/juggleim/imsdk-rn.git", :tag => "#{s.version}" }
 
   s.source_files = "ios/**/*.{h,m,mm}"
   s.requires_arc = true

package/package.json

@@ -1,25 +1,25 @@
 {
   "name": "juggleim-rnsdk",
-  "version": "0.0.11",
+  "version": "0.0.15",
   "description": "React Native wrapper for Juggle IM SDK",
   "main": "src/index.js",
   "types": "src/index.d.ts",
   "react-native": "src/index.js",
-  "homepage": "https://github.com/juggleim/im-rn-sdk",
+  "homepage": "https://github.com/juggleim/imsdk-rn",
   "repository": {
     "type": "git",
-    "url": "https://github.com/juggleim/im-rn-sdk.git"
+    "url": "https://github.com/juggleim/imsdk-rn.git"
   },
   "files": [
     "src",
     "android",
     "ios",
-    "im-rn-sdk.podspec",
+    "juggleim-rnsdk.podspec",
     "README.md"
   ],
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "demo": "cd demo && npm start",
+    "app": "cd app && npm start",
     "prepare": "npm run build",
     "build": "echo \"Build completed\""
   },

package/src/index.d.ts

@@ -1,4 +1,4 @@
-declare module "im-rn-sdk" {
+declare module "juggleim-rnsdk" {
   /**
    * 连接状态类型
    */
@@ -39,13 +39,83 @@ declare module "im-rn-sdk" {
     contentType: string;
   }
 
+  /**
+   * 消息内容基类
+   * @property {string} contentType - 消息内容类型
+   *           枚举：jg:text, jg:img, jg:file, jg:voice
+   */
+  export abstract class MessageContent {
+    abstract contentType: string;
+  }
+  
   /**
    * 文本消息内容
    */
-  export interface TextMessageContent extends MessageContent {
+  export class TextMessageContent extends MessageContent {
+    contentType = 'jg:text';
     content: string;
+    constructor(content: string) {
+      super();
+      this.content = content;
+    }
+  }
+
+  /**
+   * 撤回消息内容
+   */
+  export class RecallInfoMessageContent extends MessageContent {
+    contentType = 'jg:recallinfo';
+  }
+
+  /**
+   * 合并消息内容
+   */
+  export class MergeMessageContent extends MessageContent {
+    contentType = 'jg:merge';
+
+    constructor(
+      title?: string,
+      conversation?: Conversation,
+      messageIdList?: string[],
+      previewList?: MergeMessagePreviewUnit[]
+    );
+
+    // 对应 Java 字段
+    title?: string;
+    containerMsgId?: string;
+    conversation?: Conversation;
+    messageIdList?: string[];
+    previewList?: MergeMessagePreviewUnit[];
+    extra?: string;
+
+    conversationDigest?(): string;
+    getTitle?(): string | undefined;
+    getContainerMsgId?(): string | undefined;
+    setContainerMsgId?(containerMsgId: string): void;
+    getConversation?(): Conversation | undefined;
+    setConversation?(conversation: Conversation): void;
+    getMessageIdList?(): string[] | undefined;
+    getPreviewList?(): MergeMessagePreviewUnit[] | undefined;
+    getExtra?(): string | undefined;
+    setExtra?(extra: string): void;
+  }
+
+  /**
+   * 合并消息预览单元
+   */
+  export class MergeMessagePreviewUnit {
+    constructor(previewContent?: string, sender?: UserInfo);
+
+    previewContent?: string;
+    sender?: UserInfo;
+
+    getPreviewContent?(): string | undefined;
+    setPreviewContent?(previewContent: string): void;
+    getSender?(): UserInfo | undefined;
+    setSender?(sender: UserInfo): void;
   }
 
+
   /**
    * 图片消息内容
    * @property {string} localPath - 图片本地路径：支持 /
@@ -55,13 +125,15 @@ declare module "im-rn-sdk" {
    * @property {number} width - 图片宽度
    * @property {number} height - 图片高度
    */
-  export interface ImageMessageContent extends MessageContent {
+  export class ImageMessageContent extends MessageContent {
     localPath: string;
     thumbnailLocalPath?: string;
     url?: string;
     thumbnailUrl?: string;
     width: number;
     height: number;
+
+    contentType = 'jg:img';
   }
 
   /**
@@ -72,12 +144,14 @@ declare module "im-rn-sdk" {
    * @property {number} size - 文件大小，单位字节
    * @property {string} [type] - 文件类型（MIME类型）
    */
-  export interface FileMessageContent extends MessageContent {
+  export class FileMessageContent extends MessageContent {
     localPath: string;
     url?: string;
     name: string;
     size: number;
     type?: string;
+
+    contentType = 'jg:file';
   }
 
   /**
@@ -86,12 +160,15 @@ declare module "im-rn-sdk" {
    * @property {string} [url] - 语音远程URL
    * @property {number} duration - 语音时长，单位秒
    */
-  export interface VoiceMessageContent extends MessageContent {
+  export class VoiceMessageContent extends MessageContent {
     localPath: string;
     url?: string;
     duration: number;
+
+    contentType = 'jg:voice';
   }
 
+
   /**
    * 消息对象
    * @interface Message
@@ -576,13 +653,28 @@ declare module "im-rn-sdk" {
      * 发送消息
      * @param {SendMessageObject} message  发送消息对象
      * @param {SendMessageCallback} [callback] 发送消息回调函数
-     * @returns {Message} 发送中的消息对象
+     * @returns {Promise<Message>} 发送的消息对象
      */
     static sendMessage(
       message: SendMessageObject,
       callback?: SendMessageCallback
     ): Promise<Message>;
 
+
+    /**
+     * 发送合并消息
+     * @param {string} title 合并消息的标题
+     * @param {string[]} messageIds 要合并的消息ID列表
+     * @param {Conversation} conversation 目标会话对象
+     * @param {SendMessageCallback} [callback] 发送消息回调函数
+     * @returns {Promise<Message>} 发送的消息对象
+     */
+    static sendMergeMessage(
+      message: MergeMessageContent,
+      conversation: Conversation,
+      callback?: SendMessageCallback
+    ): Promise<Message>;
+
     /**
      * 发送图片消息
      * 示例
@@ -657,12 +749,12 @@ declare module "im-rn-sdk" {
 
     /**
      * 撤回消息
-     * @param messageIds 消息ID列表
+     * @param messageId 消息ID列表
      * @param extras 扩展字段
      * @returns {Promise<Boolean>} 是否撤回成功
      */
     static recallMessage(
-      messageIds: string[],
+      messageId: string,
       extras?: { [key: string]: any }
     ): Promise<Boolean>;
 

package/src/index.js

@@ -1,7 +1,18 @@
 import { NativeModules, Platform, NativeEventEmitter } from "react-native";
 
 const { JuggleIM: JMI } = NativeModules;
-const juggleIMEmitter = new NativeEventEmitter(JMI);
+
+// NativeEventEmitter requires a non-null native module. If the native
+// module is not linked (JMI is undefined), create a safe fallback that
+// implements `addListener` and returns a subscription with `remove()` so
+// JS code can call it without crashing during development or in environments
+// where the native module isn't available.
+const juggleIMEmitter = JMI
+  ? new NativeEventEmitter(JMI)
+  : {
+      addListener: () => ({ remove: () => {} }),
+      removeAllListeners: () => {},
+    };
 
 /**
  * Juggle IM React Native SDK
@@ -535,8 +546,8 @@ class JuggleIM {
   /**
    * 发送消息
    * @param {SendMessageObject} message
-   * @param {import("im-rn-sdk").SendMessageCallback} callback - 回调对象
-   * @returns {import("im-rn-sdk").Message} - 消息对象
+   * @param {import("juggleim-rnsdk").SendMessageCallback} callback - 回调对象
+   * @returns {import("juggleim-rnsdk").Message} - 消息对象
    */
   static async sendMessage(
     message,
@@ -812,6 +823,22 @@ class JuggleIM {
     }
   }
 
+  /**
+   * 发送合并消息（构建 MergeMessage 并发送）
+   * @param {MergedMessageContent} mergedMessage - 要合并转发的消息 ID 列表
+   * @param {Conversation} conversation - 目标会话（同时作为 MergeMessage 中的 conversation 字段）
+   * @param {SendMessageCallback} callback - 回调对象，包含 onSuccess/onError
+   */
+  static async sendMergeMessage(mergedMessage, conversation, callback = {}) {
+    const messageObj = {
+      conversationType: conversation && conversation.conversationType,
+      conversationId: conversation && conversation.conversationId,
+      content: mergedMessage,
+    };
+
+    return this.sendMessage(messageObj, callback);
+  }
+
   /**
    * 获取历史消息
    * @param {Object} conversation - 会话对象
@@ -824,11 +851,11 @@ class JuggleIM {
 
   /**
    * 撤回消息
-   * @param {Object} message - 消息对象
+   * @param {String} messageId - 消息ID
    * @param {Object} extras - kv 扩展信息
    */
-  static recallMessage(message, extras = {}) {
-    return JMI.recallMessage(message, extras);
+  static recallMessage(messageId, extras = {}) {
+    return JMI.recallMessage(messageId, extras);
   }
 
   /**
@@ -838,11 +865,10 @@ class JuggleIM {
    * @returns {Promise<boolean>} 删除结果
    */
   static deleteMessagesByClientMsgNoList(conversation, clientMsgNos) {
-    if (Platform.OS === "android") {
-      return JMI.deleteMessagesByClientMsgNoList(conversation, clientMsgNos);
-    } else if (Platform.OS === "ios") {
-      return JMI.deleteMessagesByClientMsgNoList(conversation, clientMsgNos);
-    }
+    const nums = (clientMsgNos || [])
+                .map(n => Number(n))
+                .filter(n => !isNaN(n)); 
+    return JMI.deleteMessagesByClientMsgNoList(conversation, nums);
   }
 
   /**