@truewatchtech/react-native-mobile 0.4.2 → 0.4.3

package/FTMobileReactNativeSDK.podspec

@@ -12,15 +12,17 @@ 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/TrueWatchTech/datakit-react-native.git", :tag => "agent_#{s.version}" }
 
 
   s.source_files = "ios/**/*.{h,m,mm,swift}"
+  s.private_header_files = "ios/FTJSLongTaskMonitor.h", "ios/FTWebSocketMetadataStore.h", "ios/FTReactNativeWebSocket.h", "ios/FTReactNativeResource.h", "ios/FTWebSocketResourceData.h"
+  s.frameworks = "CFNetwork"
 
 
   s.dependency "React-Core"
-  s.dependency 'FTMobileSDK', '1.6.5'
-  
+  s.dependency 'TrueWatchSDK', '1.6.8'
+
     xcconfig = {
     "HEADER_SEARCH_PATHS" => "$(inherited) " +
       "$(PODS_ROOT)/React-RCTFabric/** " +
@@ -36,7 +38,7 @@ Pod::Spec.new do |s|
 
   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"
@@ -48,5 +50,5 @@ Pod::Spec.new do |s|
    if respond_to?(:install_modules_dependencies, true)
     install_modules_dependencies(s)
   end
-  
+
 end

package/android/build.gradle

@@ -94,6 +94,12 @@ android {
       }
 
       if (reactNativeMajorVersion == 0) {
+        if (reactNativeMinorVersion >= 70) {
+          java.srcDirs += ['src/rnpost70/java']
+        } else {
+          java.srcDirs += ['src/rnpre70/java']
+        }
+
         if (reactNativeMinorVersion >= 74) {
           java.srcDirs += ['src/rnpost74/java']
         } else {
@@ -179,11 +185,12 @@ repositories {
 dependencies {
   // noinspection GradleDynamicVersion
   implementation 'com.facebook.react:react-native:+'
-  implementation 'com.truewatch.ft.mobile.sdk.tracker.agent:ft-sdk:1.7.2'
-  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')
 
   implementation 'com.google.code.gson:gson:2.8.5'
+  testImplementation 'junit:junit:4.13.2'
+  testImplementation 'org.mockito:mockito-core:4.11.0'
 }

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);
@@ -655,11 +697,4 @@ public class FTMobileImpl {
         });
     }
 
-    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

@@ -2,8 +2,11 @@ package com.ft.sdk.reactnative;
 
 import com.ft.sdk.reactnative.BuildConfig;
 import com.facebook.react.bridge.Promise;
+import com.facebook.react.bridge.LifecycleEventListener;
+import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.common.LifecycleState;
 import com.ft.sdk.DetectFrequency;
 import com.ft.sdk.FTInTakeUrlHandler;
 import com.ft.sdk.FTRUMConfig;
@@ -11,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;
@@ -18,18 +22,44 @@ import com.ft.sdk.reactnative.utils.ReactNativeUtils;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
 
-public class FTRUMImpl {
+public class FTRUMImpl implements LifecycleEventListener {
 
   private static final String DEFAULT_ERROR_TYPE = "reactnative_crash";
   public static final String NAME = "FTReactNativeRUM";
+  private final ReactApplicationContext reactContext;
+  private final JsLongTaskMonitor jsLongTaskMonitor;
+  private final AtomicBoolean destroyed = new AtomicBoolean();
+
+  public FTRUMImpl(ReactApplicationContext reactContext) {
+    this(reactContext, JsLongTaskMonitor.create(reactContext));
+  }
+
+  FTRUMImpl(
+    ReactApplicationContext reactContext,
+    JsLongTaskMonitor jsLongTaskMonitor
+  ) {
+    this.reactContext = reactContext;
+    this.jsLongTaskMonitor = jsLongTaskMonitor;
+    reactContext.addLifecycleEventListener(this);
+  }
 
   @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");
@@ -39,6 +69,8 @@ public class FTRUMImpl {
     Boolean enableTrackNativeAppANR = (Boolean) map.get("enableTrackNativeAppANR");
     Boolean enableTrackNativeFreeze = (Boolean) map.get("enableTrackNativeFreeze");
     Double nativeFreezeDurationMs = (Double) map.get("nativeFreezeDurationMs");
+    Boolean enableLongTask = (Boolean) map.get("enableLongTask");
+    Double longTaskThresholdMs = (Double) map.get("longTaskThresholdMs");
     Integer monitorType = ReactNativeUtils.convertToNativeInt(map.get("errorMonitorType"));
     Integer deviceMonitorType = ReactNativeUtils.convertToNativeInt(map.get("deviceMonitorType"));
     Integer detectFrequency = ReactNativeUtils.convertToNativeInt(map.get("detectFrequency"));
@@ -48,12 +80,16 @@ public class FTRUMImpl {
     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);
@@ -131,14 +167,73 @@ public class FTRUMImpl {
     if (allowWebViewHost != null) {
       String[] allowWebViewHostArr = new String[allowWebViewHost.size()];
       allowWebViewHost.toArray(allowWebViewHostArr);
+      // Let the native SDK apply legacy hosts only when base hosts are omitted.
       rumConfig.setAllowWebViewHost(allowWebViewHostArr);
     }
 
     FTSdk.initRUMWithConfig(rumConfig);
+    double configuredThresholdMilliseconds = longTaskThresholdMs != null
+      ? longTaskThresholdMs
+      : 100;
+    double thresholdMilliseconds = Boolean.TRUE.equals(enableLongTask)
+      ? configuredThresholdMilliseconds
+      : 0;
+    jsLongTaskMonitor.setThresholdMilliseconds(thresholdMilliseconds);
+    if (
+      thresholdMilliseconds > 0 &&
+      reactContext.getLifecycleState() == LifecycleState.RESUMED
+    ) {
+      jsLongTaskMonitor.start();
+    } else {
+      jsLongTaskMonitor.stop();
+    }
     //LogUtils.d("configCheck","rumConfig:"+new Gson().toJson(rumConfig));
     promise.resolve(null);
   }
 
+  @ReactMethod
+  public void stopLongTaskTracking(final Promise promise) {
+    jsLongTaskMonitor.disable(new Runnable() {
+      @Override
+      public void run() {
+        promise.resolve(null);
+      }
+    });
+  }
+
+  public boolean setLongTaskContext(ReadableMap context) {
+    if (destroyed.get()) {
+      return false;
+    }
+    jsLongTaskMonitor.setBridgeContext(context == null ? null : context.toHashMap());
+    return true;
+  }
+
+  public void destroy() {
+    if (!destroyed.compareAndSet(false, true)) {
+      return;
+    }
+    reactContext.removeLifecycleEventListener(this);
+    jsLongTaskMonitor.disable(null);
+  }
+
+  @Override
+  public void onHostResume() {
+    if (!destroyed.get()) {
+      jsLongTaskMonitor.start();
+    }
+  }
+
+  @Override
+  public void onHostPause() {
+    jsLongTaskMonitor.stop();
+  }
+
+  @Override
+  public void onHostDestroy() {
+    jsLongTaskMonitor.stop();
+  }
+
   @ReactMethod
   public void startAction(String actionName, String actionType, ReadableMap map, Promise promise) {
     if (map != null) {
@@ -159,6 +254,36 @@ public class FTRUMImpl {
     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) {
@@ -71,6 +74,10 @@ public class FTTraceImpl {
 
   @ReactMethod
   public void getTraceHeaderFields(String url, String key, Promise promise) {
+    promise.resolve(getTraceHeaderFieldsSync(url, key));
+  }
+
+  public WritableNativeMap getTraceHeaderFieldsSync(String url, String key) {
     HashMap<String, String> hashMap = null;
     if (key == null) {
       hashMap = FTTraceManager.get().getTraceHeader(url);
@@ -84,6 +91,6 @@ public class FTTraceImpl {
         map.putString(entry.getKey(), entry.getValue());
       }
     }
-    promise.resolve(map);
+    return map;
   }
 }