@splitsoftware/splitio-commons 1.17.1-rc.0 → 1.17.1-rc.1

package/CHANGES.txt

@@ -1,6 +1,8 @@
 2.0.0 (September XX, 2024)
+ - Added `factory.destroy()` method, which invokes the `destroy` method on all SDK clients created by the factory.
  - Added support for targeting rules based on large segments.
  - BREAKING CHANGES:
+   - Updated default flag spec version to 1.2.
    - Removed `/mySegments` endpoint from SplitAPI module, as it is replaced by `/memberships` endpoint.
    - Removed support for MY_SEGMENTS_UPDATE and MY_SEGMENTS_UPDATE_V2 notification types, as they are replaced by MEMBERSHIPS_MS_UPDATE and MEMBERSHIPS_LS_UPDATE notification types.
 

package/cjs/sdkClient/identity.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildInstanceId = void 0;
+function buildInstanceId(key, trafficType) {
+    return (key.matchingKey ? key.matchingKey : key) + "-" + (key.bucketingKey ? key.bucketingKey : key) + "-" + (trafficType ? trafficType : '');
+}
+exports.buildInstanceId = buildInstanceId;

package/cjs/sdkClient/sdkClient.js

@@ -53,11 +53,11 @@ function sdkClientFactory(params, isSharedClient) {
             // Stop background jobs
             syncManager && syncManager.stop();
             return __flush().then(function () {
-                // Cleanup event listeners
-                signalListener && signalListener.stop();
-                // @TODO stop only if last client is destroyed
-                if (uniqueKeysTracker)
-                    uniqueKeysTracker.stop();
+                // For main client, cleanup event listeners and scheduled jobs
+                if (!isSharedClient) {
+                    signalListener && signalListener.stop();
+                    uniqueKeysTracker && uniqueKeysTracker.stop();
+                }
                 // Cleanup storage
                 return storage.destroy();
             });

package/cjs/sdkClient/sdkClientMethod.js

@@ -4,11 +4,13 @@ exports.sdkClientMethodFactory = void 0;
 var sdkClient_1 = require("./sdkClient");
 var constants_1 = require("../logger/constants");
 /**
- * Factory of client method for server-side SDKs (ISDK and IAsyncSDK)
+ * Factory of client method for server-side SDKs
  */
 function sdkClientMethodFactory(params) {
     var log = params.settings.log;
     var clientInstance = (0, sdkClient_1.sdkClientFactory)(params);
+    // Only one client in server-side without bound key
+    params.clients[''] = clientInstance;
     return function client() {
         if (arguments.length > 0) {
             throw new Error('Shared Client not supported by the storage mechanism. Create isolated instances instead.');

package/cjs/sdkClient/sdkClientMethodCS.js

@@ -8,22 +8,18 @@ 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");
 /**
  * Factory of client method for the client-side API variant where TT is ignored.
  * Therefore, clients don't have a bound 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, log = _a.log;
+    var clients = params.clients, storage = params.storage, syncManager = params.syncManager, sdkReadinessManager = params.sdkReadinessManager, _a = params.settings, key = _a.core.key, 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);
@@ -34,8 +30,8 @@ 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();
             var sharedStorage = storage.shared && storage.shared(matchingKey, function (err) {
@@ -54,11 +50,10 @@ 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,
-                signalListener: undefined, // only the main client "destroy" method stops the signal listener
             }), true), validKey);
             sharedSyncManager && sharedSyncManager.start();
             log.info(constants_1.NEW_SHARED_CLIENT);
@@ -66,7 +61,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,23 +9,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, trafficType) {
-    // @ts-ignore
-    return (key.matchingKey ? key.matchingKey : key) + "-" + (key.bucketingKey ? key.bucketingKey : key) + "-" + (trafficType !== undefined ? trafficType : '');
-}
+var identity_1 = require("./identity");
 /**
  * Factory of client method for the client-side (browser) variant of the Isomorphic JS SDK,
  * where clients can have a bound TT for the track method, which is provided via the settings
  * (default client) or the client method (shared clients).
  */
 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, log = _a.log;
+    var clients = params.clients, storage = params.storage, syncManager = params.syncManager, sdkReadinessManager = params.sdkReadinessManager, _a = params.settings, _b = _a.core, key = _b.key, trafficType = _b.trafficType, 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;
+    clients[defaultInstanceId] = mainClientInstance;
     return function client(key, trafficType) {
         if (key === undefined) {
             log.debug(constants_1.RETRIEVE_CLIENT_DEFAULT);
@@ -43,8 +39,8 @@ function sdkClientMethodCSFactory(params) {
                 throw new Error('Shared Client needs a valid traffic type or no traffic type at all.');
             }
         }
-        var instanceId = buildInstanceId(validKey, validTrafficType);
-        if (!clientInstances[instanceId]) {
+        var instanceId = (0, identity_1.buildInstanceId)(validKey, validTrafficType);
+        if (!clients[instanceId]) {
             var matchingKey = (0, key_2.getMatching)(validKey);
             var sharedSdkReadiness_1 = sdkReadinessManager.shared();
             var sharedStorage = storage.shared && storage.shared(matchingKey, function (err) {
@@ -63,11 +59,10 @@ 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,
-                signalListener: undefined, // only the main client "destroy" method stops the signal listener
             }), true), validKey, validTrafficType);
             sharedSyncManager && sharedSyncManager.start();
             log.info(constants_1.NEW_SHARED_CLIENT);
@@ -75,7 +70,7 @@ function sdkClientMethodCSFactory(params) {
         else {
             log.debug(constants_1.RETRIEVE_CLIENT_EXISTING);
         }
-        return clientInstances[instanceId];
+        return clients[instanceId];
     };
 }
 exports.sdkClientMethodCSFactory = sdkClientMethodCSFactory;

package/cjs/sdkFactory/index.js

@@ -40,6 +40,7 @@ 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 observer = impressionsObserverFactory();
@@ -59,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);
@@ -82,6 +83,9 @@ function sdkFactory(params) {
         // Logger wrapper API
         Logger: (0, sdkLogger_1.createLoggerAPI)(log),
         settings: settings,
+        destroy: function () {
+            return Promise.all(Object.keys(clients).map(function (key) { return clients[key].destroy(); })).then(function () { });
+        }
     }, extraProps && extraProps(ctx));
 }
 exports.sdkFactory = sdkFactory;

package/esm/sdkClient/identity.js

@@ -0,0 +1,3 @@
+export function buildInstanceId(key, trafficType) {
+    return (key.matchingKey ? key.matchingKey : key) + "-" + (key.bucketingKey ? key.bucketingKey : key) + "-" + (trafficType ? trafficType : '');
+}

package/esm/sdkClient/sdkClient.js

@@ -50,11 +50,11 @@ export function sdkClientFactory(params, isSharedClient) {
             // Stop background jobs
             syncManager && syncManager.stop();
             return __flush().then(function () {
-                // Cleanup event listeners
-                signalListener && signalListener.stop();
-                // @TODO stop only if last client is destroyed
-                if (uniqueKeysTracker)
-                    uniqueKeysTracker.stop();
+                // For main client, cleanup event listeners and scheduled jobs
+                if (!isSharedClient) {
+                    signalListener && signalListener.stop();
+                    uniqueKeysTracker && uniqueKeysTracker.stop();
+                }
                 // Cleanup storage
                 return storage.destroy();
             });

package/esm/sdkClient/sdkClientMethod.js

@@ -1,11 +1,13 @@
 import { sdkClientFactory } from './sdkClient';
 import { RETRIEVE_CLIENT_DEFAULT } from '../logger/constants';
 /**
- * Factory of client method for server-side SDKs (ISDK and IAsyncSDK)
+ * Factory of client method for server-side SDKs
  */
 export function sdkClientMethodFactory(params) {
     var log = params.settings.log;
     var clientInstance = sdkClientFactory(params);
+    // Only one client in server-side without bound key
+    params.clients[''] = clientInstance;
     return function client() {
         if (arguments.length > 0) {
             throw new Error('Shared Client not supported by the storage mechanism. Create isolated instances instead.');

package/esm/sdkClient/sdkClientMethodCS.js

@@ -5,22 +5,18 @@ import { sdkClientFactory } from './sdkClient';
 import { objectAssign } from '../utils/lang/objectAssign';
 import { RETRIEVE_CLIENT_DEFAULT, NEW_SHARED_CLIENT, RETRIEVE_CLIENT_EXISTING, LOG_PREFIX_CLIENT_INSTANTIATION } 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';
 /**
  * Factory of client method for the client-side API variant where TT is ignored.
  * Therefore, clients don't have a bound 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, log = _a.log;
+    var clients = params.clients, storage = params.storage, syncManager = params.syncManager, sdkReadinessManager = params.sdkReadinessManager, _a = params.settings, key = _a.core.key, 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);
@@ -32,7 +28,7 @@ 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();
             var sharedStorage = storage.shared && storage.shared(matchingKey, function (err) {
@@ -51,11 +47,10 @@ 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,
-                signalListener: undefined, // only the main client "destroy" method stops the signal listener
             }), true), validKey);
             sharedSyncManager && sharedSyncManager.start();
             log.info(NEW_SHARED_CLIENT);
@@ -63,6 +58,6 @@ export function sdkClientMethodCSFactory(params) {
         else {
             log.debug(RETRIEVE_CLIENT_EXISTING);
         }
-        return clientInstances[instanceId];
+        return clients[instanceId];
     };
 }

package/esm/sdkClient/sdkClientMethodCSWithTT.js

@@ -6,23 +6,19 @@ import { sdkClientFactory } from './sdkClient';
 import { objectAssign } from '../utils/lang/objectAssign';
 import { RETRIEVE_CLIENT_DEFAULT, NEW_SHARED_CLIENT, RETRIEVE_CLIENT_EXISTING, LOG_PREFIX_CLIENT_INSTANTIATION } 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';
 /**
  * Factory of client method for the client-side (browser) variant of the Isomorphic JS SDK,
  * where clients can have a bound TT for the track method, which is provided via the settings
  * (default client) or the client method (shared clients).
  */
 export 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, log = _a.log;
+    var clients = params.clients, storage = params.storage, syncManager = params.syncManager, sdkReadinessManager = params.sdkReadinessManager, _a = params.settings, _b = _a.core, key = _b.key, trafficType = _b.trafficType, log = _a.log;
     var mainClientInstance = clientCSDecorator(log, sdkClientFactory(params), key, trafficType);
     var parsedDefaultKey = keyParser(key);
     var defaultInstanceId = buildInstanceId(parsedDefaultKey, trafficType);
     // Cache instances created per factory.
-    var clientInstances = {};
-    clientInstances[defaultInstanceId] = mainClientInstance;
+    clients[defaultInstanceId] = mainClientInstance;
     return function client(key, trafficType) {
         if (key === undefined) {
             log.debug(RETRIEVE_CLIENT_DEFAULT);
@@ -41,7 +37,7 @@ export function sdkClientMethodCSFactory(params) {
             }
         }
         var instanceId = buildInstanceId(validKey, validTrafficType);
-        if (!clientInstances[instanceId]) {
+        if (!clients[instanceId]) {
             var matchingKey = getMatching(validKey);
             var sharedSdkReadiness_1 = sdkReadinessManager.shared();
             var sharedStorage = storage.shared && storage.shared(matchingKey, function (err) {
@@ -60,11 +56,10 @@ 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,
-                signalListener: undefined, // only the main client "destroy" method stops the signal listener
             }), true), validKey, validTrafficType);
             sharedSyncManager && sharedSyncManager.start();
             log.info(NEW_SHARED_CLIENT);
@@ -72,6 +67,6 @@ export function sdkClientMethodCSFactory(params) {
         else {
             log.debug(RETRIEVE_CLIENT_EXISTING);
         }
-        return clientInstances[instanceId];
+        return clients[instanceId];
     };
 }

package/esm/sdkFactory/index.js

@@ -37,6 +37,7 @@ 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 observer = impressionsObserverFactory();
@@ -56,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);
@@ -79,5 +80,8 @@ export function sdkFactory(params) {
         // Logger wrapper API
         Logger: createLoggerAPI(log),
         settings: settings,
+        destroy: function () {
+            return Promise.all(Object.keys(clients).map(function (key) { return clients[key].destroy(); })).then(function () { });
+        }
     }, extraProps && extraProps(ctx));
 }

package/package.json

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

package/src/sdkClient/identity.ts

@@ -0,0 +1,5 @@
+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 : ''}`;
+}

package/src/sdkClient/sdkClient.ts

@@ -66,11 +66,11 @@ export function sdkClientFactory(params: ISdkFactoryContext, isSharedClient?: bo
         syncManager && syncManager.stop();
 
         return __flush().then(() => {
-          // Cleanup event listeners
-          signalListener && signalListener.stop();
-
-          // @TODO stop only if last client is destroyed
-          if (uniqueKeysTracker) uniqueKeysTracker.stop();
+          // For main client, cleanup event listeners and scheduled jobs
+          if (!isSharedClient) {
+            signalListener && signalListener.stop();
+            uniqueKeysTracker && uniqueKeysTracker.stop();
+          }
 
           // Cleanup storage
           return storage.destroy();

package/src/sdkClient/sdkClientMethod.ts

@@ -4,12 +4,15 @@ import { RETRIEVE_CLIENT_DEFAULT } from '../logger/constants';
 import { ISdkFactoryContext } from '../sdkFactory/types';
 
 /**
- * Factory of client method for server-side SDKs (ISDK and IAsyncSDK)
+ * Factory of client method for server-side SDKs
  */
 export function sdkClientMethodFactory(params: ISdkFactoryContext): () => SplitIO.IClient | SplitIO.IAsyncClient {
   const log = params.settings.log;
   const clientInstance = sdkClientFactory(params);
 
+  // Only one client in server-side without bound key
+  params.clients[''] = clientInstance;
+
   return function client() {
     if (arguments.length > 0) {
       throw new Error('Shared Client not supported by the storage mechanism. Create isolated instances instead.');

package/src/sdkClient/sdkClientMethodCS.ts

@@ -8,18 +8,14 @@ import { objectAssign } from '../utils/lang/objectAssign';
 import { RETRIEVE_CLIENT_DEFAULT, NEW_SHARED_CLIENT, RETRIEVE_CLIENT_EXISTING, LOG_PREFIX_CLIENT_INSTANTIATION } 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';
 
 /**
  * Factory of client method for the client-side API variant where TT is ignored.
  * Therefore, clients don't have a bound TT for the track method.
  */
 export function sdkClientMethodCSFactory(params: ISdkFactoryContext): (key?: SplitIO.SplitKey) => SplitIO.ICsClient {
-  const { storage, syncManager, sdkReadinessManager, settings: { core: { key }, log } } = params;
+  const { clients, storage, syncManager, sdkReadinessManager, settings: { core: { key }, log } } = params;
 
   const mainClientInstance = clientCSDecorator(
     log,
@@ -31,8 +27,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) {
@@ -48,7 +43,7 @@ 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();
@@ -70,13 +65,12 @@ 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,
           storage: sharedStorage || storage,
           syncManager: sharedSyncManager,
-          signalListener: undefined, // only the main client "destroy" method stops the signal listener
         }), true) as SplitIO.IClient,
         validKey
       );
@@ -88,6 +82,6 @@ export function sdkClientMethodCSFactory(params: ISdkFactoryContext): (key?: Spl
       log.debug(RETRIEVE_CLIENT_EXISTING);
     }
 
-    return clientInstances[instanceId];
+    return clients[instanceId] as SplitIO.ICsClient;
   };
 }

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, LOG_PREFIX_CLIENT_INSTANTIATION } 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';
 
 /**
  * Factory of client method for the client-side (browser) variant of the Isomorphic JS SDK,
@@ -21,7 +17,7 @@ function buildInstanceId(key: SplitIO.SplitKey, trafficType?: string) {
  * (default client) or the client method (shared clients).
  */
 export function sdkClientMethodCSFactory(params: ISdkFactoryContext): (key?: SplitIO.SplitKey, trafficType?: string) => SplitIO.ICsClient {
-  const { storage, syncManager, sdkReadinessManager, settings: { core: { key, trafficType }, log } } = params;
+  const { clients, storage, syncManager, sdkReadinessManager, settings: { core: { key, trafficType }, log } } = params;
 
   const mainClientInstance = clientCSDecorator(
     log,
@@ -34,8 +30,7 @@ export function sdkClientMethodCSFactory(params: ISdkFactoryContext): (key?: Spl
   const defaultInstanceId = buildInstanceId(parsedDefaultKey, trafficType);
 
   // Cache instances created per factory.
-  const clientInstances: Record<string, SplitIO.ICsClient> = {};
-  clientInstances[defaultInstanceId] = mainClientInstance;
+  clients[defaultInstanceId] = mainClientInstance;
 
   return function client(key?: SplitIO.SplitKey, trafficType?: string) {
     if (key === undefined) {
@@ -58,7 +53,7 @@ export function sdkClientMethodCSFactory(params: ISdkFactoryContext): (key?: Spl
     }
     const instanceId = buildInstanceId(validKey, validTrafficType);
 
-    if (!clientInstances[instanceId]) {
+    if (!clients[instanceId]) {
       const matchingKey = getMatching(validKey);
 
       const sharedSdkReadiness = sdkReadinessManager.shared();
@@ -80,13 +75,12 @@ 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,
           storage: sharedStorage || storage,
           syncManager: sharedSyncManager,
-          signalListener: undefined, // only the main client "destroy" method stops the signal listener
         }), true) as SplitIO.IClient,
         validKey,
         validTrafficType
@@ -99,6 +93,6 @@ export function sdkClientMethodCSFactory(params: ISdkFactoryContext): (key?: Spl
       log.debug(RETRIEVE_CLIENT_EXISTING);
     }
 
-    return clientInstances[instanceId];
+    return clients[instanceId] as SplitIO.ICsClient;
   };
 }

package/src/sdkFactory/index.ts

@@ -3,7 +3,7 @@ import { sdkReadinessManagerFactory } from '../readiness/sdkReadinessManager';
 import { impressionsTrackerFactory } from '../trackers/impressionsTracker';
 import { eventTrackerFactory } from '../trackers/eventTracker';
 import { telemetryTrackerFactory } from '../trackers/telemetryTracker';
-import { SplitIO } from '../types';
+import { IBasicClient, SplitIO } from '../types';
 import { validateAndTrackApiKey } from '../utils/inputValidation/apiKey';
 import { createLoggerAPI } from '../logger/sdkLogger';
 import { NEW_FACTORY, RETRIEVE_MANAGER } from '../logger/constants';
@@ -48,7 +48,7 @@ export function sdkFactory(params: ISdkFactoryParams): SplitIO.ICsSDK | SplitIO.
     },
   });
   // @TODO add support for dataloader: `if (params.dataLoader) params.dataLoader(storage);`
-
+  const clients: Record<string, IBasicClient> = {};
   const telemetryTracker = telemetryTrackerFactory(storage.telemetry, platform.now);
   const integrationsManager = integrationsManagerFactory && integrationsManagerFactory({ settings, storage, telemetryTracker });
 
@@ -73,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;
@@ -105,5 +105,9 @@ export function sdkFactory(params: ISdkFactoryParams): SplitIO.ICsSDK | SplitIO.
     Logger: createLoggerAPI(log),
 
     settings,
+
+    destroy() {
+      return Promise.all(Object.keys(clients).map(key => clients[key].destroy())).then(() => {});
+    }
   }, extraProps && extraProps(ctx));
 }

package/src/sdkFactory/types.ts

@@ -8,7 +8,7 @@ import { IStorageAsync, IStorageSync, IStorageFactoryParams } from '../storages/
 import { ISyncManager } from '../sync/types';
 import { IImpressionObserver } from '../trackers/impressionObserver/types';
 import { IImpressionsTracker, IEventTracker, ITelemetryTracker, IFilterAdapter, IUniqueKeysTracker } from '../trackers/types';
-import { SplitIO, ISettings, IEventEmitter } from '../types';
+import { SplitIO, ISettings, IEventEmitter, IBasicClient } from '../types';
 
 /**
  * Environment related dependencies.
@@ -49,6 +49,7 @@ export interface ISdkFactoryContext {
   signalListener?: ISignalListener
   splitApi?: ISplitApi
   syncManager?: ISyncManager,
+  clients: Record<string, IBasicClient>,
 }
 
 export interface ISdkFactoryContextSync extends ISdkFactoryContext {

package/src/types.ts

@@ -426,7 +426,7 @@ export interface IStatusInterface extends IEventEmitter {
  * @interface IBasicClient
  * @extends IStatusInterface
  */
-interface IBasicClient extends IStatusInterface {
+export interface IBasicClient extends IStatusInterface {
   /**
    * Flush data
    * @function flush
@@ -459,6 +459,12 @@ interface IBasicSDK {
    * @property Logger
    */
   Logger: ILoggerAPI
+  /**
+   * Destroy all the clients created by this factory.
+   * @function destroy
+   * @returns {Promise<void>}
+   */
+  destroy(): Promise<void>
 }
 /****** Exposed namespace ******/
 /**

package/types/sdkClient/identity.d.ts

@@ -1,6 +1,2 @@
 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/sdkClient/sdkClientMethod.d.ts

@@ -1,6 +1,6 @@
 import { SplitIO } from '../types';
 import { ISdkFactoryContext } from '../sdkFactory/types';
 /**
- * Factory of client method for server-side SDKs (ISDK and IAsyncSDK)
+ * Factory of client method for server-side SDKs
  */
 export declare function sdkClientMethodFactory(params: ISdkFactoryContext): () => SplitIO.IClient | SplitIO.IAsyncClient;

package/types/sdkFactory/types.d.ts

@@ -8,7 +8,7 @@ import { IStorageAsync, IStorageSync, IStorageFactoryParams } from '../storages/
 import { ISyncManager } from '../sync/types';
 import { IImpressionObserver } from '../trackers/impressionObserver/types';
 import { IImpressionsTracker, IEventTracker, ITelemetryTracker, IFilterAdapter, IUniqueKeysTracker } from '../trackers/types';
-import { SplitIO, ISettings, IEventEmitter } from '../types';
+import { SplitIO, ISettings, IEventEmitter, IBasicClient } from '../types';
 /**
  * Environment related dependencies.
  */
@@ -47,6 +47,7 @@ export interface ISdkFactoryContext {
     signalListener?: ISignalListener;
     splitApi?: ISplitApi;
     syncManager?: ISyncManager;
+    clients: Record<string, IBasicClient>;
 }
 export interface ISdkFactoryContextSync extends ISdkFactoryContext {
     storage: IStorageSync;

package/types/storages/AbstractMySegmentsCacheSync.d.ts

@@ -0,0 +1,39 @@
+import { IMySegmentsResponse } from '../dtos/types';
+import { MySegmentsData } from '../sync/polling/types';
+import { ISegmentsCacheSync } from './types';
+/**
+ * This class provides a skeletal implementation of the ISegmentsCacheSync interface
+ * to minimize the effort required to implement this interface.
+ */
+export declare abstract class AbstractMySegmentsCacheSync implements ISegmentsCacheSync {
+    protected abstract addSegment(name: string): boolean;
+    protected abstract removeSegment(name: string): boolean;
+    protected abstract setChangeNumber(changeNumber?: number): boolean | void;
+    /**
+     * For server-side synchronizer: check if `key` is in `name` segment.
+     * For client-side synchronizer: check if `name` segment is in the cache. `key` is undefined.
+     */
+    abstract isInSegment(name: string, key?: string): boolean;
+    /**
+     * clear the cache.
+     */
+    clear(): void;
+    registerSegments(): boolean;
+    update(): boolean;
+    /**
+     * For server-side synchronizer: get the list of segments to fetch changes.
+     * Also used for the `seC` (segment count) telemetry stat.
+     */
+    abstract getRegisteredSegments(): string[];
+    /**
+     * Only used for the `skC`(segment keys count) telemetry stat: 1 for client-side, and total count of keys in server-side.
+     * @TODO for client-side it should be the number of clients, but it requires a refactor of MySegments caches to simplify the code.
+     */
+    abstract getKeysCount(): number;
+    abstract getChangeNumber(name: string): number;
+    /**
+     * For server-side synchronizer: the method is not used.
+     * For client-side synchronizer: it resets or updates the cache.
+     */
+    resetSegments(segmentsData: MySegmentsData | IMySegmentsResponse): boolean;
+}

package/types/types.d.ts

@@ -422,7 +422,7 @@ export interface IStatusInterface extends IEventEmitter {
  * @interface IBasicClient
  * @extends IStatusInterface
  */
-interface IBasicClient extends IStatusInterface {
+export interface IBasicClient extends IStatusInterface {
     /**
      * Flush data
      * @function flush
@@ -452,6 +452,12 @@ interface IBasicSDK {
      * @property Logger
      */
     Logger: ILoggerAPI;
+    /**
+     * Destroy all the clients created by this factory.
+     * @function destroy
+     * @returns {Promise<void>}
+     */
+    destroy(): Promise<void>;
 }
 /****** Exposed namespace ******/
 /**