expf-sigma-node.js 3.3.4 → 3.3.6

package/package.json

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

@@ -1017,13 +1017,7 @@ var sigmaGeoCache = new import_node_cache2.default({
   checkperiod: cacheCheckPeriod
 });
 var SigmaGeoCache = class {
-  maxGeoCacheTTL = 120 * 60;
-  minGeoCacheTTL = 1 * 60;
-  constructor(postfix, geoCacheTTL) {
-    this.geoCacheTTL = geoCacheTTL || defaultGeoCacheTTL;
-    if (geoCacheTTL > this.maxGeoCacheTTL || geoCacheTTL < this.minGeoCacheTTL) {
-      this.geoCacheTTL = defaultGeoCacheTTL;
-    }
+  constructor(postfix) {
     this.postfix = "";
     if (postfix)
       this.postfix = "__" + postfix;
@@ -1037,7 +1031,7 @@ var SigmaGeoCache = class {
   }
   set(key, value) {
     try {
-      return sigmaGeoCache.set(key + this.postfix, value, this.geoCacheTTL);
+      return sigmaGeoCache.set(key + this.postfix, value);
     } catch (e) {
       console.log(e);
     }
@@ -1268,7 +1262,7 @@ function generateFilteredList(array, name) {
 }
 
 // package.json
-var version = "3.3.4";
+var version = "3.3.6";
 
 // src/helpers/sdkVersion.js
 var sdkVersion = version;
@@ -1323,7 +1317,6 @@ var Sigma = class {
     this.api = options.api || defaultApi;
     this.retries = options.retries || 2;
     this.postfix = options.postfix || "";
-    this.geoCacheTTL = options.geoCacheTTL || defaultGeoCacheTTL;
     this.sigmaUserData = new SigmaUserData();
     this.cache = new SigmaCache(this.postfix);
     this.sigmaUserData.init({
@@ -1346,7 +1339,7 @@ var Sigma = class {
     });
     this.setSplitIdsToCache(this.userData);
     this.makePrivateIdInCache();
-    this.geoCache = new SigmaGeoCache(`${this.cache.get(sigmaPrivateId)}__${this.token}`, options.geoCacheTTL);
+    this.geoCache = new SigmaGeoCache(`${this.cache.get(sigmaPrivateId)}__${this.token}`);
   }
   setSplitIdsToCache(userData) {
     for (let [key, value] of Object.entries(userData)) {
@@ -1463,14 +1456,20 @@ var Sigma = class {
         console.error(errorMessages.APIRequestErrorConfig);
       }
     }
+    this.recordLastUpdateInCache();
+  }
+  async saveToGeoCache() {
     try {
       await this.getUserGeoData();
-    } catch {
+      this.geoCache.get(sigmaGeoData) ? this.sigmaUserData.setGeo(this.geoCache.parse(sigmaGeoData)) : this.sigmaUserData.setGeo("{}");
+    } catch (error) {
       if (!this.geoCache.get(sigmaGeoData)) {
         this.geoCache.set(sigmaGeoData, JSON.stringify({ location: "none" }));
       }
+      errorMessages.APIRequestErrorGeoData.token = this.token;
+      errorMessages.APIRequestErrorGeoData.userData = JSON.stringify(this.userData);
+      console.error(error, errorMessages.APIRequestErrorGeoData);
     }
-    this.recordLastUpdateInCache();
   }
   hasExpireCache() {
     const lastUpdate = Number(this.cache.get(sigmaDataFileLastUpdate));
@@ -1486,6 +1485,11 @@ var Sigma = class {
     }
     return true;
   }
+  updateGeoCache() {
+    if (!this.geoCache.get(sigmaGeoData)) {
+      this.saveToGeoCache();
+    }
+  }
   async getFlags() {
     await this.updateCache();
     const flags = this.cache.parse(sigmaDataFile);
@@ -1497,10 +1501,10 @@ var Sigma = class {
     if (!flagName)
       return null;
     await this.updateCache();
+    await this.updateGeoCache();
     const cacheKey = this.cache.parse(sigmaDataFile);
     if (!cacheKey.feature_flags)
       return;
-    this.sigmaUserData.setGeo(this.geoCache.parse(sigmaGeoData));
     let flag = null;
     const expName = this.getExperimentByFeatureFlag(cacheKey, flagName);
     if (expName) {
@@ -1521,8 +1525,8 @@ var Sigma = class {
   async getUserFeatureFlagsDetails() {
     const featureFlags = [];
     await this.updateCache();
+    await this.updateGeoCache();
     const sigmaDataLs = await this.cache.parse(sigmaDataFile);
-    this.sigmaUserData.setGeo(this.geoCache.parse(sigmaGeoData));
     if (sigmaDataLs.feature_flags.length > 0) {
       for (const flag in sigmaDataLs.feature_flags) {
         const ffName = sigmaDataLs.feature_flags[flag].name;
@@ -1663,7 +1667,7 @@ var Sigma = class {
             userValue,
             targets.conditions[index].value,
             targets.conditions[index].condition_sign,
-            this.sigmaUserData.user.data,
+            this.sigmaUserData.user.date,
             this.sigmaUserData.user.time
           )
         );
@@ -1689,6 +1693,7 @@ var Sigma = class {
     if (!experimentName)
       return null;
     await this.updateCache();
+    await this.updateGeoCache();
     const sigmaDataLs = await this.cache.parse(sigmaDataFile);
     this.sigmaUserData.setGeo(this.geoCache.parse(sigmaGeoData));
     if (!sigmaDataLs.experiments)
@@ -1786,6 +1791,7 @@ var Sigma = class {
   }
   async getAllUserExperiments() {
     await this.updateCache();
+    await this.updateGeoCache();
     const sigmaDataLs = this.cache.parse(sigmaDataFile);
     if (!sigmaDataLs.experiments.length)
       return null;
@@ -1876,7 +1882,7 @@ var Sigma = class {
               userValue,
               conditions[i].value,
               conditions[i].condition_sign,
-              this.sigmaUserData.user.data,
+              this.sigmaUserData.user.date,
               this.sigmaUserData.user.time
             )
           );
@@ -2110,25 +2116,12 @@ var Sigma = class {
         console.warn(`Sigma warn: Experiment ${experimentId} has not group with index ${groupIndex}`);
         return;
       }
-      if (splitById && experiment.forced_user_list.includes(String(this.userData[splitById]))) {
-        console.warn(`Sigma warn: User is already in experiment ${experimentId}. You need to exclude first then run method again`);
-        return;
-      }
-      if (splitById && this.userData[splitById] && !groupInExperiment.forced_user_list.includes(String(this.userData[splitById]))) {
+      this.clearForcedList(experiment, splitById);
+      if (this.userData[splitById] && !groupInExperiment.forced_user_list.includes(String(this.userData[splitById]))) {
         groupInExperiment.forced_user_list.push(String(this.userData[splitById]));
       }
     } else if (!groupIndex) {
-      let isUserInForcedGroup = false;
-      for (const group of experiment.groups) {
-        if (splitById && group.forced_user_list.includes(String(this.userData[splitById]))) {
-          isUserInForcedGroup = true;
-          break;
-        }
-      }
-      if (isUserInForcedGroup) {
-        console.warn(`Sigma warn: User is already group in experiment ${experimentId}. You need to exclude first then run method again`);
-        return;
-      }
+      this.clearForcedList(experiment, splitById);
       if (this.userData[splitById] && !experiment.forced_user_list.includes(String(this.userData[splitById]))) {
         experiment.forced_user_list.push(String(this.userData[splitById]));
       }
@@ -2136,68 +2129,64 @@ var Sigma = class {
     if (!this.cache.get(sigmaForcedExperiments)) {
       this.cache.set(sigmaForcedExperiments, JSON.stringify([{ experimentId, groupIndex }]));
     } else {
-      const forcedExperiments = JSON.parse(this.cache.get(sigmaForcedExperiments));
-      if (!forcedExperiments.find((el) => el.experimentId === experimentId)) {
+      const forcedExperiments = this.cache.parse(sigmaForcedExperiments);
+      const foundingForcedExperiment = forcedExperiments.find((el) => el.experimentId === experimentId);
+      if (!foundingForcedExperiment) {
         forcedExperiments.push({ experimentId, groupIndex });
         this.cache.set(sigmaForcedExperiments, JSON.stringify(forcedExperiments));
+      } else if (typeof groupIndex === "number" && groupIndex >= 0 && foundingForcedExperiment) {
+        foundingForcedExperiment.groupIndex = groupIndex;
+        this.cache.set(sigmaForcedExperiments, JSON.stringify(forcedExperiments));
+      } else if (!groupIndex && foundingForcedExperiment) {
+        foundingForcedExperiment.groupIndex = groupIndex;
+        this.cache.set(sigmaForcedExperiments, JSON.stringify(forcedExperiments));
       }
     }
     this.cache.set(sigmaDataFile, JSON.stringify(sigmaDataLs));
   }
-  excludeForceUser(experimentId) {
-    if (!experimentId || !this.cache.get(sigmaDataFile))
+  clearForcedList(experiment, splitById) {
+    if (experiment.forced_user_list.includes(String(this.userData[splitById]))) {
+      experiment.forced_user_list = experiment.forced_user_list.filter((el) => String(el) !== String(this.userData[splitById]));
+    }
+    for (const group of experiment.groups) {
+      if (group.forced_user_list.includes(String(this.userData[splitById]))) {
+        group.forced_user_list = group.forced_user_list.filter((el) => String(el) !== String(this.userData[splitById]));
+      }
+    }
+  }
+  async excludeForceUser(experimentId) {
+    if (!experimentId || !this.cache.get(sigmaDataFile) || !this.cache.get(sigmaForcedExperiments))
       return;
     const sigmaDataLs = this.cache.parse(sigmaDataFile);
     if (!sigmaDataLs || !sigmaDataLs.experiments)
       return;
     let experiment = sigmaDataLs.experiments.find((exp) => exp.name === experimentId);
-    if (!experiment)
-      return;
-    if (!Object.keys(this.userData).includes(experiment.split_by))
+    if (!experiment) {
+      console.warn(`Sigma warn: Experiment ${experimentId} not found`);
       return;
-    const splitById = Object.keys(this.userData).find((id) => id === experiment.split_by);
-    if (experiment.forced_user_list.length && experiment.forced_user_list.includes(String(this.userData[splitById]))) {
-      experiment.forced_user_list = experiment.forced_user_list.filter((el) => el !== String(this.userData[splitById]));
     }
-    const groups = experiment.groups;
-    for (const group of groups) {
-      if (group.forced_user_list.length && group.forced_user_list.includes(String(this.userData[splitById]))) {
-        group.forced_user_list = group.forced_user_list.filter((el) => el !== String(this.userData[splitById]));
-      }
+    if (!Object.keys(this.userData).includes(experiment.split_by)) {
+      console.warn(`Sigma warn: ${experiment.split_by} is missing in userData`);
+      return;
     }
-    if (this.cache.get(sigmaForcedExperiments)) {
-      let forcedExperiments = JSON.parse(this.cache.get(sigmaForcedExperiments));
-      forcedExperiments = forcedExperiments.filter((el) => el.experimentId !== experimentId);
-      if (forcedExperiments.length > 0) {
-        this.cache.set(sigmaForcedExperiments, JSON.stringify(forcedExperiments));
-      } else {
-        this.cache.remove(sigmaForcedExperiments);
-      }
+    let forcedExperiments = this.cache.parse(sigmaForcedExperiments);
+    if (!forcedExperiments.find((el) => el.experimentId === experimentId))
+      return;
+    forcedExperiments = forcedExperiments.filter((el) => el.experimentId !== experimentId);
+    if (forcedExperiments.length > 0) {
+      this.cache.set(sigmaForcedExperiments, JSON.stringify(forcedExperiments));
+    } else {
+      this.cache.remove(sigmaForcedExperiments);
     }
-    this.cache.set(sigmaDataFile, JSON.stringify(sigmaDataLs));
+    this.cache.set(sigmaHash, "");
+    await this.saveToCache();
   }
-  excludeForceUserAll() {
-    if (!this.cache.get(sigmaDataFile))
-      return;
-    const sigmaDataLs = this.cache.parse(sigmaDataFile);
-    if (!sigmaDataLs || !sigmaDataLs.experiments)
+  async excludeForceUserAll() {
+    if (!this.cache.get(sigmaDataFile) || !this.cache.get(sigmaForcedExperiments))
       return;
-    for (const experiment of sigmaDataLs.experiments) {
-      if (!Object.keys(this.userData).includes(experiment.split_by))
-        continue;
-      const splitById = Object.keys(this.userData).find((id) => id === experiment.split_by);
-      if (experiment.forced_user_list.length && experiment.forced_user_list.includes(String(this.userData[splitById]))) {
-        experiment.forced_user_list = experiment.forced_user_list.filter((el) => el !== String(this.userData[splitById]));
-      }
-      const groups = experiment.groups;
-      for (const group of groups) {
-        if (group.forced_user_list.length && group.forced_user_list.includes(String(this.userData[splitById]))) {
-          group.forced_user_list = group.forced_user_list.filter((el) => el !== String(this.userData[splitById]));
-        }
-      }
-    }
     this.cache.remove(sigmaForcedExperiments);
-    this.cache.set(sigmaDataFile, JSON.stringify(sigmaDataLs));
+    this.cache.set(sigmaHash, "");
+    await this.saveToCache();
   }
   checkForceExperiments() {
     if (!this.cache.get(sigmaForcedExperiments))