@microsoft/1ds-post-js 3.1.9 → 3.2.0

package/dist/ms.post.js

@@ -1,5 +1,5 @@
 /*!
- * 1DS JS SDK POST plugin, 3.1.9
+ * 1DS JS SDK POST plugin, 3.2.0
  * Copyright (c) Microsoft and contributors. All rights reserved.
  * (Microsoft Internal Only)
  */
@@ -17,42 +17,83 @@
     var NRT_PROFILE = "NEAR_REAL_TIME";
     var BE_PROFILE = "BEST_EFFORT";
 
+    var Method = "POST";
+    var DisabledPropertyName = "Microsoft_ApplicationInsights_BypassAjaxInstrumentation";
+    var strDropped = "drop";
+    var strSending = "send";
+    var strRequeue = "requeue";
+    var strResponseFail = "rspFail";
+    var strOther = "oth";
+    var defaultCacheControl = "no-cache, no-store";
+    var defaultContentType = "application/x-json-stream";
+    var strCacheControl = "cache-control";
+    var strContentTypeHeader = "content-type";
+    var strKillTokensHeader = "kill-tokens";
+    var strKillDurationHeader = "kill-duration";
+    var strKillDurationSecondsHeader = "kill-duration-seconds";
+    var strTimeDeltaHeader = "time-delta-millis";
+    var strClientVersion = "client-version";
+    var strClientId = "client-id";
+    var strTimeDeltaToApply = "time-delta-to-apply-millis";
+    var strUploadTime = "upload-time";
+    var strApiKey = "apikey";
+    var strMsaDeviceTicket = "AuthMsaDeviceTicket";
+    var strAuthXToken = "AuthXToken";
+    var strNoResponseBody = "NoResponseBody";
+    var strMsfpc = "msfpc";
+
+    function _getEventMsfpc(theEvent) {
+        var intWeb = ((theEvent.ext || {})["intweb"]);
+        if (intWeb && _1dsCoreJs.isValueAssigned(intWeb[strMsfpc])) {
+            return intWeb[strMsfpc];
+        }
+        return null;
+    }
+    function _getMsfpc(theEvents) {
+        var msfpc = null;
+        for (var lp = 0; msfpc === null && lp < theEvents.length; lp++) {
+            msfpc = _getEventMsfpc(theEvents[lp]);
+        }
+        return msfpc;
+    }
     var EventBatch = /** @class */ (function () {
         function EventBatch(iKey, addEvents) {
             var events = addEvents ? [].concat(addEvents) : [];
             var _self = this;
+            var _msfpc = _getMsfpc(events);
             _self.iKey = function () {
                 return iKey;
             };
+            _self.Msfpc = function () {
+                return _msfpc || "";
+            };
             _self.count = function () {
                 return events.length;
             };
             _self.events = function () {
                 return events;
             };
-            _self.addEvents = function (theEvents, append) {
-                if (append === void 0) { append = true; }
-                if (theEvents && theEvents.length > 0) {
-                    if (append) {
-                        events = events.concat(theEvents);
+            _self.addEvent = function (theEvent) {
+                if (theEvent) {
+                    events.push(theEvent);
+                    if (!_msfpc) {
+                        _msfpc = _getEventMsfpc(theEvent);
                     }
-                    else {
-                        events = theEvents.concat(events);
-                    }
-                    return theEvents.length;
+                    return true;
                 }
-                return 0;
+                return false;
             };
             _self.split = function (fromEvent, numEvents) {
-                var newBatch = new EventBatch(iKey);
+                var theEvents;
                 if (fromEvent < events.length) {
                     var cnt = events.length - fromEvent;
                     if (!_1dsCoreJs.isNullOrUndefined(numEvents)) {
                         cnt = numEvents < cnt ? numEvents : cnt;
                     }
-                    newBatch.addEvents(events.splice(fromEvent, cnt), true);
+                    theEvents = events.splice(fromEvent, cnt);
+                    _msfpc = _getMsfpc(events);
                 }
-                return newBatch;
+                return new EventBatch(iKey, theEvents);
             };
         }
         EventBatch.create = function (iKey, theEvents) {
@@ -310,24 +351,19 @@
     var RandomizationUpperThreshold = 1.2;
     var BaseBackoff = 3000;
     var MaxBackoff = 600000;
-    var RetryPolicy = /** @class */ (function () {
-        function RetryPolicy() {
-        }
-        RetryPolicy.shouldRetryForStatus = function (httpStatusCode) {
-            return !((httpStatusCode >= 300 && httpStatusCode < 500 && httpStatusCode != 408 && httpStatusCode != 429)
-                || (httpStatusCode == 501)
-                || (httpStatusCode == 505));
-        };
-        RetryPolicy.getMillisToBackoffForRetry = function (retriesSoFar) {
-            var waitDuration = 0;
-            var minBackoff = BaseBackoff * RandomizationLowerThreshold;
-            var maxBackoff = BaseBackoff * RandomizationUpperThreshold;
-            var randomBackoff = Math.floor(Math.random() * (maxBackoff - minBackoff)) + minBackoff;
-            waitDuration = Math.pow(2, retriesSoFar) * randomBackoff;
-            return Math.min(waitDuration, MaxBackoff);
-        };
-        return RetryPolicy;
-    }());
+    function retryPolicyShouldRetryForStatus(httpStatusCode) {
+        return !((httpStatusCode >= 300 && httpStatusCode < 500 && httpStatusCode != 408 && httpStatusCode != 429)
+            || (httpStatusCode == 501)
+            || (httpStatusCode == 505));
+    }
+    function retryPolicyGetMillisToBackoffForRetry(retriesSoFar) {
+        var waitDuration = 0;
+        var minBackoff = BaseBackoff * RandomizationLowerThreshold;
+        var maxBackoff = BaseBackoff * RandomizationUpperThreshold;
+        var randomBackoff = Math.floor(Math.random() * (maxBackoff - minBackoff)) + minBackoff;
+        waitDuration = Math.pow(2, retriesSoFar) * randomBackoff;
+        return Math.min(waitDuration, MaxBackoff);
+    }
 
     var SecToMsMultiplier = 1000;
     var KillSwitch = /** @class */ (function () {
@@ -419,21 +455,8 @@
     }());
 
     var _a;
-    var Method = "POST";
-    var DisabledPropertyName = "Microsoft_ApplicationInsights_BypassAjaxInstrumentation";
-    var strDropped = "drop";
-    var strSending = "send";
-    var strRequeue = "requeue";
-    var strResponseFail = "rspFail";
-    var strOther = "oth";
-    var defaultCacheControl = "no-cache, no-store";
-    var defaultContentType = "application/x-json-stream";
-    var strCacheControl = "cache-control";
-    var strContentTypeHeader = "content-type";
-    var strKillTokensHeader = "kill-tokens";
-    var strKillDurationHeader = "kill-duration";
-    var strKillDurationSecondsHeader = "kill-duration-seconds";
-    var strTimeDeltaHeader = "time-delta-millis";
+    var strSendAttempt = "sendAttempt";
+    var _noResponseQs = "&" + strNoResponseBody + "=true";
     var _eventActionMap = (_a = {},
         _a[1 ] = strRequeue,
         _a[100 ] = strRequeue,
@@ -441,6 +464,21 @@
         _a[8004 ] = strDropped,
         _a[8003 ] = strDropped,
         _a);
+    var _collectorQsHeaders = {};
+    var _collectorHeaderToQs = {};
+    function _addCollectorHeaderQsMapping(qsName, headerName, allowQs) {
+        _collectorQsHeaders[qsName] = headerName;
+        if (allowQs !== false) {
+            _collectorHeaderToQs[headerName] = qsName;
+        }
+    }
+    _addCollectorHeaderQsMapping(strMsaDeviceTicket, strMsaDeviceTicket, false);
+    _addCollectorHeaderQsMapping(strClientVersion, strClientVersion);
+    _addCollectorHeaderQsMapping(strClientId, "Client-Id");
+    _addCollectorHeaderQsMapping(strApiKey, strApiKey);
+    _addCollectorHeaderQsMapping(strTimeDeltaToApply, strTimeDeltaToApply);
+    _addCollectorHeaderQsMapping(strUploadTime, strUploadTime);
+    _addCollectorHeaderQsMapping(strAuthXToken, strAuthXToken);
     function _getResponseText(xhr) {
         try {
             return xhr.responseText;
@@ -467,11 +505,21 @@
         }
         return hasHeader;
     }
+    function _addRequestDetails(details, name, value, useHeaders) {
+        if (name && value && value.length > 0) {
+            if (useHeaders && _collectorQsHeaders[name]) {
+                details.hdrs[_collectorQsHeaders[name]] = value;
+                details.useHdrs = true;
+            }
+            else {
+                details.url += "&" + name + "=" + value;
+            }
+        }
+    }
     var HttpManager = /** @class */ (function () {
-        function HttpManager(maxEventsPerBatch, maxConnections, maxRetries, actions) {
+        function HttpManager(maxEventsPerBatch, maxConnections, maxRequestRetriesBeforeBackoff, actions) {
             this._responseHandlers = [];
-            var _urlString = "?cors=true&" + strContentTypeHeader.toLowerCase() + "=" + defaultContentType + "&client-id=NO_AUTH&client-version="
-                + _1dsCoreJs.FullVersionString;
+            var _urlString = "?cors=true&" + strContentTypeHeader.toLowerCase() + "=" + defaultContentType;
             var _killSwitch = new KillSwitch();
             var _paused = false;
             var _clockSkewManager = new ClockSkewManager();
@@ -488,6 +536,9 @@
             var _enableEventTimings = false;
             var _cookieMgr;
             var _isUnloading = false;
+            var _useHeaders = false;
+            var _xhrTimeout;
+            var _disableXhrSync;
             dynamicProto__default(HttpManager, this, function (_self) {
                 var _sendCredentials = true;
                 _self.initialize = function (endpointUrl, core, postChannel, httpInterface, channelConfig) {
@@ -496,6 +547,7 @@
                         channelConfig = {};
                     }
                     _urlString = endpointUrl + _urlString;
+                    _useHeaders = !_1dsCoreJs.isUndefined(channelConfig.avoidOptions) ? !channelConfig.avoidOptions : true;
                     _core = core;
                     _cookieMgr = core.getCookieMgr();
                     _enableEventTimings = !_core.config.disableEventTimings;
@@ -506,9 +558,13 @@
                     if (!_1dsCoreJs.isUndefined(channelConfig.enableCompoundKey)) {
                         enableCompoundKey = !!channelConfig.enableCompoundKey;
                     }
+                    _xhrTimeout = channelConfig.xhrTimeout;
+                    _disableXhrSync = channelConfig.disableXhrSync;
                     _useBeacons = !_1dsCoreJs.isReactNative();
                     _serializer = new Serializer(_core, valueSanitizer, stringifyObjects, enableCompoundKey);
                     var syncHttpInterface = httpInterface;
+                    var beaconHttpInterface = channelConfig.alwaysUseXhrOverride ? httpInterface : null;
+                    var fetchSyncHttpInterface = channelConfig.alwaysUseXhrOverride ? httpInterface : null;
                     if (!httpInterface) {
                         _customHttpInterface = false;
                         var location_1 = _1dsCoreJs.getLocation();
@@ -540,8 +596,8 @@
                     _sendInterfaces = (_a = {},
                         _a[0 ] = httpInterface,
                         _a[1 ] = syncHttpInterface || _getSenderInterface([1 , 2 , 3 ], true),
-                        _a[2 ] = _getSenderInterface([3 , 2 , 1 ], true) || syncHttpInterface,
-                        _a[3 ] = _getSenderInterface([2 , 3 , 1 ], true) || syncHttpInterface,
+                        _a[2 ] = beaconHttpInterface || _getSenderInterface([3 , 2 ], true) || syncHttpInterface || _getSenderInterface([1 ], true),
+                        _a[3 ] = fetchSyncHttpInterface || _getSenderInterface([2 , 3 ], true) || syncHttpInterface || _getSenderInterface([1 ], true),
                         _a);
                 };
                 function _getSenderInterface(transports, syncSupport) {
@@ -581,6 +637,9 @@
                 function _xdrSendPost(payload, oncomplete, sync) {
                     var xdr = new XDomainRequest();
                     xdr.open(Method, payload.urlString);
+                    if (payload.timeout) {
+                        xdr.timeout = payload.timeout;
+                    }
                     xdr.onload = function () {
                         var response = _getResponseText(xdr);
                         _doOnComplete(oncomplete, 200, {}, response);
@@ -604,6 +663,9 @@
                 }
                 function _fetchSendPost(payload, oncomplete, sync) {
                     var _a;
+                    var theUrl = payload.urlString;
+                    var ignoreResponse = false;
+                    var responseHandled = false;
                     var requestInit = (_a = {
                             body: payload.data,
                             method: Method
@@ -612,6 +674,10 @@
                         _a);
                     if (sync) {
                         requestInit.keepalive = true;
+                        if (payload._sendReason === 2 ) {
+                            ignoreResponse = true;
+                            theUrl += _noResponseQs;
+                        }
                     }
                     if (_sendCredentials) {
                         requestInit.credentials = "include";
@@ -619,7 +685,7 @@
                     if (payload.headers && _1dsCoreJs.objKeys(payload.headers).length > 0) {
                         requestInit.headers = payload.headers;
                     }
-                    fetch(payload.urlString, requestInit).then(function (response) {
+                    fetch(theUrl, requestInit).then(function (response) {
                         var headerMap = {};
                         var responseText = "";
                         if (response.headers) {
@@ -632,13 +698,32 @@
                                 responseText = text;
                             });
                         }
-                        _doOnComplete(oncomplete, response.status, headerMap, responseText);
-                        _handleCollectorResponse(responseText);
+                        if (!responseHandled) {
+                            responseHandled = true;
+                            _doOnComplete(oncomplete, response.status, headerMap, responseText);
+                            _handleCollectorResponse(responseText);
+                        }
                     })["catch"](function (error) {
-                        _doOnComplete(oncomplete, 0, {});
+                        if (!responseHandled) {
+                            responseHandled = true;
+                            _doOnComplete(oncomplete, 0, {});
+                        }
                     });
+                    if (ignoreResponse && !responseHandled) {
+                        responseHandled = true;
+                        _doOnComplete(oncomplete, 200, {});
+                    }
+                    if (!responseHandled && payload.timeout > 0) {
+                        _postManager._setTimeoutOverride(function () {
+                            if (!responseHandled) {
+                                responseHandled = true;
+                                _doOnComplete(oncomplete, 500, {});
+                            }
+                        }, payload.timeout);
+                    }
                 }
                 function _xhrSendPost(payload, oncomplete, sync) {
+                    var theUrl = payload.urlString;
                     function _appendHeader(theHeaders, xhr, name) {
                         if (!theHeaders[name] && xhr && xhr.getResponseHeader) {
                             var value = xhr.getResponseHeader(name);
@@ -663,45 +748,49 @@
                     function xhrComplete(xhr, responseTxt) {
                         _doOnComplete(oncomplete, xhr.status, _getAllResponseHeaders(xhr), responseTxt);
                     }
-                    var xhRequest = _1dsCoreJs.openXhr(Method, payload.urlString, _sendCredentials, true, sync);
+                    if (sync && payload.disableXhrSync) {
+                        sync = false;
+                    }
+                    var xhrRequest = _1dsCoreJs.openXhr(Method, theUrl, _sendCredentials, true, sync, payload.timeout);
                     _1dsCoreJs.objForEachKey(payload.headers, function (name, value) {
-                        xhRequest.setRequestHeader(name, value);
+                        xhrRequest.setRequestHeader(name, value);
                     });
-                    xhRequest.onload = function () {
-                        var response = _getResponseText(xhRequest);
-                        xhrComplete(xhRequest, response);
+                    xhrRequest.onload = function () {
+                        var response = _getResponseText(xhrRequest);
+                        xhrComplete(xhrRequest, response);
                         _handleCollectorResponse(response);
                     };
-                    xhRequest.onerror = function () {
-                        xhrComplete(xhRequest);
+                    xhrRequest.onerror = function () {
+                        xhrComplete(xhrRequest);
                     };
-                    xhRequest.ontimeout = function () {
-                        xhrComplete(xhRequest);
+                    xhrRequest.ontimeout = function () {
+                        xhrComplete(xhrRequest);
                     };
-                    xhRequest.send(payload.data);
+                    xhrRequest.send(payload.data);
                 }
                 function _doOnComplete(oncomplete, status, headers, response) {
                     try {
                         oncomplete(status, headers, response);
                     }
                     catch (e) {
-                        _postManager.diagLog().throwInternal(_1dsCoreJs.LoggingSeverity.WARNING, _1dsCoreJs._ExtendedInternalMessageId.SendPostOnCompleteFailure, _1dsCoreJs.dumpObj(e));
+                        _1dsCoreJs._throwInternal(_postManager.diagLog(), 2 , 518 , _1dsCoreJs.dumpObj(e));
                     }
                 }
                 function _beaconSendPost(payload, oncomplete, sync) {
                     var internalPayloadData = payload;
                     var status = 200;
                     var thePayload = internalPayloadData._thePayload;
+                    var theUrl = payload.urlString + _noResponseQs;
                     try {
                         var nav_1 = _1dsCoreJs.getNavigator();
-                        if (!nav_1.sendBeacon(payload.urlString, payload.data)) {
+                        if (!nav_1.sendBeacon(theUrl, payload.data)) {
                             if (thePayload) {
                                 var droppedBatches_1 = [];
                                 _1dsCoreJs.arrForEach(thePayload.batches, function (theBatch) {
                                     if (droppedBatches_1 && theBatch && theBatch.count() > 0) {
                                         var theEvents = theBatch.events();
                                         for (var lp = 0; lp < theEvents.length; lp++) {
-                                            if (!nav_1.sendBeacon(payload.urlString, _serializer.getEventBlob(theEvents[lp]))) {
+                                            if (!nav_1.sendBeacon(theUrl, _serializer.getEventBlob(theEvents[lp]))) {
                                                 droppedBatches_1.push(theBatch.split(lp));
                                                 break;
                                             }
@@ -719,7 +808,7 @@
                         }
                     }
                     catch (ex) {
-                        _postManager.diagLog().warnToConsole("Failed to send telemetry using sendBeacon API. Ex:" + ex);
+                        _postManager.diagLog().warnToConsole("Failed to send telemetry using sendBeacon API. Ex:" + _1dsCoreJs.dumpObj(ex));
                         status = 0;
                     }
                     finally {
@@ -883,11 +972,32 @@
                         }, function () { return ({ batches: _createDebugBatches(orgBatches_1), retryCount: retryCount, isTeardown: isTeardown, isSynchronous: isSynchronous_1, sendReason: sendReason, useSendBeacon: _isBeaconPayload(sendType), sendType: sendType }); }, !isSynchronous_1);
                     }
                     catch (ex) {
-                        _postManager.diagLog().throwInternal(_1dsCoreJs.LoggingSeverity.WARNING, _1dsCoreJs._ExtendedInternalMessageId.CannotSerializeObject, "Unexpected Exception sending batch: " + _1dsCoreJs.dumpObj(ex));
+                        _1dsCoreJs._throwInternal(_postManager.diagLog(), 2 , 48 , "Unexpected Exception sending batch: " + _1dsCoreJs.dumpObj(ex));
                     }
                 }
-                function _buildQueryString(thePayload) {
-                    var urlString = _urlString;
+                function _buildRequestDetails(thePayload, useHeaders) {
+                    var requestDetails = {
+                        url: _urlString,
+                        hdrs: {},
+                        useHdrs: false
+                    };
+                    if (!useHeaders) {
+                        _1dsCoreJs.objForEachKey(_headers, function (name, value) {
+                            if (_collectorHeaderToQs[name]) {
+                                _addRequestDetails(requestDetails, _collectorHeaderToQs[name], value, false);
+                            }
+                            else {
+                                requestDetails.hdrs[name] = value;
+                                requestDetails.useHdrs = true;
+                            }
+                        });
+                    }
+                    else {
+                        requestDetails.hdrs = _1dsCoreJs.extend(requestDetails.hdrs, _headers);
+                        requestDetails.useHdrs = (_1dsCoreJs.objKeys(requestDetails.hdrs).length > 0);
+                    }
+                    _addRequestDetails(requestDetails, strClientId, "NO_AUTH", useHeaders);
+                    _addRequestDetails(requestDetails, strClientVersion, _1dsCoreJs.FullVersionString, useHeaders);
                     var apiQsKeys = "";
                     _1dsCoreJs.arrForEach(thePayload.apiKeys, function (apiKey) {
                         if (apiQsKeys.length > 0) {
@@ -895,27 +1005,25 @@
                         }
                         apiQsKeys += apiKey;
                     });
-                    if (apiQsKeys.length > 0) {
-                        urlString += "&apikey=" + apiQsKeys;
-                    }
-                    urlString += "&upload-time=" + _1dsCoreJs.dateNow().toString();
+                    _addRequestDetails(requestDetails, strApiKey, apiQsKeys, useHeaders);
+                    _addRequestDetails(requestDetails, strUploadTime, _1dsCoreJs.dateNow().toString(), useHeaders);
                     var msfpc = _getMsfpc(thePayload);
                     if (_1dsCoreJs.isValueAssigned(msfpc)) {
-                        urlString = urlString + "&ext.intweb.msfpc=" + msfpc;
+                        requestDetails.url += "&ext.intweb.msfpc=" + msfpc;
                     }
                     if (_clockSkewManager.shouldAddClockSkewHeaders()) {
-                        urlString += "&time-delta-to-apply-millis=" + _clockSkewManager.getClockSkewHeaderValue();
+                        _addRequestDetails(requestDetails, strTimeDeltaToApply, _clockSkewManager.getClockSkewHeaderValue(), useHeaders);
                     }
                     if (_core.getWParam) {
                         var wParam = _core.getWParam();
                         if (wParam >= 0) {
-                            urlString += "&w=" + wParam;
+                            requestDetails.url += "&w=" + wParam;
                         }
                     }
                     for (var i = 0; i < _queryStringParameters.length; i++) {
-                        urlString += "&" + _queryStringParameters[i].name + "=" + _queryStringParameters[i].value;
+                        requestDetails.url += "&" + _queryStringParameters[i].name + "=" + _queryStringParameters[i].value;
                     }
-                    return urlString;
+                    return requestDetails;
                 }
                 function _canUseSendBeaconApi() {
                     return !_customHttpInterface && _useBeacons && _1dsCoreJs.isBeaconsSupported();
@@ -926,9 +1034,18 @@
                 }
                 function _doPayloadSend(thePayload, serializationStart, serializationCompleted, sendReason) {
                     if (thePayload && thePayload.payloadBlob && thePayload.payloadBlob.length > 0) {
-                        var urlString_1 = _buildQueryString(thePayload);
+                        var useSendHook_1 = !!_self.sendHook;
+                        var sendInterface_1 = _sendInterfaces[thePayload.sendType];
+                        if (!_isBeaconPayload(thePayload.sendType) && thePayload.isBeacon && thePayload.sendReason === 2 ) {
+                            sendInterface_1 = _sendInterfaces[2 ] || _sendInterfaces[3 ] || sendInterface_1;
+                        }
+                        var useHeaders_1 = _useHeaders;
+                        if (thePayload.isBeacon || sendInterface_1._transport === 3 ) {
+                            useHeaders_1 = false;
+                        }
+                        var requestDetails_1 = _buildRequestDetails(thePayload, useHeaders_1);
+                        useHeaders_1 = useHeaders_1 || requestDetails_1.useHdrs;
                         var sendEventStart_1 = _1dsCoreJs.getTime();
-                        var strSendAttempt_1 = "sendAttempt";
                         _1dsCoreJs.doPerf(_core, function () { return "HttpManager:_doPayloadSend"; }, function () {
                             for (var batchLp = 0; batchLp < thePayload.batches.length; batchLp++) {
                                 var theBatch = thePayload.batches[batchLp];
@@ -941,30 +1058,31 @@
                                         _setTimingValue(timings, "serializationStart", serializationStart);
                                         _setTimingValue(timings, "serializationCompleted", serializationCompleted);
                                     }
-                                    telemetryItem[strSendAttempt_1] > 0 ? telemetryItem[strSendAttempt_1]++ : telemetryItem[strSendAttempt_1] = 1;
+                                    telemetryItem[strSendAttempt] > 0 ? telemetryItem[strSendAttempt]++ : telemetryItem[strSendAttempt] = 1;
                                 }
                             }
                             _sendBatchesNotification(thePayload.batches, (1000  + (sendReason || 0 )), thePayload.sendType, true);
                             var orgPayloadData = {
                                 data: thePayload.payloadBlob,
-                                urlString: urlString_1,
-                                headers: _1dsCoreJs.extend({}, _headers),
+                                urlString: requestDetails_1.url,
+                                headers: requestDetails_1.hdrs,
                                 _thePayload: thePayload,
-                                _sendReason: sendReason
+                                _sendReason: sendReason,
+                                timeout: _xhrTimeout
                             };
-                            if (!_hasHeader(orgPayloadData.headers, strCacheControl)) {
-                                orgPayloadData.headers[strCacheControl] = defaultCacheControl;
+                            if (!_1dsCoreJs.isUndefined(_disableXhrSync)) {
+                                orgPayloadData.disableXhrSync = !!_disableXhrSync;
                             }
-                            if (!_hasHeader(orgPayloadData.headers, strContentTypeHeader)) {
-                                orgPayloadData.headers[strContentTypeHeader] = defaultContentType;
+                            if (useHeaders_1) {
+                                if (!_hasHeader(orgPayloadData.headers, strCacheControl)) {
+                                    orgPayloadData.headers[strCacheControl] = defaultCacheControl;
+                                }
+                                if (!_hasHeader(orgPayloadData.headers, strContentTypeHeader)) {
+                                    orgPayloadData.headers[strContentTypeHeader] = defaultContentType;
+                                }
                             }
                             var sender = null;
-                            var useSendHook = !!_self.sendHook;
-                            var sendInterface = _sendInterfaces[thePayload.sendType];
-                            if (!_isBeaconPayload(thePayload.sendType) && thePayload.isBeacon && thePayload.sendReason === 2 ) {
-                                sendInterface = _sendInterfaces[2 ] || _sendInterfaces[3 ] || sendInterface;
-                            }
-                            if (sendInterface) {
+                            if (sendInterface_1) {
                                 sender = function (payload) {
                                     _clockSkewManager.firstRequestSent();
                                     var onComplete = function (status, headers) {
@@ -972,7 +1090,7 @@
                                     };
                                     var isSync = thePayload.isTeardown || thePayload.isSync;
                                     try {
-                                        sendInterface.sendPOST(payload, onComplete, isSync);
+                                        sendInterface_1.sendPOST(payload, onComplete, isSync);
                                         if (_self.sendListener) {
                                             _self.sendListener(orgPayloadData, payload, isSync, thePayload.isBeacon);
                                         }
@@ -988,11 +1106,13 @@
                                     if (thePayload.sendType === 0 ) {
                                         _outstandingRequests++;
                                     }
-                                    if (useSendHook && !thePayload.isBeacon && sendInterface._transport !== 3 ) {
+                                    if (useSendHook_1 && !thePayload.isBeacon && sendInterface_1._transport !== 3 ) {
                                         var hookData_1 = {
                                             data: orgPayloadData.data,
                                             urlString: orgPayloadData.urlString,
-                                            headers: _1dsCoreJs.extend({}, orgPayloadData.headers)
+                                            headers: _1dsCoreJs.extend({}, orgPayloadData.headers),
+                                            timeout: orgPayloadData.timeout,
+                                            disableXhrSync: orgPayloadData.disableXhrSync
                                         };
                                         var senderCalled_1 = false;
                                         _1dsCoreJs.doPerf(_core, function () { return "HttpManager:_doPayloadSend.sendHook"; }, function () {
@@ -1057,11 +1177,11 @@
                                     });
                                 });
                             }
-                            if (status == 200) {
+                            if (status == 200 || status == 204) {
                                 reason = 200 ;
                                 return;
                             }
-                            if (!RetryPolicy.shouldRetryForStatus(status) || thePayload.numEvents <= 0) {
+                            if (!retryPolicyShouldRetryForStatus(status) || thePayload.numEvents <= 0) {
                                 shouldRetry = false;
                             }
                             reason = 9000  + (status % 1000);
@@ -1070,17 +1190,20 @@
                             reason = 100 ;
                             var retryCount_1 = thePayload.retryCnt;
                             if (thePayload.sendType === 0 ) {
-                                if (retryCount_1 < maxRetries) {
+                                if (retryCount_1 < maxRequestRetriesBeforeBackoff) {
                                     isRetrying = true;
                                     _doAction(function () {
                                         if (thePayload.sendType === 0 ) {
                                             _outstandingRequests--;
                                         }
                                         _sendBatches(thePayload.batches, retryCount_1 + 1, thePayload.isTeardown, _isUnloading ? 2  : thePayload.sendType, 5 );
-                                    }, _isUnloading, RetryPolicy.getMillisToBackoffForRetry(retryCount_1));
+                                    }, _isUnloading, retryPolicyGetMillisToBackoffForRetry(retryCount_1));
                                 }
                                 else {
                                     backOffTrans = true;
+                                    if (_isUnloading) {
+                                        reason = 8001 ;
+                                    }
                                 }
                             }
                         }
@@ -1155,12 +1278,9 @@
                 }
                 function _getMsfpc(thePayload) {
                     for (var lp = 0; lp < thePayload.batches.length; lp++) {
-                        var batchEvents = thePayload.batches[lp].events();
-                        for (var evtLp = 0; evtLp < batchEvents.length; evtLp++) {
-                            var intWeb = ((batchEvents[evtLp].ext || {})["intweb"] || {});
-                            if (_1dsCoreJs.isValueAssigned(intWeb["msfpc"])) {
-                                return encodeURIComponent(intWeb["msfpc"]);
-                            }
+                        var msfpc = thePayload.batches[lp].Msfpc();
+                        if (msfpc) {
+                            return encodeURIComponent(msfpc);
                         }
                     }
                     return "";
@@ -1173,13 +1293,13 @@
                                 responseHandlers[i](responseText);
                             }
                             catch (e) {
-                                _postManager.diagLog().throwInternal(_1dsCoreJs.LoggingSeverity.CRITICAL, _1dsCoreJs._ExtendedInternalMessageId.PostResponseHandler, "Response handler failed: " + e);
+                                _1dsCoreJs._throwInternal(_postManager.diagLog(), 1 , 519 , "Response handler failed: " + e);
                             }
                         }
                         if (responseText) {
                             var response = JSON.parse(responseText);
-                            if (_1dsCoreJs.isValueAssigned(response.webResult) && _1dsCoreJs.isValueAssigned(response.webResult.msfpc)) {
-                                _cookieMgr.set("MSFPC", response.webResult.msfpc, 365 * 86400);
+                            if (_1dsCoreJs.isValueAssigned(response.webResult) && _1dsCoreJs.isValueAssigned(response.webResult[strMsfpc])) {
+                                _cookieMgr.set("MSFPC", response.webResult[strMsfpc], 365 * 86400);
                             }
                         }
                     }
@@ -1197,7 +1317,7 @@
                                         theAction_1.call(actions, theBatches, batchReason, isSyncRequest_1, sendType);
                                     }
                                     catch (e) {
-                                        _postManager.diagLog().throwInternal(_1dsCoreJs.LoggingSeverity.CRITICAL, _1dsCoreJs._ExtendedInternalMessageId.NotificationException, "send request notification failed: " + e);
+                                        _1dsCoreJs._throwInternal(_postManager.diagLog(), 1 , 74 , "send request notification failed: " + e);
                                     }
                                 }, sendSync || isSyncRequest_1, 0);
                             }, function () { return ({ batches: _createDebugBatches(theBatches), reason: batchReason, isSync: isSyncRequest_1, sendSync: sendSync, sendType: sendType }); }, !isSyncRequest_1);
@@ -1229,19 +1349,23 @@
     var MaxNumberEventPerBatch = 500;
     var EventsDroppedAtOneTime = 20;
     var MaxSendAttempts = 6;
+    var MaxSyncUnloadSendAttempts = 2;
     var MaxBackoffCount = 4;
     var globalContext = _1dsCoreJs.isWindowObjectAvailable ? window : undefined;
     var MaxConnections = 2;
-    var MaxRetries = 1;
+    var MaxRequestRetriesBeforeBackoff = 1;
     var strEventsDiscarded = "eventsDiscarded";
     var strOverrideInstrumentationKey = "overrideInstrumentationKey";
+    var strMaxEventRetryAttempts = "maxEventRetryAttempts";
+    var strMaxUnloadEventRetryAttempts = "maxUnloadEventRetryAttempts";
+    var strAddUnloadCb = "addUnloadCb";
     var PostChannel = /** @class */ (function (_super) {
         applicationinsightsShims.__extendsFn(PostChannel, _super);
         function PostChannel() {
             var _this = _super.call(this) || this;
             _this.identifier = "PostChannel";
             _this.priority = 1011;
-            _this.version = '3.1.9';
+            _this.version = '3.2.0';
             var _config;
             var _isTeardownCalled = false;
             var _flushCallbackQueue = [];
@@ -1266,18 +1390,12 @@
             var _delayedBatchReason;
             var _optimizeObject = true;
             var _isPageUnloadTriggered = false;
+            var _disableXhrSync = false;
+            var _maxEventSendAttempts = MaxSendAttempts;
+            var _maxUnloadEventSendAttempts = MaxSyncUnloadSendAttempts;
+            var _evtNamespace;
             dynamicProto__default(PostChannel, _this, function (_self, _base) {
-                _initializeProfiles();
-                _clearQueues();
-                _setAutoLimits();
-                _httpManager = new HttpManager(MaxNumberEventPerBatch, MaxConnections, MaxRetries, {
-                    requeue: _requeueEvents,
-                    send: _sendingEvent,
-                    sent: _eventsSentEvent,
-                    drop: _eventsDropped,
-                    rspFail: _eventsResponseFail,
-                    oth: _otherEvent
-                });
+                _initDefaults();
                 _self["_getDbgPlgTargets"] = function () {
                     return [_httpManager];
                 };
@@ -1285,58 +1403,53 @@
                     _1dsCoreJs.doPerf(core, function () { return "PostChannel:initialize"; }, function () {
                         var extendedCore = core;
                         _base.initialize(coreConfig, core, extensions);
-                        _self.setInitialized(false);
-                        var ctx = _self._getTelCtx();
-                        coreConfig.extensionConfig[_self.identifier] = coreConfig.extensionConfig[_self.identifier] || {};
-                        _config = ctx.getExtCfg(_self.identifier);
-                        _self._setTimeoutOverride = _config.setTimeoutOverride ? _config.setTimeoutOverride : setTimeout.bind(globalContext);
-                        _self._clearTimeoutOverride = _config.clearTimeoutOverride ? _config.clearTimeoutOverride : clearTimeout.bind(globalContext);
-                        _optimizeObject = !_config.disableOptimizeObj && _1dsCoreJs.isChromium();
-                        var existingGetWParamMethod = extendedCore.getWParam;
-                        extendedCore.getWParam = function () {
-                            var wparam = 0;
-                            if (_config.ignoreMc1Ms0CookieProcessing) {
-                                wparam = wparam | 2;
+                        try {
+                            var hasAddUnloadCb = !!core[strAddUnloadCb];
+                            _evtNamespace = _1dsCoreJs.mergeEvtNamespace(_1dsCoreJs.createUniqueNamespace(_self.identifier), core.evtNamespace && core.evtNamespace());
+                            var ctx = _self._getTelCtx();
+                            coreConfig.extensionConfig[_self.identifier] = coreConfig.extensionConfig[_self.identifier] || {};
+                            _config = ctx.getExtCfg(_self.identifier);
+                            _self._setTimeoutOverride = _config.setTimeoutOverride ? _config.setTimeoutOverride : setTimeout.bind(globalContext);
+                            _self._clearTimeoutOverride = _config.clearTimeoutOverride ? _config.clearTimeoutOverride : clearTimeout.bind(globalContext);
+                            _optimizeObject = !_config.disableOptimizeObj && _1dsCoreJs.isChromium();
+                            _hookWParam(extendedCore);
+                            if (_config.eventsLimitInMem > 0) {
+                                _queueSizeLimit = _config.eventsLimitInMem;
                             }
-                            return wparam | existingGetWParamMethod();
-                        };
-                        if (_config.eventsLimitInMem > 0) {
-                            _queueSizeLimit = _config.eventsLimitInMem;
-                        }
-                        if (_config.immediateEventLimit > 0) {
-                            _immediateQueueSizeLimit = _config.immediateEventLimit;
-                        }
-                        if (_config.autoFlushEventsLimit > 0) {
-                            _autoFlushEventsLimit = _config.autoFlushEventsLimit;
-                        }
-                        _setAutoLimits();
-                        if (_config.httpXHROverride && _config.httpXHROverride.sendPOST) {
-                            _xhrOverride = _config.httpXHROverride;
-                        }
-                        if (_1dsCoreJs.isValueAssigned(coreConfig.anonCookieName)) {
-                            _httpManager.addQueryStringParameter("anoncknm", coreConfig.anonCookieName);
-                        }
-                        _httpManager.sendHook = _config.payloadPreprocessor;
-                        _httpManager.sendListener = _config.payloadListener;
-                        var endpointUrl = _config.overrideEndpointUrl ? _config.overrideEndpointUrl : coreConfig.endpointUrl;
-                        _self._notificationManager = coreConfig.extensionConfig.NotificationManager;
-                        _httpManager.initialize(endpointUrl, _self.core, _self, _xhrOverride, _config);
-                        function _handleUnloadEvents(evt) {
-                            var theEvt = evt || _1dsCoreJs.getWindow().event;
-                            if (theEvt.type !== "beforeunload") {
-                                _isPageUnloadTriggered = true;
-                                _httpManager.setUnloading(_isPageUnloadTriggered);
+                            if (_config.immediateEventLimit > 0) {
+                                _immediateQueueSizeLimit = _config.immediateEventLimit;
                             }
-                            _releaseAllQueues(2 , 2 );
+                            if (_config.autoFlushEventsLimit > 0) {
+                                _autoFlushEventsLimit = _config.autoFlushEventsLimit;
+                            }
+                            _disableXhrSync = _config.disableXhrSync;
+                            if (_1dsCoreJs.isNumber(_config[strMaxEventRetryAttempts])) {
+                                _maxEventSendAttempts = _config[strMaxEventRetryAttempts];
+                            }
+                            if (_1dsCoreJs.isNumber(_config[strMaxUnloadEventRetryAttempts])) {
+                                _maxUnloadEventSendAttempts = _config[strMaxUnloadEventRetryAttempts];
+                            }
+                            _setAutoLimits();
+                            if (_config.httpXHROverride && _config.httpXHROverride.sendPOST) {
+                                _xhrOverride = _config.httpXHROverride;
+                            }
+                            if (_1dsCoreJs.isValueAssigned(coreConfig.anonCookieName)) {
+                                _httpManager.addQueryStringParameter("anoncknm", coreConfig.anonCookieName);
+                            }
+                            _httpManager.sendHook = _config.payloadPreprocessor;
+                            _httpManager.sendListener = _config.payloadListener;
+                            var endpointUrl = _config.overrideEndpointUrl ? _config.overrideEndpointUrl : coreConfig.endpointUrl;
+                            _self._notificationManager = coreConfig.extensionConfig.NotificationManager;
+                            _httpManager.initialize(endpointUrl, _self.core, _self, _xhrOverride, _config);
+                            var excludePageUnloadEvents = coreConfig.disablePageUnloadEvents || [];
+                            _1dsCoreJs.addPageUnloadEventListener(_handleUnloadEvents, excludePageUnloadEvents, _evtNamespace);
+                            _1dsCoreJs.addPageHideEventListener(_handleUnloadEvents, excludePageUnloadEvents, _evtNamespace);
+                            _1dsCoreJs.addPageShowEventListener(_handleShowEvents, coreConfig.disablePageShowEvents, _evtNamespace);
+                        }
+                        catch (e) {
+                            _self.setInitialized(false);
+                            throw e;
                         }
-                        var excludePageUnloadEvents = coreConfig.disablePageUnloadEvents || [];
-                        _1dsCoreJs.addPageUnloadEventListener(_handleUnloadEvents, excludePageUnloadEvents);
-                        _1dsCoreJs.addPageHideEventListener(_handleUnloadEvents, excludePageUnloadEvents);
-                        _1dsCoreJs.addPageShowEventListener(function (evt) {
-                            _isPageUnloadTriggered = false;
-                            _httpManager.setUnloading(_isPageUnloadTriggered);
-                        }, coreConfig.disablePageShowEvents);
-                        _self.setInitialized(true);
                     }, function () { return ({ coreConfig: coreConfig, core: core, extensions: extensions }); });
                 };
                 _self.processTelemetry = function (ev, itemCtx) {
@@ -1365,12 +1478,43 @@
                     }
                     _self.processNext(event, itemCtx);
                 };
+                _self._doTeardown = function (unloadCtx, unloadState) {
+                    _releaseAllQueues(2 , 2 );
+                    _isTeardownCalled = true;
+                    _httpManager.teardown();
+                    _1dsCoreJs.removePageUnloadEventListener(null, _evtNamespace);
+                    _1dsCoreJs.removePageHideEventListener(null, _evtNamespace);
+                    _1dsCoreJs.removePageShowEventListener(null, _evtNamespace);
+                    _initDefaults();
+                };
+                function _hookWParam(extendedCore) {
+                    var existingGetWParamMethod = extendedCore.getWParam;
+                    extendedCore.getWParam = function () {
+                        var wparam = 0;
+                        if (_config.ignoreMc1Ms0CookieProcessing) {
+                            wparam = wparam | 2;
+                        }
+                        return wparam | existingGetWParamMethod();
+                    };
+                }
+                function _handleUnloadEvents(evt) {
+                    var theEvt = evt || _1dsCoreJs.getWindow().event;
+                    if (theEvt.type !== "beforeunload") {
+                        _isPageUnloadTriggered = true;
+                        _httpManager.setUnloading(_isPageUnloadTriggered);
+                    }
+                    _releaseAllQueues(2 , 2 );
+                }
+                function _handleShowEvents(evt) {
+                    _isPageUnloadTriggered = false;
+                    _httpManager.setUnloading(_isPageUnloadTriggered);
+                }
                 function _addEventToQueues(event, append) {
                     if (!event.sendAttempt) {
                         event.sendAttempt = 0;
                     }
                     if (!event.latency) {
-                        event.latency = _1dsCoreJs.EventLatency.Normal;
+                        event.latency = 1 ;
                     }
                     if (event.ext && event.ext["trace"]) {
                         delete (event.ext["trace"]);
@@ -1389,7 +1533,7 @@
                     }
                     if (event.sync) {
                         if (_currentBackoffCount || _paused) {
-                            event.latency = _1dsCoreJs.EventLatency.RealTime;
+                            event.latency = 3 ;
                             event.sync = false;
                         }
                         else {
@@ -1405,7 +1549,7 @@
                     var evtLatency = event.latency;
                     var queueSize = _queueSize;
                     var queueLimit = _queueSizeLimit;
-                    if (evtLatency === _1dsCoreJs.EventLatency.Immediate) {
+                    if (evtLatency === 4 ) {
                         queueSize = _immediateQueueSize;
                         queueLimit = _immediateQueueSizeLimit;
                     }
@@ -1414,10 +1558,10 @@
                         eventDropped = !_addEventToProperQueue(event, append);
                     }
                     else {
-                        var dropLatency = _1dsCoreJs.EventLatency.Normal;
+                        var dropLatency = 1 ;
                         var dropNumber = EventsDroppedAtOneTime;
-                        if (evtLatency === _1dsCoreJs.EventLatency.Immediate) {
-                            dropLatency = _1dsCoreJs.EventLatency.Immediate;
+                        if (evtLatency === 4 ) {
+                            dropLatency = 4 ;
                             dropNumber = 1;
                         }
                         eventDropped = true;
@@ -1435,7 +1579,7 @@
                     _setAutoLimits();
                     var doFlush = _queueSize > eventLimit;
                     if (!doFlush && _autoFlushBatchLimit > 0) {
-                        for (var latency = _1dsCoreJs.EventLatency.Normal; !doFlush && latency <= _1dsCoreJs.EventLatency.RealTime; latency++) {
+                        for (var latency = 1 ; !doFlush && latency <= 3 ; latency++) {
                             var batchQueue = _batchQueues[latency];
                             if (batchQueue && batchQueue.batches) {
                                 _1dsCoreJs.arrForEach(batchQueue.batches, function (theBatch) {
@@ -1448,11 +1592,6 @@
                     }
                     _performAutoFlush(true, doFlush);
                 };
-                _self.teardown = function () {
-                    _releaseAllQueues(2 , 2 );
-                    _isTeardownCalled = true;
-                    _httpManager.teardown();
-                };
                 _self.pause = function () {
                     _clearScheduledTimer();
                     _paused = true;
@@ -1494,7 +1633,7 @@
                         _clearScheduledTimer();
                         sendReason = sendReason || 1 ;
                         if (async) {
-                            _queueBatches(_1dsCoreJs.EventLatency.Normal, 0 , sendReason);
+                            _queueBatches(1 , 0 , sendReason);
                             _resetQueueCounts();
                             if (_flushCallbackTimerId == null) {
                                 _flushCallbackTimerId = _createTimer(function () {
@@ -1506,7 +1645,7 @@
                             }
                         }
                         else {
-                            _sendEventsForLatencyAndAbove(_1dsCoreJs.EventLatency.Normal, 1 , sendReason);
+                            _sendEventsForLatencyAndAbove(1 , 1 , sendReason);
                             if (callback !== null && callback !== undefined) {
                                 callback();
                             }
@@ -1514,7 +1653,7 @@
                     }
                 };
                 _self.setMsaAuthTicket = function (ticket) {
-                    _httpManager.addHeader("AuthMsaDeviceTicket", ticket);
+                    _httpManager.addHeader(strMsaDeviceTicket, ticket);
                 };
                 _self.hasEvents = _hasEvents;
                 _self._setTransmitProfile = function (profileName) {
@@ -1541,7 +1680,7 @@
                         if (immediateTimeOut >= 0) {
                             _immediateTimerId = _createTimer(function () {
                                 _immediateTimerId = null;
-                                _sendEventsForLatencyAndAbove(_1dsCoreJs.EventLatency.Immediate, 0 , 1 );
+                                _sendEventsForLatencyAndAbove(4 , 0 , 1 );
                                 _scheduleTimer();
                             }, immediateTimeOut);
                         }
@@ -1551,7 +1690,7 @@
                         if (_hasEvents()) {
                             _scheduledTimerId = _createTimer(function () {
                                 _scheduledTimerId = null;
-                                _sendEventsForLatencyAndAbove(_timerCount === 0 ? _1dsCoreJs.EventLatency.RealTime : _1dsCoreJs.EventLatency.Normal, 0 , 1 );
+                                _sendEventsForLatencyAndAbove(_timerCount === 0 ? 3  : 1 , 0 , 1 );
                                 _timerCount++;
                                 _timerCount %= 2;
                                 _scheduleTimer();
@@ -1576,13 +1715,53 @@
                         _scheduleTimer();
                     }
                 };
+                function _initDefaults() {
+                    _config = null;
+                    _isTeardownCalled = false;
+                    _flushCallbackQueue = [];
+                    _flushCallbackTimerId = null;
+                    _paused = false;
+                    _immediateQueueSize = 0;
+                    _immediateQueueSizeLimit = 500;
+                    _queueSize = 0;
+                    _queueSizeLimit = 10000;
+                    _profiles = {};
+                    _currentProfile = RT_PROFILE;
+                    _scheduledTimerId = null;
+                    _immediateTimerId = null;
+                    _currentBackoffCount = 0;
+                    _timerCount = 0;
+                    _xhrOverride = null;
+                    _batchQueues = {};
+                    _autoFlushEventsLimit = undefined;
+                    _autoFlushBatchLimit = 0;
+                    _delayedBatchSendLatency = -1;
+                    _delayedBatchReason = null;
+                    _optimizeObject = true;
+                    _isPageUnloadTriggered = false;
+                    _disableXhrSync = false;
+                    _maxEventSendAttempts = MaxSendAttempts;
+                    _maxUnloadEventSendAttempts = MaxSyncUnloadSendAttempts;
+                    _evtNamespace = null;
+                    _httpManager = new HttpManager(MaxNumberEventPerBatch, MaxConnections, MaxRequestRetriesBeforeBackoff, {
+                        requeue: _requeueEvents,
+                        send: _sendingEvent,
+                        sent: _eventsSentEvent,
+                        drop: _eventsDropped,
+                        rspFail: _eventsResponseFail,
+                        oth: _otherEvent
+                    });
+                    _initializeProfiles();
+                    _clearQueues();
+                    _setAutoLimits();
+                }
                 function _createTimer(theTimerFunc, timeOut) {
                     if (timeOut === 0 && _currentBackoffCount) {
                         timeOut = 1;
                     }
                     var timerMultiplier = 1000;
                     if (_currentBackoffCount) {
-                        timerMultiplier = RetryPolicy.getMillisToBackoffForRetry(_currentBackoffCount - 1);
+                        timerMultiplier = retryPolicyGetMillisToBackoffForRetry(_currentBackoffCount - 1);
                     }
                     return _self._setTimeoutOverride(theTimerFunc, timeOut * timerMultiplier);
                 }
@@ -1600,23 +1779,23 @@
                         _flushCallbackTimerId = null;
                     }
                     if (!_paused) {
-                        _sendEventsForLatencyAndAbove(_1dsCoreJs.EventLatency.Normal, sendType, sendReason);
+                        _sendEventsForLatencyAndAbove(1 , sendType, sendReason);
                     }
                 }
                 function _clearQueues() {
-                    _batchQueues[_1dsCoreJs.EventLatency.Immediate] = {
+                    _batchQueues[4 ] = {
                         batches: [],
                         iKeyMap: {}
                     };
-                    _batchQueues[_1dsCoreJs.EventLatency.RealTime] = {
+                    _batchQueues[3 ] = {
                         batches: [],
                         iKeyMap: {}
                     };
-                    _batchQueues[_1dsCoreJs.EventLatency.CostDeferred] = {
+                    _batchQueues[2 ] = {
                         batches: [],
                         iKeyMap: {}
                     };
-                    _batchQueues[_1dsCoreJs.EventLatency.Normal] = {
+                    _batchQueues[1 ] = {
                         batches: [],
                         iKeyMap: {}
                     };
@@ -1624,7 +1803,7 @@
                 function _getEventBatch(iKey, latency, create) {
                     var batchQueue = _batchQueues[latency];
                     if (!batchQueue) {
-                        latency = _1dsCoreJs.EventLatency.Normal;
+                        latency = 1 ;
                         batchQueue = _batchQueues[latency];
                     }
                     var eventBatch = batchQueue.iKeyMap[iKey];
@@ -1651,8 +1830,8 @@
                     }
                     var latency = event.latency;
                     var eventBatch = _getEventBatch(event.iKey, latency, true);
-                    if (eventBatch.addEvents([event], append)) {
-                        if (latency !== _1dsCoreJs.EventLatency.Immediate) {
+                    if (eventBatch.addEvent(event)) {
+                        if (latency !== 4 ) {
                             _queueSize++;
                             if (append && event.sendAttempt === 0) {
                                 _performAutoFlush(!event.sync, _autoFlushBatchLimit > 0 && eventBatch.count() >= _autoFlushBatchLimit);
@@ -1672,7 +1851,7 @@
                             var droppedEvents = eventBatch.split(0, dropNumber);
                             var droppedCount = droppedEvents.count();
                             if (droppedCount > 0) {
-                                if (currentLatency === _1dsCoreJs.EventLatency.Immediate) {
+                                if (currentLatency === 4 ) {
                                     _immediateQueueSize -= droppedCount;
                                 }
                                 else {
@@ -1694,7 +1873,7 @@
                         var batchQueue = _batchQueues[latency];
                         if (batchQueue && batchQueue.batches) {
                             _1dsCoreJs.arrForEach(batchQueue.batches, function (theBatch) {
-                                if (latency === _1dsCoreJs.EventLatency.Immediate) {
+                                if (latency === 4 ) {
                                     immediateQueue += theBatch.count();
                                 }
                                 else {
@@ -1703,7 +1882,7 @@
                             });
                         }
                     };
-                    for (var latency = _1dsCoreJs.EventLatency.Normal; latency <= _1dsCoreJs.EventLatency.Immediate; latency++) {
+                    for (var latency = 1 ; latency <= 4 ; latency++) {
                         _loop_1(latency);
                     }
                     _queueSize = normalQueue;
@@ -1715,7 +1894,7 @@
                     if (!isAsync || _httpManager.canSendRequest()) {
                         _1dsCoreJs.doPerf(_self.core, function () { return "PostChannel._queueBatches"; }, function () {
                             var droppedEvents = [];
-                            var latencyToProcess = _1dsCoreJs.EventLatency.Immediate;
+                            var latencyToProcess = 4 ;
                             while (latencyToProcess >= latency) {
                                 var batchQueue = _batchQueues[latencyToProcess];
                                 if (batchQueue && batchQueue.batches && batchQueue.batches.length > 0) {
@@ -1726,7 +1905,7 @@
                                         else {
                                             eventsQueued = eventsQueued || (theBatch && theBatch.count() > 0);
                                         }
-                                        if (latencyToProcess === _1dsCoreJs.EventLatency.Immediate) {
+                                        if (latencyToProcess === 4 ) {
                                             _immediateQueueSize -= theBatch.count();
                                         }
                                         else {
@@ -1754,7 +1933,7 @@
                     return eventsQueued;
                 }
                 function _flushImpl(callback, sendReason) {
-                    _sendEventsForLatencyAndAbove(_1dsCoreJs.EventLatency.Normal, 0 , sendReason);
+                    _sendEventsForLatencyAndAbove(1 , 0 , sendReason);
                     _waitForIdleManager(function () {
                         if (callback) {
                             callback();
@@ -1794,15 +1973,19 @@
                 }
                 function _requeueEvents(batches, reason) {
                     var droppedEvents = [];
+                    var maxSendAttempts = _maxEventSendAttempts;
+                    if (_isPageUnloadTriggered) {
+                        maxSendAttempts = _maxUnloadEventSendAttempts;
+                    }
                     _1dsCoreJs.arrForEach(batches, function (theBatch) {
                         if (theBatch && theBatch.count() > 0) {
                             _1dsCoreJs.arrForEach(theBatch.events(), function (theEvent) {
                                 if (theEvent) {
                                     if (theEvent.sync) {
-                                        theEvent.latency = _1dsCoreJs.EventLatency.Immediate;
+                                        theEvent.latency = 4 ;
                                         theEvent.sync = false;
                                     }
-                                    if (theEvent.sendAttempt < MaxSendAttempts) {
+                                    if (theEvent.sendAttempt < maxSendAttempts) {
                                         _1dsCoreJs.setProcessTelemetryTimings(theEvent, _self.identifier);
                                         _addEventToQueues(theEvent, false);
                                     }
@@ -1828,7 +2011,7 @@
                             notifyFunc.apply(manager, theArgs);
                         }
                         catch (e) {
-                            _self.diagLog().throwInternal(_1dsCoreJs.LoggingSeverity.CRITICAL, _1dsCoreJs._ExtendedInternalMessageId.NotificationException, evtName + " notification failed: " + e);
+                            _1dsCoreJs._throwInternal(_self.diagLog(), 1 , 74 , evtName + " notification failed: " + e);
                         }
                     }
                 }