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

package/cjs/storages/AbstractSplitsCacheSync.js

@@ -60,8 +60,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 +70,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,9 +35,6 @@ 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";
     };

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/inLocalStorage/SplitsCacheInLocal.js

@@ -47,13 +47,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) {
@@ -175,9 +177,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;
+        if ((0, lang_1.isFiniteNumber)(splitsWithSegmentsCount)) {
+            return splitsWithSegmentsCount > 0;
+        }
+        else {
+            return true;
+        }
     };
     /**
      * Check if the splits information is already stored in browser LocalStorage.

package/cjs/storages/inLocalStorage/index.js

@@ -16,7 +16,6 @@ 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");
 /**
  * InLocal storage factory for standalone client-side SplitFactory
  */
@@ -34,12 +33,10 @@ function InLocalStorage(options) {
         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 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),
@@ -52,7 +49,6 @@ function InLocalStorage(options) {
             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/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.';
 /**
@@ -105,7 +104,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/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.

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

@@ -1,13 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.splitChangesUpdaterFactory = exports.computeMutation = exports.parseSegments = void 0;
+exports.splitChangesUpdaterFactory = exports.computeSplitsMutation = exports.parseSegments = void 0;
 var timeout_1 = require("../../../utils/promise/timeout");
 var constants_1 = require("../../../readiness/constants");
 var constants_2 = require("../../../logger/constants");
 var lang_1 = require("../../../utils/lang");
 var constants_3 = require("../../../utils/constants");
 var sets_1 = require("../../../utils/lang/sets");
-var constants_4 = require("../../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
@@ -22,14 +21,13 @@ function checkAllSegmentsExist(segments) {
  * Collect segments from a raw split definition.
  * Exported for testing purposes.
  */
-function parseSegments(ruleEntity, matcherType) {
-    if (matcherType === void 0) { matcherType = constants_3.IN_SEGMENT; }
-    var _a = ruleEntity, conditions = _a.conditions, excluded = _a.excluded;
-    var segments = new Set(excluded && excluded.segments);
+function parseSegments(_a) {
+    var conditions = _a.conditions;
+    var segments = new Set();
     for (var i = 0; i < conditions.length; i++) {
         var matchers = conditions[i].matcherGroup.matchers;
         matchers.forEach(function (matcher) {
-            if (matcher.matcherType === matcherType)
+            if (matcher.matcherType === constants_3.IN_SEGMENT)
                 segments.add(matcher.userDefinedSegmentMatcherData.segmentName);
         });
     }
@@ -60,21 +58,24 @@ function matchFilters(featureFlag, filters) {
  * i.e., an object with added splits, removed splits and used segments.
  * Exported for testing purposes.
  */
-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) {
+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) {
                 segments.add(segmentName);
             });
         }
         else {
-            accum.removed.push(ruleEntity);
+            accum.removed.push(split);
         }
         return accum;
-    }, { added: [], removed: [] });
+    }, { added: [], removed: [], segments: [] });
+    computed.segments = (0, sets_1.setToArray)(segments);
+    return computed;
 }
-exports.computeMutation = computeMutation;
+exports.computeSplitsMutation = computeSplitsMutation;
 /**
  * factory of SplitChanges updater, a task that:
  *  - fetches split changes using `splitChangesFetcher`
@@ -92,7 +93,7 @@ exports.computeMutation = computeMutation;
 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 splits = storage.splits, segments = storage.segments;
     var startingUp = true;
     /** timeout decorator for `splitChangesFetcher` promise  */
     function _promiseDecorator(promise) {
@@ -107,48 +108,31 @@ function splitChangesUpdaterFactory(log, splitChangesFetcher, storage, splitFilt
      * @param noCache - true to revalidate data to fetch
      * @param till - query param to bypass CDN requests
      */
-    return function splitChangesUpdater(noCache, till, instantUpdate) {
+    return function splitChangesUpdater(noCache, till, splitUpdateNotification) {
         /**
          * @param since - current changeNumber at splitsCache
          * @param retry - current number of retry attempts
          */
-        function _splitChangesUpdater(sinces, retry) {
+        function _splitChangesUpdater(since, retry) {
             if (retry === void 0) { retry = 0; }
-            var since = sinces[0], rbSince = sinces[1];
-            log.debug(constants_2.SYNC_SPLITS_FETCH, sinces);
-            var fetcherPromise = Promise.resolve(instantUpdate ?
-                instantUpdate.type === constants_4.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, constants_3.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))
+            log.debug(constants_2.SYNC_SPLITS_FETCH, [since]);
+            var fetcherPromise = Promise.resolve(splitUpdateNotification ?
+                { splits: [splitUpdateNotification.payload], till: splitUpdateNotification.changeNumber } :
+                splitChangesFetcher(since, noCache, till, _promiseDecorator))
                 .then(function (splitChanges) {
                 startingUp = false;
-                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(constants_2.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(constants_2.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((0, sets_1.setToArray)(usedSegments))
+                var mutation = computeSplitsMutation(splitChanges.splits, splitFiltersValidation);
+                log.debug(constants_2.SYNC_SPLITS_UPDATE, [mutation.added.length, mutation.removed.length, 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([
+                    splits.update(mutation.added, mutation.removed, splitChanges.till),
+                    segments.registerSegments(mutation.segments)
                 ]).then(function (_a) {
-                    var ffChanged = _a[0], rbsChanged = _a[1];
+                    var isThereUpdate = _a[0];
                     if (splitsEventEmitter) {
                         // To emit SDK_SPLITS_ARRIVED for server-side SDK, we must check that all registered segments have been fetched
-                        return Promise.resolve(!splitsEventEmitter.splitsArrived || ((ffChanged || rbsChanged) && (isClientSide || checkAllSegmentsExist(segments))))
+                        return Promise.resolve(!splitsEventEmitter.splitsArrived || (since !== splitChanges.till && isThereUpdate && (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
@@ -165,7 +149,7 @@ function splitChangesUpdaterFactory(log, splitChangesFetcher, storage, splitFilt
                 if (startingUp && retriesOnFailureBeforeReady > retry) {
                     retry += 1;
                     log.info(constants_2.SYNC_SPLITS_FETCH_RETRY, [retry, error]);
-                    return _splitChangesUpdater(sinces, retry);
+                    return _splitChangesUpdater(since, retry);
                 }
                 else {
                     startingUp = false;
@@ -182,8 +166,8 @@ function splitChangesUpdaterFactory(log, splitChangesFetcher, storage, splitFilt
             }
             return fetcherPromise;
         }
-        // `getChangeNumber` never rejects or throws error
-        return Promise.all([splits.getChangeNumber(), rbSegments.getChangeNumber()]).then(_splitChangesUpdater);
+        var sincePromise = Promise.resolve(splits.getChangeNumber()); // `getChangeNumber` never rejects or throws error
+        return sincePromise.then(_splitChangesUpdater);
     };
 }
 exports.splitChangesUpdaterFactory = splitChangesUpdaterFactory;

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

@@ -78,7 +78,6 @@ function SSEHandlerFactory(log, pushEmitter, telemetryTracker) {
                 case constants_1.MEMBERSHIPS_MS_UPDATE:
                 case constants_1.MEMBERSHIPS_LS_UPDATE:
                 case constants_1.SPLIT_KILL:
-                case constants_1.RB_SEGMENT_UPDATE:
                     pushEmitter.emit(parsedData.type, parsedData);
                     break;
                 /* occupancy & control events, handled by NotificationManagerKeeper */