@splitsoftware/splitio-commons 2.2.1-rc.3 → 2.2.1-rc.5

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/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';
 var RD;
 try {
     // Using `require` to prevent error when bundling or importing the SDK in a .mjs file, since ioredis is a CommonJS module.
@@ -25,7 +26,7 @@ export function InRedisStorage(options) {
     var prefix = validatePrefix(options.prefix);
     function InRedisStorageFactory(params) {
         if (!RD)
-            throw new Error('The SDK Redis storage is not available. Your runtime environment must support CommonJS (`require`) to import the ioredis dependency.');
+            throw new Error('The SDK Redis storage is unavailable. Make sure your runtime environment supports CommonJS (`require`) so the `ioredis` dependency can be imported.');
         var onReadyFromCacheCb = params.onReadyFromCacheCb, onReadyCb = params.onReadyCb, settings = params.settings, log = params.settings.log;
         var metadata = metadataBuilder(settings);
         var keys = new KeyBuilderSS(prefix, metadata);
@@ -33,9 +34,9 @@ export function InRedisStorage(options) {
         var telemetry = new TelemetryCacheInRedis(log, keys, redisClient);
         var impressionCountsCache = new ImpressionCountsCacheInRedis(log, keys.buildImpressionsCountKey(), redisClient);
         var uniqueKeysCache = new UniqueKeysCacheInRedis(log, keys.buildUniqueKeysKey(), redisClient);
-        // RedisAdapter queues operations before connection
+        // RedisAdapter lets queue operations before connected
         onReadyFromCacheCb();
-        // subscription to Redis connect event in order to emit SDK_READY event on consumer mode
+        // Subscription to Redis connect event in order to emit SDK_READY event on consumer mode
         redisClient.on('connect', function () {
             onReadyCb();
             impressionCountsCache.start();
@@ -45,6 +46,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/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.';
 /**
@@ -102,6 +103,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/polling/fetchers/splitChangesFetcher.js

@@ -1,14 +1,64 @@
+import { FLAG_SPEC_VERSION } from '../../../utils/constants';
+import { base } from '../../../utils/settingsValidation';
+import { LOG_PREFIX_SYNC_SPLITS } from '../../../logger/constants';
+var PROXY_CHECK_INTERVAL_MILLIS_CS = 60 * 60 * 1000; // 1 hour in Client Side
+var PROXY_CHECK_INTERVAL_MILLIS_SS = 24 * PROXY_CHECK_INTERVAL_MILLIS_CS; // 24 hours in Server Side
+function sdkEndpointOverridden(settings) {
+    return settings.urls.sdk !== base.urls.sdk;
+}
 /**
  * Factory of SplitChanges fetcher.
  * 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, 
+// @TODO breaking: drop support for Split Proxy below v5.10.0 and simplify the implementation
+export function splitChangesFetcherFactory(fetchSplitChanges, settings, storage) {
+    var log = settings.log;
+    var PROXY_CHECK_INTERVAL_MILLIS = settings.core.key !== undefined ? PROXY_CHECK_INTERVAL_MILLIS_CS : PROXY_CHECK_INTERVAL_MILLIS_SS;
+    var lastProxyCheckTimestamp;
+    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);
+        // Recheck proxy
+        if (lastProxyCheckTimestamp && (Date.now() - lastProxyCheckTimestamp) > PROXY_CHECK_INTERVAL_MILLIS) {
+            settings.sync.flagSpecVersion = FLAG_SPEC_VERSION;
+        }
+        var splitsPromise = fetchSplitChanges(since, noCache, till, settings.sync.flagSpecVersion === FLAG_SPEC_VERSION ? rbSince : undefined)
+            // Handle proxy error with spec 1.3
+            .catch(function (err) {
+            if (err.statusCode === 400 && sdkEndpointOverridden(settings) && settings.sync.flagSpecVersion === FLAG_SPEC_VERSION) {
+                log.error(LOG_PREFIX_SYNC_SPLITS + 'Proxy error detected. Retrying with spec 1.2. If you are using Split Proxy, please upgrade to latest version');
+                lastProxyCheckTimestamp = Date.now();
+                settings.sync.flagSpecVersion = '1.2'; // fallback to 1.2 spec
+                return fetchSplitChanges(since, noCache, till); // retry request without rbSince
+            }
+            throw err;
+        });
         if (decorator)
             splitsPromise = decorator(splitsPromise);
-        return splitsPromise.then(function (resp) { return resp.json(); });
+        return splitsPromise
+            .then(function (resp) { return resp.json(); })
+            .then(function (data) {
+            // Using flag spec version 1.2
+            if (data.splits) {
+                return {
+                    ff: {
+                        d: data.splits,
+                        s: data.since,
+                        t: data.till
+                    }
+                };
+            }
+            // Proxy recovery
+            if (lastProxyCheckTimestamp) {
+                log.info(LOG_PREFIX_SYNC_SPLITS + 'Proxy error recovered');
+                lastProxyCheckTimestamp = undefined;
+                return splitChangesFetcher(-1, undefined, undefined, -1)
+                    .then(function (splitChangesResponse) {
+                    return Promise.all([storage.splits.clear(), storage.rbSegments.clear()])
+                        .then(function () { return splitChangesResponse; });
+                });
+            }
+            return data;
+        });
     };
 }

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, 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, settings, storage), 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 } from '../../../readiness/constants';
-import { SYNC_SPLITS_FETCH, SYNC_SPLITS_UPDATE, 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, RULE_BASED_SEGMENT, STANDARD_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
@@ -15,16 +16,25 @@ function checkAllSegmentsExist(segments) {
     });
 }
 /**
- * Collect segments from a raw split definition.
+ * Collect segments from a raw FF or RBS definition.
  * Exported for testing purposes.
  */
-export function parseSegments(_a) {
-    var conditions = _a.conditions;
+export function parseSegments(ruleEntity, matcherType) {
+    if (matcherType === void 0) { matcherType = IN_SEGMENT; }
+    var _a = ruleEntity, _b = _a.conditions, conditions = _b === void 0 ? [] : _b, excluded = _a.excluded;
     var segments = new Set();
+    if (excluded && excluded.segments) {
+        excluded.segments.forEach(function (_a) {
+            var type = _a.type, name = _a.name;
+            if ((type === STANDARD_SEGMENT && matcherType === IN_SEGMENT) || (type === RULE_BASED_SEGMENT && matcherType === IN_RULE_BASED_SEGMENT)) {
+                segments.add(name);
+            }
+        });
+    }
     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 +64,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);
-            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);
+            accum.removed.push(ruleEntity);
         }
         return accum;
-    }, { added: [], removed: [], segments: [] });
-    computed.segments = setToArray(segments);
-    return computed;
+    }, { added: [], removed: [] });
 }
 /**
  * factory of SplitChanges updater, a task that:
@@ -88,7 +95,7 @@ export function computeSplitsMutation(entries, filters) {
 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, segments = storage.segments;
+    var splits = storage.splits, rbSegments = storage.rbSegments, segments = storage.segments;
     var startingUp = true;
     /** timeout decorator for `splitChangesFetcher` promise  */
     function _promiseDecorator(promise) {
@@ -103,29 +110,48 @@ export function splitChangesUpdaterFactory(log, splitChangesFetcher, storage, sp
      * @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]);
