@truewatchtech/react-native-mobile 0.4.3-alpha.2 → 0.4.3

package/FTMobileReactNativeSDK.podspec

@@ -21,7 +21,7 @@ Pod::Spec.new do |s|
 
 
   s.dependency "React-Core"
-  s.dependency 'TrueWatchSDK', '1.6.7'
+  s.dependency 'TrueWatchSDK', '1.6.8'
 
     xcconfig = {
     "HEADER_SEARCH_PATHS" => "$(inherited) " +

package/README.md

@@ -28,40 +28,6 @@ import {
 
 ```
 
-## WebSocket handshake tracking
-
-To collect iOS WebSocket handshakes while native Resource auto-collection is disabled:
-
-```ts
-await FTReactNativeRUM.setConfig({
-  androidAppId: 'YOUR_ANDROID_APP_ID',
-  iOSAppId: 'YOUR_IOS_APP_ID',
-  enableNativeUserResource: false,
-  enableIOSWebSocketResource: true,
-});
-```
-
-`enableIOSWebSocketResource` defaults to `false` and is independent of
-`enableNativeUserResource`. It only affects iOS; Android WebSocket collection
-continues through the native SDK under `enableNativeUserResource`.
-When disabled, new iOS connections are not instrumented or injected with
-WebSocket Trace headers. Handshakes already started can finish normally.
-When enabled, Trace injection additionally requires `enableNativeAutoTrace`.
-Only connections created after tracking starts are observed.
-
-iOS starts JS capture and native setup together, without waiting for a native
-readiness reply. JS measures the handshake and injects Trace headers; the native
-bridge handles Resource reporting and optionally adds a response snapshot.
-Missing socket association keeps the native URL filtering, sampling and privacy
-path. Only older native packages without this bridge use the legacy JS route.
-Connections created before the hooks are installed may have no native snapshot.
-
-iOS handshake tracking reads `error.message` first. When it is absent, the SDK
-can use `close.reason` from the immediately following abnormal close (`1006`),
-before the next microtask. The first error still ends handshake timing; normal
-close reasons are not collected. Native HTTP response snapshots take precedence
-over error-text inference.
-
 ## More
 
 [View Doc Here](https://docs.truewatch.com/real-user-monitoring/react-native/app-access/)

package/android/build.gradle

@@ -185,8 +185,8 @@ repositories {
 dependencies {
   // noinspection GradleDynamicVersion
   implementation 'com.facebook.react:react-native:+'
-  implementation 'com.truewatch.ft.mobile.sdk.tracker.agent:ft-sdk:1.7.5'
-  implementation 'com.truewatch.ft.mobile.sdk.tracker.agent:ft-native:1.1.2'
+  implementation 'com.truewatch.ft.mobile.sdk.tracker.agent:ft-sdk:1.7.6'
+  implementation 'com.truewatch.ft.mobile.sdk.tracker.agent:ft-native:1.1.4'
 //   implementation files('../example/android/app/libs/ft-sdk-debug.aar')
 //    implementation files('../example/android/app/libs/ft-session-replay-debug.aar')
 

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

@@ -21,8 +21,10 @@ public class FTLogImpl {
     Map<String, Object> map = context.toHashMap();
     Integer discardStrategy = ReactNativeUtils.convertToNativeInt(map.get("discardStrategy"));
     Double sampleRate = (Double) map.get("sampleRate");
+    Double logSamplingRate = (Double) map.get("logSamplingRate");
     ArrayList<Object> logTypeReadArr = (ArrayList<Object>) map.get("logLevelFilters");
     Boolean enableLinkRumData = (Boolean) map.get("enableLinkRumData");
+    Boolean enableWebViewLog = (Boolean) map.get("enableWebViewLog");
     Boolean enableCustomLog = (Boolean) map.get("enableCustomLog");
     HashMap<String, Object> globalContext = (HashMap<String, Object>) map.get("globalContext");
     Integer logCacheLimitCount = ReactNativeUtils.convertToNativeInt(map.get("logCacheLimitCount"));
@@ -47,8 +49,10 @@ public class FTLogImpl {
     FTLoggerConfig logConfig = new FTLoggerConfig()
       .setLogCacheDiscardStrategy(logCacheDiscard);
 
-    if (sampleRate != null) {
-      logConfig.setSamplingRate(sampleRate.floatValue());
+    if (logSamplingRate != null) {
+      logConfig.setLogSamplingRate(logSamplingRate.floatValue());
+    } else if (sampleRate != null) {
+      logConfig.setLogSamplingRate((float) (sampleRate * 100.0));
     }
 
     if (logTypeReadArr != null) {
@@ -70,6 +74,10 @@ public class FTLogImpl {
       logConfig.setEnableLinkRumData(enableLinkRumData);
     }
 
+    if (enableWebViewLog != null) {
+      logConfig.setEnableWebViewLog(enableWebViewLog);
+    }
+
     if (enableCustomLog != null) {
       logConfig.setEnableCustomLog(enableCustomLog);
     }

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

@@ -171,6 +171,24 @@ public class FTMobileImpl {
                 if (override.hasKey("logSampleRate") && !override.isNull("logSampleRate")) {
                     configBean.setLogSampleRate((float) override.getDouble("logSampleRate"));
                 }
+                if (override.hasKey("sessionSamplingRate") && !override.isNull("sessionSamplingRate")) {
+                    configBean.setSessionSamplingRate((float) override.getDouble("sessionSamplingRate"));
+                }
+                if (override.hasKey("sessionOnErrorSamplingRate") && !override.isNull("sessionOnErrorSamplingRate")) {
+                    configBean.setSessionOnErrorSamplingRate((float) override.getDouble("sessionOnErrorSamplingRate"));
+                }
+                if (override.hasKey("traceSamplingRate") && !override.isNull("traceSamplingRate")) {
+                    configBean.setTraceSamplingRate((float) override.getDouble("traceSamplingRate"));
+                }
+                if (override.hasKey("logSamplingRate") && !override.isNull("logSamplingRate")) {
+                    configBean.setLogSamplingRate((float) override.getDouble("logSamplingRate"));
+                }
+                if (override.hasKey("sessionReplaySamplingRate") && !override.isNull("sessionReplaySamplingRate")) {
+                    configBean.setSessionReplaySamplingRate((float) override.getDouble("sessionReplaySamplingRate"));
+                }
+                if (override.hasKey("sessionReplayOnErrorSamplingRate") && !override.isNull("sessionReplayOnErrorSamplingRate")) {
+                    configBean.setSessionReplayOnErrorSamplingRate((float) override.getDouble("sessionReplayOnErrorSamplingRate"));
+                }
                 if (override.hasKey("logLevelFilters") && !override.isNull("logLevelFilters")) {
                     ReadableArray filtersArray = override.getArray("logLevelFilters");
                     String[] filters = new String[filtersArray.size()];
@@ -182,6 +200,9 @@ public class FTMobileImpl {
                 if (override.hasKey("logEnableCustomLog") && !override.isNull("logEnableCustomLog")) {
                     configBean.setLogEnableCustomLog(override.getBoolean("logEnableCustomLog"));
                 }
+                if (override.hasKey("logEnableWebViewLog") && !override.isNull("logEnableWebViewLog")) {
+                    configBean.setLogEnableWebViewLog(override.getBoolean("logEnableWebViewLog"));
+                }
                 if (override.hasKey("logEnableConsoleLog") && !override.isNull("logEnableConsoleLog")) {
                     configBean.setLogEnableConsoleLog(override.getBoolean("logEnableConsoleLog"));
                 }
@@ -367,6 +388,19 @@ public class FTMobileImpl {
         return convertedFilters;
     }
 
+    static FTSDKConfig buildSDKConfig(@Nullable String datakitUrl,
+                                      @Nullable String datawayUrl,
+                                      @Nullable String clientToken) {
+        if (datakitUrl != null && datakitUrl.length() > 0) {
+            return FTSDKConfig.builder(datakitUrl);
+        }
+        if (datawayUrl != null && datawayUrl.length() > 0
+            && clientToken != null && clientToken.length() > 0) {
+            return FTSDKConfig.builder(datawayUrl, clientToken);
+        }
+        return FTSDKConfig.builder();
+    }
+
     public void sdkConfig(ReadableMap context, Promise promise) {
         Map<String, Object> map = context.toHashMap();
         String datakitUrl = (String) map.get("datakitUrl");
@@ -393,9 +427,12 @@ public class FTMobileImpl {
         this.remoteConfigOverrideRules = context.hasKey("remoteConfigOverrideRules")
             ? context.getArray("remoteConfigOverrideRules") : null;
 
-        FTSDKConfig sdkConfig = (datakitUrl != null)
-            ? FTSDKConfig.builder(datakitUrl)
-            : FTSDKConfig.builder(datawayUrl, cliToken);
+        FTSDKConfig sdkConfig = buildSDKConfig(datakitUrl, datawayUrl, cliToken);
+
+        if (map.containsKey("allowWebViewHost")) {
+            List<String> hosts = (List<String>) map.get("allowWebViewHost");
+            sdkConfig.setAllowWebViewHost(hosts == null ? null : hosts.toArray(new String[0]));
+        }
 
         if (env != null) {
             EnvType envType;
@@ -523,6 +560,11 @@ public class FTMobileImpl {
         promise.resolve(null);
     }
 
+    public void resetVisitorId(Promise promise) {
+        FTSdk.resetVisitorId();
+        promise.resolve(null);
+    }
+
     public void bindRUMUserData(String userId, String userName, String userEmail, ReadableMap extra, Promise promise) {
         UserData userData = new UserData();
         userData.setId(userId);

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

@@ -14,6 +14,7 @@ import com.ft.sdk.FTRUMGlobalManager;
 import com.ft.sdk.FTSdk;
 import com.ft.sdk.RUMCacheDiscard;
 import com.ft.sdk.garble.bean.AppState;
+import com.ft.sdk.garble.bean.ViewTrackingType;
 import com.ft.sdk.garble.bean.NetStatusBean;
 import com.ft.sdk.garble.bean.ResourceParams;
 import com.ft.sdk.reactnative.utils.ReactNativeUtils;
@@ -47,9 +48,18 @@ public class FTRUMImpl implements LifecycleEventListener {
   @ReactMethod
   public void setConfig(ReadableMap context, Promise promise) {
     Map<String, Object> map = context.toHashMap();
+    com.ft.sdk.FTVisitorIdConfig visitorIdConfig;
+    try {
+      visitorIdConfig = VisitorIdConfigMapper.fromMap(map.get("visitorIdConfig"));
+    } catch (IllegalArgumentException error) {
+      promise.reject("E_VISITOR_ID_CONFIG", error.getMessage(), error);
+      return;
+    }
     String rumAppId = (String) map.get("androidAppId");
     Double sampleRate = (Double) map.get("sampleRate");
+    Double sessionSamplingRate = (Double) map.get("sessionSamplingRate");
     Double sessionOnErrorSampleRate = (Double) map.get("sessionOnErrorSampleRate");
+    Double sessionOnErrorSamplingRate = (Double) map.get("sessionOnErrorSamplingRate");
 
     Boolean enableNativeUserAction = (Boolean) map.get("enableNativeUserAction");
     Boolean enableNativeUserView = (Boolean) map.get("enableNativeUserView");
@@ -70,12 +80,16 @@ public class FTRUMImpl implements LifecycleEventListener {
     Boolean enableTraceWebView = (Boolean) map.get("enableTraceWebView");
     ArrayList<String> allowWebViewHost = (ArrayList<String>) map.get("allowWebViewHost");
 
-    FTRUMConfig rumConfig = new FTRUMConfig().setRumAppId(rumAppId);
-    if (sampleRate != null) {
-      rumConfig.setSamplingRate(sampleRate.floatValue());
+    FTRUMConfig rumConfig = new FTRUMConfig().setRumAppId(rumAppId).setVisitorIdConfig(visitorIdConfig);
+    if (sessionSamplingRate != null) {
+      rumConfig.setSessionSamplingRate(sessionSamplingRate.floatValue());
+    } else if (sampleRate != null) {
+      rumConfig.setSessionSamplingRate((float) (sampleRate * 100.0));
     }
-    if (sessionOnErrorSampleRate != null) {
-      rumConfig.setSessionErrorSampleRate(sessionOnErrorSampleRate.floatValue());
+    if (sessionOnErrorSamplingRate != null) {
+      rumConfig.setSessionOnErrorSamplingRate(sessionOnErrorSamplingRate.floatValue());
+    } else if (sessionOnErrorSampleRate != null) {
+      rumConfig.setSessionOnErrorSamplingRate((float) (sessionOnErrorSampleRate * 100.0));
     }
     if (enableNativeUserAction != null) {
       rumConfig.setEnableTraceUserAction(enableNativeUserAction);
@@ -153,10 +167,8 @@ public class FTRUMImpl implements LifecycleEventListener {
     if (allowWebViewHost != null) {
       String[] allowWebViewHostArr = new String[allowWebViewHost.size()];
       allowWebViewHost.toArray(allowWebViewHostArr);
-      FTSdk ftSdk = FTSdk.get();
-      if (ftSdk != null) {
-        ftSdk.getBaseConfig().setAllowWebViewHost(allowWebViewHostArr);
-      }
+      // Let the native SDK apply legacy hosts only when base hosts are omitted.
+      rumConfig.setAllowWebViewHost(allowWebViewHostArr);
     }
 
     FTSdk.initRUMWithConfig(rumConfig);
@@ -242,6 +254,36 @@ public class FTRUMImpl implements LifecycleEventListener {
     promise.resolve(null);
   }
 
+  @ReactMethod
+  public void onCreateViewWithLoadStart(String viewName, double duration, double loadStartEpochMs, Promise promise) {
+    long nanoseconds = ViewTiming.durationNanoseconds(duration);
+    FTRUMGlobalManager.get().onCreateView(viewName, nanoseconds,
+        nanoseconds > 0 ? ViewTiming.epochNanoseconds(loadStartEpochMs) : 0);
+    promise.resolve(null);
+  }
+
+  @ReactMethod
+  public void startViewWithTrackingType(String viewName, ReadableMap map, double trackingType, Promise promise) {
+    if (trackingType != 0 && trackingType != 1) {
+      promise.reject("E_VIEW_TRACKING_TYPE", "trackingType must be Manual (0) or Automatic (1)");
+      return;
+    }
+    FTRUMGlobalManager.get().startView(viewName, map == null ? null : map.toHashMap(),
+        trackingType == 1 ? ViewTrackingType.AUTOMATIC : ViewTrackingType.MANUAL);
+    promise.resolve(null);
+  }
+
+  @ReactMethod
+  public void updateViewLoadingTime(double duration, Promise promise) {
+    if (Double.isNaN(duration) || Double.isInfinite(duration) || duration < 0
+        || duration > 9007199254740991d || duration != Math.floor(duration)) {
+      promise.reject("E_VIEW_LOADING_TIME", "duration must be a non-negative safe integer in nanoseconds");
+      return;
+    }
+    FTRUMGlobalManager.get().updateLoadTime((long) duration);
+    promise.resolve(null);
+  }
+
   @ReactMethod
   public void onCreateView(String viewName, Double duration, Promise promise) {
     FTRUMGlobalManager.get().onCreateView(viewName, duration.longValue());

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

@@ -21,13 +21,16 @@ public class FTTraceImpl {
   public void setConfig(ReadableMap context, Promise promise) {
     Map<String, Object> map = context.toHashMap();
     Double sampleRate = (Double) map.get("sampleRate");
+    Double traceSamplingRate = (Double) map.get("traceSamplingRate");
     Integer traceType = ReactNativeUtils.convertToNativeInt(map.get("traceType"));
     Boolean enableLinkRUMData = (Boolean) map.get("enableLinkRUMData");
     Boolean enableNativeAutoTrace = (Boolean) map.get("enableNativeAutoTrace");
 
     FTTraceConfig traceConfig = new FTTraceConfig();
-    if (sampleRate != null) {
-      traceConfig.setSamplingRate(sampleRate.floatValue());
+    if (traceSamplingRate != null) {
+      traceConfig.setTraceSamplingRate(traceSamplingRate.floatValue());
+    } else if (sampleRate != null) {
+      traceConfig.setTraceSamplingRate((float) (sampleRate * 100.0));
     }
 
     if (traceType != null) {

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

@@ -0,0 +1,17 @@
+package com.ft.sdk.reactnative;
+
+final class ViewTiming {
+  private ViewTiming() {}
+
+  static long durationNanoseconds(double value) {
+    return (!Double.isNaN(value) && !Double.isInfinite(value)) && value > 0 && value < 0x1p63 ? (long) value : 0;
+  }
+
+  static long epochNanoseconds(double milliseconds) {
+    if ((Double.isNaN(milliseconds) || Double.isInfinite(milliseconds)) || milliseconds <= 0 || milliseconds >= 0x1p63 / 1000000.0) return 0;
+    long whole = (long) milliseconds;
+    long fraction = (long) ((milliseconds - whole) * 1000000.0);
+    if (whole > Long.MAX_VALUE / 1000000 || fraction > Long.MAX_VALUE - whole * 1000000) return 0;
+    return whole * 1000000 + fraction;
+  }
+}

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

@@ -0,0 +1,50 @@
+package com.ft.sdk.reactnative;
+
+import com.ft.sdk.FTVisitorIdConfig;
+import java.net.URI;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Pattern;
+
+final class VisitorIdConfigMapper {
+  private VisitorIdConfigMapper() {}
+
+  static FTVisitorIdConfig fromMap(Object value) {
+    if (value == null) return null;
+    if (!(value instanceof Map)) throw new IllegalArgumentException("visitorIdConfig must be an object");
+    Map<?, ?> map = (Map<?, ?>) value;
+    if (!(map.get("header") instanceof String)) throw new IllegalArgumentException("Visitor ID header is required");
+    FTVisitorIdConfig config = new FTVisitorIdConfig().setHeader((String) map.get("header"));
+    if (map.containsKey("ttlHours")) {
+      if (!(map.get("ttlHours") instanceof Number)) throw new IllegalArgumentException("Visitor ID TTL must be numeric");
+      double hours = ((Number) map.get("ttlHours")).doubleValue();
+      double milliseconds = hours * 3600000;
+      if (Double.isNaN(hours) || Double.isInfinite(hours) || milliseconds < 1 || milliseconds >= Long.MAX_VALUE) {
+        throw new IllegalArgumentException("Visitor ID TTL is out of range");
+      }
+      config.setTtlHours(hours);
+    }
+    int rules = 0;
+    for (String key : new String[]{"urlPrefixes", "regularExpressions"}) {
+      Object values = map.get(key);
+      if (values == null && !map.containsKey(key)) continue;
+      if (!(values instanceof List)) throw new IllegalArgumentException(key + " must be an array");
+      for (Object item : (List<?>) values) {
+        if (!(item instanceof String) || ((String) item).isEmpty()) throw new IllegalArgumentException("Invalid Visitor ID rule");
+        String rule = (String) item;
+        if ("urlPrefixes".equals(key)) {
+          URI uri = URI.create(rule);
+          if (uri.getHost() == null || !("http".equalsIgnoreCase(uri.getScheme()) || "https".equalsIgnoreCase(uri.getScheme()))) {
+            throw new IllegalArgumentException("Visitor ID prefix must be an HTTP(S) URL");
+          }
+          config.addMatch(rule);
+        } else {
+          config.addMatch(Pattern.compile(rule));
+        }
+        rules++;
+      }
+    }
+    if (rules == 0) throw new IllegalArgumentException("Visitor ID requires URL matching rules");
+    return config;
+  }
+}

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

@@ -39,6 +39,11 @@ public class FTMobileModule extends NativeFTMobileReactNativeSpec {
     impl.bindRUMUserData(userId, userName, userEmail, extra, promise);
   }
 
+  @ReactMethod
+  public void resetVisitorId(Promise promise) {
+    impl.resetVisitorId(promise);
+  }
+
   @ReactMethod
   public void unbindRUMUserData(Promise promise) {
     impl.unbindRUMUserData(promise);

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

@@ -58,6 +58,24 @@ public class FTRUMModule extends NativeFTReactNativeRUMSpec {
     impl.addAction(actionName, actionType, map, promise);
   }
 
+  @Override
+  @ReactMethod
+  public void onCreateViewWithLoadStart(String viewName, double duration, double loadStartEpochMs, Promise promise) {
+    impl.onCreateViewWithLoadStart(viewName, duration, loadStartEpochMs, promise);
+  }
+
+  @Override
+  @ReactMethod
+  public void startViewWithTrackingType(String viewName, ReadableMap map, double trackingType, Promise promise) {
+    impl.startViewWithTrackingType(viewName, map, trackingType, promise);
+  }
+
+  @Override
+  @ReactMethod
+  public void updateViewLoadingTime(double duration, Promise promise) {
+    impl.updateViewLoadingTime(duration, promise);
+  }
+
   @Override
   @ReactMethod
   public void onCreateView(String viewName, double duration, Promise promise) {

package/android/src/oldarch/java/com/ft/sdk/reactnative/FTMobileModule.java

@@ -38,6 +38,11 @@ public class FTMobileModule extends ReactContextBaseJavaModule {
     impl.bindRUMUserData(userId, userName, userEmail, extra, promise);
   }
 
+  @ReactMethod
+  public void resetVisitorId(Promise promise) {
+    impl.resetVisitorId(promise);
+  }
+
   @ReactMethod
   public void unbindRUMUserData(Promise promise) {
     impl.unbindRUMUserData(promise);

package/android/src/oldarch/java/com/ft/sdk/reactnative/FTRUMModule.java

@@ -56,6 +56,21 @@ public class FTRUMModule extends ReactContextBaseJavaModule {
     impl.addAction(actionName, actionType, map, promise);
   }
 
+  @ReactMethod
+  public void onCreateViewWithLoadStart(String viewName, double duration, double loadStartEpochMs, Promise promise) {
+    impl.onCreateViewWithLoadStart(viewName, duration, loadStartEpochMs, promise);
+  }
+
+  @ReactMethod
+  public void startViewWithTrackingType(String viewName, ReadableMap map, double trackingType, Promise promise) {
+    impl.startViewWithTrackingType(viewName, map, trackingType, promise);
+  }
+
+  @ReactMethod
+  public void updateViewLoadingTime(double duration, Promise promise) {
+    impl.updateViewLoadingTime(duration, promise);
+  }
+
   @ReactMethod
   public void onCreateView(String viewName, Double duration, Promise promise) {
     impl.onCreateView(viewName, duration, promise);

package/android/src/test/java/com/ft/sdk/reactnative/FTMobileImplTest.java

@@ -0,0 +1,53 @@
+package com.ft.sdk.reactnative;
+
+import static org.junit.Assert.assertEquals;
+
+import com.ft.sdk.FTSDKConfig;
+
+import org.junit.Test;
+
+public class FTMobileImplTest {
+    @Test
+    public void buildsConfigWithoutInitialUploadAddress() {
+        FTSDKConfig config = FTMobileImpl.buildSDKConfig(null, null, null);
+
+        assertEquals("", config.getDatakitUrl());
+        assertEquals("", config.getDatawayUrl());
+        assertEquals("", config.getClientToken());
+    }
+
+    @Test
+    public void ignoresIncompleteDatawayConfig() {
+        FTSDKConfig config = FTMobileImpl.buildSDKConfig(null, "https://ingest.example.com", null);
+
+        assertEquals("", config.getDatakitUrl());
+        assertEquals("", config.getDatawayUrl());
+        assertEquals("", config.getClientToken());
+    }
+
+    @Test
+    public void keepsExistingDatakitConfigBehavior() {
+        FTSDKConfig config = FTMobileImpl.buildSDKConfig(
+            "http://10.0.0.1:9529",
+            "https://ingest.example.com",
+            "client-token"
+        );
+
+        assertEquals("http://10.0.0.1:9529", config.getDatakitUrl());
+        assertEquals("", config.getDatawayUrl());
+        assertEquals("", config.getClientToken());
+    }
+
+    @Test
+    public void keepsExistingDatawayConfigBehavior() {
+        FTSDKConfig config = FTMobileImpl.buildSDKConfig(
+            null,
+            "https://ingest.example.com",
+            "client-token"
+        );
+
+        assertEquals("", config.getDatakitUrl());
+        assertEquals("https://ingest.example.com", config.getDatawayUrl());
+        assertEquals("client-token", config.getClientToken());
+    }
+}

package/ios/FTMobileReactNative.mm

@@ -7,6 +7,7 @@
 //
 
 #import "FTMobileReactNative.h"
+#import <TrueWatchSDK/FTSDKAgent.h>
 #import <React/RCTConvert.h>
 #import <TrueWatchSDK/FTMobileAgent.h>
 #import <TrueWatchSDK/FTSDKConfig+Private.h>
@@ -275,12 +276,33 @@ RCT_EXPORT_MODULE()
     if ([override.allKeys containsObject:@"logSampleRate"]) {
       model.logSampleRate = @([RCTConvert double:override[@"logSampleRate"]]);
     }
+    if ([override.allKeys containsObject:@"sessionSamplingRate"]) {
+      model.sessionSamplingRate = @([RCTConvert double:override[@"sessionSamplingRate"]]);
+    }
+    if ([override.allKeys containsObject:@"sessionOnErrorSamplingRate"]) {
+      model.sessionOnErrorSamplingRate = @([RCTConvert double:override[@"sessionOnErrorSamplingRate"]]);
+    }
+    if ([override.allKeys containsObject:@"traceSamplingRate"]) {
+      model.traceSamplingRate = @([RCTConvert double:override[@"traceSamplingRate"]]);
+    }
+    if ([override.allKeys containsObject:@"logSamplingRate"]) {
+      model.logSamplingRate = @([RCTConvert double:override[@"logSamplingRate"]]);
+    }
+    if ([override.allKeys containsObject:@"sessionReplaySamplingRate"]) {
+      model.sessionReplaySamplingRate = @([RCTConvert double:override[@"sessionReplaySamplingRate"]]);
+    }
+    if ([override.allKeys containsObject:@"sessionReplayOnErrorSamplingRate"]) {
+      model.sessionReplayOnErrorSamplingRate = @([RCTConvert double:override[@"sessionReplayOnErrorSamplingRate"]]);
+    }
     if ([override.allKeys containsObject:@"logLevelFilters"]) {
       model.logLevelFilters = [RCTConvert NSArray:override[@"logLevelFilters"]];
     }
     if ([override.allKeys containsObject:@"logEnableCustomLog"]) {
       model.logEnableCustomLog = @([RCTConvert double:override[@"logEnableCustomLog"]]);
     }
+    if ([override.allKeys containsObject:@"logEnableWebViewLog"] && override[@"logEnableWebViewLog"] != [NSNull null]) {
+      model.logEnableWebViewLog = @([RCTConvert BOOL:override[@"logEnableWebViewLog"]]);
+    }
     
     NSString *ruleId = [RCTConvert NSString:rule[@"id"]];
     [appliedRuleIds addObject:ruleId.length > 0 ? ruleId : [NSString stringWithFormat:@"rule_%lu", (unsigned long)idx]];
@@ -320,6 +342,12 @@ RCT_REMAP_METHOD(bindRUMUserData,
   [self bindRUMUserData:userId userName:userName userEmail:userName extra:extra resolve:resolve reject:reject];
 }
 
+RCT_REMAP_METHOD(resetVisitorId,
+                 resetVisitorIdResolver:(RCTPromiseResolveBlock)resolve
+                 rejecter:(RCTPromiseRejectBlock)reject) {
+  [self resetVisitorId:resolve reject:reject];
+}
+
 RCT_REMAP_METHOD(unbindRUMUserData,
                  unbindRUMUserData_Resolver:(RCTPromiseResolveBlock)resolve
                  rejecter:(RCTPromiseRejectBlock)reject
@@ -383,8 +411,7 @@ RCT_REMAP_METHOD(clearAllData,
     }else if(datakitUrl && datakitUrl.length>0){
       config = [[FTSDKConfig alloc]initWithDatakitUrl:datakitUrl];
     }else{
-      resolve(nil);
-      return;
+      config = [[FTSDKConfig alloc]init];
     }
     if ([context.allKeys containsObject:@"debug"]) {
       config.enableSDKDebugLog = [RCTConvert BOOL:context[@"debug"]];
@@ -428,6 +455,9 @@ RCT_REMAP_METHOD(clearAllData,
     if ([context.allKeys containsObject:@"dataFilters"]) {
       config.dataFilters = [RCTConvert NSDictionary:context[@"dataFilters"]];
     }
+    if ([context.allKeys containsObject:@"allowWebViewHost"]) {
+      config.allowWebViewHost = [RCTConvert NSArray:context[@"allowWebViewHost"]];
+    }
     if ([context.allKeys containsObject:@"globalContext"]) {
       config.globalContext = [RCTConvert NSDictionary:context[@"globalContext"]];
     }
@@ -528,6 +558,11 @@ RCT_REMAP_METHOD(clearAllData,
   [[FTMobileAgent sharedInstance] unbindUser];
   resolve(nil);
 }
+- (void)resetVisitorId:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
+  [FTSDKAgent resetVisitorID];
+  resolve(nil);
+}
+
 - (void)clearAllData:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
   [FTMobileAgent clearAllData];
   resolve(nil);

package/ios/FTReactNativeLog.mm

@@ -42,8 +42,13 @@ RCT_REMAP_METHOD(logWithStatusString,
 
 - (void)logConfig:(NSDictionary *)context resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
   FTLoggerConfig *logger = [[FTLoggerConfig alloc]init];
-  if ([context.allKeys containsObject:@"sampleRate"]) {
-      logger.sampleRate = [RCTConvert double:context[@"sampleRate"]] * 100;
+  if ([context.allKeys containsObject:@"logSamplingRate"]) {
+    logger.logSamplingRate = [RCTConvert double:context[@"logSamplingRate"]];
+  } else if ([context.allKeys containsObject:@"sampleRate"]) {
+    logger.logSamplingRate = [RCTConvert double:context[@"sampleRate"]] * 100;
+  }
+  if ([context.allKeys containsObject:@"enableWebViewLog"]) {
+      logger.enableWebViewLog = [RCTConvert BOOL:context[@"enableWebViewLog"]];
   }
   NSArray<NSNumber *>*filters = [RCTConvert NSNumberArray:context[@"logLevelFilters"]];
   if (filters) {