expf-sigma-node.js 0.0.4 → 0.0.6

package/package.json

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

@@ -5795,6 +5795,7 @@ var Sigma = class {
     this.api = api2 || `${defaultApi}/config.json`;
     this.retries = retries;
     this.sigmaUserData = sigmaUserData;
+    this.userData.userId = this.validateUserDataUserId(this.userData.userId);
     this.sigmaUserData.init({
       userId: this.userData.userId || null,
       ip: this.userData.ip || null,
@@ -5802,13 +5803,24 @@ var Sigma = class {
       appVersion: this.userData.appVersion || null,
       custom: this.userData.custom || null
     });
-    if (!this.userData.userId) {
-      this.setUserCookie();
-      this.sigmaUserData.setUserId(cache.get(sigmaUserId));
-    } else {
-      cache.set(sigmaUserId, this.userData.userId);
-      this.sigmaUserData.setUserId(this.userData.userId);
+    cache.set(sigmaUserId, this.userData.userId);
+    this.setUserCookie();
+  }
+  validateUserDataUserId(userId) {
+    let hasMakeId = false;
+    if (typeof userId === "undefined") {
+      hasMakeId = true;
+    }
+    userId = String(userId).trim();
+    if (userId.length === 0) {
+      hasMakeId = true;
     }
+    if (hasMakeId && cache.get(sigmaUserId)) {
+      userId = cache.get(sigmaUserId);
+    } else if (hasMakeId) {
+      userId = this.makeIdCookie();
+    }
+    return userId;
   }
   delay(ms) {
     new Promise((resolve) => setTimeout(() => resolve(void 0), ms));
@@ -5882,25 +5894,35 @@ var Sigma = class {
       cache.set("sigmaGeoData", JSON.stringify({ location: "none" }));
       console.error(error);
     }
+    let data;
     try {
-      const data = await this.getDataFile(`${api2}`);
-      const hash = await SHA256.hex(JSON.stringify(data));
-      if (!localStorageHash || localStorageHash !== hash) {
-        cache.set("sigmaHash", hash);
-        cache.set(sigmaDataFile, JSON.stringify(data));
-        this.sigmaUserData.clearFlags();
-      }
+      data = await this.getDataFile(`${api2}`);
     } catch (error) {
       if (!cache.get(sigmaDataFile)) {
         throw new Error(`
-        save data to cache: ${error},
+        Get data: ${error},
         token: ${this.token},
         url: ${defaultApi}/config.json
         `);
       } else {
-        console.error(`Get data config: ${error}`);
+        console.error(`Get data config.json: ${error}`);
+        return true;
       }
     }
+    let hash;
+    try {
+      if (typeof data !== "object") {
+        throw new Error(`typeof config.json is not an object`);
+      }
+      hash = await SHA256.hex(JSON.stringify(data));
+      if (!localStorageHash || localStorageHash !== hash) {
+        cache.set("sigmaHash", hash);
+        cache.set(sigmaDataFile, JSON.stringify(data));
+        this.sigmaUserData.clearFlags();
+      }
+    } catch (error) {
+      throw new Error(`Save data to local storage`);
+    }
   }
   setUserCookie() {
     let uin = cache.get(sigmaUserId);