flagsmith-nodejs 2.1.1 → 2.2.1

package/build/index.d.ts

@@ -1,4 +1,2 @@
-import Flagsmith from './sdk';
 export { AnalyticsProcessor, FlagsmithAPIError, FlagsmithClientError, EnvironmentDataPollingManager, FlagsmithCache, DefaultFlag, Flags } from './sdk';
 export { EnvironmentModel, IntegrationModel, FeatureStateModel, IdentityModel, TraitModel, SegmentModel, OrganisationModel } from './flagsmith-engine';
-export default Flagsmith;

package/build/index.js

@@ -20,5 +20,4 @@ Object.defineProperty(exports, "IdentityModel", { enumerable: true, get: functio
 Object.defineProperty(exports, "TraitModel", { enumerable: true, get: function () { return flagsmith_engine_1.TraitModel; } });
 Object.defineProperty(exports, "SegmentModel", { enumerable: true, get: function () { return flagsmith_engine_1.SegmentModel; } });
 Object.defineProperty(exports, "OrganisationModel", { enumerable: true, get: function () { return flagsmith_engine_1.OrganisationModel; } });
-exports.default = sdk_1.default;
 module.exports = sdk_1.default;

package/build/sdk/analytics.d.ts

@@ -5,20 +5,20 @@ export declare class AnalyticsProcessor {
     analyticsData: {
         [key: string]: any;
     };
-    private timeout;
+    private requestTimeoutMs;
     /**
      * AnalyticsProcessor is used to track how often individual Flags are evaluated within
      * the Flagsmith SDK. Docs: https://docs.flagsmith.com/advanced-use/flag-analytics.
      *
      * @param data.environmentKey environment key obtained from the Flagsmith UI
      * @param data.baseApiUrl base api url to override when using self hosted version
-     * @param data.timeout used to tell requests to stop waiting for a response after a
-            given number of seconds
+     * @param data.requestTimeoutMs used to tell requests to stop waiting for a response after a
+            given number of milliseconds
      */
     constructor(data: {
         environmentKey: string;
         baseApiUrl: string;
-        timeout?: number;
+        requestTimeoutMs?: number;
     });
     /**
      * Sends all the collected data to the api asynchronously and resets the timer

package/build/sdk/analytics.js

@@ -51,16 +51,16 @@ var AnalyticsProcessor = /** @class */ (function () {
      *
      * @param data.environmentKey environment key obtained from the Flagsmith UI
      * @param data.baseApiUrl base api url to override when using self hosted version
-     * @param data.timeout used to tell requests to stop waiting for a response after a
-            given number of seconds
+     * @param data.requestTimeoutMs used to tell requests to stop waiting for a response after a
+            given number of milliseconds
      */
     function AnalyticsProcessor(data) {
-        this.timeout = 3;
+        this.requestTimeoutMs = 3000;
         this.analyticsEndpoint = data.baseApiUrl + ANALYTICS_ENDPOINT;
         this.environmentKey = data.environmentKey;
         this.lastFlushed = Date.now();
         this.analyticsData = {};
-        this.timeout = data.timeout || this.timeout;
+        this.requestTimeoutMs = data.requestTimeoutMs || this.requestTimeoutMs;
     }
     /**
      * Sends all the collected data to the api asynchronously and resets the timer
@@ -76,7 +76,7 @@ var AnalyticsProcessor = /** @class */ (function () {
                         return [4 /*yield*/, (0, node_fetch_1.default)(this.analyticsEndpoint, {
                                 method: 'POST',
                                 body: JSON.stringify(this.analyticsData),
-                                timeout: this.timeout,
+                                timeout: this.requestTimeoutMs,
                                 headers: {
                                     'Content-Type': 'application/json',
                                     'X-Environment-Key': this.environmentKey

package/build/sdk/index.d.ts

@@ -15,6 +15,7 @@ export declare class Flagsmith {
         [key: string]: any;
     };
     requestTimeoutSeconds?: number;
+    requestTimeoutMs?: number;
     enableLocalEvaluation?: boolean;
     environmentRefreshIntervalSeconds: number;
     retries?: number;
@@ -113,6 +114,7 @@ export declare class Flagsmith {
      * You only need to call this if you wish to bypass environmentRefreshIntervalSeconds.
      */
     updateEnvironment(): Promise<void>;
+    close(): Promise<void>;
     private getJSONResponse;
     /**
      * This promise ensures that the environment is retrieved before attempting to locally evaluate.

package/build/sdk/index.js

@@ -125,6 +125,7 @@ var Flagsmith = /** @class */ (function () {
         this.apiUrl = data.apiUrl || this.apiUrl;
         this.customHeaders = data.customHeaders;
         this.requestTimeoutSeconds = data.requestTimeoutSeconds;
+        this.requestTimeoutMs = data.requestTimeoutSeconds ? data.requestTimeoutSeconds * 1000 : undefined;
         this.enableLocalEvaluation = data.enableLocalEvaluation;
         this.environmentRefreshIntervalSeconds =
             data.environmentRefreshIntervalSeconds || this.environmentRefreshIntervalSeconds;
@@ -154,7 +155,7 @@ var Flagsmith = /** @class */ (function () {
             ? new analytics_1.AnalyticsProcessor({
                 environmentKey: this.environmentKey,
                 baseApiUrl: this.apiUrl,
-                timeout: this.requestTimeoutSeconds
+                requestTimeoutMs: this.requestTimeoutMs
             })
             : undefined;
     }
@@ -182,10 +183,10 @@ var Flagsmith = /** @class */ (function () {
                             return [2 /*return*/, cachedItem];
                         }
                         if (this.enableLocalEvaluation) {
-                            return [2 /*return*/, new Promise(function (resolve) {
+                            return [2 /*return*/, new Promise(function (resolve, reject) {
                                     return _this.environmentPromise.then(function () {
                                         resolve(_this.getEnvironmentFlagsFromDocument());
-                                    });
+                                    }).catch(function (e) { return reject(e); });
                                 })];
                         }
                         if (this.environment) {
@@ -227,10 +228,10 @@ var Flagsmith = /** @class */ (function () {
                         }
                         traits = traits || {};
                         if (this.enableLocalEvaluation) {
-                            return [2 /*return*/, new Promise(function (resolve) {
+                            return [2 /*return*/, new Promise(function (resolve, reject) {
                                     return _this.environmentPromise.then(function () {
                                         resolve(_this.getIdentityFlagsFromDocument(identifier, traits || {}));
-                                    });
+                                    }).catch(function (e) { return reject(e); });
                                 })];
                         }
                         return [2 /*return*/, this.getIdentityFlagsFromApi(identifier, traits)];
@@ -253,15 +254,15 @@ var Flagsmith = /** @class */ (function () {
         var _this = this;
         traits = traits || {};
         if (this.enableLocalEvaluation) {
-            return this.environmentPromise.then(function () {
-                return new Promise(function (resolve) {
+            return new Promise(function (resolve, reject) {
+                return _this.environmentPromise.then(function () {
                     var identityModel = _this.buildIdentityModel(identifier, Object.keys(traits || {}).map(function (key) { return ({
                         key: key,
                         value: traits === null || traits === void 0 ? void 0 : traits[key]
                     }); }));
                     var segments = (0, evaluators_1.getIdentitySegments)(_this.environment, identityModel);
                     return resolve(segments);
-                });
+                }).catch(function (e) { return reject(e); });
             });
         }
         console.error('This function is only permitted with local evaluation.');
@@ -311,6 +312,15 @@ var Flagsmith = /** @class */ (function () {
             });
         });
     };
+    Flagsmith.prototype.close = function () {
+        var _a;
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_b) {
+                (_a = this.environmentDataPollingManager) === null || _a === void 0 ? void 0 : _a.stop();
+                return [2 /*return*/];
+            });
+        });
+    };
     Flagsmith.prototype.getJSONResponse = function (url, method, body) {
         return __awaiter(this, void 0, void 0, function () {
             var headers, _a, _b, _c, k, v, data;
@@ -339,10 +349,10 @@ var Flagsmith = /** @class */ (function () {
                         }
                         return [4 /*yield*/, (0, utils_1.retryFetch)(url, {
                                 method: method,
-                                timeout: this.requestTimeoutSeconds || undefined,
+                                timeout: this.requestTimeoutMs || undefined,
                                 body: JSON.stringify(body),
                                 headers: headers
-                            }, this.retries, (this.requestTimeoutSeconds || 10) * 1000)];
+                            }, this.retries)];
                     case 1:
                         data = _e.sent();
                         if (data.status !== 200) {

package/build/sdk/utils.d.ts

@@ -9,4 +9,4 @@ export declare function generateIdentitiesData(identifier: string, traits: {
     }[];
 };
 export declare const delay: (ms: number) => Promise<unknown>;
-export declare const retryFetch: (url: string, fetchOptions: any, retries: number | undefined, timeout: number) => Promise<Response>;
+export declare const retryFetch: (url: string, fetchOptions: any, retries?: number, timeout?: number | undefined) => Promise<Response>;

package/build/sdk/utils.js

@@ -59,7 +59,8 @@ var delay = function (ms) {
     return new Promise(function (resolve) { return setTimeout(function () { return resolve(undefined); }, ms); });
 };
 exports.delay = delay;
-var retryFetch = function (url, fetchOptions, retries, timeout) {
+var retryFetch = function (url, fetchOptions, retries, timeout // set an overall timeout for this function
+) {
     if (retries === void 0) { retries = 3; }
     return new Promise(function (resolve, reject) {
         // check for timeout

package/es6-example/package-lock.json

@@ -9,7 +9,6 @@
       "version": "1.0.1",
       "license": "MIT",
       "dependencies": {
-        "flagsmith-nodejs": "^2.1.0",
         "node-cache": "^5.1.2"
       },
       "devDependencies": {
@@ -1291,14 +1290,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/big-integer": {
-      "version": "1.6.51",
-      "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz",
-      "integrity": "sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==",
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
     "node_modules/binary-extensions": {
       "version": "1.13.1",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
@@ -1480,14 +1471,6 @@
       "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
       "dev": true
     },
-    "node_modules/charenc": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz",
-      "integrity": "sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==",
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/chokidar": {
       "version": "2.1.8",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
@@ -1732,14 +1715,6 @@
         "node": ">=4.8"
       }
     },
-    "node_modules/crypt": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz",
-      "integrity": "sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==",
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/debug": {
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -2473,32 +2448,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/flagsmith-nodejs": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/flagsmith-nodejs/-/flagsmith-nodejs-2.1.0.tgz",
-      "integrity": "sha512-LZV3JiU+GPVPD0a8wPnEiVAvUtQklv1ESrrkGcfV+Zo5YE96c0wUlCJlBgpXs/eztFv7RVhms+gv7X0Nx4JqEQ==",
-      "dependencies": {
-        "big-integer": "^1.6.51",
-        "md5": "^2.3.0",
-        "node-fetch": "^2.1.2",
-        "semver": "^7.3.7",
-        "uuid": "^8.3.2"
-      }
-    },
-    "node_modules/flagsmith-nodejs/node_modules/semver": {
-      "version": "7.3.7",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/flat-cache": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
@@ -3624,7 +3573,9 @@
     "node_modules/is-buffer": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true,
+      "optional": true
     },
     "node_modules/is-data-descriptor": {
       "version": "0.1.4",
@@ -3918,17 +3869,6 @@
         "loose-envify": "cli.js"
       }
     },
-    "node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/map-cache": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
@@ -3952,16 +3892,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/md5": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz",
-      "integrity": "sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==",
-      "dependencies": {
-        "charenc": "0.0.2",
-        "crypt": "0.0.2",
-        "is-buffer": "~1.1.6"
-      }
-    },
     "node_modules/media-typer": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
@@ -4184,25 +4114,6 @@
         "node": ">= 8.0.0"
       }
     },
-    "node_modules/node-fetch": {
-      "version": "2.6.7",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
-      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
-      "dependencies": {
-        "whatwg-url": "^5.0.0"
-      },
-      "engines": {
-        "node": "4.x || >=6.0.0"
-      },
-      "peerDependencies": {
-        "encoding": "^0.1.0"
-      },
-      "peerDependenciesMeta": {
-        "encoding": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/node-releases": {
       "version": "1.1.28",
       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.28.tgz",
@@ -5695,11 +5606,6 @@
         "nodetouch": "bin/nodetouch.js"
       }
     },
-    "node_modules/tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
-    },
     "node_modules/trim-right": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
@@ -5917,14 +5823,6 @@
         "node": ">= 0.4.0"
       }
     },
-    "node_modules/uuid": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-      "bin": {
-        "uuid": "dist/bin/uuid"
-      }
-    },
     "node_modules/v8-compile-cache": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz",
@@ -5940,20 +5838,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
-    },
-    "node_modules/whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
-      "dependencies": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
-      }
-    },
     "node_modules/which": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
@@ -5989,11 +5873,6 @@
       "engines": {
         "node": ">=4"
       }
-    },
-    "node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
     }
   },
   "dependencies": {
@@ -7055,11 +6934,6 @@
         }
       }
     },
-    "big-integer": {
-      "version": "1.6.51",
-      "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz",
-      "integrity": "sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg=="
-    },
     "binary-extensions": {
       "version": "1.13.1",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
@@ -7212,11 +7086,6 @@
       "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
       "dev": true
     },
-    "charenc": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz",
-      "integrity": "sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA=="
-    },
     "chokidar": {
       "version": "2.1.8",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
@@ -7417,11 +7286,6 @@
         "which": "^1.2.9"
       }
     },
-    "crypt": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz",
-      "integrity": "sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow=="
-    },
     "debug": {
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -8007,28 +7871,6 @@
         "unpipe": "~1.0.0"
       }
     },
-    "flagsmith-nodejs": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/flagsmith-nodejs/-/flagsmith-nodejs-2.1.0.tgz",
-      "integrity": "sha512-LZV3JiU+GPVPD0a8wPnEiVAvUtQklv1ESrrkGcfV+Zo5YE96c0wUlCJlBgpXs/eztFv7RVhms+gv7X0Nx4JqEQ==",
-      "requires": {
-        "big-integer": "^1.6.51",
-        "md5": "^2.3.0",
-        "node-fetch": "^2.1.2",
-        "semver": "^7.3.7",
-        "uuid": "^8.3.2"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "7.3.7",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-          "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        }
-      }
-    },
     "flat-cache": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
