@splitsoftware/splitio-commons 1.1.1-rc.0 → 1.2.1-rc.2

package/cjs/utils/promise/timeout.js

@@ -6,7 +6,7 @@ function timeout(ms, promise) {
         return promise;
     return new Promise(function (resolve, reject) {
         var tid = setTimeout(function () {
-            reject(new Error("Operation timed out because it exceeded the configured time limit of " + ms + "ms."));
+            reject(new Error("Operation timed out because it exceeded the configured time limit of " + ms + " ms."));
         }, ms);
         promise.then(function (res) {
             clearTimeout(tid);

package/cjs/utils/settingsValidation/index.js

@@ -67,10 +67,6 @@ var base = {
         impressionsMode: constants_1.OPTIMIZED,
         localhostMode: undefined
     },
-    runtime: {
-        ip: false,
-        hostname: false
-    },
     // Logger
     log: undefined
 };
@@ -87,7 +83,7 @@ function fromSecondsToMillis(n) {
 function settingsValidation(config, validationParams) {
     var defaults = validationParams.defaults, runtime = validationParams.runtime, storage = validationParams.storage, integrations = validationParams.integrations, logger = validationParams.logger, localhost = validationParams.localhost;
     // creates a settings object merging base, defaults and config objects.
-    var withDefaults = lang_1.merge({}, base, defaults, config);
+    var withDefaults = (0, lang_1.merge)({}, base, defaults, config);
     // ensure a valid logger.
     // First thing to validate, since other validators might use the logger.
     var log = logger(withDefaults); // @ts-ignore, modify readonly prop
@@ -106,7 +102,7 @@ function settingsValidation(config, validationParams) {
     startup.eventsFirstPushWindow = fromSecondsToMillis(startup.eventsFirstPushWindow);
     // ensure a valid SDK mode
     // @ts-ignore, modify readonly prop
-    withDefaults.mode = mode_1.mode(withDefaults.core.authorizationKey, withDefaults.mode);
+    withDefaults.mode = (0, mode_1.mode)(withDefaults.core.authorizationKey, withDefaults.mode);
     // ensure a valid Storage based on mode defined.
     // @ts-ignore, modify readonly prop
     if (storage)
@@ -117,8 +113,7 @@ function settingsValidation(config, validationParams) {
     }
     // Current ip/hostname information
     // @ts-ignore, modify readonly prop
-    if (runtime)
-        withDefaults.runtime = runtime(withDefaults);
+    withDefaults.runtime = runtime(withDefaults);
     // ensure a valid list of integrations.
     // `integrations` returns an array of valid integration items.
     // @ts-ignore, modify readonly prop
@@ -134,11 +129,11 @@ function settingsValidation(config, validationParams) {
         scheduler.pushRetryBackoffBase = fromSecondsToMillis(scheduler.pushRetryBackoffBase);
     }
     // validate the `splitFilters` settings and parse splits query
-    var splitFiltersValidation = splitFilters_1.validateSplitFilters(log, withDefaults.sync.splitFilters, withDefaults.mode);
+    var splitFiltersValidation = (0, splitFilters_1.validateSplitFilters)(log, withDefaults.sync.splitFilters, withDefaults.mode);
     withDefaults.sync.splitFilters = splitFiltersValidation.validFilters;
     withDefaults.sync.__splitFiltersValidation = splitFiltersValidation;
     // ensure a valid impressionsMode
-    withDefaults.sync.impressionsMode = impressionsMode_1.validImpressionsMode(log, withDefaults.sync.impressionsMode);
+    withDefaults.sync.impressionsMode = (0, impressionsMode_1.validImpressionsMode)(log, withDefaults.sync.impressionsMode);
     return withDefaults;
 }
 exports.settingsValidation = settingsValidation;

package/cjs/utils/settingsValidation/integrations/configurable.js

@@ -13,6 +13,6 @@ var lang_1 = require("../../lang");
  */
 function validateConfigurableIntegrations(settings, validIntegrationTypes) {
     if (validIntegrationTypes === void 0) { validIntegrationTypes = []; }
-    return common_1.validateIntegrations(settings, function (integration) { return integration && lang_1.isString(integration.type) && validIntegrationTypes.indexOf(integration.type) > -1; }, 'Integration items must have a valid "type" value');
+    return (0, common_1.validateIntegrations)(settings, function (integration) { return integration && (0, lang_1.isString)(integration.type) && validIntegrationTypes.indexOf(integration.type) > -1; }, 'Integration items must have a valid "type" value');
 }
 exports.validateConfigurableIntegrations = validateConfigurableIntegrations;

package/cjs/utils/settingsValidation/integrations/pluggable.js

@@ -10,6 +10,6 @@ var common_1 = require("./common");
  * @returns {Array} array of valid integration factories. The array might be empty if `settings` object does not have valid integrations.
  */
 function validatePluggableIntegrations(settings) {
-    return common_1.validateIntegrations(settings, function (integration) { return typeof integration === 'function'; }, 'Integration items must be functions that initialize the integrations');
+    return (0, common_1.validateIntegrations)(settings, function (integration) { return typeof integration === 'function'; }, 'Integration items must be functions that initialize the integrations');
 }
 exports.validatePluggableIntegrations = validatePluggableIntegrations;

package/cjs/utils/settingsValidation/localhost/builtin.js

@@ -12,7 +12,7 @@ var pluggable_1 = require("./pluggable");
  */
 function validateLocalhostWithDefault(settings) {
     if (!settings.sync.localhostMode)
-        return LocalhostFromObject_1.LocalhostFromObject();
-    return pluggable_1.validateLocalhost(settings) || LocalhostFromObject_1.LocalhostFromObject();
+        return (0, LocalhostFromObject_1.LocalhostFromObject)();
+    return (0, pluggable_1.validateLocalhost)(settings) || (0, LocalhostFromObject_1.LocalhostFromObject)();
 }
 exports.validateLocalhostWithDefault = validateLocalhostWithDefault;

package/cjs/utils/settingsValidation/logger/builtinLogger.js

@@ -19,14 +19,14 @@ var ENV_VAR_KEY = 'SPLITIO_DEBUG';
  */
 var initialState = String(
 // eslint-disable-next-line no-undef
-isNode_1.isNode ? process.env[ENV_VAR_KEY] : isLocalStorageAvailable_1.isLocalStorageAvailable() ? localStorage.getItem(LS_KEY) : '');
+isNode_1.isNode ? process.env[ENV_VAR_KEY] : (0, isLocalStorageAvailable_1.isLocalStorageAvailable)() ? localStorage.getItem(LS_KEY) : '');
 // By default it starts disabled.
 var initialLogLevel = logger_1.LogLevels.NONE;
 // Kept to avoid a breaking change ('on', 'enable' and 'enabled' are equivalent)
 if (/^(enabled?|on)/i.test(initialState)) {
     initialLogLevel = logger_1.LogLevels.DEBUG;
 }
-else if (logger_1.isLogLevelString(initialState)) {
+else if ((0, logger_1.isLogLevelString)(initialState)) {
     initialLogLevel = initialState;
 }
 /**
@@ -37,7 +37,7 @@ else if (logger_1.isLogLevelString(initialState)) {
  */
 function validateLogger(settings) {
     var debug = settings.debug;
-    var logLevel = debug !== undefined ? commons_1.getLogLevel(debug) : initialLogLevel;
+    var logLevel = debug !== undefined ? (0, commons_1.getLogLevel)(debug) : initialLogLevel;
     var log = new logger_1.Logger({ logLevel: logLevel || initialLogLevel }, allCodes);
     // @ts-ignore // if logLevel is undefined at this point, it means that settings `debug` value is invalid
     if (!logLevel)

package/cjs/utils/settingsValidation/logger/commons.js

@@ -18,7 +18,7 @@ function getLogLevel(debugValue) {
             return logger_1.LogLevels.NONE;
         }
     }
-    else if (typeof debugValue === 'string' && logger_1.isLogLevelString(debugValue)) {
+    else if (typeof debugValue === 'string' && (0, logger_1.isLogLevelString)(debugValue)) {
         return debugValue;
     }
     else {

package/cjs/utils/settingsValidation/logger/pluggableLogger.js

@@ -21,7 +21,7 @@ function validateLogger(settings) {
     if (debug !== undefined) {
         if (isLogger(debug))
             return debug;
-        logLevel = commons_1.getLogLevel(settings.debug);
+        logLevel = (0, commons_1.getLogLevel)(settings.debug);
     }
     var log = new logger_1.Logger({ logLevel: logLevel || initialLogLevel });
     // @ts-ignore // `debug` value is invalid if logLevel is undefined at this point

package/cjs/utils/settingsValidation/runtime/browser.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateRuntime = void 0;
+function validateRuntime() {
+    return {
+        ip: false,
+        hostname: false
+    };
+}
+exports.validateRuntime = validateRuntime;

package/cjs/utils/settingsValidation/runtime/node.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateRuntime = void 0;
+var tslib_1 = require("tslib");
+var os_1 = (0, tslib_1.__importDefault)(require("os"));
+var ip_1 = (0, tslib_1.__importDefault)(require("ip"));
+var constants_1 = require("../../constants");
+function validateRuntime(settings) {
+    var isIPAddressesEnabled = settings.core.IPAddressesEnabled === true;
+    var isConsumerMode = settings.mode === constants_1.CONSUMER_MODE;
+    // If the values are not available, default to false (for standalone) or "unknown" (for consumer mode, to be used on Redis keys)
+    var ip = ip_1.default.address() || (isConsumerMode ? constants_1.UNKNOWN : false);
+    var hostname = os_1.default.hostname() || (isConsumerMode ? constants_1.UNKNOWN : false);
+    if (!isIPAddressesEnabled) { // If IPAddresses setting is not enabled, set as false (for standalone) or "NA" (for consumer mode, to  be used on Redis keys)
+        ip = hostname = isConsumerMode ? constants_1.NA : false;
+    }
+    return {
+        ip: ip,
+        hostname: hostname
+    };
+}
+exports.validateRuntime = validateRuntime;

package/cjs/utils/settingsValidation/splitFilters.js

@@ -36,7 +36,7 @@ function validateFilterType(maybeFilterType) {
  */
 function validateSplitFilter(log, type, values, maxLength) {
     // validate and remove invalid and duplicated values
-    var result = splits_1.validateSplits(log, values, constants_2.LOG_PREFIX_SETTINGS, type + " filter", type + " filter value");
+    var result = (0, splits_1.validateSplits)(log, values, constants_2.LOG_PREFIX_SETTINGS, type + " filter", type + " filter value");
     if (result) {
         // check max length
         if (result.length > maxLength)

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

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

package/cjs/utils/timeTracker/index.js

@@ -125,12 +125,12 @@ exports.TrackerAPI = {
      * @return {Function | Promise} The stop function for this specific task or the promise received with the callbacks registered.
      */
     start: function (log, task, collectors, promise, now) {
-        var taskUniqueId = lang_1.uniqueId();
+        var taskUniqueId = (0, lang_1.uniqueId)();
         var taskCollector = getCollectorForTask(task, collectors);
         var result;
         // If we are registering a promise with this task, we should count the status and the exceptions as well
         // as stopping the task when the promise resolves. Then return the promise
-        if (thenable_1.thenable(promise)) {
+        if ((0, thenable_1.thenable)(promise)) {
             result = this.__attachToPromise(log, promise, task, taskCollector, taskUniqueId);
         }
         else {
@@ -147,7 +147,7 @@ exports.TrackerAPI = {
         var cb = getCallbackForTask(task, taskCollector);
         timers[trackingKey] = {
             cb: cb,
-            timer: timer_1.timer(now)
+            timer: (0, timer_1.timer)(now)
         };
         return result;
     },

package/esm/evaluator/matchers/ew.js

@@ -1,9 +1,9 @@
 import { ENGINE_MATCHER_ENDS_WITH } from '../../logger/constants';
-import { endsWith as strEndsWith } from '../../utils/lang';
+import { endsWith } from '../../utils/lang';
 export function endsWithMatcherContext(log, ruleAttr) {
     return function endsWithMatcher(runtimeAttr) {
-        var endsWith = ruleAttr.some(function (e) { return strEndsWith(runtimeAttr, e); });
-        log.debug(ENGINE_MATCHER_ENDS_WITH, [runtimeAttr, ruleAttr, endsWith]);
-        return endsWith;
+        var strEndsWith = ruleAttr.some(function (e) { return endsWith(runtimeAttr, e); });
+        log.debug(ENGINE_MATCHER_ENDS_WITH, [runtimeAttr, ruleAttr, strEndsWith]);
+        return strEndsWith;
     };
 }

package/esm/logger/messages/info.js

@@ -20,10 +20,10 @@ export var codesInfo = codesWarn.concat([
     [c.SUBMITTERS_PUSH_FULL_EVENTS_QUEUE, c.LOG_PREFIX_SYNC_SUBMITTERS + 'Flushing full events queue and reseting timer.'],
     [c.SUBMITTERS_PUSH, c.LOG_PREFIX_SYNC_SUBMITTERS + 'Pushing %s %s.'],
     [c.STREAMING_REFRESH_TOKEN, c.LOG_PREFIX_SYNC_STREAMING + 'Refreshing streaming token in %s seconds, and connecting streaming in %s seconds.'],
-    [c.STREAMING_RECONNECT, c.LOG_PREFIX_SYNC_STREAMING + 'Attempting to reconnect in %s seconds.'],
-    [c.STREAMING_CONNECTING, c.LOG_PREFIX_SYNC_STREAMING + 'Connecting to streaming.'],
+    [c.STREAMING_RECONNECT, c.LOG_PREFIX_SYNC_STREAMING + 'Attempting to reconnect streaming in %s seconds.'],
+    [c.STREAMING_CONNECTING, c.LOG_PREFIX_SYNC_STREAMING + 'Connecting streaming.'],
     [c.STREAMING_DISABLED, c.LOG_PREFIX_SYNC_STREAMING + 'Streaming is disabled for given Api key. Switching to polling mode.'],
-    [c.STREAMING_DISCONNECTING, c.LOG_PREFIX_SYNC_STREAMING + 'Disconnecting from streaming.'],
+    [c.STREAMING_DISCONNECTING, c.LOG_PREFIX_SYNC_STREAMING + 'Disconnecting streaming.'],
     [c.SYNC_START_POLLING, c.LOG_PREFIX_SYNC_MANAGER + 'Streaming not available. Starting polling.'],
     [c.SYNC_CONTINUE_POLLING, c.LOG_PREFIX_SYNC_MANAGER + 'Streaming couldn\'t connect. Continue polling.'],
     [c.SYNC_STOP_POLLING, c.LOG_PREFIX_SYNC_MANAGER + 'Streaming (re)connected. Syncing and stopping polling.'],

package/esm/sdkClient/client.js

@@ -95,6 +95,7 @@ export function clientFactory(params) {
         getTreatmentWithConfig: getTreatmentWithConfig,
         getTreatments: getTreatments,
         getTreatmentsWithConfig: getTreatmentsWithConfig,
-        track: track
+        track: track,
+        isBrowserClient: false
     };
 }

package/esm/sdkClient/clientCS.js

@@ -16,6 +16,7 @@ export function clientCSDecorator(log, client, key, trafficType) {
         getTreatments: clientCS.getTreatments.bind(clientCS, key),
         getTreatmentsWithConfig: clientCS.getTreatmentsWithConfig.bind(clientCS, key),
         // Key is bound to the `track` method. Same thing happens with trafficType but only if provided
-        track: trafficType ? clientCS.track.bind(clientCS, key, trafficType) : clientCS.track.bind(clientCS, key)
+        track: trafficType ? clientCS.track.bind(clientCS, key, trafficType) : clientCS.track.bind(clientCS, key),
+        isBrowserClient: true
     });
 }

package/esm/services/splitApi.js

@@ -72,7 +72,8 @@ export function splitApiFactory(settings, platform) {
             return splitHttpClient(url, {
                 // Adding extra headers to send impressions in OPTIMIZED or DEBUG modes.
                 method: 'POST',
-                body: body, headers: objectAssign({ SplitSDKImpressionsMode: SplitSDKImpressionsMode }, headers)
+                body: body,
+                headers: objectAssign({ SplitSDKImpressionsMode: SplitSDKImpressionsMode }, headers)
             });
         },
         /**

package/esm/services/splitHttpClient.js

@@ -43,7 +43,7 @@ export function splitHttpClientFactory(settings, getFetch, getOptions) {
             return response;
         })
             .catch(function (error) {
-            var resp = error.response;
+            var resp = error && error.response;
             var msg = '';
             if (resp) { // An HTTP error
                 switch (resp.status) {

package/esm/storages/inRedis/RedisAdapter.js

@@ -151,7 +151,13 @@ var RedisAdapter = /** @class */ (function (_super) {
     RedisAdapter._defineOptions = function (_a) {
         var connectionTimeout = _a.connectionTimeout, operationTimeout = _a.operationTimeout, url = _a.url, host = _a.host, port = _a.port, db = _a.db, pass = _a.pass;
         var parsedOptions = {
-            connectionTimeout: connectionTimeout, operationTimeout: operationTimeout, url: url, host: host, port: port, db: db, pass: pass
+            connectionTimeout: connectionTimeout,
+            operationTimeout: operationTimeout,
+            url: url,
+            host: host,
+            port: port,
+            db: db,
+            pass: pass
         };
         return merge({}, DEFAULT_OPTIONS, parsedOptions);
     };

package/esm/sync/offline/splitsParser/splitsParserFromFile.js

@@ -62,7 +62,7 @@ export function splitsParserFromFileFactory() {
             data = fs.readFileSync(filePath, 'utf-8');
         }
         catch (e) {
-            log.error(e.message);
+            log.error(e && e.message);
             return {};
         }
         if (data === previousMock)

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

@@ -2,8 +2,8 @@
  * Factory of MySegments fetcher.
  * MySegments fetcher is a wrapper around `mySegments` API service that parses the response and handle errors.
  */
-export function mySegmentsFetcherFactory(fetchMySegments, userMatchingKey) {
-    return function mySegmentsFetcher(noCache, 
+export function mySegmentsFetcherFactory(fetchMySegments) {
+    return function mySegmentsFetcher(userMatchingKey, noCache, 
     // Optional decorator for `fetchMySegments` promise, such as timeout or time tracker
     decorator) {
         var mySegmentsPromise = fetchMySegments(userMatchingKey, noCache);

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

@@ -1,4 +1,4 @@
-import { __spreadArrays } from "tslib";
+import { __spreadArray } from "tslib";
 function greedyFetch(fetchSegmentChanges, since, segmentName, noCache) {
     return fetchSegmentChanges(since, segmentName, noCache)
         .then(function (resp) { return resp.json(); })
@@ -9,7 +9,7 @@ function greedyFetch(fetchSegmentChanges, since, segmentName, noCache) {
         }
         else {
             return Promise.all([json, greedyFetch(fetchSegmentChanges, till, segmentName, noCache)]).then(function (flatMe) {
-                return __spreadArrays([flatMe[0]], flatMe[1]);
+                return __spreadArray([flatMe[0]], flatMe[1], true);
             });
         }
     });

package/esm/sync/polling/pollingManagerCS.js

@@ -8,7 +8,8 @@ import { POLLING_SMART_PAUSING, POLLING_START, POLLING_STOP } from '../../logger
  * Expose start / stop mechanism for polling data from services.
  * For client-side API with multiple clients.
  */
-export function pollingManagerCSFactory(splitApi, storage, readiness, settings) {
+export function pollingManagerCSFactory(params) {
+    var splitApi = params.splitApi, storage = params.storage, readiness = params.readiness, settings = params.settings;
     var log = settings.log;
     var splitsSyncTask = splitsSyncTaskFactory(splitApi.fetchSplitChanges, storage, readiness, settings);
     // Map of matching keys to their corresponding MySegmentsSyncTask.

package/esm/sync/polling/pollingManagerSS.js

@@ -5,7 +5,8 @@ import { POLLING_START, POLLING_STOP, LOG_PREFIX_SYNC_POLLING } from '../../logg
 /**
  * Expose start / stop mechanism for pulling data from services.
  */
-export function pollingManagerSSFactory(splitApi, storage, readiness, settings) {
+export function pollingManagerSSFactory(params) {
+    var splitApi = params.splitApi, storage = params.storage, readiness = params.readiness, settings = params.settings;
     var log = settings.log;
     var splitsSyncTask = splitsSyncTaskFactory(splitApi.fetchSplitChanges, storage, readiness, settings);
     var segmentsSyncTask = segmentsSyncTaskFactory(splitApi.fetchSegmentChanges, storage, readiness, settings);

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

@@ -5,5 +5,5 @@ import { mySegmentsUpdaterFactory } from '../updaters/mySegmentsUpdater';
  * Creates a sync task that periodically executes a `mySegmentsUpdater` task
  */
 export function mySegmentsSyncTaskFactory(fetchMySegments, storage, readiness, settings, matchingKey) {
-    return syncTaskFactory(settings.log, mySegmentsUpdaterFactory(settings.log, mySegmentsFetcherFactory(fetchMySegments, matchingKey), storage.splits, storage.segments, readiness.segments, settings.startup.requestTimeoutBeforeReady, settings.startup.retriesOnFailureBeforeReady), settings.scheduler.segmentsRefreshRate, 'mySegmentsUpdater');
+    return syncTaskFactory(settings.log, mySegmentsUpdaterFactory(settings.log, mySegmentsFetcherFactory(fetchMySegments), storage.splits, storage.segments, readiness.segments, settings.startup.requestTimeoutBeforeReady, settings.startup.retriesOnFailureBeforeReady, matchingKey), settings.scheduler.segmentsRefreshRate, 'mySegmentsUpdater');
 }

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

@@ -7,7 +7,7 @@ import { SYNC_MYSEGMENTS_FETCH_RETRY } from '../../../logger/constants';
  *  - updates `mySegmentsCache`
  *  - uses `segmentsEventEmitter` to emit events related to segments data updates
  */
-export function mySegmentsUpdaterFactory(log, mySegmentsFetcher, splitsCache, mySegmentsCache, segmentsEventEmitter, requestTimeoutBeforeReady, retriesOnFailureBeforeReady) {
+export function mySegmentsUpdaterFactory(log, mySegmentsFetcher, splitsCache, mySegmentsCache, segmentsEventEmitter, requestTimeoutBeforeReady, retriesOnFailureBeforeReady, matchingKey) {
     var readyOnAlreadyExistentState = true;
     var startingUp = true;
     /** timeout and telemetry decorator for `splitChangesFetcher` promise  */
@@ -51,7 +51,7 @@ export function mySegmentsUpdaterFactory(log, mySegmentsFetcher, splitsCache, my
             // 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(noCache, _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);

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

@@ -13,8 +13,7 @@ export function authenticateFactory(fetchAuth) {
      * @param {string[] | undefined} userKeys set of user Keys to track MY_SEGMENTS_CHANGES. It is undefined for server-side API.
      */
     return function authenticate(userKeys) {
-        var authPromise = fetchAuth(userKeys); // errors handled by fetchAuth service
-        return authPromise
+        return fetchAuth(userKeys)
             .then(function (resp) { return resp.json(); })
             .then(function (json) {
             if (json.token) { // empty token when `"pushEnabled": false`

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

@@ -7,7 +7,7 @@ var SegmentsUpdateWorker = /** @class */ (function () {
      * @param {Object} segmentsCache segments data cache
      * @param {Object} segmentsSyncTask task for syncing segments data
      */
-    function SegmentsUpdateWorker(segmentsCache, segmentsSyncTask) {
+    function SegmentsUpdateWorker(segmentsSyncTask, segmentsCache) {
         this.segmentsCache = segmentsCache;
         this.segmentsSyncTask = segmentsSyncTask;
         this.maxChangeNumbers = {};

package/esm/sync/streaming/pushManager.js

@@ -19,10 +19,11 @@ import { hash64 } from '../../utils/murmur3/murmur3_64';
  * - for server-side if key is not provided in settings.
  * - for client-side, with support for multiple clients, if key is provided in settings
  */
-export function pushManagerFactory(pollingManager, storage, readiness, fetchAuth, platform, settings) {
+export function pushManagerFactory(params, pollingManager) {
+    var settings = params.settings, storage = params.storage, splitApi = params.splitApi, readiness = params.readiness, platform = params.platform;
     // `userKey` is the matching key of main client in client-side SDK.
     // It can be used to check if running on client-side or server-side SDK.
-    var userKey = settings.core.key ? getMatching(settings.core.key) : undefined; //
+    var userKey = settings.core.key ? getMatching(settings.core.key) : undefined;
     var log = settings.log;
     var sseClient;
     try {
@@ -33,13 +34,14 @@ export function pushManagerFactory(pollingManager, storage, readiness, fetchAuth
         log.warn(STREAMING_FALLBACK, [e]);
         return;
     }
-    var authenticate = authenticateFactory(fetchAuth);
+    var authenticate = authenticateFactory(splitApi.fetchAuth);
     // init feedback loop
     var pushEmitter = new platform.EventEmitter();
     var sseHandler = SSEHandlerFactory(log, pushEmitter);
     sseClient.setEventHandler(sseHandler);
     // init workers
-    var segmentsUpdateWorker = userKey ? new MySegmentsUpdateWorker(pollingManager.segmentsSyncTask) : new SegmentsUpdateWorker(storage.segments, pollingManager.segmentsSyncTask);
+    // MySegmentsUpdateWorker (client-side) are initiated in `add` method
+    var segmentsUpdateWorker = userKey ? undefined : new SegmentsUpdateWorker(pollingManager.segmentsSyncTask, storage.segments);
     // For server-side we pass the segmentsSyncTask, used by SplitsUpdateWorker to fetch new segments
     var splitsUpdateWorker = new SplitsUpdateWorker(storage.splits, pollingManager.splitsSyncTask, readiness.splits, userKey ? undefined : pollingManager.segmentsSyncTask);
     // [Only for client-side] map of hashes to user keys, to dispatch MY_SEGMENTS_UPDATE events to the corresponding MySegmentsUpdateWorker
@@ -47,11 +49,6 @@ export function pushManagerFactory(pollingManager, storage, readiness, fetchAuth
     // [Only for client-side] map of user keys to their corresponding hash64 and MySegmentsUpdateWorkers.
     // Hash64 is used to process MY_SEGMENTS_UPDATE_V2 events and dispatch actions to the corresponding MySegmentsUpdateWorker.
     var clients = {};
-    if (userKey) {
-        var hash = hashUserKey(userKey);
-        userKeyHashes[hash] = userKey;
-        clients[userKey] = { hash64: hash64(userKey), worker: segmentsUpdateWorker };
-    }
     // [Only for client-side] variable to flag that a new client was added. It is needed to reconnect streaming.
     var connectForNewClient = false;
     // flag that indicates if `stop/disconnectPush` was called, either by the SyncManager, when the client is destroyed, or due to a PUSH_NONRETRYABLE_ERROR error.
@@ -258,33 +255,40 @@ export function pushManagerFactory(pollingManager, storage, readiness, fetchAuth
     return objectAssign(
     // Expose Event Emitter functionality and Event constants
     Object.create(pushEmitter), {
-        // Expose functionality for starting and stoping push mode:
-        stop: disconnectPush,
+        // Stop/pause push mode
+        stop: function () {
+            disconnectPush(); // `handleNonRetryableError` cannot be used as `stop`, because it emits PUSH_SUBSYSTEM_DOWN event, which starts polling.
+            if (userKey)
+                this.remove(userKey); // Necessary to properly resume streaming in client-side (e.g., RN SDK transition to foreground).
+        },
+        // Start/resume push mode
         start: function () {
             // Guard condition to avoid calling `connectPush` again if the `start` method is called multiple times or if push has been disabled.
             if (disabled || disconnected === false)
                 return;
             disconnected = false;
-            // Run in next event-loop cycle for optimization on client-side: if multiple clients are created in the same cycle than the factory, only one authentication is performed.
-            setTimeout(connectPush);
+            if (userKey)
+                this.add(userKey, pollingManager.segmentsSyncTask); // client-side
+            else
+                setTimeout(connectPush); // server-side runs in next cycle as in client-side, for consistency with client-side
         },
         // [Only for client-side]
         add: function (userKey, mySegmentsSyncTask) {
-            clients[userKey] = { hash64: hash64(userKey), worker: new MySegmentsUpdateWorker(mySegmentsSyncTask) };
             var hash = hashUserKey(userKey);
             if (!userKeyHashes[hash]) {
                 userKeyHashes[hash] = userKey;
+                clients[userKey] = { hash64: hash64(userKey), worker: new MySegmentsUpdateWorker(mySegmentsSyncTask) };
                 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
+                // in case multiple clients are created in the current cycle.
+                setTimeout(function checkForReconnect() {
+                    if (connectForNewClient) {
+                        connectForNewClient = false;
+                        connectPush();
+                    }
+                }, 0);
             }
-            // Reconnects in case of a new client.
-            // Run in next event-loop cycle to save authentication calls
-            // in case the user is creating several clients in the current cycle.
-            setTimeout(function checkForReconnect() {
-                if (connectForNewClient) {
-                    connectForNewClient = false;
-                    connectPush();
-                }
-            }, 0);
         },
         // [Only for client-side]
         remove: function (userKey) {

package/esm/sync/submitters/submitterManager.js

@@ -2,7 +2,8 @@ import { syncTaskComposite } from '../syncTaskComposite';
 import { eventsSyncTaskFactory } from './eventsSyncTask';
 import { impressionsSyncTaskFactory } from './impressionsSyncTask';
 import { impressionCountsSyncTaskFactory } from './impressionCountsSyncTask';
-export function submitterManagerFactory(settings, storage, splitApi) {
+export function submitterManagerFactory(params) {
+    var settings = params.settings, storage = params.storage, splitApi = params.splitApi;
     var log = settings.log;
     var submitters = [
         impressionsSyncTaskFactory(log, splitApi.postTestImpressionsBulk, storage.impressions, settings.scheduler.impressionsRefreshRate, settings.core.labelsEnabled),

package/esm/sync/syncManagerOnline.js

@@ -13,26 +13,25 @@ export function syncManagerOnlineFactory(pollingManagerFactory, pushManagerFacto
     /**
      * SyncManager factory for modular SDK
      */
-    return function (_a) {
-        var settings = _a.settings, platform = _a.platform, splitApi = _a.splitApi, storage = _a.storage, readiness = _a.readiness;
-        var log = settings.log;
+    return function (params) {
+        var _a = params.settings, log = _a.log, streamingEnabled = _a.streamingEnabled;
         /** Polling Manager */
-        var pollingManager = pollingManagerFactory && pollingManagerFactory(splitApi, storage, readiness, settings);
+        var pollingManager = pollingManagerFactory && pollingManagerFactory(params);
         /** Push Manager */
-        var pushManager = settings.streamingEnabled && pollingManager && pushManagerFactory ?
-            pushManagerFactory(pollingManager, storage, readiness, splitApi.fetchAuth, platform, settings) :
+        var pushManager = streamingEnabled && pollingManager && pushManagerFactory ?
+            pushManagerFactory(params, pollingManager) :
             undefined;
         /** Submitter Manager */
         // It is not inyected as push and polling managers, because at the moment it is required
-        var submitter = submitterManagerFactory(settings, storage, splitApi);
+        var submitter = submitterManagerFactory(params);
         /** Sync Manager logic */
         function startPolling() {
-            if (!pollingManager.isRunning()) {
-                log.info(SYNC_START_POLLING);
-                pollingManager.start();
+            if (pollingManager.isRunning()) {
+                log.info(SYNC_CONTINUE_POLLING);
             }
             else {
-                log.info(SYNC_CONTINUE_POLLING);
+                log.info(SYNC_START_POLLING);
+                pollingManager.start();
             }
         }
         function stopPollingAndSyncAll() {
@@ -70,7 +69,8 @@ export function syncManagerOnlineFactory(pollingManagerFactory, pushManagerFacto
                     }
                 }
                 // start periodic data recording (events, impressions, telemetry).
-                submitter && submitter.start();
+                if (submitter)
+                    submitter.start();
                 running = true;
             },
             /**

package/esm/utils/inputValidation/eventProperties.js

@@ -1,4 +1,5 @@
-import { isObject, shallowClone, isString, isFiniteNumber, isBoolean } from '../lang';
+import { isObject, isString, isFiniteNumber, isBoolean } from '../lang';
+import { objectAssign } from '../lang/objectAssign';
 import { ERROR_NOT_PLAIN_OBJECT, ERROR_SIZE_EXCEEDED, WARN_SETTING_NULL, WARN_TRIMMING_PROPERTIES } from '../../logger/constants';
 var ECMA_SIZES = {
     NULL: 0,
@@ -17,7 +18,8 @@ export function validateEventProperties(log, maybeProperties, method) {
         return { properties: false, size: BASE_EVENT_SIZE };
     }
     var keys = Object.keys(maybeProperties);
-    var clone = shallowClone(maybeProperties);
+    // Shallow clone
+    var clone = objectAssign({}, maybeProperties);
     // To avoid calculating the size twice we'll return it from here.
     var output = {
         properties: clone,

package/esm/utils/inputValidation/key.js

@@ -35,7 +35,8 @@ export function validateKey(log, maybeKey, method) {
         var bucketingKey = validateKeyValue(log, maybeKey.bucketingKey, method, 'bucketingKey');
         if (matchingKey && bucketingKey)
             return {
-                matchingKey: matchingKey, bucketingKey: bucketingKey
+                matchingKey: matchingKey,
+                bucketingKey: bucketingKey
             };
         log.error(ERROR_INVALID_KEY_OBJECT, [method]);
         return false;