@magicpixel/rn-mp-client-sdk 0.12.0 → 1.12.1

package/src/processors/data-element.processor.ts

@@ -8,14 +8,8 @@ import type { ClientSdkDeItem } from '../models/mp-client-sdk';
 import { DataStore } from '../common/data-store';
 import { Logger } from '../common/logger';
 
-const deJsvTimeOutPromise = (ms = 2000): Promise<any> => {
-  return new Promise((_resolve, reject) => {
-    const id = setTimeout(() => {
-      clearTimeout(id);
-      reject('Timed out in ' + ms + 'ms.');
-    }, ms);
-  });
-};
+// Note: JSV (JavaScript functions) are not supported in React Native
+// This timeout function is kept for potential future use
 
 const dElemProcessors: MapLike<
   (
@@ -49,6 +43,68 @@ const dElemProcessors: MapLike<
   pg_dtype: (_helper: DeJsvHelper, _elem: ClientSdkDeItem): any => {
     return DataStore.getDeviceType();
   },
+  /* Geo location data elements */
+  mp_geo_pcode: (
+    _helper: DeJsvHelper,
+    _elem: ClientSdkDeItem,
+    _eventData?: Record<string, any>
+  ): any => {
+    return DataStore.getGeoInfo()?.postal ?? undefined;
+  },
+  mp_geo_country: (
+    _helper: DeJsvHelper,
+    _elem: ClientSdkDeItem,
+    _eventData?: Record<string, any>
+  ): any => {
+    return DataStore.getGeoInfo()?.country ?? undefined;
+  },
+
+  mp_geo_region: (
+    _helper: DeJsvHelper,
+    _elem: ClientSdkDeItem,
+    _eventData?: Record<string, any>
+  ): any => {
+    return DataStore.getGeoInfo()?.region ?? undefined;
+  },
+  mp_geo_city: (
+    _helper: DeJsvHelper,
+    _elem: ClientSdkDeItem,
+    _eventData?: Record<string, any>
+  ): any => {
+    return DataStore.getGeoInfo()?.city ?? undefined;
+  },
+  /* Visit info data elements */
+  mp_visit_count: (
+    _helper: DeJsvHelper,
+    _elem: ClientSdkDeItem,
+    _eventData?: Record<string, any>
+  ): any => {
+    return DataStore.getVisitInfo()?.visitCt ?? 0;
+  },
+  mp_visit_depth: (
+    _helper: DeJsvHelper,
+    _elem: ClientSdkDeItem,
+    _eventData?: Record<string, any>
+  ): any => {
+    return DataStore.getVisitInfo()?.visitDepth ?? 0;
+  },
+  /* Browser/Platform data elements */
+  pg_browser: (
+    _helper: DeJsvHelper,
+    _elem: ClientSdkDeItem,
+    _eventData?: Record<string, any>
+  ): any => {
+    return DataStore.getDeviceOs(); // Using device OS as browser equivalent
+  },
+  /* User status data element - TODO: Implement getMpUserStatus in DataStore */
+  mp_new_vis: (
+    _helper: DeJsvHelper,
+    _elem: ClientSdkDeItem,
+    _eventData?: Record<string, any>
+  ): any => {
+    // TODO: Implement user status functionality
+    return '1'; // Default to new visitor
+  },
   pg_random: (
     _helper: DeJsvHelper,
     _elem: ClientSdkDeItem,
@@ -122,29 +178,7 @@ const dElemProcessors: MapLike<
     _elem.key = 'ev._eventName';
     return processMpDl(_helper, _elem, _eventData);
   },
-  jsv: async (
-    helper: DeJsvHelper,
-    elem: ClientSdkDeItem,
-    _eventData?: Record<string, any>
-  ): Promise<any> => {
-    try {
-      if (elem.fn) {
-        if (!elem.isAsync) {
-          return await elem.fn(helper, undefined);
-        } else {
-          return await Promise.race([
-            elem.fn(helper, undefined),
-            deJsvTimeOutPromise(elem.fnTOut || undefined),
-          ]);
-        }
-      } else {
-        return elem.def || undefined;
-      }
-    } catch (err) {
-      Logger.logError(err);
-      return elem.def || undefined;
-    }
-  },
+  // Note: JSV (JavaScript functions) processor removed - not supported in React Native
 };
 
 function generalCleanAndEscape(
@@ -194,10 +228,83 @@ function processMpDl(
   return generalCleanAndEscape(helper, de, de.def);
 }
 
+export async function processOneDataElement(
+  _sdkDataElements: MapLike<ClientSdkDeItem>,
+  deItem: ClientSdkDeItem,
+  deHelper: any,
+  eventData?: Record<string, any>,
+  _optDeKeys?: string[]
+): Promise<any> {
+  try {
+    if (dElemProcessors[deItem.typ]) {
+      Logger.logDbg('Processing data element: ', deItem.nm);
+      const deValue = await dElemProcessors[deItem.typ](
+        deHelper,
+        deItem,
+        eventData
+      );
+
+      // TODO: Implement storage duration functionality for React Native
+      // For now, we'll just return the value without persistence
+
+      return deValue;
+    } else {
+      Logger.logError('No processor found for de typ: ', deItem.typ);
+    }
+  } catch (err) {
+    Logger.logError(
+      'Error processing data element: ',
+      deItem.key,
+      ' with error: ',
+      err
+    );
+  }
+
+  return deItem.def;
+}
+
+/**
+ * Process all the data elements at once, or if a set of keys are specified, processes only
+ * those keys and updates the dataElements object in DataStore
+ * @param sdkDataElements
+ * @param eventData
+ * @param optDeKeys
+ */
+export async function processDataElements(
+  sdkDataElements: MapLike<ClientSdkDeItem>,
+  eventData?: Record<string, any>,
+  optDeKeys?: string[]
+): Promise<MapLike<any>> {
+  const de = DataStore.getDataElements();
+  const deKeys =
+    optDeKeys && optDeKeys.length > 0
+      ? optDeKeys
+      : Object.keys(sdkDataElements);
+
+  try {
+    const deHelper = DataStore.getDataElementHelpers();
+    for (const key of deKeys) {
+      de[key] = await processOneDataElement(
+        sdkDataElements,
+        sdkDataElements[key],
+        deHelper,
+        eventData,
+        optDeKeys
+      );
+    }
+  } catch (err) {
+    Logger.logError('Error processing data elements: ', err);
+  }
+
+  DataStore.setDataElements(de);
+  Logger.logDbg('Data Elements: ', de);
+  return de;
+}
+
 export class DataElementProcessor {
   /**
    * Process all the data elements at once, or if a set of keys are specified, processes only
-   * those keys and updates the dataElements object in global-fns file
+   * those keys and updates the dataElements object in DataStore
    * @param sdkDataElements
    * @param eventData
    * @param optDeKeys
@@ -207,43 +314,6 @@ export class DataElementProcessor {
     eventData?: Record<string, any>,
     optDeKeys?: string[]
   ): Promise<MapLike<any>> {
-    const de = DataStore.getDataElements();
-    const deKeys =
-      optDeKeys && optDeKeys.length > 0
-        ? optDeKeys
-        : Object.keys(sdkDataElements);
-
-    try {
-      const deHelper = DataStore.getDataElementHelpers();
-      for (const key of deKeys) {
-        try {
-          const deItem = sdkDataElements[key];
-          if (deItem) {
-            const invokeItem = dElemProcessors[deItem.typ];
-            if (dElemProcessors[deItem.typ]) {
-              Logger.logDbg('Processing data element: ', deItem.nm);
-              if (invokeItem) {
-                de[key] = await invokeItem(deHelper, deItem, eventData);
-              }
-            } else {
-              Logger.logError('No processor found for de typ: ', deItem.typ);
-            }
-          }
-        } catch (err) {
-          Logger.logError(
-            'Error processing data element: ',
-            key,
-            ' with error: ',
-            err
-          );
-        }
-      }
-    } catch (err) {
-      Logger.logError('Error processing data elements: ', err);
-    }
-
-    DataStore.setDataElements(de);
-    Logger.logDbg('Data Elements: ', de);
-    return de;
+    return processDataElements(sdkDataElements, eventData, optDeKeys);
   }
 }

package/src/processors/geo-location.processor.ts

@@ -0,0 +1,91 @@
+import { DataStore } from '../common/data-store';
+import { Utils } from '../common/utils';
+import type { GeoApiResponse, GeoResponse } from '../models/geo-api-response';
+import { Logger } from '../common/logger';
+import { MP_VISIT_ID_COOKIE } from '../common/constants';
+
+export class GeoLocationProcessor {
+  /**
+   * Always going to make the call if it's enabled in the sdk, because visit info cookie is passed on to the
+   * collector, and it's easier to make changes on the collector end when to make the
+   * ip info call or return with an updated cookie expiry
+   */
+  public static shouldMakeGeoLocationCall(): boolean {
+    return DataStore.isGeoLocationEnabledInSdk();
+  }
+
+  public static async makeGeoLocationApiCall(): Promise<GeoResponse | null> {
+    try {
+      if (!this.shouldMakeGeoLocationCall()) {
+        return null;
+      }
+
+      let geoResponse: GeoApiResponse;
+      const urlInfo = DataStore.getUrlInfo();
+
+      // In React Native, we'll get the visit ID from AsyncStorage instead of cookies
+      const visitId = await Utils.getValueFromAsyncStorage(
+        MP_VISIT_ID_COOKIE,
+        ''
+      );
+      const urlSuffix = `?vid=${visitId}`;
+
+      // For React Native, we'll try IPv6 first, then fallback to IPv4
+      if (
+        urlInfo.baseUrlV6 &&
+        (await Utils.getValueFromAsyncStorage('_mp_ipv6', 'false')) !== 'n'
+      ) {
+        try {
+          geoResponse = await Utils.getHttp<GeoApiResponse>(
+            `${urlInfo.baseUrlV6}${
+              urlInfo.geoUrl
+            }/n/${Utils.getUniqueID()}${urlSuffix}`
+          );
+          await Utils.setValueToAsyncStorage('_mp_ipv6', 'y');
+        } catch (err) {
+          Logger.logDbg('Error posting to ipv6. Posting to ipv4');
+          await Utils.setValueToAsyncStorage('_mp_ipv6', 'n');
+          geoResponse = await Utils.getHttp<GeoApiResponse>(
+            `${urlInfo.baseUrlV4}${
+              urlInfo.geoUrl
+            }/n/${Utils.getUniqueID()}${urlSuffix}`
+          );
+        }
+      } else {
+        // since the async storage said ipv6 failed, we will not try it again. post to ipv4 directly for this session
+        geoResponse = await Utils.getHttp<GeoApiResponse>(
+          `${urlInfo.baseUrlV4}${
+            urlInfo.geoUrl
+          }/n/${Utils.getUniqueID()}${urlSuffix}`
+        );
+      }
+
+      if (!geoResponse) {
+        Logger.logError('Geo API returned empty response');
+        return null;
+      }
+
+      if (geoResponse.status === 'KO') {
+        Logger.logError('Geo API returned error status');
+        return null;
+      }
+
+      if (geoResponse.status === 'OK' && geoResponse.info) {
+        // Success scenario
+        DataStore.setGeoInfo(geoResponse.info);
+        Logger.logDbg(
+          'Geo location info retrieved successfully:',
+          geoResponse.info
+        );
+        return geoResponse.info;
+      } else {
+        Logger.logError('Geo API returned invalid response format');
+        return null;
+      }
+    } catch (err) {
+      Logger.logError('Error fetching geo info:', err);
+    }
+
+    return null;
+  }
+}