@splitsoftware/splitio-commons 1.8.3-rc.2 → 1.8.3-rc.4

package/CHANGES.txt

@@ -1,7 +1,7 @@
-1.8.3 (June 28, 2023)
+1.8.3 (June 29, 2023)
  - Updated some transitive dependencies for vulnerability fixes.
- - Bugfix - The `destroy` method has been updated to immediately flag the SDK client as destroyed, to prevent access to the storage when `getTreatment` and `track` methods are called after the SDK is destroyed.
- - Bugfix - Fixed an issue with SDK_READY_TIMED_OUT event, that was not being emitted immediately when a connection error occurs using pluggable storage in consumer and partial consumer modes.
+ - Updated SDK_READY_TIMED_OUT event to be emitted immediately when a connection error occurs using pluggable storage (i.e., when the wrapper `connect` promise is rejected) in consumer and partial consumer modes.
+ - Bugfix - The `destroy` method has been updated to immediately flag the SDK client as destroyed, to prevent unexpected behaviours when `getTreatment` and `track` methods are called synchronously after `destroy` method is called.
 
 1.8.2 (May 15, 2023)
  - Updated terminology on the SDKs codebase to be more aligned with current standard without causing a breaking change. The core change is the term split for feature flag on things like logs and IntelliSense comments.

package/cjs/readiness/readinessManager.js

