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

package/cjs/sdkFactory/index.js

@@ -25,14 +25,13 @@ function sdkFactory(params) {
     (0, apiKey_1.validateAndTrackApiKey)(log, settings.core.authorizationKey);
     var sdkReadinessManager = (0, sdkReadinessManager_1.sdkReadinessManagerFactory)(log, platform.EventEmitter, settings.startup.readyTimeout);
     var readiness = sdkReadinessManager.readinessManager;
-    var matchingKey = (0, key_1.getMatching)(settings.core.key);
     // @TODO consider passing the settings object, so that each storage access only what it needs
     var storageFactoryParams = {
         impressionsQueueSize: settings.scheduler.impressionsQueueSize,
         eventsQueueSize: settings.scheduler.eventsQueueSize,
         optimize: (0, utils_1.shouldBeOptimized)(settings),
         // ATM, only used by InLocalStorage
-        matchingKey: matchingKey,
+        matchingKey: (0, key_1.getMatching)(settings.core.key),
         splitFiltersValidation: settings.sync.__splitFiltersValidation,
         // ATM, only used by PluggableStorage
         mode: settings.mode,
@@ -48,21 +47,7 @@ function sdkFactory(params) {
         log: log
     };
     var storage = storageFactory(storageFactoryParams);
-    // @TODO dataLoader requires validation
-    if (settings.dataLoader) {
-        settings.dataLoader(storage, matchingKey);
-        Promise.resolve(storage.splits.checkCache()).then(function (cacheReady) {
-            if (cacheReady) {
-                if (settings.sync.onlySubmitters) { // emit SDK_READY to not timeout when not synchronizing splits & segments
-                    readiness.splits.emit(constants_2.SDK_SPLITS_ARRIVED);
-                    readiness.segments.emit(constants_2.SDK_SEGMENTS_ARRIVED);
-                }
-                else { // emit SDK_READY_FROM_CACHE
-                    readiness.splits.emit(constants_2.SDK_SPLITS_CACHE_LOADED);
-                }
-            }
-        });
-    }
+    // @TODO add support for dataloader: `if (params.dataLoader) params.dataLoader(storage);`
     var integrationsManager = integrationsManagerFactory && integrationsManagerFactory({ settings: settings, storage: storage });
     // trackers
     var observer = impressionsObserverFactory && impressionsObserverFactory();
@@ -94,9 +79,6 @@ function sdkFactory(params) {
         // Logger wrapper API
         Logger: (0, sdkLogger_1.createLoggerAPI)(settings.log),
         settings: settings,
-        // @TODO remove
-        __storage: storage,
-        __ctx: ctx
     }, extraProps && extraProps(ctx));
 }
 exports.sdkFactory = sdkFactory;

package/cjs/storages/AbstractSplitsCacheSync.js

