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

package/esm/sdkFactory/index.js

@@ -5,7 +5,7 @@ import { telemetryTrackerFactory } from '../trackers/telemetryTracker';
 import { validateAndTrackApiKey } from '../utils/inputValidation/apiKey';
 import { createLoggerAPI } from '../logger/sdkLogger';
 import { NEW_FACTORY, RETRIEVE_MANAGER } from '../logger/constants';
-import { SDK_SPLITS_ARRIVED, SDK_SEGMENTS_ARRIVED } from '../readiness/constants';
+import { SDK_SPLITS_ARRIVED, SDK_SEGMENTS_ARRIVED, SDK_SPLITS_CACHE_LOADED } from '../readiness/constants';
 import { objectAssign } from '../utils/lang/objectAssign';
 import { strategyDebugFactory } from '../trackers/strategy/strategyDebug';
 import { strategyOptimizedFactory } from '../trackers/strategy/strategyOptimized';
@@ -16,12 +16,19 @@ import { NONE, OPTIMIZED } from '../utils/constants';
  * Modular SDK factory
  */
 export function sdkFactory(params) {
-    var settings = params.settings, platform = params.platform, storageFactory = params.storageFactory, splitApiFactory = params.splitApiFactory, extraProps = params.extraProps, syncManagerFactory = params.syncManagerFactory, SignalListener = params.SignalListener, impressionsObserverFactory = params.impressionsObserverFactory, integrationsManagerFactory = params.integrationsManagerFactory, sdkManagerFactory = params.sdkManagerFactory, sdkClientMethodFactory = params.sdkClientMethodFactory, filterAdapterFactory = params.filterAdapterFactory;
+    var settings = params.settings, platform = params.platform, storageFactory = params.storageFactory, splitApiFactory = params.splitApiFactory, extraProps = params.extraProps, syncManagerFactory = params.syncManagerFactory, SignalListener = params.SignalListener, impressionsObserverFactory = params.impressionsObserverFactory, integrationsManagerFactory = params.integrationsManagerFactory, sdkManagerFactory = params.sdkManagerFactory, sdkClientMethodFactory = params.sdkClientMethodFactory, filterAdapterFactory = params.filterAdapterFactory, lazyInit = params.lazyInit;
     var log = settings.log, impressionsMode = settings.sync.impressionsMode;
     // @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
+    var hasInit = false;
+    var initCallbacks = [];
+    function whenInit(cb) {
+        if (hasInit)
+            cb();
+        else
+            initCallbacks.push(cb);
+    }
     var sdkReadinessManager = sdkReadinessManagerFactory(platform.EventEmitter, settings);
     var readiness = sdkReadinessManager.readinessManager;
     var storage = storageFactory({
@@ -35,8 +42,10 @@ export function sdkFactory(params) {
             readiness.splits.emit(SDK_SPLITS_ARRIVED);
             readiness.segments.emit(SDK_SEGMENTS_ARRIVED);
         },
+        onReadyFromCacheCb: function () {
+            readiness.splits.emit(SDK_SPLITS_CACHE_LOADED);
+        }
     });
-    // @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 });
@@ -53,8 +62,8 @@ export function sdkFactory(params) {
         default:
             strategy = strategyDebugFactory(observer);
     }
-    var impressionsTracker = impressionsTrackerFactory(settings, storage.impressions, strategy, integrationsManager, storage.telemetry);
-    var eventTracker = eventTrackerFactory(settings, storage.events, integrationsManager, storage.telemetry);
+    var impressionsTracker = impressionsTrackerFactory(settings, storage.impressions, strategy, whenInit, integrationsManager, storage.telemetry);
+    var eventTracker = eventTrackerFactory(settings, storage.events, whenInit, integrationsManager, storage.telemetry);
     // splitApi is used by SyncManager and Browser signal listener
     var splitApi = splitApiFactory && splitApiFactory(settings, platform, telemetryTracker);
     var ctx = { clients: clients, splitApi: splitApi, eventTracker: eventTracker, impressionsTracker: impressionsTracker, telemetryTracker: telemetryTracker, uniqueKeysTracker: uniqueKeysTracker, sdkReadinessManager: sdkReadinessManager, readiness: readiness, settings: settings, storage: storage, platform: platform };
@@ -65,8 +74,19 @@ export function sdkFactory(params) {
     // SDK client and manager
     var clientMethod = sdkClientMethodFactory(ctx);
     var managerInstance = sdkManagerFactory(settings, storage.splits, sdkReadinessManager);
-    syncManager && syncManager.start();
-    signalListener && signalListener.start();
+    function init() {
+        if (hasInit)
+            return;
+        hasInit = 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();
+        uniqueKeysTracker && uniqueKeysTracker.start();
+        syncManager && syncManager.start();
+        signalListener && signalListener.start();
+        initCallbacks.forEach(function (cb) { return cb(); });
+        initCallbacks.length = 0;
+    }
     log.info(NEW_FACTORY);
     // @ts-ignore
     return objectAssign({
@@ -83,5 +103,5 @@ export function sdkFactory(params) {
         destroy: function () {
             return Promise.all(Object.keys(clients).map(function (key) { return clients[key].destroy(); })).then(function () { });
         }
-    }, extraProps && extraProps(ctx));
+    }, extraProps && extraProps(ctx), lazyInit ? { init: init } : init());
 }

