@splitsoftware/splitio-commons 1.17.1-rc.2 → 1.17.1-rc.3

package/esm/storages/dataLoader.js

@@ -1,4 +1,5 @@
 import { setToArray } from '../utils/lang/sets';
+import { getMatching } from '../utils/key';
 /**
  * Storage-agnostic adaptation of `loadDataIntoLocalStorage` function
  * (https://github.com/godaddy/split-javascript-data-loader/blob/master/src/load-data.js)
@@ -12,7 +13,7 @@ import { setToArray } from '../utils/lang/sets';
  * @TODO add logs, and input validation in this module, in favor of size reduction.
  * @TODO unit tests
  */
-export function loadData(preloadedData, storage, userKey) {
+export function loadData(preloadedData, storage, matchingKey) {
     // Do not load data if current preloadedData is empty
     if (Object.keys(preloadedData).length === 0)
         return;
@@ -28,29 +29,28 @@ export function loadData(preloadedData, storage, userKey) {
         // splitsData in an object where the property is the split name and the pertaining value is a stringified json of its data
         storage.splits.addSplits(splitsData.map(function (split) { return ([split.name, split]); }));
     }
-    if (userKey) { // add mySegments data (client-side)
-        var mySegmentsData = preloadedData.mySegmentsData && preloadedData.mySegmentsData[userKey];
+    if (matchingKey) { // add mySegments data (client-side)
+        var mySegmentsData = preloadedData.mySegmentsData && preloadedData.mySegmentsData[matchingKey];
         if (!mySegmentsData) {
             // segmentsData in an object where the property is the segment name and the pertaining value is a stringified object that contains the `added` array of userIds
             mySegmentsData = Object.keys(segmentsData).filter(function (segmentName) {
-                var userKeys = segmentsData[segmentName];
-                return userKeys.indexOf(userKey) > -1;
+                var matchingKeys = segmentsData[segmentName];
+                return matchingKeys.indexOf(matchingKey) > -1;
             });
         }
         storage.segments.resetSegments({ k: mySegmentsData.map(function (s) { return ({ n: s }); }) });
     }
     else { // add segments data (server-side)
         Object.keys(segmentsData).filter(function (segmentName) {
-            var userKeys = segmentsData[segmentName];
-            storage.segments.addToSegment(segmentName, userKeys);
+            var matchingKeys = segmentsData[segmentName];
+            storage.segments.addToSegment(segmentName, matchingKeys);
         });
     }
 }
 export function getSnapshot(storage, userKeys) {
     return {
         // lastUpdated: Date.now(),
-        // @ts-ignore accessing private prop
-        since: storage.splits.changeNumber,
+        since: storage.splits.getChangeNumber(),
         splitsData: storage.splits.getAll(),
         segmentsData: userKeys ?
             undefined : // @ts-ignore accessing private prop
@@ -60,8 +60,7 @@ export function getSnapshot(storage, userKeys) {
             }, {}),
         mySegmentsData: userKeys ?
             userKeys.reduce(function (prev, userKey) {
-                // @ts-ignore accessing private prop
-                prev[userKey] = storage.shared ?
+                prev[getMatching(userKey)] = storage.shared ?
                     // Client-side segments
                     // @ts-ignore accessing private prop
                     Object.keys(storage.shared(userKey).segments.segmentCache) :

package/esm/storages/inLocalStorage/index.js

@@ -34,9 +34,6 @@ export function InLocalStorage(options) {
         var splits = new SplitsCacheInLocal(settings, keys, expirationTimestamp);
         var segments = new MySegmentsCacheInLocal(log, keys);
         var largeSegments = new MySegmentsCacheInLocal(log, myLargeSegmentsKeyBuilder(prefix, matchingKey));
-        if (settings.mode === LOCALHOST_MODE || splits.getChangeNumber() > -1) {
-            Promise.resolve().then(onReadyFromCacheCb);
-        }
         return {
             splits: splits,
             segments: segments,
@@ -46,6 +43,11 @@ export function InLocalStorage(options) {
             events: new EventsCacheInMemory(eventsQueueSize),
             telemetry: shouldRecordTelemetry(params) ? new TelemetryCacheInMemory(splits, segments) : undefined,
             uniqueKeys: impressionsMode === NONE ? new UniqueKeysCacheInMemoryCS() : undefined,
+            init: function () {
+                if (settings.mode === LOCALHOST_MODE || splits.getChangeNumber() > -1) {
+                    Promise.resolve().then(onReadyFromCacheCb);
+                }
+            },
             destroy: function () {
                 var _a;
                 this.splits = new SplitsCacheInMemory(__splitFiltersValidation);

package/esm/storages/inRedis/RedisAdapter.js

@@ -17,7 +17,7 @@ var DEFAULT_OPTIONS = {
 var DEFAULT_LIBRARY_OPTIONS = {
     enableOfflineQueue: false,
     connectTimeout: DEFAULT_OPTIONS.connectionTimeout,
-    lazyConnect: false
+    lazyConnect: false // @TODO true to avoid side-effects on instantiation.
 };
 /**
  * Redis adapter on top of the library of choice (written with ioredis) for some extra control.

package/esm/storages/pluggable/index.js

@@ -55,6 +55,7 @@ export function PluggableStorage(options) {
         var metadata = metadataBuilder(settings);
         var keys = new KeyBuilderSS(prefix, metadata);
         var wrapper = wrapperAdapter(log, options.wrapper);
+        var connectPromise;
         var isSyncronizer = mode === undefined; // If mode is not defined, the synchronizer is running
         var isPartialConsumer = mode === CONSUMER_PARTIAL_MODE;
         var telemetry = shouldRecordTelemetry(params) || isSyncronizer ?
@@ -72,37 +73,6 @@ export function PluggableStorage(options) {
                 settings.core.key === undefined ? new UniqueKeysCacheInMemory() : new UniqueKeysCacheInMemoryCS() :
                 new UniqueKeysCachePluggable(log, keys.buildUniqueKeysKey(), wrapper) :
             undefined;
-        // Connects to wrapper and emits SDK_READY event on main client
-        var connectPromise = wrapper.connect().then(function () {
-            if (isSyncronizer) {
-                // In standalone or producer mode, clear storage if SDK key or feature flag filter has changed
-                return wrapper.get(keys.buildHashKey()).then(function (hash) {
-                    var currentHash = getStorageHash(settings);
-                    if (hash !== currentHash) {
-                        log.info(LOG_PREFIX + 'Storage HASH has changed (SDK key, flags filter criteria or flags spec version was modified). Clearing cache');
-                        return wrapper.getKeysByPrefix(keys.prefix + ".").then(function (storageKeys) {
-                            return Promise.all(storageKeys.map(function (storageKey) { return wrapper.del(storageKey); }));
-                        }).then(function () { return wrapper.set(keys.buildHashKey(), currentHash); });
-                    }
-                }).then(function () {
-                    onReadyCb();
-                });
-            }
-            else {
-                // Start periodic flush of async storages if not running synchronizer (producer mode)
-                if (impressionCountsCache && impressionCountsCache.start)
-                    impressionCountsCache.start();
-                if (uniqueKeysCache && uniqueKeysCache.start)
-                    uniqueKeysCache.start();
-                if (telemetry && telemetry.recordConfig)
-                    telemetry.recordConfig();
-                onReadyCb();
-            }
-        }).catch(function (e) {
-            e = e || new Error('Error connecting wrapper');
-            onReadyCb(e);
-            return e; // Propagate error for shared clients
-        });
         return {
             splits: new SplitsCachePluggable(log, keys, wrapper, settings.sync.__splitFiltersValidation),
             segments: new SegmentsCachePluggable(log, keys, wrapper),
@@ -111,6 +81,41 @@ export function PluggableStorage(options) {
             events: isPartialConsumer ? promisifyEventsTrack(new EventsCacheInMemory(eventsQueueSize)) : new EventsCachePluggable(log, keys.buildEventsKey(), wrapper, metadata),
             telemetry: telemetry,
             uniqueKeys: uniqueKeysCache,
+            init: function () {
+                if (connectPromise)
+                    return connectPromise;
+                // Connects to wrapper and emits SDK_READY event on main client
+                return connectPromise = wrapper.connect().then(function () {
+                    if (isSyncronizer) {
+                        // In standalone or producer mode, clear storage if SDK key or feature flag filter has changed
+                        return wrapper.get(keys.buildHashKey()).then(function (hash) {
+                            var currentHash = getStorageHash(settings);
+                            if (hash !== currentHash) {
+                                log.info(LOG_PREFIX + 'Storage HASH has changed (SDK key, flags filter criteria or flags spec version was modified). Clearing cache');
+                                return wrapper.getKeysByPrefix(keys.prefix + ".").then(function (storageKeys) {
+                                    return Promise.all(storageKeys.map(function (storageKey) { return wrapper.del(storageKey); }));
+                                }).then(function () { return wrapper.set(keys.buildHashKey(), currentHash); });
+                            }
+                        }).then(function () {
+                            onReadyCb();
+                        });
+                    }
+                    else {
+                        // Start periodic flush of async storages if not running synchronizer (producer mode)
+                        if (impressionCountsCache && impressionCountsCache.start)
+                            impressionCountsCache.start();
+                        if (uniqueKeysCache && uniqueKeysCache.start)
+                            uniqueKeysCache.start();
+                        if (telemetry && telemetry.recordConfig)
+                            telemetry.recordConfig();
+                        onReadyCb();
+                    }
+                }).catch(function (e) {
+                    e = e || new Error('Error connecting wrapper');
+                    onReadyCb(e);
+                    return e; // Propagate error for shared clients
+                });
+            },
             // Stop periodic flush and disconnect the underlying storage
             destroy: function () {
                 return Promise.all(isSyncronizer ? [] : [
@@ -120,7 +125,7 @@ export function PluggableStorage(options) {
             },
             // emits SDK_READY event on shared clients and returns a reference to the storage
             shared: function (_, onReadyCb) {
-                connectPromise.then(onReadyCb);
+                this.init().then(onReadyCb);
                 return __assign(__assign({}, this), { 
                     // no-op destroy, to disconnect the wrapper only when the main client is destroyed
                     destroy: function () { } });

package/esm/trackers/eventTracker.js

@@ -9,7 +9,7 @@ import { isConsumerMode } from '../utils/settingsValidation/mode';
  * @param eventsCache cache to save events
  * @param integrationsManager optional event handler used for integrations
  */
-export function eventTrackerFactory(settings, eventsCache, integrationsManager, telemetryCache) {
+export function eventTrackerFactory(settings, eventsCache, whenInit, integrationsManager, telemetryCache) {
     var log = settings.log, mode = settings.mode;
     var isAsync = isConsumerMode(mode);
     function queueEventsCallback(eventData, tracked) {
@@ -20,14 +20,16 @@ export function eventTrackerFactory(settings, eventsCache, integrationsManager,
             log.info(EVENTS_TRACKER_SUCCESS, [msg]);
             if (integrationsManager) {
                 // Wrap in a timeout because we don't want it to be blocking.
-                setTimeout(function () {
-                    // copy of event, to avoid unexpected behaviour if modified by integrations
-                    var eventDataCopy = objectAssign({}, eventData);
-                    if (properties)
-                        eventDataCopy.properties = objectAssign({}, properties);
-                    // integrationsManager does not throw errors (they are internally handled by each integration module)
-                    integrationsManager.handleEvent(eventDataCopy);
-                }, 0);
+                whenInit(function () {
+                    setTimeout(function () {
+                        // copy of event, to avoid unexpected behaviour if modified by integrations
+                        var eventDataCopy = objectAssign({}, eventData);
+                        if (properties)
+                            eventDataCopy.properties = objectAssign({}, properties);
+                        // integrationsManager does not throw errors (they are internally handled by each integration module)
+                        integrationsManager.handleEvent(eventDataCopy);
+                    });
+                });
             }
         }
         else {

package/esm/trackers/impressionsTracker.js

@@ -11,7 +11,7 @@ import { CONSENT_DECLINED, DEDUPED, QUEUED } from '../utils/constants';
  * @param integrationsManager optional integrations manager
  * @param strategy strategy for impressions tracking.
  */
-export function impressionsTrackerFactory(settings, impressionsCache, strategy, integrationsManager, telemetryCache) {
+export function impressionsTrackerFactory(settings, impressionsCache, strategy, whenInit, integrationsManager, telemetryCache) {
     var log = settings.log, impressionListener = settings.impressionListener, _a = settings.runtime, ip = _a.ip, hostname = _a.hostname, version = settings.version;
     return {
         track: function (impressions, attributes) {
@@ -51,18 +51,20 @@ export function impressionsTrackerFactory(settings, impressionsCache, strategy,
                         sdkLanguageVersion: version
                     };
                     // Wrap in a timeout because we don't want it to be blocking.
-                    setTimeout(function () {
-                        // integrationsManager.handleImpression does not throw errors
-                        if (integrationsManager)
-                            integrationsManager.handleImpression(impressionData);
-                        try { // @ts-ignore. An exception on the listeners should not break the SDK.
-                            if (impressionListener)
-                                impressionListener.logImpression(impressionData);
-                        }
-                        catch (err) {
-                            log.error(ERROR_IMPRESSIONS_LISTENER, [err]);
-                        }
-                    }, 0);
+                    whenInit(function () {
+                        setTimeout(function () {
+                            // integrationsManager.handleImpression does not throw errors
+                            if (integrationsManager)
+                                integrationsManager.handleImpression(impressionData);
+                            try { // @ts-ignore. An exception on the listeners should not break the SDK.
+                                if (impressionListener)
+                                    impressionListener.logImpression(impressionData);
+                            }
+                            catch (err) {
+                                log.error(ERROR_IMPRESSIONS_LISTENER, [err]);
+                            }
+                        });
+                    });
                 };
                 for (var i = 0; i < impressionsToListenerCount; i++) {
                     _loop_1(i);

package/esm/trackers/uniqueKeysTracker.js

@@ -16,9 +16,6 @@ var noopFilterAdapter = {
 export function uniqueKeysTrackerFactory(log, uniqueKeysCache, filterAdapter) {
     if (filterAdapter === void 0) { filterAdapter = noopFilterAdapter; }
     var intervalId;
-    if (filterAdapter.refreshRate) {
-        intervalId = setInterval(filterAdapter.clear, filterAdapter.refreshRate);
-    }
     return {
         track: function (key, featureName) {
             if (!filterAdapter.add(key, featureName)) {
@@ -27,6 +24,11 @@ export function uniqueKeysTrackerFactory(log, uniqueKeysCache, filterAdapter) {
             }
             uniqueKeysCache.track(key, featureName);
         },
+        start: function () {
+            if (filterAdapter.refreshRate) {
+                intervalId = setInterval(filterAdapter.clear, filterAdapter.refreshRate);
+            }
+        },
         stop: function () {
             clearInterval(intervalId);
         }

package/package.json

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

package/src/readiness/readinessManager.ts

@@ -55,19 +55,15 @@ export function readinessManagerFactory(
 
   // emit SDK_READY_TIMED_OUT
   let hasTimedout = false;
+  let readyTimeoutId: ReturnType<typeof setTimeout>;
 
-  function timeout() {
-    if (hasTimedout) return;
+  function timeout() { // eslint-disable-next-line no-use-before-define
+    if (hasTimedout || isReady) return;
     hasTimedout = true;
     syncLastUpdate();
     gate.emit(SDK_READY_TIMED_OUT, 'Split SDK emitted SDK_READY_TIMED_OUT event.');
   }
 
-  let readyTimeoutId: ReturnType<typeof setTimeout>;
-  if (readyTimeout > 0) {
-    readyTimeoutId = setTimeout(timeout, readyTimeout);
-  }
-
   // emit SDK_READY and SDK_UPDATE
   let isReady = false;
   splits.on(SDK_SPLITS_ARRIVED, checkIsReadyOrUpdate);
@@ -132,6 +128,12 @@ export function readinessManagerFactory(
     // tracking and evaluations, while keeping event listeners to emit SDK_READY_TIMED_OUT event
     setDestroyed() { isDestroyed = true; },
 
+    init() {
+      if (readyTimeout > 0) {
+        readyTimeoutId = setTimeout(timeout, readyTimeout);
+      }
+    },
+
     destroy() {
       isDestroyed = true;
       syncLastUpdate();

package/src/readiness/types.ts

@@ -59,6 +59,7 @@ export interface IReadinessManager {
   timeout(): void,
   setDestroyed(): void,
   destroy(): void,
+  init(): void,
 
   /** for client-side */
   shared(): IReadinessManager,

package/src/sdkClient/sdkClientMethodCS.ts

@@ -15,7 +15,7 @@ import { buildInstanceId } from './identity';
  * Therefore, clients don't have a bound TT for the track method.
  */
 export function sdkClientMethodCSFactory(params: ISdkFactoryContext): (key?: SplitIO.SplitKey) => SplitIO.ICsClient {
-  const { clients, storage, syncManager, sdkReadinessManager, settings: { core: { key }, log } } = params;
+  const { clients, storage, syncManager, sdkReadinessManager, settings: { core: { key }, log }, whenInit } = params;
 
   const mainClientInstance = clientCSDecorator(
     log,
@@ -75,7 +75,10 @@ export function sdkClientMethodCSFactory(params: ISdkFactoryContext): (key?: Spl
         validKey
       );
 
-      sharedSyncManager && sharedSyncManager.start();
+      whenInit(() => {
+        sharedSdkReadiness.readinessManager.init();
+        sharedSyncManager && sharedSyncManager.start();
+      });
 
       log.info(NEW_SHARED_CLIENT);
     } else {

package/src/sdkClient/sdkClientMethodCSWithTT.ts

@@ -17,7 +17,7 @@ import { buildInstanceId } from './identity';
  * (default client) or the client method (shared clients).
  */
 export function sdkClientMethodCSFactory(params: ISdkFactoryContext): (key?: SplitIO.SplitKey, trafficType?: string) => SplitIO.ICsClient {
-  const { clients, storage, syncManager, sdkReadinessManager, settings: { core: { key, trafficType }, log } } = params;
+  const { clients, storage, syncManager, sdkReadinessManager, settings: { core: { key, trafficType }, log }, whenInit } = params;
 
   const mainClientInstance = clientCSDecorator(
     log,
@@ -86,7 +86,10 @@ export function sdkClientMethodCSFactory(params: ISdkFactoryContext): (key?: Spl
         validTrafficType
       );
 
-      sharedSyncManager && sharedSyncManager.start();
+      whenInit(() => {
+        sharedSdkReadiness.readinessManager.init();
+        sharedSyncManager && sharedSyncManager.start();
+      });
 
       log.info(NEW_SHARED_CLIENT);
     } else {

package/src/sdkFactory/index.ts

@@ -23,14 +23,20 @@ export function sdkFactory(params: ISdkFactoryParams): SplitIO.ICsSDK | SplitIO.
   const { settings, platform, storageFactory, splitApiFactory, extraProps,
     syncManagerFactory, SignalListener, impressionsObserverFactory,
     integrationsManagerFactory, sdkManagerFactory, sdkClientMethodFactory,
-    filterAdapterFactory } = params;
+    filterAdapterFactory, isPure } = params;
   const { log, sync: { impressionsMode } } = settings;
 
   // @TODO handle non-recoverable errors, such as, global `fetch` not available, invalid SDK Key, etc.
   // On non-recoverable errors, we should mark the SDK as destroyed and not start synchronization.
 
-  // We will just log and allow for the SDK to end up throwing an SDK_TIMEOUT event for devs to handle.
-  validateAndTrackApiKey(log, settings.core.authorizationKey);
+  // initialization
+  let isInit = false;
+  const initCallbacks: (() => void)[] = [];
+
+  function whenInit(cb: () => void) {
+    if (isInit) cb();
+    else initCallbacks.push(cb);
+  }
 
   const sdkReadinessManager = sdkReadinessManagerFactory(platform.EventEmitter, settings);
   const readiness = sdkReadinessManager.readinessManager;
@@ -70,13 +76,13 @@ export function sdkFactory(params: ISdkFactoryParams): SplitIO.ICsSDK | SplitIO.
       strategy = strategyDebugFactory(observer);
   }
 
-  const impressionsTracker = impressionsTrackerFactory(settings, storage.impressions, strategy, integrationsManager, storage.telemetry);
-  const eventTracker = eventTrackerFactory(settings, storage.events, integrationsManager, storage.telemetry);
+  const impressionsTracker = impressionsTrackerFactory(settings, storage.impressions, strategy, whenInit, integrationsManager, storage.telemetry);
+  const eventTracker = eventTrackerFactory(settings, storage.events, whenInit, integrationsManager, storage.telemetry);
 
   // splitApi is used by SyncManager and Browser signal listener
   const splitApi = splitApiFactory && splitApiFactory(settings, platform, telemetryTracker);
 
-  const ctx: ISdkFactoryContext = { clients, splitApi, eventTracker, impressionsTracker, telemetryTracker, uniqueKeysTracker, sdkReadinessManager, readiness, settings, storage, platform };
+  const ctx: ISdkFactoryContext = { clients, splitApi, eventTracker, impressionsTracker, telemetryTracker, uniqueKeysTracker, sdkReadinessManager, readiness, settings, storage, platform, whenInit };
 
   const syncManager = syncManagerFactory && syncManagerFactory(ctx as ISdkFactoryContextSync);
   ctx.syncManager = syncManager;
@@ -88,8 +94,24 @@ export function sdkFactory(params: ISdkFactoryParams): SplitIO.ICsSDK | SplitIO.
   const clientMethod = sdkClientMethodFactory(ctx);
   const managerInstance = sdkManagerFactory(settings, storage.splits, sdkReadinessManager);
 
-  syncManager && syncManager.start();
-  signalListener && signalListener.start();
+
+  function init() {
+    if (isInit) return;
+    isInit = true;
+
+    // We will just log and allow for the SDK to end up throwing an SDK_TIMEOUT event for devs to handle.
+    validateAndTrackApiKey(log, settings.core.authorizationKey);
+    readiness.init();
+    storage.init && storage.init();
+    uniqueKeysTracker && uniqueKeysTracker.start();
+    syncManager && syncManager.start();
+    signalListener && signalListener.start();
+
+    initCallbacks.forEach((cb) => cb());
+    initCallbacks.length = 0;
+  }
+
+  if (!isPure) init();
 
   log.info(NEW_FACTORY);
 
@@ -110,7 +132,7 @@ export function sdkFactory(params: ISdkFactoryParams): SplitIO.ICsSDK | SplitIO.
     settings,
 
     destroy() {
-      return Promise.all(Object.keys(clients).map(key => clients[key].destroy())).then(() => {});
+      return Promise.all(Object.keys(clients).map(key => clients[key].destroy())).then(() => { });
     }
-  }, extraProps && extraProps(ctx));
+  }, extraProps && extraProps(ctx), isPure && { init });
 }

package/src/sdkFactory/types.ts

@@ -50,6 +50,7 @@ export interface ISdkFactoryContext {
   splitApi?: ISplitApi
   syncManager?: ISyncManager,
   clients: Record<string, IBasicClient>,
+  whenInit(cb: () => void): void
 }
 
 export interface ISdkFactoryContextSync extends ISdkFactoryContext {
@@ -68,6 +69,8 @@ export interface ISdkFactoryContextAsync extends ISdkFactoryContext {
  * Object parameter with the modules required to create an SDK factory instance
  */
 export interface ISdkFactoryParams {
+  // If true, the `sdkFactory` is pure (no side effects), and the SDK instance includes a `init` method to run initialization side effects
+  isPure?: boolean,
 
   // The settings must be already validated
   settings: ISettings,

package/src/storages/dataLoader.ts

@@ -1,6 +1,7 @@
 import { SplitIO } from '../types';
 import { ISegmentsCacheSync, ISplitsCacheSync, IStorageSync } from './types';
 import { setToArray, ISet } from '../utils/lang/sets';
+import { getMatching } from '../utils/key';
 
 /**
  * Storage-agnostic adaptation of `loadDataIntoLocalStorage` function
@@ -15,7 +16,7 @@ import { setToArray, ISet } from '../utils/lang/sets';
  * @TODO add logs, and input validation in this module, in favor of size reduction.
  * @TODO unit tests
  */
-export function loadData(preloadedData: SplitIO.PreloadedData, storage: { splits?: ISplitsCacheSync, segments: ISegmentsCacheSync, largeSegments?: ISegmentsCacheSync }, userKey?: string) {
+export function loadData(preloadedData: SplitIO.PreloadedData, storage: { splits?: ISplitsCacheSync, segments: ISegmentsCacheSync, largeSegments?: ISegmentsCacheSync }, matchingKey?: string) {
   // Do not load data if current preloadedData is empty
   if (Object.keys(preloadedData).length === 0) return;
 
@@ -35,29 +36,28 @@ export function loadData(preloadedData: SplitIO.PreloadedData, storage: { splits
     storage.splits.addSplits(splitsData.map(split => ([split.name, split])));
   }
 
-  if (userKey) { // add mySegments data (client-side)
-    let mySegmentsData = preloadedData.mySegmentsData && preloadedData.mySegmentsData[userKey];
+  if (matchingKey) { // add mySegments data (client-side)
+    let mySegmentsData = preloadedData.mySegmentsData && preloadedData.mySegmentsData[matchingKey];
     if (!mySegmentsData) {
       // segmentsData in an object where the property is the segment name and the pertaining value is a stringified object that contains the `added` array of userIds
       mySegmentsData = Object.keys(segmentsData).filter(segmentName => {
-        const userKeys = segmentsData[segmentName];
-        return userKeys.indexOf(userKey) > -1;
+        const matchingKeys = segmentsData[segmentName];
+        return matchingKeys.indexOf(matchingKey) > -1;
       });
     }
     storage.segments.resetSegments({ k: mySegmentsData.map(s => ({ n: s })) });
   } else { // add segments data (server-side)
     Object.keys(segmentsData).filter(segmentName => {
-      const userKeys = segmentsData[segmentName];
-      storage.segments.addToSegment(segmentName, userKeys);
+      const matchingKeys = segmentsData[segmentName];
+      storage.segments.addToSegment(segmentName, matchingKeys);
     });
   }
 }
 
-export function getSnapshot(storage: IStorageSync, userKeys?: string[]): SplitIO.PreloadedData {
+export function getSnapshot(storage: IStorageSync, userKeys?: SplitIO.SplitKey[]): SplitIO.PreloadedData {
   return {
     // lastUpdated: Date.now(),
-    // @ts-ignore accessing private prop
-    since: storage.splits.changeNumber,
+    since: storage.splits.getChangeNumber(),
     splitsData: storage.splits.getAll(),
     segmentsData: userKeys ?
       undefined : // @ts-ignore accessing private prop
@@ -66,9 +66,8 @@ export function getSnapshot(storage: IStorageSync, userKeys?: string[]): SplitIO
         return prev;
       }, {}),
     mySegmentsData: userKeys ?
-      userKeys.reduce((prev, userKey) => {
-        // @ts-ignore accessing private prop
-        prev[userKey] = storage.shared ?
+      userKeys.reduce<Record<string, string[]>>((prev, userKey) => {
+        prev[getMatching(userKey)] = storage.shared ?
           // Client-side segments
           // @ts-ignore accessing private prop
           Object.keys(storage.shared(userKey).segments.segmentCache) :

package/src/storages/inLocalStorage/index.ts

@@ -45,10 +45,6 @@ export function InLocalStorage(options: InLocalStorageOptions = {}): IStorageSyn
     const segments = new MySegmentsCacheInLocal(log, keys);
     const largeSegments = new MySegmentsCacheInLocal(log, myLargeSegmentsKeyBuilder(prefix, matchingKey));
 
-    if (settings.mode === LOCALHOST_MODE || splits.getChangeNumber() > -1) {
-      Promise.resolve().then(onReadyFromCacheCb);
-    }
-
     return {
       splits,
       segments,
@@ -59,6 +55,12 @@ export function InLocalStorage(options: InLocalStorageOptions = {}): IStorageSyn
       telemetry: shouldRecordTelemetry(params) ? new TelemetryCacheInMemory(splits, segments) : undefined,
       uniqueKeys: impressionsMode === NONE ? new UniqueKeysCacheInMemoryCS() : undefined,
 
+      init() {
+        if (settings.mode === LOCALHOST_MODE || splits.getChangeNumber() > -1) {
+          Promise.resolve().then(onReadyFromCacheCb);
+        }
+      },
+
       destroy() {
         this.splits = new SplitsCacheInMemory(__splitFiltersValidation);
         this.segments = new MySegmentsCacheInMemory();

package/src/storages/inRedis/RedisAdapter.ts

@@ -20,7 +20,7 @@ const DEFAULT_OPTIONS = {
 const DEFAULT_LIBRARY_OPTIONS = {
   enableOfflineQueue: false,
   connectTimeout: DEFAULT_OPTIONS.connectionTimeout,
-  lazyConnect: false
+  lazyConnect: false // @TODO true to avoid side-effects on instantiation.
 };
 
 interface IRedisCommand {