expf-sigma-node.js 1.2.3 → 2.0.1

package/package.json

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

@@ -59,7 +59,11 @@ var SigmaUserData = class {
       time: null,
       date: null,
       deviceCategory: null,
-      featureFlags: []
+      featureFlags: [],
+      domain: null,
+      url: null,
+      query: null,
+      pathname: null
     };
   }
   init({
@@ -71,7 +75,11 @@ var SigmaUserData = class {
     deviceCategory,
     os,
     browser,
-    geo
+    geo,
+    domain,
+    url,
+    query,
+    pathname
   }) {
     this.user.userId = userId;
     this.user.ip = ip;
@@ -84,6 +92,10 @@ var SigmaUserData = class {
     this.user.os = os;
     this.user.browser = browser;
     this.user.geo = geo;
+    this.user.domain = domain;
+    this.user.url = url;
+    this.user.query = query;
+    this.user.pathname = pathname;
   }
   setUserId(userId) {
     this.user.userId = userId;
@@ -946,9 +958,13 @@ var Sigma = class {
       appVersion: this.userData.appVersion || null,
       custom: this.userData.custom || null,
       deviceCategory: this.userData.deviceCategory || null,
-      browser: this.userData.browser || null,
-      os: this.userData.os || null,
-      geo: this.userData.geo || null
+      browser: this.userData.browser || { version: null, name: null },
+      os: this.userData.os || { version: null, name: null },
+      geo: this.userData.geo || null,
+      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.cache.set(sigmaUserId, this.userData.userId);
@@ -1160,8 +1176,10 @@ var Sigma = class {
   }
   conditionOperation(userValue, conditionValues, operation) {
     !operation ? operation = "=" : operation;
-    if (!userValue || typeof userValue === "undefined")
+    if (userValue === null || typeof userValue === "undefined" || !conditionValues)
       return false;
+    userValue = String(userValue);
+    conditionValues = String(conditionValues);
     switch (operation.trim()) {
       case "equal":
         return userValue.toLowerCase().trim() == conditionValues.toLowerCase().trim();
@@ -1181,14 +1199,14 @@ var Sigma = class {
         return !conditionValues.includes(userValue);
       case "contains any of":
         for (let i = 0; i < conditionValues.length; i++) {
-          if (String(userValue).includes(conditionValues[i])) {
+          if (userValue.includes(conditionValues[i])) {
             return true;
           }
         }
         return false;
       case "contains none of":
         for (let i = 0; i < conditionValues.length; i++) {
-          if (String(userValue).includes(conditionValues[i])) {
+          if (userValue.includes(conditionValues[i])) {
             return false;
           }
         }
@@ -1205,7 +1223,7 @@ var Sigma = class {
         return false;
     }
   }
-  getUserParamValue(paramKey, privateFlag = null) {
+  getUserParamValue(paramKey, privateFlag = null, isConditionSignForHash = false) {
     if (!paramKey)
       return false;
     const user = this.sigmaUserData.user;
@@ -1235,8 +1253,11 @@ var Sigma = class {
         }
       }
     }
-    if (privateFlag && defaultValue)
+    if (defaultValue != null)
+      defaultValue = String(defaultValue);
+    if (privateFlag && defaultValue && isConditionSignForHash) {
       return MD5.hex(defaultValue);
+    }
     return defaultValue;
   }
   calcUserInGroup(salt, exposureRate, controlBucketPerc, forcedExp = false, layer = null, layerBounds = []) {
@@ -1260,6 +1281,41 @@ var Sigma = class {
     }
     return false;
   }
+  checkTargetConditions(experiment) {
+    if (experiment.targets && experiment.targets.conditions && experiment.targets.conditions.length > 0) {
+      const targets = experiment.targets;
+      let results = [];
+      for (let index in targets.conditions) {
+        const userValue = this.getUserParamValue(
+          targets.conditions[index].name,
+          experiment.is_private,
+          this.checkConditionSignForHash(targets.conditions[index].condition_sign)
+        );
+        results.push(
+          this.conditionOperation(
+            userValue,
+            targets.conditions[index].value,
+            targets.conditions[index].condition_sign
+          )
+        );
+      }
+      return this.checkConditionsStatement(targets.conditional_statement, results);
+    }
+    return false;
+  }
+  checkConditionSignForHash(condition) {
+    return ["equal", "not equal", "any of", "none of"].includes(condition);
+  }
+  experimentDefinition(experiment, forcedUserInGroup) {
+    if (forcedUserInGroup) {
+      return experiment;
+    } else if (experiment.targets && experiment.targets.conditions.length > 0 && this.checkTargetConditions(experiment)) {
+      return experiment;
+    } else if (!experiment.targets || experiment.targets && experiment.targets.conditions.length === 0) {
+      return experiment;
+    }
+    return null;
+  }
   async getExperiment(experimentName) {
     if (!experimentName) {
       return null;
@@ -1282,13 +1338,13 @@ var Sigma = class {
       }
       if (sigmaDataLs.experiments[i]["name"] === experimentName && !experiment) {
         forcedUser = checkForcedList(sigmaDataLs.experiments[i].forced_user_list, this.sigmaUserData.user.userId);
-        experiment = sigmaDataLs.experiments[i];
+        userInGroupExperiment = this.findUserInForcedGroup(sigmaDataLs.experiments[i]);
+        experiment = this.experimentDefinition(sigmaDataLs.experiments[i], userInGroupExperiment);
         break;
       }
     }
     const localStorageGroupName = `sigma_group_${experimentName}`;
     if (experiment) {
-      userInGroupExperiment = this.findUserInForcedGroup(experiment);
       if (!userInGroupExperiment) {
         userInGroupExperiment = this.calcUserInGroup(
           experiment.salt,
@@ -1362,26 +1418,28 @@ var Sigma = class {
       return false;
     let result = "";
     for (let i in sigmaDataLs.experiments) {
-      const experiment = sigmaDataLs.experiments[i];
       let layer = null;
       let bounds = [];
-      let group = this.findUserInForcedGroup(experiment);
-      if (checkBoolValue(experiment["layer_id"]) && !group) {
-        layer = experiment["layer_id"];
-        bounds = experiment["layer_bounds"];
-      }
-      if (!group) {
-        group = this.calcUserInGroup(
-          experiment.salt,
-          experiment.allocation,
-          experiment.groups,
-          checkForcedList(experiment.forced_user_list, this.sigmaUserData.user.userId),
-          layer,
-          bounds
-        );
+      let userInGroupExperiment = this.findUserInForcedGroup(sigmaDataLs.experiments[i]);
+      let experiment = this.experimentDefinition(sigmaDataLs.experiments[i], userInGroupExperiment);
+      if (experiment) {
+        if (checkBoolValue(experiment["layer_id"]) && !userInGroupExperiment) {
+          layer = experiment["layer_id"];
+          bounds = experiment["layer_bounds"];
+        }
+        if (!userInGroupExperiment) {
+          userInGroupExperiment = 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);
+      if (userInGroupExperiment) {
+        const groupIndex = experiment.groups.findIndex((i2) => i2.name == userInGroupExperiment);
         result = result.concat(experiment.name).concat(".").concat(groupIndex).concat("|");
       }
     }
@@ -1432,7 +1490,8 @@ var Sigma = class {
         for (let i in conditions) {
           let userValue = this.getUserParamValue(
             conditions[i].name,
-            exp ? exp.is_private : flag.is_private
+            exp ? exp.is_private : flag.is_private,
+            this.checkConditionSignForHash(conditions[i].condition_sign)
           );
           results.push(
             this.conditionOperation(
@@ -1442,15 +1501,7 @@ var Sigma = class {
             )
           );
         }
-        let isSuccessRule = false;
-        if (flagRules[rule].conditional_statement == "OR") {
-          const findingItem = results.find((item) => item === true);
-          findingItem === true ? isSuccessRule = true : isSuccessRule;
-        }
-        if (flagRules[rule].conditional_statement == "AND") {
-          const findingItem = results.find((item) => item === false);
-          findingItem === false ? isSuccessRule : isSuccessRule = true;
-        }
+        let isSuccessRule = this.checkConditionsStatement(flagRules[rule].conditional_statement, results);
         let ruleValue = doTypeConversion(flag.type, flagRules[rule].value);
         if (isSuccessRule) {
           if (saveToUser) {
@@ -1483,6 +1534,18 @@ var Sigma = class {
     const data = await this.cache.get(sigmaUserId);
     return data;
   }
+  checkConditionsStatement(ruleStatement, items) {
+    let isSuccessRule = false;
+    if (ruleStatement == "OR") {
+      const findingItem = items.find((item) => item === true);
+      findingItem === true ? isSuccessRule = true : isSuccessRule;
+    }
+    if (ruleStatement == "AND") {
+      const findingItem = items.find((item) => item === false);
+      findingItem === false ? isSuccessRule : isSuccessRule = true;
+    }
+    return isSuccessRule;
+  }
 };
 var sigma_default = Sigma;
 // Annotate the CommonJS export names for ESM import in node: