expf-sigma-node.js 1.1.8 → 1.2.1

package/package.json

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

@@ -110,7 +110,9 @@ var SigmaUserData = class {
 var import_node_cache = __toESM(require("node-cache"));
 var sigmaCache = new import_node_cache.default();
 var SigmaCache = class {
-  constructor(postfix) {
+  constructor(postfix, geoCacheTTL) {
+    this.geoCacheTTL = geoCacheTTL || null;
+    this.sigmaGeoCache = new import_node_cache.default({ stdTTL: this.geoCacheTTL });
     this.postfix = "";
     if (postfix)
       this.postfix = "__" + postfix;
@@ -138,6 +140,47 @@ var SigmaCache = class {
   }
 };
 
+// src/modules/sigmaGeoCache.js
+var import_node_cache2 = __toESM(require("node-cache"));
+var defaultGeoCacheTTL = 5 * 60;
+var maxGeoCacheTTL = 120 * 60;
+var minGeoCacheTTL = 1 * 60;
+var SigmaGeoCache = class {
+  constructor(postfix, geoCacheTTL) {
+    this.geoCacheTTL = geoCacheTTL || defaultGeoCacheTTL;
+    if (geoCacheTTL > maxGeoCacheTTL || geoCacheTTL < minGeoCacheTTL) {
+      this.geoCacheTTL = defaultGeoCacheTTL;
+    }
+    this.sigmaGeoCache = new import_node_cache2.default({ stdTTL: this.geoCacheTTL });
+    this.postfix = "";
+    if (postfix)
+      this.postfix = "__" + postfix;
+  }
+  get(key) {
+    try {
+      return this.sigmaGeoCache.get(key + this.postfix);
+    } catch (e) {
+      console.log(e);
+    }
+  }
+  set(key, value) {
+    try {
+      return this.sigmaGeoCache.set(key + this.postfix, value);
+    } catch (e) {
+      console.log(e);
+    }
+  }
+  keys() {
+    return this.sigmaGeoCache.keys();
+  }
+  parse(data) {
+    if (!this.get(data)) {
+      throw new Error(`${data} not found in cache`);
+    }
+    return JSON.parse(this.get(data));
+  }
+};
+
 // src/modules/sigmaHashes.js
 var Hashes;
 function utf8Encode(str) {
@@ -890,7 +933,8 @@ var Sigma = class {
   constructor(token, userData, cacheTTL = 10, options = {
     api: "",
     retries: "",
-    postfix: ""
+    postfix: "",
+    geoCacheTTL: null
   }) {
     if (!token) {
       throw new Error("Please specify a token");
@@ -915,6 +959,7 @@ var Sigma = class {
       os: this.userData.os || null,
       geo: this.userData.geo || null
     });
+    this.geoCache = new SigmaGeoCache(this.token, options.geoCacheTTL);
     this.cache.set(sigmaUserId, this.userData.userId);
     this.setUserCookie();
   }
@@ -985,20 +1030,19 @@ var Sigma = class {
     }
   }
   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);
+    if (!this.userData.ip)
+      return;
+    const geoKey = `${this.userData.ip}__${this.token}`;
+    const foundingGeoKey = this.geoCache.keys().find((k) => k === geoKey);
+    if (foundingGeoKey) {
+      const userGeoData = this.geoCache.get(this.userData.ip);
+      this.sigmaUserData.setGeo(userGeoData);
+      return;
+    } else {
+      const userGeoData = await this.getUserGeoData();
+      this.geoCache.set(this.userData.ip, userGeoData);
+      this.sigmaUserData.setGeo(userGeoData);
     }
-    this.cache.set(sigmaGeoData, jsonUserGeoData);
   }
   async saveToCache() {
     const { api } = this;
@@ -1011,7 +1055,6 @@ var Sigma = class {
        token: ${this.token}
       `);
     }
-    await this.setUserGeoData();
     let data;
     try {
       data = await this.getDataFile(`${api}/config.json`);
@@ -1051,7 +1094,7 @@ var Sigma = class {
       this.cache.get("sigmaDataFileLastUpdate")
     );
     const currentTime = Math.floor(Date.now() / 1e3);
-    if (currentTime > lastUpdate + this.cacheTTL || this.userData.geo || this.userData.ip) {
+    if (currentTime > lastUpdate + this.cacheTTL) {
       return true;
     }
     return false;
@@ -1074,11 +1117,10 @@ var Sigma = class {
       return null;
     }
     await this.updateCache();
-    const cacheKey = this.cache.parse("sigmaDataFile");
+    await this.setUserGeoData();
+    const cacheKey = this.cache.parse(sigmaDataFile);
     if (!cacheKey.feature_flags)
       return;
-    const geoData = await this.cache.parse("sigmaGeoData");
-    this.sigmaUserData.setGeo(geoData);
     let flag = null;
     const expName = this.getExperimentByFeatureFlag(cacheKey, flagName);
     if (expName) {
@@ -1232,6 +1274,7 @@ var Sigma = class {
       return null;
     }
     await this.updateCache();
+    await this.setUserGeoData();
     const sigmaDataLs = await this.cache.parse(sigmaDataFile);
     if (!sigmaDataLs.experiments) {
       throw new Error("Experiments not found in cache");
@@ -1446,7 +1489,7 @@ var Sigma = class {
     return data;
   }
   async getCacheGeoData() {
-    const data = await this.cache.get("sigmaGeoData");
+    const data = await this.cache.get(sigmaGeoData);
     return data;
   }
   async getCacheUserId() {