@microsoft/1ds-post-js 4.1.1-nightly3.2403-03 → 4.1.1

package/dist-es5/BatchNotificationActions.js

@@ -1,5 +1,5 @@
 /*
- * 1DS JS SDK POST plugin, 4.1.1-nightly3.2403-03
+ * 1DS JS SDK POST plugin, 4.1.1
  * Copyright (c) Microsoft and contributors. All rights reserved.
  * (Microsoft Internal Only)
  */

package/dist-es5/ClockSkewManager.js

@@ -1,5 +1,5 @@
 /*
- * 1DS JS SDK POST plugin, 4.1.1-nightly3.2403-03
+ * 1DS JS SDK POST plugin, 4.1.1
  * Copyright (c) Microsoft and contributors. All rights reserved.
  * (Microsoft Internal Only)
  */

package/dist-es5/DataModels.js

@@ -1,5 +1,5 @@
 /*
- * 1DS JS SDK POST plugin, 4.1.1-nightly3.2403-03
+ * 1DS JS SDK POST plugin, 4.1.1
  * Copyright (c) Microsoft and contributors. All rights reserved.
  * (Microsoft Internal Only)
  */

package/dist-es5/EventBatch.js

@@ -1,5 +1,5 @@
 /*
- * 1DS JS SDK POST plugin, 4.1.1-nightly3.2403-03
+ * 1DS JS SDK POST plugin, 4.1.1
  * Copyright (c) Microsoft and contributors. All rights reserved.
  * (Microsoft Internal Only)
  */

package/dist-es5/HttpManager.js

@@ -1,5 +1,5 @@
 /*
- * 1DS JS SDK POST plugin, 4.1.1-nightly3.2403-03
+ * 1DS JS SDK POST plugin, 4.1.1
  * Copyright (c) Microsoft and contributors. All rights reserved.
  * (Microsoft Internal Only)
  */
@@ -10,15 +10,15 @@ var _a;
 * @copyright Microsoft 2018-2020
 */
 import dynamicProto from "@microsoft/dynamicproto-js";
-import { FullVersionString, _throwInternal, _warnToConsole, arrForEach, dateNow, doPerf, dumpObj, extend, getCommonSchemaMetaData, getLocation, getNavigator, getTime, hasOwnProperty, isArray, isBeaconsSupported, isFetchSupported, isNullOrUndefined, isNumber, isReactNative, isString, isUndefined, isValueAssigned, isXhrSupported, objForEachKey, objKeys, onConfigChange, openXhr, strTrim, strUndefined, useXDomainRequest } from "@microsoft/1ds-core-js";
+import { FullVersionString, SenderPostManager, _getAllResponseHeaders, _throwInternal, _warnToConsole, arrForEach, dateNow, doPerf, dumpObj, extend, getCommonSchemaMetaData, getNavigator, getResponseText, getTime, hasOwnProperty, isBeaconsSupported, isFetchSupported, isNullOrUndefined, isReactNative, isUndefined, isValueAssigned, objForEachKey, objKeys, onConfigChange, prependTransports, strUndefined } from "@microsoft/1ds-core-js";
 import { arrAppend } from "@nevware21/ts-utils";
 import { ClockSkewManager } from "./ClockSkewManager";
-import { DEFAULT_CACHE_CONTROL, DEFAULT_CONTENT_TYPE, STR_API_KEY, STR_AUTH_XTOKEN, STR_CACHE_CONTROL, STR_CLIENT_ID, STR_CLIENT_VERSION, STR_CONTENT_TYPE_HEADER, STR_DISABLED_PROPERTY_NAME, STR_DROPPED, STR_EMPTY, STR_KILL_DURATION_HEADER, STR_KILL_DURATION_SECONDS_HEADER, STR_KILL_TOKENS_HEADER, STR_MSA_DEVICE_TICKET, STR_MSFPC, STR_NO_RESPONSE_BODY, STR_OTHER, STR_POST_METHOD, STR_REQUEUE, STR_RESPONSE_FAIL, STR_SENDING, STR_TIME_DELTA_HEADER, STR_TIME_DELTA_TO_APPLY, STR_UPLOAD_TIME } from "./InternalConstants";
+import { DEFAULT_CACHE_CONTROL, DEFAULT_CONTENT_TYPE, STR_API_KEY, STR_AUTH_XTOKEN, STR_CACHE_CONTROL, STR_CLIENT_ID, STR_CLIENT_VERSION, STR_CONTENT_TYPE_HEADER, STR_DROPPED, STR_EMPTY, STR_KILL_DURATION_HEADER, STR_KILL_TOKENS_HEADER, STR_MSA_DEVICE_TICKET, STR_MSFPC, STR_NO_RESPONSE_BODY, STR_OTHER, STR_REQUEUE, STR_RESPONSE_FAIL, STR_SENDING, STR_TIME_DELTA_HEADER, STR_TIME_DELTA_TO_APPLY, STR_UPLOAD_TIME } from "./InternalConstants";
 import { KillSwitch } from "./KillSwitch";
 import { retryPolicyGetMillisToBackoffForRetry, retryPolicyShouldRetryForStatus } from "./RetryPolicy";
 import { Serializer } from "./Serializer";
 import { createTimeoutWrapper } from "./TimeoutOverrideWrapper";
