expf-sigma-node.js 3.0.1 → 3.0.2

package/package.json

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

@@ -148,6 +148,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`);
@@ -266,8 +273,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,6 +939,7 @@ 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 sigmaDataFile = "sigmaDataFile";
@@ -981,40 +989,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)) {
       switch (key) {
         case "userId":
-          if (value)
+          if (value && String(value).trim().length > 0)
             this.cache.set(sigmaUserId, String(value).trim());
           break;
         case "profileId":
-          if (value)
+          if (value && String(value).trim().length > 0)
             this.cache.set(sigmaProfileId, String(value).trim());
           break;
         case "deviceId":
-          if (value)
+          if (value && String(value).trim().length > 0)
             this.cache.set(sigmaDeviceId, String(value).trim());
           break;
       }
     }
   }
-  validateUserDataUserId(userId) {
-    let hasMakeId = false;
-    if (typeof userId === "undefined") {
-      hasMakeId = true;
-    }
-    userId = String(userId).trim();
-    if (userId.length === 0) {
-      hasMakeId = true;
+  makePrivateIdInCache() {
+    let privateId = this.cache.get(sigmaPrivateId);
+    if (!privateId) {
+      privateId = generateRandomId();
+      this.cache.set(sigmaPrivateId, privateId);
     }
-    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) => {
@@ -1042,7 +1043,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") {
@@ -1495,6 +1496,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;
   }