react-native-trustdevice 1.1.3 → 1.1.5

package/android/build/outputs/logs/manifest-merger-debug-report.txt

@@ -1,25 +1,16 @@
 -- Merging decision tree log ---
 manifest
-ADDED from /Users/rhett/Code/dun/TrustDeviceReactNative/node_modules/react-native-trustdevice/android/src/main/AndroidManifest.xml:2:1-5:12
-INJECTED from /Users/rhett/Code/dun/TrustDeviceReactNative/node_modules/react-native-trustdevice/android/src/main/AndroidManifest.xml:2:1-5:12
-INJECTED from /Users/rhett/Code/dun/TrustDeviceReactNative/node_modules/react-native-trustdevice/android/src/main/AndroidManifest.xml:2:1-5:12
+ADDED from /Users/rhett/Code/dun/reactnew/TrustDeviceReactNative/node_modules/react-native-trustdevice/android/src/main/AndroidManifest.xml:2:1-4:12
+INJECTED from /Users/rhett/Code/dun/reactnew/TrustDeviceReactNative/node_modules/react-native-trustdevice/android/src/main/AndroidManifest.xml:2:1-4:12
 	package
-		ADDED from /Users/rhett/Code/dun/TrustDeviceReactNative/node_modules/react-native-trustdevice/android/src/main/AndroidManifest.xml:3:11-36
-		INJECTED from /Users/rhett/Code/dun/TrustDeviceReactNative/node_modules/react-native-trustdevice/android/src/main/AndroidManifest.xml
-		INJECTED from /Users/rhett/Code/dun/TrustDeviceReactNative/node_modules/react-native-trustdevice/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/rhett/Code/dun/reactnew/TrustDeviceReactNative/node_modules/react-native-trustdevice/android/src/main/AndroidManifest.xml
 	xmlns:android
-		ADDED from /Users/rhett/Code/dun/TrustDeviceReactNative/node_modules/react-native-trustdevice/android/src/main/AndroidManifest.xml:2:11-69
+		ADDED from /Users/rhett/Code/dun/reactnew/TrustDeviceReactNative/node_modules/react-native-trustdevice/android/src/main/AndroidManifest.xml:2:11-69
 uses-sdk
-INJECTED from /Users/rhett/Code/dun/TrustDeviceReactNative/node_modules/react-native-trustdevice/android/src/main/AndroidManifest.xml reason: use-sdk injection requested
-INJECTED from /Users/rhett/Code/dun/TrustDeviceReactNative/node_modules/react-native-trustdevice/android/src/main/AndroidManifest.xml
-INJECTED from /Users/rhett/Code/dun/TrustDeviceReactNative/node_modules/react-native-trustdevice/android/src/main/AndroidManifest.xml
-INJECTED from /Users/rhett/Code/dun/TrustDeviceReactNative/node_modules/react-native-trustdevice/android/src/main/AndroidManifest.xml
-INJECTED from /Users/rhett/Code/dun/TrustDeviceReactNative/node_modules/react-native-trustdevice/android/src/main/AndroidManifest.xml
+INJECTED from /Users/rhett/Code/dun/reactnew/TrustDeviceReactNative/node_modules/react-native-trustdevice/android/src/main/AndroidManifest.xml reason: use-sdk injection requested
+INJECTED from /Users/rhett/Code/dun/reactnew/TrustDeviceReactNative/node_modules/react-native-trustdevice/android/src/main/AndroidManifest.xml
+INJECTED from /Users/rhett/Code/dun/reactnew/TrustDeviceReactNative/node_modules/react-native-trustdevice/android/src/main/AndroidManifest.xml
 	android:targetSdkVersion
-		INJECTED from /Users/rhett/Code/dun/TrustDeviceReactNative/node_modules/react-native-trustdevice/android/src/main/AndroidManifest.xml
-		ADDED from /Users/rhett/Code/dun/TrustDeviceReactNative/node_modules/react-native-trustdevice/android/src/main/AndroidManifest.xml
-		INJECTED from /Users/rhett/Code/dun/TrustDeviceReactNative/node_modules/react-native-trustdevice/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/rhett/Code/dun/reactnew/TrustDeviceReactNative/node_modules/react-native-trustdevice/android/src/main/AndroidManifest.xml
 	android:minSdkVersion