@@ -31,7 +31,6 @@ function readinessManagerFactory(EventEmitter, readyTimeout, splits) {
     if (splits === void 0) { splits = splitsEventEmitterFactory(EventEmitter); }
     var segments = segmentsEventEmitterFactory(EventEmitter);
     var gate = new EventEmitter();
-    var isDestroyed = false;
     // emit SDK_READY_FROM_CACHE
     var isReadyFromCache = false;
     if (splits.splitsCacheLoaded)
@@ -40,9 +39,7 @@ function readinessManagerFactory(EventEmitter, readyTimeout, splits) {
         splits.once(constants_1.SDK_SPLITS_CACHE_LOADED, checkIsReadyFromCache);
     // emit SDK_READY_TIMED_OUT
     var hasTimedout = false;
-    function timeout(flagAsDestroyed) {
-        if (flagAsDestroyed)
-            isDestroyed = true;
+    function timeout() {
         if (hasTimedout)
             return;
         hasTimedout = true;
@@ -56,6 +53,7 @@ function readinessManagerFactory(EventEmitter, readyTimeout, splits) {
     var isReady = false;
     splits.on(constants_1.SDK_SPLITS_ARRIVED, checkIsReadyOrUpdate);
     segments.on(constants_1.SDK_SEGMENTS_ARRIVED, checkIsReadyOrUpdate);
+    var isDestroyed = false;
     function checkIsReadyFromCache() {
         isReadyFromCache = true;
         // Don't emit SDK_READY_FROM_CACHE if SDK_READY has been emitted

package/cjs/sdkClient/identity.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseInstanceId = exports.buildInstanceId = void 0;
+function buildInstanceId(key, trafficType) {
+    return (key.matchingKey ? key.matchingKey : key) + "-" + (key.bucketingKey ? key.bucketingKey : key) + "-" + (trafficType ? trafficType : '');
+}
+exports.buildInstanceId = buildInstanceId;
+function parseInstanceId(instanceId) {
+    var _a = instanceId.split('-'), matchingKey = _a[0], bucketingKey = _a[1], trafficType = _a[2];
+    return matchingKey === bucketingKey ?
+        { key: matchingKey, trafficType: trafficType } :
+        { key: { matchingKey: matchingKey, bucketingKey: bucketingKey }, trafficType: trafficType };
+}
+exports.parseInstanceId = parseInstanceId;

package/cjs/sdkClient/sdkClientMethodCS.js

@@ -8,23 +8,19 @@ var sdkClient_1 = require("./sdkClient");
 var objectAssign_1 = require("../utils/lang/objectAssign");
 var constants_1 = require("../logger/constants");
 var constants_2 = require("../readiness/constants");
-function buildInstanceId(key) {
-    // @ts-ignore
-    return (key.matchingKey ? key.matchingKey : key) + "-" + (key.bucketingKey ? key.bucketingKey : key) + "-";
-}
+var identity_1 = require("./identity");
 var method = 'Client instantiation';
 /**
  * Factory of client method for the client-side API variant where TT is ignored and thus
  * clients don't have a binded TT for the track method.
  */
 function sdkClientMethodCSFactory(params) {
-    var storage = params.storage, syncManager = params.syncManager, sdkReadinessManager = params.sdkReadinessManager, _a = params.settings, key = _a.core.key, readyTimeout = _a.startup.readyTimeout, log = _a.log;
+    var clients = params.clients, storage = params.storage, syncManager = params.syncManager, sdkReadinessManager = params.sdkReadinessManager, _a = params.settings, key = _a.core.key, readyTimeout = _a.startup.readyTimeout, log = _a.log;
     var mainClientInstance = (0, clientCS_1.clientCSDecorator)(log, (0, sdkClient_1.sdkClientFactory)(params), key);
     var parsedDefaultKey = (0, key_2.keyParser)(key);
-    var defaultInstanceId = buildInstanceId(parsedDefaultKey);
+    var defaultInstanceId = (0, identity_1.buildInstanceId)(parsedDefaultKey);
     // Cache instances created per factory.
-    var clientInstances = {};
-    clientInstances[defaultInstanceId] = mainClientInstance;
+    clients[defaultInstanceId] = mainClientInstance;
     return function client(key) {
         if (key === undefined) {
             log.debug(constants_1.RETRIEVE_CLIENT_DEFAULT);
@@ -35,13 +31,13 @@ function sdkClientMethodCSFactory(params) {
         if (validKey === false) {
             throw new Error('Shared Client needs a valid key.');
         }
-        var instanceId = buildInstanceId(validKey);
-        if (!clientInstances[instanceId]) {
+        var instanceId = (0, identity_1.buildInstanceId)(validKey);
+        if (!clients[instanceId]) {
             var matchingKey = (0, key_2.getMatching)(validKey);
             var sharedSdkReadiness_1 = sdkReadinessManager.shared(readyTimeout);
             var sharedStorage = storage.shared && storage.shared(matchingKey, function (err) {
                 if (err) {
-                    sharedSdkReadiness_1.readinessManager.timeout(true);
+                    sharedSdkReadiness_1.readinessManager.timeout();
                     return;
                 }
                 // Emit SDK_READY in consumer mode for shared clients
@@ -55,7 +51,7 @@ function sdkClientMethodCSFactory(params) {
             var sharedSyncManager = syncManager && sharedStorage && syncManager.shared(matchingKey, sharedSdkReadiness_1.readinessManager, sharedStorage);
             // As shared clients reuse all the storage information, we don't need to check here if we
             // will use offline or online mode. We should stick with the original decision.
-            clientInstances[instanceId] = (0, clientCS_1.clientCSDecorator)(log, (0, sdkClient_1.sdkClientFactory)((0, objectAssign_1.objectAssign)({}, params, {
+            clients[instanceId] = (0, clientCS_1.clientCSDecorator)(log, (0, sdkClient_1.sdkClientFactory)((0, objectAssign_1.objectAssign)({}, params, {
                 sdkReadinessManager: sharedSdkReadiness_1,
                 storage: sharedStorage || storage,
                 syncManager: sharedSyncManager,
@@ -67,7 +63,7 @@ function sdkClientMethodCSFactory(params) {
         else {
             log.debug(constants_1.RETRIEVE_CLIENT_EXISTING);
         }
-        return clientInstances[instanceId];
+        return clients[instanceId];
     };
 }
 exports.sdkClientMethodCSFactory = sdkClientMethodCSFactory;

package/cjs/sdkClient/sdkClientMethodCSWithTT.js

@@ -9,10 +9,7 @@ var sdkClient_1 = require("./sdkClient");
 var objectAssign_1 = require("../utils/lang/objectAssign");
 var constants_1 = require("../logger/constants");
 var constants_2 = require("../readiness/constants");
-function buildInstanceId(key, trafficType) {
-    // @ts-ignore
-    return (key.matchingKey ? key.matchingKey : key) + "-" + (key.bucketingKey ? key.bucketingKey : key) + "-" + (trafficType !== undefined ? trafficType : '');
-}
+var identity_1 = require("./identity");
 var method = 'Client instantiation';
 /**
  * Factory of client method for the client-side (browser) variant of the Isomorphic JS SDK,
@@ -23,7 +20,7 @@ function sdkClientMethodCSFactory(params) {
     var storage = params.storage, syncManager = params.syncManager, sdkReadinessManager = params.sdkReadinessManager, _a = params.settings, _b = _a.core, key = _b.key, trafficType = _b.trafficType, readyTimeout = _a.startup.readyTimeout, log = _a.log;
     var mainClientInstance = (0, clientCS_1.clientCSDecorator)(log, (0, sdkClient_1.sdkClientFactory)(params), key, trafficType);
     var parsedDefaultKey = (0, key_2.keyParser)(key);
-    var defaultInstanceId = buildInstanceId(parsedDefaultKey, trafficType);
+    var defaultInstanceId = (0, identity_1.buildInstanceId)(parsedDefaultKey, trafficType);
     // Cache instances created per factory.
     var clientInstances = {};
     clientInstances[defaultInstanceId] = mainClientInstance;
@@ -44,13 +41,13 @@ function sdkClientMethodCSFactory(params) {
                 throw new Error('Shared Client needs a valid traffic type or no traffic type at all.');
             }
         }
-        var instanceId = buildInstanceId(validKey, validTrafficType);
+        var instanceId = (0, identity_1.buildInstanceId)(validKey, validTrafficType);
         if (!clientInstances[instanceId]) {
             var matchingKey = (0, key_2.getMatching)(validKey);
             var sharedSdkReadiness_1 = sdkReadinessManager.shared(readyTimeout);
             var sharedStorage = storage.shared && storage.shared(matchingKey, function (err) {
                 if (err) {
-                    sharedSdkReadiness_1.readinessManager.timeout(true);
+                    sharedSdkReadiness_1.readinessManager.timeout();
                     return;
                 }
                 // Emit SDK_READY in consumer mode for shared clients

package/cjs/sdkFactory/index.js

@@ -31,9 +31,8 @@ function sdkFactory(params) {
         settings: settings,
         onReadyCb: function (error) {
             if (error) {
-                // If storage fails to connect (a non-recoverable error), SDK_READY_TIMED_OUT event is emitted and the SDK is flagged
-                // as destroyed to ensure that any subsequent call to `getTreatment` or `track` will not access the storage
-                readiness.timeout(true);
+                // If storage fails to connect, SDK_READY_TIMED_OUT event is emitted immediately. Review when timeout and non-recoverable errors are reworked
+                readiness.timeout();
                 return;
             }
             readiness.splits.emit(constants_2.SDK_SPLITS_ARRIVED);
@@ -41,8 +40,9 @@ function sdkFactory(params) {
         },
     });
     // @TODO add support for dataloader: `if (params.dataLoader) params.dataLoader(storage);`
+    var clients = {};
     var telemetryTracker = (0, telemetryTracker_1.telemetryTrackerFactory)(storage.telemetry, platform.now);
-    var integrationsManager = integrationsManagerFactory && integrationsManagerFactory({ settings: settings, storage: storage, telemetryTracker: telemetryTracker });
+    var integrationsManager = integrationsManagerFactory && integrationsManagerFactory({ settings: settings, storage: storage, telemetryTracker: telemetryTracker, clients: clients });
     var observer = impressionsObserverFactory();
     var uniqueKeysTracker = impressionsMode === constants_3.NONE ? (0, uniqueKeysTracker_1.uniqueKeysTrackerFactory)(log, storage.uniqueKeys, filterAdapterFactory && filterAdapterFactory()) : undefined;
     var strategy;
@@ -60,7 +60,7 @@ function sdkFactory(params) {
     var eventTracker = (0, eventTracker_1.eventTrackerFactory)(settings, storage.events, integrationsManager, storage.telemetry);
     // splitApi is used by SyncManager and Browser signal listener
     var splitApi = splitApiFactory && splitApiFactory(settings, platform, telemetryTracker);
-    var ctx = { splitApi: splitApi, eventTracker: eventTracker, impressionsTracker: impressionsTracker, telemetryTracker: telemetryTracker, uniqueKeysTracker: uniqueKeysTracker, sdkReadinessManager: sdkReadinessManager, readiness: readiness, settings: settings, storage: storage, platform: platform };
+    var ctx = { clients: clients, splitApi: splitApi, eventTracker: eventTracker, impressionsTracker: impressionsTracker, telemetryTracker: telemetryTracker, uniqueKeysTracker: uniqueKeysTracker, sdkReadinessManager: sdkReadinessManager, readiness: readiness, settings: settings, storage: storage, platform: platform };
     var syncManager = syncManagerFactory && syncManagerFactory(ctx);
     ctx.syncManager = syncManager;
     var signalListener = SignalListener && new SignalListener(syncManager, settings, storage, splitApi);

package/esm/readiness/readinessManager.js

@@ -28,7 +28,6 @@ export function readinessManagerFactory(EventEmitter, readyTimeout, splits) {
     if (splits === void 0) { splits = splitsEventEmitterFactory(EventEmitter); }
     var segments = segmentsEventEmitterFactory(EventEmitter);
     var gate = new EventEmitter();
-    var isDestroyed = false;
     // emit SDK_READY_FROM_CACHE
     var isReadyFromCache = false;
     if (splits.splitsCacheLoaded)
@@ -37,9 +36,7 @@ export function readinessManagerFactory(EventEmitter, readyTimeout, splits) {
         splits.once(SDK_SPLITS_CACHE_LOADED, checkIsReadyFromCache);
     // emit SDK_READY_TIMED_OUT
     var hasTimedout = false;
-    function timeout(flagAsDestroyed) {
-        if (flagAsDestroyed)
-            isDestroyed = true;
+    function timeout() {
         if (hasTimedout)
             return;
         hasTimedout = true;
@@ -53,6 +50,7 @@ export function readinessManagerFactory(EventEmitter, readyTimeout, splits) {
     var isReady = false;
     splits.on(SDK_SPLITS_ARRIVED, checkIsReadyOrUpdate);
     segments.on(SDK_SEGMENTS_ARRIVED, checkIsReadyOrUpdate);
+    var isDestroyed = false;
     function checkIsReadyFromCache() {
         isReadyFromCache = true;
         // Don't emit SDK_READY_FROM_CACHE if SDK_READY has been emitted

package/esm/sdkClient/identity.js

@@ -0,0 +1,9 @@
+export function buildInstanceId(key, trafficType) {
+    return (key.matchingKey ? key.matchingKey : key) + "-" + (key.bucketingKey ? key.bucketingKey : key) + "-" + (trafficType ? trafficType : '');
+}
+export function parseInstanceId(instanceId) {
+    var _a = instanceId.split('-'), matchingKey = _a[0], bucketingKey = _a[1], trafficType = _a[2];
+    return matchingKey === bucketingKey ?
+        { key: matchingKey, trafficType: trafficType } :
+        { key: { matchingKey: matchingKey, bucketingKey: bucketingKey }, trafficType: trafficType };
+}

package/esm/sdkClient/sdkClientMethodCS.js

@@ -5,23 +5,19 @@ import { sdkClientFactory } from './sdkClient';
 import { objectAssign } from '../utils/lang/objectAssign';
 import { RETRIEVE_CLIENT_DEFAULT, NEW_SHARED_CLIENT, RETRIEVE_CLIENT_EXISTING } from '../logger/constants';
 import { SDK_SEGMENTS_ARRIVED } from '../readiness/constants';
-function buildInstanceId(key) {
-    // @ts-ignore
-    return (key.matchingKey ? key.matchingKey : key) + "-" + (key.bucketingKey ? key.bucketingKey : key) + "-";
-}
+import { buildInstanceId } from './identity';
 var method = 'Client instantiation';
 /**
  * Factory of client method for the client-side API variant where TT is ignored and thus
  * clients don't have a binded TT for the track method.
  */
 export function sdkClientMethodCSFactory(params) {
-    var storage = params.storage, syncManager = params.syncManager, sdkReadinessManager = params.sdkReadinessManager, _a = params.settings, key = _a.core.key, readyTimeout = _a.startup.readyTimeout, log = _a.log;
+    var clients = params.clients, storage = params.storage, syncManager = params.syncManager, sdkReadinessManager = params.sdkReadinessManager, _a = params.settings, key = _a.core.key, readyTimeout = _a.startup.readyTimeout, log = _a.log;
     var mainClientInstance = clientCSDecorator(log, sdkClientFactory(params), key);
     var parsedDefaultKey = keyParser(key);
     var defaultInstanceId = buildInstanceId(parsedDefaultKey);
     // Cache instances created per factory.
-    var clientInstances = {};
-    clientInstances[defaultInstanceId] = mainClientInstance;
+    clients[defaultInstanceId] = mainClientInstance;
     return function client(key) {
         if (key === undefined) {
             log.debug(RETRIEVE_CLIENT_DEFAULT);
@@ -33,12 +29,12 @@ export function sdkClientMethodCSFactory(params) {
             throw new Error('Shared Client needs a valid key.');
         }
         var instanceId = buildInstanceId(validKey);
-        if (!clientInstances[instanceId]) {
+        if (!clients[instanceId]) {
             var matchingKey = getMatching(validKey);
             var sharedSdkReadiness_1 = sdkReadinessManager.shared(readyTimeout);
             var sharedStorage = storage.shared && storage.shared(matchingKey, function (err) {
                 if (err) {
-                    sharedSdkReadiness_1.readinessManager.timeout(true);
+                    sharedSdkReadiness_1.readinessManager.timeout();
                     return;
                 }
                 // Emit SDK_READY in consumer mode for shared clients
@@ -52,7 +48,7 @@ export function sdkClientMethodCSFactory(params) {
             var sharedSyncManager = syncManager && sharedStorage && syncManager.shared(matchingKey, sharedSdkReadiness_1.readinessManager, sharedStorage);
             // As shared clients reuse all the storage information, we don't need to check here if we
             // will use offline or online mode. We should stick with the original decision.
-            clientInstances[instanceId] = clientCSDecorator(log, sdkClientFactory(objectAssign({}, params, {
+            clients[instanceId] = clientCSDecorator(log, sdkClientFactory(objectAssign({}, params, {
                 sdkReadinessManager: sharedSdkReadiness_1,
                 storage: sharedStorage || storage,
                 syncManager: sharedSyncManager,
@@ -64,6 +60,6 @@ export function sdkClientMethodCSFactory(params) {
         else {
             log.debug(RETRIEVE_CLIENT_EXISTING);
         }
-        return clientInstances[instanceId];
+        return clients[instanceId];
     };
 }

package/esm/sdkClient/sdkClientMethodCSWithTT.js

@@ -6,10 +6,7 @@ import { sdkClientFactory } from './sdkClient';
 import { objectAssign } from '../utils/lang/objectAssign';
 import { RETRIEVE_CLIENT_DEFAULT, NEW_SHARED_CLIENT, RETRIEVE_CLIENT_EXISTING } from '../logger/constants';
 import { SDK_SEGMENTS_ARRIVED } from '../readiness/constants';
-function buildInstanceId(key, trafficType) {
-    // @ts-ignore
-    return (key.matchingKey ? key.matchingKey : key) + "-" + (key.bucketingKey ? key.bucketingKey : key) + "-" + (trafficType !== undefined ? trafficType : '');
-}
+import { buildInstanceId } from './identity';
 var method = 'Client instantiation';
 /**
  * Factory of client method for the client-side (browser) variant of the Isomorphic JS SDK,
@@ -47,7 +44,7 @@ export function sdkClientMethodCSFactory(params) {
             var sharedSdkReadiness_1 = sdkReadinessManager.shared(readyTimeout);
             var sharedStorage = storage.shared && storage.shared(matchingKey, function (err) {
                 if (err) {
-                    sharedSdkReadiness_1.readinessManager.timeout(true);
+                    sharedSdkReadiness_1.readinessManager.timeout();
                     return;
                 }
                 // Emit SDK_READY in consumer mode for shared clients

package/esm/sdkFactory/index.js

@@ -28,9 +28,8 @@ export function sdkFactory(params) {
         settings: settings,
         onReadyCb: function (error) {
             if (error) {
-                // If storage fails to connect (a non-recoverable error), SDK_READY_TIMED_OUT event is emitted and the SDK is flagged
-                // as destroyed to ensure that any subsequent call to `getTreatment` or `track` will not access the storage
-                readiness.timeout(true);
+                // If storage fails to connect, SDK_READY_TIMED_OUT event is emitted immediately. Review when timeout and non-recoverable errors are reworked
+                readiness.timeout();
                 return;
             }
             readiness.splits.emit(SDK_SPLITS_ARRIVED);
@@ -38,8 +37,9 @@ export function sdkFactory(params) {
         },
     });
     // @TODO add support for dataloader: `if (params.dataLoader) params.dataLoader(storage);`
+    var clients = {};
     var telemetryTracker = telemetryTrackerFactory(storage.telemetry, platform.now);
-    var integrationsManager = integrationsManagerFactory && integrationsManagerFactory({ settings: settings, storage: storage, telemetryTracker: telemetryTracker });
+    var integrationsManager = integrationsManagerFactory && integrationsManagerFactory({ settings: settings, storage: storage, telemetryTracker: telemetryTracker, clients: clients });
     var observer = impressionsObserverFactory();
     var uniqueKeysTracker = impressionsMode === NONE ? uniqueKeysTrackerFactory(log, storage.uniqueKeys, filterAdapterFactory && filterAdapterFactory()) : undefined;
     var strategy;
@@ -57,7 +57,7 @@ export function sdkFactory(params) {
     var eventTracker = eventTrackerFactory(settings, storage.events, integrationsManager, storage.telemetry);
     // splitApi is used by SyncManager and Browser signal listener
     var splitApi = splitApiFactory && splitApiFactory(settings, platform, telemetryTracker);
-    var ctx = { splitApi: splitApi, eventTracker: eventTracker, impressionsTracker: impressionsTracker, telemetryTracker: telemetryTracker, uniqueKeysTracker: uniqueKeysTracker, sdkReadinessManager: sdkReadinessManager, readiness: readiness, settings: settings, storage: storage, platform: platform };
+    var ctx = { clients: clients, splitApi: splitApi, eventTracker: eventTracker, impressionsTracker: impressionsTracker, telemetryTracker: telemetryTracker, uniqueKeysTracker: uniqueKeysTracker, sdkReadinessManager: sdkReadinessManager, readiness: readiness, settings: settings, storage: storage, platform: platform };
     var syncManager = syncManagerFactory && syncManagerFactory(ctx);
     ctx.syncManager = syncManager;
     var signalListener = SignalListener && new SignalListener(syncManager, settings, storage, splitApi);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@splitsoftware/splitio-commons",
-  "version": "1.8.3-rc.2",
+  "version": "1.8.3-rc.4",
   "description": "Split Javascript SDK common components",
   "main": "cjs/index.js",
   "module": "esm/index.js",

package/src/integrations/types.ts

@@ -1,4 +1,4 @@
-import { IEventsCacheBase } from '../storages/types';
+import { IStorageSync, IStorageAsync } from '../storages/types';
 import { IEventsHandler, IImpressionsHandler, ITelemetryTracker } from '../trackers/types';
 import { ISettings, SplitIO } from '../types';
 
@@ -9,9 +9,10 @@ export interface IIntegration {
 export type IIntegrationManager = IEventsHandler & IImpressionsHandler;
 
 export interface IIntegrationFactoryParams {
-  storage: { events: IEventsCacheBase }
+  storage: IStorageSync | IStorageAsync,
   settings: ISettings
   telemetryTracker: ITelemetryTracker
+  clients: Record<string, SplitIO.ICsClient>,
 }
 
 export type IntegrationFactory = {

package/src/readiness/readinessManager.ts

@@ -39,8 +39,6 @@ export function readinessManagerFactory(
   const segments: ISegmentsEventEmitter = segmentsEventEmitterFactory(EventEmitter);
   const gate: IReadinessEventEmitter = new EventEmitter();
 
-  let isDestroyed = false;
-
   // emit SDK_READY_FROM_CACHE
   let isReadyFromCache = false;
   if (splits.splitsCacheLoaded) isReadyFromCache = true; // ready from cache, but doesn't emit SDK_READY_FROM_CACHE
@@ -49,14 +47,13 @@ export function readinessManagerFactory(
   // emit SDK_READY_TIMED_OUT
   let hasTimedout = false;
 
-  function timeout(flagAsDestroyed?: boolean) {
-    if (flagAsDestroyed) isDestroyed = true;
+  function timeout() {
     if (hasTimedout) return;
     hasTimedout = true;
     gate.emit(SDK_READY_TIMED_OUT, 'Split SDK emitted SDK_READY_TIMED_OUT event.');
   }
 
-  let readyTimeoutId: any;
+  let readyTimeoutId: ReturnType<typeof setTimeout>;
   if (readyTimeout > 0) {
     readyTimeoutId = setTimeout(timeout, readyTimeout);
   }
@@ -66,6 +63,8 @@ export function readinessManagerFactory(
   splits.on(SDK_SPLITS_ARRIVED, checkIsReadyOrUpdate);
   segments.on(SDK_SEGMENTS_ARRIVED, checkIsReadyOrUpdate);
 
+  let isDestroyed = false;
+
   function checkIsReadyFromCache() {
     isReadyFromCache = true;
     // Don't emit SDK_READY_FROM_CACHE if SDK_READY has been emitted

package/src/readiness/types.ts

@@ -54,7 +54,7 @@ export interface IReadinessManager {
   isDestroyed(): boolean,
   isOperational(): boolean,
 
-  timeout(flagAsDestroyed?: boolean): void,
+  timeout(): void,
   destroy(): void,
 
   /** for client-side */

package/src/sdkClient/identity.ts

@@ -0,0 +1,12 @@
+import { SplitIO } from '../types';
+
+export function buildInstanceId(key: SplitIO.SplitKey, trafficType?: string) { // @ts-ignore
+  return `${key.matchingKey ? key.matchingKey : key}-${key.bucketingKey ? key.bucketingKey : key}-${trafficType ? trafficType : ''}`;
+}
+
+export function parseInstanceId(instanceId: string): { key: SplitIO.SplitKey, trafficType?: string } {
+  const [matchingKey, bucketingKey, trafficType] = instanceId.split('-');
+  return matchingKey === bucketingKey ?
+    { key: matchingKey, trafficType } :
+    { key: { matchingKey, bucketingKey }, trafficType };
+}

package/src/sdkClient/sdkClientMethodCS.ts

@@ -8,11 +8,7 @@ import { objectAssign } from '../utils/lang/objectAssign';
 import { RETRIEVE_CLIENT_DEFAULT, NEW_SHARED_CLIENT, RETRIEVE_CLIENT_EXISTING } from '../logger/constants';
 import { SDK_SEGMENTS_ARRIVED } from '../readiness/constants';
 import { ISdkFactoryContext } from '../sdkFactory/types';
-
-function buildInstanceId(key: SplitIO.SplitKey) {
-  // @ts-ignore
-  return `${key.matchingKey ? key.matchingKey : key}-${key.bucketingKey ? key.bucketingKey : key}-`;
-}
+import { buildInstanceId } from './identity';
 
 const method = 'Client instantiation';
 
@@ -21,7 +17,7 @@ const method = 'Client instantiation';
  * clients don't have a binded TT for the track method.
  */
 export function sdkClientMethodCSFactory(params: ISdkFactoryContext): (key?: SplitIO.SplitKey) => SplitIO.ICsClient {
-  const { storage, syncManager, sdkReadinessManager, settings: { core: { key }, startup: { readyTimeout }, log } } = params;
+  const { clients, storage, syncManager, sdkReadinessManager, settings: { core: { key }, startup: { readyTimeout }, log } } = params;
 
   const mainClientInstance = clientCSDecorator(
     log,
@@ -33,8 +29,7 @@ export function sdkClientMethodCSFactory(params: ISdkFactoryContext): (key?: Spl
   const defaultInstanceId = buildInstanceId(parsedDefaultKey);
 
   // Cache instances created per factory.
-  const clientInstances: Record<string, SplitIO.ICsClient> = {};
-  clientInstances[defaultInstanceId] = mainClientInstance;
+  clients[defaultInstanceId] = mainClientInstance;
 
   return function client(key?: SplitIO.SplitKey) {
     if (key === undefined) {
@@ -50,13 +45,13 @@ export function sdkClientMethodCSFactory(params: ISdkFactoryContext): (key?: Spl
 
     const instanceId = buildInstanceId(validKey);
 
-    if (!clientInstances[instanceId]) {
+    if (!clients[instanceId]) {
       const matchingKey = getMatching(validKey);
 
       const sharedSdkReadiness = sdkReadinessManager.shared(readyTimeout);
       const sharedStorage = storage.shared && storage.shared(matchingKey, (err) => {
         if (err) {
-          sharedSdkReadiness.readinessManager.timeout(true);
+          sharedSdkReadiness.readinessManager.timeout();
           return;
         }
         // Emit SDK_READY in consumer mode for shared clients
@@ -72,7 +67,7 @@ export function sdkClientMethodCSFactory(params: ISdkFactoryContext): (key?: Spl
 
       // As shared clients reuse all the storage information, we don't need to check here if we
       // will use offline or online mode. We should stick with the original decision.
-      clientInstances[instanceId] = clientCSDecorator(
+      clients[instanceId] = clientCSDecorator(
         log,
         sdkClientFactory(objectAssign({}, params, {
           sdkReadinessManager: sharedSdkReadiness,
@@ -90,6 +85,6 @@ export function sdkClientMethodCSFactory(params: ISdkFactoryContext): (key?: Spl
       log.debug(RETRIEVE_CLIENT_EXISTING);
     }
 
-    return clientInstances[instanceId];
+    return clients[instanceId];
   };
 }

package/src/sdkClient/sdkClientMethodCSWithTT.ts

@@ -9,11 +9,7 @@ import { objectAssign } from '../utils/lang/objectAssign';
 import { RETRIEVE_CLIENT_DEFAULT, NEW_SHARED_CLIENT, RETRIEVE_CLIENT_EXISTING } from '../logger/constants';
 import { SDK_SEGMENTS_ARRIVED } from '../readiness/constants';
 import { ISdkFactoryContext } from '../sdkFactory/types';
-
-function buildInstanceId(key: SplitIO.SplitKey, trafficType?: string) {
-  // @ts-ignore
-  return `${key.matchingKey ? key.matchingKey : key}-${key.bucketingKey ? key.bucketingKey : key}-${trafficType !== undefined ? trafficType : ''}`;
-}
+import { buildInstanceId } from './identity';
 
 const method = 'Client instantiation';
 
@@ -66,7 +62,7 @@ export function sdkClientMethodCSFactory(params: ISdkFactoryContext): (key?: Spl
       const sharedSdkReadiness = sdkReadinessManager.shared(readyTimeout);
       const sharedStorage = storage.shared && storage.shared(matchingKey, (err) => {
         if (err) {
-          sharedSdkReadiness.readinessManager.timeout(true);
+          sharedSdkReadiness.readinessManager.timeout();
           return;
         }
         // Emit SDK_READY in consumer mode for shared clients

package/src/sdkFactory/index.ts

@@ -39,9 +39,8 @@ export function sdkFactory(params: ISdkFactoryParams): SplitIO.ICsSDK | SplitIO.
     settings,
     onReadyCb: (error) => {
       if (error) {
-        // If storage fails to connect (a non-recoverable error), SDK_READY_TIMED_OUT event is emitted and the SDK is flagged
-        // as destroyed to ensure that any subsequent call to `getTreatment` or `track` will not access the storage
-        readiness.timeout(true);
+        // If storage fails to connect, SDK_READY_TIMED_OUT event is emitted immediately. Review when timeout and non-recoverable errors are reworked
+        readiness.timeout();
         return;
       }
       readiness.splits.emit(SDK_SPLITS_ARRIVED);
@@ -49,9 +48,9 @@ export function sdkFactory(params: ISdkFactoryParams): SplitIO.ICsSDK | SplitIO.
     },
   });
   // @TODO add support for dataloader: `if (params.dataLoader) params.dataLoader(storage);`
-
+  const clients: Record<string, SplitIO.ICsClient> = {};
   const telemetryTracker = telemetryTrackerFactory(storage.telemetry, platform.now);
-  const integrationsManager = integrationsManagerFactory && integrationsManagerFactory({ settings, storage, telemetryTracker });
+  const integrationsManager = integrationsManagerFactory && integrationsManagerFactory({ settings, storage, telemetryTracker, clients });
 
   const observer = impressionsObserverFactory();
   const uniqueKeysTracker = impressionsMode === NONE ? uniqueKeysTrackerFactory(log, storage.uniqueKeys!, filterAdapterFactory && filterAdapterFactory()) : undefined;
@@ -74,7 +73,7 @@ export function sdkFactory(params: ISdkFactoryParams): SplitIO.ICsSDK | SplitIO.
   // splitApi is used by SyncManager and Browser signal listener
   const splitApi = splitApiFactory && splitApiFactory(settings, platform, telemetryTracker);
 
-  const ctx: ISdkFactoryContext = { splitApi, eventTracker, impressionsTracker, telemetryTracker, uniqueKeysTracker, sdkReadinessManager, readiness, settings, storage, platform };
+  const ctx: ISdkFactoryContext = { clients, splitApi, eventTracker, impressionsTracker, telemetryTracker, uniqueKeysTracker, sdkReadinessManager, readiness, settings, storage, platform };
 
   const syncManager = syncManagerFactory && syncManagerFactory(ctx as ISdkFactoryContextSync);
   ctx.syncManager = syncManager;

package/src/sdkFactory/types.ts

@@ -35,15 +35,12 @@ export interface IPlatform {
   now?: () => number
 }
 
-export interface ISdkFactoryContext {
+export interface ISdkFactoryContext extends IIntegrationFactoryParams {
   platform: IPlatform,
   sdkReadinessManager: ISdkReadinessManager,
   readiness: IReadinessManager,
-  settings: ISettings
   impressionsTracker: IImpressionsTracker,
   eventTracker: IEventTracker,
-  telemetryTracker: ITelemetryTracker,
-  storage: IStorageSync | IStorageAsync,
   uniqueKeysTracker?: IUniqueKeysTracker,
   signalListener?: ISignalListener
   splitApi?: ISplitApi

package/types/integrations/types.d.ts

@@ -1,4 +1,4 @@
-import { IEventsCacheBase } from '../storages/types';
+import { IStorageSync, IStorageAsync } from '../storages/types';
 import { IEventsHandler, IImpressionsHandler, ITelemetryTracker } from '../trackers/types';
 import { ISettings, SplitIO } from '../types';
 export interface IIntegration {
@@ -6,11 +6,10 @@ export interface IIntegration {
 }
 export declare type IIntegrationManager = IEventsHandler & IImpressionsHandler;
 export interface IIntegrationFactoryParams {
-    storage: {
-        events: IEventsCacheBase;
-    };
+    storage: IStorageSync | IStorageAsync;
     settings: ISettings;
     telemetryTracker: ITelemetryTracker;
+    clients: Record<string, SplitIO.ICsClient>;
 }
 export declare type IntegrationFactory = {
     readonly type: string;

package/types/readiness/types.d.ts

@@ -41,7 +41,7 @@ export interface IReadinessManager {
     hasTimedout(): boolean;
     isDestroyed(): boolean;
     isOperational(): boolean;
-    timeout(flagAsDestroyed?: boolean): void;
+    timeout(): void;
     destroy(): void;
     /** for client-side */
     shared(readyTimeout?: number): IReadinessManager;

package/types/sdkClient/identity.d.ts

@@ -0,0 +1,6 @@
+import { SplitIO } from '../types';
+export declare function buildInstanceId(key: SplitIO.SplitKey, trafficType?: string): string;
+export declare function parseInstanceId(instanceId: string): {
+    key: SplitIO.SplitKey;
+    trafficType?: string;
+};

package/types/sdkFactory/types.d.ts

@@ -33,15 +33,12 @@ export interface IPlatform {
      */
     now?: () => number;
 }
-export interface ISdkFactoryContext {
+export interface ISdkFactoryContext extends IIntegrationFactoryParams {
     platform: IPlatform;
     sdkReadinessManager: ISdkReadinessManager;
     readiness: IReadinessManager;
-    settings: ISettings;
     impressionsTracker: IImpressionsTracker;
     eventTracker: IEventTracker;
-    telemetryTracker: ITelemetryTracker;
-    storage: IStorageSync | IStorageAsync;
     uniqueKeysTracker?: IUniqueKeysTracker;
     signalListener?: ISignalListener;
     splitApi?: ISplitApi;