juggleim-rnsdk 0.0.10 → 0.0.12

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 im-rn-sdk --legacy-peer-deps
 ```
 
 ## 初始化

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "juggleim-rnsdk",
-  "version": "0.0.10",
+  "version": "0.0.12",
   "description": "React Native wrapper for Juggle IM SDK",
   "main": "src/index.js",
   "types": "src/index.d.ts",

package/src/index.d.ts

@@ -657,12 +657,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,8 +1,7 @@
 import { NativeModules, Platform, NativeEventEmitter } from "react-native";
 
 const { JuggleIM: JMI } = NativeModules;
-// 为避免警告，仅在Android平台传入JMI参数
-const juggleIMEmitter = Platform.OS === 'android' ? new NativeEventEmitter(JMI) : new NativeEventEmitter();
+const juggleIMEmitter = new NativeEventEmitter(JMI);
 
 /**
  * Juggle IM React Native SDK
@@ -825,11 +824,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);
   }
 
   /**
@@ -839,11 +838,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);
   }
 
   /**