Merge branch 'staging' of github.com:Countly/countly-sdk-react-native-bridge into staging-np

Author: turtledreams

CHANGELOG.md

@@ -1,3 +1,28 @@
+## 25.4.1-np
+* Improved Content display mechanics.
+* Added "setRequestTimeoutDuration" init config parameter to change request timeout duration in seconds.
+* Added a new function "recordMetrics(metricsOverride)" to send a manual metrics requests.
+* Added a new Consent option "metrics" for controlling "recordMetrics" method. (This has no effect on Session metrics.)
+* Added event listener calls for new architecture (thanks @j-q-in-berlin)
+
+* Mitigated an issue in SDK limits config class initialization  (thanks @albertlaiuste)
+
+* Android specific changes:
+  * Improved disk size calculation in crash reports.
+  * Mitigated an issue that could have happened when navigating back from a Content.
+  * Mitigated a persistency issue with init configuration provided SBS and its initial state.
+  * Mitigated an issue where SBS could have been fetched twice.
+ 
+* iOS specific changes:
+  * Improved CPU architecture detection capabilities.
+  * Added the ability to record reserved events.
+  * Changed default log level from "Debug" to "Verbose".
+  * Mitigated an SBS issue while in temporary ID mode.
+  * Mitigated a possible Health Check network log recording issue.
+
+* Updated the underlying Android SDK version to 25.4.4
+* Updated the underlying iOS SDK version to 25.4.6
+
 ## 25.4.0-np
 * ! Minor breaking change ! The SDK now exclusively uses random UUIDs for device id generation instead of platform specific OpenUDID or IDFV
 * ! Minor breaking change ! Server Configuration is now enabled by default. Changes made on SDK Manager > SDK Configuration on your server will affect SDK behavior directly

Countly.d.ts

