@convivainc/conviva-react-native-appanalytics 0.1.4 → 0.2.0

package/android/src/main/java/com/conviva/react/apptracker/util/TrackerVersion.java

@@ -4,6 +4,6 @@ import com.conviva.react.apptracker.BuildConfig;
 
 public class TrackerVersion {
 
-    public final static String RN_CONVIVA_TRACKER_VERSION = "rn-0.1.4";
+    public final static String RN_CONVIVA_TRACKER_VERSION = "rn-0.2.0";
 
 }

package/conviva-react-native-appanalytics.d.ts

@@ -848,6 +848,19 @@ declare function removeTracker(trackerNamespace: string): Promise<boolean>;
  * @returns - A boolean promise
  */
 declare function removeAllTrackers(): Promise<boolean>;
+/**
+ * Gets the cliend id
+ *
+ * @returns - A string promise
+ */
+declare function getClientId(): Promise<string>;
+/**
+ * Sets the cliend id
+ *
+ * @param clientId {string}
+ * @returns - A boolean promise
+ */
+declare function setClientId(clientId: string): Promise<boolean>;
 declare const autocaptureNavigationTrack: (...args: any[]) => any;
 
 declare const _default: {

package/conviva-react-native-appanalytics.js

@@ -139,6 +139,8 @@ const logMessages = {
     // api error prefix
     createTracker: 'createTracker:',
     removeTracker: 'removeTracker: trackerNamespace can only be a string',
+    getClientId: 'getClientId: failed fetching client id',
+    setClientId: 'setClientId: clientId is invalid',
     // methods
     trackSelfDesc: 'trackSelfDescribingEvent:',
     trackScreenView: 'trackScreenViewEvent:',
@@ -164,6 +166,7 @@ const logMessages = {
     setScreenViewport: 'setScreenViewport: screenViewport can only be of ScreenSize type or null',
     setColorDepth: 'setColorDepth: colorDepth can only be a number(integer) or null',
     setSubjectData: 'setSubjectData:',
+    createTrackerNotSet: 'createTracker not invoked prior:'
 };
 
 /*
@@ -1282,6 +1285,7 @@ function setSubjectData$1(namespace, config) {
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
  */
+let isTrackerInitialised = false;
 /**
  * Create a tracker from specified initial configuration.
  *
@@ -1290,8 +1294,12 @@ function setSubjectData$1(namespace, config) {
  */
 function createTracker$1(initConfig) {
     return initValidate(initConfig)
-        .then(() => RNConvivaTracker.createTracker(initConfig))
+        .then(() => {
+        isTrackerInitialised = true;
+        return RNConvivaTracker.createTracker(initConfig);
+    })
         .catch((error) => {
+        isTrackerInitialised = false;
         throw new Error(`${logMessages.createTracker} ${error.message}.`);
     });
 }
@@ -1305,6 +1313,10 @@ function removeTracker$1(trackerNamespace) {
     if (typeof trackerNamespace !== 'string') {
         return Promise.reject(new Error(logMessages.removeTracker));
     }
+    if (!isTrackerInitialised) {
+        return Promise.reject(new Error(logMessages.createTrackerNotSet));
+    }
+    isTrackerInitialised = false;
     return Promise.resolve(RNConvivaTracker.removeTracker({ tracker: trackerNamespace }));
 }
 /**
@@ -1313,8 +1325,35 @@ function removeTracker$1(trackerNamespace) {
  * @returns - A void promise
  */
 function removeAllTrackers$1() {
+    if (!isTrackerInitialised) {
+        return Promise.reject(new Error(logMessages.createTrackerNotSet));
+    }
     return Promise.resolve(RNConvivaTracker.removeAllTrackers());
 }
+/**
+ * Get the client id which is in prescribed format.
+ *
+ * @returns - A promise string if the client if available or genetrated
+ */
+function getClientId$1() {
+    return Promise.resolve(RNConvivaTracker.getClientId())
+        .catch((error) => {
+        throw new Error(`${logMessages.getClientId} ${error.message}.`);
+    });
+}
+/**
+ * Set the client id which is in the prescribed format.
+ *
+ * @param clientId {string} - client id generated for the application in the device
+ * @returns - A promise fullfilled if the client id is valid
+ */
+function setClientId$1(clid) {
+    // have necessary checks in place
+    if (!clid || clid === "" || clid.split(".").length != 4 || !clid.split(".").every(part => part !== "" && !isNaN(Number(part)))) {
+        return Promise.reject(new Error(logMessages.setClientId));
+    }
+    return Promise.resolve(RNConvivaTracker.setClientId({ clientId: clid }));
+}
 /**
  * Returns a function to track a SelfDescribing event by a tracker
  *
@@ -1323,6 +1362,9 @@ function removeAllTrackers$1() {
  */
 function trackSelfDescribingEvent(namespace) {
     return function (argmap, contexts = []) {
+        if (!isTrackerInitialised) {
+            return Promise.reject(new Error(logMessages.createTrackerNotSet));
+        }
         return trackSelfDescribingEvent$1(namespace, argmap, contexts);
     };
 }
@@ -1334,6 +1376,9 @@ function trackSelfDescribingEvent(namespace) {
  */
 function trackScreenViewEvent(namespace) {
     return function (argmap, contexts = []) {
+        if (!isTrackerInitialised) {
+            return Promise.reject(new Error(logMessages.createTrackerNotSet));
+        }
         return trackScreenViewEvent$1(namespace, argmap, contexts);
     };
 }
@@ -1345,6 +1390,9 @@ function trackScreenViewEvent(namespace) {
  */
 function trackStructuredEvent(namespace) {
     return function (argmap, contexts = []) {
+        if (!isTrackerInitialised) {
+            return Promise.reject(new Error(logMessages.createTrackerNotSet));
+        }
         return trackStructuredEvent$1(namespace, argmap, contexts);
     };
 }
@@ -1356,6 +1404,9 @@ function trackStructuredEvent(namespace) {
  */
 function trackPageView(namespace) {
     return function (argmap, contexts = []) {
+        if (!isTrackerInitialised) {
+            return Promise.reject(new Error(logMessages.createTrackerNotSet));
+        }
         return trackPageView$1(namespace, argmap, contexts);
     };
 }
@@ -1367,6 +1418,9 @@ function trackPageView(namespace) {
  */
 function trackTimingEvent(namespace) {
     return function (argmap, contexts = []) {
+        if (!isTrackerInitialised) {
+            return Promise.reject(new Error(logMessages.createTrackerNotSet));
+        }
         return trackTimingEvent$1(namespace, argmap, contexts);
     };
 }
@@ -1378,6 +1432,9 @@ function trackTimingEvent(namespace) {
  */
 function trackConsentGrantedEvent(namespace) {
     return function (argmap, contexts = []) {
+        if (!isTrackerInitialised) {
+            return Promise.reject(new Error(logMessages.createTrackerNotSet));
+        }
         return trackConsentGrantedEvent$1(namespace, argmap, contexts);
     };
 }
@@ -1389,6 +1446,9 @@ function trackConsentGrantedEvent(namespace) {
  */
 function trackConsentWithdrawnEvent(namespace) {
     return function (argmap, contexts = []) {
+        if (!isTrackerInitialised) {
+            return Promise.reject(new Error(logMessages.createTrackerNotSet));
+        }
         return trackConsentWithdrawnEvent$1(namespace, argmap, contexts);
     };
 }
@@ -1400,6 +1460,9 @@ function trackConsentWithdrawnEvent(namespace) {
  */
 function trackEcommerceTransactionEvent(namespace) {
     return function (argmap, contexts = []) {
+        if (!isTrackerInitialised) {
+            return Promise.reject(new Error(logMessages.createTrackerNotSet));
+        }
         return trackEcommerceTransactionEvent$1(namespace, argmap, contexts);
     };
 }
@@ -1411,6 +1474,9 @@ function trackEcommerceTransactionEvent(namespace) {
  */
 function trackDeepLinkReceivedEvent(namespace) {
     return function (argmap, contexts = []) {
+        if (!isTrackerInitialised) {
+            return Promise.reject(new Error(logMessages.createTrackerNotSet));
+        }
         return trackDeepLinkReceivedEvent$1(namespace, argmap, contexts);
     };
 }
@@ -1422,6 +1488,9 @@ function trackDeepLinkReceivedEvent(namespace) {
  */
 function trackMessageNotificationEvent(namespace) {
     return function (argmap, contexts = []) {
+        if (!isTrackerInitialised) {
+            return Promise.reject(new Error(logMessages.createTrackerNotSet));
+        }
         return trackMessageNotificationEvent$1(namespace, argmap, contexts);
     };
 }
@@ -1433,26 +1502,41 @@ function trackMessageNotificationEvent(namespace) {
  */
 function trackCustomEvent(namespace) {
     return function (eventName, eventData, contexts = []) {
+        if (!isTrackerInitialised) {
+            return Promise.reject(new Error(logMessages.createTrackerNotSet));
+        }
         return trackCustomEvent$1(namespace, eventName, eventData, contexts);
     };
 }
 function setCustomTags(namespace) {
     return function (tags, contexts = []) {
+        if (!isTrackerInitialised) {
+            return Promise.reject(new Error(logMessages.createTrackerNotSet));
+        }
         return setCustomTags$1(namespace, tags, contexts);
     };
 }
 function setCustomTagsWithCategory(namespace) {
     return function (category, tags, contexts = []) {
+        if (!isTrackerInitialised) {
+            return Promise.reject(new Error(logMessages.createTrackerNotSet));
+        }
         return setCustomTagsWithCategory$1(namespace, category, tags, contexts);
     };
 }
 function clearCustomTags(namespace) {
     return function (tagKeys, contexts = []) {
+        if (!isTrackerInitialised) {
+            return Promise.reject(new Error(logMessages.createTrackerNotSet));
+        }
         return clearCustomTags$1(namespace, tagKeys, contexts);
     };
 }
 function clearAllCustomTags(namespace) {
     return function (contexts = []) {
+        if (!isTrackerInitialised) {
+            return Promise.reject(new Error(logMessages.createTrackerNotSet));
+        }
         return clearAllCustomTags$1(namespace, contexts);
     };
 }
@@ -1685,6 +1769,9 @@ function getForegroundIndex(namespace) {
  */
 function trackClickEvent(namespace) {
     return function (eventData) {
+        if (!isTrackerInitialised) {
+            return Promise.reject(new Error(logMessages.createTrackerNotSet));
+        }
         return trackClickEvent$1(namespace, eventData);
     };
 }
@@ -2187,6 +2274,25 @@ function removeAllTrackers() {
     return removeAllTrackers$1()
         .catch((e) => errorHandler(e));
 }
+/**
+ * Gets the cliend id
+ *
+ * @returns - A string promise
+ */
+function getClientId() {
+    return Promise.resolve(getClientId$1())
+        .catch((e) => errorHandler(e));
+}
+/**
+ * Sets the cliend id
+ *
+ * @param clientId {string}
+ * @returns - A boolean promise
+ */
+function setClientId(clientId) {
+    return Promise.resolve(setClientId$1(clientId))
+        .catch((e) => errorHandler(e));
+}
 const autocaptureNavigationTrack = handleError((payload) => {
     checkDisplayNamePlugin();
     trackScreenViewEvent('CAT')(payload).catch((e) => errorHandler(e));
@@ -2200,5 +2306,5 @@ var index = {
     withReactNavigationAutotrack: withReactNavigationAutotrack(autocaptureNavigationTrack)
 };
 
-export { autocaptureNavigationTrack, createTracker, index as default, getWebViewCallback, removeAllTrackers, removeTracker, withReactNavigationAutotrack };
+export { autocaptureNavigationTrack, createTracker, index as default, getClientId, getWebViewCallback, removeAllTrackers, removeTracker, setClientId, withReactNavigationAutotrack };
 //# sourceMappingURL=conviva-react-native-appanalytics.js.map

package/ios/RNConvivaAppAnalytics.m

@@ -637,10 +637,10 @@ RCT_EXPORT_METHOD(trackCustomEvent:
 
     if (trackerController != nil) {
         NSString *eventName = [details objectForKey:@"eventName"];
-        NSString *eventData = [details objectForKey:@"eventData"];
+        NSDictionary *eventData = [details objectForKey:@"eventData"];
 
         if(0 < eventName.length){
-            [trackerController trackCustomEvent:eventName data:eventData];
+            [trackerController trackCustomEvent:eventName eventData:eventData];
         }
         
         resolve(@YES);
@@ -1011,13 +1011,20 @@ RCT_EXPORT_METHOD(getIsInBackground:
                   (NSDictionary *)details
                   resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject) {
-    NSString *namespace = [details objectForKey:@"tracker"];
-    id<CATTrackerController> trackerController = [self trackerByNamespace:namespace];
-
-    if (trackerController != nil) {
-        BOOL isInBg = [trackerController.session isInBackground];
-        resolve(@(isInBg));
-    } else {
+//    NSString *namespace = [details objectForKey:@"tracker"];
+//    id<CATTrackerController> trackerController = [self trackerByNamespace:namespace];
+//
+//    if (trackerController != nil) {
+//        BOOL isInBg = [trackerController.session isInBackground];
+//        resolve(@(isInBg));
+//    } else {
+//        NSError* error = [NSError errorWithDomain:@"ConvivaAppAnalytics" code:200 userInfo:nil];
+//        reject(@"ERROR", @"tracker with given namespace not found", error);
+//    }
+
+    @try {
+        resolve(@(YES));
+    } @catch (NSException *exception) {
         NSError* error = [NSError errorWithDomain:@"ConvivaAppAnalytics" code:200 userInfo:nil];
         reject(@"ERROR", @"tracker with given namespace not found", error);
     }
@@ -1027,13 +1034,19 @@ RCT_EXPORT_METHOD(getBackgroundIndex:
                   (NSDictionary *)details
                   resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject) {
-    NSString *namespace = [details objectForKey:@"tracker"];
-    id<CATTrackerController> trackerController = [self trackerByNamespace:namespace];
-
-    if (trackerController != nil) {
-        NSInteger bgIdx = [trackerController.session backgroundIndex];
-        resolve(@(bgIdx));
-    } else {
+//    NSString *namespace = [details objectForKey:@"tracker"];
+//    id<CATTrackerController> trackerController = [self trackerByNamespace:namespace];
+//
+//    if (trackerController != nil) {
+//        NSInteger bgIdx = [trackerController.session backgroundIndex];
+//        resolve(@(bgIdx));
+//    } else {
+//        NSError* error = [NSError errorWithDomain:@"ConvivaAppAnalytics" code:200 userInfo:nil];
+//        reject(@"ERROR", @"tracker with given namespace not found", error);
+//    }
+    @try {
+        resolve(@(YES));
+    } @catch (NSException *exception) {
         NSError* error = [NSError errorWithDomain:@"ConvivaAppAnalytics" code:200 userInfo:nil];
         reject(@"ERROR", @"tracker with given namespace not found", error);
     }
@@ -1043,12 +1056,56 @@ RCT_EXPORT_METHOD(getForegroundIndex:
                   (NSDictionary *)details
                   resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject) {
-    NSString *namespace = [details objectForKey:@"tracker"];
-    id<CATTrackerController> trackerController = [self trackerByNamespace:namespace];
+//    NSString *namespace = [details objectForKey:@"tracker"];
+//    id<CATTrackerController> trackerController = [self trackerByNamespace:namespace];
+//
+//    if (trackerController != nil) {
+//        NSInteger fgIdx = [trackerController.session foregroundIndex];
+//        resolve(@(fgIdx));
+//    } else {
+//        NSError* error = [NSError errorWithDomain:@"ConvivaAppAnalytics" code:200 userInfo:nil];
+//        reject(@"ERROR", @"tracker with given namespace not found", error);
+//    }
+    @try {
+        resolve(@(YES));
+    } @catch (NSException *exception) {
+        NSError* error = [NSError errorWithDomain:@"ConvivaAppAnalytics" code:200 userInfo:nil];
+        reject(@"ERROR", @"tracker with given namespace not found", error);
+    }
+}
 
-    if (trackerController != nil) {
-        NSInteger fgIdx = [trackerController.session foregroundIndex];
-        resolve(@(fgIdx));
+RCT_EXPORT_METHOD(getClientId: (RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
+    
+    CATAppAnalytics *convivaAppAnalytics = [CATAppAnalytics sharedInstance];
+
+    if (convivaAppAnalytics != nil) {
+        NSString *clientId = [convivaAppAnalytics getClientId];
+        if (clientId != nil && clientId.length > 0) {
+            resolve(clientId);
+        }
+        else {
+            NSError* error = [NSError errorWithDomain:@"ConvivaAppAnalytics" code:200 userInfo:nil];
+            reject(@"ERROR", @"ClientId not found", error);
+        }
+    } else {
+        NSError* error = [NSError errorWithDomain:@"ConvivaAppAnalytics" code:200 userInfo:nil];
+        reject(@"ERROR", @"CATAppAnalytics not found", error);
+    }
+}
+
+RCT_EXPORT_METHOD(setClientId:
+                  (NSDictionary *)details
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject) {
+    CATAppAnalytics *convivaAppAnalytics = [CATAppAnalytics sharedInstance];
+
+    if (convivaAppAnalytics != nil) {
+        NSString *newClientId = [details rncat_stringForKey:@"clientId" defaultValue:nil];
+        BOOL isClientIdSet = NO;
+        if (newClientId != nil && newClientId.length > 0) {
+             isClientIdSet = [convivaAppAnalytics setClientId: newClientId];
+        }
+        resolve(@(isClientIdSet));
     } else {
         NSError* error = [NSError errorWithDomain:@"ConvivaAppAnalytics" code:200 userInfo:nil];
         reject(@"ERROR", @"tracker with given namespace not found", error);

package/ios/Util/RNTrackerVersion.m

@@ -22,6 +22,6 @@
 
 @implementation RNTrackerVersion
 
-NSString * const kRNTrackerVersion = @"rn-0.1.4";
+NSString * const kRNTrackerVersion = @"rn-0.2.0";
 
 @end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@convivainc/conviva-react-native-appanalytics",
-  "version": "0.1.4",
+  "version": "0.2.0",
   "description": "Conviva React Native Application Analytics Library",
   "main": "conviva-react-native-appanalytics.js",
   "repository": {

package/android/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Mon Dec 18 17:16:15 IST 2023
-gradle.version=7.5

package/android/.gradle/config.properties

@@ -1,2 +0,0 @@
-#Mon Dec 18 17:16:12 IST 2023
-java.home=/private/var/folders/k4/74893875541dtbxdz44z6zbr0000gn/T/AppTranslocation/4A54960E-0028-414A-AF27-0F092C67D374/d/Android Studio.app/Contents/jbr/Contents/Home

package/android/.idea/compiler.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
-  </component>
-</project>

package/android/.idea/gradle.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="testRunner" value="GRADLE" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="Embedded JDK" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-          </set>
-        </option>
-        <option name="resolveExternalAnnotations" value="false" />
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>

package/android/.idea/migrations.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectMigrations">
-    <option name="MigrateToGradleLocalJavaHome">
-      <set>
-        <option value="$PROJECT_DIR$" />
-      </set>
-    </option>
-  </component>
-</project>

package/android/.idea/misc.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="11" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
-</project>

package/android/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
-  </component>
-</project>

package/android/local.properties

@@ -1,8 +0,0 @@
-## This file must *NOT* be checked into Version Control Systems,
-# as it contains information specific to your local configuration.
-#
-# Location of the SDK. This is only used by Gradle.
-# For customization when using a Version Control System, please read the
-# header note.
-#Mon Dec 18 17:16:12 IST 2023
-sdk.dir=/Users/sramachandra/Library/Android/sdk