gomarketme-react-native 1.0.18 → 1.1.0

package/dist/index.d.ts

@@ -15,7 +15,7 @@ declare class GoMarketMe {
     private postSystemInfo;
     private readAndroidDeviceInfo;
     private readIosDeviceInfo;
-    private getTimeZoneCode;
+    private getTimeZone;
     private getLanguageCode;
     private fetchPurchases;
     private fetchPurchaseProducts;

package/dist/index.js

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
-    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
@@ -41,6 +41,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var react_native_1 = require("react-native");
 var react_native_device_info_1 = __importDefault(require("react-native-device-info"));
+var get_user_locale_1 = __importDefault(require("get-user-locale"));
+var async_storage_1 = __importDefault(require("@react-native-async-storage/async-storage"));
 var react_native_iap_1 = __importDefault(require("react-native-iap"));
 var axios_1 = __importDefault(require("axios"));
 var GoMarketMe = /** @class */ (function () {
@@ -51,6 +53,9 @@ var GoMarketMe = /** @class */ (function () {
         this.sdkInitializationUrl = 'https://api.gomarketme.net/v1/sdk-initialization';
         this.systemInfoUrl = 'https://api.gomarketme.net/v1/mobile/system-info';
         this.eventUrl = 'https://api.gomarketme.net/v1/event';
+        this.getTimeZone = function () {
+            return Intl.DateTimeFormat().resolvedOptions().timeZone;
+        };
     }
     GoMarketMe.getInstance = function () {
         if (!GoMarketMe.instance) {
@@ -119,7 +124,7 @@ var GoMarketMe = /** @class */ (function () {
     };
     GoMarketMe.prototype.getSystemInfo = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var deviceData, _a, _b, devicePixelRatio, windowData;
+            var deviceData, _a, _b, devicePixelRatio, dimension, windowData;
             var _c;
             return __generator(this, function (_d) {
                 switch (_d.label) {
@@ -134,15 +139,16 @@ var GoMarketMe = /** @class */ (function () {
                         deviceData = _b.apply(_a, [(_c.android = _d.sent(),
                                 _c)]);
                         devicePixelRatio = react_native_1.PixelRatio.get();
+                        dimension = react_native_1.Dimensions.get('window');
                         windowData = {
                             devicePixelRatio: devicePixelRatio,
-                            width: react_native_1.Dimensions.get('window').width * devicePixelRatio,
-                            height: react_native_1.Dimensions.get('window').height * devicePixelRatio,
+                            width: dimension.width * devicePixelRatio,
+                            height: dimension.height * devicePixelRatio,
                         };
                         return [2 /*return*/, {
                                 device_info: deviceData,
                                 window_info: windowData,
-                                time_zone_code: this.getTimeZoneCode(),
+                                time_zone: this.getTimeZone(),
                                 language_code: this.getLanguageCode(),
                             }];
                 }
@@ -221,98 +227,96 @@ var GoMarketMe = /** @class */ (function () {
     };
     GoMarketMe.prototype.readAndroidDeviceInfo = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        _a = {};
-                        return [4 /*yield*/, react_native_device_info_1.default.getAndroidId()];
+            var androidId, uniqueId, deviceId, systemName, systemVersion, brand, model, manufacturer, isEmulator;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, react_native_device_info_1.default.getAndroidId()];
                     case 1:
-                        _a.deviceId = _b.sent();
-                        return [4 /*yield*/, react_native_device_info_1.default.getDeviceId()];
+                        androidId = _a.sent();
+                        return [4 /*yield*/, react_native_device_info_1.default.getUniqueId()];
                     case 2:
-                        _a._deviceId = _b.sent();
-                        return [4 /*yield*/, react_native_device_info_1.default.getSystemName()];
+                        uniqueId = _a.sent();
+                        return [4 /*yield*/, react_native_device_info_1.default.getDeviceId()];
                     case 3:
-                        _a.systemName = _b.sent();
-                        return [4 /*yield*/, react_native_device_info_1.default.getSystemVersion()];
+                        deviceId = _a.sent();
+                        return [4 /*yield*/, react_native_device_info_1.default.getSystemName()];
                     case 4:
-                        _a.systemVersion = _b.sent();
-                        return [4 /*yield*/, react_native_device_info_1.default.getBrand()];
+                        systemName = _a.sent();
+                        return [4 /*yield*/, react_native_device_info_1.default.getSystemVersion()];
                     case 5:
-                        _a.brand = _b.sent();
-                        return [4 /*yield*/, react_native_device_info_1.default.getModel()];
+                        systemVersion = _a.sent();
+                        return [4 /*yield*/, react_native_device_info_1.default.getBrand()];
                     case 6:
-                        _a.model = _b.sent();
-                        return [4 /*yield*/, react_native_device_info_1.default.getManufacturer()];
+                        brand = _a.sent();
+                        return [4 /*yield*/, react_native_device_info_1.default.getModel()];
                     case 7:
-                        _a.manufacturer = _b.sent();
-                        return [4 /*yield*/, react_native_device_info_1.default.isEmulator()];
+                        model = _a.sent();
+                        return [4 /*yield*/, react_native_device_info_1.default.getManufacturer()];
                     case 8:
-                        _a.isEmulator = _b.sent();
-                        return [4 /*yield*/, react_native_device_info_1.default.getUniqueId()];
-                    case 9: return [2 /*return*/, (_a.uniqueId = _b.sent(),
-                            _a)];
+                        manufacturer = _a.sent();
+                        return [4 /*yield*/, react_native_device_info_1.default.isEmulator()];
+                    case 9:
+                        isEmulator = _a.sent();
+                        return [2 /*return*/, {
+                                deviceId: androidId,
+                                _deviceId: deviceId,
+                                _uniqueId: uniqueId,
+                                systemName: systemName,
+                                systemVersion: systemVersion,
+                                brand: brand,
+                                model: model,
+                                manufacturer: manufacturer,
+                                isEmulator: isEmulator
+                            }];
                 }
             });
         });
     };
     GoMarketMe.prototype.readIosDeviceInfo = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var info;
-            var _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        _a = {};
-                        return [4 /*yield*/, react_native_device_info_1.default.getUniqueId()];
+            var uniqueId, deviceId, systemName, systemVersion, brand, model, manufacturer, isEmulator;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, react_native_device_info_1.default.getUniqueId()];
                     case 1:
-                        _a.deviceId = _b.sent();
+                        uniqueId = _a.sent();
                         return [4 /*yield*/, react_native_device_info_1.default.getDeviceId()];
                     case 2:
-                        _a._deviceId = _b.sent();
+                        deviceId = _a.sent();
                         return [4 /*yield*/, react_native_device_info_1.default.getSystemName()];
                     case 3:
-                        _a.systemName = _b.sent();
+                        systemName = _a.sent();
                         return [4 /*yield*/, react_native_device_info_1.default.getSystemVersion()];
                     case 4:
-                        _a.systemVersion = _b.sent();
+                        systemVersion = _a.sent();
                         return [4 /*yield*/, react_native_device_info_1.default.getBrand()];
                     case 5:
-                        _a.brand = _b.sent();
+                        brand = _a.sent();
                         return [4 /*yield*/, react_native_device_info_1.default.getModel()];
                     case 6:
-                        _a.model = _b.sent();
+                        model = _a.sent();
                         return [4 /*yield*/, react_native_device_info_1.default.getManufacturer()];
                     case 7:
-                        _a.manufacturer = _b.sent();
+                        manufacturer = _a.sent();
                         return [4 /*yield*/, react_native_device_info_1.default.isEmulator()];
                     case 8:
-                        _a.isEmulator = _b.sent();
-                        return [4 /*yield*/, react_native_device_info_1.default.getUniqueId()];
-                    case 9:
-                        info = (_a.uniqueId = _b.sent(),
-                            _a);
-                        return [2 /*return*/];
+                        isEmulator = _a.sent();
+                        return [2 /*return*/, {
+                                deviceId: uniqueId,
+                                _deviceId: deviceId,
+                                systemName: systemName,
+                                systemVersion: systemVersion,
+                                brand: brand,
+                                model: model,
+                                manufacturer: manufacturer,
+                                isEmulator: isEmulator
+                            }];
                 }
             });
         });
     };
