flagsmith-nodejs 2.5.1 → 2.5.2

package/build/sdk/index.js

@@ -364,10 +364,9 @@ var Flagsmith = /** @class */ (function () {
                         return [4 /*yield*/, (0, utils_1.retryFetch)(url, {
                                 agent: this.agent,
                                 method: method,
-                                timeout: this.requestTimeoutMs || undefined,
                                 body: JSON.stringify(body),
                                 headers: headers
-                            }, this.retries)];
+                            }, this.retries, this.requestTimeoutMs || undefined)];
                     case 1:
                         data = _e.sent();
                         if (data.status !== 200) {

package/build/sdk/utils.js

@@ -63,11 +63,8 @@ var retryFetch = function (url, fetchOptions, retries, timeout // set an overall
 ) {
     if (retries === void 0) { retries = 3; }
     return new Promise(function (resolve, reject) {
-        // check for timeout
-        if (timeout)
-            setTimeout(function () { return reject('error: timeout'); }, timeout);
-        var wrapper = function (n) {
-            (0, node_fetch_1.default)(url, fetchOptions)
+        var retryWrapper = function (n) {
+            requestWrapper()
                 .then(function (res) { return resolve(res); })
                 .catch(function (err) { return __awaiter(void 0, void 0, void 0, function () {
                 return __generator(this, function (_a) {
@@ -77,7 +74,7 @@ var retryFetch = function (url, fetchOptions, retries, timeout // set an overall
                             return [4 /*yield*/, (0, exports.delay)(1000)];
                         case 1:
                             _a.sent();
-                            wrapper(--n);
+                            retryWrapper(--n);
                             return [3 /*break*/, 3];
                         case 2:
                             reject(err);
@@ -87,7 +84,16 @@ var retryFetch = function (url, fetchOptions, retries, timeout // set an overall
                 });
             }); });
         };
-        wrapper(retries);
+        var requestWrapper = function () {
+            return new Promise(function (resolve, reject) {
+                if (timeout)
+                    setTimeout(function () { return reject('error: timeout'); }, timeout);
+                return (0, node_fetch_1.default)(url, fetchOptions)
+                    .then(function (res) { return resolve(res); })
+                    .catch(function (err) { return reject(err); });
+            });
+        };
+        retryWrapper(retries);
     });
 };
 exports.retryFetch = retryFetch;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flagsmith-nodejs",
-  "version": "2.5.1",
+  "version": "2.5.2",
   "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/index.ts

@@ -283,11 +283,11 @@ export class Flagsmith {
             {
                 agent: this.agent,
                 method: method,
-                timeout: this.requestTimeoutMs || undefined,
                 body: JSON.stringify(body),
                 headers: headers
             },
-            this.retries
+            this.retries,
+            this.requestTimeoutMs || undefined,
         );
 
         if (data.status !== 200) {

package/sdk/utils.ts

@@ -23,22 +23,28 @@ export const retryFetch = (
     timeout?: number // set an overall timeout for this function
 ): Promise<Response> => {
     return new Promise((resolve, reject) => {
-        // check for timeout
-        if (timeout) setTimeout(() => reject('error: timeout'), timeout);
-
-        const wrapper = (n: number) => {
-            fetch(url, fetchOptions)
+        const retryWrapper = (n: number) => {
+            requestWrapper()
                 .then(res => resolve(res))
                 .catch(async err => {
                     if (n > 0) {
                         await delay(1000);
-                        wrapper(--n);
+                        retryWrapper(--n);
                     } else {
                         reject(err);
                     }
                 });
         };
 
-        wrapper(retries);
+        const requestWrapper = (): Promise<Response> => {
+            return new Promise((resolve, reject) => {
+                if (timeout) setTimeout(() => reject('error: timeout'), timeout);
+                return fetch(url, fetchOptions)
+                    .then(res => resolve(res))
+                    .catch(err => reject(err))
+            })
+        }
+
+        retryWrapper(retries);
     });
 };

package/tests/engine/unit/utils/utils.test.ts

@@ -42,7 +42,6 @@ describe('getHashedPercentageForObjIds', () => {
         let objectIdPairs = Array.from(Array(testSample).keys()).flatMap(d => Array.from(Array(testSample).keys()).map(e => [d, e].flat()))
 
         // When
-        console.log(objectIdPairs);
         let values = objectIdPairs.map((objIds) => getHashedPercentateForObjIds(objIds));
 
         // Then

package/tests/sdk/flagsmith.test.ts

@@ -172,6 +172,27 @@ test('test_default_flag_used_after_multiple_API_errors', async () => {
     expect(flag.value).toBe(defaultFlag.value);
 });
 
+test('default flag handler used when timeout occurs', async () => {
+    // @ts-ignore
+    fetch.mockReturnValue(Promise.resolve(sleep(10000)));
+
+    const defaultFlag = new DefaultFlag('some-default-value', true);
+
+    const defaultFlagHandler = (featureName: string) => defaultFlag;
+
+    const flg = new Flagsmith({
+        environmentKey: 'key',
+        defaultFlagHandler: defaultFlagHandler,
+        requestTimeoutSeconds: 0.1,
+    });
+
+    const flags = await flg.getEnvironmentFlags();
+    const flag = flags.getFlag('some_feature');
+    expect(flag.isDefault).toBe(true);
+    expect(flag.enabled).toBe(defaultFlag.enabled);
+    expect(flag.value).toBe(defaultFlag.value);
+})
+
 test('test_throws_when_no_identity_flags_returned_due_to_error', async () => {
     // @ts-ignore
     fetch.mockReturnValue(Promise.resolve(new Response('bad data')));
@@ -245,7 +266,6 @@ test('getIdentitySegments throws error if identifier is empty string', () => {
 })
 
 
-
 async function wipeFeatureStateUUIDs (enviromentModel: EnvironmentModel) {
     // TODO: this has been pulled out of tests above as a helper function.
     //  I'm not entirely sure why it's necessary, however, we should look to remove.
@@ -264,3 +284,9 @@ async function wipeFeatureStateUUIDs (enviromentModel: EnvironmentModel) {
         })
     })
 }
+
+function sleep(ms: number) {
+    return new Promise((resolve) => {
+        setTimeout(resolve, ms);
+    });
+}