@@ -8916,7 +8758,9 @@
     "is-buffer": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true,
+      "optional": true
     },
     "is-data-descriptor": {
       "version": "0.1.4",
@@ -9149,14 +8993,6 @@
         "js-tokens": "^3.0.0 || ^4.0.0"
       }
     },
-    "lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "requires": {
-        "yallist": "^4.0.0"
-      }
-    },
     "map-cache": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
@@ -9174,16 +9010,6 @@
         "object-visit": "^1.0.0"
       }
     },
-    "md5": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz",
-      "integrity": "sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==",
-      "requires": {
-        "charenc": "0.0.2",
-        "crypt": "0.0.2",
-        "is-buffer": "~1.1.6"
-      }
-    },
     "media-typer": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
@@ -9363,14 +9189,6 @@
         "clone": "2.x"
       }
     },
-    "node-fetch": {
-      "version": "2.6.7",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
-      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
-      "requires": {
-        "whatwg-url": "^5.0.0"
-      }
-    },
     "node-releases": {
       "version": "1.1.28",
       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.28.tgz",
@@ -10550,11 +10368,6 @@
         "nopt": "~1.0.10"
       }
     },
-    "tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
-    },
     "trim-right": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
@@ -10726,11 +10539,6 @@
       "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
       "dev": true
     },