@@ -33,7 +33,7 @@ var AbstractSplitsCacheSync = /** @class */ (function () {
      * It is used as condition to emit SDK_SPLITS_CACHE_LOADED, and then SDK_READY_FROM_CACHE.
      */
     AbstractSplitsCacheSync.prototype.checkCache = function () {
-        return this.getChangeNumber() > -1;
+        return false;
     };
     /**
      * Kill `name` split and set `defaultTreatment` and `changeNumber`.

package/cjs/storages/dataLoader.js

@@ -1,27 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DataLoaderFactory = void 0;
+exports.dataLoaderFactory = void 0;
 var browser_1 = require("../utils/constants/browser");
 /**
- * Factory of storage loader
+ * Factory of client-side storage loader
  *
  * @param preloadedData validated data following the format proposed in https://github.com/godaddy/split-javascript-data-loader
  * and extended with a `mySegmentsData` property.
  * @returns function to preload the storage
  */
-function DataLoaderFactory(preloadedData) {
+function dataLoaderFactory(preloadedData) {
     /**
      * Storage-agnostic adaptation of `loadDataIntoLocalStorage` function
      * (https://github.com/godaddy/split-javascript-data-loader/blob/master/src/load-data.js)
      *
      * @param storage object containing `splits` and `segments` cache (client-side variant)
-     * @param userKey user key (matching key) of the provided MySegmentsCache
+     * @param userId user key string of the provided MySegmentsCache
      *
+     * @TODO extend to support SegmentsCache (server-side variant) by making `userId` optional and adding the corresponding logic.
      * @TODO extend to load data on shared mySegments storages. Be specific when emitting SDK_READY_FROM_CACHE on shared clients. Maybe the serializer should provide the `useSegments` flag.
-     * @TODO add logs, and input validation in this module, in favor of size reduction.
-     * @TODO unit tests
      */
-    return function loadData(storage, userKey) {
+    return function loadData(storage, userId) {
         // Do not load data if current preloadedData is empty
         if (Object.keys(preloadedData).length === 0)
             return;
@@ -37,23 +36,16 @@ function DataLoaderFactory(preloadedData) {
         storage.splits.setChangeNumber(since);
         // 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(Object.keys(splitsData).map(function (splitName) { return [splitName, splitsData[splitName]]; }));
-        if (userKey) { // add mySegments data (client-side)
-            var mySegmentsData = preloadedData.mySegmentsData && preloadedData.mySegmentsData[userKey];
-            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;
-                });
-            }
-            storage.segments.resetSegments(mySegmentsData);
-        }
-        else { // add segments data (server-side)
-            Object.keys(segmentsData).filter(function (segmentName) {
-                var userKeys = segmentsData[segmentName];
-                storage.segments.addToSegment(segmentName, userKeys);
+        // add mySegments data
+        var mySegmentsData = preloadedData.mySegmentsData && preloadedData.mySegmentsData[userId];
+        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 userIds = JSON.parse(segmentsData[segmentName]).added;
+                return Array.isArray(userIds) && userIds.indexOf(userId) > -1;
             });
         }
+        storage.segments.resetSegments(mySegmentsData);
     };
 }
-exports.DataLoaderFactory = DataLoaderFactory;
+exports.dataLoaderFactory = dataLoaderFactory;

package/cjs/storages/inMemory/InMemoryStorage.js

@@ -8,7 +8,6 @@ var EventsCacheInMemory_1 = require("./EventsCacheInMemory");
 var ImpressionCountsCacheInMemory_1 = require("./ImpressionCountsCacheInMemory");
 var constants_1 = require("../../utils/constants");
 var TelemetryCacheInMemory_1 = require("./TelemetryCacheInMemory");
-var sets_1 = require("../../utils/lang/sets");
 /**
  * InMemory storage factory for standalone server-side SplitFactory
  *
@@ -29,20 +28,7 @@ function InMemoryStorageFactory(params) {
             this.impressions.clear();
             this.impressionCounts && this.impressionCounts.clear();
             this.events.clear();
-        },
-        // @ts-ignore, private method, for POC
-        getSnapshot: function () {
-            var _this = this;
-            return {
-                lastUpdated: Date.now(),
-                since: this.splits.changeNumber,
-                splitsData: this.splits.splitsCache,
-                segmentsData: Object.keys(this.segments.segmentCache).reduce(function (prev, cur) {
-                    prev[cur] = (0, sets_1.setToArray)(_this.segments.segmentCache[cur]);
-                    return prev;
-                }, {})
-            };
-        },
+        }
     };
 }
 exports.InMemoryStorageFactory = InMemoryStorageFactory;

package/cjs/storages/inMemory/InMemoryStorageCS.js

@@ -29,18 +29,6 @@ function InMemoryStorageCSFactory(params) {
             this.impressionCounts && this.impressionCounts.clear();
             this.events.clear();
         },
-        // @ts-ignore, private method, for POC
-        getSnapshot: function () {
-            var _a;
-            return {
-                lastUpdated: Date.now(),
-                since: this.splits.changeNumber,
-                splitsData: this.splits.splitsCache,
-                mySegmentsData: (_a = {},
-                    _a[params.matchingKey] = Object.keys(this.segments.segmentCache),
-                    _a)
-            };
-        },
         // When using shared instanciation with MEMORY we reuse everything but segments (they are unique per key)
         shared: function () {
             return {

package/cjs/sync/syncManagerOnline.js

@@ -19,9 +19,9 @@ function syncManagerOnlineFactory(pollingManagerFactory, pushManagerFactory) {
      * SyncManager factory for modular SDK
      */
     return function (params) {
-        var settings = params.settings, _a = params.settings, log = _a.log, streamingEnabled = _a.streamingEnabled, _b = _a.sync, syncEnabled = _b.enabled, onlySubmitters = _b.onlySubmitters, telemetryTracker = params.telemetryTracker;
+        var settings = params.settings, _a = params.settings, log = _a.log, streamingEnabled = _a.streamingEnabled, syncEnabled = _a.sync.enabled, telemetryTracker = params.telemetryTracker;
         /** Polling Manager */
-        var pollingManager = onlySubmitters ? undefined : pollingManagerFactory && pollingManagerFactory(params);
+        var pollingManager = pollingManagerFactory && pollingManagerFactory(params);
         /** Push Manager */
         var pushManager = syncEnabled && streamingEnabled && pollingManager && pushManagerFactory ?
             pushManagerFactory(params, pollingManager) :

package/cjs/trackers/impressionObserver/impressionObserverCS.js

@@ -5,7 +5,7 @@ var ImpressionObserver_1 = require("./ImpressionObserver");
 var murmur3_1 = require("../../utils/murmur3/murmur3");
 var buildKey_1 = require("./buildKey");
 function hashImpression32(impression) {
-    return (0, murmur3_1.hash)((0, buildKey_1.buildKey)(impression)).toString();
+    return (0, murmur3_1.hash)((0, buildKey_1.buildKey)(impression));
 }
 exports.hashImpression32 = hashImpression32;
 var LAST_SEEN_CACHE_SIZE = 500; // cache up to 500 impression hashes

package/cjs/utils/settingsValidation/index.js

@@ -127,9 +127,6 @@ function settingsValidation(config, validationParams) {
     // ensure a valid SDK mode
     // @ts-ignore, modify readonly prop
     withDefaults.mode = (0, mode_1.mode)(withDefaults.core.authorizationKey, withDefaults.mode);
-    if (withDefaults.sync.onlySubmitters && withDefaults.mode === constants_1.STANDALONE_MODE && !withDefaults.dataLoader) {
-        throw new Error('To use `onlySubmitters` param in standalone mode, DataLoader is required to preload data into the storage');
-    }
     // ensure a valid Storage based on mode defined.
     // @ts-ignore, modify readonly prop
     if (storage)
@@ -172,13 +169,9 @@ function settingsValidation(config, validationParams) {
         scheduler.pushRetryBackoffBase = fromSecondsToMillis(scheduler.pushRetryBackoffBase);
     }
     // validate sync enabled
-    if (withDefaults.sync.enabled !== false) {
+    if (withDefaults.sync.enabled !== false) { // @ts-ignore, modify readonly prop
         withDefaults.sync.enabled = true;
     }
-    // validate sync onlySubmitters
-    if (withDefaults.sync.onlySubmitters !== true) {
-        withDefaults.sync.onlySubmitters = false;
-    }
     // validate the `splitFilters` settings and parse splits query
     var splitFiltersValidation = (0, splitFilters_1.validateSplitFilters)(log, withDefaults.sync.splitFilters, withDefaults.mode);
     withDefaults.sync.splitFilters = splitFiltersValidation.validFilters;

package/esm/sdkFactory/index.js

@@ -8,7 +8,7 @@ import { validateAndTrackApiKey } from '../utils/inputValidation/apiKey';
 import { createLoggerAPI } from '../logger/sdkLogger';
 import { NEW_FACTORY, RETRIEVE_MANAGER } from '../logger/constants';
 import { metadataBuilder } from '../storages/metadataBuilder';
-import { SDK_SPLITS_ARRIVED, SDK_SEGMENTS_ARRIVED, SDK_SPLITS_CACHE_LOADED } from '../readiness/constants';
+import { SDK_SPLITS_ARRIVED, SDK_SEGMENTS_ARRIVED } from '../readiness/constants';
 import { objectAssign } from '../utils/lang/objectAssign';
 /**
  * Modular SDK factory
@@ -22,14 +22,13 @@ export function sdkFactory(params) {
     validateAndTrackApiKey(log, settings.core.authorizationKey);
     var sdkReadinessManager = sdkReadinessManagerFactory(log, platform.EventEmitter, settings.startup.readyTimeout);
     var readiness = sdkReadinessManager.readinessManager;
-    var matchingKey = getMatching(settings.core.key);
     // @TODO consider passing the settings object, so that each storage access only what it needs
     var storageFactoryParams = {
         impressionsQueueSize: settings.scheduler.impressionsQueueSize,
         eventsQueueSize: settings.scheduler.eventsQueueSize,
         optimize: shouldBeOptimized(settings),
         // ATM, only used by InLocalStorage
-        matchingKey: matchingKey,
+        matchingKey: getMatching(settings.core.key),
         splitFiltersValidation: settings.sync.__splitFiltersValidation,
         // ATM, only used by PluggableStorage
         mode: settings.mode,
@@ -45,21 +44,7 @@ export function sdkFactory(params) {
         log: log
     };
     var storage = storageFactory(storageFactoryParams);
-    // @TODO dataLoader requires validation
-    if (settings.dataLoader) {
-        settings.dataLoader(storage, matchingKey);
-        Promise.resolve(storage.splits.checkCache()).then(function (cacheReady) {
-            if (cacheReady) {
-                if (settings.sync.onlySubmitters) { // emit SDK_READY to not timeout when not synchronizing splits & segments
-                    readiness.splits.emit(SDK_SPLITS_ARRIVED);
-                    readiness.segments.emit(SDK_SEGMENTS_ARRIVED);
-                }
-                else { // emit SDK_READY_FROM_CACHE
-                    readiness.splits.emit(SDK_SPLITS_CACHE_LOADED);
-                }
-            }
-        });
-    }
+    // @TODO add support for dataloader: `if (params.dataLoader) params.dataLoader(storage);`
     var integrationsManager = integrationsManagerFactory && integrationsManagerFactory({ settings: settings, storage: storage });
     // trackers
     var observer = impressionsObserverFactory && impressionsObserverFactory();
@@ -91,8 +76,5 @@ export function sdkFactory(params) {
         // Logger wrapper API
         Logger: createLoggerAPI(settings.log),
         settings: settings,
-        // @TODO remove
-        __storage: storage,
-        __ctx: ctx
     }, extraProps && extraProps(ctx));
 }

package/esm/storages/AbstractSplitsCacheSync.js

@@ -30,7 +30,7 @@ var AbstractSplitsCacheSync = /** @class */ (function () {
      * It is used as condition to emit SDK_SPLITS_CACHE_LOADED, and then SDK_READY_FROM_CACHE.
      */
     AbstractSplitsCacheSync.prototype.checkCache = function () {
-        return this.getChangeNumber() > -1;
+        return false;
     };
     /**
      * Kill `name` split and set `defaultTreatment` and `changeNumber`.

package/esm/storages/dataLoader.js

@@ -1,24 +1,23 @@
 import { DEFAULT_CACHE_EXPIRATION_IN_MILLIS } from '../utils/constants/browser';
 /**
- * Factory of storage loader
+ * Factory of client-side storage loader
  *
  * @param preloadedData validated data following the format proposed in https://github.com/godaddy/split-javascript-data-loader
  * and extended with a `mySegmentsData` property.
  * @returns function to preload the storage
  */
-export function DataLoaderFactory(preloadedData) {
+export function dataLoaderFactory(preloadedData) {
     /**
      * Storage-agnostic adaptation of `loadDataIntoLocalStorage` function
      * (https://github.com/godaddy/split-javascript-data-loader/blob/master/src/load-data.js)
      *
      * @param storage object containing `splits` and `segments` cache (client-side variant)
-     * @param userKey user key (matching key) of the provided MySegmentsCache
+     * @param userId user key string of the provided MySegmentsCache
      *
+     * @TODO extend to support SegmentsCache (server-side variant) by making `userId` optional and adding the corresponding logic.
      * @TODO extend to load data on shared mySegments storages. Be specific when emitting SDK_READY_FROM_CACHE on shared clients. Maybe the serializer should provide the `useSegments` flag.
-     * @TODO add logs, and input validation in this module, in favor of size reduction.
-     * @TODO unit tests
      */
-    return function loadData(storage, userKey) {
+    return function loadData(storage, userId) {
         // Do not load data if current preloadedData is empty
         if (Object.keys(preloadedData).length === 0)
             return;
@@ -34,22 +33,15 @@ export function DataLoaderFactory(preloadedData) {
         storage.splits.setChangeNumber(since);
         // 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(Object.keys(splitsData).map(function (splitName) { return [splitName, splitsData[splitName]]; }));
-        if (userKey) { // add mySegments data (client-side)
-            var mySegmentsData = preloadedData.mySegmentsData && preloadedData.mySegmentsData[userKey];
-            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;
-                });
-            }
-            storage.segments.resetSegments(mySegmentsData);
-        }
-        else { // add segments data (server-side)
-            Object.keys(segmentsData).filter(function (segmentName) {
-                var userKeys = segmentsData[segmentName];
-                storage.segments.addToSegment(segmentName, userKeys);
+        // add mySegments data
+        var mySegmentsData = preloadedData.mySegmentsData && preloadedData.mySegmentsData[userId];
+        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 userIds = JSON.parse(segmentsData[segmentName]).added;
+                return Array.isArray(userIds) && userIds.indexOf(userId) > -1;
             });
         }
+        storage.segments.resetSegments(mySegmentsData);
     };
 }

package/esm/storages/inMemory/InMemoryStorage.js

@@ -5,7 +5,6 @@ import { EventsCacheInMemory } from './EventsCacheInMemory';
 import { ImpressionCountsCacheInMemory } from './ImpressionCountsCacheInMemory';
 import { LOCALHOST_MODE, STORAGE_MEMORY } from '../../utils/constants';
 import { TelemetryCacheInMemory } from './TelemetryCacheInMemory';
-import { setToArray } from '../../utils/lang/sets';
 /**
  * InMemory storage factory for standalone server-side SplitFactory
  *
@@ -26,20 +25,7 @@ export function InMemoryStorageFactory(params) {
             this.impressions.clear();
             this.impressionCounts && this.impressionCounts.clear();
             this.events.clear();
-        },
-        // @ts-ignore, private method, for POC
-        getSnapshot: function () {
-            var _this = this;
-            return {
-                lastUpdated: Date.now(),
-                since: this.splits.changeNumber,
-                splitsData: this.splits.splitsCache,
-                segmentsData: Object.keys(this.segments.segmentCache).reduce(function (prev, cur) {
-                    prev[cur] = setToArray(_this.segments.segmentCache[cur]);
-                    return prev;
-                }, {})
-            };
-        },
+        }
     };
 }
 InMemoryStorageFactory.type = STORAGE_MEMORY;

package/esm/storages/inMemory/InMemoryStorageCS.js

@@ -26,18 +26,6 @@ export function InMemoryStorageCSFactory(params) {
             this.impressionCounts && this.impressionCounts.clear();
             this.events.clear();
         },
-        // @ts-ignore, private method, for POC
-        getSnapshot: function () {
-            var _a;
-            return {
-                lastUpdated: Date.now(),
-                since: this.splits.changeNumber,
-                splitsData: this.splits.splitsCache,
-                mySegmentsData: (_a = {},
-                    _a[params.matchingKey] = Object.keys(this.segments.segmentCache),
-                    _a)
-            };
-        },
         // When using shared instanciation with MEMORY we reuse everything but segments (they are unique per key)
         shared: function () {
             return {

package/esm/sync/syncManagerOnline.js

@@ -16,9 +16,9 @@ export function syncManagerOnlineFactory(pollingManagerFactory, pushManagerFacto
      * SyncManager factory for modular SDK
      */
     return function (params) {
-        var settings = params.settings, _a = params.settings, log = _a.log, streamingEnabled = _a.streamingEnabled, _b = _a.sync, syncEnabled = _b.enabled, onlySubmitters = _b.onlySubmitters, telemetryTracker = params.telemetryTracker;
+        var settings = params.settings, _a = params.settings, log = _a.log, streamingEnabled = _a.streamingEnabled, syncEnabled = _a.sync.enabled, telemetryTracker = params.telemetryTracker;
         /** Polling Manager */
-        var pollingManager = onlySubmitters ? undefined : pollingManagerFactory && pollingManagerFactory(params);
+        var pollingManager = pollingManagerFactory && pollingManagerFactory(params);
         /** Push Manager */
         var pushManager = syncEnabled && streamingEnabled && pollingManager && pushManagerFactory ?
             pushManagerFactory(params, pollingManager) :

package/esm/trackers/impressionObserver/impressionObserverCS.js

@@ -2,7 +2,7 @@ import { ImpressionObserver } from './ImpressionObserver';
 import { hash } from '../../utils/murmur3/murmur3';
 import { buildKey } from './buildKey';
 export function hashImpression32(impression) {
-    return hash(buildKey(impression)).toString();
+    return hash(buildKey(impression));
 }
 var LAST_SEEN_CACHE_SIZE = 500; // cache up to 500 impression hashes
 export function impressionObserverCSFactory() {

package/esm/utils/settingsValidation/index.js

@@ -124,9 +124,6 @@ export function settingsValidation(config, validationParams) {
     // ensure a valid SDK mode
     // @ts-ignore, modify readonly prop
     withDefaults.mode = mode(withDefaults.core.authorizationKey, withDefaults.mode);
-    if (withDefaults.sync.onlySubmitters && withDefaults.mode === STANDALONE_MODE && !withDefaults.dataLoader) {
-        throw new Error('To use `onlySubmitters` param in standalone mode, DataLoader is required to preload data into the storage');
-    }
     // ensure a valid Storage based on mode defined.
     // @ts-ignore, modify readonly prop
     if (storage)
@@ -169,13 +166,9 @@ export function settingsValidation(config, validationParams) {
         scheduler.pushRetryBackoffBase = fromSecondsToMillis(scheduler.pushRetryBackoffBase);
     }
     // validate sync enabled
-    if (withDefaults.sync.enabled !== false) {
+    if (withDefaults.sync.enabled !== false) { // @ts-ignore, modify readonly prop
         withDefaults.sync.enabled = true;
     }
-    // validate sync onlySubmitters
-    if (withDefaults.sync.onlySubmitters !== true) {
-        withDefaults.sync.onlySubmitters = false;
-    }
     // validate the `splitFilters` settings and parse splits query
     var splitFiltersValidation = validateSplitFilters(log, withDefaults.sync.splitFilters, withDefaults.mode);
     withDefaults.sync.splitFilters = splitFiltersValidation.validFilters;

package/package.json

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

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 { IStorageFactoryParams, IStorageSync } from '../storages/types';
+import { IStorageFactoryParams } from '../storages/types';
 import { SplitIO } from '../types';
 import { getMatching } from '../utils/key';
 import { shouldBeOptimized } from '../trackers/impressionObserver/utils';
@@ -11,7 +11,7 @@ import { validateAndTrackApiKey } from '../utils/inputValidation/apiKey';
 import { createLoggerAPI } from '../logger/sdkLogger';
 import { NEW_FACTORY, RETRIEVE_MANAGER } from '../logger/constants';
 import { metadataBuilder } from '../storages/metadataBuilder';
-import { SDK_SPLITS_ARRIVED, SDK_SEGMENTS_ARRIVED, SDK_SPLITS_CACHE_LOADED } from '../readiness/constants';
+import { SDK_SPLITS_ARRIVED, SDK_SEGMENTS_ARRIVED } from '../readiness/constants';
 import { objectAssign } from '../utils/lang/objectAssign';
 
 /**
@@ -32,7 +32,6 @@ export function sdkFactory(params: ISdkFactoryParams): SplitIO.ICsSDK | SplitIO.
 
   const sdkReadinessManager = sdkReadinessManagerFactory(log, platform.EventEmitter, settings.startup.readyTimeout);
   const readiness = sdkReadinessManager.readinessManager;
-  const matchingKey = getMatching(settings.core.key);
 
   // @TODO consider passing the settings object, so that each storage access only what it needs
   const storageFactoryParams: IStorageFactoryParams = {
@@ -41,7 +40,7 @@ export function sdkFactory(params: ISdkFactoryParams): SplitIO.ICsSDK | SplitIO.
     optimize: shouldBeOptimized(settings),
 
     // ATM, only used by InLocalStorage
-    matchingKey,
+    matchingKey: getMatching(settings.core.key),
     splitFiltersValidation: settings.sync.__splitFiltersValidation,
 
     // ATM, only used by PluggableStorage
@@ -59,21 +58,7 @@ export function sdkFactory(params: ISdkFactoryParams): SplitIO.ICsSDK | SplitIO.
   };
 
   const storage = storageFactory(storageFactoryParams);
-
-  // @TODO dataLoader requires validation
-  if (settings.dataLoader) {
-    settings.dataLoader(storage as IStorageSync, matchingKey);
-    Promise.resolve(storage.splits.checkCache()).then(cacheReady => {
-      if (cacheReady) {
-        if (settings.sync.onlySubmitters) { // emit SDK_READY to not timeout when not synchronizing splits & segments
-          readiness.splits.emit(SDK_SPLITS_ARRIVED);
-          readiness.segments.emit(SDK_SEGMENTS_ARRIVED);
-        } else { // emit SDK_READY_FROM_CACHE
-          readiness.splits.emit(SDK_SPLITS_CACHE_LOADED);
-        }
-      }
-    });
-  }
+  // @TODO add support for dataloader: `if (params.dataLoader) params.dataLoader(storage);`
 
   const integrationsManager = integrationsManagerFactory && integrationsManagerFactory({ settings, storage });
 
@@ -118,9 +103,5 @@ export function sdkFactory(params: ISdkFactoryParams): SplitIO.ICsSDK | SplitIO.
     Logger: createLoggerAPI(settings.log),
 
     settings,
-
-    // @TODO remove
-    __storage: storage,
-    __ctx: ctx
   }, extraProps && extraProps(ctx));
 }

package/src/storages/AbstractSplitsCacheSync.ts

@@ -50,7 +50,7 @@ export abstract class AbstractSplitsCacheSync implements ISplitsCacheSync {
    * It is used as condition to emit SDK_SPLITS_CACHE_LOADED, and then SDK_READY_FROM_CACHE.
    */
   checkCache(): boolean {
-    return this.getChangeNumber() > -1;
+    return false;
   }
 
   /**

package/src/storages/dataLoader.ts

@@ -3,26 +3,25 @@ import { DEFAULT_CACHE_EXPIRATION_IN_MILLIS } from '../utils/constants/browser';
 import { DataLoader, ISegmentsCacheSync, ISplitsCacheSync } from './types';
 
 /**
- * Factory of storage loader
+ * Factory of client-side storage loader
  *
  * @param preloadedData validated data following the format proposed in https://github.com/godaddy/split-javascript-data-loader
  * and extended with a `mySegmentsData` property.
  * @returns function to preload the storage
  */
-export function DataLoaderFactory(preloadedData: SplitIO.PreloadedData): DataLoader {
+export function dataLoaderFactory(preloadedData: SplitIO.PreloadedData): DataLoader {
 
   /**
    * Storage-agnostic adaptation of `loadDataIntoLocalStorage` function
    * (https://github.com/godaddy/split-javascript-data-loader/blob/master/src/load-data.js)
    *
    * @param storage object containing `splits` and `segments` cache (client-side variant)
-   * @param userKey user key (matching key) of the provided MySegmentsCache
+   * @param userId user key string of the provided MySegmentsCache
    *
+   * @TODO extend to support SegmentsCache (server-side variant) by making `userId` optional and adding the corresponding logic.
    * @TODO extend to load data on shared mySegments storages. Be specific when emitting SDK_READY_FROM_CACHE on shared clients. Maybe the serializer should provide the `useSegments` flag.
-   * @TODO add logs, and input validation in this module, in favor of size reduction.
-   * @TODO unit tests
    */
-  return function loadData(storage: { splits: ISplitsCacheSync, segments: ISegmentsCacheSync }, userKey?: string) {
+  return function loadData(storage: { splits: ISplitsCacheSync, segments: ISegmentsCacheSync }, userId: string) {
     // Do not load data if current preloadedData is empty
     if (Object.keys(preloadedData).length === 0) return;
 
@@ -42,21 +41,15 @@ export function DataLoaderFactory(preloadedData: SplitIO.PreloadedData): DataLoa
     // 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(Object.keys(splitsData).map(splitName => [splitName, splitsData[splitName]]));
 
-    if (userKey) { // add mySegments data (client-side)
-      let mySegmentsData = preloadedData.mySegmentsData && preloadedData.mySegmentsData[userKey];
-      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;
-        });
-      }
-      storage.segments.resetSegments(mySegmentsData);
-    } else { // add segments data (server-side)
-      Object.keys(segmentsData).filter(segmentName => {
-        const userKeys = segmentsData[segmentName];
-        storage.segments.addToSegment(segmentName, userKeys);
+    // add mySegments data
+    let mySegmentsData = preloadedData.mySegmentsData && preloadedData.mySegmentsData[userId];
+    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 userIds = JSON.parse(segmentsData[segmentName]).added;
+        return Array.isArray(userIds) && userIds.indexOf(userId) > -1;
       });
     }
+    storage.segments.resetSegments(mySegmentsData);
   };
 }

package/src/storages/inMemory/InMemoryStorage.ts

@@ -6,8 +6,6 @@ import { IStorageFactoryParams, IStorageSync } from '../types';
 import { ImpressionCountsCacheInMemory } from './ImpressionCountsCacheInMemory';
 import { LOCALHOST_MODE, STORAGE_MEMORY } from '../../utils/constants';
 import { TelemetryCacheInMemory } from './TelemetryCacheInMemory';
-import { SplitIO } from '../../types';
-import { setToArray, ISet } from '../../utils/lang/sets';
 
 /**
  * InMemory storage factory for standalone server-side SplitFactory
@@ -31,20 +29,7 @@ export function InMemoryStorageFactory(params: IStorageFactoryParams): IStorageS
       this.impressions.clear();
       this.impressionCounts && this.impressionCounts.clear();
       this.events.clear();
-    },
-
-    // @ts-ignore, private method, for POC
-    getSnapshot(): SplitIO.PreloadedData {
-      return {
-        lastUpdated: Date.now(), // @ts-ignore accessing private prop
-        since: this.splits.changeNumber, // @ts-ignore accessing private prop
-        splitsData: this.splits.splitsCache, // @ts-ignore accessing private prop
-        segmentsData: Object.keys(this.segments.segmentCache).reduce((prev, cur) => { // @ts-ignore accessing private prop
-          prev[cur] = setToArray(this.segments.segmentCache[cur] as ISet<string>);
-          return prev;
-        }, {})
-      };
-    },
+    }
   };
 }