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

package/cjs/services/splitApi.js

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

package/cjs/storages/AbstractSplitsCacheAsync.js

@@ -25,13 +25,6 @@ var AbstractSplitsCacheAsync = /** @class */ (function () {
     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.

package/cjs/storages/AbstractSplitsCacheSync.js

@@ -28,13 +28,6 @@ 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.
@@ -60,8 +53,8 @@ exports.AbstractSplitsCacheSync = 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
  */
-function usesSegments(ruleEntity) {
-    var conditions = ruleEntity.conditions || [];
+function usesSegments(split) {
+    var conditions = split.conditions || [];
     for (var i = 0; i < conditions.length; i++) {
         var matchers = conditions[i].matcherGroup.matchers;
         for (var j = 0; j < matchers.length; j++) {
@@ -70,9 +63,6 @@ function usesSegments(ruleEntity) {
                 return true;
         }
     }
-    var excluded = ruleEntity.excluded;
-    if (excluded && excluded.segments && excluded.segments.length > 0)
-        return true;
     return false;
 }
 exports.usesSegments = usesSegments;

package/cjs/storages/KeyBuilder.js

@@ -28,15 +28,6 @@ var KeyBuilder = /** @class */ (function () {
     KeyBuilder.prototype.buildSplitKeyPrefix = function () {
         return this.prefix + ".split.";
     };
-    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;
     };

package/cjs/storages/KeyBuilderCS.js

@@ -9,7 +9,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|rbsegment)\\.");
+        _this.regexSplitsCacheKey = new RegExp("^" + prefix + "\\.(splits?|trafficType|flagSet)\\.");
         return _this;
     }
     /**
@@ -35,12 +35,12 @@ var KeyBuilderCS = /** @class */ (function (_super) {
     KeyBuilderCS.prototype.isSplitKey = function (key) {
         return (0, lang_1.startsWith)(key, this.prefix + ".split.");
     };
-    KeyBuilderCS.prototype.isRBSegmentKey = function (key) {
-        return (0, lang_1.startsWith)(key, this.prefix + ".rbsegment.");
-    };
     KeyBuilderCS.prototype.buildSplitsWithSegmentCountKey = function () {
         return this.prefix + ".splits.usingSegments";
     };
+    KeyBuilderCS.prototype.buildLastClear = function () {
+        return this.prefix + ".lastClear";
+    };
     return KeyBuilderCS;
 }(KeyBuilder_1.KeyBuilder));
 exports.KeyBuilderCS = KeyBuilderCS;

package/cjs/storages/KeyBuilderSS.js

@@ -42,9 +42,6 @@ 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 + "/" + exports.METHOD_NAMES[method] + "/" + bucket;

package/cjs/storages/dataLoader.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.dataLoaderFactory = void 0;
-var browser_1 = require("../utils/constants/browser");
+// This value might be eventually set via a config parameter
+var DEFAULT_CACHE_EXPIRATION_IN_MILLIS = 864000000; // 10 days
 /**
  * Factory of client-side storage loader
  *
@@ -25,7 +26,7 @@ function dataLoaderFactory(preloadedData) {
             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;
         var storedSince = storage.splits.getChangeNumber();
-        var expirationTimestamp = Date.now() - browser_1.DEFAULT_CACHE_EXPIRATION_IN_MILLIS;
+        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)

package/cjs/storages/inLocalStorage/SplitsCacheInLocal.js

@@ -5,21 +5,17 @@ var tslib_1 = require("tslib");
 var AbstractSplitsCacheSync_1 = require("../AbstractSplitsCacheSync");
 var lang_1 = require("../../utils/lang");
 var constants_1 = require("./constants");
-var KeyBuilder_1 = require("../KeyBuilder");
 var sets_1 = require("../../utils/lang/sets");
 /**
  * ISplitsCacheSync implementation that stores split definitions in browser LocalStorage.
  */
 var SplitsCacheInLocal = /** @class */ (function (_super) {
     (0, tslib_1.__extends)(SplitsCacheInLocal, _super);
-    function SplitsCacheInLocal(settings, keys, expirationTimestamp) {
+    function SplitsCacheInLocal(settings, keys) {
         var _this = _super.call(this) || this;
         _this.keys = keys;
         _this.log = settings.log;
-        _this.storageHash = (0, KeyBuilder_1.getStorageHash)(settings);
         _this.flagSetsFilter = settings.sync.__splitFiltersValidation.groupedFilters.bySet;
-        _this._checkExpiration(expirationTimestamp);
-        _this._checkFilterQuery();
         return _this;
     }
     SplitsCacheInLocal.prototype._decrementCount = function (key) {
@@ -32,13 +28,11 @@ var SplitsCacheInLocal = /** @class */ (function (_super) {
     };
     SplitsCacheInLocal.prototype._decrementCounts = function (split) {
         try {
-            if (split) {
-                var ttKey = this.keys.buildTrafficTypeKey(split.trafficTypeName);
-                this._decrementCount(ttKey);
-                if ((0, AbstractSplitsCacheSync_1.usesSegments)(split)) {
-                    var segmentsCountKey = this.keys.buildSplitsWithSegmentCountKey();
-                    this._decrementCount(segmentsCountKey);
-                }
+            var ttKey = this.keys.buildTrafficTypeKey(split.trafficTypeName);
+            this._decrementCount(ttKey);
+            if ((0, AbstractSplitsCacheSync_1.usesSegments)(split)) {
+                var segmentsCountKey = this.keys.buildSplitsWithSegmentCountKey();
+                this._decrementCount(segmentsCountKey);
             }
         }
         catch (e) {
@@ -47,13 +41,15 @@ var SplitsCacheInLocal = /** @class */ (function (_super) {
     };
     SplitsCacheInLocal.prototype._incrementCounts = function (split) {
         try {
-            var ttKey = this.keys.buildTrafficTypeKey(split.trafficTypeName);
-            // @ts-expect-error
-            localStorage.setItem(ttKey, (0, lang_1.toNumber)(localStorage.getItem(ttKey)) + 1);
-            if ((0, AbstractSplitsCacheSync_1.usesSegments)(split)) {
-                var segmentsCountKey = this.keys.buildSplitsWithSegmentCountKey();
+            if (split) {
+                var ttKey = this.keys.buildTrafficTypeKey(split.trafficTypeName);
                 // @ts-expect-error
-                localStorage.setItem(segmentsCountKey, (0, lang_1.toNumber)(localStorage.getItem(segmentsCountKey)) + 1);
+                localStorage.setItem(ttKey, (0, lang_1.toNumber)(localStorage.getItem(ttKey)) + 1);
+                if ((0, AbstractSplitsCacheSync_1.usesSegments)(split)) {
+                    var segmentsCountKey = this.keys.buildSplitsWithSegmentCountKey();
+                    // @ts-expect-error
+                    localStorage.setItem(segmentsCountKey, (0, lang_1.toNumber)(localStorage.getItem(segmentsCountKey)) + 1);
+                }
             }
         }
         catch (e) {
@@ -65,7 +61,6 @@ 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(constants_1.LOG_PREFIX + 'Flushing Splits data from localStorage');
         // collect item keys
         var len = localStorage.length;
         var accum = [];
@@ -86,11 +81,12 @@ var SplitsCacheInLocal = /** @class */ (function (_super) {
             var splitKey = this.keys.buildSplitKey(name_1);
             var splitFromLocalStorage = localStorage.getItem(splitKey);
             var previousSplit = splitFromLocalStorage ? JSON.parse(splitFromLocalStorage) : null;
+            if (previousSplit) {
+                this._decrementCounts(previousSplit);
+                this.removeFromFlagSets(previousSplit.name, previousSplit.sets);
+            }
             localStorage.setItem(splitKey, JSON.stringify(split));
             this._incrementCounts(split);
-            this._decrementCounts(previousSplit);
-            if (previousSplit)
-                this.removeFromFlagSets(previousSplit.name, previousSplit.sets);
             this.addToFlagSets(split);
             return true;
         }
@@ -106,8 +102,7 @@ var SplitsCacheInLocal = /** @class */ (function (_super) {
                 return false;
             localStorage.removeItem(this.keys.buildSplitKey(name));
             this._decrementCounts(split);
-            if (split)
-                this.removeFromFlagSets(split.name, split.sets);
+            this.removeFromFlagSets(split.name, split.sets);
             return true;
         }
         catch (e) {
@@ -120,18 +115,6 @@ 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(constants_1.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(constants_1.LOG_PREFIX + e);
-            }
-            this.updateNewFilter = false;
-        }
         try {
             localStorage.setItem(this.keys.buildSplitsTillKey(), changeNumber + '');
             // update "last updated" timestamp with current time
@@ -175,48 +158,12 @@ var SplitsCacheInLocal = /** @class */ (function (_super) {
             return true;
         var storedCount = localStorage.getItem(this.keys.buildSplitsWithSegmentCountKey());
         var splitsWithSegmentsCount = storedCount === null ? 0 : (0, lang_1.toNumber)(storedCount);
-        return (0, lang_1.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 (!(0, lang_1.isNaNNumber)(value) && expirationTimestamp && value < expirationTimestamp)
-                this.clear();
+        if ((0, lang_1.isFiniteNumber)(splitsWithSegmentsCount)) {
+            return splitsWithSegmentsCount > 0;
         }
-    };
-    // @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(constants_1.LOG_PREFIX + e);
-            }
+        else {
+            return true;
         }
-        // if the filter didn't change, nothing is done
     };
     SplitsCacheInLocal.prototype.getNamesByFlagSets = function (flagSets) {
         var _this = this;

package/cjs/storages/inLocalStorage/index.js

@@ -9,14 +9,13 @@ var KeyBuilderCS_1 = require("../KeyBuilderCS");
 var isLocalStorageAvailable_1 = require("../../utils/env/isLocalStorageAvailable");
 var SplitsCacheInLocal_1 = require("./SplitsCacheInLocal");
 var MySegmentsCacheInLocal_1 = require("./MySegmentsCacheInLocal");
-var browser_1 = require("../../utils/constants/browser");
 var InMemoryStorageCS_1 = require("../inMemory/InMemoryStorageCS");
 var constants_1 = require("./constants");
 var constants_2 = require("../../utils/constants");
 var TelemetryCacheInMemory_1 = require("../inMemory/TelemetryCacheInMemory");
 var UniqueKeysCacheInMemoryCS_1 = require("../inMemory/UniqueKeysCacheInMemoryCS");
 var key_1 = require("../../utils/key");
-var RBSegmentsCacheInLocal_1 = require("./RBSegmentsCacheInLocal");
+var validateCache_1 = require("./validateCache");
 /**
  * InLocal storage factory for standalone client-side SplitFactory
  */
@@ -32,14 +31,11 @@ function InLocalStorage(options) {
         var settings = params.settings, _a = params.settings, log = _a.log, _b = _a.scheduler, impressionsQueueSize = _b.impressionsQueueSize, eventsQueueSize = _b.eventsQueueSize;
         var matchingKey = (0, key_1.getMatching)(settings.core.key);
         var keys = new KeyBuilderCS_1.KeyBuilderCS(prefix, matchingKey);
-        var expirationTimestamp = Date.now() - browser_1.DEFAULT_CACHE_EXPIRATION_IN_MILLIS;
-        var splits = new SplitsCacheInLocal_1.SplitsCacheInLocal(settings, keys, expirationTimestamp);
-        var rbSegments = new RBSegmentsCacheInLocal_1.RBSegmentsCacheInLocal(settings, keys);
+        var splits = new SplitsCacheInLocal_1.SplitsCacheInLocal(settings, keys);
         var segments = new MySegmentsCacheInLocal_1.MySegmentsCacheInLocal(log, keys);
         var largeSegments = new MySegmentsCacheInLocal_1.MySegmentsCacheInLocal(log, (0, KeyBuilderCS_1.myLargeSegmentsKeyBuilder)(prefix, matchingKey));
         return {
             splits: splits,
-            rbSegments: rbSegments,
             segments: segments,
             largeSegments: largeSegments,
             impressions: new ImpressionsCacheInMemory_1.ImpressionsCacheInMemory(impressionsQueueSize),
@@ -47,12 +43,14 @@ function InLocalStorage(options) {
             events: new EventsCacheInMemory_1.EventsCacheInMemory(eventsQueueSize),
             telemetry: (0, TelemetryCacheInMemory_1.shouldRecordTelemetry)(params) ? new TelemetryCacheInMemory_1.TelemetryCacheInMemory(splits, segments) : undefined,
             uniqueKeys: new UniqueKeysCacheInMemoryCS_1.UniqueKeysCacheInMemoryCS(),
+            validateCache: function () {
+                return (0, validateCache_1.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_1.MySegmentsCacheInLocal(log, new KeyBuilderCS_1.KeyBuilderCS(prefix, matchingKey)),
                     largeSegments: new MySegmentsCacheInLocal_1.MySegmentsCacheInLocal(log, (0, KeyBuilderCS_1.myLargeSegmentsKeyBuilder)(prefix, matchingKey)),
                     impressions: this.impressions,

package/cjs/storages/inLocalStorage/validateCache.js

@@ -0,0 +1,79 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateCache = void 0;
+var lang_1 = require("../../utils/lang");
+var KeyBuilder_1 = require("../KeyBuilder");
+var constants_1 = require("./constants");
+var DEFAULT_CACHE_EXPIRATION_IN_DAYS = 10;
+var MILLIS_IN_A_DAY = 86400000;
+/**
+ * Validates if cache should be cleared and sets the cache `hash` if needed.
+ *
+ * @returns `true` if cache should be cleared, `false` otherwise
+ */
+function validateExpiration(options, settings, keys, currentTimestamp, isThereCache) {
+    var log = settings.log;
+    // Check expiration
+    var lastUpdatedTimestamp = parseInt(localStorage.getItem(keys.buildLastUpdatedKey()), 10);
+    if (!(0, lang_1.isNaNNumber)(lastUpdatedTimestamp)) {
+        var cacheExpirationInDays = (0, lang_1.isFiniteNumber)(options.expirationDays) && options.expirationDays >= 1 ? options.expirationDays : DEFAULT_CACHE_EXPIRATION_IN_DAYS;
+        var expirationTimestamp = currentTimestamp - MILLIS_IN_A_DAY * cacheExpirationInDays;
+        if (lastUpdatedTimestamp < expirationTimestamp) {
+            log.info(constants_1.LOG_PREFIX + 'Cache expired more than ' + cacheExpirationInDays + ' days ago. Cleaning up cache');
+            return true;
+        }
+    }
+    // Check hash
+    var storageHashKey = keys.buildHashKey();
+    var storageHash = localStorage.getItem(storageHashKey);
+    var currentStorageHash = (0, KeyBuilder_1.getStorageHash)(settings);
+    if (storageHash !== currentStorageHash) {
+        try {
+            localStorage.setItem(storageHashKey, currentStorageHash);
+        }
+        catch (e) {
+            log.error(constants_1.LOG_PREFIX + e);
+        }
+        if (isThereCache) {
+            log.info(constants_1.LOG_PREFIX + 'SDK key, flags filter criteria, or flags spec version has changed. Cleaning up cache');
+            return true;
+        }
+        return false; // No cache to clear
+    }
+    // Clear on init
+    if (options.clearOnInit) {
+        var lastClearTimestamp = parseInt(localStorage.getItem(keys.buildLastClear()), 10);
+        if ((0, lang_1.isNaNNumber)(lastClearTimestamp) || lastClearTimestamp < currentTimestamp - MILLIS_IN_A_DAY) {
+            log.info(constants_1.LOG_PREFIX + 'clearOnInit was set and cache was not cleared in the last 24 hours. Cleaning up cache');
+            return true;
+        }
+    }
+}
+/**
+ * Clean cache if:
+ * - it has expired, i.e., its `lastUpdated` timestamp is older than the given `expirationTimestamp`
+ * - its hash has changed, i.e., the SDK key, flags filter criteria or flags spec version was modified
+ * - `clearOnInit` was set and cache was not cleared in the last 24 hours
+ *
+ * @returns `true` if cache is ready to be used, `false` otherwise (cache was cleared or there is no cache)
+ */
+function validateCache(options, settings, keys, splits, segments, largeSegments) {
+    var currentTimestamp = Date.now();
+    var isThereCache = splits.getChangeNumber() > -1;
+    if (validateExpiration(options, settings, keys, currentTimestamp, isThereCache)) {
+        splits.clear();
+        segments.clear();
+        largeSegments.clear();
+        // Update last clear timestamp
+        try {
+            localStorage.setItem(keys.buildLastClear(), currentTimestamp + '');
+        }
+        catch (e) {
+            settings.log.error(constants_1.LOG_PREFIX + e);
+        }
+        return false;
+    }
+    // Check if ready from cache
+    return isThereCache;
+}
+exports.validateCache = validateCache;

package/cjs/storages/inMemory/InMemoryStorage.js

@@ -9,7 +9,6 @@ var ImpressionCountsCacheInMemory_1 = require("./ImpressionCountsCacheInMemory")
 var constants_1 = require("../../utils/constants");
 var TelemetryCacheInMemory_1 = require("./TelemetryCacheInMemory");
 var UniqueKeysCacheInMemory_1 = require("./UniqueKeysCacheInMemory");
-var RBSegmentsCacheInMemory_1 = require("./RBSegmentsCacheInMemory");
 /**
  * InMemory storage factory for standalone server-side SplitFactory
  *
@@ -18,11 +17,9 @@ var RBSegmentsCacheInMemory_1 = require("./RBSegmentsCacheInMemory");
 function InMemoryStorageFactory(params) {
     var _a = params.settings, _b = _a.scheduler, impressionsQueueSize = _b.impressionsQueueSize, eventsQueueSize = _b.eventsQueueSize, __splitFiltersValidation = _a.sync.__splitFiltersValidation;
     var splits = new SplitsCacheInMemory_1.SplitsCacheInMemory(__splitFiltersValidation);
-    var rbSegments = new RBSegmentsCacheInMemory_1.RBSegmentsCacheInMemory();
     var segments = new SegmentsCacheInMemory_1.SegmentsCacheInMemory();
     var storage = {
         splits: splits,
-        rbSegments: rbSegments,
         segments: segments,
         impressions: new ImpressionsCacheInMemory_1.ImpressionsCacheInMemory(impressionsQueueSize),
         impressionCounts: new ImpressionCountsCacheInMemory_1.ImpressionCountsCacheInMemory(),

package/cjs/storages/inMemory/InMemoryStorageCS.js

@@ -9,7 +9,6 @@ var ImpressionCountsCacheInMemory_1 = require("./ImpressionCountsCacheInMemory")
 var constants_1 = require("../../utils/constants");
 var TelemetryCacheInMemory_1 = require("./TelemetryCacheInMemory");
 var UniqueKeysCacheInMemoryCS_1 = require("./UniqueKeysCacheInMemoryCS");
-var RBSegmentsCacheInMemory_1 = require("./RBSegmentsCacheInMemory");
 /**
  * InMemory storage factory for standalone client-side SplitFactory
  *
@@ -18,12 +17,10 @@ var RBSegmentsCacheInMemory_1 = require("./RBSegmentsCacheInMemory");
 function InMemoryStorageCSFactory(params) {
     var _a = params.settings, _b = _a.scheduler, impressionsQueueSize = _b.impressionsQueueSize, eventsQueueSize = _b.eventsQueueSize, __splitFiltersValidation = _a.sync.__splitFiltersValidation;
     var splits = new SplitsCacheInMemory_1.SplitsCacheInMemory(__splitFiltersValidation);
-    var rbSegments = new RBSegmentsCacheInMemory_1.RBSegmentsCacheInMemory();
     var segments = new MySegmentsCacheInMemory_1.MySegmentsCacheInMemory();
     var largeSegments = new MySegmentsCacheInMemory_1.MySegmentsCacheInMemory();
     var storage = {
         splits: splits,
-        rbSegments: rbSegments,
         segments: segments,
         largeSegments: largeSegments,
         impressions: new ImpressionsCacheInMemory_1.ImpressionsCacheInMemory(impressionsQueueSize),
@@ -36,7 +33,6 @@ function InMemoryStorageCSFactory(params) {
         shared: function () {
             return {
                 splits: this.splits,
-                rbSegments: this.rbSegments,
                 segments: new MySegmentsCacheInMemory_1.MySegmentsCacheInMemory(),
                 largeSegments: new MySegmentsCacheInMemory_1.MySegmentsCacheInMemory(),
                 impressions: this.impressions,

package/cjs/storages/inRedis/index.js

@@ -12,7 +12,6 @@ var TelemetryCacheInRedis_1 = require("./TelemetryCacheInRedis");
 var UniqueKeysCacheInRedis_1 = require("./UniqueKeysCacheInRedis");
 var ImpressionCountsCacheInRedis_1 = require("./ImpressionCountsCacheInRedis");
 var utils_1 = require("../utils");
-var RBSegmentsCacheInRedis_1 = require("./RBSegmentsCacheInRedis");
 /**
  * InRedis storage factory for consumer server-side SplitFactory, that uses `Ioredis` Redis client for Node.js
  * @see {@link https://www.npmjs.com/package/ioredis}
@@ -41,7 +40,6 @@ function InRedisStorage(options) {
         });
         return {
             splits: new SplitsCacheInRedis_1.SplitsCacheInRedis(log, keys, redisClient, settings.sync.__splitFiltersValidation),
-            rbSegments: new RBSegmentsCacheInRedis_1.RBSegmentsCacheInRedis(log, keys, redisClient),
             segments: new SegmentsCacheInRedis_1.SegmentsCacheInRedis(log, keys, redisClient),
             impressions: new ImpressionsCacheInRedis_1.ImpressionsCacheInRedis(log, keys.buildImpressionsKey(), redisClient, metadata),
             impressionCounts: impressionCountsCache,

package/cjs/storages/pluggable/index.js

@@ -22,7 +22,6 @@ var UniqueKeysCacheInMemory_1 = require("../inMemory/UniqueKeysCacheInMemory");
 var UniqueKeysCacheInMemoryCS_1 = require("../inMemory/UniqueKeysCacheInMemoryCS");
 var utils_1 = require("../utils");
 var constants_2 = require("../pluggable/constants");
-var RBSegmentsCachePluggable_1 = require("./RBSegmentsCachePluggable");
 var NO_VALID_WRAPPER = 'Expecting pluggable storage `wrapper` in options, but no valid wrapper instance was provided.';
 var NO_VALID_WRAPPER_INTERFACE = 'The provided wrapper instance doesn’t follow the expected interface. Check our docs.';
 /**
@@ -75,7 +74,8 @@ function PluggableStorage(options) {
         // Connects to wrapper and emits SDK_READY event on main client
         var connectPromise = wrapper.connect().then(function () {
             if (isSynchronizer) {
-                // In standalone or producer mode, clear storage if SDK key or feature flag filter has changed
+                // @TODO reuse InLocalStorage::validateCache logic
+                // In standalone or producer mode, clear storage if SDK key, flags filter criteria or flags spec version was modified
                 return wrapper.get(keys.buildHashKey()).then(function (hash) {
                     var currentHash = (0, KeyBuilder_1.getStorageHash)(settings);
                     if (hash !== currentHash) {
@@ -105,7 +105,6 @@ function PluggableStorage(options) {
         });
         return {
             splits: new SplitsCachePluggable_1.SplitsCachePluggable(log, keys, wrapper, settings.sync.__splitFiltersValidation),
-            rbSegments: new RBSegmentsCachePluggable_1.RBSegmentsCachePluggable(log, keys, wrapper),
             segments: new SegmentsCachePluggable_1.SegmentsCachePluggable(log, keys, wrapper),
             impressions: isPartialConsumer ? new ImpressionsCacheInMemory_1.ImpressionsCacheInMemory(impressionsQueueSize) : new ImpressionsCachePluggable_1.ImpressionsCachePluggable(log, keys.buildImpressionsKey(), wrapper, metadata),
             impressionCounts: impressionCountsCache,

package/cjs/storages/utils.js

@@ -27,6 +27,7 @@ function impressionsToJSON(impressions, metadata) {
                 c: impression.changeNumber,
                 m: impression.time,
                 pt: impression.pt,
+                properties: impression.properties
             }
         };
         return JSON.stringify(impressionWithMetadata);

package/cjs/sync/offline/syncTasks/fromObjectSyncTask.js

@@ -45,9 +45,10 @@ function fromObjectUpdaterFactory(splitsParser, storage, readiness, settings) {
                 readiness.splits.emit(constants_2.SDK_SPLITS_ARRIVED);
                 if (startingUp) {
                     startingUp = false;
-                    Promise.resolve(splitsCache.checkCache()).then(function (cacheReady) {
+                    var isCacheLoaded_1 = storage.validateCache ? storage.validateCache() : false;
+                    Promise.resolve().then(function () {
                         // Emits SDK_READY_FROM_CACHE
-                        if (cacheReady)
+                        if (isCacheLoaded_1)
                             readiness.splits.emit(constants_2.SDK_SPLITS_CACHE_LOADED);
                         // Emits SDK_READY
                         readiness.segments.emit(constants_2.SDK_SEGMENTS_ARRIVED);

package/cjs/sync/polling/fetchers/splitChangesFetcher.js

@@ -6,10 +6,10 @@ exports.splitChangesFetcherFactory = void 0;
  * SplitChanges fetcher is a wrapper around `splitChanges` API service that parses the response and handle errors.
  */
 function splitChangesFetcherFactory(fetchSplitChanges) {
-    return function splitChangesFetcher(since, noCache, till, rbSince, 
+    return function splitChangesFetcher(since, noCache, till, 
     // Optional decorator for `fetchSplitChanges` promise, such as timeout or time tracker
     decorator) {
-        var splitsPromise = fetchSplitChanges(since, noCache, till, rbSince);
+        var splitsPromise = fetchSplitChanges(since, noCache, till);
         if (decorator)
             splitsPromise = decorator(splitsPromise);
         return splitsPromise.then(function (resp) { return resp.json(); });

package/cjs/sync/polling/pollingManagerCS.js

@@ -34,10 +34,10 @@ function pollingManagerCSFactory(params) {
     readiness.splits.on(constants_1.SDK_SPLITS_ARRIVED, function () {
         if (!splitsSyncTask.isRunning())
             return; // noop if not doing polling
-        var usingSegments = storage.splits.usesSegments() || storage.rbSegments.usesSegments();
-        if (usingSegments !== mySegmentsSyncTask.isRunning()) {
-            log.info(constants_2.POLLING_SMART_PAUSING, [usingSegments ? 'ON' : 'OFF']);
-            if (usingSegments) {
+        var splitsHaveSegments = storage.splits.usesSegments();
+        if (splitsHaveSegments !== mySegmentsSyncTask.isRunning()) {
+            log.info(constants_2.POLLING_SMART_PAUSING, [splitsHaveSegments ? 'ON' : 'OFF']);
+            if (splitsHaveSegments) {
                 startMySegmentsSyncTasks();
             }
             else {
@@ -49,10 +49,10 @@ function pollingManagerCSFactory(params) {
         var mySegmentsSyncTask = (0, mySegmentsSyncTask_1.mySegmentsSyncTaskFactory)(splitApi.fetchMemberships, storage, readiness, settings, matchingKey);
         // smart ready
         function smartReady() {
-            if (!readiness.isReady() && !storage.splits.usesSegments() && !storage.rbSegments.usesSegments())
+            if (!readiness.isReady() && !storage.splits.usesSegments())
                 readiness.segments.emit(constants_1.SDK_SEGMENTS_ARRIVED);
         }
-        if (!storage.splits.usesSegments() && !storage.rbSegments.usesSegments())
+        if (!storage.splits.usesSegments())
             setTimeout(smartReady, 0);
         else
             readiness.splits.once(constants_1.SDK_SPLITS_ARRIVED, smartReady);
@@ -66,7 +66,7 @@ function pollingManagerCSFactory(params) {
         start: function () {
             log.info(constants_2.POLLING_START);
             splitsSyncTask.start();
-            if (storage.splits.usesSegments() || storage.rbSegments.usesSegments())
+            if (storage.splits.usesSegments())
                 startMySegmentsSyncTasks();
         },
         // Stop periodic fetching (polling)

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

@@ -12,7 +12,7 @@ var constants_3 = require("../../streaming/constants");
  *  - uses `segmentsEventEmitter` to emit events related to segments data updates
  */
 function mySegmentsUpdaterFactory(log, mySegmentsFetcher, storage, segmentsEventEmitter, requestTimeoutBeforeReady, retriesOnFailureBeforeReady, matchingKey) {
-    var splits = storage.splits, rbSegments = storage.rbSegments, segments = storage.segments, largeSegments = storage.largeSegments;
+    var splits = storage.splits, segments = storage.segments, largeSegments = storage.largeSegments;
     var readyOnAlreadyExistentState = true;
     var startingUp = true;
     /** timeout and telemetry decorator for `splitChangesFetcher` promise  */
@@ -34,7 +34,7 @@ function mySegmentsUpdaterFactory(log, mySegmentsFetcher, storage, segmentsEvent
             shouldNotifyUpdate = largeSegments.resetSegments(segmentsData.ls || {}) || shouldNotifyUpdate;
         }
         // Notify update if required
-        if ((splits.usesSegments() || rbSegments.usesSegments()) && (shouldNotifyUpdate || readyOnAlreadyExistentState)) {
+        if (splits.usesSegments() && (shouldNotifyUpdate || readyOnAlreadyExistentState)) {
             readyOnAlreadyExistentState = false;
             segmentsEventEmitter.emit(constants_1.SDK_SEGMENTS_ARRIVED);
         }

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

@@ -39,7 +39,7 @@ function segmentChangesUpdaterFactory(log, segmentChangesFetcher, segments, read
      * Returned promise will not be rejected.
      *
      * @param fetchOnlyNew - if true, only fetch the segments that not exists, i.e., which `changeNumber` is equal to -1.
-     * This param is used by SplitUpdateWorker on server-side SDK, to fetch new registered segments on SPLIT_UPDATE or RB_SEGMENT_UPDATE notifications.
+     * This param is used by SplitUpdateWorker on server-side SDK, to fetch new registered segments on SPLIT_UPDATE notifications.
      * @param segmentName - segment name to fetch. By passing `undefined` it fetches the list of segments registered at the storage
      * @param noCache - true to revalidate data to fetch on a SEGMENT_UPDATE notifications.
      * @param till - till target for the provided segmentName, for CDN bypass.