package/esm/storages/{AbstractSegmentsCacheSync.js → AbstractMySegmentsCacheSync.js}

@@ -2,35 +2,33 @@
  * This class provides a skeletal implementation of the ISegmentsCacheSync interface
  * to minimize the effort required to implement this interface.
  */
-var AbstractSegmentsCacheSync = /** @class */ (function () {
-    function AbstractSegmentsCacheSync() {
+var AbstractMySegmentsCacheSync = /** @class */ (function () {
+    function AbstractMySegmentsCacheSync() {
     }
     /**
      * clear the cache.
      */
-    AbstractSegmentsCacheSync.prototype.clear = function () {
+    AbstractMySegmentsCacheSync.prototype.clear = function () {
         this.resetSegments({});
     };
-    /**
-     * For server-side synchronizer: add the given list of segments to the cache, with an empty list of keys. The segments that already exist are not modified.
-     * For client-side synchronizer: the method is not used.
-     */
-    AbstractSegmentsCacheSync.prototype.registerSegments = function (names) { return false; };
+    // No-op. Not used in client-side.
+    AbstractMySegmentsCacheSync.prototype.registerSegments = function () { return false; };
+    AbstractMySegmentsCacheSync.prototype.update = function () { return false; };
     /**
      * For server-side synchronizer: the method is not used.
      * For client-side synchronizer: it resets or updates the cache.
      */
-    AbstractSegmentsCacheSync.prototype.resetSegments = function (segmentsData) {
+    AbstractMySegmentsCacheSync.prototype.resetSegments = function (segmentsData) {
         var _this = this;
-        this.setChangeNumber(undefined, segmentsData.cn);
+        this.setChangeNumber(segmentsData.cn);
         var _a = segmentsData, added = _a.added, removed = _a.removed;
         if (added && removed) {
             var isDiff_1 = false;
             added.forEach(function (segment) {
-                isDiff_1 = _this.addToSegment(segment) || isDiff_1;
+                isDiff_1 = _this.addSegment(segment) || isDiff_1;
             });
             removed.forEach(function (segment) {
-                isDiff_1 = _this.removeFromSegment(segment) || isDiff_1;
+                isDiff_1 = _this.removeSegment(segment) || isDiff_1;
             });
             return isDiff_1;
         }
@@ -47,13 +45,13 @@ var AbstractSegmentsCacheSync = /** @class */ (function () {
             return false;
         // Slowest path => add and/or remove segments
         for (var removeIndex = index; removeIndex < storedSegmentKeys.length; removeIndex++) {
-            this.removeFromSegment(storedSegmentKeys[removeIndex]);
+            this.removeSegment(storedSegmentKeys[removeIndex]);
         }
         for (var addIndex = index; addIndex < names.length; addIndex++) {
-            this.addToSegment(names[addIndex]);
+            this.addSegment(names[addIndex]);
         }
         return true;
     };
-    return AbstractSegmentsCacheSync;
+    return AbstractMySegmentsCacheSync;
 }());
-export { AbstractSegmentsCacheSync };
+export { AbstractMySegmentsCacheSync };

package/esm/storages/dataLoader.js

@@ -1,47 +1,108 @@
-import { DEFAULT_CACHE_EXPIRATION_IN_MILLIS } from '../utils/constants/browser';
+import { setToArray } from '../utils/lang/sets';
+import { getMatching } from '../utils/key';
 /**
- * Factory of client-side storage loader
+ * Storage-agnostic adaptation of `loadDataIntoLocalStorage` function
+ * (https://github.com/godaddy/split-javascript-data-loader/blob/master/src/load-data.js)
  *
- * @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
+ * @param preloadedData validated data following the format proposed in https://github.com/godaddy/split-javascript-data-loader and extended with a `mySegmentsData` property.
+ * @param storage object containing `splits` and `segments` cache (client-side variant)
+ * @param userKey user key (matching key) of the provided MySegmentsCache
+ *
+ * @TODO extend to load largeSegments
+ * @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
  */
-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 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.
-     */
-    return function loadData(storage, userId) {
-        // Do not load data if current preloadedData is empty
-        if (Object.keys(preloadedData).length === 0)
-            return;
-        var _a = preloadedData.lastUpdated, lastUpdated = _a === void 0 ? -1 : _a, _b = preloadedData.segmentsData, segmentsData = _b === void 0 ? {} : _b, _c = preloadedData.since, since = _c === void 0 ? -1 : _c, _d = preloadedData.splitsData, splitsData = _d === void 0 ? {} : _d;
+export function loadData(preloadedData, storage, matchingKey) {
+    // Do not load data if current preloadedData is empty
+    if (Object.keys(preloadedData).length === 0)
+        return;
+    var _a = preloadedData.segmentsData, segmentsData = _a === void 0 ? {} : _a, _b = preloadedData.since, since = _b === void 0 ? -1 : _b, _c = preloadedData.splitsData, splitsData = _c === void 0 ? [] : _c;
+    if (storage.splits) {
         var storedSince = storage.splits.getChangeNumber();
-        var expirationTimestamp = Date.now() - DEFAULT_CACHE_EXPIRATION_IN_MILLIS;
-        // Do not load data if current localStorage data is more recent,
-        // or if its `lastUpdated` timestamp is older than the given `expirationTimestamp`,
-        if (storedSince > since || lastUpdated < expirationTimestamp)
+        // Do not load data if current data is more recent
+        if (storedSince > since)
             return;
         // cleaning up the localStorage data, since some cached splits might need be part of the preloaded data
         storage.splits.clear();
         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 JSON.parse(splitsData[splitName]); }));
-        // 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.splits.addSplits(splitsData.map(function (split) { return ([split.name, split]); }));
+    }
+    if (matchingKey) { // add mySegments data (client-side)
+        var membershipsData = preloadedData.membershipsData && preloadedData.membershipsData[matchingKey];
+        if (!membershipsData && segmentsData) {
+            membershipsData = {
+                ms: {
+                    k: Object.keys(segmentsData).filter(function (segmentName) {
+                        var segmentKeys = segmentsData[segmentName];
+                        return segmentKeys.indexOf(matchingKey) > -1;
+                    }).map(function (segmentName) { return ({ n: segmentName }); })
+                }
+            };
         }
-        storage.segments.resetSegments({ k: mySegmentsData.map(function (s) { return ({ n: s }); }) });
+        if (membershipsData) {
+            if (membershipsData.ms)
+                storage.segments.resetSegments(membershipsData.ms);
+            if (membershipsData.ls && storage.largeSegments)
+                storage.largeSegments.resetSegments(membershipsData.ls);
+        }
+    }
+    else { // add segments data (server-side)
+        Object.keys(segmentsData).forEach(function (segmentName) {
+            var segmentKeys = segmentsData[segmentName];
+            storage.segments.update(segmentName, segmentKeys, [], -1);
+        });
+    }
+}
+export function getSnapshot(storage, userKeys) {
+    return {
+        // lastUpdated: Date.now(),
+        since: storage.splits.getChangeNumber(),
+        splitsData: storage.splits.getAll(),
+        segmentsData: userKeys ?
+            undefined : // @ts-ignore accessing private prop
+            Object.keys(storage.segments.segmentCache).reduce(function (prev, cur) {
+                prev[cur] = setToArray(storage.segments.segmentCache[cur]);
+                return prev;
+            }, {}),
+        membershipsData: userKeys ?
+            userKeys.reduce(function (prev, userKey) {
+                if (storage.shared) {
+                    // Client-side segments
+                    // @ts-ignore accessing private prop
+                    var sharedStorage = storage.shared(userKey);
+                    prev[getMatching(userKey)] = {
+                        ms: {
+                            // @ts-ignore accessing private prop
+                            k: Object.keys(sharedStorage.segments.segmentCache).map(function (segmentName) { return ({ n: segmentName }); }),
+                            // cn: sharedStorage.segments.getChangeNumber()
+                        },
+                        ls: sharedStorage.largeSegments ? {
+                            // @ts-ignore accessing private prop
+                            k: Object.keys(sharedStorage.largeSegments.segmentCache).map(function (segmentName) { return ({ n: segmentName }); }),
+                            // cn: sharedStorage.largeSegments.getChangeNumber()
+                        } : undefined
+                    };
+                }
+                else {
+                    prev[getMatching(userKey)] = {
+                        ms: {
+                            // Server-side segments
+                            // @ts-ignore accessing private prop
+                            k: Object.keys(storage.segments.segmentCache).reduce(function (prev, segmentName) {
+                                return storage.segments.segmentCache[segmentName].has(userKey) ?
+                                    prev.concat({ n: segmentName }) :
+                                    prev;
+                            }, [])
+                        },
+                        ls: {
+                            k: []
+                        }
+                    };
+                }
+                return prev;
+            }, {}) :
+            undefined
     };
 }

package/esm/storages/inLocalStorage/MySegmentsCacheInLocal.js

@@ -1,6 +1,6 @@
 import { __extends } from "tslib";
 import { isNaNNumber } from '../../utils/lang';
-import { AbstractSegmentsCacheSync } from '../AbstractSegmentsCacheSync';
+import { AbstractMySegmentsCacheSync } from '../AbstractMySegmentsCacheSync';
 import { LOG_PREFIX, DEFINED } from './constants';
 var MySegmentsCacheInLocal = /** @class */ (function (_super) {
     __extends(MySegmentsCacheInLocal, _super);
@@ -11,7 +11,7 @@ var MySegmentsCacheInLocal = /** @class */ (function (_super) {
         return _this;
         // There is not need to flush segments cache like splits cache, since resetSegments receives the up-to-date list of active segments
     }
-    MySegmentsCacheInLocal.prototype.addToSegment = function (name) {
+    MySegmentsCacheInLocal.prototype.addSegment = function (name) {
         var segmentKey = this.keys.buildSegmentNameKey(name);
         try {
             if (localStorage.getItem(segmentKey) === DEFINED)
@@ -24,7 +24,7 @@ var MySegmentsCacheInLocal = /** @class */ (function (_super) {
             return false;
         }
     };
-    MySegmentsCacheInLocal.prototype.removeFromSegment = function (name) {
+    MySegmentsCacheInLocal.prototype.removeSegment = function (name) {
         var segmentKey = this.keys.buildSegmentNameKey(name);
         try {
             if (localStorage.getItem(segmentKey) !== DEFINED)
@@ -53,7 +53,7 @@ var MySegmentsCacheInLocal = /** @class */ (function (_super) {
     MySegmentsCacheInLocal.prototype.getKeysCount = function () {
         return 1;
     };
-    MySegmentsCacheInLocal.prototype.setChangeNumber = function (name, changeNumber) {
+    MySegmentsCacheInLocal.prototype.setChangeNumber = function (changeNumber) {
         try {
             if (changeNumber)
                 localStorage.setItem(this.keys.buildTillKey(), changeNumber + '');
@@ -74,5 +74,5 @@ var MySegmentsCacheInLocal = /** @class */ (function (_super) {
         return n;
     };
     return MySegmentsCacheInLocal;
-}(AbstractSegmentsCacheSync));
+}(AbstractMySegmentsCacheSync));
 export { MySegmentsCacheInLocal };

package/esm/storages/inLocalStorage/SplitsCacheInLocal.js

@@ -3,6 +3,7 @@ import { AbstractSplitsCacheSync, usesSegments } from '../AbstractSplitsCacheSyn
 import { isFiniteNumber, toNumber, isNaNNumber } from '../../utils/lang';
 import { LOG_PREFIX } from './constants';
 import { getStorageHash } from '../KeyBuilder';
+import { setToArray } from '../../utils/lang/sets';
 /**
  * ISplitsCacheSync implementation that stores split definitions in browser LocalStorage.
  */
@@ -240,7 +241,7 @@ var SplitsCacheInLocal = /** @class */ (function (_super) {
             var flagSetFromLocalStorage = localStorage.getItem(flagSetKey);
             var flagSetCache = new Set(flagSetFromLocalStorage ? JSON.parse(flagSetFromLocalStorage) : []);
             flagSetCache.add(featureFlag.name);
-            localStorage.setItem(flagSetKey, JSON.stringify(Array.from(flagSetCache)));
+            localStorage.setItem(flagSetKey, JSON.stringify(setToArray(flagSetCache)));
         });
     };
     SplitsCacheInLocal.prototype.removeFromFlagSets = function (featureFlagName, flagSets) {
@@ -262,7 +263,7 @@ var SplitsCacheInLocal = /** @class */ (function (_super) {
             localStorage.removeItem(flagSetKey);
             return;
         }
-        localStorage.setItem(flagSetKey, JSON.stringify(Array.from(flagSetCache)));
+        localStorage.setItem(flagSetKey, JSON.stringify(setToArray(flagSetCache)));
     };
     return SplitsCacheInLocal;
 }(AbstractSplitsCacheSync));

package/esm/storages/inLocalStorage/index.js

@@ -53,7 +53,7 @@ export function InLocalStorage(options) {
                 this.events.clear();
                 (_a = this.uniqueKeys) === null || _a === void 0 ? void 0 : _a.clear();
             },
-            // When using shared instanciation with MEMORY we reuse everything but segments (they are customer per key).
+            // When using shared instantiation with MEMORY we reuse everything but segments (they are customer per key).
             shared: function (matchingKey) {
                 return {
                     splits: this.splits,

package/esm/storages/inMemory/InMemoryStorageCS.js

@@ -6,13 +6,15 @@ import { ImpressionCountsCacheInMemory } from './ImpressionCountsCacheInMemory';
 import { DEBUG, LOCALHOST_MODE, NONE, STORAGE_MEMORY } from '../../utils/constants';
 import { shouldRecordTelemetry, TelemetryCacheInMemory } from './TelemetryCacheInMemory';
 import { UniqueKeysCacheInMemoryCS } from './UniqueKeysCacheInMemoryCS';
+import { getMatching } from '../../utils/key';
+import { loadData } from '../dataLoader';
 /**
  * InMemory storage factory for standalone client-side SplitFactory
  *
  * @param params parameters required by EventsCacheSync
  */
 export function InMemoryStorageCSFactory(params) {
-    var _a = params.settings, _b = _a.scheduler, impressionsQueueSize = _b.impressionsQueueSize, eventsQueueSize = _b.eventsQueueSize, _c = _a.sync, impressionsMode = _c.impressionsMode, __splitFiltersValidation = _c.__splitFiltersValidation;
+    var _a = params.settings, _b = _a.scheduler, impressionsQueueSize = _b.impressionsQueueSize, eventsQueueSize = _b.eventsQueueSize, _c = _a.sync, impressionsMode = _c.impressionsMode, __splitFiltersValidation = _c.__splitFiltersValidation, preloadedData = _a.preloadedData, onReadyFromCacheCb = params.onReadyFromCacheCb;
     var splits = new SplitsCacheInMemory(__splitFiltersValidation);
     var segments = new MySegmentsCacheInMemory();
     var largeSegments = new MySegmentsCacheInMemory();
@@ -35,12 +37,17 @@ export function InMemoryStorageCSFactory(params) {
             this.events.clear();
             this.uniqueKeys && this.uniqueKeys.clear();
         },
-        // When using shared instanciation with MEMORY we reuse everything but segments (they are unique per key)
-        shared: function () {
+        // When using shared instantiation with MEMORY we reuse everything but segments (they are unique per key)
+        shared: function (matchingKey) {
+            var segments = new MySegmentsCacheInMemory();
+            var largeSegments = new MySegmentsCacheInMemory();
+            if (preloadedData) {
+                loadData(preloadedData, { segments: segments, largeSegments: largeSegments }, matchingKey);
+            }
             return {
                 splits: this.splits,
-                segments: new MySegmentsCacheInMemory(),
-                largeSegments: new MySegmentsCacheInMemory(),
+                segments: segments,
+                largeSegments: largeSegments,
                 impressions: this.impressions,
                 impressionCounts: this.impressionCounts,
                 events: this.events,
@@ -55,7 +62,7 @@ export function InMemoryStorageCSFactory(params) {
         },
     };
     // @TODO revisit storage logic in localhost mode
-    // No tracking data in localhost mode to avoid memory leaks
+    // No tracking in localhost mode to avoid memory leaks: https://github.com/splitio/javascript-commons/issues/181
     if (params.settings.mode === LOCALHOST_MODE) {
         var noopTrack = function () { return true; };
         storage.impressions.track = noopTrack;
@@ -65,6 +72,11 @@ export function InMemoryStorageCSFactory(params) {
         if (storage.uniqueKeys)
             storage.uniqueKeys.track = noopTrack;
     }
+    if (preloadedData) {
+        loadData(preloadedData, storage, getMatching(params.settings.core.key));
+        if (splits.getChangeNumber() > -1)
+            onReadyFromCacheCb();
+    }
     return storage;
 }
 InMemoryStorageCSFactory.type = STORAGE_MEMORY;

package/esm/storages/inMemory/MySegmentsCacheInMemory.js

@@ -1,5 +1,5 @@
 import { __extends } from "tslib";
-import { AbstractSegmentsCacheSync } from '../AbstractSegmentsCacheSync';
+import { AbstractMySegmentsCacheSync } from '../AbstractMySegmentsCacheSync';
 /**
  * Default MySegmentsCacheInMemory implementation that stores MySegments in memory.
  * Supported by all JS runtimes.
@@ -11,13 +11,13 @@ var MySegmentsCacheInMemory = /** @class */ (function (_super) {
         _this.segmentCache = {};
         return _this;
     }
-    MySegmentsCacheInMemory.prototype.addToSegment = function (name) {
+    MySegmentsCacheInMemory.prototype.addSegment = function (name) {
         if (this.segmentCache[name])
             return false;
         this.segmentCache[name] = true;
         return true;
     };
-    MySegmentsCacheInMemory.prototype.removeFromSegment = function (name) {
+    MySegmentsCacheInMemory.prototype.removeSegment = function (name) {
         if (!this.segmentCache[name])
             return false;
         delete this.segmentCache[name];
@@ -26,7 +26,7 @@ var MySegmentsCacheInMemory = /** @class */ (function (_super) {
     MySegmentsCacheInMemory.prototype.isInSegment = function (name) {
         return this.segmentCache[name] === true;
     };
-    MySegmentsCacheInMemory.prototype.setChangeNumber = function (name, changeNumber) {
+    MySegmentsCacheInMemory.prototype.setChangeNumber = function (changeNumber) {
         this.cn = changeNumber;
     };
     MySegmentsCacheInMemory.prototype.getChangeNumber = function () {
@@ -39,5 +39,5 @@ var MySegmentsCacheInMemory = /** @class */ (function (_super) {
         return 1;
     };
     return MySegmentsCacheInMemory;
-}(AbstractSegmentsCacheSync));
+}(AbstractMySegmentsCacheSync));
 export { MySegmentsCacheInMemory };

package/esm/storages/inMemory/SegmentsCacheInMemory.js

@@ -1,31 +1,19 @@
-import { __extends } from "tslib";
-import { AbstractSegmentsCacheSync } from '../AbstractSegmentsCacheSync';
 import { isIntegerNumber } from '../../utils/lang';
 /**
- * Default ISplitsCacheSync implementation that stores split definitions in memory.
- * Supported by all JS runtimes.
+ * Default ISplitsCacheSync implementation for server-side that stores segments definitions in memory.
  */
-var SegmentsCacheInMemory = /** @class */ (function (_super) {
-    __extends(SegmentsCacheInMemory, _super);
+var SegmentsCacheInMemory = /** @class */ (function () {
     function SegmentsCacheInMemory() {
-        var _this = _super !== null && _super.apply(this, arguments) || this;
-        _this.segmentCache = {};
-        _this.segmentChangeNumber = {};
-        return _this;
+        this.segmentCache = {};
+        this.segmentChangeNumber = {};
     }
-    SegmentsCacheInMemory.prototype.addToSegment = function (name, segmentKeys) {
-        var values = this.segmentCache[name];
-        var keySet = values ? values : new Set();
-        segmentKeys.forEach(function (k) { return keySet.add(k); });
-        this.segmentCache[name] = keySet;
-        return true;
-    };
-    SegmentsCacheInMemory.prototype.removeFromSegment = function (name, segmentKeys) {
-        var values = this.segmentCache[name];
-        var keySet = values ? values : new Set();
-        segmentKeys.forEach(function (k) { return keySet.delete(k); });
+    SegmentsCacheInMemory.prototype.update = function (name, addedKeys, removedKeys, changeNumber) {
+        var keySet = this.segmentCache[name] || new Set();
+        addedKeys.forEach(function (k) { return keySet.add(k); });
+        removedKeys.forEach(function (k) { return keySet.delete(k); });
         this.segmentCache[name] = keySet;
-        return true;
+        this.segmentChangeNumber[name] = changeNumber;
+        return addedKeys.length > 0 || removedKeys.length > 0;
     };
     SegmentsCacheInMemory.prototype.isInSegment = function (name, key) {
         var segmentValues = this.segmentCache[name];
@@ -59,14 +47,12 @@ var SegmentsCacheInMemory = /** @class */ (function (_super) {
             return acum + _this.segmentCache[segmentName].size;
         }, 0);
     };
-    SegmentsCacheInMemory.prototype.setChangeNumber = function (name, changeNumber) {
-        this.segmentChangeNumber[name] = changeNumber;
-        return true;
-    };
     SegmentsCacheInMemory.prototype.getChangeNumber = function (name) {
         var value = this.segmentChangeNumber[name];
         return isIntegerNumber(value) ? value : -1;
     };
+    // No-op. Not used in server-side
+    SegmentsCacheInMemory.prototype.resetSegments = function () { return false; };
     return SegmentsCacheInMemory;
-}(AbstractSegmentsCacheSync));
+}());
 export { SegmentsCacheInMemory };

package/esm/storages/inMemory/SplitsCacheInMemory.js

@@ -3,7 +3,6 @@ import { AbstractSplitsCacheSync, usesSegments } from '../AbstractSplitsCacheSyn
 import { isFiniteNumber } from '../../utils/lang';
 /**
  * Default ISplitsCacheSync implementation that stores split definitions in memory.
- * Supported by all JS runtimes.
  */
 var SplitsCacheInMemory = /** @class */ (function (_super) {
     __extends(SplitsCacheInMemory, _super);

package/esm/storages/inMemory/UniqueKeysCacheInMemory.js

@@ -1,4 +1,5 @@
 import { DEFAULT_CACHE_SIZE } from '../inRedis/constants';
+import { setToArray } from '../../utils/lang/sets';
 /**
  * Converts `uniqueKeys` data from cache into request payload for SS.
  */
@@ -7,7 +8,7 @@ export function fromUniqueKeysCollector(uniqueKeys) {
     var featureNames = Object.keys(uniqueKeys);
     for (var i = 0; i < featureNames.length; i++) {
         var featureName = featureNames[i];
-        var userKeys = Array.from(uniqueKeys[featureName]);
+        var userKeys = setToArray(uniqueKeys[featureName]);
         var uniqueKeysPayload = {
             f: featureName,
             ks: userKeys

package/esm/storages/inMemory/UniqueKeysCacheInMemoryCS.js

@@ -1,4 +1,5 @@
 import { DEFAULT_CACHE_SIZE } from '../inRedis/constants';
+import { setToArray } from '../../utils/lang/sets';
 var UniqueKeysCacheInMemoryCS = /** @class */ (function () {
     /**
      *
@@ -58,7 +59,7 @@ var UniqueKeysCacheInMemoryCS = /** @class */ (function () {
         var userKeys = Object.keys(uniqueKeys);
         for (var k = 0; k < userKeys.length; k++) {
             var userKey = userKeys[k];
-            var featureNames = Array.from(uniqueKeys[userKey]);
+            var featureNames = setToArray(uniqueKeys[userKey]);
             var uniqueKeysPayload = {
                 k: userKey,
                 fs: featureNames

package/esm/storages/inRedis/RedisAdapter.js

@@ -3,6 +3,7 @@ import ioredis from 'ioredis';
 import { merge, isString } from '../../utils/lang';
 import { thenable } from '../../utils/promise/thenable';
 import { timeout } from '../../utils/promise/timeout';
+import { setToArray } from '../../utils/lang/sets';
 var LOG_PREFIX = 'storage:redis-adapter: ';
 // If we ever decide to fully wrap every method, there's a Commander.getBuiltinCommands from ioredis.
 var METHODS_TO_PROMISE_WRAP = ['set', 'exec', 'del', 'get', 'keys', 'sadd', 'srem', 'sismember', 'smembers', 'incr', 'rpush', 'expire', 'mget', 'lrange', 'ltrim', 'hset', 'hincrby', 'popNRaw'];
@@ -125,7 +126,7 @@ var RedisAdapter = /** @class */ (function (_super) {
             setTimeout(function deferredDisconnect() {
                 if (instance._runningCommands.size > 0) {
                     instance.log.info(LOG_PREFIX + ("Attempting to disconnect but there are " + instance._runningCommands.size + " commands still waiting for resolution. Defering disconnection until those finish."));
-                    Promise.all(Array.from(instance._runningCommands))
+                    Promise.all(setToArray(instance._runningCommands))
                         .then(function () {
                         instance.log.debug(LOG_PREFIX + 'Pending commands finished successfully, disconnecting.');
                         originalMethod.apply(instance, params);

package/esm/storages/inRedis/SegmentsCacheInRedis.js

@@ -6,30 +6,24 @@ var SegmentsCacheInRedis = /** @class */ (function () {
         this.redis = redis;
         this.keys = keys;
     }
-    SegmentsCacheInRedis.prototype.addToSegment = function (name, segmentKeys) {
+    /**
+     * Update the given segment `name` with the lists of `addedKeys`, `removedKeys` and `changeNumber`.
+     * The returned promise is resolved if the operation success, with `true` if the segment was updated (i.e., some key was added or removed),
+     * or rejected if it fails (e.g., Redis operation fails).
+     */
+    SegmentsCacheInRedis.prototype.update = function (name, addedKeys, removedKeys, changeNumber) {
         var segmentKey = this.keys.buildSegmentNameKey(name);
-        if (segmentKeys.length) {
-            return this.redis.sadd(segmentKey, segmentKeys).then(function () { return true; });
-        }
-        else {
-            return Promise.resolve(true);
-        }
-    };
-    SegmentsCacheInRedis.prototype.removeFromSegment = function (name, segmentKeys) {
-        var segmentKey = this.keys.buildSegmentNameKey(name);
-        if (segmentKeys.length) {
-            return this.redis.srem(segmentKey, segmentKeys).then(function () { return true; });
-        }
-        else {
-            return Promise.resolve(true);
-        }
+        return Promise.all([
+            addedKeys.length && this.redis.sadd(segmentKey, addedKeys),
+            removedKeys.length && this.redis.srem(segmentKey, removedKeys),
+            this.redis.set(this.keys.buildSegmentTillKey(name), changeNumber + '')
+        ]).then(function () {
+            return addedKeys.length > 0 || removedKeys.length > 0;
+        });
     };
     SegmentsCacheInRedis.prototype.isInSegment = function (name, key) {
         return this.redis.sismember(this.keys.buildSegmentNameKey(name), key).then(function (matches) { return matches !== 0; });
     };
-    SegmentsCacheInRedis.prototype.setChangeNumber = function (name, changeNumber) {
-        return this.redis.set(this.keys.buildSegmentTillKey(name), changeNumber + '').then(function (status) { return status === 'OK'; });
-    };
     SegmentsCacheInRedis.prototype.getChangeNumber = function (name) {
         var _this = this;
         return this.redis.get(this.keys.buildSegmentTillKey(name)).then(function (value) {