-    GoMarketMe.prototype.getTimeZoneCode = function () {
-        // Convert the time zone to GMT format (e.g., "GMT+2")
-        var timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
-        var date = new Date();
-        var timezoneOffset = date.getTimezoneOffset(); // in minutes
-        var absOffset = Math.abs(timezoneOffset);
-        var hours = Math.floor(absOffset / 60);
-        var minutes = absOffset % 60;
-        var sign = timezoneOffset > 0 ? '-' : '+';
-        return "GMT".concat(sign).concat(String(hours).padStart(2, '0'), ":").concat(String(minutes).padStart(2, '0')); // Return GMT format
-    };
     GoMarketMe.prototype.getLanguageCode = function () {
-        //const locales = RNLocalize.getLocales();
-        //return locales.length > 0 ? locales[0].languageTag : 'en-US';
-        return 'en-US';
+        return (0, get_user_locale_1.default)();
     };
     GoMarketMe.prototype.fetchPurchases = function (purchaseDetailsList, apiKey) {
         return __awaiter(this, void 0, void 0, function () {
@@ -349,7 +353,7 @@ var GoMarketMe = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 9, , 10]);
-                        return [4 /*yield*/, react_native_iap_1.default.getProducts({ skus: productIds })];
+                        return [4 /*yield*/, react_native_iap_1.default.getProducts(productIds)];
                     case 1:
                         products = _a.sent();
                         if (!(products.length > 0)) return [3 /*break*/, 6];
@@ -422,7 +426,7 @@ var GoMarketMe = /** @class */ (function () {
             purchaseID: purchase.transactionId || '',
             transactionDate: purchase.transactionDate || '',
             status: react_native_1.Platform.select({
-                ios: purchase.transactionStateIOS, // Removed non-existent properties
+                ios: purchase.transactionStateIOS,
                 android: purchase.purchaseStateAndroid,
             }),
             verificationData: {
@@ -442,29 +446,41 @@ var GoMarketMe = /** @class */ (function () {
     };
     GoMarketMe.prototype.markSDKAsInitialized = function () {
         return __awaiter(this, void 0, void 0, function () {
+            var e_6;
             return __generator(this, function (_a) {
-                // try {
-                //   await AsyncStorage.setItem(this.sdkInitializedKey, 'true');
-                //   return true;
-                // } catch (e) {
-                //   console.error('Failed to save SDK initialization:', e);
-                //   return false;
-                // }
-                return [2 /*return*/, true];
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, 2, , 3]);
+                        return [4 /*yield*/, async_storage_1.default.setItem(this.sdkInitializedKey, 'true')];
+                    case 1:
+                        _a.sent();
+                        return [2 /*return*/, true];
+                    case 2:
+                        e_6 = _a.sent();
+                        console.error('Failed to save SDK initialization:', e_6);
+                        return [2 /*return*/, false];
+                    case 3: return [2 /*return*/];
+                }
             });
         });
     };
     GoMarketMe.prototype.isSDKInitialized = function () {
         return __awaiter(this, void 0, void 0, function () {
+            var value, e_7;
             return __generator(this, function (_a) {
-                // try {
-                //   const value = await AsyncStorage.getItem(this.sdkInitializedKey);
-                //   return value === 'true';
-                // } catch (e) {
-                //   console.error('Failed to load SDK initialization:', e);
-                //   return false;
-                // }
-                return [2 /*return*/, false];
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, 2, , 3]);
+                        return [4 /*yield*/, async_storage_1.default.getItem(this.sdkInitializedKey)];
+                    case 1:
+                        value = _a.sent();
+                        return [2 /*return*/, value === 'true'];
+                    case 2:
+                        e_7 = _a.sent();
+                        console.error('Failed to load SDK initialization:', e_7);
+                        return [2 /*return*/, false];
+                    case 3: return [2 /*return*/];
+                }
             });
         });
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gomarketme-react-native",
-  "version": "1.0.18",
+  "version": "1.1.0",
   "description": "Affiliate Marketing for React Native-Based iOS and Android Apps.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -18,12 +18,19 @@
   "author": "GoMarketMe",
   "license": "MIT",
   "dependencies": {
-    "axios": "^1.7.7",
+    "@react-native-async-storage/async-storage": "^1.15.6",
+    "axios": "^0.21.1",
+    "get-user-locale": "^2.3.2",
     "react-native-device-info": "^14.0.0",
-    "react-native-iap": ">=7.0.0"
+    "react-native-iap": "^7.0.0"
+  },
+  "devDependencies": {
+    "@types/node": "^15.12.5",
+    "@types/react-native": "^0.64.12",
+    "typescript": "^4.3.5"
   },
   "peerDependencies": {
-    "react": "^18.3.1",
+    "react": "*",
     "react-native": "*"
   }
 }

