@truewatchtech/react-native-mobile 0.3.15 → 0.4.1

package/FTMobileReactNativeSDK.podspec

@@ -1,6 +1,7 @@
 require "json"
 
 package = JSON.parse(File.read(File.join(__dir__, "package.json")))
+folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
 
 Pod::Spec.new do |s|
   s.name         = "FTMobileReactNativeSDK"
@@ -11,12 +12,41 @@ Pod::Spec.new do |s|
   s.authors      = package["author"]
 
   s.platforms    = { :ios => "10.0" }
-  s.source       = { :git => "https://github.com/TrueWatchTech/datakit-react-native.git", :tag => "#{s.version}" }
+  s.source       = { :git => "https://github.com/GuanceCloud/datakit-react-native.git", :tag => "#{s.version}" }
 
 
   s.source_files = "ios/**/*.{h,m,mm,swift}"
 
 
   s.dependency "React-Core"
-  s.dependency 'FTMobileSDK', '1.5.18'
+  s.dependency 'FTMobileSDK', '1.6.2'
+  
+    xcconfig = {
+    "HEADER_SEARCH_PATHS" => "$(inherited) " +
+      "$(PODS_ROOT)/React-RCTFabric/** " +
+      "$(PODS_ROOT)/React-FabricComponents/** " +
+      "${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_RCTFabric.framework/Headers/** " +
+      "$(PODS_CONFIGURATION_BUILD_DIR)/React-FabricComponents/React_FabricComponents.framework/Headers/**",
+    "USER_HEADER_SEARCH_PATHS" => "$(inherited) " +
+      "$(PODS_ROOT)/React-RCTFabric/** " +
+      "$(PODS_ROOT)/React-FabricComponents/** " +
+      "${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_RCTFabric.framework/Headers/** " +
+      "$(PODS_CONFIGURATION_BUILD_DIR)/React-FabricComponents/React_FabricComponents.framework/Headers/**"
+  }
+
+  if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
+    s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"
+    
+    xcconfig.merge!({
+      "DEFINES_MODULE" => "YES",
+      "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
+    })
+  end
+
+  s.pod_target_xcconfig = xcconfig
+
+   if respond_to?(:install_modules_dependencies, true)
+    install_modules_dependencies(s)
+  end
+  
 end

package/android/build.gradle

