gomarketme-react-native 1.0.1 → 1.0.2

package/dist/index.d.ts

@@ -15,6 +15,8 @@ declare class GoMarketMe {
     private postSystemInfo;
     private readAndroidDeviceInfo;
     private readIosDeviceInfo;
+    private getTimeZoneCode;
+    private getLanguageCode;
     private fetchPurchases;
     private fetchPurchaseProducts;
     private sendEventToServer;

package/dist/index.js

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -41,6 +64,7 @@ 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 RNLocalize = __importStar(require("react-native-localize"));
 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"));
@@ -102,7 +126,7 @@ var GoMarketMe = /** @class */ (function () {
                     return __generator(this, function (_a) {
                         switch (_a.label) {
                             case 0:
-                                if (!this.affiliateCampaignCode) return [3 /*break*/, 3];
+                                if (!(this.affiliateCampaignCode != '')) return [3 /*break*/, 3];
                                 return [4 /*yield*/, this.fetchPurchases([purchase], apiKey)];
                             case 1:
                                 productIds = _a.sent();
@@ -120,7 +144,7 @@ var GoMarketMe = /** @class */ (function () {
     };
     GoMarketMe.prototype.getSystemInfo = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var deviceData, _a, _b, windowData;
+            var deviceData, _a, _b, devicePixelRatio, windowData;
             var _c;
             return __generator(this, function (_d) {
                 switch (_d.label) {
@@ -134,16 +158,17 @@ var GoMarketMe = /** @class */ (function () {
                     case 2:
                         deviceData = _b.apply(_a, [(_c.android = _d.sent(),
                                 _c)]);
+                        devicePixelRatio = react_native_1.PixelRatio.get();
                         windowData = {
-                            devicePixelRatio: react_native_1.PixelRatio.get(),
-                            width: react_native_1.Dimensions.get('window').width,
-                            height: react_native_1.Dimensions.get('window').height,
+                            devicePixelRatio: devicePixelRatio,
+                            width: react_native_1.Dimensions.get('window').width * devicePixelRatio,
+                            height: react_native_1.Dimensions.get('window').height * devicePixelRatio,
                         };
                         return [2 /*return*/, {
                                 device_info: deviceData,
                                 window_info: windowData,
-                                time_zone_code: Intl.DateTimeFormat().resolvedOptions().timeZone,
-                                language_code: react_native_device_info_1.default.getDeviceId(),
+                                time_zone_code: this.getTimeZoneCode(),
+                                language_code: this.getLanguageCode(),
                             }];
                 }
             });
@@ -226,29 +251,32 @@ var GoMarketMe = /** @class */ (function () {
                 switch (_b.label) {
                     case 0:
                         _a = {};
-                        return [4 /*yield*/, react_native_device_info_1.default.getDeviceId()];
+                        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.getSystemName()];
+                        return [4 /*yield*/, react_native_device_info_1.default.getDeviceId()];
                     case 2:
+                        _a._deviceId = _b.sent();
+                        return [4 /*yield*/, react_native_device_info_1.default.getSystemName()];
+                    case 3:
                         _a.systemName = _b.sent();
                         return [4 /*yield*/, react_native_device_info_1.default.getSystemVersion()];
-                    case 3:
+                    case 4:
                         _a.systemVersion = _b.sent();
                         return [4 /*yield*/, react_native_device_info_1.default.getBrand()];
-                    case 4:
+                    case 5:
                         _a.brand = _b.sent();
                         return [4 /*yield*/, react_native_device_info_1.default.getModel()];
-                    case 5:
+                    case 6:
                         _a.model = _b.sent();
                         return [4 /*yield*/, react_native_device_info_1.default.getManufacturer()];
-                    case 6:
+                    case 7:
                         _a.manufacturer = _b.sent();
                         return [4 /*yield*/, react_native_device_info_1.default.isEmulator()];
-                    case 7:
+                    case 8:
                         _a.isEmulator = _b.sent();
                         return [4 /*yield*/, react_native_device_info_1.default.getUniqueId()];
-                    case 8: return [2 /*return*/, (_a.uniqueId = _b.sent(),
+                    case 9: return [2 /*return*/, (_a.uniqueId = _b.sent(),
                             _a)];
                 }
             });
@@ -256,39 +284,61 @@ var GoMarketMe = /** @class */ (function () {
     };
     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.getDeviceId()];
+                        return [4 /*yield*/, react_native_device_info_1.default.getUniqueId()];
                     case 1:
                         _a.deviceId = _b.sent();
-                        return [4 /*yield*/, react_native_device_info_1.default.getSystemName()];
+                        return [4 /*yield*/, react_native_device_info_1.default.getDeviceId()];
                     case 2:
+                        _a._deviceId = _b.sent();
+                        return [4 /*yield*/, react_native_device_info_1.default.getSystemName()];
+                    case 3:
                         _a.systemName = _b.sent();
                         return [4 /*yield*/, react_native_device_info_1.default.getSystemVersion()];
-                    case 3:
+                    case 4:
                         _a.systemVersion = _b.sent();
                         return [4 /*yield*/, react_native_device_info_1.default.getBrand()];
-                    case 4:
+                    case 5:
                         _a.brand = _b.sent();
                         return [4 /*yield*/, react_native_device_info_1.default.getModel()];
-                    case 5:
+                    case 6:
                         _a.model = _b.sent();
                         return [4 /*yield*/, react_native_device_info_1.default.getManufacturer()];
-                    case 6:
+                    case 7:
                         _a.manufacturer = _b.sent();
                         return [4 /*yield*/, react_native_device_info_1.default.isEmulator()];
-                    case 7:
+                    case 8:
                         _a.isEmulator = _b.sent();
                         return [4 /*yield*/, react_native_device_info_1.default.getUniqueId()];
-                    case 8: return [2 /*return*/, (_a.uniqueId = _b.sent(),
-                            _a)];
+                    case 9:
+                        info = (_a.uniqueId = _b.sent(),
+                            _a);
+                        return [2 /*return*/];
                 }
             });
         });
     };
+    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 () {
+        var locales = RNLocalize.getLocales();
+        // Check if there are any locales available and return the first one or default to 'en-US'
+        return locales.length > 0 ? locales[0].languageTag : 'en-US';
+    };
     GoMarketMe.prototype.fetchPurchases = function (purchaseDetailsList, apiKey) {
         return __awaiter(this, void 0, void 0, function () {
             var productIds, _i, purchaseDetailsList_1, purchase;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gomarketme-react-native",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Affiliate Marketing for React Native-Based iOS and Android Apps.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -20,8 +20,9 @@
   "dependencies": {
     "@react-native-async-storage/async-storage": "^1.15.6",
     "axios": "^0.21.1",
-    "react-native-device-info": "^8.0.1",
-    "react-native-iap": "^7.0.0"
+    "react-native-device-info": "^14.0.0",
+    "react-native-iap": "^7.0.0",
+    "react-native-localize": "^3.2.1"
   },
   "devDependencies": {
     "@types/node": "^15.12.5",

package/src/index.tsx

@@ -1,5 +1,6 @@
 import { Platform, Dimensions, PixelRatio } from 'react-native';
 import DeviceInfo from 'react-native-device-info';
+import * as RNLocalize from 'react-native-localize';
 import AsyncStorage from '@react-native-async-storage/async-storage';
 import InAppPurchase, { Purchase, Product, ProductPurchase } from 'react-native-iap';
 import axios from 'axios';
@@ -38,7 +39,7 @@ class GoMarketMe {
 
   private async addListener(apiKey: string): Promise<void> {
     InAppPurchase.purchaseUpdatedListener(async (purchase: Purchase) => {
-      if (this.affiliateCampaignCode) {
+      if (this.affiliateCampaignCode != '') {
         const productIds = await this.fetchPurchases([purchase], apiKey);
         await this.fetchPurchaseProducts(productIds, apiKey);
       }
@@ -51,17 +52,19 @@ class GoMarketMe {
       android: await this.readAndroidDeviceInfo(),
     });
 
+    const devicePixelRatio = PixelRatio.get();
+
     const windowData = {
-      devicePixelRatio: PixelRatio.get(),
-      width: Dimensions.get('window').width,
-      height: Dimensions.get('window').height,
+      devicePixelRatio: devicePixelRatio,
+      width: Dimensions.get('window').width * devicePixelRatio,
+      height: Dimensions.get('window').height * devicePixelRatio,
     };
 
     return {
       device_info: deviceData,
       window_info: windowData,
-      time_zone_code: Intl.DateTimeFormat().resolvedOptions().timeZone,
-      language_code: DeviceInfo.getDeviceId(),
+      time_zone_code: this.getTimeZoneCode(),
+      language_code: this.getLanguageCode(),
     };
   }
 
@@ -109,7 +112,8 @@ class GoMarketMe {
 
   private async readAndroidDeviceInfo(): Promise<any> {
     return {
-      deviceId: await DeviceInfo.getDeviceId(),
+      deviceId: await DeviceInfo.getAndroidId(),
+      _deviceId: await DeviceInfo.getDeviceId(),
       systemName: await DeviceInfo.getSystemName(),
       systemVersion: await DeviceInfo.getSystemVersion(),
       brand: await DeviceInfo.getBrand(),
@@ -121,8 +125,9 @@ class GoMarketMe {
   }
 
   private async readIosDeviceInfo(): Promise<any> {
-    return {
-      deviceId: await DeviceInfo.getDeviceId(),
+    var info = {
+      deviceId: await DeviceInfo.getUniqueId(),
+      _deviceId: await DeviceInfo.getDeviceId(),
       systemName: await DeviceInfo.getSystemName(),
       systemVersion: await DeviceInfo.getSystemVersion(),
       brand: await DeviceInfo.getBrand(),
@@ -133,6 +138,24 @@ class GoMarketMe {
     };
   }
 
+  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 getLanguageCode(): string {
+    const locales = RNLocalize.getLocales();
+    // Check if there are any locales available and return the first one or default to 'en-US'
+    return locales.length > 0 ? locales[0].languageTag : 'en-US'; 
+  }
+
   private async fetchPurchases(purchaseDetailsList: Purchase[], apiKey: string): Promise<string[]> {
     const productIds: string[] = [];
     for (const purchase of purchaseDetailsList) {