-import { _DYN_ADD_HEADER, _DYN_ALLOW_REQUEST_SENDIN0, _DYN_ALWAYS_USE_XHR_OVERR7, _DYN_AVOID_OPTIONS, _DYN_BATCHES, _DYN_CAN_SEND_REQUEST, _DYN_CLEAR_TIMEOUT_OVERRI3, _DYN_CONCAT, _DYN_COUNT, _DYN_CREATE_PAYLOAD, _DYN_DATA, _DYN_DISABLE_EVENT_TIMING5, _DYN_DISABLE_FETCH_KEEP_A6, _DYN_DISABLE_XHR_SYNC, _DYN_ENABLE_COMPOUND_KEY, _DYN_EVENTS, _DYN_EXCLUDE_CS_META_DATA, _DYN_FIRST_REQUEST_SENT, _DYN_GET_ALL_RESPONSE_HEA10, _DYN_GET_CLOCK_SKEW_HEADE2, _DYN_GET_OFFLINE_REQUEST_9, _DYN_GET_RESPONSE_HEADER, _DYN_GET_WPARAM, _DYN_HDRS, _DYN_HEADERS, _DYN_INITIALIZE, _DYN_IS_BEACON, _DYN_IS_COMPLETELY_IDLE, _DYN_IS_SYNC, _DYN_IS_TEARDOWN, _DYN_I_KEY, _DYN_LENGTH, _DYN_ONTIMEOUT, _DYN_OVERRIDE_ENDPOINT_UR4, _DYN_PAYLOAD_PREPROCESSOR, _DYN_PUSH, _DYN_SEND_POST, _DYN_SEND_QUEUED_REQUESTS, _DYN_SEND_SYNCHRONOUS_BAT11, _DYN_SEND_TYPE, _DYN_SERIALIZE_OFFLINE_EV8, _DYN_SET_CLOCK_SKEW, _DYN_SET_KILL_SWITCH_TENA12, _DYN_SET_TIMEOUT_OVERRIDE, _DYN_SET_UNLOADING, _DYN_SHOULD_ADD_CLOCK_SKE1, _DYN_SPLICE, _DYN_SPLIT, _DYN_STRINGIFY_OBJECTS, _DYN_TIMEOUT, _DYN_TIMINGS, _DYN_TO_LOWER_CASE, _DYN_UNLOAD_TRANSPORTS, _DYN_URL_STRING, _DYN_USE_HDRS, _DYN_USE_SEND_BEACON, _DYN__BACK_OFF_TRANSMISSI13, _DYN__SEND_REASON, _DYN__THE_PAYLOAD, _DYN__TRANSPORT } from "./__DynamicConstants";
+import { _DYN_ADD_HEADER, _DYN_ADD_NO_RESPONSE, _DYN_ALLOW_REQUEST_SENDIN0, _DYN_ALWAYS_USE_XHR_OVERR7, _DYN_AVOID_OPTIONS, _DYN_BATCHES, _DYN_CAN_SEND_REQUEST, _DYN_CLEAR_TIMEOUT_OVERRI3, _DYN_CONCAT, _DYN_COUNT, _DYN_CREATE_PAYLOAD, _DYN_DATA, _DYN_DISABLE_EVENT_TIMING5, _DYN_DISABLE_FETCH_KEEP_A6, _DYN_DISABLE_XHR_SYNC, _DYN_ENABLE_COMPOUND_KEY, _DYN_EVENTS, _DYN_EXCLUDE_CS_META_DATA, _DYN_FIRST_REQUEST_SENT, _DYN_GET_CLOCK_SKEW_HEADE2, _DYN_GET_OFFLINE_REQUEST_9, _DYN_GET_WPARAM, _DYN_HDRS, _DYN_HEADERS, _DYN_INITIALIZE, _DYN_IS_BEACON, _DYN_IS_COMPLETELY_IDLE, _DYN_IS_SYNC, _DYN_IS_TEARDOWN, _DYN_I_KEY, _DYN_LENGTH, _DYN_OVERRIDE_ENDPOINT_UR4, _DYN_PAYLOAD_PREPROCESSOR, _DYN_PUSH, _DYN_SEND_QUEUED_REQUESTS, _DYN_SEND_SYNCHRONOUS_BAT10, _DYN_SEND_TYPE, _DYN_SERIALIZE_OFFLINE_EV8, _DYN_SET_CLOCK_SKEW, _DYN_SET_KILL_SWITCH_TENA11, _DYN_SET_TIMEOUT_OVERRIDE, _DYN_SET_UNLOADING, _DYN_SHOULD_ADD_CLOCK_SKE1, _DYN_SPLICE, _DYN_SPLIT, _DYN_STRINGIFY_OBJECTS, _DYN_TIMINGS, _DYN_TO_LOWER_CASE, _DYN_UNLOAD_TRANSPORTS, _DYN_URL_STRING, _DYN_USE_HDRS, _DYN_USE_SEND_BEACON, _DYN__BACK_OFF_TRANSMISSI12, _DYN__SEND_REASON, _DYN__THE_PAYLOAD, _DYN__TRANSPORT } from "./__DynamicConstants";
 var strSendAttempt = "sendAttempt";
 var _noResponseQs = "&" + STR_NO_RESPONSE_BODY + "=true";
 var UrlQueryString = "?cors=true&" + STR_CONTENT_TYPE_HEADER[_DYN_TO_LOWER_CASE /* @min:%2etoLowerCase */]() + "=" + DEFAULT_CONTENT_TYPE;