package/src/index.tsx

@@ -1,5 +1,7 @@
 import { Platform, Dimensions, PixelRatio } from 'react-native';
 import DeviceInfo from 'react-native-device-info';
+import getUserLocale from 'get-user-locale'
+import AsyncStorage from '@react-native-async-storage/async-storage';
 import InAppPurchase, { Purchase, Product, ProductPurchase } from 'react-native-iap';
 import axios from 'axios';
 
@@ -49,19 +51,20 @@ class GoMarketMe {
       ios: await this.readIosDeviceInfo(),
       android: await this.readAndroidDeviceInfo(),
     });
-
+  
     const devicePixelRatio = PixelRatio.get();
-
+    const dimension = Dimensions.get('window');
+  
     const windowData = {
       devicePixelRatio: devicePixelRatio,
-      width: Dimensions.get('window').width * devicePixelRatio,
-      height: Dimensions.get('window').height * devicePixelRatio,
+      width: dimension.width * devicePixelRatio,
+      height: dimension.height * devicePixelRatio,
     };
-
+  
     return {
       device_info: deviceData,
       window_info: windowData,
-      time_zone_code: this.getTimeZoneCode(),
+      time_zone: this.getTimeZone(),
       language_code: this.getLanguageCode(),
     };
   }
@@ -100,6 +103,7 @@ class GoMarketMe {
         if (responseData.device_id) {
           this.deviceId = responseData.device_id;
         }
+
       } else {
         console.error('Failed to send system info. Status code:', response.status);
       }
