expf-sigma-node.js 1.1.4 → 1.1.6

package/package.json

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

@@ -957,6 +957,7 @@ var Sigma = class {
       body,
       credentials: "same-origin",
       headers: {
+        "ip": this.userData.ip,
         "X-Real-IP": this.userData.ip,
         token: this.token,
         "user-id": this.userData.userId ? this.userData.userId : this.sigmaUserData.user.userId
@@ -983,6 +984,22 @@ var Sigma = class {
       throw new Error(`Get geo: ${error}`);
     }
   }
+  async setUserGeoData() {
+    let jsonUserGeoData = JSON.stringify({ location: "none" });
+    try {
+      if (this.userData.ip && !this.userData.geo) {
+        const userGeoData = await this.getUserGeoData();
+        if (!this.cache.get(sigmaGeoData) || userGeoData) {
+          jsonUserGeoData = JSON.stringify(userGeoData);
+        }
+      } else if (this.userData.geo) {
+        jsonUserGeoData = JSON.stringify(this.userData.geo);
+      }
+    } catch (error) {
+      console.log(error);
+    }
+    this.cache.set(sigmaGeoData, jsonUserGeoData);
+  }
   async saveToCache() {
     const { api } = this;
     const localStorageHash = this.cache.get("sigmaHash");
@@ -994,18 +1011,7 @@ var Sigma = class {
        token: ${this.token}
       `);
     }
-    try {
-      if (!this.userData.geo) {
-        const userGeoData = await this.getUserGeoData();
-        if (!this.cache.get(sigmaGeoData) || userGeoData) {
-          this.cache.set(sigmaGeoData, JSON.stringify(userGeoData));
-        }
-      } else {
-        this.cache.set(sigmaGeoData, JSON.stringify(this.userData.geo));
-      }
-    } catch (error) {
-      this.cache.set(sigmaGeoData, JSON.stringify({ location: "none" }));
-    }
+    await this.setUserGeoData();
     let data;
     try {
       data = await this.getDataFile(`${api}/config.json`);
@@ -1045,7 +1051,8 @@ var Sigma = class {
       this.cache.get("sigmaDataFileLastUpdate")
     );
     const currentTime = Math.floor(Date.now() / 1e3);
-    if (currentTime > lastUpdate + this.cacheTTL || this.userData.geo) {
+    const userGeoCache = this.cache.parse(sigmaGeoData);
+    if (currentTime > lastUpdate + this.cacheTTL || Object.keys(userGeoCache).length !== 0 || Object.keys(this.userData.geo).length !== 0) {
       return true;
     }
     return false;