@@ -47,15 +47,6 @@ _addCollectorHeaderQsMapping(STR_API_KEY, STR_API_KEY);
 _addCollectorHeaderQsMapping(STR_TIME_DELTA_TO_APPLY, STR_TIME_DELTA_TO_APPLY);
 _addCollectorHeaderQsMapping(STR_UPLOAD_TIME, STR_UPLOAD_TIME);
 _addCollectorHeaderQsMapping(STR_AUTH_XTOKEN, STR_AUTH_XTOKEN);
-function _getResponseText(xhr) {
-    try {
-        return xhr.responseText;
-    }
-    catch (e) {
-        // Best effort, as XHR may throw while XDR wont so just ignore
-    }
-    return STR_EMPTY;
-}
 function _hasHeader(headers, header) {
     var hasHeader = false;
     if (headers && header) {
@@ -85,17 +76,6 @@ function _addRequestDetails(details, name, value, useHeaders) {
         }
     }
 }
-function _prependTransports(theTransports, newTransports) {
-    if (newTransports) {
-        if (isNumber(newTransports)) {
-            theTransports = [newTransports][_DYN_CONCAT /* @min:%2econcat */](theTransports);
-        }
-        else if (isArray(newTransports)) {
-            theTransports = newTransports[_DYN_CONCAT /* @min:%2econcat */](theTransports);
-        }
-    }
-    return theTransports;
-}
 function _addQueryStringParameter(qsParams, name, value) {
     for (var i = 0; i < qsParams[_DYN_LENGTH /* @min:%2elength */]; i++) {
         if (qsParams[i].name === name) {
@@ -156,6 +136,7 @@ var HttpManager = /** @class */ (function () {
         var _isInitialized;
         var _timeoutWrapper;
         var _excludeCsMetaData;
+        var _sendPostMgr;
         dynamicProto(HttpManager, this, function (_self) {
             _initDefaults();
             var _sendCredentials = true;
@@ -193,7 +174,7 @@ var HttpManager = /** @class */ (function () {
                         _xhrTimeout = channelConfig.xhrTimeout;
                         _disableXhrSync = !!channelConfig[_DYN_DISABLE_XHR_SYNC /* @min:%2edisableXhrSync */];
                         _disableFetchKeepAlive = !!channelConfig[_DYN_DISABLE_FETCH_KEEP_A6 /* @min:%2edisableFetchKeepAlive */];
-                        _addNoResponse = channelConfig.addNoResponse !== false;
+                        _addNoResponse = channelConfig[_DYN_ADD_NO_RESPONSE /* @min:%2eaddNoResponse */] !== false;
                         _excludeCsMetaData = !!channelConfig[_DYN_EXCLUDE_CS_META_DATA /* @min:%2eexcludeCsMetaData */];
                         if (!!core.getPlugin("LocalStorage")) {
                             // Always disable fetch keep alive when persisten storage is available
@@ -204,17 +185,27 @@ var HttpManager = /** @class */ (function () {
                         if (!isNullOrUndefined(channelConfig[_DYN_USE_SEND_BEACON /* @min:%2euseSendBeacon */])) {
                             _useBeacons = !!channelConfig[_DYN_USE_SEND_BEACON /* @min:%2euseSendBeacon */];
                         }
+                        var sendPostConfig = _getSendPostMgrConfig();
+                        // only init it once
+                        if (!_sendPostMgr) {
+                            _sendPostMgr = new SenderPostManager();
+                            _sendPostMgr[_DYN_INITIALIZE /* @min:%2einitialize */](sendPostConfig, _logger);
+                        }
+                        else {
+                            _sendPostMgr.SetConfig(sendPostConfig);
+                        }
                         var syncHttpInterface = httpInterface;
                         var beaconHttpInterface = channelConfig[_DYN_ALWAYS_USE_XHR_OVERR7 /* @min:%2ealwaysUseXhrOverride */] ? httpInterface : null;
                         var fetchSyncHttpInterface = channelConfig[_DYN_ALWAYS_USE_XHR_OVERR7 /* @min:%2ealwaysUseXhrOverride */] ? httpInterface : null;
                         var beaconUnloadTransports = [3 /* TransportType.Beacon */, 2 /* TransportType.Fetch */];
                         if (!httpInterface) {
                             _customHttpInterface = false;
-                            var location_1 = getLocation();
-                            if (location_1 && location_1.protocol && location_1.protocol[_DYN_TO_LOWER_CASE /* @min:%2etoLowerCase */]() === "file:") {
-                                // Special case where a local html file fails with a CORS error on Chromium browsers
-                                _sendCredentials = false;
-                            }
+                            // this is handled in SendPostManager now
+                            // let location = getLocation();
+                            // if (location && location.protocol && location.protocol.toLowerCase() === "file:") {
+                            //     // Special case where a local html file fails with a CORS error on Chromium browsers
+                            //     _sendCredentials = false;
+                            // }
                             var theTransports = [];
                             if (isReactNative()) {
                                 // Use Fetch or XDR/XHR
@@ -226,7 +217,7 @@ var HttpManager = /** @class */ (function () {
                                 theTransports = [1 /* TransportType.Xhr */, 2 /* TransportType.Fetch */, 3 /* TransportType.Beacon */];
                             }
                             // Prefix any user requested transport(s) values
-                            theTransports = _prependTransports(theTransports, channelConfig.transports);
+                            theTransports = prependTransports(theTransports, channelConfig.transports);
                             httpInterface = _getSenderInterface(theTransports, false);
                             if (!httpInterface) {
                                 _warnToConsole(_logger, "No available transport to send events");
@@ -235,7 +226,7 @@ var HttpManager = /** @class */ (function () {
                         }
                         if (!beaconHttpInterface) {
                             // Allow overriding the usage of sendBeacon
-                            beaconUnloadTransports = _prependTransports(beaconUnloadTransports, channelConfig[_DYN_UNLOAD_TRANSPORTS /* @min:%2eunloadTransports */]);
+                            beaconUnloadTransports = prependTransports(beaconUnloadTransports, channelConfig[_DYN_UNLOAD_TRANSPORTS /* @min:%2eunloadTransports */]);
                             beaconHttpInterface = _getSenderInterface(beaconUnloadTransports, true);
                         }
                         _canHaveReducedPayload = !_customHttpInterface && ((_useBeacons && isBeaconsSupported()) || (!_disableFetchKeepAlive && isFetchSupported(true)));
@@ -261,80 +252,70 @@ var HttpManager = /** @class */ (function () {
                 };
             };
             _self[_DYN_SERIALIZE_OFFLINE_EV8 /* @min:%2eserializeOfflineEvt */] = function (evt) {
-                return _serializer.getEventBlob(evt);
+                try {
+                    if (_serializer) {
+                        return _serializer.getEventBlob(evt);
+                    }
+                }
+                catch (e) {
+                    // eslint-disable-next-line no-empty
+                }
+                return STR_EMPTY;
             };
             _self[_DYN_GET_OFFLINE_REQUEST_9 /* @min:%2egetOfflineRequestDetails */] = function () {
-                var payload = _serializer[_DYN_CREATE_PAYLOAD /* @min:%2ecreatePayload */](0, false, false, false, 1 /* SendRequestReason.NormalSchedule */, 0 /* EventSendType.Batched */);
-                return _buildRequestDetails(payload, _useHeaders);
+                try {
+                    var payload = _serializer && _serializer[_DYN_CREATE_PAYLOAD /* @min:%2ecreatePayload */](0, false, false, false, 1 /* SendRequestReason.NormalSchedule */, 0 /* EventSendType.Batched */);
+                    return _buildRequestDetails(payload, _useHeaders);
+                }
+                catch (e) {
+                    // eslint-disable-next-line no-empty
+                }
+                return null;
             };
             // Special internal method to allow the DebugPlugin to hook embedded objects
             function _getSenderInterface(transports, syncSupport) {
-                var transportType = 0 /* TransportType.NotSet */;
-                var sendPostFunc = null;
-                var lp = 0;
-                while (sendPostFunc == null && lp < transports[_DYN_LENGTH /* @min:%2elength */]) {
-                    transportType = transports[lp];
-                    if (transportType === 1 /* TransportType.Xhr */) {
-                        if (useXDomainRequest()) {
-                            sendPostFunc = _xdrSendPost;
-                        }
-                        else if (isXhrSupported()) {
-                            sendPostFunc = _xhrSendPost;
-                        }
-                    }
-                    else if (transportType === 2 /* TransportType.Fetch */ && isFetchSupported(syncSupport) && (!syncSupport || (syncSupport && !_disableFetchKeepAlive))) {
-                        sendPostFunc = _fetchSendPost;
-                    }
-                    else if (_useBeacons && transportType === 3 /* TransportType.Beacon */ && isBeaconsSupported()) {
-                        sendPostFunc = _beaconSendPost;
-                    }
-                    lp++;
+                try {
+                    return _sendPostMgr && _sendPostMgr.getSenderInst(transports, syncSupport);
                 }
-                if (sendPostFunc) {
-                    return {
-                        _transport: transportType,
-                        _isSync: syncSupport,
-                        sendPOST: sendPostFunc
-                    };
+                catch (e) {
+                    // eslint-disable-next-line no-empty
                 }
                 return null;
             }
             _self["_getDbgPlgTargets"] = function () {
                 return [_sendInterfaces[0 /* EventSendType.Batched */], _killSwitch, _serializer, _sendInterfaces];
             };
-            function _xdrSendPost(payload, oncomplete, sync) {
-                // It doesn't support custom headers, so no action is taken with current requestHeaders
-                var xdr = new XDomainRequest();
-                xdr.open(STR_POST_METHOD, payload[_DYN_URL_STRING /* @min:%2eurlString */]);
-                if (payload[_DYN_TIMEOUT /* @min:%2etimeout */]) {
-                    xdr[_DYN_TIMEOUT /* @min:%2etimeout */] = payload[_DYN_TIMEOUT /* @min:%2etimeout */];
-                }
-                // can't get the status code in xdr.
-                xdr.onload = function () {
-                    // we will assume onload means the request succeeded.
-                    var response = _getResponseText(xdr);
-                    _doOnComplete(oncomplete, 200, {}, response);
-                    _handleCollectorResponse(response);
-                };
-                // we will assume onerror means we need to drop the events.
-                xdr.onerror = function () {
-                    _doOnComplete(oncomplete, 400, {});
-                };
-                // we will assume ontimeout means we need to retry the events.
-                xdr[_DYN_ONTIMEOUT /* @min:%2eontimeout */] = function () {
-                    _doOnComplete(oncomplete, 500, {});
-                };
-                // https://cypressnorth.com/web-programming-and-development/internet-explorer-aborting-ajax-requests-fixed/
-                // tslint:disable-next-line:no-empty
-                xdr.onprogress = function () { };
-                if (sync) {
-                    xdr.send(payload[_DYN_DATA /* @min:%2edata */]);
+            function _getSendPostMgrConfig() {
+                try {
+                    var onCompleteFuncs = {
+                        xdrOnComplete: _xdrOncomplete,
+                        fetchOnComplete: _fetchOnComplete,
+                        xhrOnComplete: _xhrOnComplete,
+                        beaconOnRetry: _onBeaconRetry
+                    };
+                    var config = {
+                        enableSendPromise: false,
+                        isOneDs: true,
+                        disableCredentials: !_sendCredentials,
+                        disableXhr: false,
+                        disableBeacon: !_useBeacons,
+                        disableBeaconSync: !_useBeacons,
+                        disableFetchKeepAlive: _disableFetchKeepAlive,
+                        timeWrapper: _timeoutWrapper,
+                        addNoResponse: _addNoResponse,
+                        senderOnCompleteCallBack: onCompleteFuncs
+                    };
+                    return config;
                 }
-                else {
-                    _timeoutWrapper.set(function () {
-                        xdr.send(payload[_DYN_DATA /* @min:%2edata */]);
-                    }, 0);
+                catch (e) {
+                    // eslint-disable-next-line no-empty
                 }
+                return null;
+            }
+            function _xdrOncomplete(xdr, oncomplete, payload) {
+                var response = getResponseText(xdr);
+                _doOnComplete(oncomplete, 200, {}, response);
+                _handleCollectorResponse(response);
             }
             function _initDefaults() {
                 var undefValue;
@@ -369,136 +350,26 @@ var HttpManager = /** @class */ (function () {
                 _isInitialized = false;
                 _timeoutWrapper = createTimeoutWrapper();
                 _excludeCsMetaData = false;
+                _sendPostMgr = null;
             }
-            function _fetchSendPost(payload, oncomplete, sync) {
-                var _a;
-                var theUrl = payload[_DYN_URL_STRING /* @min:%2eurlString */];
-                var ignoreResponse = false;
-                var responseHandled = false;
-                var requestInit = (_a = {
-                        body: payload[_DYN_DATA /* @min:%2edata */],
-                        method: STR_POST_METHOD
-                    },
-                    _a[STR_DISABLED_PROPERTY_NAME] = true,
-                    _a);
-                if (sync) {
-                    requestInit.keepalive = true;
-                    if (payload[_DYN__SEND_REASON /* @min:%2e_sendReason */] === 2 /* SendRequestReason.Unload */) {
-                        // As a sync request (during unload), it is unlikely that we will get a chance to process the response so
-                        // just like beacon send assume that the events have been accepted and processed
-                        ignoreResponse = true;
-                        if (_addNoResponse) {
-                            theUrl += _noResponseQs;
-                        }
-                    }
-                }
-                if (_sendCredentials) {
-                    // Don't send credentials when URL is file://
-                    requestInit.credentials = "include";
-                }
-                // Only add headers if there are headers to add, due to issue with some polyfills
-                if (payload.headers && objKeys(payload.headers)[_DYN_LENGTH /* @min:%2elength */] > 0) {
-                    requestInit[_DYN_HEADERS /* @min:%2eheaders */] = payload[_DYN_HEADERS /* @min:%2eheaders */];
-                }
+            function _fetchOnComplete(response, onComplete, resValue, payload) {
                 var handleResponse = function (status, headerMap, responseText) {
-                    if (!responseHandled) {
-                        responseHandled = true;
-                        _doOnComplete(oncomplete, status, headerMap, responseText);
-                        _handleCollectorResponse(responseText);
-                    }
-                };
-                var handleError = function () {
-                    // In case there is an error in the request. Set the status to 0
-                    // so that the events can be retried later.
-                    if (!responseHandled) {
-                        responseHandled = true;
-                        _doOnComplete(oncomplete, 0, {});
-                    }
+                    _doOnComplete(onComplete, status, headerMap, responseText);
+                    _handleCollectorResponse(responseText);
                 };
-                fetch(theUrl, requestInit).then(function (response) {
-                    var headerMap = {};
-                    var responseText = STR_EMPTY;
-                    var headers = response[_DYN_HEADERS /* @min:%2eheaders */];
-                    if (headers) {
-                        headers["forEach"](function (value, name) {
-                            headerMap[name] = value;
-                        });
-                    }
-                    if (response.body) {
-                        response.text().then(function (text) {
-                            responseText = text;
-                            handleResponse(response.status, headerMap, responseText);
-                        }, handleError);
-                    }
-                    else {
-                        handleResponse(response.status, headerMap, "");
-                    }
-                }).catch(handleError);
-                if (ignoreResponse && !responseHandled) {
-                    // Assume success during unload processing
-                    responseHandled = true;
-                    _doOnComplete(oncomplete, 200, {});
-                }
-                if (!responseHandled && payload[_DYN_TIMEOUT /* @min:%2etimeout */] > 0) {
-                    // Simulate timeout
-                    _timeoutWrapper.set(function () {
-                        if (!responseHandled) {
-                            // Assume a 500 response (which will cause a retry)
-                            responseHandled = true;
-                            _doOnComplete(oncomplete, 500, {});
-                        }
-                    }, payload[_DYN_TIMEOUT /* @min:%2etimeout */]);
+                var headerMap = {};
+                var headers = response[_DYN_HEADERS /* @min:%2eheaders */];
+                if (headers) {
+                    headers["forEach"](function (value, name) {
+                        headerMap[name] = value;
+                    });
                 }
+                handleResponse(response.status, headerMap, resValue || STR_EMPTY);
             }
-            function _xhrSendPost(payload, oncomplete, sync) {
-                var theUrl = payload[_DYN_URL_STRING /* @min:%2eurlString */];
-                function _appendHeader(theHeaders, xhr, name) {
-                    if (!theHeaders[name] && xhr && xhr[_DYN_GET_RESPONSE_HEADER /* @min:%2egetResponseHeader */]) {
-                        var value = xhr[_DYN_GET_RESPONSE_HEADER /* @min:%2egetResponseHeader */](name);
-                        if (value) {
-                            theHeaders[name] = strTrim(value);
-                        }
-                    }
-                    return theHeaders;
-                }
-                function _getAllResponseHeaders(xhr) {
-                    var theHeaders = {};
-                    if (!xhr[_DYN_GET_ALL_RESPONSE_HEA10 /* @min:%2egetAllResponseHeaders */]) {
-                        // Firefox 2-63 doesn't have getAllResponseHeaders function but it does have getResponseHeader
-                        // Only call these if getAllResponseHeaders doesn't exist, otherwise we can get invalid response errors
-                        // as collector is not currently returning the correct header to allow JS to access these headers
-                        theHeaders = _appendHeader(theHeaders, xhr, STR_TIME_DELTA_HEADER);
-                        theHeaders = _appendHeader(theHeaders, xhr, STR_KILL_DURATION_HEADER);
-                        theHeaders = _appendHeader(theHeaders, xhr, STR_KILL_DURATION_SECONDS_HEADER);
-                    }
-                    else {
-                        theHeaders = _convertAllHeadersToMap(xhr[_DYN_GET_ALL_RESPONSE_HEA10 /* @min:%2egetAllResponseHeaders */]());
-                    }
-                    return theHeaders;
-                }
-                function xhrComplete(xhr, responseTxt) {
-                    _doOnComplete(oncomplete, xhr.status, _getAllResponseHeaders(xhr), responseTxt);
-                }
-                if (sync && payload[_DYN_DISABLE_XHR_SYNC /* @min:%2edisableXhrSync */]) {
-                    sync = false;
-                }
-                var xhrRequest = openXhr(STR_POST_METHOD, theUrl, _sendCredentials, true, sync, payload[_DYN_TIMEOUT /* @min:%2etimeout */]);
-                // Set custom headers (e.g. gzip) here (after open())
-                objForEachKey(payload[_DYN_HEADERS /* @min:%2eheaders */], function (name, value) {
-                    xhrRequest.setRequestHeader(name, value);
-                });
-                xhrRequest.onload = function () {
-                    var response = _getResponseText(xhrRequest);
-                    xhrComplete(xhrRequest, response);
-                    _handleCollectorResponse(response);
-                };
-                xhrRequest.onerror = function () {
-                    xhrComplete(xhrRequest);
-                };
-                xhrRequest[_DYN_ONTIMEOUT /* @min:%2eontimeout */] = function () {
-                    xhrComplete(xhrRequest);
-                };
-                xhrRequest.send(payload[_DYN_DATA /* @min:%2edata */]);
+            function _xhrOnComplete(request, oncomplete, payload) {
+                var response = getResponseText(request);
+                _doOnComplete(oncomplete, request.status, _getAllResponseHeaders(request, true), response);
+                _handleCollectorResponse(response);
             }
             function _doOnComplete(oncomplete, status, headers, response) {
                 try {
@@ -508,7 +379,7 @@ var HttpManager = /** @class */ (function () {
                     _throwInternal(_logger, 2 /* eLoggingSeverity.WARNING */, 518 /* _eExtendedInternalMessageId.SendPostOnCompleteFailure */, dumpObj(e));
                 }
             }
-            function _beaconSendPost(payload, oncomplete, sync) {
+            function _onBeaconRetry(payload, onComplete, canSend) {
                 // Custom headers not supported in sendBeacon payload.headers would be ignored
                 var internalPayloadData = payload;
                 var status = 200;
@@ -516,50 +387,48 @@ var HttpManager = /** @class */ (function () {
                 var theUrl = payload[_DYN_URL_STRING /* @min:%2eurlString */] + (_addNoResponse ? _noResponseQs : STR_EMPTY);
                 try {
                     var nav_1 = getNavigator();
-                    if (!nav_1.sendBeacon(theUrl, payload[_DYN_DATA /* @min:%2edata */])) {
-                        if (thePayload) {
-                            var persistStorage = !!_core.getPlugin("LocalStorage");
-                            // Failed to send entire payload so try and split data and try to send as much events as possible
-                            var droppedBatches_1 = [];
-                            var sentBatches_1 = [];
-                            arrForEach(thePayload[_DYN_BATCHES /* @min:%2ebatches */], function (theBatch) {
-                                if (droppedBatches_1 && theBatch && theBatch[_DYN_COUNT /* @min:%2ecount */]() > 0) {
-                                    var theEvents = theBatch[_DYN_EVENTS /* @min:%2eevents */]();
-                                    for (var lp = 0; lp < theEvents[_DYN_LENGTH /* @min:%2elength */]; lp++) {
-                                        if (!nav_1.sendBeacon(theUrl, _serializer.getEventBlob(theEvents[lp]))) {
-                                            // Can't send anymore, so split the batch and drop the rest
-                                            droppedBatches_1[_DYN_PUSH /* @min:%2epush */](theBatch[_DYN_SPLIT /* @min:%2esplit */](lp));
-                                            break;
-                                        }
-                                        else {
-                                            sentBatches_1[_DYN_PUSH /* @min:%2epush */](theBatch[lp]);
-                                        }
+                    if (thePayload) {
+                        var persistStorage = !!_core.getPlugin("LocalStorage");
+                        // Failed to send entire payload so try and split data and try to send as much events as possible
+                        var droppedBatches_1 = [];
+                        var sentBatches_1 = [];
+                        arrForEach(thePayload[_DYN_BATCHES /* @min:%2ebatches */], function (theBatch) {
+                            if (droppedBatches_1 && theBatch && theBatch[_DYN_COUNT /* @min:%2ecount */]() > 0) {
+                                var theEvents = theBatch[_DYN_EVENTS /* @min:%2eevents */]();
+                                for (var lp = 0; lp < theEvents[_DYN_LENGTH /* @min:%2elength */]; lp++) {
+                                    if (!nav_1.sendBeacon(theUrl, _serializer.getEventBlob(theEvents[lp]))) {
+                                        // Can't send anymore, so split the batch and drop the rest
+                                        droppedBatches_1[_DYN_PUSH /* @min:%2epush */](theBatch[_DYN_SPLIT /* @min:%2esplit */](lp));
+                                        break;
+                                    }
+                                    else {
+                                        sentBatches_1[_DYN_PUSH /* @min:%2epush */](theBatch[lp]);
                                     }
                                 }
-                                else {
-                                    // Remove all of the events from the existing batch in the payload as the copy includes the original
-                                    droppedBatches_1[_DYN_PUSH /* @min:%2epush */](theBatch[_DYN_SPLIT /* @min:%2esplit */](0));
-                                }
-                            });
-                            if (sentBatches_1[_DYN_LENGTH /* @min:%2elength */] > 0) {
-                                // Update the payload with the sent batches
-                                thePayload.sentEvts = sentBatches_1;
                             }
-                            if (!persistStorage) {
-                                _sendBatchesNotification(droppedBatches_1, 8003 /* EventBatchNotificationReason.SizeLimitExceeded */, thePayload[_DYN_SEND_TYPE /* @min:%2esendType */], true);
+                            else {
+                                // Remove all of the events from the existing batch in the payload as the copy includes the original
+                                droppedBatches_1[_DYN_PUSH /* @min:%2epush */](theBatch[_DYN_SPLIT /* @min:%2esplit */](0));
                             }
+                        });
+                        if (sentBatches_1[_DYN_LENGTH /* @min:%2elength */] > 0) {
+                            // Update the payload with the sent batches
+                            thePayload.sentEvts = sentBatches_1;
                         }
-                        else {
-                            status = 0;
+                        if (!persistStorage) {
+                            _sendBatchesNotification(droppedBatches_1, 8003 /* EventBatchNotificationReason.SizeLimitExceeded */, thePayload[_DYN_SEND_TYPE /* @min:%2esendType */], true);
                         }
                     }
+                    else {
+                        status = 0;
+                    }
                 }
                 catch (ex) {
                     _warnToConsole(_logger, "Failed to send telemetry using sendBeacon API. Ex:" + dumpObj(ex));
                     status = 0;
                 }
                 finally {
-                    _doOnComplete(oncomplete, status, {}, STR_EMPTY);
+                    _doOnComplete(onComplete, status, {}, STR_EMPTY);
                 }
             }
             function _isBeaconPayload(sendType) {
@@ -642,7 +511,7 @@ var HttpManager = /** @class */ (function () {
              * @param batch - The request to be sent.
              * @param sendReason   - The token used to send the request.
              */
-            _self[_DYN_SEND_SYNCHRONOUS_BAT11 /* @min:%2esendSynchronousBatch */] = function (batch, sendType, sendReason) {
+            _self[_DYN_SEND_SYNCHRONOUS_BAT10 /* @min:%2esendSynchronousBatch */] = function (batch, sendType, sendReason) {
                 // This will not take into account the max connections restriction. Since this is sync, we can
                 // only send one of this request at a time and thus should not worry about multiple connections
                 // being used to send synchronous events.
@@ -885,7 +754,7 @@ var HttpManager = /** @class */ (function () {
                                 };
                                 var isSync = thePayload[_DYN_IS_TEARDOWN /* @min:%2eisTeardown */] || thePayload[_DYN_IS_SYNC /* @min:%2eisSync */];
                                 try {
-                                    sendInterface_1[_DYN_SEND_POST /* @min:%2esendPOST */](payload, onComplete, isSync);
+                                    sendInterface_1.sendPOST(payload, onComplete, isSync);
                                     if (_sendListener) {
                                         // Send the original payload to the listener
                                         _sendListener(orgPayloadData, payload, isSync, thePayload[_DYN_IS_BEACON /* @min:%2eisBeacon */]);
@@ -913,7 +782,7 @@ var HttpManager = /** @class */ (function () {
                                         data: orgPayloadData[_DYN_DATA /* @min:%2edata */],
                                         urlString: orgPayloadData[_DYN_URL_STRING /* @min:%2eurlString */],
                                         headers: extend({}, orgPayloadData[_DYN_HEADERS /* @min:%2eheaders */]),
-                                        timeout: orgPayloadData[_DYN_TIMEOUT /* @min:%2etimeout */],
+                                        timeout: orgPayloadData.timeout,
                                         disableXhrSync: orgPayloadData[_DYN_DISABLE_XHR_SYNC /* @min:%2edisableXhrSync */],
                                         disableFetchKeepAlive: orgPayloadData[_DYN_DISABLE_FETCH_KEEP_A6 /* @min:%2edisableFetchKeepAlive */]
                                     };
@@ -973,7 +842,7 @@ var HttpManager = /** @class */ (function () {
                         if (headers) {
                             _clockSkewManager[_DYN_SET_CLOCK_SKEW /* @min:%2esetClockSkew */](headers[STR_TIME_DELTA_HEADER]);
                             var killDuration = headers[STR_KILL_DURATION_HEADER] || headers["kill-duration-seconds"];
-                            arrForEach(_killSwitch[_DYN_SET_KILL_SWITCH_TENA12 /* @min:%2esetKillSwitchTenants */](headers[STR_KILL_TOKENS_HEADER], killDuration), function (killToken) {
+                            arrForEach(_killSwitch[_DYN_SET_KILL_SWITCH_TENA11 /* @min:%2esetKillSwitchTenants */](headers[STR_KILL_TOKENS_HEADER], killDuration), function (killToken) {
                                 arrForEach(thePayload[_DYN_BATCHES /* @min:%2ebatches */], function (theBatch) {
                                     if (theBatch[_DYN_I_KEY /* @min:%2eiKey */]() === killToken) {
                                         // Make sure we have initialized the array
@@ -1045,7 +914,7 @@ var HttpManager = /** @class */ (function () {
                 try {
                     if (backOffTrans) {
                         // Slow down the transmission requests
-                        _postManager[_DYN__BACK_OFF_TRANSMISSI13 /* @min:%2e_backOffTransmission */]();
+                        _postManager[_DYN__BACK_OFF_TRANSMISSI12 /* @min:%2e_backOffTransmission */]();
                     }
                     var theBatches = thePayload[_DYN_BATCHES /* @min:%2ebatches */];
                     if (batchReason === 200 /* EventBatchNotificationReason.Complete */) {
@@ -1092,31 +961,6 @@ var HttpManager = /** @class */ (function () {
                     _timeoutWrapper.set(cb, interval);
                 }
             }
-            /**
-            * Converts the XHR getAllResponseHeaders to a map containing the header key and value.
-            */
-            // tslint:disable-next-line: align
-            function _convertAllHeadersToMap(headersString) {
-                var headers = {};
-                if (isString(headersString)) {
-                    var headersArray = strTrim(headersString)[_DYN_SPLIT /* @min:%2esplit */](/[\r\n]+/);
-                    arrForEach(headersArray, function (headerEntry) {
-                        if (headerEntry) {
-                            var idx = headerEntry.indexOf(": ");
-                            if (idx !== -1) {
-                                // The new spec has the headers returning all as lowercase -- but not all browsers do this yet
-                                var header = strTrim(headerEntry.substring(0, idx))[_DYN_TO_LOWER_CASE /* @min:%2etoLowerCase */]();
-                                var value = strTrim(headerEntry.substring(idx + 1));
-                                headers[header] = value;
-                            }
-                            else {
-                                headers[strTrim(headerEntry)] = 1;
-                            }
-                        }
-                    });
-                }
-                return headers;
-            }
             function _getMsfpc(thePayload) {
                 for (var lp = 0; lp < thePayload.batches[_DYN_LENGTH /* @min:%2elength */]; lp++) {
                     var msfpc = thePayload[_DYN_BATCHES /* @min:%2ebatches */][lp].Msfpc();