flagsmith-nodejs 3.0.1 → 3.1.1

package/build/flagsmith-engine/features/models.js

@@ -83,10 +83,7 @@ var FeatureStateModel = /** @class */ (function () {
     };
     FeatureStateModel.prototype.getMultivariateValue = function (identityID) {
         var e_1, _a;
-        var percentageValue = (0, hashing_1.getHashedPercentateForObjIds)([
-            this.djangoID || this.featurestateUUID,
-            identityID
-        ]);
+        var percentageValue;
         var startPercentage = 0;
         var sortedF = this.multivariateFeatureStateValues.sort(function (a, b) {
             return a.id - b.id;
@@ -94,6 +91,19 @@ var FeatureStateModel = /** @class */ (function () {
         try {
             for (var sortedF_1 = __values(sortedF), sortedF_1_1 = sortedF_1.next(); !sortedF_1_1.done; sortedF_1_1 = sortedF_1.next()) {
                 var myValue = sortedF_1_1.value;
+                switch (myValue.percentageAllocation) {
+                    case 0:
+                        continue;
+                    case 100:
+                        return myValue.multivariateFeatureOption.value;
+                    default:
+                        if (percentageValue === undefined) {
+                            percentageValue = (0, hashing_1.getHashedPercentateForObjIds)([
+                                this.djangoID || this.featurestateUUID,
+                                identityID
+                            ]);
+                        }
+                }
                 var limit = myValue.percentageAllocation + startPercentage;
                 if (startPercentage <= percentageValue && percentageValue < limit) {
                     return myValue.multivariateFeatureOption.value;

package/build/sdk/index.d.ts

@@ -15,7 +15,6 @@ export declare class Flagsmith {
     customHeaders?: {
         [key: string]: any;
     };
-    requestTimeoutSeconds?: number;
     agent: RequestInit['agent'];
     requestTimeoutMs?: number;
     enableLocalEvaluation?: boolean;

package/build/sdk/index.js

@@ -89,6 +89,7 @@ Object.defineProperty(exports, "Flags", { enumerable: true, get: function () { r
 var polling_manager_2 = require("./polling_manager");
 Object.defineProperty(exports, "EnvironmentDataPollingManager", { enumerable: true, get: function () { return polling_manager_2.EnvironmentDataPollingManager; } });
 var DEFAULT_API_URL = 'https://edge.api.flagsmith.com/api/v1/';
+var DEFAULT_REQUEST_TIMEOUT_SECONDS = 10;
 var Flagsmith = /** @class */ (function () {
     /**
      * A Flagsmith client.
@@ -122,6 +123,7 @@ var Flagsmith = /** @class */ (function () {
         @param data.logger: an instance of the pino Logger class to use for logging
      */
     function Flagsmith(data) {
+        var _a;
         this.apiUrl = DEFAULT_API_URL;
         this.enableLocalEvaluation = false;
         this.environmentRefreshIntervalSeconds = 60;
@@ -130,8 +132,7 @@ var Flagsmith = /** @class */ (function () {
         this.environmentKey = data.environmentKey;
         this.apiUrl = data.apiUrl || this.apiUrl;
         this.customHeaders = data.customHeaders;
-        this.requestTimeoutSeconds = data.requestTimeoutSeconds;
-        this.requestTimeoutMs = data.requestTimeoutSeconds ? data.requestTimeoutSeconds * 1000 : undefined;
+        this.requestTimeoutMs = 1000 * ((_a = data.requestTimeoutSeconds) !== null && _a !== void 0 ? _a : DEFAULT_REQUEST_TIMEOUT_SECONDS);
         this.enableLocalEvaluation = data.enableLocalEvaluation;
         this.environmentRefreshIntervalSeconds =
             data.environmentRefreshIntervalSeconds || this.environmentRefreshIntervalSeconds;

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: RequestInit, retries?: number, timeout?: number | undefined) => Promise<Response>;
+export declare const retryFetch: (url: string, fetchOptions: RequestInit, retries?: number, timeout?: number) => Promise<Response>;

package/build/sdk/utils.js

@@ -62,6 +62,7 @@ exports.delay = delay;
 var retryFetch = function (url, fetchOptions, retries, timeout // set an overall timeout for this function
 ) {
     if (retries === void 0) { retries = 3; }
+    if (timeout === void 0) { timeout = 10; }
     return new Promise(function (resolve, reject) {
         var retryWrapper = function (n) {
             requestWrapper()

package/flagsmith-engine/features/models.ts

@@ -96,18 +96,27 @@ export class FeatureStateModel {
         }
         return this.featureSegment.priority < other.featureSegment.priority;
     }
-    
-    getMultivariateValue(identityID: number | string) {
-        const percentageValue = getHashedPercentateForObjIds([
-            this.djangoID || this.featurestateUUID,
-            identityID
-        ]);
 
+    getMultivariateValue(identityID: number | string) {
+        let percentageValue: number | undefined;
         let startPercentage = 0;
-        const sortedF = this.multivariateFeatureStateValues.sort((a, b) =>{
+        const sortedF = this.multivariateFeatureStateValues.sort((a, b) => {
             return a.id - b.id;
         });
         for (const myValue of sortedF) {
+            switch (myValue.percentageAllocation) {
+                case 0:
+                    continue;
+                case 100:
+                    return myValue.multivariateFeatureOption.value;
+                default:
+                    if (percentageValue === undefined) {
+                        percentageValue = getHashedPercentateForObjIds([
+                            this.djangoID || this.featurestateUUID,
+                            identityID
+                        ]);
+                    }
+            }
             const limit = myValue.percentageAllocation + startPercentage;
             if (startPercentage <= percentageValue && percentageValue < limit) {
                 return myValue.multivariateFeatureOption.value;

package/package.json

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

@@ -24,13 +24,13 @@ export { EnvironmentDataPollingManager } from './polling_manager';
 export { FlagsmithCache, FlagsmithConfig } from './types';
 
 const DEFAULT_API_URL = 'https://edge.api.flagsmith.com/api/v1/';
+const DEFAULT_REQUEST_TIMEOUT_SECONDS = 10;
 
 
 export class Flagsmith {
     environmentKey?: string;
     apiUrl: string = DEFAULT_API_URL;
     customHeaders?: { [key: string]: any };
-    requestTimeoutSeconds?: number;
     agent: RequestInit['agent'];
     requestTimeoutMs?: number;
     enableLocalEvaluation?: boolean = false;
@@ -87,8 +87,7 @@ export class Flagsmith {
         this.environmentKey = data.environmentKey;
         this.apiUrl = data.apiUrl || this.apiUrl;
         this.customHeaders = data.customHeaders;
-        this.requestTimeoutSeconds = data.requestTimeoutSeconds;
-        this.requestTimeoutMs = data.requestTimeoutSeconds ? data.requestTimeoutSeconds * 1000 : undefined;
+        this.requestTimeoutMs = 1000 * (data.requestTimeoutSeconds ?? DEFAULT_REQUEST_TIMEOUT_SECONDS);
         this.enableLocalEvaluation = data.enableLocalEvaluation;
         this.environmentRefreshIntervalSeconds =
             data.environmentRefreshIntervalSeconds || this.environmentRefreshIntervalSeconds;

package/sdk/utils.ts

@@ -19,8 +19,8 @@ export const delay = (ms: number) =>
 export const retryFetch = (
     url: string,
     fetchOptions: RequestInit,
-    retries = 3,
-    timeout?: number // set an overall timeout for this function
+    retries: number = 3,
+    timeout: number = 10// set an overall timeout for this function
 ): Promise<Response> => {
     return new Promise((resolve, reject) => {
         const retryWrapper = (n: number) => {

package/tests/sdk/flagsmith.test.ts

@@ -183,7 +183,7 @@ test('default flag handler used when timeout occurs', async () => {
     const flg = new Flagsmith({
         environmentKey: 'key',
         defaultFlagHandler: defaultFlagHandler,
-        requestTimeoutSeconds: 0.1,
+        requestTimeoutSeconds: 0.001,
     });
 
     const flags = await flg.getEnvironmentFlags();
@@ -193,6 +193,15 @@ test('default flag handler used when timeout occurs', async () => {
     expect(flag.value).toBe(defaultFlag.value);
 })
 
+test('request timeout uses default if not provided', async () => {
+
+    const flg = new Flagsmith({
+        environmentKey: 'key',
+    });
+
+    expect(flg.requestTimeoutMs).toBe(10000);
+})
+
 test('test_throws_when_no_identity_flags_returned_due_to_error', async () => {
     // @ts-ignore
     fetch.mockReturnValue(Promise.resolve(new Response('bad data')));