expf-sigma-node.js 0.0.8 → 0.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expf-sigma-node.js",
-  "version": "0.0.8",
+  "version": "0.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": [
@@ -17,7 +17,10 @@
   "scripts": {
     "release": "np",
     "build": "esbuild --bundle ./src/sigma.js --platform=node --format=cjs --outdir=public",
-    "dev": "esbuild --bundle ./src/sigma.js --platform=node --format=cjs --outdir=public --watch"
+    "dev": "esbuild --bundle ./src/sigma.js --platform=node --format=cjs --outdir=public --watch",
+    "lint": "eslint ./src/sigma.js",
+    "lint:all": "eslint \"**/*.js\"",
+    "test": "jest"
   },
   "dependencies": {
     "node-fetch": "^2.1.2"
@@ -27,6 +30,7 @@
     "@babel/plugin-proposal-class-properties": "^7.18.6",
     "@babel/preset-env": "^7.16.4",
     "babel-eslint": "^10.1.0",
+    "babel-jest": "^29.2.2",
     "babel-loader": "^8.2.3",
     "babel-plugin-add-module-exports": "^1.0.4",
     "clean-webpack-plugin": "^4.0.0",
@@ -36,6 +40,8 @@
     "eslint-plugin-jest": "^23.8.2",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^3.1.3",
+    "jest": "^29.2.2",
+    "jest-environment-jsdom": "^29.2.1",
     "js-cookie": "^3.0.1",
     "jshashes": "^1.0.8",
     "node-cache": "^5.1.2",

package/public/sigma.js

@@ -5620,11 +5620,14 @@ var SigmaUserData = class {
   getUserNavigator() {
     const userNavigator = browser_detect_es5_default();
     const { user } = this;
-    const userOs = userNavigator.os.split(" ");
-    user.browser.name = userNavigator.name;
-    user.browser.version = userNavigator.version;
-    user.os.name = userOs[0];
-    user.os.version = userOs[1];
+    let userOs;
+    if (userNavigator.os) {
+      userOs = userNavigator.os.split(" ");
+    }
+    user.browser.name = userNavigator.name ? userNavigator.name : void 0;
+    user.browser.version = userNavigator.version ? userNavigator.version : void 0;
+    user.os.name = userOs ? userOs[0] : void 0;
+    user.os.version = userOs ? userOs[1] : void 0;
   }
   setUserId(userId) {
     this.user.userId = userId;
@@ -5780,6 +5783,109 @@ var js_cookie_default = api;
 
 // src/sigma.js
 var import_jshashes = __toESM(require_hashes());
+
+// src/helpers/checkBoolValue.js
+function checkBoolValue(value) {
+  if (value)
+    return true;
+  return false;
+}
+
+// src/helpers/checkForcedList.js
+function checkForcedList(usersList, data) {
+  if (usersList.length) {
+    for (let id2 in usersList) {
+      if (usersList[id2] == data) {
+        return true;
+      }
+    }
+  }
+  return false;
+}
+
+// src/helpers/compareVersions.js
+function compareVersions(versionA, versionB, strict = true) {
+  let resultCompare;
+  const versionsLength = Math.max(versionA.length, versionB.length);
+  versionA = (versionA + "").split(".");
+  versionB = (versionB + "").split(".");
+  for (let i = 0; i < versionsLength; i++) {
+    if (versionA[i] === void 0) {
+      versionA[i] = "0";
+    }
+    if (versionB[i] === void 0) {
+      versionB[i] = "0";
+    }
+    resultCompare = parseInt(versionA[i], 10) - parseInt(versionB[i], 10);
+    if (resultCompare !== 0) {
+      return resultCompare < 0 ? false : true;
+    }
+  }
+  if (strict) {
+    return false;
+  }
+  if (!strict) {
+    return true;
+  }
+}
+
+// src/helpers/delay.js
+function delay(ms) {
+  new Promise((resolve) => setTimeout(() => resolve(void 0), ms));
+}
+
+// src/helpers/digestHash.js
+function digestHash(string) {
+  let hash = 0, i, chr;
+  if (string.length === 0)
+    return hash;
+  for (i = 0; i < string.length; i++) {
+    chr = string.charCodeAt(i);
+    hash = (hash << 5) - hash + chr;
+    hash |= 0;
+  }
+  return hash;
+}
+
+// src/helpers/doTypeConversion.js
+function doTypeConversion(type, value) {
+  if (type === "string")
+    return value;
+  if (type === "bool") {
+    return value === "true" ? true : false;
+  }
+  if (type === "integer" || type === "number")
+    return parseFloat(value);
+  return value;
+}
+
+// src/helpers/makeIdCookie.js
+function makeIdCookie() {
+  let text = "";
+  let possible = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+  for (let i = 0; i < 80; i++)
+    text += possible.charAt(Math.floor(Math.random() * possible.length));
+  return text;
+}
+
+// src/helpers/getUserGroup.js
+function getUserGroup(salt, exposureRate, controlBucketPerc, forcedExp) {
+  let userInGroup = "a";
+  let currentDiapason = 0;
+  if (Math.abs(salt) / 100 <= parseFloat(exposureRate) * 100 || forcedExp) {
+    let bucket = Math.abs(salt) % 100;
+    for (let i = 0; i < controlBucketPerc.length; i++) {
+      currentDiapason += controlBucketPerc[i].weight * 100;
+      if (bucket <= currentDiapason) {
+        return userInGroup = controlBucketPerc[i].name;
+      }
+    }
+    return userInGroup;
+  }
+  return false;
+}
+
+// src/sigma.js
 if (typeof import_node_fetch.default.default !== "undefined")
   import_node_fetch.default.default;
 var defaultApi = "https://api.expf.ru/api/v1";
@@ -5830,13 +5936,10 @@ var Sigma = class {
     if (hasMakeId && this.cache.get(sigmaUserId)) {
       userId = this.cache.get(sigmaUserId);
     } else if (hasMakeId) {
-      userId = this.makeIdCookie();
+      userId = makeIdCookie();
     }
     return userId;
   }
-  delay(ms) {
-    new Promise((resolve) => setTimeout(() => resolve(void 0), ms));
-  }
   retryFetch(url, fetchOptions, retries = 3, timeout) {
     return new Promise((resolve, reject) => {
       if (timeout)
@@ -5844,7 +5947,7 @@ var Sigma = class {
       const wrapper = (n) => {
         (0, import_node_fetch.default)(url, fetchOptions).then((res) => resolve(res)).catch((err) => {
           if (n > 0) {
-            this.delay(1e3);
+            delay(1e3);
             wrapper(--n);
           } else {
             reject(err);
@@ -5880,6 +5983,7 @@ var Sigma = class {
   async getUserGeoData() {
     try {
       const data = await this.getDataFile(`${defaultApi}/geo`);
+      this.sigmaUserData.setIp(data.ip);
       return data;
     } catch (error) {
       throw new Error(error);
@@ -5945,19 +6049,12 @@ var Sigma = class {
       js_cookie_default.set(sigmaUserId, uin);
     }
     if (!uin) {
-      uin = this.makeIdCookie();
+      uin = makeIdCookie();
       js_cookie_default.set(sigmaUserId, uin);
       this.cache.set(sigmaUserId, uin);
     }
     return;
   }
-  makeIdCookie() {
-    let text = "";
-    let possible = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
-    for (let i = 0; i < 80; i++)
-      text += possible.charAt(Math.floor(Math.random() * possible.length));
-    return text;
-  }
   hasExpireCache() {
     const lastUpdate = parseInt(
       this.cache.get("sigmaDataFileLastUpdate")
@@ -5993,8 +6090,6 @@ var Sigma = class {
     this.sigmaUserData.setGeo(geoData);
     let flag = null;
     for (let i = 0; i < cacheKey.feature_flags.length; i++) {
-      if (cacheKey.feature_flags[i]["is_active"] == "false")
-        continue;
       if (cacheKey.feature_flags[i]["name"] === flagName) {
         flag = cacheKey.feature_flags[i];
         break;
@@ -6021,30 +6116,6 @@ var Sigma = class {
     }
     return flagValue;
   }
-  compareVersions(versionA, versionB, strict = true) {
-    let resultCompare;
-    const versionsLength = Math.max(versionA.length, versionB.length);
-    versionA = (versionA + "").split(".");
-    versionB = (versionB + "").split(".");
-    for (let i = 0; i < versionsLength; i++) {
-      if (versionA[i] === void 0) {
-        versionA[i] = "0";
-      }
-      if (versionB[i] === void 0) {
-        versionB[i] = "0";
-      }
-      resultCompare = parseInt(versionA[i], 10) - parseInt(versionB[i], 10);
-      if (resultCompare !== 0) {
-        return resultCompare < 0 ? false : true;
-      }
-    }
-    if (strict) {
-      return false;
-    }
-    if (!strict) {
-      return true;
-    }
-  }
   conditionOperation(userValue, conditionValues, operation) {
     !operation ? operation = "=" : operation;
     if (!userValue || typeof userValue === "undefined")
@@ -6055,17 +6126,17 @@ var Sigma = class {
       case "not equal":
         return userValue.toLowerCase().trim() != conditionValues.toLowerCase().trim();
       case "greater":
-        return this.compareVersions(conditionValues.trim(), userValue.trim());
+        return compareVersions(conditionValues.trim(), userValue.trim());
       case "less":
-        return this.compareVersions(userValue.trim(), conditionValues.trim());
+        return compareVersions(userValue.trim(), conditionValues.trim());
       case "greater equal":
-        return this.compareVersions(
+        return compareVersions(
           conditionValues.trim(),
           userValue.trim(),
           false
         );
       case "less equal":
-        return this.compareVersions(
+        return compareVersions(
           userValue.trim(),
           conditionValues.trim(),
           false
@@ -6076,14 +6147,14 @@ var Sigma = class {
         return !conditionValues.includes(userValue);
       case "contains any of":
         for (let i = 0; i < conditionValues.length; i++) {
-          if (String(conditionValues[i]).includes(userValue)) {
+          if (String(userValue).includes(conditionValues[i])) {
             return true;
           }
         }
         return false;
       case "contains none of":
         for (let i = 0; i < conditionValues.length; i++) {
-          if (String(conditionValues[i]).includes(userValue)) {
+          if (String(userValue).includes(conditionValues[i])) {
             return false;
           }
         }
@@ -6104,10 +6175,11 @@ var Sigma = class {
         return false;
     }
   }
-  getUserParamValue(paramKey) {
+  getUserParamValue(paramKey, privateFlag = null) {
     if (!paramKey)
       return false;
     const user = this.sigmaUserData.user;
+    let defaultValue = null;
     if (paramKey.includes(".")) {
       const paramsArray = paramKey.split(".");
       const parent = paramsArray[0];
@@ -6115,67 +6187,46 @@ var Sigma = class {
       if (!child)
         return false;
       const isSetParentInUserData = Object.keys(user).find((i) => i === parent);
-      if (!user[isSetParentInUserData])
+      if (!user[isSetParentInUserData]) {
         return false;
+      }
       const userObject = Object.entries(user[isSetParentInUserData]);
       for (let [userParamKey, userParamValue] of userObject) {
         if (userParamKey == child) {
-          return userParamValue;
+          defaultValue = userParamValue;
+          break;
         }
       }
     } else {
       for (let [key, value] of Object.entries(user)) {
         if (key == paramKey) {
-          return value;
+          defaultValue = value;
+          break;
         }
       }
     }
-    return false;
-  }
-  digestHash(string) {
-    let hash = 0, i, chr;
-    if (string.length === 0)
-      return hash;
-    for (i = 0; i < string.length; i++) {
-      chr = string.charCodeAt(i);
-      hash = (hash << 5) - hash + chr;
-      hash |= 0;
-    }
-    return hash;
+    if (privateFlag && defaultValue)
+      return MD5.hex(defaultValue);
+    return defaultValue;
   }
   calcUserInGroup(salt, exposureRate, controlBucketPerc, forcedExp = false, layer = null, layerBounds = []) {
     const userId = this.sigmaUserData.user.userId ? this.sigmaUserData.user.userId : this.cache.get(sigmaUserId);
     const md5R = MD5.hex(String(userId) + salt);
-    const R = this.digestHash(md5R) * zeta / max_decimal_64;
+    const R = digestHash(md5R) * zeta / max_decimal_64;
     let md5L = null;
     if (!layer && !layerBounds.length || forcedExp) {
-      return this.getUserGroup(R, exposureRate, controlBucketPerc, forcedExp);
+      return getUserGroup(R, exposureRate, controlBucketPerc, forcedExp);
     } else {
       md5L = MD5.hex(String(userId) + layer);
-      const L = this.digestHash(md5L) * zeta / max_decimal_64;
+      const L = digestHash(md5L) * zeta / max_decimal_64;
       for (let i in layerBounds) {
         const result = Math.abs(L / 10);
         if (result <= layerBounds[i].lower_bound || layerBounds[i].upper_bound <= result) {
           continue;
         } else {
-          return this.getUserGroup(R, exposureRate, controlBucketPerc, forcedExp);
-        }
-      }
-    }
-    return false;
-  }
-  getUserGroup(salt, exposureRate, controlBucketPerc, forcedExp) {
-    let userInGroup = "a";
-    let currentDiaposon = 0;
-    if (Math.abs(salt) / 100 <= parseFloat(exposureRate) * 100 || forcedExp) {
-      let bucket = Math.abs(salt) % 100;
-      for (let i = 0; i < controlBucketPerc.length; i++) {
-        currentDiaposon += controlBucketPerc[i].weight * 100;
-        if (bucket <= currentDiaposon) {
-          return userInGroup = controlBucketPerc[i].name;
+          return getUserGroup(R, exposureRate, controlBucketPerc, forcedExp);
         }
       }
-      return userInGroup;
     }
     return false;
   }
@@ -6184,38 +6235,39 @@ var Sigma = class {
       return false;
     }
     await this.updateCache();
-    const sigmaDataLs = this.cache.parse(sigmaDataFile);
+    const sigmaDataLs = await this.cache.parse(sigmaDataFile);
+    if (!sigmaDataLs.experiments) {
+      throw new Error("Experiments not found in cache");
+    }
     let experiment = null;
     let layer = null;
     let bounds = [];
     let userInGroupExperiment = null;
     let forcedUser = false;
-    if (!sigmaDataLs.experiments) {
-      throw new Error("experiments in cache not found");
-    }
     for (let i = 0; i < sigmaDataLs.experiments.length; i++) {
-      if (sigmaDataLs.experiments[i]["is_active"] == "false")
-        continue;
-      if (sigmaDataLs.experiments[i]["name"] === experimentName && this.checkBoolValue(sigmaDataLs.experiments[i]["layer_id"])) {
+      if (sigmaDataLs.experiments[i]["name"] === experimentName && checkBoolValue(sigmaDataLs.experiments[i]["layer_id"])) {
         layer = sigmaDataLs.experiments[i]["layer_id"];
         bounds = sigmaDataLs.experiments[i]["layer_bounds"];
       }
       if (sigmaDataLs.experiments[i]["name"] === experimentName && !experiment) {
-        forcedUser = this.checkForcedList(sigmaDataLs.experiments[i].forced_user_list, this.sigmaUserData.user.userId);
+        forcedUser = checkForcedList(sigmaDataLs.experiments[i].forced_user_list, this.sigmaUserData.user.userId);
         experiment = sigmaDataLs.experiments[i];
         break;
       }
     }
     const localStorageGroupName = `sigma_group_${experimentName}`;
     if (experiment) {
-      userInGroupExperiment = this.calcUserInGroup(
-        experiment.salt,
-        experiment.allocation,
-        experiment.groups,
-        forcedUser,
-        layer,
-        bounds
-      );
+      userInGroupExperiment = this.findUserInForcedGroup(experiment);
+      if (!userInGroupExperiment) {
+        userInGroupExperiment = this.calcUserInGroup(
+          experiment.salt,
+          experiment.allocation,
+          experiment.groups,
+          forcedUser,
+          layer,
+          bounds
+        );
+      }
       this.cache.set(localStorageGroupName, userInGroupExperiment);
     }
     const getParamValue = (paramName) => {
@@ -6236,7 +6288,7 @@ var Sigma = class {
       let paramValue = null;
       for (let item in params.values) {
         if (params.values[item].group === groupName) {
-          paramValue = this.doTypeConversion(params.type, params.values[item].value);
+          paramValue = doTypeConversion(params.type, params.values[item].value);
         }
       }
       if (!paramValue) {
@@ -6267,7 +6319,7 @@ var Sigma = class {
       }
       if (!flag)
         return false;
-      return this.findingSpotCondition(flag);
+      return this.findingSpotCondition(flag, false, experiment);
     };
     return {
       getParamValue,
@@ -6284,18 +6336,21 @@ var Sigma = class {
       const experiment = sigmaDataLs.experiments[i];
       let layer = null;
       let bounds = [];
-      if (this.checkBoolValue(experiment["layer_id"])) {
+      let group = this.findUserInForcedGroup(experiment);
+      if (checkBoolValue(experiment["layer_id"]) && !group) {
         layer = experiment["layer_id"];
         bounds = experiment["layer_bounds"];
       }
-      const group = this.calcUserInGroup(
-        experiment.salt,
-        experiment.allocation,
-        experiment.groups,
-        this.checkForcedList(experiment.forced_user_list, this.sigmaUserData.user.userId),
-        layer,
-        bounds
-      );
+      if (!group) {
+        group = this.calcUserInGroup(
+          experiment.salt,
+          experiment.allocation,
+          experiment.groups,
+          checkForcedList(experiment.forced_user_list, this.sigmaUserData.user.userId),
+          layer,
+          bounds
+        );
+      }
       if (group) {
         const groupIndex = experiment.groups.findIndex((i2) => i2.name == group);
         result = result.concat(experiment.name).concat(".").concat(groupIndex).concat("|");
@@ -6307,22 +6362,21 @@ var Sigma = class {
     }
     return false;
   }
-  checkForcedList(usersList, data) {
-    if (usersList.length) {
-      for (let id2 in usersList) {
-        if (usersList[id2] == data) {
-          return true;
+  findUserInForcedGroup(experiment) {
+    let groupName = false;
+    for (const groupItem in experiment.groups) {
+      const forcedList = experiment.groups[groupItem].forced_user_list;
+      if (forcedList && forcedList.length) {
+        for (const item in forcedList) {
+          if (forcedList[item] === this.sigmaUserData.user.userId) {
+            return groupName = experiment.groups[groupItem].name;
+          }
         }
       }
     }
-    return false;
+    return groupName;
   }
-  checkBoolValue(value) {
-    if (value)
-      return true;
-    return false;
-  }
-  findingSpotCondition(flag, saveToUser) {
+  findingSpotCondition(flag, saveToUser = false, exp = null) {
     let flagRules = flag.rules;
     let flagDefaultResult = null;
     for (let defaultRule in flagRules) {
@@ -6347,7 +6401,10 @@ var Sigma = class {
         const conditions = flagRules[rule].conditions;
         let results = [];
         for (let i in conditions) {
-          let userValue = this.getUserParamValue(conditions[i].name);
+          let userValue = this.getUserParamValue(
+            conditions[i].name,
+            exp ? exp.is_private : flag.is_private
+          );
           results.push(
             this.conditionOperation(
               userValue,
@@ -6365,7 +6422,7 @@ var Sigma = class {
           const findingItem = results.find((item) => item === false);
           findingItem === false ? isSuccessRule : isSuccessRule = true;
         }
-        let ruleValue = this.doTypeConversion(flag.type, flagRules[rule].value);
+        let ruleValue = doTypeConversion(flag.type, flagRules[rule].value);
         if (isSuccessRule) {
           if (saveToUser) {
             saveToUser.addFlag(flag.name, {
@@ -6377,7 +6434,7 @@ var Sigma = class {
           return ruleValue;
         }
       }
-      let defaultValue = this.doTypeConversion(flagDefaultResult.type, flagDefaultResult.value);
+      let defaultValue = doTypeConversion(flagDefaultResult.type, flagDefaultResult.value);
       if (saveToUser) {
         flagDefaultResult.value = defaultValue;
         saveToUser.addFlag(flag.name, flagDefaultResult);
@@ -6385,16 +6442,6 @@ var Sigma = class {
       return defaultValue;
     }
   }
-  doTypeConversion(type, value) {
-    if (type === "string")
-      return value;
-    if (type === "bool") {
-      return value === "true" ? true : false;
-    }
-    if (type === "integer" || type === "number")
-      return parseFloat(value);
-    return value;
-  }
   async getCacheDataFile() {
     const data = await this.cache.get(sigmaDataFile);
     return data;