@@ -520,6 +520,13 @@ declare module "countly-sdk-react-native-bridge-np" {
      */
     export function addCrashLog(crashLog: string): string | void;
 
+
+    /**
+     * Record a metrics request to be sent to the server
+     * @param {Record<string, string>} [metricsOverride] - optional metrics override map
+     */
+    export function recordMetrics(metricsOverride?: Record<string, string>): void;
+
     /**
      *
      * Log exception for Countly
@@ -1356,8 +1363,8 @@ declare module "countly-sdk-react-native-bridge-np/CountlyConfig" {
      * Method to give consent for specific features before init
      *
      * @param {string[]} consents consents e.g ['location', 'sessions',
-     * 'attribution', 'push', 'events', 'views', 'crashes', 'users',
-     * 'star-rating', 'apm', 'feedback', 'remote-config']
+     * 'attribution', 'events', 'views', 'crashes', 'users',
+     * 'star-rating', 'apm', 'feedback', 'remote-config', 'metrics']
      */
       giveConsent(consents: readonly string[]): CountlyConfig;
 
@@ -1494,6 +1501,14 @@ declare module "countly-sdk-react-native-bridge-np/CountlyConfig" {
        * @return {CountlyConfig}
        */
       setSDKBehaviorSettings(settingsObject: object): CountlyConfig;
+
+      /**
+       * Method to set the request timeout duration
+       *
+       * @param {number} requestTimeoutDuration - request timeout duration in seconds
+       * @return {CountlyConfig}
+       */
+      setRequestTimeoutDuration(requestTimeoutDuration: number): CountlyConfig;
   }
 
   export default CountlyConfig;

Countly.js

@@ -642,6 +642,29 @@ Countly.addCrashLog = function (crashLog) {
     CountlyNativeModule.addCrashLog([crashLog]);
 };
 
+/**
+ * Record a metrics request to be sent to the server
+ *
+ * @param {object} [metricsOverride] - optional metrics override map
+ */
+Countly.recordMetrics = function (metricsOverride = {}) {
+    if (!_state.isInitialized) {
+        L.e(`recordMetrics, 'init' must be called before 'recordMetrics'`);
+    }
+    L.d(`recordMetrics, Sending metrics request with override: [${JSON.stringify(metricsOverride)}]`);
+    if (metricsOverride && typeof metricsOverride !== "object") {
+        L.w(`recordMetrics, ignoring non-object metricsOverride of type '${typeof metricsOverride}'`);
+        metricsOverride = {};
+    }
+
+    const args = [];
+    for (const key in metricsOverride) {
+        args.push(key.toString());
+        args.push(metricsOverride[key].toString());
+    }
+    CountlyNativeModule.recordMetrics(args);
+};
+
 /**
  *
  * Log exception for Countly

CountlyConfig.js

@@ -29,6 +29,8 @@ class CountlyConfig {
 
     #sdkBehaviorSettings;
 
+    #requestTimeoutDuration;
+
     constructor(serverURL, appKey) {
         this.serverURL = serverURL;
         this.appKey = appKey;
@@ -94,6 +96,10 @@ class CountlyConfig {
         return this.#sdkBehaviorSettings;
     }
 
+    get _requestTimeoutDuration() {
+        return this.#requestTimeoutDuration;
+    }
+
     /**
      * Method to set the server url
      *
@@ -124,6 +130,17 @@ class CountlyConfig {
         return this;
     }
 
+    /**
+     * Method to set the request timeout duration
+     *
+     * @param {Number} timeout - request timeout duration in seconds
+     * @returns {CountlyConfig} this
+     */
+    setRequestTimeoutDuration(timeout) {
+        this.#requestTimeoutDuration = timeout;
+        return this;
+    }
+
     /**
      * Method to enable countly internal debugging logs
      *

CountlyReactNative.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'CountlyReactNative'
-  s.version = '25.4.0'
+  s.version = '25.4.1'
   s.license = {
     :type => 'COMMUNITY',
     :text => <<-LICENSE

Utils.js

@@ -172,6 +172,10 @@ function configToJson(config) {
             json.campaignData = config.campaignData;
             L.i(`init configuration, Campaign type: ${config.campaignType}, Campaign data: ${config.campaignData}`);
         }
+        if (config._requestTimeoutDuration) {
+            json.requestTimeoutDuration = config._requestTimeoutDuration;
+            L.i(`init configuration, Request timeout duration: ${config._requestTimeoutDuration}`);
+        }
         if (config.attributionValues) {
             json.attributionValues = config.attributionValues;
             L.i(`init configuration, Attribution values: ${config.attributionValues}`);

android/build.gradle

@@ -65,5 +65,5 @@ repositories {
 
 dependencies {
     implementation "com.facebook.react:react-native:${safeExtGet('reactNativeVersion', '+')}"
-    implementation 'ly.count.android:sdk:25.4.2'
+    implementation 'ly.count.android:sdk:25.4.4'
 }

android/src/main/java/ly/count/android/sdk/react/CountlyReactNativeImpl.java

@@ -88,7 +88,7 @@ public class CountlyReactNativeImpl extends ReactContextBaseJavaModule implement
 
     public static final String NAME = "CountlyReactNative";
     public static final String TAG = "CountlyRNPlugin";
-    private String COUNTLY_RN_SDK_VERSION_STRING = "25.4.0";
+    private String COUNTLY_RN_SDK_VERSION_STRING = "25.4.1";
     private String COUNTLY_RN_SDK_NAME = "js-rnb-android-np";
 
     private static final CountlyConfig config = new CountlyConfig();
@@ -360,6 +360,14 @@ public void onContentCallback(ContentStatus contentStatus,Map<String, Object> co
                     log("RecordIndirectAttribution: failure, no attribution values provided", LogLevel.DEBUG);
                 }
             }
+            if (_config.has("requestTimeoutDuration")) {
+                int timeout = _config.getInt("requestTimeoutDuration");
+                if (timeout > 0) {
+                    config.setRequestTimeoutDuration(timeout);
+                } else {
+                    log("setRequestTimeoutDuration: failure, timeout value must be greater than 0", LogLevel.DEBUG);
+                }
+            }
             if (_config.has("disableSDKBehaviorSettingsUpdates")) {
                 boolean disableUpdates = _config.getBoolean("disableSDKBehaviorSettingsUpdates");
                 if (disableUpdates) {
@@ -723,6 +731,16 @@ public void addCrashLog(ReadableArray args) {
         Countly.sharedInstance().crashes().addCrashBreadcrumb(record);
     }
 
+    public void recordMetrics(ReadableArray args) {
+        Map<String, String> metricsMap = new HashMap<>();
+        for (int i = 0; i < args.size(); i += 2) {
+            String key = args.getString(i);
+            String value = args.getString(i + 1);
+            metricsMap.put(key, value);
+        }
+        Countly.sharedInstance().requestQueue().recordMetrics(metricsMap);
+    }
+
 
     public void logException(ReadableArray args) {
         String exceptionString = args.getString(0);
@@ -1750,4 +1768,12 @@ public void onHostPause() {
     public void onHostDestroy() {
 
     }
+
+    public void addListener(String eventType) {
+        log("addListener", LogLevel.ERROR);
+    }
+
+    public void removeListeners(double id) {
+        log("removeListeners", LogLevel.ERROR);
+    }
 }

android/src/newarch/java/ly/count/android/sdk/react/CountlyReactNative.java

@@ -201,6 +201,11 @@ public void logException(ReadableArray args) {
         this.impl.logException(args);
     }
 
+    @Override
+    public void recordMetrics(ReadableArray args) {
+        this.impl.recordMetrics(args);
+    }
+
     @Override
     public void logJSException(String err, String message, String stack) {
         this.impl.logJSException(err, message, stack);
@@ -568,4 +573,14 @@ public void setID(String newDeviceID) {
     public void setCustomMetrics(ReadableArray args) {
         this.impl.setCustomMetrics(args);
     }
+
+    @Override
+    public void addListener(String eventType) {
+        this.impl.addListener(eventType);
+    }
+
+    @Override
+    public void removeListeners(double id) {
+        this.impl.removeListeners(id);
+    }
 }

android/src/oldarch/java/ly/count/android/sdk/react/CountlyReactNative.java

@@ -102,6 +102,11 @@ public void addCrashLog(ReadableArray args) {
         this.impl.addCrashLog(args);
     }
 
+    @ReactMethod
+    public void recordMetrics(ReadableArray args) {
+        this.impl.recordMetrics(args);
+    }
+
     @ReactMethod
     public void logException(ReadableArray args) {
         this.impl.logException(args);
@@ -476,4 +481,14 @@ public void setID(String newDeviceID) {
     public void setCustomMetrics(ReadableArray args) {
         this.impl.setCustomMetrics(args);
     }
+
+    @ReactMethod
+    public void addListener(String eventType) {
+        this.impl.addListener(eventType);
+    }
+
+    @ReactMethod
+    public void removeListeners(double id) {
+        this.impl.removeListeners(id);
+    }
 }