-    "uuid": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
-    },
     "v8-compile-cache": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz",
@@ -10743,20 +10551,6 @@
       "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
       "dev": true
     },
-    "webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
-    },
-    "whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
-      "requires": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
-      }
-    },
     "which": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
@@ -10786,11 +10580,6 @@
       "requires": {
         "mkdirp": "^0.5.1"
       }
-    },
-    "yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
     }
   }
 }

package/es6-example/package.json

@@ -50,7 +50,6 @@
     "prettier": "^1.18.2"
   },
   "dependencies": {
-    "flagsmith-nodejs": "^2.1.0",
     "node-cache": "^5.1.2"
   }
 }

package/es6-example/src/api/index.js

@@ -1,5 +1,5 @@
 import {Router}  from 'express'
-import Flagsmith, {Flags} from '../../../build'
+import Flagsmith from '../../../build'
 
 const environmentKey = '';
 import nodecache from "node-cache";

package/index.ts

@@ -19,5 +19,5 @@ export {
   SegmentModel,
   OrganisationModel
 } from './flagsmith-engine';
-export default Flagsmith
+
 module.exports = Flagsmith;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flagsmith-nodejs",
-  "version": "2.1.1",
+  "version": "2.2.1",
   "description": "Flagsmith lets you manage features flags and remote config across web, mobile and server side applications. Deliver true Continuous Integration. Get builds out faster. Control who has access to new features.",
   "main": "build/index.js",
   "repository": {

package/sdk/analytics.ts

@@ -10,22 +10,22 @@ export class AnalyticsProcessor {
     private environmentKey: string;
     private lastFlushed: number;
     analyticsData: { [key: string]: any };
-    private timeout: number = 3;
+    private requestTimeoutMs: number = 3000;
     /**
      * AnalyticsProcessor is used to track how often individual Flags are evaluated within 
      * the Flagsmith SDK. Docs: https://docs.flagsmith.com/advanced-use/flag-analytics.
      * 
      * @param data.environmentKey environment key obtained from the Flagsmith UI
      * @param data.baseApiUrl base api url to override when using self hosted version
-     * @param data.timeout used to tell requests to stop waiting for a response after a
-            given number of seconds
+     * @param data.requestTimeoutMs used to tell requests to stop waiting for a response after a
+            given number of milliseconds
      */
-    constructor(data: { environmentKey: string; baseApiUrl: string; timeout?: number }) {
+    constructor(data: { environmentKey: string; baseApiUrl: string; requestTimeoutMs?: number }) {
         this.analyticsEndpoint = data.baseApiUrl + ANALYTICS_ENDPOINT;
         this.environmentKey = data.environmentKey;
         this.lastFlushed = Date.now();
         this.analyticsData = {};
-        this.timeout = data.timeout || this.timeout;
+        this.requestTimeoutMs = data.requestTimeoutMs || this.requestTimeoutMs;
     }
     /**
      * Sends all the collected data to the api asynchronously and resets the timer
@@ -38,7 +38,7 @@ export class AnalyticsProcessor {
         await fetch(this.analyticsEndpoint, {
             method: 'POST',
             body: JSON.stringify(this.analyticsData),
-            timeout: this.timeout,
+            timeout: this.requestTimeoutMs,
             headers: {
                 'Content-Type': 'application/json',
                 'X-Environment-Key': this.environmentKey

package/sdk/index.ts

@@ -28,6 +28,7 @@ export class Flagsmith {
     apiUrl: string = DEFAULT_API_URL;
     customHeaders?: { [key: string]: any };
     requestTimeoutSeconds?: number;
+    requestTimeoutMs?: number;
     enableLocalEvaluation?: boolean = false;
     environmentRefreshIntervalSeconds: number = 60;
     retries?: number;
@@ -92,6 +93,7 @@ export class Flagsmith {
         this.apiUrl = data.apiUrl || this.apiUrl;
         this.customHeaders = data.customHeaders;
         this.requestTimeoutSeconds = data.requestTimeoutSeconds;
+        this.requestTimeoutMs = data.requestTimeoutSeconds ? data.requestTimeoutSeconds * 1000 : undefined;
         this.enableLocalEvaluation = data.enableLocalEvaluation;
         this.environmentRefreshIntervalSeconds =
             data.environmentRefreshIntervalSeconds || this.environmentRefreshIntervalSeconds;
@@ -135,7 +137,7 @@ export class Flagsmith {
             ? new AnalyticsProcessor({
                 environmentKey: this.environmentKey,
                 baseApiUrl: this.apiUrl,
-                timeout: this.requestTimeoutSeconds
+                requestTimeoutMs: this.requestTimeoutMs
             })
             : undefined;
     }
@@ -150,10 +152,10 @@ export class Flagsmith {
             return cachedItem;
         }
         if (this.enableLocalEvaluation) {
-            return new Promise(resolve =>
+            return new Promise((resolve, reject) =>
                 this.environmentPromise!.then(() => {
                     resolve(this.getEnvironmentFlagsFromDocument());
-                })
+                }).catch((e) => reject(e))
             );
         }
         if (this.environment) {
@@ -180,10 +182,10 @@ export class Flagsmith {
         }
         traits = traits || {};
         if (this.enableLocalEvaluation) {
-            return new Promise(resolve =>
+            return new Promise((resolve, reject) =>
                 this.environmentPromise!.then(() => {
                     resolve(this.getIdentityFlagsFromDocument(identifier, traits || {}));
-                })
+                }).catch(e => reject(e))
             );
         }
         return this.getIdentityFlagsFromApi(identifier, traits);
@@ -206,8 +208,8 @@ export class Flagsmith {
     ): Promise<SegmentModel[]> {
         traits = traits || {};
         if (this.enableLocalEvaluation) {
-            return this.environmentPromise!.then(() => {
-                return new Promise(resolve => {
+            return new Promise((resolve, reject) => {
+                return this.environmentPromise!.then(() => {
                     const identityModel = this.buildIdentityModel(
                         identifier,
                         Object.keys(traits || {}).map(key => ({
@@ -218,7 +220,7 @@ export class Flagsmith {
 
                     const segments = getIdentitySegments(this.environment, identityModel);
                     return resolve(segments);
-                });
+                }).catch((e) => reject(e));
             });
         }
         console.error('This function is only permitted with local evaluation.');
@@ -251,6 +253,10 @@ export class Flagsmith {
         }
     }
 
+    async close() {
+        this.environmentDataPollingManager?.stop();
+    }
+
     private async getJSONResponse(
         url: string,
         method: string,
@@ -271,12 +277,11 @@ export class Flagsmith {
             url,
             {
                 method: method,
-                timeout: this.requestTimeoutSeconds || undefined,
+                timeout: this.requestTimeoutMs || undefined,
                 body: JSON.stringify(body),
                 headers: headers
             },
-            this.retries,
-            (this.requestTimeoutSeconds || 10) * 1000
+            this.retries
         );
 
         if (data.status !== 200) {

package/sdk/utils.ts

@@ -20,7 +20,7 @@ export const retryFetch = (
     url: string,
     fetchOptions: any,
     retries = 3,
-    timeout: number
+    timeout?: number // set an overall timeout for this function
 ): Promise<Response> => {
     return new Promise((resolve, reject) => {
         // check for timeout

package/tests/sdk/analytics.test.ts

@@ -32,7 +32,7 @@ test('test_analytics_processor_flush_post_request_data_match_ananlytics_data', a
         body: '{"myFeature1":1,"myFeature2":1}',
         headers: { 'Content-Type': 'application/json', 'X-Environment-Key': 'test-key' },
         method: 'POST',
-        timeout: 3
+        timeout: 3000
     });
 });