@splitsoftware/splitio-commons 2.5.0-rc.1 → 2.5.1-rc.0

package/cjs/sync/polling/updaters/mySegmentsUpdater.js

@@ -34,6 +34,8 @@ function mySegmentsUpdaterFactory(log, mySegmentsFetcher, storage, segmentsEvent
             shouldNotifyUpdate = segments.resetSegments(segmentsData.ms || {});
             shouldNotifyUpdate = largeSegments.resetSegments(segmentsData.ls || {}) || shouldNotifyUpdate;
         }
+        if (storage.save)
+            storage.save();
         // Notify update if required
         if ((0, AbstractSplitsCacheSync_1.usesSegmentsSync)(storage) && (shouldNotifyUpdate || readyOnAlreadyExistentState)) {
             readyOnAlreadyExistentState = false;

package/cjs/sync/polling/updaters/splitChangesUpdater.js

@@ -154,6 +154,8 @@ function splitChangesUpdaterFactory(log, splitChangesFetcher, storage, splitFilt
                     segments.registerSegments((0, sets_1.setToArray)(usedSegments))
                 ]).then(function (_a) {
                     var ffChanged = _a[0], rbsChanged = _a[1];
+                    if (storage.save)
+                        storage.save();
                     if (splitsEventEmitter) {
                         // To emit SDK_SPLITS_ARRIVED for server-side SDK, we must check that all registered segments have been fetched
                         return Promise.resolve(!splitsEventEmitter.splitsArrived || ((ffChanged || rbsChanged) && (isClientSide || checkAllSegmentsExist(segments))))

package/cjs/sync/syncManagerOnline.js

@@ -69,35 +69,39 @@ function syncManagerOnlineFactory(pollingManagerFactory, pushManagerFactory) {
              */
             start: function () {
                 running = true;
-                if (startFirstTime) {
-                    var isCacheLoaded = storage.validateCache ? storage.validateCache() : false;
-                    if (isCacheLoaded)
-                        Promise.resolve().then(function () { readiness.splits.emit(constants_4.SDK_SPLITS_CACHE_LOADED); });
-                }
-                // start syncing splits and segments
-                if (pollingManager) {
-                    // If synchronization is disabled pushManager and pollingManager should not start
-                    if (syncEnabled) {
-                        if (pushManager) {
-                            // Doesn't call `syncAll` when the syncManager is resuming
-                            if (startFirstTime) {
-                                pollingManager.syncAll();
+                // @TODO once event, impression and telemetry storages support persistence, call when `validateCache` promise is resolved
+                submitterManager.start(!(0, consent_1.isConsentGranted)(settings));
+                return Promise.resolve(storage.validateCache ? storage.validateCache() : false).then(function (isCacheLoaded) {
+                    if (!running)
+                        return;
+                    if (startFirstTime) {
+                        // Emits SDK_READY_FROM_CACHE
+                        if (isCacheLoaded)
+                            readiness.splits.emit(constants_4.SDK_SPLITS_CACHE_LOADED);
+                    }
+                    // start syncing splits and segments
+                    if (pollingManager) {
+                        // If synchronization is disabled pushManager and pollingManager should not start
+                        if (syncEnabled) {
+                            if (pushManager) {
+                                // Doesn't call `syncAll` when the syncManager is resuming
+                                if (startFirstTime) {
+                                    pollingManager.syncAll();
+                                }
+                                pushManager.start();
+                            }
+                            else {
+                                pollingManager.start();
                             }
-                            pushManager.start();
                         }
                         else {
-                            pollingManager.start();
-                        }
-                    }
-                    else {
-                        if (startFirstTime) {
-                            pollingManager.syncAll();
+                            if (startFirstTime) {
+                                pollingManager.syncAll();
+                            }
                         }
                     }
-                }
-                // start periodic data recording (events, impressions, telemetry).
-                submitterManager.start(!(0, consent_1.isConsentGranted)(settings));
-                startFirstTime = false;
+                    startFirstTime = false;
+                });
             },
             /**
              * Method used to stop/pause the syncManager.

package/cjs/utils/env/isLocalStorageAvailable.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isLocalStorageAvailable = void 0;
+exports.isWebStorage = exports.isValidStorageWrapper = exports.isLocalStorageAvailable = void 0;
 /* eslint-disable no-undef */
 function isLocalStorageAvailable() {
     var mod = '__SPLITSOFTWARE__';
@@ -14,3 +14,24 @@ function isLocalStorageAvailable() {
     }
 }
 exports.isLocalStorageAvailable = isLocalStorageAvailable;
+function isValidStorageWrapper(wrapper) {
+    return wrapper !== null &&
+        typeof wrapper === 'object' &&
+        typeof wrapper.setItem === 'function' &&
+        typeof wrapper.getItem === 'function' &&
+        typeof wrapper.removeItem === 'function';
+}
+exports.isValidStorageWrapper = isValidStorageWrapper;
+function isWebStorage(wrapper) {
+    if (typeof wrapper.length === 'number') {
+        try {
+            wrapper.key(0);
+            return true;
+        }
+        catch (e) {
+            return false;
+        }
+    }
+    return false;
+}
+exports.isWebStorage = isWebStorage;

package/cjs/utils/settingsValidation/storage/storageCS.js

@@ -6,7 +6,7 @@ var constants_1 = require("../../../logger/constants");
 var constants_2 = require("../../../utils/constants");
 function __InLocalStorageMockFactory(params) {
     var result = (0, InMemoryStorageCS_1.InMemoryStorageCSFactory)(params);
-    result.validateCache = function () { return true; }; // to emit SDK_READY_FROM_CACHE
+    result.validateCache = function () { return Promise.resolve(true); }; // to emit SDK_READY_FROM_CACHE
     return result;
 }
 exports.__InLocalStorageMockFactory = __InLocalStorageMockFactory;

package/esm/storages/getRolloutPlan.js

@@ -7,7 +7,7 @@ export function getRolloutPlan(log, storage, options) {
     if (options === void 0) { options = {}; }
     var keys = options.keys, exposeSegments = options.exposeSegments;
     var splits = storage.splits, segments = storage.segments, rbSegments = storage.rbSegments;
-    log.debug("storage: get feature flags" + (keys ? ", and memberships for keys " + keys : '') + (exposeSegments ? ', and segments' : ''));
+    log.debug("storage: get feature flags" + (keys ? ", and memberships for keys: " + keys : '') + (exposeSegments ? ', and segments' : ''));
     return {
         splitChanges: {
             ff: {

package/esm/storages/inLocalStorage/MySegmentsCacheInLocal.js

@@ -4,19 +4,20 @@ import { AbstractMySegmentsCacheSync } from '../AbstractMySegmentsCacheSync';
 import { LOG_PREFIX, DEFINED } from './constants';
 var MySegmentsCacheInLocal = /** @class */ (function (_super) {
     __extends(MySegmentsCacheInLocal, _super);
-    function MySegmentsCacheInLocal(log, keys) {
+    function MySegmentsCacheInLocal(log, keys, storage) {
         var _this = _super.call(this) || this;
         _this.log = log;
         _this.keys = keys;
+        _this.storage = storage;
         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.addSegment = function (name) {
         var segmentKey = this.keys.buildSegmentNameKey(name);
         try {
-            if (localStorage.getItem(segmentKey) === DEFINED)
+            if (this.storage.getItem(segmentKey) === DEFINED)
                 return false;
-            localStorage.setItem(segmentKey, DEFINED);
+            this.storage.setItem(segmentKey, DEFINED);
             return true;
         }
         catch (e) {
@@ -27,9 +28,9 @@ var MySegmentsCacheInLocal = /** @class */ (function (_super) {
     MySegmentsCacheInLocal.prototype.removeSegment = function (name) {
         var segmentKey = this.keys.buildSegmentNameKey(name);
         try {
-            if (localStorage.getItem(segmentKey) !== DEFINED)
+            if (this.storage.getItem(segmentKey) !== DEFINED)
                 return false;
-            localStorage.removeItem(segmentKey);
+            this.storage.removeItem(segmentKey);
             return true;
         }
         catch (e) {
@@ -38,17 +39,16 @@ var MySegmentsCacheInLocal = /** @class */ (function (_super) {
         }
     };
     MySegmentsCacheInLocal.prototype.isInSegment = function (name) {
-        return localStorage.getItem(this.keys.buildSegmentNameKey(name)) === DEFINED;
+        return this.storage.getItem(this.keys.buildSegmentNameKey(name)) === DEFINED;
     };
     MySegmentsCacheInLocal.prototype.getRegisteredSegments = function () {
-        var _this = this;
-        // Scan current values from localStorage
-        return Object.keys(localStorage).reduce(function (accum, key) {
-            var segmentName = _this.keys.extractSegmentName(key);
+        var registeredSegments = [];
+        for (var i = 0, len = this.storage.length; i < len; i++) {
+            var segmentName = this.keys.extractSegmentName(this.storage.key(i));
             if (segmentName)
-                accum.push(segmentName);
-            return accum;
-        }, []);
+                registeredSegments.push(segmentName);
+        }
+        return registeredSegments;
     };
     MySegmentsCacheInLocal.prototype.getKeysCount = function () {
         return 1;
@@ -56,9 +56,9 @@ var MySegmentsCacheInLocal = /** @class */ (function (_super) {
     MySegmentsCacheInLocal.prototype.setChangeNumber = function (changeNumber) {
         try {
             if (changeNumber)
-                localStorage.setItem(this.keys.buildTillKey(), changeNumber + '');
+                this.storage.setItem(this.keys.buildTillKey(), changeNumber + '');
             else
-                localStorage.removeItem(this.keys.buildTillKey());
+                this.storage.removeItem(this.keys.buildTillKey());
         }
         catch (e) {
             this.log.error(e);
@@ -66,7 +66,7 @@ var MySegmentsCacheInLocal = /** @class */ (function (_super) {
     };
     MySegmentsCacheInLocal.prototype.getChangeNumber = function () {
         var n = -1;
-        var value = localStorage.getItem(this.keys.buildTillKey());
+        var value = this.storage.getItem(this.keys.buildTillKey());
         if (value !== null) {
             value = parseInt(value, 10);
             return isNaNNumber(value) ? n : value;

package/esm/storages/inLocalStorage/RBSegmentsCacheInLocal.js

@@ -3,14 +3,15 @@ import { setToArray } from '../../utils/lang/sets';
 import { usesSegments } from '../AbstractSplitsCacheSync';
 import { LOG_PREFIX } from './constants';
 var RBSegmentsCacheInLocal = /** @class */ (function () {
-    function RBSegmentsCacheInLocal(settings, keys) {
+    function RBSegmentsCacheInLocal(settings, keys, storage) {
         this.keys = keys;
         this.log = settings.log;
+        this.storage = storage;
     }
     RBSegmentsCacheInLocal.prototype.clear = function () {
         var _this = this;
         this.getNames().forEach(function (name) { return _this.remove(name); });
-        localStorage.removeItem(this.keys.buildRBSegmentsTillKey());
+        this.storage.removeItem(this.keys.buildRBSegmentsTillKey());
     };
     RBSegmentsCacheInLocal.prototype.update = function (toAdd, toRemove, changeNumber) {
         var _this = this;
@@ -20,8 +21,8 @@ var RBSegmentsCacheInLocal = /** @class */ (function () {
     };
     RBSegmentsCacheInLocal.prototype.setChangeNumber = function (changeNumber) {
         try {
-            localStorage.setItem(this.keys.buildRBSegmentsTillKey(), changeNumber + '');
-            localStorage.setItem(this.keys.buildLastUpdatedKey(), Date.now() + '');
+            this.storage.setItem(this.keys.buildRBSegmentsTillKey(), changeNumber + '');
+            this.storage.setItem(this.keys.buildLastUpdatedKey(), Date.now() + '');
         }
         catch (e) {
             this.log.error(LOG_PREFIX + e);
@@ -29,20 +30,19 @@ var RBSegmentsCacheInLocal = /** @class */ (function () {
     };
     RBSegmentsCacheInLocal.prototype.updateSegmentCount = function (diff) {
         var segmentsCountKey = this.keys.buildSplitsWithSegmentCountKey();
-        var count = toNumber(localStorage.getItem(segmentsCountKey)) + diff;
-        // @ts-expect-error
+        var count = toNumber(this.storage.getItem(segmentsCountKey)) + diff;
         if (count > 0)
-            localStorage.setItem(segmentsCountKey, count);
+            this.storage.setItem(segmentsCountKey, count + '');
         else
-            localStorage.removeItem(segmentsCountKey);
+            this.storage.removeItem(segmentsCountKey);
     };
     RBSegmentsCacheInLocal.prototype.add = function (rbSegment) {
         try {
             var name_1 = rbSegment.name;
             var rbSegmentKey = this.keys.buildRBSegmentKey(name_1);
-            var rbSegmentFromLocalStorage = localStorage.getItem(rbSegmentKey);
-            var previous = rbSegmentFromLocalStorage ? JSON.parse(rbSegmentFromLocalStorage) : null;
-            localStorage.setItem(rbSegmentKey, JSON.stringify(rbSegment));
+            var rbSegmentFromStorage = this.storage.getItem(rbSegmentKey);
+            var previous = rbSegmentFromStorage ? JSON.parse(rbSegmentFromStorage) : null;
+            this.storage.setItem(rbSegmentKey, JSON.stringify(rbSegment));
             var usesSegmentsDiff = 0;
             if (previous && usesSegments(previous))
                 usesSegmentsDiff--;
@@ -62,7 +62,7 @@ var RBSegmentsCacheInLocal = /** @class */ (function () {
             var rbSegment = this.get(name);
             if (!rbSegment)
                 return false;
-            localStorage.removeItem(this.keys.buildRBSegmentKey(name));
+            this.storage.removeItem(this.keys.buildRBSegmentKey(name));
             if (usesSegments(rbSegment))
                 this.updateSegmentCount(-1);
             return true;
@@ -73,11 +73,11 @@ var RBSegmentsCacheInLocal = /** @class */ (function () {
         }
     };
     RBSegmentsCacheInLocal.prototype.getNames = function () {
-        var len = localStorage.length;
+        var len = this.storage.length;
         var accum = [];
         var cur = 0;
         while (cur < len) {
-            var key = localStorage.key(cur);
+            var key = this.storage.key(cur);
             if (key != null && this.keys.isRBSegmentKey(key))
                 accum.push(this.keys.extractKey(key));
             cur++;
@@ -85,7 +85,7 @@ var RBSegmentsCacheInLocal = /** @class */ (function () {
         return accum;
     };
     RBSegmentsCacheInLocal.prototype.get = function (name) {
-        var item = localStorage.getItem(this.keys.buildRBSegmentKey(name));
+        var item = this.storage.getItem(this.keys.buildRBSegmentKey(name));
         return item && JSON.parse(item);
     };
     RBSegmentsCacheInLocal.prototype.getAll = function () {
@@ -99,7 +99,7 @@ var RBSegmentsCacheInLocal = /** @class */ (function () {
     };
     RBSegmentsCacheInLocal.prototype.getChangeNumber = function () {
         var n = -1;
-        var value = localStorage.getItem(this.keys.buildRBSegmentsTillKey());
+        var value = this.storage.getItem(this.keys.buildRBSegmentsTillKey());
         if (value !== null) {
             value = parseInt(value, 10);
             return isNaNNumber(value) ? n : value;
@@ -107,7 +107,7 @@ var RBSegmentsCacheInLocal = /** @class */ (function () {
         return n;
     };
     RBSegmentsCacheInLocal.prototype.usesSegments = function () {
-        var storedCount = localStorage.getItem(this.keys.buildSplitsWithSegmentCountKey());
+        var storedCount = this.storage.getItem(this.keys.buildSplitsWithSegmentCountKey());
         var splitsWithSegmentsCount = storedCount === null ? 0 : toNumber(storedCount);
         return isFiniteNumber(splitsWithSegmentsCount) ?
             splitsWithSegmentsCount > 0 :

package/esm/storages/inLocalStorage/SplitsCacheInLocal.js

@@ -3,25 +3,22 @@ import { AbstractSplitsCacheSync, usesSegments } from '../AbstractSplitsCacheSyn
 import { isFiniteNumber, toNumber, isNaNNumber } from '../../utils/lang';
 import { LOG_PREFIX } from './constants';
 import { setToArray } from '../../utils/lang/sets';
-/**
- * ISplitsCacheSync implementation that stores split definitions in browser LocalStorage.
- */
 var SplitsCacheInLocal = /** @class */ (function (_super) {
     __extends(SplitsCacheInLocal, _super);
-    function SplitsCacheInLocal(settings, keys) {
+    function SplitsCacheInLocal(settings, keys, storage) {
         var _this = _super.call(this) || this;
         _this.keys = keys;
         _this.log = settings.log;
         _this.flagSetsFilter = settings.sync.__splitFiltersValidation.groupedFilters.bySet;
+        _this.storage = storage;
         return _this;
     }
     SplitsCacheInLocal.prototype._decrementCount = function (key) {
-        var count = toNumber(localStorage.getItem(key)) - 1;
-        // @ts-expect-error
+        var count = toNumber(this.storage.getItem(key)) - 1;
         if (count > 0)
-            localStorage.setItem(key, count);
+            this.storage.setItem(key, count + '');
         else
-            localStorage.removeItem(key);
+            this.storage.removeItem(key);
     };
     SplitsCacheInLocal.prototype._decrementCounts = function (split) {
         try {
@@ -39,12 +36,10 @@ var SplitsCacheInLocal = /** @class */ (function (_super) {
     SplitsCacheInLocal.prototype._incrementCounts = function (split) {
         try {
             var ttKey = this.keys.buildTrafficTypeKey(split.trafficTypeName);
-            // @ts-expect-error
-            localStorage.setItem(ttKey, toNumber(localStorage.getItem(ttKey)) + 1);
+            this.storage.setItem(ttKey, (toNumber(this.storage.getItem(ttKey)) + 1) + '');
             if (usesSegments(split)) {
                 var segmentsCountKey = this.keys.buildSplitsWithSegmentCountKey();
-                // @ts-expect-error
-                localStorage.setItem(segmentsCountKey, toNumber(localStorage.getItem(segmentsCountKey)) + 1);
+                this.storage.setItem(segmentsCountKey, (toNumber(this.storage.getItem(segmentsCountKey)) + 1) + '');
             }
         }
         catch (e) {
@@ -56,17 +51,18 @@ var SplitsCacheInLocal = /** @class */ (function (_super) {
      * We cannot simply call `localStorage.clear()` since that implies removing user items from the storage.
      */
     SplitsCacheInLocal.prototype.clear = function () {
+        var _this = this;
         // collect item keys
-        var len = localStorage.length;
+        var len = this.storage.length;
         var accum = [];
         for (var cur = 0; cur < len; cur++) {
-            var key = localStorage.key(cur);
+            var key = this.storage.key(cur);
             if (key != null && this.keys.isSplitsCacheKey(key))
                 accum.push(key);
         }
         // remove items
         accum.forEach(function (key) {
-            localStorage.removeItem(key);
+            _this.storage.removeItem(key);
         });
         this.hasSync = false;
     };
@@ -74,13 +70,13 @@ var SplitsCacheInLocal = /** @class */ (function (_super) {
         try {
             var name_1 = split.name;
             var splitKey = this.keys.buildSplitKey(name_1);
-            var splitFromLocalStorage = localStorage.getItem(splitKey);
-            var previousSplit = splitFromLocalStorage ? JSON.parse(splitFromLocalStorage) : null;
+            var splitFromStorage = this.storage.getItem(splitKey);
+            var previousSplit = splitFromStorage ? JSON.parse(splitFromStorage) : null;
             if (previousSplit) {
                 this._decrementCounts(previousSplit);
                 this.removeFromFlagSets(previousSplit.name, previousSplit.sets);
             }
-            localStorage.setItem(splitKey, JSON.stringify(split));
+            this.storage.setItem(splitKey, JSON.stringify(split));
             this._incrementCounts(split);
             this.addToFlagSets(split);
             return true;
@@ -95,7 +91,7 @@ var SplitsCacheInLocal = /** @class */ (function (_super) {
             var split = this.getSplit(name);
             if (!split)
                 return false;
-            localStorage.removeItem(this.keys.buildSplitKey(name));
+            this.storage.removeItem(this.keys.buildSplitKey(name));
             this._decrementCounts(split);
             this.removeFromFlagSets(split.name, split.sets);
             return true;
@@ -106,14 +102,14 @@ var SplitsCacheInLocal = /** @class */ (function (_super) {
         }
     };
     SplitsCacheInLocal.prototype.getSplit = function (name) {
-        var item = localStorage.getItem(this.keys.buildSplitKey(name));
+        var item = this.storage.getItem(this.keys.buildSplitKey(name));
         return item && JSON.parse(item);
     };
     SplitsCacheInLocal.prototype.setChangeNumber = function (changeNumber) {
         try {
-            localStorage.setItem(this.keys.buildSplitsTillKey(), changeNumber + '');
+            this.storage.setItem(this.keys.buildSplitsTillKey(), changeNumber + '');
             // update "last updated" timestamp with current time
-            localStorage.setItem(this.keys.buildLastUpdatedKey(), Date.now() + '');
+            this.storage.setItem(this.keys.buildLastUpdatedKey(), Date.now() + '');
             this.hasSync = true;
             return true;
         }
@@ -124,7 +120,7 @@ var SplitsCacheInLocal = /** @class */ (function (_super) {
     };
     SplitsCacheInLocal.prototype.getChangeNumber = function () {
         var n = -1;
-        var value = localStorage.getItem(this.keys.buildSplitsTillKey());
+        var value = this.storage.getItem(this.keys.buildSplitsTillKey());
         if (value !== null) {
             value = parseInt(value, 10);
             return isNaNNumber(value) ? n : value;
@@ -132,11 +128,11 @@ var SplitsCacheInLocal = /** @class */ (function (_super) {
         return n;
     };
     SplitsCacheInLocal.prototype.getSplitNames = function () {
-        var len = localStorage.length;
+        var len = this.storage.length;
         var accum = [];
         var cur = 0;
         while (cur < len) {
-            var key = localStorage.key(cur);
+            var key = this.storage.key(cur);
             if (key != null && this.keys.isSplitKey(key))
                 accum.push(this.keys.extractKey(key));
             cur++;
@@ -144,14 +140,14 @@ var SplitsCacheInLocal = /** @class */ (function (_super) {
         return accum;
     };
     SplitsCacheInLocal.prototype.trafficTypeExists = function (trafficType) {
-        var ttCount = toNumber(localStorage.getItem(this.keys.buildTrafficTypeKey(trafficType)));
+        var ttCount = toNumber(this.storage.getItem(this.keys.buildTrafficTypeKey(trafficType)));
         return isFiniteNumber(ttCount) && ttCount > 0;
     };
     SplitsCacheInLocal.prototype.usesSegments = function () {
         // If cache hasn't been synchronized with the cloud, assume we need them.
         if (!this.hasSync)
             return true;
-        var storedCount = localStorage.getItem(this.keys.buildSplitsWithSegmentCountKey());
+        var storedCount = this.storage.getItem(this.keys.buildSplitsWithSegmentCountKey());
         var splitsWithSegmentsCount = storedCount === null ? 0 : toNumber(storedCount);
         return isFiniteNumber(splitsWithSegmentsCount) ?
             splitsWithSegmentsCount > 0 :
@@ -161,8 +157,8 @@ var SplitsCacheInLocal = /** @class */ (function (_super) {
         var _this = this;
         return flagSets.map(function (flagSet) {
             var flagSetKey = _this.keys.buildFlagSetKey(flagSet);
-            var flagSetFromLocalStorage = localStorage.getItem(flagSetKey);
-            return new Set(flagSetFromLocalStorage ? JSON.parse(flagSetFromLocalStorage) : []);
+            var flagSetFromStorage = _this.storage.getItem(flagSetKey);
+            return new Set(flagSetFromStorage ? JSON.parse(flagSetFromStorage) : []);
         });
     };
     SplitsCacheInLocal.prototype.addToFlagSets = function (featureFlag) {
@@ -173,10 +169,10 @@ var SplitsCacheInLocal = /** @class */ (function (_super) {
             if (_this.flagSetsFilter.length > 0 && !_this.flagSetsFilter.some(function (filterFlagSet) { return filterFlagSet === featureFlagSet; }))
                 return;
             var flagSetKey = _this.keys.buildFlagSetKey(featureFlagSet);
-            var flagSetFromLocalStorage = localStorage.getItem(flagSetKey);
-            var flagSetCache = new Set(flagSetFromLocalStorage ? JSON.parse(flagSetFromLocalStorage) : []);
+            var flagSetFromStorage = _this.storage.getItem(flagSetKey);
+            var flagSetCache = new Set(flagSetFromStorage ? JSON.parse(flagSetFromStorage) : []);
             flagSetCache.add(featureFlag.name);
-            localStorage.setItem(flagSetKey, JSON.stringify(setToArray(flagSetCache)));
+            _this.storage.setItem(flagSetKey, JSON.stringify(setToArray(flagSetCache)));
         });
     };
     SplitsCacheInLocal.prototype.removeFromFlagSets = function (featureFlagName, flagSets) {
@@ -189,16 +185,16 @@ var SplitsCacheInLocal = /** @class */ (function (_super) {
     };
     SplitsCacheInLocal.prototype.removeNames = function (flagSetName, featureFlagName) {
         var flagSetKey = this.keys.buildFlagSetKey(flagSetName);
-        var flagSetFromLocalStorage = localStorage.getItem(flagSetKey);
-        if (!flagSetFromLocalStorage)
+        var flagSetFromStorage = this.storage.getItem(flagSetKey);
+        if (!flagSetFromStorage)
             return;
-        var flagSetCache = new Set(JSON.parse(flagSetFromLocalStorage));
+        var flagSetCache = new Set(JSON.parse(flagSetFromStorage));
         flagSetCache.delete(featureFlagName);
         if (flagSetCache.size === 0) {
-            localStorage.removeItem(flagSetKey);
+            this.storage.removeItem(flagSetKey);
             return;
         }
-        localStorage.setItem(flagSetKey, JSON.stringify(setToArray(flagSetCache)));
+        this.storage.setItem(flagSetKey, JSON.stringify(setToArray(flagSetCache)));
     };
     return SplitsCacheInLocal;
 }(AbstractSplitsCacheSync));

package/esm/storages/inLocalStorage/index.js

@@ -3,7 +3,7 @@ import { ImpressionCountsCacheInMemory } from '../inMemory/ImpressionCountsCache
 import { EventsCacheInMemory } from '../inMemory/EventsCacheInMemory';
 import { validatePrefix } from '../KeyBuilder';
 import { KeyBuilderCS, myLargeSegmentsKeyBuilder } from '../KeyBuilderCS';
-import { isLocalStorageAvailable } from '../../utils/env/isLocalStorageAvailable';
+import { isLocalStorageAvailable, isValidStorageWrapper, isWebStorage } from '../../utils/env/isLocalStorageAvailable';
 import { SplitsCacheInLocal } from './SplitsCacheInLocal';
 import { RBSegmentsCacheInLocal } from './RBSegmentsCacheInLocal';
 import { MySegmentsCacheInLocal } from './MySegmentsCacheInLocal';
@@ -14,6 +14,20 @@ import { shouldRecordTelemetry, TelemetryCacheInMemory } from '../inMemory/Telem
 import { UniqueKeysCacheInMemoryCS } from '../inMemory/UniqueKeysCacheInMemoryCS';
 import { getMatching } from '../../utils/key';
 import { validateCache } from './validateCache';
+import { storageAdapter } from './storageAdapter';
+function validateStorage(log, prefix, wrapper) {
+    if (wrapper) {
+        if (isValidStorageWrapper(wrapper)) {
+            return isWebStorage(wrapper) ?
+                wrapper : // localStorage and sessionStorage don't need adapter
+                storageAdapter(log, prefix, wrapper);
+        }
+        log.warn(LOG_PREFIX + 'Invalid storage provided. Falling back to LocalStorage API');
+    }
+    if (isLocalStorageAvailable())
+        return localStorage;
+    log.warn(LOG_PREFIX + 'LocalStorage API is unavailable. Falling back to default MEMORY storage');
+}
 /**
  * InLocal storage factory for standalone client-side SplitFactory
  */
@@ -21,18 +35,17 @@ export function InLocalStorage(options) {
     if (options === void 0) { options = {}; }
     var prefix = validatePrefix(options.prefix);
     function InLocalStorageCSFactory(params) {
-        // Fallback to InMemoryStorage if LocalStorage API is not available
-        if (!isLocalStorageAvailable()) {
-            params.settings.log.warn(LOG_PREFIX + 'LocalStorage API is unavailable. Falling back to default MEMORY storage');
-            return InMemoryStorageCSFactory(params);
-        }
         var settings = params.settings, _a = params.settings, log = _a.log, _b = _a.scheduler, impressionsQueueSize = _b.impressionsQueueSize, eventsQueueSize = _b.eventsQueueSize;
+        var storage = validateStorage(log, prefix, options.wrapper);
+        if (!storage)
+            return InMemoryStorageCSFactory(params);
         var matchingKey = getMatching(settings.core.key);
         var keys = new KeyBuilderCS(prefix, matchingKey);
-        var splits = new SplitsCacheInLocal(settings, keys);
-        var rbSegments = new RBSegmentsCacheInLocal(settings, keys);
-        var segments = new MySegmentsCacheInLocal(log, keys);
-        var largeSegments = new MySegmentsCacheInLocal(log, myLargeSegmentsKeyBuilder(prefix, matchingKey));
+        var splits = new SplitsCacheInLocal(settings, keys, storage);
+        var rbSegments = new RBSegmentsCacheInLocal(settings, keys, storage);
+        var segments = new MySegmentsCacheInLocal(log, keys, storage);
+        var largeSegments = new MySegmentsCacheInLocal(log, myLargeSegmentsKeyBuilder(prefix, matchingKey), storage);
+        var validateCachePromise;
         return {
             splits: splits,
             rbSegments: rbSegments,
@@ -44,16 +57,21 @@ export function InLocalStorage(options) {
             telemetry: shouldRecordTelemetry(params) ? new TelemetryCacheInMemory(splits, segments) : undefined,
             uniqueKeys: new UniqueKeysCacheInMemoryCS(),
             validateCache: function () {
-                return validateCache(options, settings, keys, splits, rbSegments, segments, largeSegments);
+                return validateCachePromise || (validateCachePromise = validateCache(options, storage, settings, keys, splits, rbSegments, segments, largeSegments));
+            },
+            save: function () {
+                return storage.save && storage.save();
+            },
+            destroy: function () {
+                return storage.whenSaved && storage.whenSaved();
             },
-            destroy: function () { },
             // When using shared instantiation with MEMORY we reuse everything but segments (they are customer per key).
             shared: function (matchingKey) {
                 return {
                     splits: this.splits,
                     rbSegments: this.rbSegments,
-                    segments: new MySegmentsCacheInLocal(log, new KeyBuilderCS(prefix, matchingKey)),
-                    largeSegments: new MySegmentsCacheInLocal(log, myLargeSegmentsKeyBuilder(prefix, matchingKey)),
+                    segments: new MySegmentsCacheInLocal(log, new KeyBuilderCS(prefix, matchingKey), storage),
+                    largeSegments: new MySegmentsCacheInLocal(log, myLargeSegmentsKeyBuilder(prefix, matchingKey), storage),
                     impressions: this.impressions,
                     impressionCounts: this.impressionCounts,
                     events: this.events,