@splitsoftware/splitio-commons 2.0.0 → 2.0.1-rc.0

package/CHANGES.txt

@@ -1,3 +1,6 @@
+2.0.1 (XXX XX, 2024)
+ - Updated the factory `init` and `destroy` methods to support re-initialization after destruction, enabling repeated cycles of initialization and cleanup. This update ensures compatibility of the React SDK with React Strict Mode, where the factory's `init` and `destroy` effects are executed an extra time to validate proper resource cleanup.
+
 2.0.0 (November 1, 2024)
  - Added support for targeting rules based on large segments.
  - Added `factory.destroy()` method, which invokes the `destroy` method on all SDK clients created by the factory.
@@ -20,7 +23,7 @@
  - Updated some transitive dependencies for vulnerability fixes.
 
 1.16.0 (June 13, 2024)
- - Added the `getOptions` method to the `IPlatform` interface to allow the SDK to pass request options to the `fetch` function and `EventSource` constructor when fetching data from the Split servers. The method is optional and, if provided, it is called twice: first for the `fetch` options and then for the `EventSource` options. Useful for advanced use cases like configuring a proxy or validating HTTPS certificates in NodeJS.
+ - Added the `getOptions` method to the `IPlatform` interface to allow the SDK to pass request options to the `fetch` function and `EventSource` constructor when fetching data from the Split servers. The method is optional and, if provided, it is called twice: first for the `fetch` options and then for the `EventSource` options. Useful for advanced use cases like configuring a proxy or validating HTTPS certificates in Node.js.
  - Updated the Redis storage to lazily import the `ioredis` dependency when the storage is created. This prevents errors when the SDK is imported or bundled in a .mjs file, as `ioredis` is a CommonJS module.
  - Bugfixing - Restored some input validation error logs that were removed in version 1.12.0. The logs inform the user when the `getTreatment(s)` methods are called with an invalid value as feature flag name or flag set name.
  - Bugfixing - Fixed localhost mode to emit SDK_UPDATE when mocked feature flags are updated in the `features` object map of the config object (Related to issue https://github.com/splitio/javascript-browser-client/issues/119).
@@ -57,7 +60,7 @@
    - Added a new optional Split Filter configuration option. This allows the SDK and Split services to only synchronize the flags in the specified flag sets, avoiding unused or unwanted flags from being synced on the SDK instance, bringing all the benefits from a reduced payload.
      - Note: Only applicable when the SDK is in charge of the rollout data synchronization. When not applicable, the SDK will log a warning on init.
    - Added `sets` property to the `SplitView` object returned by the `split` and `splits` methods of the SDK manager to expose flag sets on flag views.
- - Bugfixing - Fixed SDK key validation in NodeJS to ensure the SDK_READY_TIMED_OUT event is emitted when a client-side type SDK key is provided instead of a server-side one (Related to issue https://github.com/splitio/javascript-client/issues/768).
+ - Bugfixing - Fixed SDK key validation in Node.js to ensure the SDK_READY_TIMED_OUT event is emitted when a client-side type SDK key is provided instead of a server-side one (Related to issue https://github.com/splitio/javascript-client/issues/768).
 
 1.10.0 (October 20, 2023)
  - Added `defaultTreatment` property to the `SplitView` object returned by the `split` and `splits` methods of the SDK manager (Related to issue https://github.com/splitio/javascript-commons/issues/225).
@@ -135,7 +138,7 @@
 1.3.0 (April 6, 2022)
  - Added user consent feature to allow delaying or disabling the data tracking from SDK until user consent is explicitly granted or declined. Read more in our docs.
  - Added `scheduler.impressionsQueueSize` property to SDK configuration to limit the amount of impressions tracked in memory. Read more in our docs.
- - Added support to accept TLS configuration options to the Redis storage in NodeJS. Read more in our docs.
+ - Added support to accept TLS configuration options to the Redis storage in Node.js. Read more in our docs.
  - Updated format for MySegments keys in LocalStorage, keeping backwards compatibility (issue https://github.com/splitio/javascript-client/issues/638).
  - Updated some modules due to general polishing and refactors, including updates in some log messages.
  - Updated some dependencies for vulnerability fixes.

package/README.md

@@ -33,7 +33,7 @@ Split has built and maintains SDKs for:
 * Java [Github](https://github.com/splitio/java-client) [Docs](https://help.split.io/hc/en-us/articles/360020405151-Java-SDK)
 * JavaScript [Github](https://github.com/splitio/javascript-client) [Docs](https://help.split.io/hc/en-us/articles/360020448791-JavaScript-SDK)
 * JavaScript for Browser [Github](https://github.com/splitio/javascript-browser-client) [Docs](https://help.split.io/hc/en-us/articles/360058730852-Browser-SDK)
-* Node [Github](https://github.com/splitio/javascript-client) [Docs](https://help.split.io/hc/en-us/articles/360020564931-Node-js-SDK)
+* Node.js [Github](https://github.com/splitio/javascript-client) [Docs](https://help.split.io/hc/en-us/articles/360020564931-Node-js-SDK)
 * PHP [Github](https://github.com/splitio/php-client) [Docs](https://help.split.io/hc/en-us/articles/360020350372-PHP-SDK)
 * PHP thin-client [Github](https://github.com/splitio/php-thin-client) [Docs](https://help.split.io/hc/en-us/articles/18305128673933-PHP-Thin-Client-SDK)
 * Python [Github](https://github.com/splitio/python-client) [Docs](https://help.split.io/hc/en-us/articles/360020359652-Python-SDK)

package/cjs/listeners/node.js

@@ -15,7 +15,7 @@ var EVENT_NAME = 'for SIGTERM signal.';
 var NodeSignalListener = /** @class */ (function () {
     function NodeSignalListener(syncManager, // private handler: () => MaybeThenable<void>,
     settings) {
-        // @TODO review handler logic when implementing Node SDK
+        // @TODO review handler logic when implementing Node.js SDK
         this.handler = function () {
             if (syncManager) {
                 // syncManager.stop();

package/cjs/readiness/readinessManager.js

@@ -28,7 +28,7 @@ function segmentsEventEmitterFactory(EventEmitter) {
 /**
  * Factory of readiness manager, which handles the ready / update event propagation.
  */
-function readinessManagerFactory(EventEmitter, settings, splits) {
+function readinessManagerFactory(EventEmitter, settings, splits, isShared) {
     if (splits === void 0) { splits = splitsEventEmitterFactory(EventEmitter); }
     var readyTimeout = settings.startup.readyTimeout;
     var segments = segmentsEventEmitterFactory(EventEmitter);
@@ -54,22 +54,24 @@ function readinessManagerFactory(EventEmitter, settings, splits) {
         syncLastUpdate();
         gate.emit(constants_1.SDK_READY_TIMED_OUT, 'Split SDK emitted SDK_READY_TIMED_OUT event.');
     }
-    var readyTimeoutId;
-    if (readyTimeout > 0) {
-        if (splits.hasInit)
-            readyTimeoutId = setTimeout(timeout, readyTimeout);
-        else
-            splits.initCallbacks.push(function () { readyTimeoutId = setTimeout(timeout, readyTimeout); });
-    }
     // emit SDK_READY and SDK_UPDATE
     var isReady = false;
     splits.on(constants_1.SDK_SPLITS_ARRIVED, checkIsReadyOrUpdate);
     segments.on(constants_1.SDK_SEGMENTS_ARRIVED, checkIsReadyOrUpdate);
     var isDestroyed = false;
+    var readyTimeoutId;
+    function __init() {
+        isDestroyed = false;
+        if (readyTimeout > 0 && !isReady)
+            readyTimeoutId = setTimeout(timeout, readyTimeout);
+    }
+    splits.initCallbacks.push(__init);
+    if (splits.hasInit)
+        __init();
     function checkIsReadyFromCache() {
         isReadyFromCache = true;
         // Don't emit SDK_READY_FROM_CACHE if SDK_READY has been emitted
-        if (!isReady) {
+        if (!isReady && !isDestroyed) {
             try {
                 syncLastUpdate();
                 gate.emit(constants_1.SDK_READY_FROM_CACHE);
@@ -81,6 +83,8 @@ function readinessManagerFactory(EventEmitter, settings, splits) {
         }
     }
     function checkIsReadyOrUpdate(diff) {
+        if (isDestroyed)
+            return;
         if (isReady) {
             try {
                 syncLastUpdate();
@@ -106,14 +110,12 @@ function readinessManagerFactory(EventEmitter, settings, splits) {
             }
         }
     }
-    var refCount = 1;
     return {
         splits: splits,
         segments: segments,
         gate: gate,
         shared: function () {
-            refCount++;
-            return readinessManagerFactory(EventEmitter, settings, splits);
+            return readinessManagerFactory(EventEmitter, settings, splits, true);
         },
         // @TODO review/remove next methods when non-recoverable errors are reworked
         // Called on consumer mode, when storage fails to connect
@@ -130,13 +132,9 @@ function readinessManagerFactory(EventEmitter, settings, splits) {
         destroy: function () {
             isDestroyed = true;
             syncLastUpdate();
-            segments.removeAllListeners();
-            gate.removeAllListeners();
             clearTimeout(readyTimeoutId);
-            if (refCount > 0)
-                refCount--;
-            if (refCount === 0)
-                splits.removeAllListeners();
+            if (!isShared)
+                splits.hasInit = false;
         },
         isReady: function () { return isReady; },
         isReadyFromCache: function () { return isReadyFromCache; },

package/cjs/sdkClient/sdkClient.js

@@ -45,19 +45,16 @@ function sdkClientFactory(params, isSharedClient) {
         destroy: function () {
             // Mark the SDK as destroyed immediately
             sdkReadinessManager.readinessManager.destroy();
-            // For main client, release the SDK Key and record stat before flushing data
+            // For main client, cleanup the SDK Key, listeners and scheduled jobs, and record stat before flushing data
             if (!isSharedClient) {
                 (0, apiKey_1.releaseApiKey)(settings.core.authorizationKey);
                 telemetryTracker.sessionLength();
+                signalListener && signalListener.stop();
+                uniqueKeysTracker && uniqueKeysTracker.stop();
             }
             // Stop background jobs
             syncManager && syncManager.stop();
             return __flush().then(function () {
-                // For main client, cleanup event listeners and scheduled jobs
-                if (!isSharedClient) {
-                    signalListener && signalListener.stop();
-                    uniqueKeysTracker && uniqueKeysTracker.stop();
-                }
                 // Cleanup storage
                 return storage.destroy();
             });

package/cjs/sdkFactory/index.js

@@ -102,6 +102,7 @@ function sdkFactory(params) {
         Logger: (0, sdkLogger_1.createLoggerAPI)(log),
         settings: settings,
         destroy: function () {
+            hasInit = false;
             return Promise.all(Object.keys(clients).map(function (key) { return clients[key].destroy(); })).then(function () { });
         }
     }, extraProps && extraProps(ctx), lazyInit ? { init: init } : init());

package/cjs/storages/inLocalStorage/index.js

@@ -9,8 +9,6 @@ var KeyBuilderCS_1 = require("../KeyBuilderCS");
 var isLocalStorageAvailable_1 = require("../../utils/env/isLocalStorageAvailable");
 var SplitsCacheInLocal_1 = require("./SplitsCacheInLocal");
 var MySegmentsCacheInLocal_1 = require("./MySegmentsCacheInLocal");
-var MySegmentsCacheInMemory_1 = require("../inMemory/MySegmentsCacheInMemory");
-var SplitsCacheInMemory_1 = require("../inMemory/SplitsCacheInMemory");
 var browser_1 = require("../../utils/constants/browser");
 var InMemoryStorageCS_1 = require("../inMemory/InMemoryStorageCS");
 var constants_1 = require("./constants");
@@ -30,7 +28,7 @@ function InLocalStorage(options) {
             params.settings.log.warn(constants_1.LOG_PREFIX + 'LocalStorage API is unavailable. Falling back to default MEMORY storage');
             return (0, InMemoryStorageCS_1.InMemoryStorageCSFactory)(params);
         }
-        var settings = params.settings, _a = params.settings, log = _a.log, _b = _a.scheduler, impressionsQueueSize = _b.impressionsQueueSize, eventsQueueSize = _b.eventsQueueSize, _c = _a.sync, impressionsMode = _c.impressionsMode, __splitFiltersValidation = _c.__splitFiltersValidation;
+        var settings = params.settings, _a = params.settings, log = _a.log, _b = _a.scheduler, impressionsQueueSize = _b.impressionsQueueSize, eventsQueueSize = _b.eventsQueueSize, impressionsMode = _a.sync.impressionsMode;
         var matchingKey = (0, key_1.getMatching)(settings.core.key);
         var keys = new KeyBuilderCS_1.KeyBuilderCS(prefix, matchingKey);
         var expirationTimestamp = Date.now() - browser_1.DEFAULT_CACHE_EXPIRATION_IN_MILLIS;
@@ -46,16 +44,7 @@ function InLocalStorage(options) {
             events: new EventsCacheInMemory_1.EventsCacheInMemory(eventsQueueSize),
             telemetry: (0, TelemetryCacheInMemory_1.shouldRecordTelemetry)(params) ? new TelemetryCacheInMemory_1.TelemetryCacheInMemory(splits, segments) : undefined,
             uniqueKeys: impressionsMode === constants_2.NONE ? new UniqueKeysCacheInMemoryCS_1.UniqueKeysCacheInMemoryCS() : undefined,
-            destroy: function () {
-                var _a;
-                this.splits = new SplitsCacheInMemory_1.SplitsCacheInMemory(__splitFiltersValidation);
-                this.segments = new MySegmentsCacheInMemory_1.MySegmentsCacheInMemory();
-                this.largeSegments = new MySegmentsCacheInMemory_1.MySegmentsCacheInMemory();
-                this.impressions.clear();
-                this.impressionCounts && this.impressionCounts.clear();
-                this.events.clear();
-                (_a = this.uniqueKeys) === null || _a === void 0 ? void 0 : _a.clear();
-            },
+            destroy: function () { },
             // When using shared instantiation with MEMORY we reuse everything but segments (they are customer per key).
             shared: function (matchingKey) {
                 return {
@@ -66,11 +55,7 @@ function InLocalStorage(options) {
                     impressionCounts: this.impressionCounts,
                     events: this.events,
                     telemetry: this.telemetry,
-                    destroy: function () {
-                        this.splits = new SplitsCacheInMemory_1.SplitsCacheInMemory(__splitFiltersValidation);
-                        this.segments = new MySegmentsCacheInMemory_1.MySegmentsCacheInMemory();
-                        this.largeSegments = new MySegmentsCacheInMemory_1.MySegmentsCacheInMemory();
-                    }
+                    destroy: function () { }
                 };
             },
         };

package/cjs/storages/inMemory/InMemoryStorage.js

@@ -26,15 +26,7 @@ function InMemoryStorageFactory(params) {
         events: new EventsCacheInMemory_1.EventsCacheInMemory(eventsQueueSize),
         telemetry: (0, TelemetryCacheInMemory_1.shouldRecordTelemetry)(params) ? new TelemetryCacheInMemory_1.TelemetryCacheInMemory(splits, segments) : undefined,
         uniqueKeys: impressionsMode === constants_1.NONE ? new UniqueKeysCacheInMemory_1.UniqueKeysCacheInMemory() : undefined,
-        // When using MEMORY we should clean all the caches to leave them empty
-        destroy: function () {
-            this.splits.clear();
-            this.segments.clear();
-            this.impressions.clear();
-            this.impressionCounts && this.impressionCounts.clear();
-            this.events.clear();
-            this.uniqueKeys && this.uniqueKeys.clear();
-        }
+        destroy: function () { }
     };
     // @TODO revisit storage logic in localhost mode
     // No tracking data in localhost mode to avoid memory leaks

package/cjs/storages/inMemory/InMemoryStorageCS.js

@@ -28,16 +28,7 @@ function InMemoryStorageCSFactory(params) {
         events: new EventsCacheInMemory_1.EventsCacheInMemory(eventsQueueSize),
         telemetry: (0, TelemetryCacheInMemory_1.shouldRecordTelemetry)(params) ? new TelemetryCacheInMemory_1.TelemetryCacheInMemory(splits, segments) : undefined,
         uniqueKeys: impressionsMode === constants_1.NONE ? new UniqueKeysCacheInMemoryCS_1.UniqueKeysCacheInMemoryCS() : undefined,
-        // When using MEMORY we should clean all the caches to leave them empty
-        destroy: function () {
-            this.splits.clear();
-            this.segments.clear();
-            this.largeSegments.clear();
-            this.impressions.clear();
-            this.impressionCounts && this.impressionCounts.clear();
-            this.events.clear();
-            this.uniqueKeys && this.uniqueKeys.clear();
-        },
+        destroy: function () { },
         // When using shared instantiation with MEMORY we reuse everything but segments (they are unique per key)
         shared: function () {
             return {
@@ -48,12 +39,7 @@ function InMemoryStorageCSFactory(params) {
                 impressionCounts: this.impressionCounts,
                 events: this.events,
                 telemetry: this.telemetry,
-                // Set a new splits cache to clean it for the client without affecting other clients
-                destroy: function () {
-                    this.splits = new SplitsCacheInMemory_1.SplitsCacheInMemory(__splitFiltersValidation);
-                    this.segments.clear();
-                    this.largeSegments.clear();
-                }
+                destroy: function () { }
             };
         },
     };

package/cjs/storages/inRedis/SplitsCacheInRedis.js

@@ -18,7 +18,7 @@ function processPipelineAnswer(results) {
 }
 /**
  * ISplitsCacheAsync implementation that stores split definitions in Redis.
- * Supported by Node.
+ * Supported by Node.js
  */
 var SplitsCacheInRedis = /** @class */ (function (_super) {
     (0, tslib_1.__extends)(SplitsCacheInRedis, _super);

package/cjs/storages/inRedis/index.js

@@ -13,7 +13,7 @@ var UniqueKeysCacheInRedis_1 = require("./UniqueKeysCacheInRedis");
 var ImpressionCountsCacheInRedis_1 = require("./ImpressionCountsCacheInRedis");
 var utils_1 = require("../utils");
 /**
- * InRedis storage factory for consumer server-side SplitFactory, that uses `Ioredis` Redis client for Node.
+ * InRedis storage factory for consumer server-side SplitFactory, that uses `Ioredis` Redis client for Node.js
  * @see {@link https://www.npmjs.com/package/ioredis}
  */
 function InRedisStorage(options) {

package/cjs/sync/syncTask.js

@@ -69,8 +69,8 @@ function syncTaskFactory(log, task, period, taskName) {
             }
         },
         stop: function () {
-            running = false;
-            if (timeoutID) {
+            if (running) {
+                running = false;
                 log.debug(constants_1.SYNC_TASK_STOP, [taskName]);
                 clearTimeout(timeoutID);
                 timeoutID = undefined;

package/cjs/utils/settingsValidation/index.js

@@ -58,7 +58,7 @@ exports.base = {
     storage: undefined,
     // Defines if the logs are enabled, SDK wide.
     debug: undefined,
-    // Defines the impression listener, but will only be used on NodeJS.
+    // Defines the impression listener.
     impressionListener: undefined,
     // Instance version.
     version: undefined,

package/esm/listeners/node.js

@@ -12,7 +12,7 @@ var EVENT_NAME = 'for SIGTERM signal.';
 var NodeSignalListener = /** @class */ (function () {
     function NodeSignalListener(syncManager, // private handler: () => MaybeThenable<void>,
     settings) {
-        // @TODO review handler logic when implementing Node SDK
+        // @TODO review handler logic when implementing Node.js SDK
         this.handler = function () {
             if (syncManager) {
                 // syncManager.stop();

package/esm/readiness/readinessManager.js

@@ -25,7 +25,7 @@ function segmentsEventEmitterFactory(EventEmitter) {
 /**
  * Factory of readiness manager, which handles the ready / update event propagation.
  */
-export function readinessManagerFactory(EventEmitter, settings, splits) {
+export function readinessManagerFactory(EventEmitter, settings, splits, isShared) {
     if (splits === void 0) { splits = splitsEventEmitterFactory(EventEmitter); }
     var readyTimeout = settings.startup.readyTimeout;
     var segments = segmentsEventEmitterFactory(EventEmitter);
@@ -51,22 +51,24 @@ export function readinessManagerFactory(EventEmitter, settings, splits) {
         syncLastUpdate();
         gate.emit(SDK_READY_TIMED_OUT, 'Split SDK emitted SDK_READY_TIMED_OUT event.');
     }
-    var readyTimeoutId;
-    if (readyTimeout > 0) {
-        if (splits.hasInit)
-            readyTimeoutId = setTimeout(timeout, readyTimeout);
-        else
-            splits.initCallbacks.push(function () { readyTimeoutId = setTimeout(timeout, readyTimeout); });
-    }
     // emit SDK_READY and SDK_UPDATE
     var isReady = false;
     splits.on(SDK_SPLITS_ARRIVED, checkIsReadyOrUpdate);
     segments.on(SDK_SEGMENTS_ARRIVED, checkIsReadyOrUpdate);
     var isDestroyed = false;
+    var readyTimeoutId;
+    function __init() {
+        isDestroyed = false;
+        if (readyTimeout > 0 && !isReady)
+            readyTimeoutId = setTimeout(timeout, readyTimeout);
+    }
+    splits.initCallbacks.push(__init);
+    if (splits.hasInit)
+        __init();
     function checkIsReadyFromCache() {
         isReadyFromCache = true;
         // Don't emit SDK_READY_FROM_CACHE if SDK_READY has been emitted
-        if (!isReady) {
+        if (!isReady && !isDestroyed) {
             try {
                 syncLastUpdate();
                 gate.emit(SDK_READY_FROM_CACHE);
@@ -78,6 +80,8 @@ export function readinessManagerFactory(EventEmitter, settings, splits) {
         }
     }
     function checkIsReadyOrUpdate(diff) {
+        if (isDestroyed)
+            return;
         if (isReady) {
             try {
                 syncLastUpdate();
@@ -103,14 +107,12 @@ export function readinessManagerFactory(EventEmitter, settings, splits) {
             }
         }
     }
-    var refCount = 1;
     return {
         splits: splits,
         segments: segments,
         gate: gate,
         shared: function () {
-            refCount++;
-            return readinessManagerFactory(EventEmitter, settings, splits);
+            return readinessManagerFactory(EventEmitter, settings, splits, true);
         },
         // @TODO review/remove next methods when non-recoverable errors are reworked
         // Called on consumer mode, when storage fails to connect
@@ -127,13 +129,9 @@ export function readinessManagerFactory(EventEmitter, settings, splits) {
         destroy: function () {
             isDestroyed = true;
             syncLastUpdate();
-            segments.removeAllListeners();
-            gate.removeAllListeners();
             clearTimeout(readyTimeoutId);
-            if (refCount > 0)
-                refCount--;
-            if (refCount === 0)
-                splits.removeAllListeners();
+            if (!isShared)
+                splits.hasInit = false;
         },
         isReady: function () { return isReady; },
         isReadyFromCache: function () { return isReadyFromCache; },

package/esm/sdkClient/sdkClient.js

@@ -42,19 +42,16 @@ export function sdkClientFactory(params, isSharedClient) {
         destroy: function () {
             // Mark the SDK as destroyed immediately
             sdkReadinessManager.readinessManager.destroy();
-            // For main client, release the SDK Key and record stat before flushing data
+            // For main client, cleanup the SDK Key, listeners and scheduled jobs, and record stat before flushing data
             if (!isSharedClient) {
                 releaseApiKey(settings.core.authorizationKey);
                 telemetryTracker.sessionLength();
+                signalListener && signalListener.stop();
+                uniqueKeysTracker && uniqueKeysTracker.stop();
             }
             // Stop background jobs
             syncManager && syncManager.stop();
             return __flush().then(function () {
-                // For main client, cleanup event listeners and scheduled jobs
-                if (!isSharedClient) {
-                    signalListener && signalListener.stop();
-                    uniqueKeysTracker && uniqueKeysTracker.stop();
-                }
                 // Cleanup storage
                 return storage.destroy();
             });

package/esm/sdkFactory/index.js

@@ -99,6 +99,7 @@ export function sdkFactory(params) {
         Logger: createLoggerAPI(log),
         settings: settings,
         destroy: function () {
+            hasInit = false;
             return Promise.all(Object.keys(clients).map(function (key) { return clients[key].destroy(); })).then(function () { });
         }
     }, extraProps && extraProps(ctx), lazyInit ? { init: init } : init());

package/esm/storages/inLocalStorage/index.js

@@ -6,8 +6,6 @@ import { KeyBuilderCS, myLargeSegmentsKeyBuilder } from '../KeyBuilderCS';
 import { isLocalStorageAvailable } from '../../utils/env/isLocalStorageAvailable';
 import { SplitsCacheInLocal } from './SplitsCacheInLocal';
 import { MySegmentsCacheInLocal } from './MySegmentsCacheInLocal';
-import { MySegmentsCacheInMemory } from '../inMemory/MySegmentsCacheInMemory';
-import { SplitsCacheInMemory } from '../inMemory/SplitsCacheInMemory';
 import { DEFAULT_CACHE_EXPIRATION_IN_MILLIS } from '../../utils/constants/browser';
 import { InMemoryStorageCSFactory } from '../inMemory/InMemoryStorageCS';
 import { LOG_PREFIX } from './constants';
@@ -27,7 +25,7 @@ export function InLocalStorage(options) {
             params.settings.log.warn(LOG_PREFIX + 'LocalStorage API is unavailable. Falling back to default MEMORY storage');
             return InMemoryStorageCSFactory(params);
         }
-        var settings = params.settings, _a = params.settings, log = _a.log, _b = _a.scheduler, impressionsQueueSize = _b.impressionsQueueSize, eventsQueueSize = _b.eventsQueueSize, _c = _a.sync, impressionsMode = _c.impressionsMode, __splitFiltersValidation = _c.__splitFiltersValidation;
+        var settings = params.settings, _a = params.settings, log = _a.log, _b = _a.scheduler, impressionsQueueSize = _b.impressionsQueueSize, eventsQueueSize = _b.eventsQueueSize, impressionsMode = _a.sync.impressionsMode;
         var matchingKey = getMatching(settings.core.key);
         var keys = new KeyBuilderCS(prefix, matchingKey);
         var expirationTimestamp = Date.now() - DEFAULT_CACHE_EXPIRATION_IN_MILLIS;
@@ -43,16 +41,7 @@ export function InLocalStorage(options) {
             events: new EventsCacheInMemory(eventsQueueSize),
             telemetry: shouldRecordTelemetry(params) ? new TelemetryCacheInMemory(splits, segments) : undefined,
             uniqueKeys: impressionsMode === NONE ? new UniqueKeysCacheInMemoryCS() : undefined,
-            destroy: function () {
-                var _a;
-                this.splits = new SplitsCacheInMemory(__splitFiltersValidation);
-                this.segments = new MySegmentsCacheInMemory();
-                this.largeSegments = new MySegmentsCacheInMemory();
-                this.impressions.clear();
-                this.impressionCounts && this.impressionCounts.clear();
-                this.events.clear();
-                (_a = this.uniqueKeys) === null || _a === void 0 ? void 0 : _a.clear();
-            },
+            destroy: function () { },
             // When using shared instantiation with MEMORY we reuse everything but segments (they are customer per key).
             shared: function (matchingKey) {
                 return {
@@ -63,11 +52,7 @@ export function InLocalStorage(options) {
                     impressionCounts: this.impressionCounts,
                     events: this.events,
                     telemetry: this.telemetry,
-                    destroy: function () {
-                        this.splits = new SplitsCacheInMemory(__splitFiltersValidation);
-                        this.segments = new MySegmentsCacheInMemory();
-                        this.largeSegments = new MySegmentsCacheInMemory();
-                    }
+                    destroy: function () { }
                 };
             },
         };

package/esm/storages/inMemory/InMemoryStorage.js

@@ -23,15 +23,7 @@ export function InMemoryStorageFactory(params) {
         events: new EventsCacheInMemory(eventsQueueSize),
         telemetry: shouldRecordTelemetry(params) ? new TelemetryCacheInMemory(splits, segments) : undefined,
         uniqueKeys: impressionsMode === NONE ? new UniqueKeysCacheInMemory() : undefined,
-        // When using MEMORY we should clean all the caches to leave them empty
-        destroy: function () {
-            this.splits.clear();
-            this.segments.clear();
-            this.impressions.clear();
-            this.impressionCounts && this.impressionCounts.clear();
-            this.events.clear();
-            this.uniqueKeys && this.uniqueKeys.clear();
-        }
+        destroy: function () { }
     };
     // @TODO revisit storage logic in localhost mode
     // No tracking data in localhost mode to avoid memory leaks

package/esm/storages/inMemory/InMemoryStorageCS.js

@@ -25,16 +25,7 @@ export function InMemoryStorageCSFactory(params) {
         events: new EventsCacheInMemory(eventsQueueSize),
         telemetry: shouldRecordTelemetry(params) ? new TelemetryCacheInMemory(splits, segments) : undefined,
         uniqueKeys: impressionsMode === NONE ? new UniqueKeysCacheInMemoryCS() : undefined,
-        // When using MEMORY we should clean all the caches to leave them empty
-        destroy: function () {
-            this.splits.clear();
-            this.segments.clear();
-            this.largeSegments.clear();
-            this.impressions.clear();
-            this.impressionCounts && this.impressionCounts.clear();
-            this.events.clear();
-            this.uniqueKeys && this.uniqueKeys.clear();
-        },
+        destroy: function () { },
         // When using shared instantiation with MEMORY we reuse everything but segments (they are unique per key)
         shared: function () {
             return {
@@ -45,12 +36,7 @@ export function InMemoryStorageCSFactory(params) {
                 impressionCounts: this.impressionCounts,
                 events: this.events,
                 telemetry: this.telemetry,
-                // Set a new splits cache to clean it for the client without affecting other clients
-                destroy: function () {
-                    this.splits = new SplitsCacheInMemory(__splitFiltersValidation);
-                    this.segments.clear();
-                    this.largeSegments.clear();
-                }
+                destroy: function () { }
             };
         },
     };

package/esm/storages/inRedis/SplitsCacheInRedis.js

@@ -15,7 +15,7 @@ function processPipelineAnswer(results) {
 }
 /**
  * ISplitsCacheAsync implementation that stores split definitions in Redis.
- * Supported by Node.
+ * Supported by Node.js
  */
 var SplitsCacheInRedis = /** @class */ (function (_super) {
     __extends(SplitsCacheInRedis, _super);

package/esm/storages/inRedis/index.js

@@ -10,7 +10,7 @@ import { UniqueKeysCacheInRedis } from './UniqueKeysCacheInRedis';
 import { ImpressionCountsCacheInRedis } from './ImpressionCountsCacheInRedis';
 import { metadataBuilder } from '../utils';
 /**
- * InRedis storage factory for consumer server-side SplitFactory, that uses `Ioredis` Redis client for Node.
+ * InRedis storage factory for consumer server-side SplitFactory, that uses `Ioredis` Redis client for Node.js
  * @see {@link https://www.npmjs.com/package/ioredis}
  */
 export function InRedisStorage(options) {

package/esm/sync/syncTask.js

@@ -66,8 +66,8 @@ export function syncTaskFactory(log, task, period, taskName) {
             }
         },
         stop: function () {
-            running = false;
-            if (timeoutID) {
+            if (running) {
+                running = false;
                 log.debug(SYNC_TASK_STOP, [taskName]);
                 clearTimeout(timeoutID);
                 timeoutID = undefined;

package/esm/utils/settingsValidation/index.js

@@ -55,7 +55,7 @@ export var base = {
     storage: undefined,
     // Defines if the logs are enabled, SDK wide.
     debug: undefined,
-    // Defines the impression listener, but will only be used on NodeJS.
+    // Defines the impression listener.
     impressionListener: undefined,
     // Instance version.
     version: undefined,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@splitsoftware/splitio-commons",
-  "version": "2.0.0",
+  "version": "2.0.1-rc.0",
   "description": "Split JavaScript SDK common components",
   "main": "cjs/index.js",
   "module": "esm/index.js",

package/src/listeners/node.ts

@@ -1,4 +1,4 @@
-// @TODO eventually migrate to JS-Node-SDK package.
+// @TODO eventually migrate to Node.js SDK package.
 import { ISignalListener } from './types';
 import { thenable } from '../utils/promise/thenable';
 import { MaybeThenable } from '../dtos/types';
@@ -25,7 +25,7 @@ export class NodeSignalListener implements ISignalListener {
     syncManager: ISyncManager | undefined, // private handler: () => MaybeThenable<void>,
     settings: ISettings
   ) {
-    // @TODO review handler logic when implementing Node SDK
+    // @TODO review handler logic when implementing Node.js SDK
     this.handler = function () {
       if (syncManager) {
         // syncManager.stop();

package/src/readiness/readinessManager.ts

@@ -37,7 +37,9 @@ function segmentsEventEmitterFactory(EventEmitter: new () => SplitIO.IEventEmitt
 export function readinessManagerFactory(
   EventEmitter: new () => SplitIO.IEventEmitter,
   settings: ISettings,
-  splits: ISplitsEventEmitter = splitsEventEmitterFactory(EventEmitter)): IReadinessManager {
+  splits: ISplitsEventEmitter = splitsEventEmitterFactory(EventEmitter),
+  isShared?: boolean
+): IReadinessManager {
 
   const readyTimeout = settings.startup.readyTimeout;
 
@@ -66,11 +68,6 @@ export function readinessManagerFactory(
     gate.emit(SDK_READY_TIMED_OUT, 'Split SDK emitted SDK_READY_TIMED_OUT event.');
   }
 
-  let readyTimeoutId: ReturnType<typeof setTimeout>;
-  if (readyTimeout > 0) {
-    if (splits.hasInit) readyTimeoutId = setTimeout(timeout, readyTimeout);
-    else splits.initCallbacks.push(() => { readyTimeoutId = setTimeout(timeout, readyTimeout); });
-  }
 
   // emit SDK_READY and SDK_UPDATE
   let isReady = false;
@@ -78,11 +75,19 @@ export function readinessManagerFactory(
   segments.on(SDK_SEGMENTS_ARRIVED, checkIsReadyOrUpdate);
 
   let isDestroyed = false;
+  let readyTimeoutId: ReturnType<typeof setTimeout>;
+  function __init() {
+    isDestroyed = false;
+    if (readyTimeout > 0 && !isReady) readyTimeoutId = setTimeout(timeout, readyTimeout);
+  }
+
+  splits.initCallbacks.push(__init);
+  if (splits.hasInit) __init();
 
   function checkIsReadyFromCache() {
     isReadyFromCache = true;
     // Don't emit SDK_READY_FROM_CACHE if SDK_READY has been emitted
-    if (!isReady) {
+    if (!isReady && !isDestroyed) {
       try {
         syncLastUpdate();
         gate.emit(SDK_READY_FROM_CACHE);
@@ -94,6 +99,7 @@ export function readinessManagerFactory(
   }
 
   function checkIsReadyOrUpdate(diff: any) {
+    if (isDestroyed) return;
     if (isReady) {
       try {
         syncLastUpdate();
@@ -117,16 +123,13 @@ export function readinessManagerFactory(
     }
   }
 
-  let refCount = 1;
-
   return {
     splits,
     segments,
     gate,
 
     shared() {
-      refCount++;
-      return readinessManagerFactory(EventEmitter, settings, splits);
+      return readinessManagerFactory(EventEmitter, settings, splits, true);
     },
 
     // @TODO review/remove next methods when non-recoverable errors are reworked
@@ -145,13 +148,9 @@ export function readinessManagerFactory(
     destroy() {
       isDestroyed = true;
       syncLastUpdate();
-
-      segments.removeAllListeners();
-      gate.removeAllListeners();
       clearTimeout(readyTimeoutId);
 
-      if (refCount > 0) refCount--;
-      if (refCount === 0) splits.removeAllListeners();
+      if (!isShared) splits.hasInit = false;
     },
 
     isReady() { return isReady; },

package/src/sdkClient/sdkClient.ts

@@ -56,22 +56,18 @@ export function sdkClientFactory(params: ISdkFactoryContext, isSharedClient?: bo
         // Mark the SDK as destroyed immediately
         sdkReadinessManager.readinessManager.destroy();
 
-        // For main client, release the SDK Key and record stat before flushing data
+        // For main client, cleanup the SDK Key, listeners and scheduled jobs, and record stat before flushing data
         if (!isSharedClient) {
           releaseApiKey(settings.core.authorizationKey);
           telemetryTracker.sessionLength();
+          signalListener && signalListener.stop();
+          uniqueKeysTracker && uniqueKeysTracker.stop();
         }
 
         // Stop background jobs
         syncManager && syncManager.stop();
 
         return __flush().then(() => {
-          // For main client, cleanup event listeners and scheduled jobs
-          if (!isSharedClient) {
-            signalListener && signalListener.stop();
-            uniqueKeysTracker && uniqueKeysTracker.stop();
-          }
-
           // Cleanup storage
           return storage.destroy();
         });

package/src/sdkFactory/index.ts

@@ -126,6 +126,7 @@ export function sdkFactory(params: ISdkFactoryParams): SplitIO.ISDK | SplitIO.IA
     settings,
 
     destroy() {
+      hasInit = false;
       return Promise.all(Object.keys(clients).map(key => clients[key].destroy())).then(() => { });
     }
   }, extraProps && extraProps(ctx), lazyInit ? { init } : init());

package/src/sdkFactory/types.ts

@@ -28,7 +28,7 @@ export interface IPlatform {
    */
   getEventSource?: (settings: ISettings) => (IEventSourceConstructor | undefined)
   /**
-   * EventEmitter constructor, like NodeJS.EventEmitter or a polyfill.
+   * EventEmitter constructor, like Node.js EventEmitter or a polyfill.
    */
   EventEmitter: new () => SplitIO.IEventEmitter,
   /**
@@ -104,7 +104,7 @@ export interface ISdkFactoryParams {
   filterAdapterFactory?: () => IFilterAdapter
 
   // Optional signal listener constructor. Used to handle special app states, like shutdown, app paused or resumed.
-  // Pass only if `syncManager` (used by Node listener) and `splitApi` (used by Browser listener) are passed.
+  // Pass only if `syncManager` (used by NodeSignalListener) and `splitApi` (used by Browser listener) are passed.
   SignalListener?: new (
     syncManager: ISyncManager | undefined, // Used by NodeSignalListener to flush data, and by BrowserSignalListener to close streaming connection.
     settings: ISettings, // Used by BrowserSignalListener

package/src/storages/inLocalStorage/index.ts

@@ -7,8 +7,6 @@ import { KeyBuilderCS, myLargeSegmentsKeyBuilder } from '../KeyBuilderCS';
 import { isLocalStorageAvailable } from '../../utils/env/isLocalStorageAvailable';
 import { SplitsCacheInLocal } from './SplitsCacheInLocal';
 import { MySegmentsCacheInLocal } from './MySegmentsCacheInLocal';
-import { MySegmentsCacheInMemory } from '../inMemory/MySegmentsCacheInMemory';
-import { SplitsCacheInMemory } from '../inMemory/SplitsCacheInMemory';
 import { DEFAULT_CACHE_EXPIRATION_IN_MILLIS } from '../../utils/constants/browser';
 import { InMemoryStorageCSFactory } from '../inMemory/InMemoryStorageCS';
 import { LOG_PREFIX } from './constants';
@@ -36,7 +34,7 @@ export function InLocalStorage(options: InLocalStorageOptions = {}): IStorageSyn
       return InMemoryStorageCSFactory(params);
     }
 
-    const { settings, settings: { log, scheduler: { impressionsQueueSize, eventsQueueSize, }, sync: { impressionsMode, __splitFiltersValidation } } } = params;
+    const { settings, settings: { log, scheduler: { impressionsQueueSize, eventsQueueSize, }, sync: { impressionsMode } } } = params;
     const matchingKey = getMatching(settings.core.key);
     const keys = new KeyBuilderCS(prefix, matchingKey);
     const expirationTimestamp = Date.now() - DEFAULT_CACHE_EXPIRATION_IN_MILLIS;
@@ -55,15 +53,7 @@ export function InLocalStorage(options: InLocalStorageOptions = {}): IStorageSyn
       telemetry: shouldRecordTelemetry(params) ? new TelemetryCacheInMemory(splits, segments) : undefined,
       uniqueKeys: impressionsMode === NONE ? new UniqueKeysCacheInMemoryCS() : undefined,
 
-      destroy() {
-        this.splits = new SplitsCacheInMemory(__splitFiltersValidation);
-        this.segments = new MySegmentsCacheInMemory();
-        this.largeSegments = new MySegmentsCacheInMemory();
-        this.impressions.clear();
-        this.impressionCounts && this.impressionCounts.clear();
-        this.events.clear();
-        this.uniqueKeys?.clear();
-      },
+      destroy() { },
 
       // When using shared instantiation with MEMORY we reuse everything but segments (they are customer per key).
       shared(matchingKey: string) {
@@ -77,11 +67,7 @@ export function InLocalStorage(options: InLocalStorageOptions = {}): IStorageSyn
           events: this.events,
           telemetry: this.telemetry,
 
-          destroy() {
-            this.splits = new SplitsCacheInMemory(__splitFiltersValidation);
-            this.segments = new MySegmentsCacheInMemory();
-            this.largeSegments = new MySegmentsCacheInMemory();
-          }
+          destroy() { }
         };
       },
     };

package/src/storages/inMemory/InMemoryStorage.ts

@@ -28,15 +28,7 @@ export function InMemoryStorageFactory(params: IStorageFactoryParams): IStorageS
     telemetry: shouldRecordTelemetry(params) ? new TelemetryCacheInMemory(splits, segments) : undefined,
     uniqueKeys: impressionsMode === NONE ? new UniqueKeysCacheInMemory() : undefined,
 
-    // When using MEMORY we should clean all the caches to leave them empty
-    destroy() {
-      this.splits.clear();
-      this.segments.clear();
-      this.impressions.clear();
-      this.impressionCounts && this.impressionCounts.clear();
-      this.events.clear();
-      this.uniqueKeys && this.uniqueKeys.clear();
-    }
+    destroy() { }
   };
 
   // @TODO revisit storage logic in localhost mode

package/src/storages/inMemory/InMemoryStorageCS.ts

@@ -30,16 +30,7 @@ export function InMemoryStorageCSFactory(params: IStorageFactoryParams): IStorag
     telemetry: shouldRecordTelemetry(params) ? new TelemetryCacheInMemory(splits, segments) : undefined,
     uniqueKeys: impressionsMode === NONE ? new UniqueKeysCacheInMemoryCS() : undefined,
 
-    // When using MEMORY we should clean all the caches to leave them empty
-    destroy() {
-      this.splits.clear();
-      this.segments.clear();
-      this.largeSegments.clear();
-      this.impressions.clear();
-      this.impressionCounts && this.impressionCounts.clear();
-      this.events.clear();
-      this.uniqueKeys && this.uniqueKeys.clear();
-    },
+    destroy() { },
 
     // When using shared instantiation with MEMORY we reuse everything but segments (they are unique per key)
     shared() {
@@ -52,12 +43,7 @@ export function InMemoryStorageCSFactory(params: IStorageFactoryParams): IStorag
         events: this.events,
         telemetry: this.telemetry,
 
-        // Set a new splits cache to clean it for the client without affecting other clients
-        destroy() {
-          this.splits = new SplitsCacheInMemory(__splitFiltersValidation);
-          this.segments.clear();
-          this.largeSegments.clear();
-        }
+        destroy() { }
       };
     },
   };

package/src/storages/inRedis/SplitsCacheInRedis.ts

@@ -19,7 +19,7 @@ function processPipelineAnswer(results: Array<[Error | null, string]>): string[]
 
 /**
  * ISplitsCacheAsync implementation that stores split definitions in Redis.
- * Supported by Node.
+ * Supported by Node.js
  */
 export class SplitsCacheInRedis extends AbstractSplitsCacheAsync {
 

package/src/storages/inRedis/index.ts

@@ -18,7 +18,7 @@ export interface InRedisStorageOptions {
 }
 
 /**
- * InRedis storage factory for consumer server-side SplitFactory, that uses `Ioredis` Redis client for Node.
+ * InRedis storage factory for consumer server-side SplitFactory, that uses `Ioredis` Redis client for Node.js
  * @see {@link https://www.npmjs.com/package/ioredis}
  */
 export function InRedisStorage(options: InRedisStorageOptions = {}): IStorageAsyncFactory {

package/src/sync/syncTask.ts

@@ -68,8 +68,8 @@ export function syncTaskFactory<Input extends any[], Output = any>(log: ILogger,
     },
 
     stop() {
-      running = false;
-      if (timeoutID) {
+      if (running) {
+        running = false;
         log.debug(SYNC_TASK_STOP, [taskName]);
         clearTimeout(timeoutID);
         timeoutID = undefined;

package/src/utils/settingsValidation/index.ts

@@ -64,7 +64,7 @@ export const base = {
   // Defines if the logs are enabled, SDK wide.
   debug: undefined,
 
-  // Defines the impression listener, but will only be used on NodeJS.
+  // Defines the impression listener.
   impressionListener: undefined,
 
   // Instance version.

package/src/utils/settingsValidation/types.ts

@@ -2,7 +2,7 @@ import { ISettings } from '../../types';
 
 /**
  * Parameters used to specialize the settings validation for each API variant
- * (client-side, server-side) and environment (Node server, Browser, etc)
+ * (client-side, server-side) and environment (Node.js, Browser, etc)
  */
 export interface ISettingsValidationParams {
   /**

package/types/splitio.d.ts

@@ -164,7 +164,7 @@ interface INonPluggableSharedSettings {
  */
 interface IServerSideSharedSettings {
   /**
-   * SDK Core settings for NodeJS.
+   * SDK Core settings for Node.js.
    */
   core: {
     /**
@@ -187,7 +187,7 @@ interface IServerSideSharedSettings {
     IPAddressesEnabled?: boolean;
   };
   /**
-   * SDK Startup settings for NodeJS.
+   * SDK Startup settings for Node.js.
    */
   startup?: {
     /**
@@ -450,7 +450,7 @@ interface IClientSideSyncSharedSettings extends IClientSideSharedSettings, ISync
 declare namespace SplitIO {
 
   /**
-   * EventEmitter interface based on a subset of the NodeJS.EventEmitter methods.
+   * EventEmitter interface based on a subset of the Node.js EventEmitter methods.
    */
   interface IEventEmitter {
     addListener(event: string, listener: (...args: any[]) => void): this;
@@ -462,7 +462,7 @@ declare namespace SplitIO {
     emit(event: string, ...args: any[]): boolean;
   }
   /**
-   * NodeJS.EventEmitter interface
+   * Node.js EventEmitter interface
    * @see {@link https://nodejs.org/api/events.html}
    */
   interface EventEmitter extends IEventEmitter {
@@ -478,7 +478,7 @@ declare namespace SplitIO {
     listeners(event: string | symbol): Function[];
     rawListeners(event: string | symbol): Function[];
     listenerCount(type: string | symbol): number;
-    // Added in Node 6...
+    // Added in Node.js 6...
     prependListener(event: string | symbol, listener: (...args: any[]) => void): this;
     prependOnceListener(event: string | symbol, listener: (...args: any[]) => void): this;
     eventNames(): Array<string | symbol>;
@@ -557,7 +557,7 @@ declare namespace SplitIO {
     readonly debug: boolean | LogLevel | ILogger;
     readonly version: string;
     /**
-     * Mocked features map if using in client-side, or mocked features file path string if using in server-side (NodeJS).
+     * Mocked features map if using in client-side, or mocked features file path string if using in server-side (Node.js).
      */
     features: MockedFeaturesMap | MockedFeaturesFilePath;
     readonly streamingEnabled: boolean;
@@ -576,7 +576,7 @@ declare namespace SplitIO {
     };
     readonly impressionListener?: IImpressionListener;
     /**
-     * User consent status if using in client-side. Undefined if using in server-side (NodeJS).
+     * User consent status if using in client-side. Undefined if using in server-side (Node.js).
      */
     readonly userConsent?: ConsentStatus;
   }
@@ -936,11 +936,11 @@ declare namespace SplitIO {
     wrapper: Object;
   }
   /**
-   * Synchronous storage valid types for NodeJS.
+   * Synchronous storage valid types for Node.js.
    */
   type NodeSyncStorage = 'MEMORY';
   /**
-   * Asynchronous storages valid types for NodeJS.
+   * Asynchronous storages valid types for Node.js.
    */
   type NodeAsyncStorage = 'REDIS';
   /**
@@ -1237,14 +1237,14 @@ declare namespace SplitIO {
     };
   }
   /**
-   * Settings interface for JavaScript SDK instances created on NodeJS, with server-side API and synchronous in-memory storage.
+   * Settings interface for JavaScript SDK instances created on Node.js, with server-side API and synchronous in-memory storage.
    * If your storage is asynchronous (Redis for example) use SplitIO.INodeAsyncSettings instead.
    *
    * @see {@link https://help.split.io/hc/en-us/articles/360020564931-Node-js-SDK#configuration}
    */
   interface INodeSettings extends IServerSideSharedSettings, ISyncSharedSettings, INonPluggableSharedSettings {
     /**
-     * Defines which kind of storage we can instantiate on NodeJS for 'standalone' mode.
+     * Defines which kind of storage we can instantiate on Node.js for 'standalone' mode.
      * The only possible storage type is 'MEMORY', which is the default.
      */
     storage?: {
@@ -1263,7 +1263,7 @@ declare namespace SplitIO {
     };
     sync?: ISyncSharedSettings['sync'] & {
       /**
-       * Custom options object for HTTP(S) requests in NodeJS.
+       * Custom options object for HTTP(S) requests in Node.js.
        * If provided, this object is merged with the options object passed by the SDK for EventSource and Node-Fetch calls.
        * @see {@link https://www.npmjs.com/package/node-fetch#options}
        */
@@ -1291,7 +1291,7 @@ declare namespace SplitIO {
          */
         getHeaderOverrides?: (context: { headers: Record<string, string> }) => Record<string, string>;
         /**
-         * Custom NodeJS HTTP(S) Agent used by the SDK for HTTP(S) requests.
+         * Custom Node.js HTTP(S) Agent used by the SDK for HTTP(S) requests.
          *
          * You can use it, for example, for certificate pinning or setting a network proxy:
          *
@@ -1319,7 +1319,7 @@ declare namespace SplitIO {
     };
   }
   /**
-   * Settings interface for JavaScript SDK instances created on NodeJS, with asynchronous storage like Redis.
+   * Settings interface for JavaScript SDK instances created on Node.js, with asynchronous storage like Redis.
    * If your storage is synchronous (by default we use memory, which is sync) use SplitIO.INodeSettings instead.
    *
    * @see {@link https://help.split.io/hc/en-us/articles/360020564931-Node-js-SDK#configuration}
@@ -1332,7 +1332,7 @@ declare namespace SplitIO {
      */
     mode: 'consumer';
     /**
-     * Defines which kind of async storage we can instantiate on NodeJS for 'consumer' mode.
+     * Defines which kind of async storage we can instantiate on Node.js for 'consumer' mode.
      * The only possible storage type is 'REDIS'.
      */
     storage: {
@@ -1501,7 +1501,7 @@ declare namespace SplitIO {
   }
   /**
    * This represents the interface for the Client instance on server-side, where the user key is not bound to the instance and must be provided on each method call.
-   * This interface is available in NodeJS, or when importing the 'server' sub-package of JS SDK (e.g., `import { SplitFactory } from '@splitsoftware/splitio/server'`).
+   * This interface is available in Node.js, or when importing the 'server' sub-package of JS SDK (e.g., `import { SplitFactory } from '@splitsoftware/splitio/server'`).
    */
   interface IClient extends IBasicClient {
     /**
@@ -1592,7 +1592,7 @@ declare namespace SplitIO {
   /**
    * This represents the interface for the Client instance on server-side with asynchronous storage, like REDIS.
    * User key is not bound to the instance and must be provided on each method call, which returns a promise.
-   * This interface is available in NodeJS, or when importing the 'server' sub-package in JS SDK (e.g., `import { SplitFactory } from '@splitsoftware/splitio/server'`).
+   * This interface is available in Node.js, or when importing the 'server' sub-package in JS SDK (e.g., `import { SplitFactory } from '@splitsoftware/splitio/server'`).
    */
   interface IAsyncClient extends IBasicClient {
     /**