apps-sdk 1.0.102 → 1.0.103

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apps-sdk",
-  "version": "1.0.102",
+  "version": "1.0.103",
   "description": "Apps SDK",
   "main": "index.js",
   "scripts": {

package/src/libraries/AdJust.js

@@ -69,27 +69,13 @@ class AdJust {
     }
 
     async trackEventIfExist(eventKeyword, eventValue= 0) {
-        let finalKeyword = eventKeyword;
-        if (config.EVENTS[finalKeyword]) {
-            if (this.isSpecialEvent(eventKeyword)) {
-                finalKeyword = 'first_' + eventKeyword;
-                if (config.EVENTS[finalKeyword]) {
-                    const alreadySent = await storage.getData(finalKeyword);
-                    console.log("Already sent: " + finalKeyword + " " + JSON.stringify(alreadySent));
-                    if (!alreadySent) {
-                        console.log("Storing event: " + finalKeyword);
-                        storage.storeData(finalKeyword, true);
-                    } else {
-                        finalKeyword = eventKeyword;
-                    }
-                }
-            }
-            const adjustEvent = new AdjustEvent(config.EVENTS[finalKeyword]);
+        if (config.EVENTS[eventKeyword]) {
+            const adjustEvent = new AdjustEvent(config.EVENTS[eventKeyword]);
             if (eventValue > 0) {
                 adjustEvent.setRevenue(eventValue, 'EUR');
             }
             Adjust.trackEvent(adjustEvent);
-            console.log("Event sent to AdJust: " + eventKeyword + " with value: " + eventValue + " and keyword: " + finalKeyword + " and event: " + config.EVENTS[finalKeyword]);
+            console.log("Event sent to AdJust: " + eventKeyword + " with value: " + eventValue + " and keyword: " + eventKeyword + " and event: " + config.EVENTS[eventKeyword]);
         } else {
             console.log("Event not found in AdJust, not sent: " + eventKeyword);
         }
@@ -116,10 +102,6 @@ class AdJust {
         }
     }
 
-    isSpecialEvent(eventKeyword) {
-        return config.SPECIAL_EVENTS.includes(eventKeyword);
-    }
-
     async getAttribution() {
         Adjust.getAttribution((attribution) => {
             if (attribution) {

package/src/libraries/Networking.js

@@ -7,6 +7,7 @@ import CryptoES from "crypto-es";
 import semver from 'semver';
 import Constants from 'expo-constants';
 import { Platform } from 'react-native';
+import utils from "./Utils";
 
 class Networking {
     constructor() {
@@ -218,13 +219,31 @@ class Networking {
             }
             return;
         }
-        config.DEBUG_MODE && console.debug("sendEvent", eventType, eventKeyword, eventData);
+
+        let finalKeyword = eventKeyword;
+        if (config.EVENTS[finalKeyword]) {
+            if (utils.isSpecialEvent(finalKeyword)) {
+                finalKeyword = 'first_' + eventKeyword;
+                if (config.EVENTS[finalKeyword]) {
+                    const alreadySent = await storage.getData(finalKeyword);
+                    console.log("Already sent: " + finalKeyword + " " + JSON.stringify(alreadySent));
+                    if (!alreadySent) {
+                        console.log("Storing event: " + finalKeyword);
+                        storage.storeData(finalKeyword, true);
+                    } else {
+                        finalKeyword = eventKeyword;
+                    }
+                }
+            }
+        }
+
+        config.DEBUG_MODE && console.debug("sendEvent", eventType, finalKeyword, eventData);
         try {
-            AdJust.trackEventIfExist(eventKeyword);
+            AdJust.trackEventIfExist(finalKeyword);
             let eventResponse = await this.request(config.ENDPOINTS.EVENTS_PUSH, {
-                event_name: eventKeyword,
+                event_name: finalKeyword,
                 event_type: eventType,
-                appevent: eventKeyword,
+                appevent: finalKeyword,
                 payload: eventData,
                 ...Session.sessionData,
             });

package/src/libraries/Utils.js

@@ -1,3 +1,5 @@
+import * as config from "../../config";
+
 class Utils {
     isBase64(str) {
         if (str ==='' || str.trim() ===''){ return false; }
@@ -20,6 +22,10 @@ class Utils {
         }
         return result;
     };
+
+    isSpecialEvent(eventKeyword) {
+        return config.SPECIAL_EVENTS.includes(eventKeyword);
+    }
 }
 
 export default new Utils();

package/types/index.d.ts

@@ -105,6 +105,7 @@ declare module 'apps-sdk' {
     export class Utils {
         isBase64(str: string): boolean;
         isBase64Image(str: string): boolean;
+        isSpecialEvent(eventKeyword: string): boolean;
     }
 
     export class Rating {
@@ -141,7 +142,6 @@ declare module 'apps-sdk' {
         sendAttributionData(attribution: any): Promise<void>;
         trackEventIfExist(eventKeyword: string, eventValue?: number): void;
         storeSubscription(subscriptionData: any): void;
-        isSpecialEvent(eventKeyword: string): boolean;
         getAttribution(): Promise<void>;
         getAdid(): Promise<void>;
         getIdfa(): Promise<void>;