@@ -109,49 +113,59 @@ class GoMarketMe {
   }
 
   private async readAndroidDeviceInfo(): Promise<any> {
+
+    let androidId = await DeviceInfo.getAndroidId();
+    let uniqueId = await DeviceInfo.getUniqueId();
+    let deviceId = await DeviceInfo.getDeviceId(); // model
+    let systemName = await DeviceInfo.getSystemName();
+    let systemVersion = await DeviceInfo.getSystemVersion()
+    let brand = await DeviceInfo.getBrand();
+    let model = await DeviceInfo.getModel();
+    let manufacturer = await DeviceInfo.getManufacturer();
+    let isEmulator = await DeviceInfo.isEmulator();
+
     return {
-      deviceId: await DeviceInfo.getAndroidId(),
-      _deviceId: await DeviceInfo.getDeviceId(),
-      systemName: await DeviceInfo.getSystemName(),
-      systemVersion: await DeviceInfo.getSystemVersion(),
-      brand: await DeviceInfo.getBrand(),
-      model: await DeviceInfo.getModel(),
-      manufacturer: await DeviceInfo.getManufacturer(),
-      isEmulator: await DeviceInfo.isEmulator(),
-      uniqueId: await DeviceInfo.getUniqueId(),
+      deviceId: androidId,
+      _deviceId: deviceId,
+      _uniqueId: uniqueId,
+      systemName: systemName,
+      systemVersion: systemVersion,
+      brand: brand,
+      model: model,
+      manufacturer: manufacturer,
+      isEmulator: isEmulator
     };
   }
 
   private async readIosDeviceInfo(): Promise<any> {
-    var info = {
-      deviceId: await DeviceInfo.getUniqueId(),
-      _deviceId: await DeviceInfo.getDeviceId(),
-      systemName: await DeviceInfo.getSystemName(),
-      systemVersion: await DeviceInfo.getSystemVersion(),
-      brand: await DeviceInfo.getBrand(),
-      model: await DeviceInfo.getModel(),
-      manufacturer: await DeviceInfo.getManufacturer(),
-      isEmulator: await DeviceInfo.isEmulator(),
-      uniqueId: await DeviceInfo.getUniqueId(),
+
+    let uniqueId = await DeviceInfo.getUniqueId();
+    let deviceId = await DeviceInfo.getDeviceId(); // model
+    let systemName = await DeviceInfo.getSystemName();
+    let systemVersion = await DeviceInfo.getSystemVersion()
+    let brand = await DeviceInfo.getBrand();
+    let model = await DeviceInfo.getModel();
+    let manufacturer = await DeviceInfo.getManufacturer();
+    let isEmulator = await DeviceInfo.isEmulator();
+
+    return {
+      deviceId: uniqueId,
+      _deviceId: deviceId,
+      systemName: systemName,
+      systemVersion: systemVersion,
+      brand: brand,
+      model: model,
+      manufacturer: manufacturer,
+      isEmulator: isEmulator
     };
   }
 
-  private getTimeZoneCode(): string {
-    // Convert the time zone to GMT format (e.g., "GMT+2")
-    const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
-    const date = new Date();
-    const timezoneOffset = date.getTimezoneOffset(); // in minutes
-    const absOffset = Math.abs(timezoneOffset);
-    const hours = Math.floor(absOffset / 60);
-    const minutes = absOffset % 60;
-    const sign = timezoneOffset > 0 ? '-' : '+';
-    return `GMT${sign}${String(hours).padStart(2, '0')}:${String(minutes).padStart(2, '0')}`; // Return GMT format
-  }
+  private getTimeZone = (): string => {
+    return Intl.DateTimeFormat().resolvedOptions().timeZone;
+};
 
   private getLanguageCode(): string {
-    //const locales = RNLocalize.getLocales();
-    //return locales.length > 0 ? locales[0].languageTag : 'en-US';
-    return 'en-US';
+    return getUserLocale();
   }
 
   private async fetchPurchases(purchaseDetailsList: Purchase[], apiKey: string): Promise<string[]> {
@@ -169,7 +183,7 @@ class GoMarketMe {
 
   private async fetchPurchaseProducts(productIds: string[], apiKey: string): Promise<void> {
     try {
-      const products = await InAppPurchase.getProducts({skus:productIds});
+      const products = await InAppPurchase.getProducts(productIds);
       if (products.length > 0) {
         for (const product of products) {
           await this.sendEventToServer(JSON.stringify(this.serializeProductDetails(product)), 'product', apiKey);
@@ -232,25 +246,23 @@ class GoMarketMe {
   }
 
   private async markSDKAsInitialized(): Promise<boolean> {
-    // try {
-    //   await AsyncStorage.setItem(this.sdkInitializedKey, 'true');
-    //   return true;
-    // } catch (e) {
-    //   console.error('Failed to save SDK initialization:', e);
-    //   return false;
-    // }
-    return true;
+    try {
+      await AsyncStorage.setItem(this.sdkInitializedKey, 'true');
+      return true;
+    } catch (e) {
+      console.error('Failed to save SDK initialization:', e);
+      return false;
+    }
   }
 
   private async isSDKInitialized(): Promise<boolean> {
-    // try {
-    //   const value = await AsyncStorage.getItem(this.sdkInitializedKey);
-    //   return value === 'true';
-    // } catch (e) {
-    //   console.error('Failed to load SDK initialization:', e);
-    //   return false;
-    // }
-    return false;
+    try {
+      const value = await AsyncStorage.getItem(this.sdkInitializedKey);
+      return value === 'true';
+    } catch (e) {
+      console.error('Failed to load SDK initialization:', e);
+      return false;
+    }
   }
 }