-            return 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);
+            return 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_UPDATE, [mutation.added.length, mutation.removed.length, mutation.segments.length]);
-                return Promise.all([
-                    splits.update(mutation.added, mutation.removed, splitChanges.till),
-                    segments.registerSegments(mutation.segments)
+                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 isThereUpdate = _a[0];
+                    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 && (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
@@ -142,7 +168,7 @@ export function splitChangesUpdaterFactory(log, splitChangesFetcher, storage, sp
                 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;
@@ -150,7 +176,7 @@ export function splitChangesUpdaterFactory(log, splitChangesFetcher, storage, sp
                 return false;
             });
         }
-        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);
     };
 }

package/esm/sync/streaming/SSEHandler/index.js

@@ -1,6 +1,6 @@
 import { errorParser, messageParser } from './NotificationParser';
 import { notificationKeeperFactory } from './NotificationKeeper';
-import { PUSH_RETRYABLE_ERROR, PUSH_NONRETRYABLE_ERROR, OCCUPANCY, CONTROL, SEGMENT_UPDATE, SPLIT_KILL, SPLIT_UPDATE, MEMBERSHIPS_MS_UPDATE, MEMBERSHIPS_LS_UPDATE } from '../constants';
+import { PUSH_RETRYABLE_ERROR, PUSH_NONRETRYABLE_ERROR, OCCUPANCY, CONTROL, SEGMENT_UPDATE, SPLIT_KILL, SPLIT_UPDATE, MEMBERSHIPS_MS_UPDATE, MEMBERSHIPS_LS_UPDATE, RB_SEGMENT_UPDATE } from '../constants';
 import { STREAMING_PARSING_ERROR_FAILS, ERROR_STREAMING_SSE, STREAMING_PARSING_MESSAGE_FAILS, STREAMING_NEW_MESSAGE } from '../../../logger/constants';
 import { ABLY_ERROR, NON_REQUESTED, SSE_CONNECTION_ERROR } from '../../../utils/constants';
 /**
@@ -75,6 +75,7 @@ export function SSEHandlerFactory(log, pushEmitter, telemetryTracker) {
                 case MEMBERSHIPS_MS_UPDATE:
                 case MEMBERSHIPS_LS_UPDATE:
                 case SPLIT_KILL:
+                case RB_SEGMENT_UPDATE:
                     pushEmitter.emit(parsedData.type, parsedData);
                     break;
                 /* occupancy & control events, handled by NotificationManagerKeeper */