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

package/esm/storages/inMemory/SplitsCacheInMemory.js

@@ -22,7 +22,8 @@ var SplitsCacheInMemory = /** @class */ (function (_super) {
         this.changeNumber = -1;
         this.segmentsCount = 0;
     };
-    SplitsCacheInMemory.prototype.addSplit = function (name, split) {
+    SplitsCacheInMemory.prototype.addSplit = function (split) {
+        var name = split.name;
         var previousSplit = this.getSplit(name);
         if (previousSplit) { // We had this Split already
             var previousTtName = previousSplit.trafficTypeName;
@@ -34,40 +35,32 @@ var SplitsCacheInMemory = /** @class */ (function (_super) {
             if (usesSegments(previousSplit))
                 this.segmentsCount--;
         }
-        if (split) {
-            // Store the Split.
-            this.splitsCache[name] = split;
-            // Update TT cache
-            var ttName = split.trafficTypeName;
-            this.ttCache[ttName] = (this.ttCache[ttName] || 0) + 1;
-            this.addToFlagSets(split);
-            // Add to segments count for the new version of the Split
-            if (usesSegments(split))
-                this.segmentsCount++;
-            return true;
-        }
-        else {
-            return false;
-        }
+        // Store the Split.
+        this.splitsCache[name] = split;
+        // Update TT cache
+        var ttName = split.trafficTypeName;
+        this.ttCache[ttName] = (this.ttCache[ttName] || 0) + 1;
+        this.addToFlagSets(split);
+        // Add to segments count for the new version of the Split
+        if (usesSegments(split))
+            this.segmentsCount++;
+        return true;
     };
     SplitsCacheInMemory.prototype.removeSplit = function (name) {
         var split = this.getSplit(name);
-        if (split) {
-            // Delete the Split
-            delete this.splitsCache[name];
-            var ttName = split.trafficTypeName;
-            this.ttCache[ttName]--; // Update tt cache
-            if (!this.ttCache[ttName])
-                delete this.ttCache[ttName];
-            this.removeFromFlagSets(split.name, split.sets);
-            // Update the segments count.
-            if (usesSegments(split))
-                this.segmentsCount--;
-            return true;
-        }
-        else {
+        if (!split)
             return false;
-        }
+        // Delete the Split
+        delete this.splitsCache[name];
+        var ttName = split.trafficTypeName;
+        this.ttCache[ttName]--; // Update tt cache
+        if (!this.ttCache[ttName])
+            delete this.ttCache[ttName];
+        this.removeFromFlagSets(split.name, split.sets);
+        // Update the segments count.
+        if (usesSegments(split))
+            this.segmentsCount--;
+        return true;
     };
     SplitsCacheInMemory.prototype.getSplit = function (name) {
         return this.splitsCache[name] || null;

package/esm/storages/inRedis/RBSegmentsCacheInRedis.js

@@ -0,0 +1,61 @@
+import { isNaNNumber } from '../../utils/lang';
+import { LOG_PREFIX } from './constants';
+import { setToArray } from '../../utils/lang/sets';
+var RBSegmentsCacheInRedis = /** @class */ (function () {
+    function RBSegmentsCacheInRedis(log, keys, redis) {
+        this.log = log;
+        this.keys = keys;
+        this.redis = redis;
+    }
+    RBSegmentsCacheInRedis.prototype.get = function (name) {
+        return this.redis.get(this.keys.buildRBSegmentKey(name))
+            .then(function (maybeRBSegment) { return maybeRBSegment && JSON.parse(maybeRBSegment); });
+    };
+    RBSegmentsCacheInRedis.prototype.getNames = function () {
+        var _this = this;
+        return this.redis.keys(this.keys.searchPatternForRBSegmentKeys()).then(function (listOfKeys) { return listOfKeys.map(_this.keys.extractKey); });
+    };
+    RBSegmentsCacheInRedis.prototype.contains = function (names) {
+        var namesArray = setToArray(names);
+        return this.getNames().then(function (namesInStorage) {
+            return namesArray.every(function (name) { return namesInStorage.includes(name); });
+        });
+    };
+    RBSegmentsCacheInRedis.prototype.update = function (toAdd, toRemove, changeNumber) {
+        var _this = this;
+        return Promise.all([
+            this.setChangeNumber(changeNumber),
+            Promise.all(toAdd.map(function (toAdd) {
+                var key = _this.keys.buildRBSegmentKey(toAdd.name);
+                var stringifiedNewRBSegment = JSON.stringify(toAdd);
+                return _this.redis.set(key, stringifiedNewRBSegment).then(function () { return true; });
+            })),
+            Promise.all(toRemove.map(function (toRemove) {
+                var key = _this.keys.buildRBSegmentKey(toRemove.name);
+                return _this.redis.del(key).then(function (status) { return status === 1; });
+            }))
+        ]).then(function (_a) {
+            var added = _a[1], removed = _a[2];
+            return added.some(function (result) { return result; }) || removed.some(function (result) { return result; });
+        });
+    };
+    RBSegmentsCacheInRedis.prototype.setChangeNumber = function (changeNumber) {
+        return this.redis.set(this.keys.buildRBSegmentsTillKey(), changeNumber + '').then(function (status) { return status === 'OK'; });
+    };
+    RBSegmentsCacheInRedis.prototype.getChangeNumber = function () {
+        var _this = this;
+        return this.redis.get(this.keys.buildRBSegmentsTillKey()).then(function (value) {
+            var i = parseInt(value, 10);
+            return isNaNNumber(i) ? -1 : i;
+        }).catch(function (e) {
+            _this.log.error(LOG_PREFIX + 'Could not retrieve changeNumber from storage. Error: ' + e);
+            return -1;
+        });
+    };
+    // @TODO implement if required by DataLoader or producer mode
+    RBSegmentsCacheInRedis.prototype.clear = function () {
+        return Promise.resolve();
+    };
+    return RBSegmentsCacheInRedis;
+}());
+export { RBSegmentsCacheInRedis };

package/esm/storages/inRedis/SplitsCacheInRedis.js

@@ -64,8 +64,9 @@ var SplitsCacheInRedis = /** @class */ (function (_super) {
      * The returned promise is resolved when the operation success
      * or rejected if it fails (e.g., redis operation fails)
      */
-    SplitsCacheInRedis.prototype.addSplit = function (name, split) {
+    SplitsCacheInRedis.prototype.addSplit = function (split) {
         var _this = this;
+        var name = split.name;
         var splitKey = this.keys.buildSplitKey(name);
         return this.redis.get(splitKey).then(function (splitFromStorage) {
             // handling parsing error
@@ -89,18 +90,9 @@ var SplitsCacheInRedis = /** @class */ (function (_super) {
             }).then(function () { return _this._updateFlagSets(name, parsedPreviousSplit && parsedPreviousSplit.sets, split.sets); });
         }).then(function () { return true; });
     };
-    /**
-     * Add a list of splits.
-     * The returned promise is resolved when the operation success
-     * or rejected if it fails (e.g., redis operation fails)
-     */
-    SplitsCacheInRedis.prototype.addSplits = function (entries) {
-        var _this = this;
-        return Promise.all(entries.map(function (keyValuePair) { return _this.addSplit(keyValuePair[0], keyValuePair[1]); }));
-    };
     /**
      * Remove a given split.
-     * The returned promise is resolved when the operation success, with 1 or 0 indicating if the split existed or not.
+     * The returned promise is resolved when the operation success, with true or false indicating if the split existed (and was removed) or not.
      * or rejected if it fails (e.g., redis operation fails).
      */
     SplitsCacheInRedis.prototype.removeSplit = function (name) {
@@ -110,18 +102,9 @@ var SplitsCacheInRedis = /** @class */ (function (_super) {
                 return _this._decrementCounts(split).then(function () { return _this._updateFlagSets(name, split.sets); });
             }
         }).then(function () {
-            return _this.redis.del(_this.keys.buildSplitKey(name));
+            return _this.redis.del(_this.keys.buildSplitKey(name)).then(function (status) { return status === 1; });
         });
     };
-    /**
-     * Remove a list of splits.
-     * The returned promise is resolved when the operation success,
-     * or rejected if it fails (e.g., redis operation fails).
-     */
-    SplitsCacheInRedis.prototype.removeSplits = function (names) {
-        var _this = this;
-        return Promise.all(names.map(function (name) { return _this.removeSplit(name); }));
-    };
     /**
      * Get split definition or null if it's not defined.
      * Returned promise is rejected if redis operation fails.

package/esm/storages/inRedis/index.js

@@ -9,6 +9,7 @@ import { TelemetryCacheInRedis } from './TelemetryCacheInRedis';
 import { UniqueKeysCacheInRedis } from './UniqueKeysCacheInRedis';
 import { ImpressionCountsCacheInRedis } from './ImpressionCountsCacheInRedis';
 import { metadataBuilder } from '../utils';
+import { RBSegmentsCacheInRedis } from './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}
@@ -37,6 +38,7 @@ export function InRedisStorage(options) {
         });
         return {
             splits: new SplitsCacheInRedis(log, keys, redisClient, settings.sync.__splitFiltersValidation),
+            rbSegments: new RBSegmentsCacheInRedis(log, keys, redisClient),
             segments: new SegmentsCacheInRedis(log, keys, redisClient),
             impressions: new ImpressionsCacheInRedis(log, keys.buildImpressionsKey(), redisClient, metadata),
             impressionCounts: impressionCountsCache,

package/esm/storages/pluggable/RBSegmentsCachePluggable.js

@@ -0,0 +1,61 @@
+import { isNaNNumber } from '../../utils/lang';
+import { LOG_PREFIX } from './constants';
+import { setToArray } from '../../utils/lang/sets';
+var RBSegmentsCachePluggable = /** @class */ (function () {
+    function RBSegmentsCachePluggable(log, keys, wrapper) {
+        this.log = log;
+        this.keys = keys;
+        this.wrapper = wrapper;
+    }
+    RBSegmentsCachePluggable.prototype.get = function (name) {
+        return this.wrapper.get(this.keys.buildRBSegmentKey(name))
+            .then(function (maybeRBSegment) { return maybeRBSegment && JSON.parse(maybeRBSegment); });
+    };
+    RBSegmentsCachePluggable.prototype.getNames = function () {
+        var _this = this;
+        return this.wrapper.getKeysByPrefix(this.keys.buildRBSegmentKeyPrefix()).then(function (listOfKeys) { return listOfKeys.map(_this.keys.extractKey); });
+    };
+    RBSegmentsCachePluggable.prototype.contains = function (names) {
+        var namesArray = setToArray(names);
+        return this.getNames().then(function (namesInStorage) {
+            return namesArray.every(function (name) { return namesInStorage.includes(name); });
+        });
+    };
+    RBSegmentsCachePluggable.prototype.update = function (toAdd, toRemove, changeNumber) {
+        var _this = this;
+        return Promise.all([
+            this.setChangeNumber(changeNumber),
+            Promise.all(toAdd.map(function (toAdd) {
+                var key = _this.keys.buildRBSegmentKey(toAdd.name);
+                var stringifiedNewRBSegment = JSON.stringify(toAdd);
+                return _this.wrapper.set(key, stringifiedNewRBSegment).then(function () { return true; });
+            })),
+            Promise.all(toRemove.map(function (toRemove) {
+                var key = _this.keys.buildRBSegmentKey(toRemove.name);
+                return _this.wrapper.del(key);
+            }))
+        ]).then(function (_a) {
+            var added = _a[1], removed = _a[2];
+            return added.some(function (result) { return result; }) || removed.some(function (result) { return result; });
+        });
+    };
+    RBSegmentsCachePluggable.prototype.setChangeNumber = function (changeNumber) {
+        return this.wrapper.set(this.keys.buildRBSegmentsTillKey(), changeNumber + '');
+    };
+    RBSegmentsCachePluggable.prototype.getChangeNumber = function () {
+        var _this = this;
+        return this.wrapper.get(this.keys.buildRBSegmentsTillKey()).then(function (value) {
+            var i = parseInt(value, 10);
+            return isNaNNumber(i) ? -1 : i;
+        }).catch(function (e) {
+            _this.log.error(LOG_PREFIX + 'Could not retrieve changeNumber from storage. Error: ' + e);
+            return -1;
+        });
+    };
+    // @TODO implement if required by DataLoader or producer mode
+    RBSegmentsCachePluggable.prototype.clear = function () {
+        return Promise.resolve();
+    };
+    return RBSegmentsCachePluggable;
+}());
+export { RBSegmentsCachePluggable };

package/esm/storages/pluggable/SplitsCachePluggable.js

@@ -51,8 +51,9 @@ var SplitsCachePluggable = /** @class */ (function (_super) {
      * The returned promise is resolved when the operation success
      * or rejected if it fails (e.g., wrapper operation fails)
      */
-    SplitsCachePluggable.prototype.addSplit = function (name, split) {
+    SplitsCachePluggable.prototype.addSplit = function (split) {
         var _this = this;
+        var name = split.name;
         var splitKey = this.keys.buildSplitKey(name);
         return this.wrapper.get(splitKey).then(function (splitFromStorage) {
             // handling parsing error
@@ -76,15 +77,6 @@ var SplitsCachePluggable = /** @class */ (function (_super) {
             }).then(function () { return _this._updateFlagSets(name, parsedPreviousSplit && parsedPreviousSplit.sets, split.sets); });
         }).then(function () { return true; });
     };
-    /**
-     * Add a list of splits.
-     * The returned promise is resolved when the operation success
-     * or rejected if it fails (e.g., wrapper operation fails)
-     */
-    SplitsCachePluggable.prototype.addSplits = function (entries) {
-        var _this = this;
-        return Promise.all(entries.map(function (keyValuePair) { return _this.addSplit(keyValuePair[0], keyValuePair[1]); }));
-    };
     /**
      * Remove a given split.
      * The returned promise is resolved when the operation success, with a boolean indicating if the split existed or not.
@@ -100,15 +92,6 @@ var SplitsCachePluggable = /** @class */ (function (_super) {
             return _this.wrapper.del(_this.keys.buildSplitKey(name));
         });
     };
-    /**
-     * Remove a list of splits.
-     * The returned promise is resolved when the operation success, with a boolean array indicating if the splits existed or not.
-     * or rejected if it fails (e.g., wrapper operation fails).
-     */
-    SplitsCachePluggable.prototype.removeSplits = function (names) {
-        var _this = this;
-        return Promise.all(names.map(function (name) { return _this.removeSplit(name); }));
-    };
     /**
      * Get split.
      * The returned promise is resolved with the split definition or null if it's not defined,

package/esm/storages/pluggable/index.js

@@ -19,6 +19,7 @@ import { UniqueKeysCacheInMemory } from '../inMemory/UniqueKeysCacheInMemory';
 import { UniqueKeysCacheInMemoryCS } from '../inMemory/UniqueKeysCacheInMemoryCS';
 import { metadataBuilder } from '../utils';
 import { LOG_PREFIX } from '../pluggable/constants';
+import { RBSegmentsCachePluggable } from './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.';
 /**
@@ -101,6 +102,7 @@ export function PluggableStorage(options) {
         });
         return {
             splits: new SplitsCachePluggable(log, keys, wrapper, settings.sync.__splitFiltersValidation),
+            rbSegments: new RBSegmentsCachePluggable(log, keys, wrapper),
             segments: new SegmentsCachePluggable(log, keys, wrapper),
             impressions: isPartialConsumer ? new ImpressionsCacheInMemory(impressionsQueueSize) : new ImpressionsCachePluggable(log, keys.buildImpressionsKey(), wrapper, metadata),
             impressionCounts: impressionCountsCache,

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

@@ -23,22 +23,21 @@ export function fromObjectUpdaterFactory(splitsParser, storage, readiness, setti
         if (!loadError && splitsMock) {
             log.debug(SYNC_OFFLINE_DATA, [JSON.stringify(splitsMock)]);
             forOwn(splitsMock, function (val, name) {
-                splits.push([
-                    name, {
-                        name: name,
-                        status: 'ACTIVE',
-                        killed: false,
-                        trafficAllocation: 100,
-                        defaultTreatment: CONTROL,
-                        conditions: val.conditions || [],
-                        configurations: val.configurations,
-                        trafficTypeName: val.trafficTypeName
-                    }
-                ]);
+                // @ts-ignore Split changeNumber and seed is undefined in localhost mode
+                splits.push({
+                    name: name,
+                    status: 'ACTIVE',
+                    killed: false,
+                    trafficAllocation: 100,
+                    defaultTreatment: CONTROL,
+                    conditions: val.conditions || [],
+                    configurations: val.configurations,
+                    trafficTypeName: val.trafficTypeName
+                });
             });
             return Promise.all([
                 splitsCache.clear(),
-                splitsCache.addSplits(splits)
+                splitsCache.update(splits, [], Date.now())
             ]).then(function () {
                 readiness.splits.emit(SDK_SPLITS_ARRIVED);
                 if (startingUp) {

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

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

package/esm/sync/polling/pollingManagerCS.js

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

package/esm/sync/polling/syncTasks/splitsSyncTask.js

@@ -5,5 +5,5 @@ import { splitChangesUpdaterFactory } from '../updaters/splitChangesUpdater';
  * Creates a sync task that periodically executes a `splitChangesUpdater` task
  */
 export function splitsSyncTaskFactory(fetchSplitChanges, storage, readiness, settings, isClientSide) {
-    return syncTaskFactory(settings.log, splitChangesUpdaterFactory(settings.log, splitChangesFetcherFactory(fetchSplitChanges), storage.splits, storage.segments, settings.sync.__splitFiltersValidation, readiness.splits, settings.startup.requestTimeoutBeforeReady, settings.startup.retriesOnFailureBeforeReady, isClientSide), settings.scheduler.featuresRefreshRate, 'splitChangesUpdater');
+    return syncTaskFactory(settings.log, splitChangesUpdaterFactory(settings.log, splitChangesFetcherFactory(fetchSplitChanges), storage, settings.sync.__splitFiltersValidation, readiness.splits, settings.startup.requestTimeoutBeforeReady, settings.startup.retriesOnFailureBeforeReady, isClientSide), settings.scheduler.featuresRefreshRate, 'splitChangesUpdater');
 }

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

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

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

@@ -36,7 +36,7 @@ export function segmentChangesUpdaterFactory(log, segmentChangesFetcher, segment
      * 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 notifications.
+     * This param is used by SplitUpdateWorker on server-side SDK, to fetch new registered segments on SPLIT_UPDATE or RB_SEGMENT_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.

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

@@ -1,9 +1,10 @@
 import { timeout } from '../../../utils/promise/timeout';
 import { SDK_SPLITS_ARRIVED, SDK_SPLITS_CACHE_LOADED } from '../../../readiness/constants';
-import { SYNC_SPLITS_FETCH, SYNC_SPLITS_NEW, SYNC_SPLITS_REMOVED, SYNC_SPLITS_SEGMENTS, SYNC_SPLITS_FETCH_FAILS, SYNC_SPLITS_FETCH_RETRY } from '../../../logger/constants';
+import { SYNC_SPLITS_FETCH, SYNC_SPLITS_UPDATE, SYNC_RBS_UPDATE, SYNC_SPLITS_FETCH_FAILS, SYNC_SPLITS_FETCH_RETRY } from '../../../logger/constants';
 import { startsWith } from '../../../utils/lang';
-import { IN_SEGMENT } from '../../../utils/constants';
+import { IN_RULE_BASED_SEGMENT, IN_SEGMENT } from '../../../utils/constants';
 import { setToArray } from '../../../utils/lang/sets';
+import { SPLIT_UPDATE } from '../../streaming/constants';
 // Checks that all registered segments have been fetched (changeNumber !== -1 for every segment).
 // Returns a promise that could be rejected.
 // @TODO review together with Segments and MySegments storage APIs
@@ -18,13 +19,14 @@ function checkAllSegmentsExist(segments) {
  * Collect segments from a raw split definition.
  * Exported for testing purposes.
  */
-export function parseSegments(_a) {
-    var conditions = _a.conditions;
-    var segments = new Set();
+export function parseSegments(ruleEntity, matcherType) {
+    if (matcherType === void 0) { matcherType = IN_SEGMENT; }
+    var _a = ruleEntity, conditions = _a.conditions, excluded = _a.excluded;
+    var segments = new Set(excluded && excluded.segments);
     for (var i = 0; i < conditions.length; i++) {
         var matchers = conditions[i].matcherGroup.matchers;
         matchers.forEach(function (matcher) {
-            if (matcher.matcherType === IN_SEGMENT)
+            if (matcher.matcherType === matcherType)
                 segments.add(matcher.userDefinedSegmentMatcherData.segmentName);
         });
     }
@@ -54,22 +56,19 @@ function matchFilters(featureFlag, filters) {
  * i.e., an object with added splits, removed splits and used segments.
  * Exported for testing purposes.
  */
-export function computeSplitsMutation(entries, filters) {
-    var segments = new Set();
-    var computed = entries.reduce(function (accum, split) {
-        if (split.status === 'ACTIVE' && matchFilters(split, filters)) {
-            accum.added.push([split.name, split]);
-            parseSegments(split).forEach(function (segmentName) {
+export function computeMutation(rules, segments, filters) {
+    return rules.reduce(function (accum, ruleEntity) {
+        if (ruleEntity.status === 'ACTIVE' && (!filters || matchFilters(ruleEntity, filters))) {
+            accum.added.push(ruleEntity);
+            parseSegments(ruleEntity).forEach(function (segmentName) {
                 segments.add(segmentName);
             });
         }
         else {
-            accum.removed.push(split.name);
+            accum.removed.push(ruleEntity);
         }
         return accum;
-    }, { added: [], removed: [], segments: [] });
-    computed.segments = setToArray(segments);
-    return computed;
+    }, { added: [], removed: [] });
 }
 /**
  * factory of SplitChanges updater, a task that:
@@ -85,9 +84,10 @@ export function computeSplitsMutation(entries, filters) {
  * @param requestTimeoutBeforeReady -  How long the updater will wait for the request to timeout. Default 0, i.e., never timeout.
  * @param retriesOnFailureBeforeReady -  How many retries on `/splitChanges` we the updater do in case of failure or timeout. Default 0, i.e., no retries.
  */
-export function splitChangesUpdaterFactory(log, splitChangesFetcher, splits, segments, splitFiltersValidation, splitsEventEmitter, requestTimeoutBeforeReady, retriesOnFailureBeforeReady, isClientSide) {
+export function splitChangesUpdaterFactory(log, splitChangesFetcher, storage, splitFiltersValidation, splitsEventEmitter, requestTimeoutBeforeReady, retriesOnFailureBeforeReady, isClientSide) {
     if (requestTimeoutBeforeReady === void 0) { requestTimeoutBeforeReady = 0; }
     if (retriesOnFailureBeforeReady === void 0) { retriesOnFailureBeforeReady = 0; }
+    var splits = storage.splits, rbSegments = storage.rbSegments, segments = storage.segments;
     var startingUp = true;
     /** timeout decorator for `splitChangesFetcher` promise  */
     function _promiseDecorator(promise) {
@@ -95,17 +95,6 @@ export function splitChangesUpdaterFactory(log, splitChangesFetcher, splits, seg
             promise = timeout(requestTimeoutBeforeReady, promise);
         return promise;
     }
-    /** Returns true if at least one split was updated */
-    function isThereUpdate(flagsChange) {
-        var added = flagsChange[1], removed = flagsChange[2];
-        // There is at least one added or modified feature flag
-        if (added && added.some(function (update) { return update; }))
-            return true;
-        // There is at least one removed feature flag
-        if (removed && removed.some(function (update) { return update; }))
-            return true;
-        return false;
-    }
     /**
      * SplitChanges updater returns a promise that resolves with a `false` boolean value if it fails to fetch splits or synchronize them with the storage.
      * Returned promise will not be rejected.
@@ -113,35 +102,48 @@ export function splitChangesUpdaterFactory(log, splitChangesFetcher, splits, seg
      * @param noCache - true to revalidate data to fetch
      * @param till - query param to bypass CDN requests
      */
-    return function splitChangesUpdater(noCache, till, splitUpdateNotification) {
+    return function splitChangesUpdater(noCache, till, instantUpdate) {
         /**
          * @param since - current changeNumber at splitsCache
          * @param retry - current number of retry attempts
          */
-        function _splitChangesUpdater(since, retry) {
+        function _splitChangesUpdater(sinces, retry) {
             if (retry === void 0) { retry = 0; }
-            log.debug(SYNC_SPLITS_FETCH, [since]);
-            var fetcherPromise = Promise.resolve(splitUpdateNotification ?
-                { splits: [splitUpdateNotification.payload], till: splitUpdateNotification.changeNumber } :
-                splitChangesFetcher(since, noCache, till, _promiseDecorator))
+            var since = sinces[0], rbSince = sinces[1];
+            log.debug(SYNC_SPLITS_FETCH, sinces);
+            var fetcherPromise = Promise.resolve(instantUpdate ?
+                instantUpdate.type === SPLIT_UPDATE ?
+                    // IFFU edge case: a change to a flag that adds an IN_RULE_BASED_SEGMENT matcher that is not present yet
+                    Promise.resolve(rbSegments.contains(parseSegments(instantUpdate.payload, IN_RULE_BASED_SEGMENT))).then(function (contains) {
+                        return contains ?
+                            { ff: { d: [instantUpdate.payload], t: instantUpdate.changeNumber } } :
+                            splitChangesFetcher(since, noCache, till, rbSince, _promiseDecorator);
+                    }) :
+                    { rbs: { d: [instantUpdate.payload], t: instantUpdate.changeNumber } } :
+                splitChangesFetcher(since, noCache, till, rbSince, _promiseDecorator))
                 .then(function (splitChanges) {
                 startingUp = false;
-                var mutation = computeSplitsMutation(splitChanges.splits, splitFiltersValidation);
-                log.debug(SYNC_SPLITS_NEW, [mutation.added.length]);
-                log.debug(SYNC_SPLITS_REMOVED, [mutation.removed.length]);
-                log.debug(SYNC_SPLITS_SEGMENTS, [mutation.segments.length]);
-                // Write into storage
-                // @TODO call `setChangeNumber` only if the other storage operations have succeeded, in order to keep storage consistency
-                return Promise.all([
-                    // calling first `setChangenumber` method, to perform cache flush if split filter queryString changed
-                    splits.setChangeNumber(splitChanges.till),
-                    splits.addSplits(mutation.added),
-                    splits.removeSplits(mutation.removed),
-                    segments.registerSegments(mutation.segments)
-                ]).then(function (flagsChange) {
+                var usedSegments = new Set();
+                var ffUpdate = false;
+                if (splitChanges.ff) {
+                    var _a = computeMutation(splitChanges.ff.d, usedSegments, splitFiltersValidation), added = _a.added, removed = _a.removed;
+                    log.debug(SYNC_SPLITS_UPDATE, [added.length, removed.length]);
+                    ffUpdate = splits.update(added, removed, splitChanges.ff.t);
+                }
+                var rbsUpdate = false;
+                if (splitChanges.rbs) {
+                    var _b = computeMutation(splitChanges.rbs.d, usedSegments), added = _b.added, removed = _b.removed;
+                    log.debug(SYNC_RBS_UPDATE, [added.length, removed.length]);
+                    rbsUpdate = rbSegments.update(added, removed, splitChanges.rbs.t);
+                }
+                return Promise.all([ffUpdate, rbsUpdate,
+                    // @TODO if at least 1 segment fetch fails due to 404 and other segments are updated in the storage, SDK_UPDATE is not emitted
+                    segments.registerSegments(setToArray(usedSegments))
+                ]).then(function (_a) {
+                    var ffChanged = _a[0], rbsChanged = _a[1];
                     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 || (since !== splitChanges.till && isThereUpdate(flagsChange) && (isClientSide || checkAllSegmentsExist(segments))))
+                        return Promise.resolve(!splitsEventEmitter.splitsArrived || ((ffChanged || rbsChanged) && (isClientSide || checkAllSegmentsExist(segments))))
                             .catch(function () { return false; } /** noop. just to handle a possible `checkAllSegmentsExist` rejection, before emitting SDK event */)
                             .then(function (emitSplitsArrivedEvent) {
                             // emit SDK events
@@ -158,7 +160,7 @@ export function splitChangesUpdaterFactory(log, splitChangesFetcher, splits, seg
                 if (startingUp && retriesOnFailureBeforeReady > retry) {
                     retry += 1;
                     log.info(SYNC_SPLITS_FETCH_RETRY, [retry, error]);
-                    return _splitChangesUpdater(since, retry);
+                    return _splitChangesUpdater(sinces, retry);
                 }
                 else {
                     startingUp = false;
@@ -175,7 +177,7 @@ export function splitChangesUpdaterFactory(log, splitChangesFetcher, splits, seg
             }
             return fetcherPromise;
         }
-        var sincePromise = Promise.resolve(splits.getChangeNumber()); // `getChangeNumber` never rejects or throws error
-        return sincePromise.then(_splitChangesUpdater);
+        // `getChangeNumber` never rejects or throws error
+        return Promise.all([splits.getChangeNumber(), rbSegments.getChangeNumber()]).then(_splitChangesUpdater);
     };
 }