-		INJECTED from /Users/rhett/Code/dun/TrustDeviceReactNative/node_modules/react-native-trustdevice/android/src/main/AndroidManifest.xml
-		ADDED from /Users/rhett/Code/dun/TrustDeviceReactNative/node_modules/react-native-trustdevice/android/src/main/AndroidManifest.xml
-		INJECTED from /Users/rhett/Code/dun/TrustDeviceReactNative/node_modules/react-native-trustdevice/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/rhett/Code/dun/reactnew/TrustDeviceReactNative/node_modules/react-native-trustdevice/android/src/main/AndroidManifest.xml

package/android/build.gradle

@@ -1,18 +1,8 @@
-
-buildscript {
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath("com.android.tools.build:gradle:4.1.3")
-    }
-}
-
 apply plugin: 'com.android.library'
 
 android {
+    namespace 'com.trustdevice'  // 添加这一行,AGP8.0+需要namespace
+
     compileSdkVersion 34
      
     defaultConfig {

package/android/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.trustdevice">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>
   

package/android/src/main/java/com/trustdevice/TrustdevicePackage.java

@@ -15,7 +15,7 @@ public class TrustdevicePackage implements ReactPackage {
     @NonNull
     @Override
     public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
-      return List.<NativeModule>of(new TrustdeviceModule(reactContext));
+      return List.<NativeModule>of(new TrustdeviceModule(reactContext), new TrustdeviceSeModule(reactContext));
     }
 
     // Deprecated from RN 0.47

package/android/src/main/java/com/trustdevice/TrustdeviceSeModule.java

@@ -0,0 +1,126 @@
+
+package com.trustdevice;
+
+import androidx.annotation.NonNull;
+
+import com.facebook.react.bridge.Promise;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.bridge.Arguments; 
+import com.trustdevice.utils.TDUniRiskUtils;
+
+import java.util.HashMap;
+
+import com.trustdecision.mobrisk.TDRisk;
+import com.trustdecision.mobrisk.TDRiskCallback;
+import com.trustdecision.mobrisk.TDAPISignResult;
+
+import com.trustdecision.mobrisk.TDDeviceManager;
+import com.trustdecision.mobrisk.TDDeviceInfoCallback;
+import com.trustdecision.mobrisk.TDDeviceAPIStatus;
+
+public class TrustdeviceSeModule extends ReactContextBaseJavaModule {
+    private final ReactApplicationContext reactContext;
+
+    public TrustdeviceSeModule(ReactApplicationContext reactContext) {
+        super(reactContext);
+        this.reactContext = reactContext;
+    }
+
+    @NonNull
+    @Override
+    public String getName() {
+        return "TrustDeviceSe";
+    }
+
+    @ReactMethod
+    public void initWithOptions(ReadableMap readableMap, Promise promise) {
+        if (readableMap != null) {
+            HashMap<String, Object> options = readableMap.toHashMap();
+            TDDeviceManager.Builder builder = TDUniRiskUtils.mapToBuilderSe(options);
+            TDDeviceManager.initWithOptions(this.reactContext.getApplicationContext(), builder);
+            promise.resolve(null);
+        }
+    }
+
+    @ReactMethod
+    public void getBlackBoxAsync(Promise promise) {
+        try {
+            TDRisk.getBlackBoxAsync(new TDRiskCallback() {
+                @Override
+                public void onEvent(String blackbox) {
+                    promise.resolve(blackbox);
+                }
+            });
+        } catch (Exception e) {
+            promise.reject("getBlackBoxAsync Error", e);
+        }
+    }
+
+    @ReactMethod
+    public void getDeviceInfo(Promise promise) {
+        try {
+
+            TDDeviceManager.getDeviceInfo(new TDDeviceInfoCallback() {
+                @Override
+                public void onResult(String fpVersion,
+                            String blackBox,
+                            String anonymousId,
+                            int deviceRiskScore,
+                            TDDeviceAPIStatus apiStatus,
+                            String sealedResult) {
+                    // 注：回调在子线程中执行，请不要在此处操作UI
+                    // fpVersion: SDK版本号
+                    // blackBox: 本次采集的blackBox
+                    // anonymousId: 当前设备的匿名ID
+                    // deviceRiskScore: 设备风险分数
+                    // apiStatus: API状态信息
+                    // sealedResult: 密封结果
+                    int code = apiStatus.getCode();
+                    
+                    // 创建 WritableMap 来返回结构化数据
+                    WritableMap resultMap = Arguments.createMap();
+                    
+                    resultMap.putInt("code", apiStatus.getCode());
+                    resultMap.putString("fpVersion", fpVersion);
+                    resultMap.putString("blackBox", blackBox);
+                    resultMap.putString("anonymousId", anonymousId);
+                    resultMap.putInt("deviceRiskScore", deviceRiskScore);
+                    resultMap.putString("sealedResult", sealedResult);
+                    resultMap.putString("msg", apiStatus.getMessage());
+
+                    promise.resolve(resultMap);   
+                }
+            });
+
+        } catch (Exception e) {
+            promise.reject("getDeviceInfo Error", e);
+        }
+    }
+
+    @ReactMethod
+    public void sign(String path, Promise promise) {
+        try {
+            TDAPISignResult signResult = TDRisk.sign(this.reactContext.getApplicationContext(), path);
+            // 创建 WritableMap 来返回结构化数据
+            WritableMap resultMap = Arguments.createMap();
+            resultMap.putString("sign", signResult.signature());
+            resultMap.putInt("code", signResult.code());
+            resultMap.putString("msg", signResult.message());
+            
+            promise.resolve(resultMap);
+            
+        } catch (Exception e) {
+            promise.reject("sign Error", e);
+        }
+    }
+
+    @ReactMethod
+    public void getSDKVersion(Promise promise) {
+        String sdkVersion = TDRisk.getSDKVersion();
+        promise.resolve(sdkVersion);
+    }
+}

package/android/src/main/java/com/trustdevice/utils/TDUniRiskUtils.java

@@ -5,6 +5,7 @@ import android.text.TextUtils;
 import java.util.Map;
 
 import com.trustdecision.mobrisk.TDRisk;
+import com.trustdecision.mobrisk.TDDeviceManager;
 
 public class TDUniRiskUtils {
     ///Mandatory Shared Configuration
@@ -12,10 +13,13 @@ public class TDUniRiskUtils {
     static final String KEY_APPKEY = "appKey";
     static final String KEY_APPNAME = "appName";
     static final String KEY_COUNTRY = "country";
+    static final String KEY_DATACENTER = "dataCenter";
+    static final String KEY_CHANNEL = "channel";
     static final String KEY_DEBUG = "debug";
     static final String KEY_TIME_LIMIT = "timeLimit";
     static final String KEY_LOCATION = "location";
     static final String KEY_COLLECT_LEVEL = "collectLevel";
+    static final String KEY_CUSTOM_MESSAGE = "customMessage";
 
     ///Android device fingerprint configuration
     static final String KEY_FP_ANDROID_RUNNING_TASKS = "runningTasks";
@@ -25,6 +29,9 @@ public class TDUniRiskUtils {
     static final String KEY_FP_ANDROID_WIFIMAC = "wifiMac";
 
     static final String KEY_FP_ANDROID_GOOGLE_AID = "googleAid";
+    static final String KEY_FP_ANDROID_OAID = "OAID";
+    static final String KEY_FP_ANDROID_AID = "AID";
+    static final String KEY_FP_ANDROID_ANDROID_ID = "ANDROID_ID";
 
     ///Android device Captcha configuration
     static final String KEY_CAPTCHA_LANGUAGE = "language";
@@ -36,6 +43,170 @@ public class TDUniRiskUtils {
     static final String KEY_CAPTCHA_SKIP_CAPTCHA = "skipCaptcha";
     static final String KEY_CAPTCHA_MFAID = "mfaId";
 
+    public static TDDeviceManager.Builder mapToBuilderSe(Map<String, Object> configMap) {
+        TDDeviceManager.Builder builder = null;
+        if (configMap == null) {
+            return builder;
+        }
+        builder = new TDDeviceManager.Builder();
+        if (configMap.containsKey(KEY_PARTNER)) {
+            builder.partner((String) configMap.get(KEY_PARTNER));
+        }
+        if (configMap.containsKey(KEY_APPKEY)) {
+            builder.appKey((String) configMap.get(KEY_APPKEY));
+        }
+
+        // if (configMap.containsKey(KEY_APPNAME)) {
+        //     builder.appName((String) configMap.get(KEY_APPNAME));
+        // }
+
+        if (configMap.containsKey(KEY_APPNAME)) {
+            builder.channel((String) configMap.get(KEY_APPNAME));
+        }
+        if (configMap.containsKey(KEY_CHANNEL)) {
+            builder.channel((String) configMap.get(KEY_CHANNEL));
+        }
+        if (configMap.containsKey(KEY_COUNTRY)) {
+            String country = (String) configMap.get(KEY_COUNTRY);
+            if (!TextUtils.isEmpty(country)) {
+                builder.country(country.toUpperCase());
+            }
+        }
+        if (configMap.containsKey(KEY_DATACENTER)) {
+            String dataCenter = (String) configMap.get(KEY_DATACENTER);
+            if (!TextUtils.isEmpty(dataCenter)) {
+                builder.country(dataCenter.toUpperCase());
+            }
+        }
+        // if (configMap.containsKey(KEY_URL)) {
+        //     String url = (String) configMap.get(KEY_URL);
+        //     if (!TextUtils.isEmpty(url)) {
+        //         builder.url(url);
+        //     }
+        // }
+        // if (configMap.containsKey(KEY_PROFILE_URL)) {
+        //     String url = (String) configMap.get(KEY_PROFILE_URL);
+        //     if (!TextUtils.isEmpty(url)) {
+        //         builder.url(url);
+        //     }
+        // }
+        if (configMap.containsKey(KEY_DEBUG)) {
+            Object debug = configMap.get(KEY_DEBUG);
+            if (debug != null) {
+                if (!(boolean) debug)
+                    builder.disableDebugger();
+            }
+        }
+        if (configMap.containsKey(KEY_TIME_LIMIT)) {
+            Object timeLimit = configMap.get(KEY_TIME_LIMIT);
+            if (timeLimit != null) {
+                builder.httpTimeOut(((int) timeLimit) * 1000);
+            }
+        }
+
+        if (configMap.containsKey(KEY_LOCATION)) {
+            Object location = configMap.get(KEY_LOCATION);
+            if (location != null) {
+                if (!(boolean) location)
+                    builder.disableGPS();
+            }
+        }
+
+        // if (configMap.containsKey(KEY_COLLECT_LEVEL)) {
+        //     String collectLevel = (String) configMap.get(KEY_COLLECT_LEVEL);
+        //     if ("M".equals(collectLevel)) {
+        //         builder.collectLevel(TDRisk.COLLECT_LEVEL_M);
+        //     } else if ("L".equals(collectLevel)) {
+        //         builder.collectLevel(TDRisk.COLLECT_LEVEL_L);
+        //     }
+        // }
+
+        if (configMap.containsKey(KEY_CUSTOM_MESSAGE)) {
+            String customMessage = (String) configMap.get(KEY_CUSTOM_MESSAGE);
+            if (customMessage != null) {
+                builder.customMessage(customMessage);
+            }
+        }
+
+
+        ///Android device fingerprint configuration
+        if (configMap.containsKey(KEY_FP_ANDROID_RUNNING_TASKS)) {
+            Object runningTasks = configMap.get(KEY_FP_ANDROID_RUNNING_TASKS);
+            if (runningTasks != null) {
+                if (!(boolean) runningTasks)
+                    builder.disableRunningTasks();
+            }
+        }
+        if (configMap.containsKey(KEY_FP_ANDROID_SENSOR)) {
+            Object sensor = configMap.get(KEY_FP_ANDROID_SENSOR);
+            if (sensor != null) {
+                if (!(boolean) sensor)
+                    builder.disableSensor();
+            }
+        }
+        if (configMap.containsKey(KEY_FP_ANDROID_READ_PHONE)) {
+            Object readPhone = configMap.get(KEY_FP_ANDROID_READ_PHONE);
+            if (readPhone != null) {
+                if (!(boolean) readPhone)
+                    builder.disableReadPhone();
+            }
+        }
+        if (configMap.containsKey(KEY_FP_ANDROID_INSTALLPACKAGE_LIST)) {
+            Object installPackageList = configMap.get(KEY_FP_ANDROID_INSTALLPACKAGE_LIST);
+            if (installPackageList != null) {
+                if (!(boolean) installPackageList)
+                    builder.disableInstallPackageList();
+            }
+        }
+        
+        // if (configMap.containsKey(KEY_FP_ANDROID_WIFIMAC)) {
+        //     Object wifiMac = configMap.get(KEY_FP_ANDROID_WIFIMAC);
+        //     if (wifiMac != null) {
+        //         if (!(boolean) wifiMac) {
+        //             builder.disableWifiMac();
+        //         } else {
+        //             builder.enableWifiMac();
+        //         }
+        //     }
+        // }
+
+        if (configMap.containsKey(KEY_FP_ANDROID_GOOGLE_AID)) {
+            Object enableGoogleAid = configMap.get(KEY_FP_ANDROID_GOOGLE_AID);
+            if (enableGoogleAid != null) {
+                if (!(boolean) enableGoogleAid)
+                    builder.disableGoogleAid();
+            }
+        }
+
+        if (configMap.containsKey(KEY_FP_ANDROID_OAID)) {
+            Object oaid = configMap.get(KEY_FP_ANDROID_OAID);
+            if (oaid != null) {
+                if (!(boolean) oaid )
+                    builder.disableOptions(TDDeviceManager.OPTION_OAID);
+            }
+        }
+        if (configMap.containsKey(KEY_FP_ANDROID_AID)) {
+            Object aid = configMap.get(KEY_FP_ANDROID_AID);
+            if (aid != null) {
+                if (!(boolean) aid)
+                    builder.disableOptions(TDDeviceManager.OPTION_AID);
+            }
+        }
+        if (configMap.containsKey(KEY_FP_ANDROID_ANDROID_ID)) {
+            Object androidID = configMap.get(KEY_FP_ANDROID_ANDROID_ID);
+            if (androidID != null) {
+                if (!(boolean) androidID)
+                    builder.disableOptions(TDDeviceManager.OPTION_ANDROID_ID);
+            }
+        }
+        
+        
+
+        return builder;
+
+        
+    }
+
     /**
      * 转换configMap成builder
      *
@@ -48,13 +219,19 @@ public class TDUniRiskUtils {
             return builder;
         builder = new TDRisk.Builder();
         if (configMap.containsKey(KEY_PARTNER)) {
-            builder.partnerCode((String) configMap.get(KEY_PARTNER));
+            builder.partner((String) configMap.get(KEY_PARTNER));
         }
         if (configMap.containsKey(KEY_APPKEY)) {
             builder.appKey((String) configMap.get(KEY_APPKEY));
         }
+        // if (configMap.containsKey(KEY_APPNAME)) {
+        //     builder.appName((String) configMap.get(KEY_APPNAME));
+        // }
         if (configMap.containsKey(KEY_APPNAME)) {
-            builder.appName((String) configMap.get(KEY_APPNAME));
+            builder.channel((String) configMap.get(KEY_APPNAME));
+        }
+        if (configMap.containsKey(KEY_CHANNEL)) {
+            builder.channel((String) configMap.get(KEY_CHANNEL));
         }
         if (configMap.containsKey(KEY_COUNTRY)) {
             String country = (String) configMap.get(KEY_COUNTRY);
@@ -62,6 +239,12 @@ public class TDUniRiskUtils {
                 builder.country(country.toUpperCase());
             }
         }
+        if (configMap.containsKey(KEY_DATACENTER)) {
+            String dataCenter = (String) configMap.get(KEY_DATACENTER);
+            if (!TextUtils.isEmpty(dataCenter)) {
+                builder.country(dataCenter.toUpperCase());
+            }
+        }
         if (configMap.containsKey(KEY_DEBUG)) {
             Object debug = configMap.get(KEY_DEBUG);
             if (debug != null) {
@@ -119,16 +302,16 @@ public class TDUniRiskUtils {
                     builder.disableInstallPackageList();
             }
         }
-        if (configMap.containsKey(KEY_FP_ANDROID_WIFIMAC)) {
-            Object wifiMac = configMap.get(KEY_FP_ANDROID_WIFIMAC);
-            if (wifiMac != null) {
-                if (!(boolean) wifiMac) {
-                    builder.disableWifiMac();
-                } else {
-                    builder.enableWifiMac();
-                }
-            }
-        }
+        // if (configMap.containsKey(KEY_FP_ANDROID_WIFIMAC)) {
+        //     Object wifiMac = configMap.get(KEY_FP_ANDROID_WIFIMAC);
+        //     if (wifiMac != null) {
+        //         if (!(boolean) wifiMac) {
+        //             builder.disableWifiMac();
+        //         } else {
+        //             builder.enableWifiMac();
+        //         }
+        //     }
+        // }
         if (configMap.containsKey(KEY_FP_ANDROID_GOOGLE_AID)) {
             Object googleAid = configMap.get(KEY_FP_ANDROID_GOOGLE_AID);
             if (googleAid != null) {
@@ -190,6 +373,13 @@ public class TDUniRiskUtils {
                 builder.mfaId((String) mfaIdObj);
             }
         }
+        // 补充
+        if (configMap.containsKey(KEY_CUSTOM_MESSAGE)) {
+            String customMessage = (String) configMap.get(KEY_CUSTOM_MESSAGE);
+            if (customMessage != null) {
+                builder.customMessage(customMessage);
+            }
+        }
         return builder;
     }
 }

package/ios/TrustDevice.m

@@ -27,7 +27,22 @@ RCT_REMAP_METHOD(getSDKVersion,
 RCT_EXPORT_METHOD(initWithOptions:(NSDictionary*)options)
 {
   NSMutableDictionary* mutableOptions = [options mutableCopy];
-  mutableOptions[@"allowd"] = options[@"debug"];
+    
+  // 1. 判断 debug 是否为空（nil 或 NSNull）
+  id debugValue = options[@"debug"];
+  if (debugValue && debugValue != [NSNull null]) {
+      mutableOptions[@"allowd"] = debugValue;  // 原逻辑保留
+  } else {
+      // debug 为空时，可能设置默认值或不设置
+      mutableOptions[@"allowd"] = @(NO); // 示例默认 false
+  }
+  
+  // 2. 增加 dataCenter 赋值给 country
+  id dataCenter = options[@"dataCenter"];
+  if (dataCenter && dataCenter != [NSNull null]) {
+      mutableOptions[@"country"] = dataCenter;
+  }
+  
   TDMobRiskManager_t *manager = [TDMobRiskManager sharedManager];
   manager->initWithOptions([mutableOptions copy]);
 }

package/ios/TrustDeviceSe.h

@@ -0,0 +1,17 @@
+//
+//  TrustDeviceSe.h
+//  TrustDeviceReactNative
+//
+//  Created on 2025.11.12
+//
+
+#import <Foundation/Foundation.h>
+#import <React/RCTBridgeModule.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface TrustDeviceSe : NSObject <RCTBridgeModule>
+
+@end
+
+NS_ASSUME_NONNULL_END