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

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

@@ -4,15 +4,13 @@ exports.mySegmentsUpdaterFactory = void 0;
 var timeout_1 = require("../../../utils/promise/timeout");
 var constants_1 = require("../../../readiness/constants");
 var constants_2 = require("../../../logger/constants");
-var constants_3 = require("../../streaming/constants");
 /**
  * factory of MySegments updater, a task that:
  *  - fetches mySegments using `mySegmentsFetcher`
  *  - updates `mySegmentsCache`
  *  - uses `segmentsEventEmitter` to emit events related to segments data updates
  */
-function mySegmentsUpdaterFactory(log, mySegmentsFetcher, storage, segmentsEventEmitter, requestTimeoutBeforeReady, retriesOnFailureBeforeReady, matchingKey) {
-    var splits = storage.splits, segments = storage.segments, largeSegments = storage.largeSegments;
+function mySegmentsUpdaterFactory(log, mySegmentsFetcher, splitsCache, mySegmentsCache, segmentsEventEmitter, requestTimeoutBeforeReady, retriesOnFailureBeforeReady, matchingKey) {
     var readyOnAlreadyExistentState = true;
     var startingUp = true;
     /** timeout and telemetry decorator for `splitChangesFetcher` promise  */
@@ -24,27 +22,36 @@ function mySegmentsUpdaterFactory(log, mySegmentsFetcher, storage, segmentsEvent
     // @TODO if allowing pluggable storages, handle async execution
     function updateSegments(segmentsData) {
         var shouldNotifyUpdate;
-        if (segmentsData.type !== undefined) {
-            shouldNotifyUpdate = segmentsData.type === constants_3.MEMBERSHIPS_LS_UPDATE ?
-                largeSegments.resetSegments(segmentsData) :
-                segments.resetSegments(segmentsData);
+        if (Array.isArray(segmentsData)) {
+            // Update the list of segment names available
+            shouldNotifyUpdate = mySegmentsCache.resetSegments(segmentsData);
         }
         else {
-            shouldNotifyUpdate = segments.resetSegments(segmentsData.ms || {});
-            shouldNotifyUpdate = largeSegments.resetSegments(segmentsData.ls || {}) || shouldNotifyUpdate;
+            // Add/Delete the segment
+            var name_1 = segmentsData.name, add = segmentsData.add;
+            if (mySegmentsCache.isInSegment(name_1) !== add) {
+                shouldNotifyUpdate = true;
+                if (add)
+                    mySegmentsCache.addToSegment(name_1);
+                else
+                    mySegmentsCache.removeFromSegment(name_1);
+            }
+            else {
+                shouldNotifyUpdate = false;
+            }
         }
         // Notify update if required
-        if (splits.usesSegments() && (shouldNotifyUpdate || readyOnAlreadyExistentState)) {
+        if (splitsCache.usesSegments() && (shouldNotifyUpdate || readyOnAlreadyExistentState)) {
             readyOnAlreadyExistentState = false;
             segmentsEventEmitter.emit(constants_1.SDK_SEGMENTS_ARRIVED);
         }
     }
-    function _mySegmentsUpdater(retry, segmentsData, noCache, till) {
+    function _mySegmentsUpdater(retry, segmentsData, noCache) {
         var updaterPromise = segmentsData ?
             // If segmentsData is provided, there is no need to fetch mySegments
             new Promise(function (res) { updateSegments(segmentsData); res(true); }) :
             // If not provided, fetch mySegments
-            mySegmentsFetcher(matchingKey, noCache, till, _promiseDecorator).then(function (segments) {
+            mySegmentsFetcher(matchingKey, noCache, _promiseDecorator).then(function (segments) {
                 // Only when we have downloaded segments completely, we should not keep retrying anymore
                 startingUp = false;
                 updateSegments(segments);
@@ -71,10 +78,9 @@ function mySegmentsUpdaterFactory(log, mySegmentsFetcher, storage, segmentsEvent
      *  (2) an object with a segment name and action (true: add, or false: delete) to update the storage,
      *  (3) or `undefined`, for which the updater will fetch mySegments in order to sync the storage.
      * @param {boolean | undefined} noCache true to revalidate data to fetch
-     * @param {boolean | undefined} till query param to bypass CDN requests
      */
-    return function mySegmentsUpdater(segmentsData, noCache, till) {
-        return _mySegmentsUpdater(0, segmentsData, noCache, till);
+    return function mySegmentsUpdater(segmentsData, noCache) {
+        return _mySegmentsUpdater(0, segmentsData, noCache);
     };
 }
 exports.mySegmentsUpdaterFactory = mySegmentsUpdaterFactory;

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

@@ -23,9 +23,9 @@ function segmentChangesUpdaterFactory(log, segmentChangesFetcher, segments, read
         var sincePromise = Promise.resolve(segments.getChangeNumber(segmentName));
         return sincePromise.then(function (since) {
             // if fetchOnlyNew flag, avoid processing already fetched segments
-            if (fetchOnlyNew && since !== -1)
+            if (fetchOnlyNew && since !== undefined)
                 return -1;
-            return segmentChangesFetcher(since, segmentName, noCache, till).then(function (changes) {
+            return segmentChangesFetcher(since || -1, segmentName, noCache, till).then(function (changes) {
                 var changeNumber = -1;
                 var results = [];
                 changes.forEach(function (x) {

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

@@ -14,7 +14,7 @@ function checkAllSegmentsExist(segments) {
     var registeredSegments = Promise.resolve(segments.getRegisteredSegments());
     return registeredSegments.then(function (segmentNames) {
         return Promise.all(segmentNames.map(function (segmentName) { return segments.getChangeNumber(segmentName); }))
-            .then(function (changeNumbers) { return changeNumbers.every(function (changeNumber) { return changeNumber !== -1; }); });
+            .then(function (changeNumbers) { return changeNumbers.every(function (changeNumber) { return changeNumber !== undefined; }); });
     });
 }
 /**
@@ -126,7 +126,7 @@ function splitChangesUpdaterFactory(log, splitChangesFetcher, splits, segments,
         function _splitChangesUpdater(since, retry) {
             if (retry === void 0) { retry = 0; }
             log.debug(constants_2.SYNC_SPLITS_FETCH, [since]);
-            return Promise.resolve(splitUpdateNotification ?
+            var fetcherPromise = Promise.resolve(splitUpdateNotification ?
                 { splits: [splitUpdateNotification.payload], till: splitUpdateNotification.changeNumber } :
                 splitChangesFetcher(since, noCache, till, _promiseDecorator))
                 .then(function (splitChanges) {
@@ -170,6 +170,15 @@ function splitChangesUpdaterFactory(log, splitChangesFetcher, splits, segments,
                 }
                 return false;
             });
+            // After triggering the requests, if we have cached splits information let's notify that to emit SDK_READY_FROM_CACHE.
+            // Wrapping in a promise since checkCache can be async.
+            if (splitsEventEmitter && startingUp) {
+                Promise.resolve(splits.checkCache()).then(function (isCacheReady) {
+                    if (isCacheReady)
+                        splitsEventEmitter.emit(constants_1.SDK_SPLITS_CACHE_LOADED);
+                });
+            }
+            return fetcherPromise;
         }
         var sincePromise = Promise.resolve(splits.getChangeNumber()); // `getChangeNumber` never rejects or throws error
         return sincePromise.then(_splitChangesUpdater);

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

@@ -13,7 +13,7 @@ var murmur3_1 = require("../../../utils/murmur3/murmur3");
 function authenticateFactory(fetchAuth) {
     /**
      * Run authentication requests to Auth Server, and returns a promise that resolves with the decoded JTW token.
-     * @param {string[] | undefined} userKeys set of user Keys to track membership updates. It is undefined for server-side API.
+     * @param {string[] | undefined} userKeys set of user Keys to track MY_SEGMENTS_CHANGES. It is undefined for server-side API.
      */
     return function authenticate(userKeys) {
         return fetchAuth(userKeys)

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

@@ -68,18 +68,20 @@ function SSEHandlerFactory(log, pushEmitter, telemetryTracker) {
             }
             var parsedData = messageWithParsedData.parsedData, data = messageWithParsedData.data, channel = messageWithParsedData.channel, timestamp = messageWithParsedData.timestamp;
             log.debug(constants_2.STREAMING_NEW_MESSAGE, [data]);
-            // we only handle update events if streaming is up
+            // we only handle update events if streaming is up.
             if (!notificationKeeper.isStreamingUp() && [constants_1.OCCUPANCY, constants_1.CONTROL].indexOf(parsedData.type) === -1)
                 return;
             switch (parsedData.type) {
                 /* update events */
                 case constants_1.SPLIT_UPDATE:
                 case constants_1.SEGMENT_UPDATE:
-                case constants_1.MEMBERSHIPS_MS_UPDATE:
-                case constants_1.MEMBERSHIPS_LS_UPDATE:
+                case constants_1.MY_SEGMENTS_UPDATE_V2:
                 case constants_1.SPLIT_KILL:
                     pushEmitter.emit(parsedData.type, parsedData);
                     break;
+                case constants_1.MY_SEGMENTS_UPDATE:
+                    pushEmitter.emit(parsedData.type, parsedData, channel);
+                    break;
                 /* occupancy & control events, handled by NotificationManagerKeeper */
                 case constants_1.OCCUPANCY:
                     notificationKeeper.handleOccupancyEvent(parsedData.metrics.publishers, channel, timestamp);

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

@@ -3,121 +3,62 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MySegmentsUpdateWorker = void 0;
 var Backoff_1 = require("../../../utils/Backoff");
 var constants_1 = require("../../../utils/constants");
-var constants_2 = require("./constants");
-var constants_3 = require("../constants");
 /**
  * MySegmentsUpdateWorker factory
  */
-function MySegmentsUpdateWorker(log, storage, mySegmentsSyncTask, telemetryTracker) {
-    var _a;
-    var _delay;
-    var _delayTimeoutID;
-    function createUpdateWorker(mySegmentsCache) {
-        var maxChangeNumber = 0; // keeps the maximum changeNumber among queued events
-        var currentChangeNumber = -1;
-        var handleNewEvent = false;
-        var isHandlingEvent;
-        var cdnBypass;
-        var _segmentsData; // keeps the segmentsData (if included in notification payload) from the queued event with maximum changeNumber
-        var backoff = new Backoff_1.Backoff(__handleMySegmentsUpdateCall);
-        function __handleMySegmentsUpdateCall() {
-            isHandlingEvent = true;
-            if (maxChangeNumber > Math.max(currentChangeNumber, mySegmentsCache.getChangeNumber())) {
-                handleNewEvent = false;
-                var currentMaxChangeNumber_1 = maxChangeNumber;
-                // fetch mySegments revalidating data if cached
-                var syncTask = _delay ?
-                    new Promise(function (res) {
-                        _delayTimeoutID = setTimeout(function () {
-                            _delay = undefined;
-                            mySegmentsSyncTask.execute(_segmentsData, true, cdnBypass ? maxChangeNumber : undefined).then(res);
-                        }, _delay);
-                    }) :
-                    mySegmentsSyncTask.execute(_segmentsData, true, cdnBypass ? maxChangeNumber : undefined);
-                syncTask.then(function (result) {
-                    if (!isHandlingEvent)
-                        return; // halt if `stop` has been called
-                    if (result !== false) { // Unlike `Splits|SegmentsUpdateWorker`, `mySegmentsCache.getChangeNumber` can be -1, since `/memberships` change number is optional
-                        var storageChangeNumber = mySegmentsCache.getChangeNumber();
-                        currentChangeNumber = storageChangeNumber > -1 ?
-                            storageChangeNumber :
-                            Math.max(currentChangeNumber, currentMaxChangeNumber_1); // use `currentMaxChangeNumber`, in case that `maxChangeNumber` was updated during fetch.
-                    }
-                    if (handleNewEvent) {
-                        __handleMySegmentsUpdateCall();
-                    }
-                    else {
-                        if (_segmentsData)
-                            telemetryTracker.trackUpdatesFromSSE(constants_1.MEMBERSHIPS);
-                        var attempts = backoff.attempts + 1;
-                        if (maxChangeNumber <= currentChangeNumber) {
-                            log.debug("Refresh completed" + (cdnBypass ? ' bypassing the CDN' : '') + " in " + attempts + " attempts.");
-                            isHandlingEvent = false;
-                            return;
-                        }
-                        if (attempts < constants_2.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;
-                            __handleMySegmentsUpdateCall();
-                        }
-                    }
-                });
-            }
-            else {
-                isHandlingEvent = false;
-            }
-        }
-        return {
-            /**
-             * Invoked by NotificationProcessor on MY_(LARGE)_SEGMENTS_UPDATE notifications
-             *
-             * @param changeNumber change number of the notification
-             * @param segmentsData data for KeyList or SegmentRemoval instant updates
-             * @param delay optional time to wait for BoundedFetchRequest or BoundedFetchRequest updates
-             */
-            put: function (mySegmentsData, payload, delay) {
-                var type = mySegmentsData.type, cn = mySegmentsData.cn;
-                // Discard event if it is outdated or there is a pending fetch request (_delay is set), but update target change number
-                if (cn <= Math.max(currentChangeNumber, mySegmentsCache.getChangeNumber()) || cn <= maxChangeNumber)
-                    return;
-                maxChangeNumber = cn;
-                if (_delay)
-                    return;
-                handleNewEvent = true;
-                cdnBypass = false;
-                _segmentsData = payload && { type: type, cn: cn, added: payload.added, removed: payload.removed };
-                _delay = delay;
-                if (backoff.timeoutID || !isHandlingEvent)
+function MySegmentsUpdateWorker(mySegmentsSyncTask, telemetryTracker) {
+    var maxChangeNumber = 0; // keeps the maximum changeNumber among queued events
+    var currentChangeNumber = -1;
+    var handleNewEvent = false;
+    var isHandlingEvent;
+    var _segmentsData; // keeps the segmentsData (if included in notification payload) from the queued event with maximum changeNumber
+    var backoff = new Backoff_1.Backoff(__handleMySegmentsUpdateCall);
+    function __handleMySegmentsUpdateCall() {
+        isHandlingEvent = true;
+        if (maxChangeNumber > currentChangeNumber) {
+            handleNewEvent = false;
+            var currentMaxChangeNumber_1 = maxChangeNumber;
+            // fetch mySegments revalidating data if cached
+            mySegmentsSyncTask.execute(_segmentsData, true).then(function (result) {
+                if (!isHandlingEvent)
+                    return; // halt if `stop` has been called
+                if (result !== false) { // Unlike `Splits|SegmentsUpdateWorker`, we cannot use `mySegmentsCache.getChangeNumber` since `/mySegments` endpoint doesn't provide this value.
+                    if (_segmentsData)
+                        telemetryTracker.trackUpdatesFromSSE(constants_1.MY_SEGMENT);
+                    currentChangeNumber = Math.max(currentChangeNumber, currentMaxChangeNumber_1); // use `currentMaxChangeNumber`, in case that `maxChangeNumber` was updated during fetch.
+                }
+                if (handleNewEvent) {
                     __handleMySegmentsUpdateCall();
-                backoff.reset();
-            },
-            stop: function () {
-                clearTimeout(_delayTimeoutID);
-                _delay = undefined;
-                isHandlingEvent = false;
-                backoff.reset();
-            }
-        };
+                }
+                else {
+                    backoff.scheduleCall();
+                }
+            });
+        }
+        else {
+            isHandlingEvent = false;
+        }
     }
-    var updateWorkers = (_a = {},
-        _a[constants_3.MEMBERSHIPS_MS_UPDATE] = createUpdateWorker(storage.segments),
-        _a[constants_3.MEMBERSHIPS_LS_UPDATE] = createUpdateWorker(storage.largeSegments),
-        _a);
     return {
-        put: function (mySegmentsData, payload, delay) {
-            updateWorkers[mySegmentsData.type].put(mySegmentsData, payload, delay);
+        /**
+         * Invoked by NotificationProcessor on MY_SEGMENTS_UPDATE event
+         *
+         * @param {number} changeNumber change number of the MY_SEGMENTS_UPDATE notification
+         * @param {SegmentsData | undefined} segmentsData might be undefined
+         */
+        put: function (changeNumber, segmentsData) {
+            if (changeNumber <= currentChangeNumber || changeNumber <= maxChangeNumber)
+                return;
+            maxChangeNumber = changeNumber;
+            handleNewEvent = true;
+            _segmentsData = segmentsData;
+            if (backoff.timeoutID || !isHandlingEvent)
+                __handleMySegmentsUpdateCall();
+            backoff.reset();
         },
         stop: function () {
-            updateWorkers[constants_3.MEMBERSHIPS_MS_UPDATE].stop();
-            updateWorkers[constants_3.MEMBERSHIPS_LS_UPDATE].stop();
+            isHandlingEvent = false;
+            backoff.reset();
         }
     };
 }

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

@@ -16,7 +16,7 @@ function SegmentsUpdateWorker(log, segmentsSyncTask, segmentsCache) {
         var backoff = new Backoff_1.Backoff(__handleSegmentUpdateCall, constants_1.FETCH_BACKOFF_BASE, constants_1.FETCH_BACKOFF_MAX_WAIT);
         function __handleSegmentUpdateCall() {
             isHandlingEvent = true;
-            if (maxChangeNumber > segmentsCache.getChangeNumber(segment)) {
+            if (maxChangeNumber > (segmentsCache.getChangeNumber(segment) || -1)) {
                 handleNewEvent = false;
                 // fetch segments revalidating data if cached
                 segmentsSyncTask.execute(false, segment, true, cdnBypass ? maxChangeNumber : undefined).then(function () {
@@ -27,7 +27,7 @@ function SegmentsUpdateWorker(log, segmentsSyncTask, segmentsCache) {
                     }
                     else {
                         var attempts = backoff.attempts + 1;
-                        if (maxChangeNumber <= segmentsCache.getChangeNumber(segment)) {
+                        if (maxChangeNumber <= (segmentsCache.getChangeNumber(segment) || -1)) {
                             log.debug("Refresh completed" + (cdnBypass ? ' bypassing the CDN' : '') + " in " + attempts + " attempts.");
                             isHandlingEvent = false;
                             return;
@@ -54,7 +54,7 @@ function SegmentsUpdateWorker(log, segmentsSyncTask, segmentsCache) {
         }
         return {
             put: function (changeNumber) {
-                var currentChangeNumber = segmentsCache.getChangeNumber(segment);
+                var currentChangeNumber = segmentsCache.getChangeNumber(segment) || -1;
                 if (changeNumber <= currentChangeNumber || changeNumber <= maxChangeNumber)
                     return;
                 maxChangeNumber = changeNumber;

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.SPLIT_UPDATE = exports.SPLIT_KILL = exports.SEGMENT_UPDATE = exports.MY_SEGMENTS_UPDATE_V2 = exports.MY_SEGMENTS_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
@@ -25,8 +25,8 @@ exports.PUSH_SUBSYSTEM_UP = 'PUSH_SUBSYSTEM_UP';
  */
 exports.PUSH_SUBSYSTEM_DOWN = 'PUSH_SUBSYSTEM_DOWN';
 // Update-type push notifications, handled by NotificationProcessor
-exports.MEMBERSHIPS_MS_UPDATE = 'MEMBERSHIPS_MS_UPDATE';
-exports.MEMBERSHIPS_LS_UPDATE = 'MEMBERSHIPS_LS_UPDATE';
+exports.MY_SEGMENTS_UPDATE = 'MY_SEGMENTS_UPDATE';
+exports.MY_SEGMENTS_UPDATE_V2 = 'MY_SEGMENTS_UPDATE_V2';
 exports.SEGMENT_UPDATE = 'SEGMENT_UPDATE';
 exports.SPLIT_KILL = 'SPLIT_KILL';
 exports.SPLIT_UPDATE = 'SPLIT_UPDATE';

package/cjs/sync/streaming/parseUtils.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDelay = exports.parseFFUpdatePayload = exports.isInBitmap = exports.parseBitmap = exports.parseKeyList = void 0;
+exports.parseFFUpdatePayload = exports.isInBitmap = exports.parseBitmap = exports.parseKeyList = void 0;
 var decompress_1 = require("../../utils/decompress");
 var base64_1 = require("../../utils/base64");
-var murmur3_1 = require("../../utils/murmur3/murmur3");
 var GZIP = 1;
 var ZLIB = 2;
 function Uint8ArrayToString(myUint8Arr) {
@@ -81,19 +80,15 @@ function isInBitmap(bitmap, hash64hex) {
 exports.isInBitmap = isInBitmap;
 /**
  * Parse feature flags notifications for instant feature flag updates
+ *
+ * @param {ISplitUpdateData} data
+ * @returns {KeyList}
  */
 function parseFFUpdatePayload(compression, data) {
-    return compression > 0 ?
-        parseKeyList(data, compression, false) :
-        JSON.parse((0, base64_1.decodeFromBase64)(data));
+    var avoidPrecisionLoss = false;
+    if (compression > 0)
+        return parseKeyList(data, compression, avoidPrecisionLoss);
+    else
+        return JSON.parse((0, base64_1.decodeFromBase64)(data));
 }
 exports.parseFFUpdatePayload = parseFFUpdatePayload;
-var DEFAULT_MAX_INTERVAL = 60000;
-function getDelay(parsedData, matchingKey) {
-    if (parsedData.h === 0)
-        return 0;
-    var interval = parsedData.i || DEFAULT_MAX_INTERVAL;
-    var seed = parsedData.s || 0;
-    return (0, murmur3_1.hash)(matchingKey, seed) % interval;
-}
-exports.getDelay = getDelay;

package/cjs/sync/streaming/pushManager.js

@@ -48,10 +48,10 @@ function pushManagerFactory(params, pollingManager) {
     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);
-    // [Only for client-side] map of hashes to user keys, to dispatch membership update events to the corresponding MySegmentsUpdateWorker
+    // [Only for client-side] map of hashes to user keys, to dispatch MY_SEGMENTS_UPDATE events to the corresponding MySegmentsUpdateWorker
     var userKeyHashes = {};
     // [Only for client-side] map of user keys to their corresponding hash64 and MySegmentsUpdateWorkers.
-    // Hash64 is used to process membership update events and dispatch actions to the corresponding MySegmentsUpdateWorker.
+    // Hash64 is used to process MY_SEGMENTS_UPDATE_V2 events and dispatch actions to the corresponding MySegmentsUpdateWorker.
     var clients = {};
     // [Only for client-side] variable to flag that a new client was added. It is needed to reconnect streaming.
     var connectForNewClient = false;
@@ -198,76 +198,77 @@ function pushManagerFactory(params, pollingManager) {
         }
         splitsUpdateWorker.put(parsedData);
     });
-    function handleMySegmentsUpdate(parsedData) {
-        switch (parsedData.u) {
-            case types_1.UpdateStrategy.BoundedFetchRequest: {
-                var bitmap_1;
-                try {
-                    bitmap_1 = (0, parseUtils_1.parseBitmap)(parsedData.d, parsedData.c);
-                }
-                catch (e) {
-                    log.warn(constants_2.STREAMING_PARSING_MEMBERSHIPS_UPDATE, ['BoundedFetchRequest', e]);
-                    break;
-                }
-                (0, lang_1.forOwn)(clients, function (_a, matchingKey) {
-                    var hash64 = _a.hash64, worker = _a.worker;
-                    if ((0, parseUtils_1.isInBitmap)(bitmap_1, hash64.hex)) {
-                        worker.put(parsedData, undefined, (0, parseUtils_1.getDelay)(parsedData, matchingKey));
-                    }
-                });
-                return;
+    if (userKey) {
+        pushEmitter.on(constants_1.MY_SEGMENTS_UPDATE, function handleMySegmentsUpdate(parsedData, channel) {
+            var userKeyHash = channel.split('_')[2];
+            var userKey = userKeyHashes[userKeyHash];
+            if (userKey && clients[userKey]) { // check existence since it can be undefined if client has been destroyed
+                clients[userKey].worker.put(parsedData.changeNumber, parsedData.includesPayload ? parsedData.segmentList ? parsedData.segmentList : [] : undefined);
             }
-            case types_1.UpdateStrategy.KeyList: {
-                var keyList = void 0, added_1, removed_1;
-                try {
-                    keyList = (0, parseUtils_1.parseKeyList)(parsedData.d, parsedData.c);
-                    added_1 = new sets_1._Set(keyList.a);
-                    removed_1 = new sets_1._Set(keyList.r);
-                }
-                catch (e) {
-                    log.warn(constants_2.STREAMING_PARSING_MEMBERSHIPS_UPDATE, ['KeyList', e]);
-                    break;
-                }
-                if (!parsedData.n || !parsedData.n.length) {
-                    log.warn(constants_2.STREAMING_PARSING_MEMBERSHIPS_UPDATE, ['KeyList', 'No segment name was provided']);
-                    break;
+        });
+        pushEmitter.on(constants_1.MY_SEGMENTS_UPDATE_V2, function handleMySegmentsUpdate(parsedData) {
+            switch (parsedData.u) {
+                case types_1.UpdateStrategy.BoundedFetchRequest: {
+                    var bitmap_1;
+                    try {
+                        bitmap_1 = (0, parseUtils_1.parseBitmap)(parsedData.d, parsedData.c);
+                    }
+                    catch (e) {
+                        log.warn(constants_2.STREAMING_PARSING_MY_SEGMENTS_UPDATE_V2, ['BoundedFetchRequest', e]);
+                        break;
+                    }
+                    (0, lang_1.forOwn)(clients, function (_a) {
+                        var hash64 = _a.hash64, worker = _a.worker;
+                        if ((0, parseUtils_1.isInBitmap)(bitmap_1, hash64.hex)) {
+                            worker.put(parsedData.changeNumber); // fetch mySegments
+                        }
+                    });
+                    return;
                 }
-                (0, lang_1.forOwn)(clients, function (_a) {
-                    var hash64 = _a.hash64, worker = _a.worker;
-                    var add = added_1.has(hash64.dec) ? true : removed_1.has(hash64.dec) ? false : undefined;
-                    if (add !== undefined) {
-                        worker.put(parsedData, {
-                            added: add ? [parsedData.n[0]] : [],
-                            removed: add ? [] : [parsedData.n[0]]
-                        });
+                case types_1.UpdateStrategy.KeyList: {
+                    var keyList = void 0, added_1, removed_1;
+                    try {
+                        keyList = (0, parseUtils_1.parseKeyList)(parsedData.d, parsedData.c);
+                        added_1 = new sets_1._Set(keyList.a);
+                        removed_1 = new sets_1._Set(keyList.r);
                     }
-                });
-                return;
-            }
-            case types_1.UpdateStrategy.SegmentRemoval:
-                if (!parsedData.n || !parsedData.n.length) {
-                    log.warn(constants_2.STREAMING_PARSING_MEMBERSHIPS_UPDATE, ['SegmentRemoval', 'No segment name was provided']);
-                    break;
+                    catch (e) {
+                        log.warn(constants_2.STREAMING_PARSING_MY_SEGMENTS_UPDATE_V2, ['KeyList', e]);
+                        break;
+                    }
+                    (0, lang_1.forOwn)(clients, function (_a) {
+                        var hash64 = _a.hash64, worker = _a.worker;
+                        var add = added_1.has(hash64.dec) ? true : removed_1.has(hash64.dec) ? false : undefined;
+                        if (add !== undefined) {
+                            worker.put(parsedData.changeNumber, {
+                                name: parsedData.segmentName,
+                                add: add
+                            });
+                        }
+                    });
+                    return;
                 }
-                (0, lang_1.forOwn)(clients, function (_a) {
-                    var worker = _a.worker;
-                    worker.put(parsedData, {
-                        added: [],
-                        removed: parsedData.n
+                case types_1.UpdateStrategy.SegmentRemoval:
+                    if (!parsedData.segmentName) {
+                        log.warn(constants_2.STREAMING_PARSING_MY_SEGMENTS_UPDATE_V2, ['SegmentRemoval', 'No segment name was provided']);
+                        break;
+                    }
+                    (0, lang_1.forOwn)(clients, function (_a) {
+                        var worker = _a.worker;
+                        return worker.put(parsedData.changeNumber, {
+                            name: parsedData.segmentName,
+                            add: false
+                        });
                     });
-                });
-                return;
-        }
-        // `UpdateStrategy.UnboundedFetchRequest` and fallbacks of other cases
-        (0, lang_1.forOwn)(clients, function (_a, matchingKey) {
-            var worker = _a.worker;
-            worker.put(parsedData, undefined, (0, parseUtils_1.getDelay)(parsedData, matchingKey));
+                    return;
+            }
+            // `UpdateStrategy.UnboundedFetchRequest` and fallbacks of other cases
+            (0, lang_1.forOwn)(clients, function (_a) {
+                var worker = _a.worker;
+                worker.put(parsedData.changeNumber);
+            });
         });
     }
-    if (userKey) {
-        pushEmitter.on(constants_1.MEMBERSHIPS_MS_UPDATE, handleMySegmentsUpdate);
-        pushEmitter.on(constants_1.MEMBERSHIPS_LS_UPDATE, handleMySegmentsUpdate);
-    }
     else {
         pushEmitter.on(constants_1.SEGMENT_UPDATE, segmentsUpdateWorker.put);
     }
@@ -302,10 +303,7 @@ function pushManagerFactory(params, pollingManager) {
             var hash = (0, AuthClient_1.hashUserKey)(userKey);
             if (!userKeyHashes[hash]) {
                 userKeyHashes[hash] = userKey;
-                clients[userKey] = {
-                    hash64: (0, murmur3_64_1.hash64)(userKey),
-                    worker: (0, MySegmentsUpdateWorker_1.MySegmentsUpdateWorker)(log, storage, mySegmentsSyncTask, telemetryTracker)
-                };
+                clients[userKey] = { hash64: (0, murmur3_64_1.hash64)(userKey), worker: (0, MySegmentsUpdateWorker_1.MySegmentsUpdateWorker)(mySegmentsSyncTask, telemetryTracker) };
                 connectForNewClient = true; // we must reconnect on start, to listen the channel for the new user key
                 // Reconnects in case of a new client.
                 // Run in next event-loop cycle to save authentication calls

package/cjs/sync/syncTask.js

@@ -69,8 +69,8 @@ function syncTaskFactory(log, task, period, taskName) {
             }
         },
         stop: function () {
-            running = false;
-            if (timeoutID) {
+            if (running) {
+                running = false;
                 log.debug(constants_1.SYNC_TASK_STOP, [taskName]);
                 clearTimeout(timeoutID);
                 timeoutID = undefined;

package/cjs/trackers/eventTracker.js

@@ -12,7 +12,7 @@ var mode_1 = require("../utils/settingsValidation/mode");
  * @param eventsCache cache to save events
  * @param integrationsManager optional event handler used for integrations
  */
-function eventTrackerFactory(settings, eventsCache, whenInit, integrationsManager, telemetryCache) {
+function eventTrackerFactory(settings, eventsCache, integrationsManager, telemetryCache) {
     var log = settings.log, mode = settings.mode;
     var isAsync = (0, mode_1.isConsumerMode)(mode);
     function queueEventsCallback(eventData, tracked) {
@@ -23,16 +23,14 @@ function eventTrackerFactory(settings, eventsCache, whenInit, integrationsManage
             log.info(constants_1.EVENTS_TRACKER_SUCCESS, [msg]);
             if (integrationsManager) {
                 // Wrap in a timeout because we don't want it to be blocking.
-                whenInit(function () {
-                    setTimeout(function () {
-                        // copy of event, to avoid unexpected behaviour if modified by integrations
-                        var eventDataCopy = (0, objectAssign_1.objectAssign)({}, eventData);
-                        if (properties)
-                            eventDataCopy.properties = (0, objectAssign_1.objectAssign)({}, properties);
-                        // integrationsManager does not throw errors (they are internally handled by each integration module)
-                        integrationsManager.handleEvent(eventDataCopy);
-                    });
-                });
+                setTimeout(function () {
+                    // copy of event, to avoid unexpected behaviour if modified by integrations
+                    var eventDataCopy = (0, objectAssign_1.objectAssign)({}, eventData);
+                    if (properties)
+                        eventDataCopy.properties = (0, objectAssign_1.objectAssign)({}, properties);
+                    // integrationsManager does not throw errors (they are internally handled by each integration module)
+                    integrationsManager.handleEvent(eventDataCopy);
+                }, 0);
             }
         }
         else {