@@ -29,8 +29,10 @@ def reactNativeVersion = new groovy.json.JsonSlurper()
 def (reactNativeMajorVersion, reactNativeMinorVersion) = reactNativeVersion.split("\\.").collect { it.isInteger() ? it.toInteger() : it }
 
 def isNewArchitectureEnabled() {
-  //return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
-  return false //TODO code not ready, hide this part
+  return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
+}
+if (isNewArchitectureEnabled()) {
+  apply plugin: 'com.facebook.react'
 }
 
 android {
@@ -54,7 +56,7 @@ android {
   compileSdkVersion getExtOrIntegerDefault('compileSdkVersion')
   buildToolsVersion getExtOrDefault('buildToolsVersion')
   defaultConfig {
-    minSdkVersion 16
+    minSdkVersion 21
     targetSdkVersion getExtOrIntegerDefault('targetSdkVersion')
 
     buildConfigField("boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString())
@@ -177,7 +179,11 @@ repositories {
 dependencies {
   // noinspection GradleDynamicVersion
   implementation 'com.facebook.react:react-native:+'
-  implementation 'com.truewatch.ft.mobile.sdk.tracker.agent:ft-sdk:1.6.13'
+  implementation 'com.truewatch.ft.mobile.sdk.tracker.agent:ft-sdk:1.7.0'
   implementation 'com.truewatch.ft.mobile.sdk.tracker.agent:ft-native:1.1.2'
+
+//   implementation files('../example/android/app/libs/ft-sdk-debug.aar')
+//    implementation files('../example/android/app/libs/ft-session-replay-debug.aar')
+
   implementation 'com.google.code.gson:gson:2.8.5'
 }

package/android/src/main/java/com/ft/sdk/reactnative/FTMobileImpl.java

@@ -2,23 +2,341 @@ package com.ft.sdk.reactnative;
 
 import static com.ft.sdk.garble.utils.Constants.FT_LOG_DEFAULT_MEASUREMENT;
 
+import androidx.annotation.Nullable;
+
+import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.Promise;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.ReadableType;
+import com.facebook.react.bridge.WritableArray;
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.ft.sdk.DBCacheDiscard;
 import com.ft.sdk.EnvType;
+import com.ft.sdk.FTRemoteConfigManager;
 import com.ft.sdk.FTSDKConfig;
 import com.ft.sdk.FTSdk;
-import com.ft.sdk.InnerClassProxy;
 import com.ft.sdk.LineDataModifier;
+import com.ft.sdk.garble.bean.RemoteConfigBean;
 import com.ft.sdk.garble.bean.UserData;
 import com.ft.sdk.DataModifier;
 import com.ft.sdk.reactnative.utils.ReactNativeUtils;
 
 import java.util.HashMap;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
 
 public class FTMobileImpl {
     public static final String NAME = "FTMobileReactNative";
+    private static final String REMOTE_CONFIG_EVENT = "ft_remote_config_callback";
+    private final ReactApplicationContext reactContext;
+    private boolean remoteConfigurationEnabled = false;
+    private int remoteConfigMiniUpdateInterval = 12 * 60 * 60;
+    @Nullable
+    private ReadableArray remoteConfigOverrideRules;
+
+    public FTMobileImpl(ReactApplicationContext reactContext) {
+        this.reactContext = reactContext;
+    }
+
+    private static class RemoteConfigOverrideResult {
+        final RemoteConfigBean configBean;
+        final List<String> appliedRuleIds;
+
+        RemoteConfigOverrideResult(RemoteConfigBean configBean, List<String> appliedRuleIds) {
+            this.configBean = configBean;
+            this.appliedRuleIds = appliedRuleIds;
+        }
+    }
+
+    private WritableMap createRemoteConfigPayload(String triggerType,
+                                                  boolean success,
+                                                  @Nullable String rawJson,
+                                                  @Nullable List<String> appliedRuleIds,
+                                                  @Nullable String errorCode,
+                                                  @Nullable String errorMessage) {
+        WritableMap payload = Arguments.createMap();
+        payload.putString("triggerType", triggerType);
+        payload.putBoolean("success", success);
+        payload.putString("platform", "android");
+        payload.putDouble("timestamp", System.currentTimeMillis());
+        if (rawJson != null) {
+            payload.putString("rawJson", rawJson);
+        }
+        if (appliedRuleIds != null && !appliedRuleIds.isEmpty()) {
+            WritableArray ids = Arguments.createArray();
+            for (String ruleId : appliedRuleIds) {
+                ids.pushString(ruleId);
+            }
+            payload.putArray("appliedOverrideRuleIds", ids);
+        }
+        if (errorCode != null) {
+            payload.putString("errorCode", errorCode);
+        }
+        if (errorMessage != null) {
+            payload.putString("errorMessage", errorMessage);
+        }
+        return payload;
+    }
+
+    private void emitRemoteConfigEvent(boolean success, @Nullable String rawJson,
+                                       @Nullable List<String> appliedRuleIds,
+                                       @Nullable String errorCode, @Nullable String errorMessage) {
+        if (!reactContext.hasActiveCatalystInstance()) {
+            return;
+        }
+        reactContext
+            .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+            .emit(REMOTE_CONFIG_EVENT, createRemoteConfigPayload("auto", success, rawJson, appliedRuleIds, errorCode, errorMessage));
+    }
+
+    private RemoteConfigOverrideResult applyRemoteConfigOverrideRules(RemoteConfigBean configBean,
+                                                                      @Nullable String jsonConfig) {
+        return applyRemoteConfigOverrideRules(configBean, jsonConfig, this.remoteConfigOverrideRules);
+    }
+
+    private RemoteConfigOverrideResult applyRemoteConfigOverrideRules(RemoteConfigBean configBean,
+                                                                      @Nullable String jsonConfig,
+                                                                      @Nullable ReadableArray rules) {
+        if (configBean == null || jsonConfig == null || rules == null || rules.size() == 0) {
+            return new RemoteConfigOverrideResult(configBean, new ArrayList<>());
+        }
+        List<String> appliedRuleIds = new ArrayList<>();
+        try {
+            JSONObject jsonObject = new JSONObject(jsonConfig);
+            for (int i = 0; i < rules.size(); i++) {
+                if (rules.getType(i) != ReadableType.Map) {
+                    continue;
+                }
+                ReadableMap rule = rules.getMap(i);
+                boolean enabled = !rule.hasKey("enabled") || rule.isNull("enabled") || rule.getBoolean("enabled");
+                if (!enabled) {
+                    continue;
+                }
+                ReadableMap match = rule.hasKey("match") && !rule.isNull("match") ? rule.getMap("match") : null;
+                ReadableMap customKeys = match != null && match.hasKey("customKeys") && !match.isNull("customKeys")
+                    ? match.getMap("customKeys") : null;
+                if (customKeys == null) {
+                    continue;
+                }
+                HashMap<String, Object> keyMap = customKeys.toHashMap();
+                if (keyMap.isEmpty()) {
+                    continue;
+                }
+                boolean matches = true;
+                for (Map.Entry<String, Object> entry : keyMap.entrySet()) {
+                    Object expectedValue = entry.getValue();
+                    Object actualValue = getJsonValue(jsonObject, entry.getKey());
+
+                    if (!matchesCustomKey(actualValue, expectedValue)) {
+                        matches = false;
+                        break;
+                    }
+                }
+                if (!matches) {
+                    continue;
+                }
+                ReadableMap override = rule.hasKey("override") && !rule.isNull("override") ? rule.getMap("override") : null;
+                if (override == null) {
+                    continue;
+                }
+
+                // Basic configuration properties
+                if (override.hasKey("env") && !override.isNull("env")) {
+                    configBean.setEnv(override.getString("env"));
+                }
+                if (override.hasKey("serviceName") && !override.isNull("serviceName")) {
+                    configBean.setServiceName(override.getString("serviceName"));
+                }
+                if (override.hasKey("autoSync") && !override.isNull("autoSync")) {
+                    configBean.setAutoSync(override.getBoolean("autoSync"));
+                }
+                if (override.hasKey("compressIntakeRequests") && !override.isNull("compressIntakeRequests")) {
+                    configBean.setCompressIntakeRequests(override.getBoolean("compressIntakeRequests"));
+                }
+                if (override.hasKey("syncPageSize") && !override.isNull("syncPageSize")) {
+                    configBean.setSyncPageSize(override.getInt("syncPageSize"));
+                }
+                if (override.hasKey("syncSleepTime") && !override.isNull("syncSleepTime")) {
+                    configBean.setSyncSleepTime(override.getInt("syncSleepTime"));
+                }
+
+                // Log configuration properties
+                if (override.hasKey("logSampleRate") && !override.isNull("logSampleRate")) {
+                    configBean.setLogSampleRate((float) override.getDouble("logSampleRate"));
+                }
+                if (override.hasKey("logLevelFilters") && !override.isNull("logLevelFilters")) {
+                    ReadableArray filtersArray = override.getArray("logLevelFilters");
+                    String[] filters = new String[filtersArray.size()];
+                    for (int j = 0; j < filtersArray.size(); j++) {
+                        filters[j] = filtersArray.getString(j);
+                    }
+                    configBean.setLogLevelFilters(filters);
+                }
+                if (override.hasKey("logEnableCustomLog") && !override.isNull("logEnableCustomLog")) {
+                    configBean.setLogEnableCustomLog(override.getBoolean("logEnableCustomLog"));
+                }
+                if (override.hasKey("logEnableConsoleLog") && !override.isNull("logEnableConsoleLog")) {
+                    configBean.setLogEnableConsoleLog(override.getBoolean("logEnableConsoleLog"));
+                }
+
+                // RUM configuration properties
+                if (override.hasKey("rumSampleRate") && !override.isNull("rumSampleRate")) {
+                    configBean.setRumSampleRate((float) override.getDouble("rumSampleRate"));
+                }
+                if (override.hasKey("rumSessionOnErrorSampleRate") && !override.isNull("rumSessionOnErrorSampleRate")) {
+                    configBean.setRumSessionOnErrorSampleRate((float) override.getDouble("rumSessionOnErrorSampleRate"));
+                }
+                if (override.hasKey("rumEnableTraceUserAction") && !override.isNull("rumEnableTraceUserAction")) {
+                    configBean.setRumEnableTraceUserAction(override.getBoolean("rumEnableTraceUserAction"));
+                }
+                if (override.hasKey("rumEnableTraceUserView") && !override.isNull("rumEnableTraceUserView")) {
+                    configBean.setRumEnableTraceUserView(override.getBoolean("rumEnableTraceUserView"));
+                }
+                if (override.hasKey("rumEnableTraceUserResource") && !override.isNull("rumEnableTraceUserResource")) {
+                    configBean.setRumEnableTraceUserResource(override.getBoolean("rumEnableTraceUserResource"));
+                }
+                if (override.hasKey("rumEnableResourceHostIP") && !override.isNull("rumEnableResourceHostIP")) {
+                    configBean.setRumEnableResourceHostIP(override.getBoolean("rumEnableResourceHostIP"));
+                }
+                if (override.hasKey("rumEnableTrackAppUIBlock") && !override.isNull("rumEnableTrackAppUIBlock")) {
+                    configBean.setRumEnableTrackAppUIBlock(override.getBoolean("rumEnableTrackAppUIBlock"));
+                }
+                if (override.hasKey("rumBlockDurationMs") && !override.isNull("rumBlockDurationMs")) {
+                    configBean.setRumBlockDurationMs((long) override.getInt("rumBlockDurationMs"));
+                }
+                if (override.hasKey("rumEnableTrackAppCrash") && !override.isNull("rumEnableTrackAppCrash")) {
+                    configBean.setRumEnableTrackAppCrash(override.getBoolean("rumEnableTrackAppCrash"));
+                }
+                if (override.hasKey("rumEnableTrackAppANR") && !override.isNull("rumEnableTrackAppANR")) {
+                    configBean.setRumEnableTrackAppANR(override.getBoolean("rumEnableTrackAppANR"));
+                }
+                if (override.hasKey("rumEnableTraceWebView") && !override.isNull("rumEnableTraceWebView")) {
+                    configBean.setRumEnableTraceWebView(override.getBoolean("rumEnableTraceWebView"));
+                }
+                if (override.hasKey("rumAllowWebViewHost") && !override.isNull("rumAllowWebViewHost")) {
+                    ReadableArray hostsArray = override.getArray("rumAllowWebViewHost");
+                    String[] hosts = new String[hostsArray.size()];
+                    for (int j = 0; j < hostsArray.size(); j++) {
+                        hosts[j] = hostsArray.getString(j);
+                    }
+                    configBean.setRumAllowWebViewHost(hosts);
+                }
+
+                // Trace configuration properties
+                if (override.hasKey("traceSampleRate") && !override.isNull("traceSampleRate")) {
+                    configBean.setTraceSampleRate((float) override.getDouble("traceSampleRate"));
+                }
+                if (override.hasKey("traceEnableAutoTrace") && !override.isNull("traceEnableAutoTrace")) {
+                    configBean.setTraceEnableAutoTrace(override.getBoolean("traceEnableAutoTrace"));
+                }
+                if (override.hasKey("traceType") && !override.isNull("traceType")) {
+                    configBean.setTraceType(override.getString("traceType"));
+                }
+
+                String ruleId = rule.hasKey("id") && !rule.isNull("id") ? rule.getString("id") : null;
+                appliedRuleIds.add(ruleId != null ? ruleId : "rule_" + i);
+            }
+        } catch (JSONException ignored) {
+        }
+        return new RemoteConfigOverrideResult(configBean, appliedRuleIds);
+    }
+
+    private Object getJsonValue(JSONObject jsonObject, String key) {
+        if (!jsonObject.has(key)) {
+            return null;
+        }
+        try {
+            Object value = jsonObject.get(key);
+            if (value == JSONObject.NULL) {
+                return null;
+            }
+            return value;
+        } catch (JSONException e) {
+            return null;
+        }
+    }
+
+    private boolean isEqualValue(Object actual, Object expected) {
+        if (actual == null && expected == null) {
+            return true;
+        }
+        if (actual == null || expected == null) {
+            return false;
+        }
+
+        if (actual instanceof String actualString) {
+            Object normalizedActual = parseJsonStringIfNeeded(actualString);
+            if (normalizedActual != actual) {
+                return isEqualValue(normalizedActual, expected);
+            }
+        }
+
+        // Handle number comparison
+        if (actual instanceof Number && expected instanceof Number) {
+            return ((Number) actual).doubleValue() == ((Number) expected).doubleValue();
+        }
+
+        // Handle string comparison
+        if (actual instanceof String && expected instanceof String) {
+            return actual.equals(expected);
+        }
+
+        // Handle boolean comparison (JSON booleans are represented as Boolean in Java)
+        if (actual instanceof Boolean && expected instanceof Boolean) {
+            return actual.equals(expected);
+        }
+
+        // Fallback to string comparison
+        return actual.toString().equals(expected.toString());
+    }
+
+    private boolean matchesCustomKey(Object actual, Object expected) {
+        if (expected instanceof Map<?, ?> expectedMap && expectedMap.containsKey("contains")) {
+            return containsValue(actual, expectedMap.get("contains"));
+        }
+        return isEqualValue(actual, expected);
+    }
+
+    private boolean containsValue(Object actual, Object expectedValue) {
+        Object normalizedActual = actual instanceof String actualString
+            ? parseJsonStringIfNeeded(actualString)
+            : actual;
+
+        if (normalizedActual instanceof JSONArray actualArray) {
+            try {
+                for (int i = 0; i < actualArray.length(); i++) {
+                    if (isEqualValue(actualArray.get(i), expectedValue)) {
+                        return true;
+                    }
+                }
+            } catch (JSONException ignored) {
+                return false;
+            }
+        }
+        return isEqualValue(normalizedActual, expectedValue);
+    }
+
+    private Object parseJsonStringIfNeeded(String value) {
+        String trimmedValue = value.trim();
+        if (trimmedValue.length() < 2) {
+            return value;
+        }
+        try {
+            if (trimmedValue.startsWith("[") && trimmedValue.endsWith("]")) {
+                return new JSONArray(trimmedValue);
+            }
+        } catch (JSONException ignored) {
+            return value;
+        }
+        return value;
+    }
 
     public void sdkConfig(ReadableMap context, Promise promise) {
         Map<String, Object> map = context.toHashMap();
@@ -37,9 +355,12 @@ public class FTMobileImpl {
         Boolean enableLimitWithDbSize = (Boolean) map.get("enableLimitWithDbSize");
         Long dbCacheLimit = ReactNativeUtils.convertToNativeLong(map.get("dbCacheLimit"));
         Integer dbDiscardStrategy = ReactNativeUtils.convertToNativeInt(map.get("dbDiscardStrategy"));
-        String sdkPkgInfo = (String)map.get("pkgInfo");
         Map<String, Object> dataModifier = (Map<String, Object>) map.get("dataModifier");
         Map<String, Map<String,Object>> lineDataModifier = (Map<String, Map<String,Object>>) map.get("lineDataModifier");
+        Boolean remoteConfiguration = (Boolean) map.get("remoteConfiguration");
+        Integer remoteConfigMiniUpdateInterval = ReactNativeUtils.convertToNativeInt(map.get("remoteConfigMiniUpdateInterval"));
+        this.remoteConfigOverrideRules = context.hasKey("remoteConfigOverrideRules")
+            ? context.getArray("remoteConfigOverrideRules") : null;
 
         FTSDKConfig sdkConfig = (datakitUrl != null)
             ? FTSDKConfig.builder(datakitUrl)
@@ -103,9 +424,6 @@ public class FTMobileImpl {
           sdkConfig.setDbCacheDiscard(dbCacheDiscard);
         }
 
-        if(sdkPkgInfo!=null){
-          InnerClassProxy.addPkgInfo(sdkConfig,"reactnative",sdkPkgInfo);
-        }
       if (dataModifier != null) {
         sdkConfig.setDataModifier(new DataModifier() {
                                     @Override
@@ -127,6 +445,40 @@ public class FTMobileImpl {
                                         }
                                       }
         );
+      }
+      if (remoteConfiguration != null) {
+        sdkConfig.setRemoteConfiguration(remoteConfiguration);
+      }
+      remoteConfigurationEnabled = sdkConfig.isRemoteConfiguration();
+      if (remoteConfigMiniUpdateInterval != null) {
+        sdkConfig.setRemoteConfigMiniUpdateInterval(remoteConfigMiniUpdateInterval);
+        this.remoteConfigMiniUpdateInterval = remoteConfigMiniUpdateInterval;
+      } else {
+        this.remoteConfigMiniUpdateInterval = sdkConfig.getRemoteConfigMiniUpdateInterval();
+      }
+      if (remoteConfigurationEnabled) {
+        sdkConfig.setRemoteConfigurationCallBack(new FTRemoteConfigManager.FetchResult() {
+          private String rawJson;
+          private List<String> appliedRuleIds = new ArrayList<>();
+
+          @Override
+          public RemoteConfigBean onConfigSuccessFetched(RemoteConfigBean configBean, String jsonConfig) {
+            rawJson = jsonConfig;
+            RemoteConfigOverrideResult result = applyRemoteConfigOverrideRules(configBean, jsonConfig);
+            appliedRuleIds = result.appliedRuleIds;
+            emitRemoteConfigEvent(true, configBean.toJsonString(), appliedRuleIds, null, null);
+            return result.configBean;
+          }
+
+          @Override
+          public void onResult(boolean success) {
+            if (!success) {
+              emitRemoteConfigEvent(false, rawJson, appliedRuleIds, "FETCH_FAILED", "Remote config update failed");
+            }
+            rawJson = null;
+            appliedRuleIds = new ArrayList<>();
+          }
+        });
       }
         FTSdk.install(sdkConfig);
 //        LogUtils.d("configCheck","sdkConfig:"+new Gson().toJson(sdkConfig));
@@ -160,6 +512,16 @@ public class FTMobileImpl {
         promise.resolve(null);
     }
 
+    public void setDatakitURL(String datakitUrl, Promise promise) {
+        FTSdk.setDatakitUrl(datakitUrl);
+        promise.resolve(null);
+    }
+
+    public void setDatawayURL(String datawayUrl, String clientToken, Promise promise) {
+        FTSdk.setDatawayUrl(datawayUrl, clientToken);
+        promise.resolve(null);
+    }
+
     public void flushSyncData(Promise promise) {
         FTSdk.flushSyncData();
         promise.resolve(null);
@@ -195,4 +557,71 @@ public class FTMobileImpl {
         FTSdk.clearAllData();
         promise.resolve(null);
     }
+
+    public void updateRemoteConfig(Promise promise) {
+        if (!remoteConfigurationEnabled) {
+            promise.reject("E_REMOTE_CONFIG_DISABLED", "Remote configuration is not enabled.");
+            return;
+        }
+        FTSdk.updateRemoteConfig(remoteConfigMiniUpdateInterval, new FTRemoteConfigManager.FetchResult() {
+            private String rawJson;
+            private List<String> appliedRuleIds = new ArrayList<>();
+
+            @Override
+            public RemoteConfigBean onConfigSuccessFetched(RemoteConfigBean configBean, String jsonConfig) {
+                rawJson = jsonConfig;
+                RemoteConfigOverrideResult result = applyRemoteConfigOverrideRules(configBean, jsonConfig);
+                appliedRuleIds = result.appliedRuleIds;
+                promise.resolve(createRemoteConfigPayload("manual", true, configBean.toJsonString(), appliedRuleIds, null, null));
+                return result.configBean;
+            }
+
+            @Override
+            public void onResult(boolean success) {
+                if (!success) {
+                    promise.reject("E_REMOTE_CONFIG_UPDATE_FAILED", "Remote config update failed");
+                } else if (rawJson == null) {
+                    promise.resolve(createRemoteConfigPayload("manual", true, null, appliedRuleIds, null, null));
+                }
+            }
+        });
+    }
+
+    public void updateRemoteConfigWithMiniUpdateInterval(int interval, @Nullable ReadableArray rules, Promise promise) {
+        if (!remoteConfigurationEnabled) {
+            promise.reject("E_REMOTE_CONFIG_DISABLED", "Remote configuration is not enabled.");
+            return;
+        }
+        FTSdk.updateRemoteConfig(interval, new FTRemoteConfigManager.FetchResult() {
+            private String rawJson;
+            private List<String> appliedRuleIds = new ArrayList<>();
+
+            @Override
+            public RemoteConfigBean onConfigSuccessFetched(RemoteConfigBean configBean, String jsonConfig) {
+                rawJson = jsonConfig;
+                ReadableArray rulesToApply = rules != null && rules.size() > 0 ? rules : remoteConfigOverrideRules;
+                RemoteConfigOverrideResult result = applyRemoteConfigOverrideRules(configBean, jsonConfig, rulesToApply);
+                appliedRuleIds = result.appliedRuleIds;
+                promise.resolve(createRemoteConfigPayload("manual", true, configBean.toJsonString(), appliedRuleIds, null, null));
+                return result.configBean;
+            }
+
+            @Override
+            public void onResult(boolean success) {
+                if (!success) {
+                    promise.reject("E_REMOTE_CONFIG_UPDATE_FAILED", "Remote config update failed");
+                } else if (rawJson == null) {
+                    promise.resolve(createRemoteConfigPayload("manual", true, null, appliedRuleIds, null, null));
+                }
+            }
+        });
+    }
+
+    public void addListener(String eventName) {
+        // Required for NativeEventEmitter. No-op because native does not need listener bookkeeping.
+    }
+
+    public void removeListeners(double count) {
+        // Required for NativeEventEmitter. No-op because native does not need listener bookkeeping.
+    }
 }

package/android/src/main/java/com/ft/sdk/reactnative/FTRUMImpl.java

@@ -15,6 +15,7 @@ import com.ft.sdk.garble.bean.NetStatusBean;
 import com.ft.sdk.garble.bean.ResourceParams;
 import com.ft.sdk.reactnative.utils.ReactNativeUtils;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -44,6 +45,8 @@ public class FTRUMImpl {
     Map<String, Object> globalContext = (Map<String, Object>) map.get("globalContext");
     Integer rumCacheLimitCount = ReactNativeUtils.convertToNativeInt(map.get("rumCacheLimitCount"));
     Integer rumDiscardStrategy = ReactNativeUtils.convertToNativeInt(map.get("rumDiscardStrategy"));
+    Boolean enableTraceWebView = (Boolean) map.get("enableTraceWebView");
+    ArrayList<String> allowWebViewHost = (ArrayList<String>) map.get("allowWebViewHost");
 
     FTRUMConfig rumConfig = new FTRUMConfig().setRumAppId(rumAppId);
     if (sampleRate != null) {
@@ -122,6 +125,15 @@ public class FTRUMImpl {
       }
       rumConfig.setRumCacheDiscardStrategy(rumCacheDiscard);
     }
+    if (enableTraceWebView != null) {
+      rumConfig.setEnableTraceWebView(enableTraceWebView);
+    }
+    if (allowWebViewHost != null) {
+      String[] allowWebViewHostArr = new String[allowWebViewHost.size()];
+      allowWebViewHost.toArray(allowWebViewHostArr);
+      rumConfig.setAllowWebViewHost(allowWebViewHostArr);
+    }
+
     FTSdk.initRUMWithConfig(rumConfig);
     //LogUtils.d("configCheck","rumConfig:"+new Gson().toJson(rumConfig));
     promise.resolve(null);

package/android/src/main/java/com/ft/sdk/reactnative/FTTraceImpl.java

@@ -1,5 +1,6 @@
 package com.ft.sdk.reactnative;
 
+import com.ft.sdk.reactnative.utils.ReactNativeUtils;
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMap;
@@ -8,7 +9,6 @@ import com.ft.sdk.FTSdk;
 import com.ft.sdk.FTTraceConfig;
 import com.ft.sdk.FTTraceManager;
 import com.ft.sdk.TraceType;
-import com.ft.sdk.reactnative.utils.ReactNativeUtils;
 
 import java.util.HashMap;
 import java.util.Map;

package/android/src/newarch/java/com/ft/sdk/reactnative/FTLogModule.java

@@ -1,35 +1,28 @@
 package com.ft.sdk.reactnative;
 
-import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
-import com.facebook.react.turbomodule.core.interfaces.TurboModule;
+import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReadableMap;
 
-@ReactModule(name = FTLogModule.NAME)
-public class FTLogModule extends NativeFTLogSpec  {
-  private final FTLogInterface logImpl = new FTLogImpl();
+public class FTLogModule extends NativeFTReactNativeLogSpec {
+  private final FTLogImpl logImpl = new FTLogImpl();
 
   public FTLogModule(ReactApplicationContext reactContext) {
     super(reactContext);
   }
 
-  @Override
-  public String getName() {
-    return NAME;
-  }
-
   @ReactMethod
   public void logConfig(ReadableMap context, Promise promise) {
     logImpl.logConfig(context, promise);
   }
 
   @ReactMethod
-  public void logging(String content, int logStatus, ReadableMap map, Promise promise) {
-    logImpl.logging(content, logStatus, map, promise);
+  @Override
+  public void logging(String content, double logStatus, @Nullable ReadableMap property, Promise promise) {
+    logImpl.logging(content, (int) logStatus, property, promise);
   }
 
   @ReactMethod