@splitsoftware/splitio-commons 2.1.0-rc.2 → 2.1.1-rc.0

package/esm/logger/messages/warn.js

@@ -31,7 +31,7 @@ export var codesWarn = codesError.concat([
     [c.WARN_SPLITS_FILTER_EMPTY, c.LOG_PREFIX_SETTINGS + ': feature flag filter configuration must be a non-empty array of filter objects.'],
     [c.WARN_SDK_KEY, c.LOG_PREFIX_SETTINGS + ': You already have %s. We recommend keeping only one instance of the factory at all times (Singleton pattern) and reusing it throughout your application'],
     [c.STREAMING_PARSING_MEMBERSHIPS_UPDATE, c.LOG_PREFIX_SYNC_STREAMING + 'Fetching Memberships due to an error processing %s notification: %s'],
-    [c.STREAMING_PARSING_SPLIT_UPDATE, c.LOG_PREFIX_SYNC_STREAMING + 'Fetching SplitChanges due to an error processing SPLIT_UPDATE notification: %s'],
+    [c.STREAMING_PARSING_SPLIT_UPDATE, c.LOG_PREFIX_SYNC_STREAMING + 'Fetching SplitChanges due to an error processing %s notification: %s'],
     [c.WARN_INVALID_FLAGSET, '%s: you passed %s, flag set must adhere to the regular expressions %s. This means a flag set must start with a letter or number, be in lowercase, alphanumeric and have a max length of 50 characters. %s was discarded.'],
     [c.WARN_LOWERCASE_FLAGSET, '%s: flag set %s should be all lowercase - converting string to lowercase.'],
     [c.WARN_FLAGSET_WITHOUT_FLAGS, '%s: you passed %s flag set that does not contain cached feature flag names. Please double check what flag sets are in use in the Split user interface.'],

package/esm/readiness/readinessManager.js

@@ -1,6 +1,5 @@
 import { objectAssign } from '../utils/lang/objectAssign';
 import { SDK_SPLITS_ARRIVED, SDK_SPLITS_CACHE_LOADED, SDK_SEGMENTS_ARRIVED, SDK_READY_TIMED_OUT, SDK_READY_FROM_CACHE, SDK_UPDATE, SDK_READY } from './constants';
-import { STORAGE_LOCALSTORAGE } from '../utils/constants';
 function splitsEventEmitterFactory(EventEmitter) {
     var splitsEventEmitter = objectAssign(new EventEmitter(), {
         splitsArrived: false,
@@ -81,7 +80,6 @@ export function readinessManagerFactory(EventEmitter, settings, splits, isShared
         }
     }
     function checkIsReadyOrUpdate(diff) {
-        var _a;
         if (isDestroyed)
             return;
         if (isReady) {
@@ -100,10 +98,6 @@ export function readinessManagerFactory(EventEmitter, settings, splits, isShared
                 isReady = true;
                 try {
                     syncLastUpdate();
-                    if (!isReadyFromCache && ((_a = settings.storage) === null || _a === void 0 ? void 0 : _a.type) === STORAGE_LOCALSTORAGE) {
-                        isReadyFromCache = true;
-                        gate.emit(SDK_READY_FROM_CACHE);
-                    }
                     gate.emit(SDK_READY);
                 }
                 catch (e) {

package/esm/services/splitApi.js

@@ -38,8 +38,8 @@ export function splitApiFactory(settings, platform, telemetryTracker) {
             }
             return splitHttpClient(url, undefined, telemetryTracker.trackHttp(TOKEN));
         },
-        fetchSplitChanges: function (since, noCache, till) {
-            var url = urls.sdk + "/splitChanges?s=" + flagSpecVersion + "&since=" + since + (filterQueryString || '') + (till ? '&till=' + till : '');
+        fetchSplitChanges: function (since, noCache, till, rbSince) {
+            var url = urls.sdk + "/splitChanges?s=" + flagSpecVersion + "&since=" + since + (rbSince ? '&rbSince=' + rbSince : '') + (filterQueryString || '') + (till ? '&till=' + till : '');
             return splitHttpClient(url, noCache ? noCacheHeaderOptions : undefined, telemetryTracker.trackHttp(SPLITS))
                 .catch(function (err) {
                 if (err.statusCode === 414)

package/esm/storages/AbstractSplitsCacheAsync.js

@@ -6,11 +6,29 @@ import { objectAssign } from '../utils/lang/objectAssign';
 var AbstractSplitsCacheAsync = /** @class */ (function () {
     function AbstractSplitsCacheAsync() {
     }
+    AbstractSplitsCacheAsync.prototype.update = function (toAdd, toRemove, changeNumber) {
+        var _this = this;
+        return Promise.all([
+            this.setChangeNumber(changeNumber),
+            Promise.all(toAdd.map(function (addedFF) { return _this.addSplit(addedFF); })),
+            Promise.all(toRemove.map(function (removedFF) { return _this.removeSplit(removedFF.name); }))
+        ]).then(function (_a) {
+            var added = _a[1], removed = _a[2];
+            return added.some(function (result) { return result; }) || removed.some(function (result) { return result; });
+        });
+    };
     // @TODO revisit segment-related methods ('usesSegments', 'getRegisteredSegments', 'registerSegments')
     // noop, just keeping the interface. This is used by standalone client-side API only, and so only implemented by InMemory and InLocalStorage.
     AbstractSplitsCacheAsync.prototype.usesSegments = function () {
         return Promise.resolve(true);
     };
+    /**
+     * Check if the splits information is already stored in cache.
+     * Noop, just keeping the interface. This is used by client-side implementations only.
+     */
+    AbstractSplitsCacheAsync.prototype.checkCache = function () {
+        return Promise.resolve(false);
+    };
     /**
      * Kill `name` split and set `defaultTreatment` and `changeNumber`.
      * Used for SPLIT_KILL push notifications.
@@ -27,7 +45,7 @@ var AbstractSplitsCacheAsync = /** @class */ (function () {
                 newSplit.killed = true;
                 newSplit.defaultTreatment = defaultTreatment;
                 newSplit.changeNumber = changeNumber;
-                return _this.addSplit(name, newSplit);
+                return _this.addSplit(newSplit);
             }
             return false;
         }).catch(function () { return false; });

package/esm/storages/AbstractSplitsCacheSync.js

@@ -7,13 +7,11 @@ import { IN_SEGMENT, IN_LARGE_SEGMENT } from '../utils/constants';
 var AbstractSplitsCacheSync = /** @class */ (function () {
     function AbstractSplitsCacheSync() {
     }
-    AbstractSplitsCacheSync.prototype.addSplits = function (entries) {
+    AbstractSplitsCacheSync.prototype.update = function (toAdd, toRemove, changeNumber) {
         var _this = this;
-        return entries.map(function (keyValuePair) { return _this.addSplit(keyValuePair[0], keyValuePair[1]); });
-    };
-    AbstractSplitsCacheSync.prototype.removeSplits = function (names) {
-        var _this = this;
-        return names.map(function (name) { return _this.removeSplit(name); });
+        this.setChangeNumber(changeNumber);
+        var updated = toAdd.map(function (addedFF) { return _this.addSplit(addedFF); }).some(function (result) { return result; });
+        return toRemove.map(function (removedFF) { return _this.removeSplit(removedFF.name); }).some(function (result) { return result; }) || updated;
     };
     AbstractSplitsCacheSync.prototype.getSplits = function (names) {
         var _this = this;
@@ -27,6 +25,13 @@ var AbstractSplitsCacheSync = /** @class */ (function () {
         var _this = this;
         return this.getSplitNames().map(function (key) { return _this.getSplit(key); });
     };
+    /**
+     * Check if the splits information is already stored in cache. This data can be preloaded.
+     * It is used as condition to emit SDK_SPLITS_CACHE_LOADED, and then SDK_READY_FROM_CACHE.
+     */
+    AbstractSplitsCacheSync.prototype.checkCache = function () {
+        return false;
+    };
     /**
      * Kill `name` split and set `defaultTreatment` and `changeNumber`.
      * Used for SPLIT_KILL push notifications.
@@ -41,7 +46,7 @@ var AbstractSplitsCacheSync = /** @class */ (function () {
             newSplit.killed = true;
             newSplit.defaultTreatment = defaultTreatment;
             newSplit.changeNumber = changeNumber;
-            return this.addSplit(name, newSplit);
+            return this.addSplit(newSplit);
         }
         return false;
     };
@@ -52,8 +57,8 @@ export { AbstractSplitsCacheSync };
  * Given a parsed split, it returns a boolean flagging if its conditions use segments matchers (rules & whitelists).
  * This util is intended to simplify the implementation of `splitsCache::usesSegments` method
  */
-export function usesSegments(split) {
-    var conditions = split.conditions || [];
+export function usesSegments(ruleEntity) {
+    var conditions = ruleEntity.conditions || [];
     for (var i = 0; i < conditions.length; i++) {
         var matchers = conditions[i].matcherGroup.matchers;
         for (var j = 0; j < matchers.length; j++) {
@@ -62,5 +67,8 @@ export function usesSegments(split) {
                 return true;
         }
     }
+    var excluded = ruleEntity.excluded;
+    if (excluded && excluded.segments && excluded.segments.length > 0)
+        return true;
     return false;
 }

package/esm/storages/KeyBuilder.js

@@ -1,4 +1,3 @@
-import { startsWith } from '../utils/lang';
 import { hash } from '../utils/murmur3/murmur3';
 var everythingAtTheEnd = /[^.]+$/;
 var DEFAULT_PREFIX = 'SPLITIO';
@@ -22,19 +21,17 @@ var KeyBuilder = /** @class */ (function () {
     KeyBuilder.prototype.buildSplitsTillKey = function () {
         return this.prefix + ".splits.till";
     };
-    // NOT USED
-    // buildSplitsReady() {
-    //   return `${this.prefix}.splits.ready`;
-    // }
-    KeyBuilder.prototype.isSplitKey = function (key) {
-        return startsWith(key, this.prefix + ".split.");
-    };
     KeyBuilder.prototype.buildSplitKeyPrefix = function () {
         return this.prefix + ".split.";
     };
-    // Only used by InLocalStorage.
-    KeyBuilder.prototype.buildSplitsWithSegmentCountKey = function () {
-        return this.prefix + ".splits.usingSegments";
+    KeyBuilder.prototype.buildRBSegmentKey = function (rbsegmentName) {
+        return this.prefix + ".rbsegment." + rbsegmentName;
+    };
+    KeyBuilder.prototype.buildRBSegmentsTillKey = function () {
+        return this.prefix + ".rbsegments.till";
+    };
+    KeyBuilder.prototype.buildRBSegmentKeyPrefix = function () {
+        return this.prefix + ".rbsegment.";
     };
     KeyBuilder.prototype.buildSegmentNameKey = function (segmentName) {
         return this.prefix + ".segment." + segmentName;
@@ -42,10 +39,6 @@ var KeyBuilder = /** @class */ (function () {
     KeyBuilder.prototype.buildSegmentTillKey = function (segmentName) {
         return this.prefix + ".segment." + segmentName + ".till";
     };
-    // NOT USED
-    // buildSegmentsReady() {
-    //   return `${this.prefix}.segments.ready`;
-    // }
     KeyBuilder.prototype.extractKey = function (builtKey) {
         var s = builtKey.match(everythingAtTheEnd);
         if (s && s.length) {

package/esm/storages/KeyBuilderCS.js

@@ -6,7 +6,7 @@ var KeyBuilderCS = /** @class */ (function (_super) {
     function KeyBuilderCS(prefix, matchingKey) {
         var _this = _super.call(this, prefix) || this;
         _this.matchingKey = matchingKey;
-        _this.regexSplitsCacheKey = new RegExp("^" + prefix + "\\.(splits?|trafficType|flagSet)\\.");
+        _this.regexSplitsCacheKey = new RegExp("^" + prefix + "\\.(splits?|trafficType|flagSet|rbsegment)\\.");
         return _this;
     }
     /**
@@ -18,7 +18,7 @@ var KeyBuilderCS = /** @class */ (function (_super) {
     KeyBuilderCS.prototype.extractSegmentName = function (builtSegmentKeyName) {
         var prefix = this.prefix + "." + this.matchingKey + ".segment.";
         if (startsWith(builtSegmentKeyName, prefix))
-            return builtSegmentKeyName.substr(prefix.length);
+            return builtSegmentKeyName.slice(prefix.length);
     };
     KeyBuilderCS.prototype.buildLastUpdatedKey = function () {
         return this.prefix + ".splits.lastUpdated";
@@ -29,8 +29,14 @@ var KeyBuilderCS = /** @class */ (function (_super) {
     KeyBuilderCS.prototype.buildTillKey = function () {
         return this.prefix + "." + this.matchingKey + ".segments.till";
     };
-    KeyBuilderCS.prototype.buildLastClear = function () {
-        return this.prefix + ".lastClear";
+    KeyBuilderCS.prototype.isSplitKey = function (key) {
+        return startsWith(key, this.prefix + ".split.");
+    };
+    KeyBuilderCS.prototype.isRBSegmentKey = function (key) {
+        return startsWith(key, this.prefix + ".rbsegment.");
+    };
+    KeyBuilderCS.prototype.buildSplitsWithSegmentCountKey = function () {
+        return this.prefix + ".splits.usingSegments";
     };
     return KeyBuilderCS;
 }(KeyBuilder));
@@ -43,7 +49,7 @@ export function myLargeSegmentsKeyBuilder(prefix, matchingKey) {
         extractSegmentName: function (builtSegmentKeyName) {
             var p = prefix + "." + matchingKey + ".largeSegment.";
             if (startsWith(builtSegmentKeyName, p))
-                return builtSegmentKeyName.substr(p.length);
+                return builtSegmentKeyName.slice(p.length);
         },
         buildTillKey: function () {
             return prefix + "." + matchingKey + ".largeSegments.till";

package/esm/storages/KeyBuilderSS.js

@@ -39,6 +39,9 @@ var KeyBuilderSS = /** @class */ (function (_super) {
     KeyBuilderSS.prototype.searchPatternForSplitKeys = function () {
         return this.buildSplitKeyPrefix() + "*";
     };
+    KeyBuilderSS.prototype.searchPatternForRBSegmentKeys = function () {
+        return this.buildRBSegmentKeyPrefix() + "*";
+    };
     /* Telemetry keys */
     KeyBuilderSS.prototype.buildLatencyKey = function (method, bucket) {
         return this.latencyPrefix + "::" + this.versionablePrefix + "/" + METHOD_NAMES[method] + "/" + bucket;

package/esm/storages/dataLoader.js

@@ -1,5 +1,4 @@
-// This value might be eventually set via a config parameter
-var DEFAULT_CACHE_EXPIRATION_IN_MILLIS = 864000000; // 10 days
+import { DEFAULT_CACHE_EXPIRATION_IN_MILLIS } from '../utils/constants/browser';
 /**
  * Factory of client-side storage loader
  *
@@ -30,9 +29,8 @@ export function dataLoaderFactory(preloadedData) {
             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]); }));
+        storage.splits.update(Object.keys(splitsData).map(function (splitName) { return JSON.parse(splitsData[splitName]); }), [], since);
         // add mySegments data
         var mySegmentsData = preloadedData.mySegmentsData && preloadedData.mySegmentsData[userId];
         if (!mySegmentsData) {

package/esm/storages/inLocalStorage/RBSegmentsCacheInLocal.js

@@ -0,0 +1,114 @@
+import { isFiniteNumber, isNaNNumber, toNumber } from '../../utils/lang';
+import { setToArray } from '../../utils/lang/sets';
+import { usesSegments } from '../AbstractSplitsCacheSync';
+import { LOG_PREFIX } from './constants';
+var RBSegmentsCacheInLocal = /** @class */ (function () {
+    function RBSegmentsCacheInLocal(settings, keys) {
+        this.keys = keys;
+        this.log = settings.log;
+    }
+    RBSegmentsCacheInLocal.prototype.clear = function () {
+        var _this = this;
+        this.getNames().forEach(function (name) { return _this.remove(name); });
+        localStorage.removeItem(this.keys.buildRBSegmentsTillKey());
+    };
+    RBSegmentsCacheInLocal.prototype.update = function (toAdd, toRemove, changeNumber) {
+        var _this = this;
+        this.setChangeNumber(changeNumber);
+        var updated = toAdd.map(function (toAdd) { return _this.add(toAdd); }).some(function (result) { return result; });
+        return toRemove.map(function (toRemove) { return _this.remove(toRemove.name); }).some(function (result) { return result; }) || updated;
+    };
+    RBSegmentsCacheInLocal.prototype.setChangeNumber = function (changeNumber) {
+        try {
+            localStorage.setItem(this.keys.buildRBSegmentsTillKey(), changeNumber + '');
+            localStorage.setItem(this.keys.buildLastUpdatedKey(), Date.now() + '');
+        }
+        catch (e) {
+            this.log.error(LOG_PREFIX + e);
+        }
+    };
+    RBSegmentsCacheInLocal.prototype.updateSegmentCount = function (diff) {
+        var segmentsCountKey = this.keys.buildSplitsWithSegmentCountKey();
+        var count = toNumber(localStorage.getItem(segmentsCountKey)) + diff;
+        // @ts-expect-error
+        if (count > 0)
+            localStorage.setItem(segmentsCountKey, count);
+        else
+            localStorage.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 usesSegmentsDiff = 0;
+            if (previous && usesSegments(previous))
+                usesSegmentsDiff--;
+            if (usesSegments(rbSegment))
+                usesSegmentsDiff++;
+            if (usesSegmentsDiff !== 0)
+                this.updateSegmentCount(usesSegmentsDiff);
+            return true;
+        }
+        catch (e) {
+            this.log.error(LOG_PREFIX + e);
+            return false;
+        }
+    };
+    RBSegmentsCacheInLocal.prototype.remove = function (name) {
+        try {
+            var rbSegment = this.get(name);
+            if (!rbSegment)
+                return false;
+            localStorage.removeItem(this.keys.buildRBSegmentKey(name));
+            if (usesSegments(rbSegment))
+                this.updateSegmentCount(-1);
+            return true;
+        }
+        catch (e) {
+            this.log.error(LOG_PREFIX + e);
+            return false;
+        }
+    };
+    RBSegmentsCacheInLocal.prototype.getNames = function () {
+        var len = localStorage.length;
+        var accum = [];
+        var cur = 0;
+        while (cur < len) {
+            var key = localStorage.key(cur);
+            if (key != null && this.keys.isRBSegmentKey(key))
+                accum.push(this.keys.extractKey(key));
+            cur++;
+        }
+        return accum;
+    };
+    RBSegmentsCacheInLocal.prototype.get = function (name) {
+        var item = localStorage.getItem(this.keys.buildRBSegmentKey(name));
+        return item && JSON.parse(item);
+    };
+    RBSegmentsCacheInLocal.prototype.contains = function (names) {
+        var namesArray = setToArray(names);
+        var namesInStorage = this.getNames();
+        return namesArray.every(function (name) { return namesInStorage.indexOf(name) !== -1; });
+    };
+    RBSegmentsCacheInLocal.prototype.getChangeNumber = function () {
+        var n = -1;
+        var value = localStorage.getItem(this.keys.buildRBSegmentsTillKey());
+        if (value !== null) {
+            value = parseInt(value, 10);
+            return isNaNNumber(value) ? n : value;
+        }
+        return n;
+    };
+    RBSegmentsCacheInLocal.prototype.usesSegments = function () {
+        var storedCount = localStorage.getItem(this.keys.buildSplitsWithSegmentCountKey());
+        var splitsWithSegmentsCount = storedCount === null ? 0 : toNumber(storedCount);
+        return isFiniteNumber(splitsWithSegmentsCount) ?
+            splitsWithSegmentsCount > 0 :
+            true;
+    };
+    return RBSegmentsCacheInLocal;
+}());
+export { RBSegmentsCacheInLocal };

package/esm/storages/inLocalStorage/SplitsCacheInLocal.js

@@ -2,17 +2,21 @@ import { __extends } from "tslib";
 import { AbstractSplitsCacheSync, usesSegments } from '../AbstractSplitsCacheSync';
 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.
  */
 var SplitsCacheInLocal = /** @class */ (function (_super) {
     __extends(SplitsCacheInLocal, _super);
-    function SplitsCacheInLocal(settings, keys) {
+    function SplitsCacheInLocal(settings, keys, expirationTimestamp) {
         var _this = _super.call(this) || this;
         _this.keys = keys;
         _this.log = settings.log;
+        _this.storageHash = getStorageHash(settings);
         _this.flagSetsFilter = settings.sync.__splitFiltersValidation.groupedFilters.bySet;
+        _this._checkExpiration(expirationTimestamp);
+        _this._checkFilterQuery();
         return _this;
     }
     SplitsCacheInLocal.prototype._decrementCount = function (key) {
@@ -40,15 +44,13 @@ var SplitsCacheInLocal = /** @class */ (function (_super) {
     };
     SplitsCacheInLocal.prototype._incrementCounts = function (split) {
         try {
-            if (split) {
-                var ttKey = this.keys.buildTrafficTypeKey(split.trafficTypeName);
+            var ttKey = this.keys.buildTrafficTypeKey(split.trafficTypeName);
+            // @ts-expect-error
+            localStorage.setItem(ttKey, toNumber(localStorage.getItem(ttKey)) + 1);
+            if (usesSegments(split)) {
+                var segmentsCountKey = this.keys.buildSplitsWithSegmentCountKey();
                 // @ts-expect-error
-                localStorage.setItem(ttKey, toNumber(localStorage.getItem(ttKey)) + 1);
-                if (usesSegments(split)) {
-                    var segmentsCountKey = this.keys.buildSplitsWithSegmentCountKey();
-                    // @ts-expect-error
-                    localStorage.setItem(segmentsCountKey, toNumber(localStorage.getItem(segmentsCountKey)) + 1);
-                }
+                localStorage.setItem(segmentsCountKey, toNumber(localStorage.getItem(segmentsCountKey)) + 1);
             }
         }
         catch (e) {
@@ -60,6 +62,7 @@ var SplitsCacheInLocal = /** @class */ (function (_super) {
      * We cannot simply call `localStorage.clear()` since that implies removing user items from the storage.
      */
     SplitsCacheInLocal.prototype.clear = function () {
+        this.log.info(LOG_PREFIX + 'Flushing Splits data from localStorage');
         // collect item keys
         var len = localStorage.length;
         var accum = [];
@@ -74,9 +77,10 @@ var SplitsCacheInLocal = /** @class */ (function (_super) {
         });
         this.hasSync = false;
     };
-    SplitsCacheInLocal.prototype.addSplit = function (name, split) {
+    SplitsCacheInLocal.prototype.addSplit = function (split) {
         try {
-            var splitKey = this.keys.buildSplitKey(name);
+            var name_1 = split.name;
+            var splitKey = this.keys.buildSplitKey(name_1);
             var splitFromLocalStorage = localStorage.getItem(splitKey);
             var previousSplit = splitFromLocalStorage ? JSON.parse(splitFromLocalStorage) : null;
             localStorage.setItem(splitKey, JSON.stringify(split));
@@ -95,6 +99,8 @@ var SplitsCacheInLocal = /** @class */ (function (_super) {
     SplitsCacheInLocal.prototype.removeSplit = function (name) {
         try {
             var split = this.getSplit(name);
+            if (!split)
+                return false;
             localStorage.removeItem(this.keys.buildSplitKey(name));
             this._decrementCounts(split);
             if (split)
@@ -111,6 +117,18 @@ var SplitsCacheInLocal = /** @class */ (function (_super) {
         return item && JSON.parse(item);
     };
     SplitsCacheInLocal.prototype.setChangeNumber = function (changeNumber) {
+        // when using a new split query, we must update it at the store
+        if (this.updateNewFilter) {
+            this.log.info(LOG_PREFIX + 'SDK key, flags filter criteria or flags spec version was modified. Updating cache');
+            var storageHashKey = this.keys.buildHashKey();
+            try {
+                localStorage.setItem(storageHashKey, this.storageHash);
+            }
+            catch (e) {
+                this.log.error(LOG_PREFIX + e);
+            }
+            this.updateNewFilter = false;
+        }
         try {
             localStorage.setItem(this.keys.buildSplitsTillKey(), changeNumber + '');
             // update "last updated" timestamp with current time
@@ -154,12 +172,48 @@ var SplitsCacheInLocal = /** @class */ (function (_super) {
             return true;
         var storedCount = localStorage.getItem(this.keys.buildSplitsWithSegmentCountKey());
         var splitsWithSegmentsCount = storedCount === null ? 0 : toNumber(storedCount);
-        if (isFiniteNumber(splitsWithSegmentsCount)) {
-            return splitsWithSegmentsCount > 0;
+        return isFiniteNumber(splitsWithSegmentsCount) ?
+            splitsWithSegmentsCount > 0 :
+            true;
+    };
+    /**
+     * Check if the splits information is already stored in browser LocalStorage.
+     * In this function we could add more code to check if the data is valid.
+     * @override
+     */
+    SplitsCacheInLocal.prototype.checkCache = function () {
+        return this.getChangeNumber() > -1;
+    };
+    /**
+     * Clean Splits cache if its `lastUpdated` timestamp is older than the given `expirationTimestamp`,
+     *
+     * @param expirationTimestamp - if the value is not a number, data will not be cleaned
+     */
+    SplitsCacheInLocal.prototype._checkExpiration = function (expirationTimestamp) {
+        var value = localStorage.getItem(this.keys.buildLastUpdatedKey());
+        if (value !== null) {
+            value = parseInt(value, 10);
+            if (!isNaNNumber(value) && expirationTimestamp && value < expirationTimestamp)
+                this.clear();
         }
-        else {
-            return true;
+    };
+    // @TODO eventually remove `_checkFilterQuery`. Cache should be cleared at the storage level, reusing same logic than PluggableStorage
+    SplitsCacheInLocal.prototype._checkFilterQuery = function () {
+        var storageHashKey = this.keys.buildHashKey();
+        var storageHash = localStorage.getItem(storageHashKey);
+        if (storageHash !== this.storageHash) {
+            try {
+                // mark cache to update the new query filter on first successful splits fetch
+                this.updateNewFilter = true;
+                // if there is cache, clear it
+                if (this.checkCache())
+                    this.clear();
+            }
+            catch (e) {
+                this.log.error(LOG_PREFIX + e);
+            }
         }
+        // if the filter didn't change, nothing is done
     };
     SplitsCacheInLocal.prototype.getNamesByFlagSets = function (flagSets) {
         var _this = this;

package/esm/storages/inLocalStorage/index.js

@@ -6,13 +6,14 @@ import { KeyBuilderCS, myLargeSegmentsKeyBuilder } from '../KeyBuilderCS';
 import { isLocalStorageAvailable } from '../../utils/env/isLocalStorageAvailable';
 import { SplitsCacheInLocal } from './SplitsCacheInLocal';
 import { MySegmentsCacheInLocal } from './MySegmentsCacheInLocal';
+import { DEFAULT_CACHE_EXPIRATION_IN_MILLIS } from '../../utils/constants/browser';
 import { InMemoryStorageCSFactory } from '../inMemory/InMemoryStorageCS';
 import { LOG_PREFIX } from './constants';
 import { STORAGE_LOCALSTORAGE } from '../../utils/constants';
 import { shouldRecordTelemetry, TelemetryCacheInMemory } from '../inMemory/TelemetryCacheInMemory';
 import { UniqueKeysCacheInMemoryCS } from '../inMemory/UniqueKeysCacheInMemoryCS';
 import { getMatching } from '../../utils/key';
-import { validateCache } from './validateCache';
+import { RBSegmentsCacheInLocal } from './RBSegmentsCacheInLocal';
 /**
  * InLocal storage factory for standalone client-side SplitFactory
  */
@@ -28,11 +29,14 @@ export function InLocalStorage(options) {
         var settings = params.settings, _a = params.settings, log = _a.log, _b = _a.scheduler, impressionsQueueSize = _b.impressionsQueueSize, eventsQueueSize = _b.eventsQueueSize;
         var matchingKey = getMatching(settings.core.key);
         var keys = new KeyBuilderCS(prefix, matchingKey);
-        var splits = new SplitsCacheInLocal(settings, keys);
+        var expirationTimestamp = Date.now() - DEFAULT_CACHE_EXPIRATION_IN_MILLIS;
+        var splits = new SplitsCacheInLocal(settings, keys, expirationTimestamp);
+        var rbSegments = new RBSegmentsCacheInLocal(settings, keys);
         var segments = new MySegmentsCacheInLocal(log, keys);
         var largeSegments = new MySegmentsCacheInLocal(log, myLargeSegmentsKeyBuilder(prefix, matchingKey));
         return {
             splits: splits,
+            rbSegments: rbSegments,
             segments: segments,
             largeSegments: largeSegments,
             impressions: new ImpressionsCacheInMemory(impressionsQueueSize),
@@ -40,14 +44,12 @@ export function InLocalStorage(options) {
             events: new EventsCacheInMemory(eventsQueueSize),
             telemetry: shouldRecordTelemetry(params) ? new TelemetryCacheInMemory(splits, segments) : undefined,
             uniqueKeys: new UniqueKeysCacheInMemoryCS(),
-            validateCache: function () {
-                return validateCache(options, settings, keys, splits, segments, largeSegments);
-            },
             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)),
                     impressions: this.impressions,

package/esm/storages/inMemory/InMemoryStorage.js

@@ -6,6 +6,7 @@ import { ImpressionCountsCacheInMemory } from './ImpressionCountsCacheInMemory';
 import { LOCALHOST_MODE, STORAGE_MEMORY } from '../../utils/constants';
 import { shouldRecordTelemetry, TelemetryCacheInMemory } from './TelemetryCacheInMemory';
 import { UniqueKeysCacheInMemory } from './UniqueKeysCacheInMemory';
+import { RBSegmentsCacheInMemory } from './RBSegmentsCacheInMemory';
 /**
  * InMemory storage factory for standalone server-side SplitFactory
  *
@@ -14,9 +15,11 @@ import { UniqueKeysCacheInMemory } from './UniqueKeysCacheInMemory';
 export function InMemoryStorageFactory(params) {
     var _a = params.settings, _b = _a.scheduler, impressionsQueueSize = _b.impressionsQueueSize, eventsQueueSize = _b.eventsQueueSize, __splitFiltersValidation = _a.sync.__splitFiltersValidation;
     var splits = new SplitsCacheInMemory(__splitFiltersValidation);
+    var rbSegments = new RBSegmentsCacheInMemory();
     var segments = new SegmentsCacheInMemory();
     var storage = {
         splits: splits,
+        rbSegments: rbSegments,
         segments: segments,
         impressions: new ImpressionsCacheInMemory(impressionsQueueSize),
         impressionCounts: new ImpressionCountsCacheInMemory(),

package/esm/storages/inMemory/InMemoryStorageCS.js

@@ -6,6 +6,7 @@ import { ImpressionCountsCacheInMemory } from './ImpressionCountsCacheInMemory';
 import { LOCALHOST_MODE, STORAGE_MEMORY } from '../../utils/constants';
 import { shouldRecordTelemetry, TelemetryCacheInMemory } from './TelemetryCacheInMemory';
 import { UniqueKeysCacheInMemoryCS } from './UniqueKeysCacheInMemoryCS';
+import { RBSegmentsCacheInMemory } from './RBSegmentsCacheInMemory';
 /**
  * InMemory storage factory for standalone client-side SplitFactory
  *
@@ -14,10 +15,12 @@ import { UniqueKeysCacheInMemoryCS } from './UniqueKeysCacheInMemoryCS';
 export function InMemoryStorageCSFactory(params) {
     var _a = params.settings, _b = _a.scheduler, impressionsQueueSize = _b.impressionsQueueSize, eventsQueueSize = _b.eventsQueueSize, __splitFiltersValidation = _a.sync.__splitFiltersValidation;
     var splits = new SplitsCacheInMemory(__splitFiltersValidation);
+    var rbSegments = new RBSegmentsCacheInMemory();
     var segments = new MySegmentsCacheInMemory();
     var largeSegments = new MySegmentsCacheInMemory();
     var storage = {
         splits: splits,
+        rbSegments: rbSegments,
         segments: segments,
         largeSegments: largeSegments,
         impressions: new ImpressionsCacheInMemory(impressionsQueueSize),
@@ -30,6 +33,7 @@ export function InMemoryStorageCSFactory(params) {
         shared: function () {
             return {
                 splits: this.splits,
+                rbSegments: this.rbSegments,
                 segments: new MySegmentsCacheInMemory(),
                 largeSegments: new MySegmentsCacheInMemory(),
                 impressions: this.impressions,