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

package/cjs/sync/streaming/UpdateWorkers/SplitsUpdateWorker.js

@@ -1,106 +1,135 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SplitsUpdateWorker = void 0;
-var constants_1 = require("../../../readiness/constants");
+var constants_1 = require("../../../logger/constants");
+var constants_2 = require("../../../readiness/constants");
 var Backoff_1 = require("../../../utils/Backoff");
-var constants_2 = require("../../../utils/constants");
-var constants_3 = require("./constants");
+var constants_3 = require("../../../utils/constants");
+var constants_4 = require("../constants");
+var parseUtils_1 = require("../parseUtils");
+var constants_5 = require("./constants");
 /**
  * SplitsUpdateWorker factory
  */
-function SplitsUpdateWorker(log, splitsCache, splitsSyncTask, splitsEventEmitter, telemetryTracker, segmentsSyncTask) {
-    var maxChangeNumber = 0;
-    var handleNewEvent = false;
-    var isHandlingEvent;
-    var cdnBypass;
-    var payload;
-    var backoff = new Backoff_1.Backoff(__handleSplitUpdateCall, constants_3.FETCH_BACKOFF_BASE, constants_3.FETCH_BACKOFF_MAX_WAIT);
-    function __handleSplitUpdateCall() {
-        isHandlingEvent = true;
-        if (maxChangeNumber > splitsCache.getChangeNumber()) {
-            handleNewEvent = false;
-            var splitUpdateNotification_1 = payload ? { payload: payload, changeNumber: maxChangeNumber } : undefined;
-            // fetch splits revalidating data if cached
-            splitsSyncTask.execute(true, cdnBypass ? maxChangeNumber : undefined, splitUpdateNotification_1).then(function () {
-                if (!isHandlingEvent)
-                    return; // halt if `stop` has been called
-                if (handleNewEvent) {
-                    __handleSplitUpdateCall();
-                }
-                else {
-                    if (splitUpdateNotification_1)
-                        telemetryTracker.trackUpdatesFromSSE(constants_2.SPLITS);
-                    // fetch new registered segments for server-side API. Not retrying on error
-                    if (segmentsSyncTask)
-                        segmentsSyncTask.execute(true);
-                    var attempts = backoff.attempts + 1;
-                    if (maxChangeNumber <= splitsCache.getChangeNumber()) {
-                        log.debug("Refresh completed" + (cdnBypass ? ' bypassing the CDN' : '') + " in " + attempts + " attempts.");
-                        isHandlingEvent = false;
-                        return;
-                    }
-                    if (attempts < constants_3.FETCH_BACKOFF_MAX_RETRIES) {
-                        backoff.scheduleCall();
-                        return;
-                    }
-                    if (cdnBypass) {
-                        log.debug("No changes fetched after " + attempts + " attempts with CDN bypassed.");
-                        isHandlingEvent = false;
+function SplitsUpdateWorker(log, storage, splitsSyncTask, splitsEventEmitter, telemetryTracker, segmentsSyncTask) {
+    var ff = SplitsUpdateWorker(storage.splits);
+    var rbs = SplitsUpdateWorker(storage.rbSegments);
+    function SplitsUpdateWorker(cache) {
+        var maxChangeNumber = -1;
+        var handleNewEvent = false;
+        var isHandlingEvent;
+        var cdnBypass;
+        var instantUpdate;
+        var backoff = new Backoff_1.Backoff(__handleSplitUpdateCall, constants_5.FETCH_BACKOFF_BASE, constants_5.FETCH_BACKOFF_MAX_WAIT);
+        function __handleSplitUpdateCall() {
+            isHandlingEvent = true;
+            if (maxChangeNumber > cache.getChangeNumber()) {
+                handleNewEvent = false;
+                // fetch splits revalidating data if cached
+                splitsSyncTask.execute(true, cdnBypass ? maxChangeNumber : undefined, instantUpdate).then(function () {
+                    if (!isHandlingEvent)
+                        return; // halt if `stop` has been called
+                    if (handleNewEvent) {
+                        __handleSplitUpdateCall();
                     }
                     else {
-                        backoff.reset();
-                        cdnBypass = true;
-                        __handleSplitUpdateCall();
+                        if (instantUpdate)
+                            telemetryTracker.trackUpdatesFromSSE(constants_3.SPLITS);
+                        // fetch new registered segments for server-side API. Not retrying on error
+                        if (segmentsSyncTask)
+                            segmentsSyncTask.execute(true);
+                        var attempts = backoff.attempts + 1;
+                        if (ff.isSync() && rbs.isSync()) {
+                            log.debug("Refresh completed" + (cdnBypass ? ' bypassing the CDN' : '') + " in " + attempts + " attempts.");
+                            isHandlingEvent = false;
+                            return;
+                        }
+                        if (attempts < constants_5.FETCH_BACKOFF_MAX_RETRIES) {
+                            backoff.scheduleCall();
+                            return;
+                        }
+                        if (cdnBypass) {
+                            log.debug("No changes fetched after " + attempts + " attempts with CDN bypassed.");
+                            isHandlingEvent = false;
+                        }
+                        else {
+                            backoff.reset();
+                            cdnBypass = true;
+                            __handleSplitUpdateCall();
+                        }
                     }
-                }
-            });
-        }
-        else {
-            isHandlingEvent = false;
-        }
-    }
-    /**
-     * Invoked by NotificationProcessor on SPLIT_UPDATE event
-     *
-     * @param changeNumber - change number of the SPLIT_UPDATE notification
-     */
-    function put(_a, _payload) {
-        var changeNumber = _a.changeNumber, pcn = _a.pcn;
-        var currentChangeNumber = splitsCache.getChangeNumber();
-        if (changeNumber <= currentChangeNumber || changeNumber <= maxChangeNumber)
-            return;
-        maxChangeNumber = changeNumber;
-        handleNewEvent = true;
-        cdnBypass = false;
-        payload = undefined;
-        if (_payload && currentChangeNumber === pcn) {
-            payload = _payload;
+                });
+            }
+            else {
+                isHandlingEvent = false;
+            }
         }
-        if (backoff.timeoutID || !isHandlingEvent)
-            __handleSplitUpdateCall();
-        backoff.reset();
+        return {
+            /**
+             * Invoked by NotificationProcessor on SPLIT_UPDATE or RB_SEGMENT_UPDATE event
+             *
+             * @param changeNumber - change number of the notification
+             */
+            put: function (_a, payload) {
+                var changeNumber = _a.changeNumber, pcn = _a.pcn, type = _a.type;
+                var currentChangeNumber = cache.getChangeNumber();
+                if (changeNumber <= currentChangeNumber || changeNumber <= maxChangeNumber)
+                    return;
+                maxChangeNumber = changeNumber;
+                handleNewEvent = true;
+                cdnBypass = false;
+                instantUpdate = undefined;
+                if (payload && currentChangeNumber === pcn) {
+                    instantUpdate = { payload: payload, changeNumber: changeNumber, type: type };
+                }
+                if (backoff.timeoutID || !isHandlingEvent)
+                    __handleSplitUpdateCall();
+                backoff.reset();
+            },
+            stop: function () {
+                isHandlingEvent = false;
+                backoff.reset();
+            },
+            isSync: function () {
+                return maxChangeNumber <= cache.getChangeNumber();
+            }
+        };
     }
     return {
-        put: put,
+        put: function (parsedData) {
+            if (parsedData.d && parsedData.c !== undefined) {
+                try {
+                    var payload = (0, parseUtils_1.parseFFUpdatePayload)(parsedData.c, parsedData.d);
+                    if (payload) {
+                        (parsedData.type === constants_4.RB_SEGMENT_UPDATE ? rbs : ff).put(parsedData, payload);
+                        return;
+                    }
+                }
+                catch (e) {
+                    log.warn(constants_1.STREAMING_PARSING_SPLIT_UPDATE, [parsedData.type, e]);
+                }
+            }
+            (parsedData.type === constants_4.RB_SEGMENT_UPDATE ? rbs : ff).put(parsedData);
+        },
         /**
          * Invoked by NotificationProcessor on SPLIT_KILL event
          *
-         * @param changeNumber - change number of the SPLIT_UPDATE notification
+         * @param changeNumber - change number of the notification
          * @param splitName - name of split to kill
          * @param defaultTreatment - default treatment value
          */
         killSplit: function (_a) {
             var changeNumber = _a.changeNumber, splitName = _a.splitName, defaultTreatment = _a.defaultTreatment;
-            if (splitsCache.killLocally(splitName, defaultTreatment, changeNumber)) {
+            if (storage.splits.killLocally(splitName, defaultTreatment, changeNumber)) {
                 // trigger an SDK_UPDATE if Split was killed locally
-                splitsEventEmitter.emit(constants_1.SDK_SPLITS_ARRIVED, true);
+                splitsEventEmitter.emit(constants_2.SDK_SPLITS_ARRIVED, true);
             }
             // queues the SplitChanges fetch (only if changeNumber is newer)
-            put({ changeNumber: changeNumber });
+            ff.put({ changeNumber: changeNumber });
         },
         stop: function () {
-            isHandlingEvent = false;
-            backoff.reset();
+            ff.stop();
+            rbs.stop();
         }
     };
 }

package/cjs/sync/streaming/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ControlType = exports.OCCUPANCY = exports.CONTROL = exports.SPLIT_UPDATE = exports.SPLIT_KILL = exports.SEGMENT_UPDATE = exports.MEMBERSHIPS_LS_UPDATE = exports.MEMBERSHIPS_MS_UPDATE = exports.PUSH_SUBSYSTEM_DOWN = exports.PUSH_SUBSYSTEM_UP = exports.PUSH_RETRYABLE_ERROR = exports.PUSH_NONRETRYABLE_ERROR = exports.SECONDS_BEFORE_EXPIRATION = void 0;
+exports.ControlType = exports.OCCUPANCY = exports.CONTROL = exports.RB_SEGMENT_UPDATE = exports.SPLIT_UPDATE = exports.SPLIT_KILL = exports.SEGMENT_UPDATE = exports.MEMBERSHIPS_LS_UPDATE = exports.MEMBERSHIPS_MS_UPDATE = exports.PUSH_SUBSYSTEM_DOWN = exports.PUSH_SUBSYSTEM_UP = exports.PUSH_RETRYABLE_ERROR = exports.PUSH_NONRETRYABLE_ERROR = exports.SECONDS_BEFORE_EXPIRATION = void 0;
 // time for refresh token
 exports.SECONDS_BEFORE_EXPIRATION = 600;
 // Internal SDK events, subscribed by SyncManager and PushManager
@@ -30,6 +30,7 @@ exports.MEMBERSHIPS_LS_UPDATE = 'MEMBERSHIPS_LS_UPDATE';
 exports.SEGMENT_UPDATE = 'SEGMENT_UPDATE';
 exports.SPLIT_KILL = 'SPLIT_KILL';
 exports.SPLIT_UPDATE = 'SPLIT_UPDATE';
+exports.RB_SEGMENT_UPDATE = 'RB_SEGMENT_UPDATE';
 // Control-type push notifications, handled by NotificationKeeper
 exports.CONTROL = 'CONTROL';
 exports.OCCUPANCY = 'OCCUPANCY';

package/cjs/sync/streaming/pushManager.js

@@ -46,7 +46,7 @@ function pushManagerFactory(params, pollingManager) {
     // MySegmentsUpdateWorker (client-side) are initiated in `add` method
     var segmentsUpdateWorker = userKey ? undefined : (0, SegmentsUpdateWorker_1.SegmentsUpdateWorker)(log, pollingManager.segmentsSyncTask, storage.segments);
     // For server-side we pass the segmentsSyncTask, used by SplitsUpdateWorker to fetch new segments
-    var splitsUpdateWorker = (0, SplitsUpdateWorker_1.SplitsUpdateWorker)(log, storage.splits, pollingManager.splitsSyncTask, readiness.splits, telemetryTracker, userKey ? undefined : pollingManager.segmentsSyncTask);
+    var splitsUpdateWorker = (0, SplitsUpdateWorker_1.SplitsUpdateWorker)(log, storage, pollingManager.splitsSyncTask, readiness.splits, telemetryTracker, userKey ? undefined : pollingManager.segmentsSyncTask);
     // [Only for client-side] map of hashes to user keys, to dispatch membership update events to the corresponding MySegmentsUpdateWorker
     var userKeyHashes = {};
     // [Only for client-side] map of user keys to their corresponding hash64 and MySegmentsUpdateWorkers.
@@ -182,21 +182,8 @@ function pushManagerFactory(params, pollingManager) {
     });
     /** Functions related to synchronization (Queues and Workers in the spec) */
     pushEmitter.on(constants_1.SPLIT_KILL, splitsUpdateWorker.killSplit);
-    pushEmitter.on(constants_1.SPLIT_UPDATE, function (parsedData) {
-        if (parsedData.d && parsedData.c !== undefined) {
-            try {
-                var payload = (0, parseUtils_1.parseFFUpdatePayload)(parsedData.c, parsedData.d);
-                if (payload) {
-                    splitsUpdateWorker.put(parsedData, payload);
-                    return;
-                }
-            }
-            catch (e) {
-                log.warn(constants_2.STREAMING_PARSING_SPLIT_UPDATE, [e]);
-            }
-        }
-        splitsUpdateWorker.put(parsedData);
-    });
+    pushEmitter.on(constants_1.SPLIT_UPDATE, splitsUpdateWorker.put);
+    pushEmitter.on(constants_1.RB_SEGMENT_UPDATE, splitsUpdateWorker.put);
     function handleMySegmentsUpdate(parsedData) {
         switch (parsedData.u) {
             case types_1.UpdateStrategy.BoundedFetchRequest: {

package/cjs/sync/syncManagerOnline.js

@@ -6,7 +6,6 @@ var constants_1 = require("./streaming/constants");
 var constants_2 = require("../logger/constants");
 var consent_1 = require("../consent");
 var constants_3 = require("../utils/constants");
-var constants_4 = require("../readiness/constants");
 /**
  * Online SyncManager factory.
  * Can be used for server-side API, and client-side API with or without multiple clients.
@@ -20,7 +19,7 @@ function syncManagerOnlineFactory(pollingManagerFactory, pushManagerFactory) {
      * SyncManager factory for modular SDK
      */
     return function (params) {
-        var settings = params.settings, _a = params.settings, log = _a.log, streamingEnabled = _a.streamingEnabled, syncEnabled = _a.sync.enabled, telemetryTracker = params.telemetryTracker, storage = params.storage, readiness = params.readiness;
+        var settings = params.settings, _a = params.settings, log = _a.log, streamingEnabled = _a.streamingEnabled, syncEnabled = _a.sync.enabled, telemetryTracker = params.telemetryTracker;
         /** Polling Manager */
         var pollingManager = pollingManagerFactory && pollingManagerFactory(params);
         /** Push Manager */
@@ -68,11 +67,6 @@ function syncManagerOnlineFactory(pollingManagerFactory, pushManagerFactory) {
              */
             start: function () {
                 running = true;
-                if (startFirstTime) {
-                    var isCacheLoaded = storage.validateCache ? storage.validateCache() : false;
-                    if (isCacheLoaded)
-                        Promise.resolve().then(function () { readiness.splits.emit(constants_4.SDK_SPLITS_CACHE_LOADED); });
-                }
                 // start syncing splits and segments
                 if (pollingManager) {
                     // If synchronization is disabled pushManager and pollingManager should not start
@@ -81,6 +75,7 @@ function syncManagerOnlineFactory(pollingManagerFactory, pushManagerFactory) {
                             // Doesn't call `syncAll` when the syncManager is resuming
                             if (startFirstTime) {
                                 pollingManager.syncAll();
+                                startFirstTime = false;
                             }
                             pushManager.start();
                         }
@@ -91,12 +86,12 @@ function syncManagerOnlineFactory(pollingManagerFactory, pushManagerFactory) {
                     else {
                         if (startFirstTime) {
                             pollingManager.syncAll();
+                            startFirstTime = false;
                         }
                     }
                 }
                 // start periodic data recording (events, impressions, telemetry).
                 submitterManager.start(!(0, consent_1.isConsentGranted)(settings));
-                startFirstTime = false;
             },
             /**
              * Method used to stop/pause the syncManager.
@@ -130,7 +125,7 @@ function syncManagerOnlineFactory(pollingManagerFactory, pushManagerFactory) {
                         if (pushManager) {
                             if (pollingManager.isRunning()) {
                                 // if doing polling, we must start the periodic fetch of data
-                                if (storage.splits.usesSegments())
+                                if (storage.splits.usesSegments() || storage.rbSegments.usesSegments())
                                     mySegmentsSyncTask.start();
                             }
                             else {
@@ -140,7 +135,7 @@ function syncManagerOnlineFactory(pollingManagerFactory, pushManagerFactory) {
                             }
                         }
                         else {
-                            if (storage.splits.usesSegments())
+                            if (storage.splits.usesSegments() || storage.rbSegments.usesSegments())
                                 mySegmentsSyncTask.start();
                         }
                     }

package/cjs/trackers/uniqueKeysTracker.js

@@ -8,7 +8,7 @@ var noopFilterAdapter = {
     clear: function () { }
 };
 /**
- * Trackes uniques keys
+ * Tracks uniques keys
  * Unique Keys Tracker will be in charge of checking if the MTK was already sent to the BE in the last period
  * or schedule to be sent; if not it will be added in an internal cache and sent in the next post.
  *

package/cjs/utils/constants/browser.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DEFAULT_CACHE_EXPIRATION_IN_MILLIS = void 0;
+// This value might be eventually set via a config parameter
+exports.DEFAULT_CACHE_EXPIRATION_IN_MILLIS = 864000000; // 10 days

package/cjs/utils/constants/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MEMBERSHIPS = exports.SEGMENT = exports.TOKEN = exports.TELEMETRY = exports.EVENTS = exports.IMPRESSIONS_COUNT = exports.IMPRESSIONS = exports.SPLITS = exports.NONE_ENUM = exports.DEBUG_ENUM = exports.OPTIMIZED_ENUM = exports.CONSUMER_PARTIAL_ENUM = exports.CONSUMER_ENUM = exports.STANDALONE_ENUM = exports.DEDUPED = exports.DROPPED = exports.QUEUED = exports.NAMES_FN_LABEL = exports.SPLITS_FN_LABEL = exports.SPLIT_FN_LABEL = exports.TRACK_FN_LABEL = exports.GET_TREATMENTS_WITH_CONFIG_BY_FLAG_SETS = exports.GET_TREATMENTS_WITH_CONFIG_BY_FLAG_SET = exports.GET_TREATMENTS_BY_FLAG_SETS = exports.GET_TREATMENTS_BY_FLAG_SET = exports.GET_TREATMENTS_WITH_CONFIG = exports.GET_TREATMENT_WITH_CONFIG = exports.GET_TREATMENTS = exports.GET_TREATMENT = exports.CONSENT_UNKNOWN = exports.CONSENT_DECLINED = exports.CONSENT_GRANTED = exports.STORAGE_PLUGGABLE = exports.STORAGE_REDIS = exports.STORAGE_LOCALSTORAGE = exports.STORAGE_MEMORY = exports.CONSUMER_PARTIAL_MODE = exports.CONSUMER_MODE = exports.PRODUCER_MODE = exports.STANDALONE_MODE = exports.LOCALHOST_MODE = exports.NONE = exports.OPTIMIZED = exports.DEBUG = exports.SPLIT_EVENT = exports.SPLIT_IMPRESSION = exports.NA = exports.UNKNOWN = exports.CONTROL_WITH_CONFIG = exports.CONTROL = void 0;
-exports.IN_LARGE_SEGMENT = exports.IN_SEGMENT = exports.FLAG_SPEC_VERSION = exports.PAUSED = exports.ENABLED = exports.DISABLED = exports.NON_REQUESTED = exports.REQUESTED = exports.POLLING = exports.STREAMING = exports.AUTH_REJECTION = exports.SYNC_MODE_UPDATE = exports.ABLY_ERROR = exports.TOKEN_REFRESH = exports.SSE_CONNECTION_ERROR = exports.STREAMING_STATUS = exports.OCCUPANCY_SEC = exports.OCCUPANCY_PRI = exports.CONNECTION_ESTABLISHED = exports.TRACK = exports.TREATMENTS_WITH_CONFIG_BY_FLAGSETS = exports.TREATMENTS_WITH_CONFIG_BY_FLAGSET = exports.TREATMENTS_BY_FLAGSETS = exports.TREATMENTS_BY_FLAGSET = exports.TREATMENTS_WITH_CONFIG = exports.TREATMENT_WITH_CONFIG = exports.TREATMENTS = exports.TREATMENT = void 0;
+exports.IN_RULE_BASED_SEGMENT = exports.IN_LARGE_SEGMENT = exports.IN_SEGMENT = exports.FLAG_SPEC_VERSION = exports.PAUSED = exports.ENABLED = exports.DISABLED = exports.NON_REQUESTED = exports.REQUESTED = exports.POLLING = exports.STREAMING = exports.AUTH_REJECTION = exports.SYNC_MODE_UPDATE = exports.ABLY_ERROR = exports.TOKEN_REFRESH = exports.SSE_CONNECTION_ERROR = exports.STREAMING_STATUS = exports.OCCUPANCY_SEC = exports.OCCUPANCY_PRI = exports.CONNECTION_ESTABLISHED = exports.TRACK = exports.TREATMENTS_WITH_CONFIG_BY_FLAGSETS = exports.TREATMENTS_WITH_CONFIG_BY_FLAGSET = exports.TREATMENTS_BY_FLAGSETS = exports.TREATMENTS_BY_FLAGSET = exports.TREATMENTS_WITH_CONFIG = exports.TREATMENT_WITH_CONFIG = exports.TREATMENTS = exports.TREATMENT = void 0;
 // Special treatments
 exports.CONTROL = 'control';
 exports.CONTROL_WITH_CONFIG = {
@@ -90,7 +90,8 @@ exports.NON_REQUESTED = 1;
 exports.DISABLED = 0;
 exports.ENABLED = 1;
 exports.PAUSED = 2;
-exports.FLAG_SPEC_VERSION = '1.2';
+exports.FLAG_SPEC_VERSION = '1.3';
 // Matcher types
 exports.IN_SEGMENT = 'IN_SEGMENT';
 exports.IN_LARGE_SEGMENT = 'IN_LARGE_SEGMENT';
+exports.IN_RULE_BASED_SEGMENT = 'IN_RULE_BASED_SEGMENT';

package/cjs/utils/settingsValidation/storage/storageCS.js

@@ -6,7 +6,7 @@ var constants_1 = require("../../../logger/constants");
 var constants_2 = require("../../../utils/constants");
 function __InLocalStorageMockFactory(params) {
     var result = (0, InMemoryStorageCS_1.InMemoryStorageCSFactory)(params);
-    result.validateCache = function () { return true; }; // to emit SDK_READY_FROM_CACHE
+    result.splits.checkCache = function () { return true; }; // to emit SDK_READY_FROM_CACHE
     return result;
 }
 exports.__InLocalStorageMockFactory = __InLocalStorageMockFactory;

package/esm/evaluator/combiners/and.js

@@ -8,12 +8,8 @@ export function andCombinerContext(log, matchers) {
         log.debug(ENGINE_COMBINER_AND, [hasMatchedAll]);
         return hasMatchedAll;
     }
-    return function andCombiner() {
-        var params = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            params[_i] = arguments[_i];
-        }
-        var matcherResults = matchers.map(function (matcher) { return matcher.apply(void 0, params); });
+    return function andCombiner(key, attributes, splitEvaluator) {
+        var matcherResults = matchers.map(function (matcher) { return matcher(key, attributes, splitEvaluator); });
         // If any matching result is a thenable we should use Promise.all
         if (findIndex(matcherResults, thenable) !== -1) {
             return Promise.all(matcherResults).then(andResults);

package/esm/evaluator/combiners/ifelseif.js

@@ -1,4 +1,4 @@
-import { findIndex } from '../../utils/lang';
+import { findIndex, isBoolean } from '../../utils/lang';
 import { thenable } from '../../utils/promise/thenable';
 import { UNSUPPORTED_MATCHER_TYPE } from '../../utils/labels';
 import { CONTROL } from '../../utils/constants';
@@ -11,12 +11,12 @@ export function ifElseIfCombinerContext(log, predicates) {
             label: UNSUPPORTED_MATCHER_TYPE
         };
     }
-    function computeTreatment(predicateResults) {
-        var len = predicateResults.length;
-        for (var i = 0; i < len; i++) {
+    function computeEvaluation(predicateResults) {
+        for (var i = 0, len = predicateResults.length; i < len; i++) {
             var evaluation = predicateResults[i];
             if (evaluation !== undefined) {
-                log.debug(ENGINE_COMBINER_IFELSEIF, [evaluation.treatment]);
+                if (!isBoolean(evaluation))
+                    log.debug(ENGINE_COMBINER_IFELSEIF, [evaluation.treatment]);
                 return evaluation;
             }
         }
@@ -30,9 +30,9 @@ export function ifElseIfCombinerContext(log, predicates) {
         var predicateResults = predicates.map(function (evaluator) { return evaluator(key, seed, trafficAllocation, trafficAllocationSeed, attributes, splitEvaluator); });
         // if we find a thenable
         if (findIndex(predicateResults, thenable) !== -1) {
-            return Promise.all(predicateResults).then(function (results) { return computeTreatment(results); });
+            return Promise.all(predicateResults).then(function (results) { return computeEvaluation(results); });
         }
-        return computeTreatment(predicateResults);
+        return computeEvaluation(predicateResults);
     }
     // if there is none predicates, then there was an error in parsing phase
     if (!Array.isArray(predicates) || predicates.length === 0) {

package/esm/evaluator/condition/index.js

@@ -4,11 +4,12 @@ import { NOT_IN_SPLIT } from '../../utils/labels';
 // Build Evaluation object if and only if matchingResult is true
 function match(log, matchingResult, bucketingKey, seed, treatments, label) {
     if (matchingResult) {
-        var treatment = getTreatment(log, bucketingKey, seed, treatments);
-        return {
-            treatment: treatment,
-            label: label
-        };
+        return treatments ? // Feature flag
+            {
+                treatment: getTreatment(log, bucketingKey, seed, treatments),
+                label: label
+            } : // Rule-based segment
+            true;
     }
     // else we should notify the engine to continue evaluating
     return undefined;

package/esm/evaluator/index.js

@@ -26,12 +26,12 @@ export function evaluateFeature(log, key, splitName, attributes, storage) {
         return treatmentException;
     }
     if (thenable(parsedSplit)) {
-        return parsedSplit.then(function (split) { return getEvaluation(log, split, key, attributes, storage); }).catch(
+        return parsedSplit.then(function (split) { return getEvaluation(log, key, split, attributes, storage); }).catch(
         // Exception on async `getSplit` storage. For example, when the storage is redis or
         // pluggable and there is a connection issue and we can't retrieve the split to be evaluated
         function () { return treatmentException; });
     }
-    return getEvaluation(log, parsedSplit, key, attributes, storage);
+    return getEvaluation(log, key, parsedSplit, attributes, storage);
 }
 export function evaluateFeatures(log, key, splitNames, attributes, storage) {
     var parsedSplits;
@@ -43,13 +43,13 @@ export function evaluateFeatures(log, key, splitNames, attributes, storage) {
         return treatmentsException(splitNames);
     }
     return thenable(parsedSplits) ?
-        parsedSplits.then(function (splits) { return getEvaluations(log, splitNames, splits, key, attributes, storage); })
+        parsedSplits.then(function (splits) { return getEvaluations(log, key, splitNames, splits, attributes, storage); })
             .catch(function () {
             // Exception on async `getSplits` storage. For example, when the storage is redis or
             // pluggable and there is a connection issue and we can't retrieve the split to be evaluated
             return treatmentsException(splitNames);
         }) :
-        getEvaluations(log, splitNames, parsedSplits, key, attributes, storage);
+        getEvaluations(log, key, splitNames, parsedSplits, attributes, storage);
 }
 export function evaluateFeaturesByFlagSets(log, key, flagSets, attributes, storage, method) {
     var storedFlagNames;
@@ -84,7 +84,7 @@ export function evaluateFeaturesByFlagSets(log, key, flagSets, attributes, stora
         }) :
         evaluate(storedFlagNames);
 }
-function getEvaluation(log, splitJSON, key, attributes, storage) {
+function getEvaluation(log, key, splitJSON, attributes, storage) {
     var evaluation = {
         treatment: CONTROL,
         label: SPLIT_NOT_FOUND,
@@ -110,11 +110,11 @@ function getEvaluation(log, splitJSON, key, attributes, storage) {
     }
     return evaluation;
 }
-function getEvaluations(log, splitNames, splits, key, attributes, storage) {
+function getEvaluations(log, key, splitNames, splits, attributes, storage) {
     var result = {};
     var thenables = [];
     splitNames.forEach(function (splitName) {
-        var evaluation = getEvaluation(log, splits[splitName], key, attributes, storage);
+        var evaluation = getEvaluation(log, key, splits[splitName], attributes, storage);
         if (thenable(evaluation)) {
             thenables.push(evaluation.then(function (res) {
                 result[splitName] = res;

package/esm/evaluator/matchers/index.js

@@ -21,6 +21,7 @@ import { greaterThanEqualToSemverMatcherContext } from './semver_gte';
 import { lessThanEqualToSemverMatcherContext } from './semver_lte';
 import { betweenSemverMatcherContext } from './semver_between';
 import { inListSemverMatcherContext } from './semver_inlist';
+import { ruleBasedSegmentMatcherContext } from './rbsegment';
 var matchers = [
     undefined,
     allMatcherContext,
@@ -45,7 +46,8 @@ var matchers = [
     lessThanEqualToSemverMatcherContext,
     betweenSemverMatcherContext,
     inListSemverMatcherContext,
-    largeSegmentMatcherContext, // IN_LARGE_SEGMENT: 23
+    largeSegmentMatcherContext,
+    ruleBasedSegmentMatcherContext // IN_RULE_BASED_SEGMENT: 24
 ];
 /**
  * Matcher factory.

package/esm/evaluator/matchers/matcherTypes.js

@@ -23,6 +23,7 @@ export var matcherTypes = {
     BETWEEN_SEMVER: 21,
     IN_LIST_SEMVER: 22,
     IN_LARGE_SEGMENT: 23,
+    IN_RULE_BASED_SEGMENT: 24,
 };
 export var matcherDataTypes = {
     BOOLEAN: 'BOOLEAN',

package/esm/evaluator/matchers/rbsegment.js

@@ -0,0 +1,39 @@
+import { thenable } from '../../utils/promise/thenable';
+import { getMatching, keyParser } from '../../utils/key';
+import { parser } from '../parser';
+export function ruleBasedSegmentMatcherContext(segmentName, storage, log) {
+    return function ruleBasedSegmentMatcher(_a, splitEvaluator) {
+        var key = _a.key, attributes = _a.attributes;
+        function matchConditions(rbsegment) {
+            var conditions = rbsegment.conditions;
+            var evaluator = parser(log, conditions, storage);
+            var evaluation = evaluator(keyParser(key), undefined, undefined, undefined, attributes, splitEvaluator);
+            return thenable(evaluation) ?
+                evaluation.then(function (evaluation) { return evaluation ? true : false; }) :
+                evaluation ? true : false;
+        }
+        function isExcluded(rbSegment) {
+            var matchingKey = getMatching(key);
+            if (rbSegment.excluded.keys.indexOf(matchingKey) !== -1)
+                return true;
+            var isInSegment = rbSegment.excluded.segments.map(function (segmentName) {
+                return storage.segments.isInSegment(segmentName, matchingKey);
+            });
+            return isInSegment.length && thenable(isInSegment[0]) ?
+                Promise.all(isInSegment).then(function (results) { return results.some(function (result) { return result; }); }) :
+                isInSegment.some(function (result) { return result; });
+        }
+        function isInSegment(rbSegment) {
+            if (!rbSegment)
+                return false;
+            var excluded = isExcluded(rbSegment);
+            return thenable(excluded) ?
+                excluded.then(function (excluded) { return excluded ? false : matchConditions(rbSegment); }) :
+                excluded ? false : matchConditions(rbSegment);
+        }
+        var rbSegment = storage.rbSegments.get(segmentName);
+        return thenable(rbSegment) ?
+            rbSegment.then(isInSegment) :
+            isInSegment(rbSegment);
+    };
+}

package/esm/evaluator/matchersTransform/index.js

@@ -78,6 +78,10 @@ export function matchersTransform(matchers) {
             type === matcherTypes.LESS_THAN_OR_EQUAL_TO_SEMVER) {
             value = stringMatcherData;
         }
+        else if (type === matcherTypes.IN_RULE_BASED_SEGMENT) {
+            value = segmentTransform(userDefinedSegmentMatcherData);
+            dataType = matcherDataTypes.NOT_SPECIFIED;
+        }
         return {
             attribute: attribute,
             negate: negate,

package/esm/evaluator/parser/index.js

@@ -50,8 +50,8 @@ export function parser(log, conditions, storage) {
             // and break the loop
             break;
         }
-        predicates.push(conditionContext(log, andCombinerContext(log, expressions), Treatments.parse(partitions), label, conditionType));
+        predicates.push(conditionContext(log, andCombinerContext(log, expressions), partitions && Treatments.parse(partitions), label, conditionType));
     }
-    // Instanciate evaluator given the set of conditions using if else if logic
+    // Instantiate evaluator given the set of conditions using if else if logic
     return ifElseIfCombinerContext(log, predicates);
 }

package/esm/evaluator/value/sanitize.js

@@ -49,6 +49,7 @@ function getProcessingFunction(matcherTypeID, dataType) {
         case matcherTypes.BETWEEN:
             return dataType === 'DATETIME' ? zeroSinceSS : undefined;
         case matcherTypes.IN_SPLIT_TREATMENT:
+        case matcherTypes.IN_RULE_BASED_SEGMENT:
             return dependencyProcessor;
         default:
             return undefined;

package/esm/logger/constants.js

@@ -20,9 +20,8 @@ export var RETRIEVE_CLIENT_EXISTING = 28;
 export var RETRIEVE_MANAGER = 29;
 export var SYNC_OFFLINE_DATA = 30;
 export var SYNC_SPLITS_FETCH = 31;
-export var SYNC_SPLITS_NEW = 32;
-export var SYNC_SPLITS_REMOVED = 33;
-export var SYNC_SPLITS_SEGMENTS = 34;
+export var SYNC_SPLITS_UPDATE = 32;
+export var SYNC_RBS_UPDATE = 33;
 export var STREAMING_NEW_MESSAGE = 35;
 export var SYNC_TASK_START = 36;
 export var SYNC_TASK_EXECUTE = 37;

package/esm/logger/messages/debug.js

@@ -19,10 +19,9 @@ export var codesDebug = codesInfo.concat([
     [c.RETRIEVE_MANAGER, 'Retrieving manager instance.'],
     // synchronizer
     [c.SYNC_OFFLINE_DATA, c.LOG_PREFIX_SYNC_OFFLINE + 'Feature flags data: \n%s'],
-    [c.SYNC_SPLITS_FETCH, c.LOG_PREFIX_SYNC_SPLITS + 'Spin up feature flags update using since = %s'],
-    [c.SYNC_SPLITS_NEW, c.LOG_PREFIX_SYNC_SPLITS + 'New feature flags %s'],
-    [c.SYNC_SPLITS_REMOVED, c.LOG_PREFIX_SYNC_SPLITS + 'Removed feature flags %s'],
-    [c.SYNC_SPLITS_SEGMENTS, c.LOG_PREFIX_SYNC_SPLITS + 'Segment names collected %s'],
+    [c.SYNC_SPLITS_FETCH, c.LOG_PREFIX_SYNC_SPLITS + 'Spin up feature flags update using since = %s and rbSince = %s.'],
+    [c.SYNC_SPLITS_UPDATE, c.LOG_PREFIX_SYNC_SPLITS + 'New feature flags %s. Removed feature flags %s.'],
+    [c.SYNC_RBS_UPDATE, c.LOG_PREFIX_SYNC_SPLITS + 'New rule-based segments %s. Removed rule-based segments %s.'],
     [c.STREAMING_NEW_MESSAGE, c.LOG_PREFIX_SYNC_STREAMING + 'New SSE message received, with data: %s.'],
     [c.SYNC_TASK_START, c.LOG_PREFIX_SYNC + ': Starting %s. Running each %s millis'],
     [c.SYNC_TASK_EXECUTE, c.LOG_PREFIX_SYNC + ': Running %s'],