expf-sigma-node.js 1.0.0 → 1.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expf-sigma-node.js",
-  "version": "1.0.0",
+  "version": "1.1.1",
   "description": "expf-sigma-node.js lets you manage features flags and remote config across web, server side applications. Deliver true Continuous Integration. Get builds out faster. Control who has access to new features.",
   "main": "public/sigma.js",
   "keywords": [

package/public/sigma.js

@@ -68,7 +68,10 @@ var SigmaUserData = class {
     email,
     appVersion,
     custom,
-    deviceCategory
+    deviceCategory,
+    os,
+    browser,
+    geo
   }) {
     this.user.userId = userId;
     this.user.ip = ip;
@@ -78,8 +81,9 @@ var SigmaUserData = class {
     this.user.time = new Date().getTime() / (1e3 * 60 * 60);
     this.user.date = Math.floor(new Date().getTime() / (1e3 * 60 * 60 * 24));
     this.user.deviceCategory = deviceCategory;
-  }
-  getUserNavigator() {
+    this.user.os = os;
+    this.user.browser = browser;
+    this.user.geo = geo;
   }
   setUserId(userId) {
     this.user.userId = userId;
@@ -877,6 +881,7 @@ var defaultApi = "https://api.expf.ru/api/v1";
 var sigmaUserId = "sigmaUserId";
 var sigmaDataFile = "sigmaDataFile";
 var sigmaExperiments = "sigmaExperiments";
+var sigmaGeoData = "sigmaGeoData";
 var SHA256 = new sigmaHashes_default.SHA256();
 var MD5 = new sigmaHashes_default.MD5();
 var max_decimal_64 = 18446744073709552e3;
@@ -893,7 +898,7 @@ var Sigma = class {
     this.token = token;
     this.userData = userData || {};
     cacheTTL < 10 ? this.cacheTTL = 10 : this.cacheTTL = cacheTTL;
-    this.api = options.api || `${defaultApi}/config.json`;
+    this.api = options.api || `${defaultApi}`;
     this.retries = options.retries || 3;
     this.sigmaUserData = new SigmaUserData();
     this.postfix = options.postfix || "";
@@ -905,7 +910,10 @@ var Sigma = class {
       email: this.userData.email || null,
       appVersion: this.userData.appVersion || null,
       custom: this.userData.custom || null,
-      deviceCategory: this.userData.deviceCategory || null
+      deviceCategory: this.userData.deviceCategory || null,
+      browser: this.userData.browser || null,
+      os: this.userData.os || null,
+      geo: this.userData.geo || null
     });
     this.cache.set(sigmaUserId, this.userData.userId);
     this.setUserCookie();
@@ -968,8 +976,7 @@ var Sigma = class {
   }
   async getUserGeoData() {
     try {
-      const data = await this.getDataFile(`${defaultApi}/geo`);
-      this.sigmaUserData.setIp(data.ip);
+      const data = await this.getDataFile(`${this.api}/geo`);
       return data;
     } catch (error) {
       throw new Error(error);
@@ -987,24 +994,27 @@ var Sigma = class {
       `);
     }
     try {
-      const userGeoData = await this.getUserGeoData();
-      if (!this.cache.get("sigmaGeoData") || this.cache.get("sigmaGeoData", { location: "none" }) && userGeoData) {
-        this.cache.set("sigmaGeoData", JSON.stringify(userGeoData));
-        this.sigmaUserData.clearFlags();
+      if (!this.userData.geo) {
+        const userGeoData = await this.getUserGeoData();
+        if (!this.cache.get(sigmaGeoData) || this.cache.get(sigmaGeoData, { location: "none" }) && userGeoData) {
+          this.cache.set(sigmaGeoData, JSON.stringify(userGeoData));
+        }
+      } else {
+        this.cache.set(sigmaGeoData, JSON.stringify(this.userData.geo));
       }
     } catch (error) {
-      this.cache.set("sigmaGeoData", JSON.stringify({ location: "none" }));
+      this.cache.set(sigmaGeoData, JSON.stringify({ location: "none" }));
       console.error(error);
     }
     let data;
     try {
-      data = await this.getDataFile(`${api}`);
+      data = await this.getDataFile(`${api}/config.json`);
     } catch (error) {
       if (!this.cache.get(sigmaDataFile)) {
         throw new Error(`
         Get data: ${error},
         token: ${this.token},
-        url: ${defaultApi}/config.json
+        url: ${this.api}/config.json
         `);
       } else {
         console.error(`Get data config.json: ${error}`);