expf-sigma-node.js 3.2.2 → 3.2.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expf-sigma-node.js",
-  "version": "3.2.2",
+  "version": "3.2.4",
   "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

@@ -783,6 +783,7 @@ var SHA256 = new sigmaHashes_default.SHA256();
 var MD5 = new sigmaHashes_default.MD5();
 var expirationDate = 24 * 60 * 60 * 1e3;
 var secondsIn24Hours = 24 * 60 * 60;
+var sigmaGeoData = "sigmaGeoData";
 
 // src/modules/sigmaCache.js
 var sigmaCache = new import_node_cache.default({ stdTTL: secondsIn24Hours });
@@ -903,7 +904,7 @@ function compareVersions(versionA, versionB, strict = true) {
 }
 
 // src/helpers/conditionOperation.js
-function conditionOperation(userValue, conditionValues, operation) {
+function conditionOperation(userValue, conditionValues, operation, date, time) {
   !operation ? operation = "=" : operation;
   if (userValue === null || typeof userValue === "undefined" || !conditionValues)
     return false;
@@ -944,11 +945,11 @@ function conditionOperation(userValue, conditionValues, operation) {
     case "on date":
       return Math.floor(
         new Date(conditionValues.trim()).getTime() / (1e3 * 60 * 60 * 24)
-      ) == this.sigmaUserData.user.date;
+      ) == date;
     case "after time":
-      return new Date(conditionValues.trim()).getTime() / (1e3 * 60 * 60) < this.sigmaUserData.user.time;
+      return new Date(conditionValues.trim()).getTime() / (1e3 * 60 * 60) < time;
     case "before time":
-      return new Date(conditionValues.trim()).getTime() / (1e3 * 60 * 60) > this.sigmaUserData.user.time;
+      return new Date(conditionValues.trim()).getTime() / (1e3 * 60 * 60) > time;
     case "starts with":
       return userValue.startsWith(conditionValues);
     case "not starts with":
@@ -1079,6 +1080,7 @@ var Sigma = class {
     this.sigmaUserData = new SigmaUserData();
     this.postfix = options.postfix || "";
     this.cache = new SigmaCache(this.postfix);
+    this.geoCache = new SigmaGeoCache(`${this.userData.ip}__${this.token}`, options.geoCacheTTL);
     this.sigmaUserData.init({
       userId: this.userData.userId || null,
       profileId: this.userData.profileId || null,
@@ -1090,13 +1092,12 @@ var Sigma = class {
       deviceCategory: this.userData.deviceCategory || null,
       browser: this.userData.browser || { version: null, name: null },
       os: this.userData.os || { version: null, name: null },
-      geo: this.userData.geo || null,
+      geo: this.userData.ip ? this.geoCache.get(sigmaGeoData) : this.userData.geo || this.sigmaUserData.user.geo,
       domain: this.userData.domain || null,
       url: this.userData.url || null,
       query: this.userData.query || null,
       pathname: this.userData.pathname || null
     });
-    this.geoCache = new SigmaGeoCache(this.token, options.geoCacheTTL);
     this.setSplitIdsToCache(this.userData);
     this.makePrivateIdInCache();
   }
@@ -1177,32 +1178,9 @@ var Sigma = class {
       throw new Error(`Get geo: ${error}`);
     }
   }
-  async setUserGeoData() {
-    if (!this.userData.ip)
-      return;
-    const geoKey = `${this.userData.ip}__${this.token}`;
-    const foundingGeoKey = this.geoCache.keys().find((k) => k === geoKey);
-    if (foundingGeoKey) {
-      const userGeoData = this.geoCache.get(this.userData.ip);
-      this.sigmaUserData.setGeo(userGeoData);
-      return;
-    } else {
-      const userGeoData = await this.getUserGeoData();
-      this.geoCache.set(this.userData.ip, userGeoData);
-      this.sigmaUserData.setGeo(userGeoData);
-    }
-  }
   async saveToCache() {
     const { api } = this;
     const localStorageHash = this.cache.get(sigmaHash);
-    try {
-      const timeRecord = Math.floor(Date.now() / 1e3);
-      this.cache.set(sigmaDataFileLastUpdate, timeRecord);
-    } catch (error) {
-      throw new Error(`save last update to cache: ${error},
-       token: ${this.token}
-      `);
-    }
     let data;
     try {
       data = await this.getDataFile(`${api}/config.json`);
@@ -1229,6 +1207,30 @@ var Sigma = class {
     } catch (error) {
       throw new Error(`Save data to local storage`);
     }
+    try {
+      if (this.userData.ip) {
+        const userGeoData = await this.getUserGeoData();
+        this.geoCache.set(sigmaGeoData, JSON.stringify(userGeoData));
+        this.sigmaUserData.setGeo(userGeoData);
+      } else if (this.userData.geo) {
+        this.geoCache.set(sigmaGeoData, JSON.stringify(this.userData.geo));
+        this.sigmaUserData.setGeo(this.userData.geo);
+      } else {
+        this.geoCache.set(sigmaGeoData, JSON.stringify({ location: "none" }));
+        this.sigmaUserData.setGeo({ location: "none" });
+      }
+    } catch {
+      this.geoCache.set(sigmaGeoData, JSON.stringify({ location: "none" }));
+      this.sigmaUserData.setGeo({ location: "none" });
+    }
+    try {
+      const timeRecord = Math.floor(Date.now() / 1e3);
+      this.cache.set(sigmaDataFileLastUpdate, timeRecord);
+    } catch (error) {
+      throw new Error(`save last update to cache: ${error},
+       token: ${this.token}
+      `);
+    }
   }
   hasExpireCache() {
     const lastUpdate = parseInt(
@@ -1258,7 +1260,6 @@ var Sigma = class {
       return null;
     }
     await this.updateCache();
-    await this.setUserGeoData();
     const cacheKey = this.cache.parse(sigmaDataFile);
     if (!cacheKey.feature_flags)
       return;
@@ -1404,7 +1405,9 @@ var Sigma = class {
           conditionOperation(
             userValue,
             targets.conditions[index].value,
-            targets.conditions[index].condition_sign
+            targets.conditions[index].condition_sign,
+            this.sigmaUserData.user.data,
+            this.sigmaUserData.user.time
           )
         );
       }
@@ -1430,7 +1433,6 @@ var Sigma = class {
       return null;
     }
     await this.updateCache();
-    await this.setUserGeoData();
     const sigmaDataLs = await this.cache.parse(sigmaDataFile);
     if (!sigmaDataLs.experiments) {
       throw new Error("Experiments not found in cache");
@@ -1616,7 +1618,9 @@ var Sigma = class {
             conditionOperation(
               userValue,
               conditions[i].value,
-              conditions[i].condition_sign
+              conditions[i].condition_sign,
+              this.sigmaUserData.user.data,
+              this.sigmaUserData.user.time
             )
           );
         }