expf-sigma-node.js 3.0.1 → 3.0.3

package/package.json

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

@@ -111,10 +111,13 @@ var SigmaUserData = class {
   }
   addFlag(flagName, flagRule) {
     const { user } = this;
-    user.featureFlags.push({
-      name: flagName,
-      rule: flagRule
-    });
+    const userHasFlag = user.featureFlags.find((item) => item.name === flagName);
+    if (!userHasFlag) {
+      user.featureFlags.push({
+        name: flagName,
+        rule: flagRule
+      });
+    }
   }
   clearFlags() {
     this.user.featureFlags = [];
@@ -148,6 +151,13 @@ var SigmaCache = class {
       console.log(e);
     }
   }
+  remove(key) {
+    try {
+      return sigmaCache.del(key + this.postfix);
+    } catch (e) {
+      console.log(e);
+    }
+  }
   parse(data) {
     if (!this.get(data)) {
       throw new Error(`${data} not found in cache`);
@@ -238,7 +248,7 @@ function compareVersions(versionA, versionB, strict = true) {
 
 // src/helpers/delay.js
 function delay(ms) {
-  new Promise((resolve) => setTimeout(() => resolve(void 0), ms));
+  return new Promise((resolve) => setTimeout(() => resolve(void 0), ms));
 }
 
 // src/helpers/digestHash.js
@@ -266,8 +276,8 @@ function doTypeConversion(type, value) {
   return value;
 }
 
-// src/helpers/makeIdCookie.js
-function makeIdCookie() {
+// src/helpers/generateRandomId.js
+function generateRandomId() {
   let text = "";
   let possible = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
   for (let i = 0; i < 80; i++)
@@ -932,14 +942,17 @@ var defaultApi = "https://api.expf.ru/api/v1";
 var sigmaUserId = "sigmaUserId";
 var sigmaProfileId = "sigmaProfileId";
 var sigmaDeviceId = "sigmaDeviceId";
+var sigmaPrivateId = "sigmaPrivateId";
 var sigmaHash = "sigmaHash";
 var sigmaDataFileLastUpdate = "sigmaDataFileLastUpdate";
+var sigmaExpiration = "sigmaExpiration";
 var sigmaDataFile = "sigmaDataFile";
 var sigmaExperiments = "sigmaExperiments";
 var max_decimal_64 = 18446744073709552e3;
 var zeta = 8540717056e4;
 var SHA256 = new sigmaHashes_default.SHA256();
 var MD5 = new sigmaHashes_default.MD5();
+var expirationDate = 24 * 60 * 60 * 1e3;
 
 // src/sigma.js
 if (typeof import_node_fetch.default.default !== "undefined")
@@ -981,40 +994,33 @@ var Sigma = class {
     });
     this.geoCache = new SigmaGeoCache(this.token, options.geoCacheTTL);
     this.setSplitIdsToCache(this.userData);
+    this.makePrivateIdInCache();
   }
   setSplitIdsToCache(userData) {
     for (let [key, value] of Object.entries(userData)) {
+      if (!value || !String(value).trim().length)
+        continue;
       switch (key) {
         case "userId":
-          if (value)
-            this.cache.set(sigmaUserId, String(value).trim());
+          this.cache.set(sigmaUserId, String(value).trim());
+          this.cache.set(sigmaExpiration, new Date().getTime() + expirationDate);
           break;
         case "profileId":
-          if (value)
-            this.cache.set(sigmaProfileId, String(value).trim());
+          this.cache.set(sigmaProfileId, String(value).trim());
           break;
         case "deviceId":
-          if (value)
-            this.cache.set(sigmaDeviceId, String(value).trim());
+          this.cache.set(sigmaDeviceId, String(value).trim());
           break;
       }
     }
   }
-  validateUserDataUserId(userId) {
-    let hasMakeId = false;
-    if (typeof userId === "undefined") {
-      hasMakeId = true;
+  makePrivateIdInCache() {
+    let privateId = this.cache.get(sigmaPrivateId);
+    if (!privateId) {
+      privateId = generateRandomId();
+      this.cache.set(sigmaPrivateId, privateId);
     }
-    userId = String(userId).trim();
-    if (userId.length === 0) {
-      hasMakeId = true;
-    }
-    if (hasMakeId && this.cache.get(sigmaUserId)) {
-      userId = this.cache.get(sigmaUserId);
-    } else if (hasMakeId) {
-      userId = makeIdCookie();
-    }
-    return userId;
+    return privateId;
   }
   retryFetch(url, fetchOptions, retries = 3, timeout) {
     return new Promise((resolve, reject) => {
@@ -1023,8 +1029,9 @@ var Sigma = class {
       const wrapper = (n) => {
         (0, import_node_fetch.default)(url, fetchOptions).then((res) => resolve(res)).catch((err) => {
           if (n > 0) {
-            delay(1e3);
-            wrapper(--n);
+            delay(1e3).then(() => {
+              wrapper(--n);
+            });
           } else {
             reject(err);
           }
@@ -1042,7 +1049,7 @@ var Sigma = class {
         "ip": this.userData.ip,
         "X-Real-IP": this.userData.ip,
         token: this.token,
-        "user-id": this.validateUserDataUserId(this.userData.userId)
+        "user-id": this.cache.get(sigmaPrivateId)
       }
     };
     if (method !== "GET") {
@@ -1315,6 +1322,9 @@ var Sigma = class {
     switch (experiment.split_by) {
       case "userId":
         id = this.cache.get(sigmaUserId) || null;
+        if (this.cache.get(sigmaExpiration) && parseInt(new Date().getTime()) >= parseInt(this.cache.get(sigmaExpiration))) {
+          id = null;
+        }
         break;
       case "profileId":
         id = this.cache.get(sigmaProfileId) || null;
@@ -1462,7 +1472,7 @@ var Sigma = class {
     await this.updateCache();
     const sigmaDataLs = this.cache.parse(sigmaDataFile);
     if (!sigmaDataLs.experiments.length)
-      return false;
+      return null;
     let result = "";
     for (let i in sigmaDataLs.experiments) {
       let layer = null;
@@ -1495,6 +1505,8 @@ var Sigma = class {
     if (result.length > 0) {
       this.cache.set(sigmaExperiments, result.slice(0, -1));
       return result.slice(0, -1);
+    } else {
+      this.cache.remove(sigmaExperiments);
     }
     return null;
   }