@microsoft/1ds-post-js 3.2.6 → 3.2.8

package/dist-esm/src/BatchNotificationActions.js

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

package/dist-esm/src/ClockSkewManager.js

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

package/dist-esm/src/DataModels.d.ts

@@ -14,6 +14,7 @@ export interface IPayloadData {
     };
     timeout?: number;
     disableXhrSync?: boolean;
+    disableFetchKeepAlive?: boolean;
 }
 /**
  * Defines the function signature for the Payload Preprocessor.
@@ -139,10 +140,25 @@ export interface IChannelConfiguration {
      */
     transports?: number | number[];
     /**
-     * [Optional] Avoid adding request headers to the outgoing request that would cause a pre-flight (OPTIONS) request to be sent for each request.
-     * This currently defaults to true but will be changed once the collector handles additional settings to allow the browser to better cache any
-     * previous OPTIONS response, at which point some of the current dynamic values sent on the query string will be moved to a header.
+     * [Optional] Either an array or single value identifying the requested TransportType type(s) that should be used during unload or events
+     * marked as sendBeacon. This is used during initialization to identify the requested send transport, it will be ignored if a httpXHROverride
+     * is provided and alwaysUseXhrOverride is true.
      */
+    unloadTransports?: number | number[];
+    /**
+     * [Optional] A flag to enable or disable the usage of the sendBeacon() API (if available). If running on ReactNative this defaults
+     * to `false` for all other cases it defaults to `true`.
+     */
+    useSendBeacon?: boolean;
+    /**
+     * [Optional] A flag to disable the usage of the [fetch with keep-alive](https://javascript.info/fetch-api#keepalive) support.
+     */
+    disableFetchKeepAlive?: boolean;
+    /**
+    * [Optional] Avoid adding request headers to the outgoing request that would cause a pre-flight (OPTIONS) request to be sent for each request.
+    * This currently defaults to true but will be changed once the collector handles additional settings to allow the browser to better cache any
+    * previous OPTIONS response, at which point some of the current dynamic values sent on the query string will be moved to a header.
+    */
     avoidOptions?: boolean;
     /**
      * [Optional] Specify a timeout (in ms) to apply to requests when sending requests using XHR, XDR or fetch requests. Defaults to undefined
@@ -187,6 +203,11 @@ export interface IChannelConfiguration {
      * configuration setting and/or changing this value to 0 or 1.
      */
     maxUnloadEventRetryAttempts?: number;
+    /**
+     * [Optional] flag to indicate whether the sendBeacon and fetch (with keep-alive flag) should add the "NoResponseBody" query string
+     * value to indicate that the server should return a 204 for successful requests. Defaults to true
+     */
+    addNoResponse?: boolean;
 }
 /**
  * SendPOSTFunction type defines how an HTTP POST request is sent to an ingestion server

package/dist-esm/src/DataModels.js

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

package/dist-esm/src/EventBatch.js

@@ -1,5 +1,5 @@
 /*
- * 1DS JS SDK POST plugin, 3.2.6
+ * 1DS JS SDK POST plugin, 3.2.8
  * Copyright (c) Microsoft and contributors. All rights reserved.
  * (Microsoft Internal Only)
  */
@@ -9,7 +9,7 @@
 * @copyright Microsoft 2020
 */
 import { isNullOrUndefined, isValueAssigned } from "@microsoft/1ds-core-js";
-import { STR_MSFPC } from "./InternalConstants";
+import { STR_EMPTY, STR_MSFPC } from "./InternalConstants";
 function _getEventMsfpc(theEvent) {
     var intWeb = ((theEvent.ext || {})["intweb"]);
     if (intWeb && isValueAssigned(intWeb[STR_MSFPC])) {
@@ -45,7 +45,7 @@ var EventBatch = /** @class */ (function () {
         };
         _self.Msfpc = function () {
             // return the cached value unless it's undefined -- used to avoid cpu
-            return _msfpc || "";
+            return _msfpc || STR_EMPTY;
         };
         _self.count = function () {
             return events.length;

package/dist-esm/src/EventBatch.js.map

@@ -1 +1 @@
-{"version":3,"file":"EventBatch.js.map","sources":["EventBatch.js"],"sourcesContent":["/**\r\n* EventBatch.ts\r\n* @author Nev Wylie (newylie)\r\n* @copyright Microsoft 2020\r\n*/\r\nimport { isNullOrUndefined, isValueAssigned } from \"@microsoft/1ds-core-js\";\r\nimport { STR_MSFPC } from \"./InternalConstants\";\r\nfunction _getEventMsfpc(theEvent) {\r\n    var intWeb = ((theEvent.ext || {})[\"intweb\"]);\r\n    if (intWeb && isValueAssigned(intWeb[STR_MSFPC])) {\r\n        return intWeb[STR_MSFPC];\r\n    }\r\n    return null;\r\n}\r\nfunction _getMsfpc(theEvents) {\r\n    var msfpc = null;\r\n    for (var lp = 0; msfpc === null && lp < theEvents.length; lp++) {\r\n        msfpc = _getEventMsfpc(theEvents[lp]);\r\n    }\r\n    return msfpc;\r\n}\r\n/**\r\n* This class defines a \"batch\" events related to a specific iKey, it is used by the PostChannel and HttpManager\r\n* to collect and transfer ownership of events without duplicating them in-memory. This reduces the previous\r\n* array duplication and shared ownership issues that occurred due to race conditions caused by the async nature\r\n* of sending requests.\r\n*/\r\nvar EventBatch = /** @class */ (function () {\r\n    /**\r\n     * Private constructor so that caller is forced to use the static create method.\r\n     * @param iKey - The iKey to associate with the events (not validated)\r\n     * @param addEvents - The optional collection of events to assign to this batch - defaults to an empty array.\r\n     */\r\n    function EventBatch(iKey, addEvents) {\r\n        var events = addEvents ? [].concat(addEvents) : [];\r\n        var _self = this;\r\n        var _msfpc = _getMsfpc(events);\r\n        _self.iKey = function () {\r\n            return iKey;\r\n        };\r\n        _self.Msfpc = function () {\r\n            // return the cached value unless it's undefined -- used to avoid cpu\r\n            return _msfpc || \"\";\r\n        };\r\n        _self.count = function () {\r\n            return events.length;\r\n        };\r\n        _self.events = function () {\r\n            return events;\r\n        };\r\n        _self.addEvent = function (theEvent) {\r\n            if (theEvent) {\r\n                events.push(theEvent);\r\n                if (!_msfpc) {\r\n                    // Not found so try and find one\r\n                    _msfpc = _getEventMsfpc(theEvent);\r\n                }\r\n                return true;\r\n            }\r\n            return false;\r\n        };\r\n        _self.split = function (fromEvent, numEvents) {\r\n            // Create a new batch with the same iKey\r\n            var theEvents;\r\n            if (fromEvent < events.length) {\r\n                var cnt = events.length - fromEvent;\r\n                if (!isNullOrUndefined(numEvents)) {\r\n                    cnt = numEvents < cnt ? numEvents : cnt;\r\n                }\r\n                theEvents = events.splice(fromEvent, cnt);\r\n                // reset the fetched msfpc value\r\n                _msfpc = _getMsfpc(events);\r\n            }\r\n            return new EventBatch(iKey, theEvents);\r\n        };\r\n    }\r\n    /**\r\n     * Creates a new Event Batch object\r\n     * @param iKey The iKey associated with this batch of events\r\n     */\r\n    EventBatch.create = function (iKey, theEvents) {\r\n        return new EventBatch(iKey, theEvents);\r\n    };\r\n    return EventBatch;\r\n}());\r\nexport { EventBatch };\r\n//# sourceMappingURL=EventBatch.js.map"],"names":[],"mappings":";;;;;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA"}
+{"version":3,"file":"EventBatch.js.map","sources":["EventBatch.js"],"sourcesContent":["/**\r\n* EventBatch.ts\r\n* @author Nev Wylie (newylie)\r\n* @copyright Microsoft 2020\r\n*/\r\nimport { isNullOrUndefined, isValueAssigned } from \"@microsoft/1ds-core-js\";\r\nimport { STR_EMPTY, STR_MSFPC } from \"./InternalConstants\";\r\nfunction _getEventMsfpc(theEvent) {\r\n    var intWeb = ((theEvent.ext || {})[\"intweb\"]);\r\n    if (intWeb && isValueAssigned(intWeb[STR_MSFPC])) {\r\n        return intWeb[STR_MSFPC];\r\n    }\r\n    return null;\r\n}\r\nfunction _getMsfpc(theEvents) {\r\n    var msfpc = null;\r\n    for (var lp = 0; msfpc === null && lp < theEvents.length; lp++) {\r\n        msfpc = _getEventMsfpc(theEvents[lp]);\r\n    }\r\n    return msfpc;\r\n}\r\n/**\r\n* This class defines a \"batch\" events related to a specific iKey, it is used by the PostChannel and HttpManager\r\n* to collect and transfer ownership of events without duplicating them in-memory. This reduces the previous\r\n* array duplication and shared ownership issues that occurred due to race conditions caused by the async nature\r\n* of sending requests.\r\n*/\r\nvar EventBatch = /** @class */ (function () {\r\n    /**\r\n     * Private constructor so that caller is forced to use the static create method.\r\n     * @param iKey - The iKey to associate with the events (not validated)\r\n     * @param addEvents - The optional collection of events to assign to this batch - defaults to an empty array.\r\n     */\r\n    function EventBatch(iKey, addEvents) {\r\n        var events = addEvents ? [].concat(addEvents) : [];\r\n        var _self = this;\r\n        var _msfpc = _getMsfpc(events);\r\n        _self.iKey = function () {\r\n            return iKey;\r\n        };\r\n        _self.Msfpc = function () {\r\n            // return the cached value unless it's undefined -- used to avoid cpu\r\n            return _msfpc || STR_EMPTY;\r\n        };\r\n        _self.count = function () {\r\n            return events.length;\r\n        };\r\n        _self.events = function () {\r\n            return events;\r\n        };\r\n        _self.addEvent = function (theEvent) {\r\n            if (theEvent) {\r\n                events.push(theEvent);\r\n                if (!_msfpc) {\r\n                    // Not found so try and find one\r\n                    _msfpc = _getEventMsfpc(theEvent);\r\n                }\r\n                return true;\r\n            }\r\n            return false;\r\n        };\r\n        _self.split = function (fromEvent, numEvents) {\r\n            // Create a new batch with the same iKey\r\n            var theEvents;\r\n            if (fromEvent < events.length) {\r\n                var cnt = events.length - fromEvent;\r\n                if (!isNullOrUndefined(numEvents)) {\r\n                    cnt = numEvents < cnt ? numEvents : cnt;\r\n                }\r\n                theEvents = events.splice(fromEvent, cnt);\r\n                // reset the fetched msfpc value\r\n                _msfpc = _getMsfpc(events);\r\n            }\r\n            return new EventBatch(iKey, theEvents);\r\n        };\r\n    }\r\n    /**\r\n     * Creates a new Event Batch object\r\n     * @param iKey The iKey associated with this batch of events\r\n     */\r\n    EventBatch.create = function (iKey, theEvents) {\r\n        return new EventBatch(iKey, theEvents);\r\n    };\r\n    return EventBatch;\r\n}());\r\nexport { EventBatch };\r\n//# sourceMappingURL=EventBatch.js.map"],"names":[],"mappings":";;;;;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA"}

package/dist-esm/src/HttpManager.js

@@ -1,5 +1,5 @@
 /*
- * 1DS JS SDK POST plugin, 3.2.6
+ * 1DS JS SDK POST plugin, 3.2.8
  * Copyright (c) Microsoft and contributors. All rights reserved.
  * (Microsoft Internal Only)
  */
@@ -13,7 +13,7 @@ import dynamicProto from "@microsoft/dynamicproto-js";
 import EVTClockSkewManager from "./ClockSkewManager";
 import EVTKillSwitch from "./KillSwitch";
 import { FullVersionString, _throwInternal, _warnToConsole, arrForEach, dateNow, doPerf, dumpObj, extend, getLocation, getNavigator, getTime, hasOwnProperty, isArray, isBeaconsSupported, isFetchSupported, isNullOrUndefined, isNumber, isReactNative, isString, isUndefined, isValueAssigned, isXhrSupported, objForEachKey, objKeys, openXhr, strTrim, strUndefined, useXDomainRequest } from "@microsoft/1ds-core-js";
-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_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_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 { retryPolicyGetMillisToBackoffForRetry, retryPolicyShouldRetryForStatus } from "./RetryPolicy";
 import { Serializer } from "./Serializer";
 var strSendAttempt = "sendAttempt";
@@ -50,7 +50,7 @@ function _getResponseText(xhr) {
     catch (e) {
         // Best effort, as XHR may throw while XDR wont so just ignore
     }
-    return "";
+    return STR_EMPTY;
 }
 function _hasHeader(headers, header) {
     var hasHeader = false;
@@ -81,6 +81,17 @@ function _addRequestDetails(details, name, value, useHeaders) {
         }
     }
 }
+function _prependTransports(theTransports, newTransports) {
+    if (newTransports) {
+        if (isNumber(newTransports)) {
+            theTransports = [newTransports].concat(theTransports);
+        }
+        else if (isArray(newTransports)) {
+            theTransports = newTransports.concat(theTransports);
+        }
+    }
+    return theTransports;
+}
 /**
  * Class managing the sending of requests.
  */
@@ -112,6 +123,9 @@ var HttpManager = /** @class */ (function () {
         var _useHeaders = false;
         var _xhrTimeout;
         var _disableXhrSync;
+        var _disableFetchKeepAlive;
+        var _canHaveReducedPayload;
+        var _addNoResponse;
         dynamicProto(HttpManager, this, function (_self) {
             var _sendCredentials = true;
             _self.initialize = function (endpointUrl, core, postChannel, httpInterface, channelConfig) {
@@ -133,12 +147,18 @@ var HttpManager = /** @class */ (function () {
                     enableCompoundKey = !!channelConfig.enableCompoundKey;
                 }
                 _xhrTimeout = channelConfig.xhrTimeout;
-                _disableXhrSync = channelConfig.disableXhrSync;
+                _disableXhrSync = !!channelConfig.disableXhrSync;
+                _disableFetchKeepAlive = !!channelConfig.disableFetchKeepAlive;
+                _addNoResponse = channelConfig.addNoResponse !== false;
                 _useBeacons = !isReactNative(); // Only use beacons if not running in React Native
                 _serializer = new Serializer(_core, valueSanitizer, stringifyObjects, enableCompoundKey);
+                if (!isNullOrUndefined(channelConfig.useSendBeacon)) {
+                    _useBeacons = !!channelConfig.useSendBeacon;
+                }
                 var syncHttpInterface = httpInterface;
                 var beaconHttpInterface = channelConfig.alwaysUseXhrOverride ? httpInterface : null;
                 var fetchSyncHttpInterface = channelConfig.alwaysUseXhrOverride ? httpInterface : null;
+                var beaconUnloadTransports = [3 /* TransportType.Beacon */, 2 /* TransportType.Fetch */];
                 if (!httpInterface) {
                     _customHttpInterface = false;
                     var location_1 = getLocation();
@@ -150,31 +170,30 @@ var HttpManager = /** @class */ (function () {
                     if (isReactNative()) {
                         // Use Fetch or XDR/XHR
                         theTransports = [2 /* TransportType.Fetch */, 1 /* TransportType.Xhr */];
+                        beaconUnloadTransports = [2 /* TransportType.Fetch */, 1 /* TransportType.Xhr */, 3 /* TransportType.Beacon */];
                     }
                     else {
                         // Use XDR/XHR, Fetch or beacons
                         theTransports = [1 /* TransportType.Xhr */, 2 /* TransportType.Fetch */, 3 /* TransportType.Beacon */];
                     }
                     // Prefix any user requested transport(s) values
-                    var configTransports = channelConfig.transports;
-                    if (configTransports) {
-                        if (isNumber(configTransports)) {
-                            theTransports = [configTransports].concat(theTransports);
-                        }
-                        else if (isArray(configTransports)) {
-                            theTransports = configTransports.concat(theTransports);
-                        }
-                    }
+                    theTransports = _prependTransports(theTransports, channelConfig.transports);
                     httpInterface = _getSenderInterface(theTransports, false);
-                    syncHttpInterface = _getSenderInterface(theTransports, true);
                     if (!httpInterface) {
                         _warnToConsole(_logger, "No available transport to send events");
                     }
+                    syncHttpInterface = _getSenderInterface(theTransports, true);
+                }
+                if (!beaconHttpInterface) {
+                    // Allow overriding the usage of sendBeacon
+                    beaconUnloadTransports = _prependTransports(beaconUnloadTransports, channelConfig.unloadTransports);
+                    beaconHttpInterface = _getSenderInterface(beaconUnloadTransports, true);
                 }
+                _canHaveReducedPayload = !_customHttpInterface && ((_useBeacons && isBeaconsSupported()) || (!_disableFetchKeepAlive && isFetchSupported(true)));
                 _sendInterfaces = (_a = {},
                     _a[0 /* EventSendType.Batched */] = httpInterface,
                     _a[1 /* EventSendType.Synchronous */] = syncHttpInterface || _getSenderInterface([1 /* TransportType.Xhr */, 2 /* TransportType.Fetch */, 3 /* TransportType.Beacon */], true),
-                    _a[2 /* EventSendType.SendBeacon */] = beaconHttpInterface || _getSenderInterface([3 /* TransportType.Beacon */, 2 /* TransportType.Fetch */], true) || syncHttpInterface || _getSenderInterface([1 /* TransportType.Xhr */], true),
+                    _a[2 /* EventSendType.SendBeacon */] = beaconHttpInterface || syncHttpInterface || _getSenderInterface([1 /* TransportType.Xhr */], true),
                     _a[3 /* EventSendType.SyncFetch */] = fetchSyncHttpInterface || _getSenderInterface([2 /* TransportType.Fetch */, 3 /* TransportType.Beacon */], true) || syncHttpInterface || _getSenderInterface([1 /* TransportType.Xhr */], true),
                     _a);
             };
@@ -193,7 +212,7 @@ var HttpManager = /** @class */ (function () {
                             sendPostFunc = _xhrSendPost;
                         }
                     }
-                    else if (transportType === 2 /* TransportType.Fetch */ && isFetchSupported(syncSupport)) {
+                    else if (transportType === 2 /* TransportType.Fetch */ && isFetchSupported(syncSupport) && (!syncSupport || (syncSupport && !_disableFetchKeepAlive))) {
                         sendPostFunc = _fetchSendPost;
                     }
                     else if (_useBeacons && transportType === 3 /* TransportType.Beacon */ && isBeaconsSupported()) {
@@ -264,7 +283,9 @@ var HttpManager = /** @class */ (function () {
                         // 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;
-                        theUrl += _noResponseQs;
+                        if (_addNoResponse) {
+                            theUrl += _noResponseQs;
+                        }
                     }
                 }
                 if (_sendCredentials) {
@@ -277,7 +298,7 @@ var HttpManager = /** @class */ (function () {
                 }
                 fetch(theUrl, requestInit).then(function (response) {
                     var headerMap = {};
-                    var responseText = "";
+                    var responseText = STR_EMPTY;
                     var headers = response.headers;
                     if (headers) {
                         headers["forEach"](function (value, name) {
@@ -381,7 +402,7 @@ var HttpManager = /** @class */ (function () {
                 var internalPayloadData = payload;
                 var status = 200;
                 var thePayload = internalPayloadData._thePayload;
-                var theUrl = payload.urlString + _noResponseQs;
+                var theUrl = payload.urlString + (_addNoResponse ? _noResponseQs : STR_EMPTY);
                 try {
                     var nav_1 = getNavigator();
                     if (!nav_1.sendBeacon(theUrl, payload.data)) {
@@ -416,7 +437,7 @@ var HttpManager = /** @class */ (function () {
                     status = 0;
                 }
                 finally {
-                    _doOnComplete(oncomplete, status, {}, "");
+                    _doOnComplete(oncomplete, status, {}, STR_EMPTY);
                 }
             }
             function _isBeaconPayload(sendType) {
@@ -573,14 +594,15 @@ var HttpManager = /** @class */ (function () {
                         var thePayload = null;
                         var serializationStart = getTime();
                         var sendInterface = _sendInterfaces[sendType] || (isSynchronous_1 ? _sendInterfaces[1 /* EventSendType.Synchronous */] : _sendInterfaces[0 /* EventSendType.Batched */]);
+                        var sendTransport = sendInterface && sendInterface._transport;
                         // Sync Fetch has the same payload limitation as sendBeacon -- 64kb limit
-                        var isBeaconTransport = (_isUnloading || _isBeaconPayload(sendType) || (sendInterface && sendInterface._transport === 3 /* TransportType.Beacon */)) && _canUseSendBeaconApi();
+                        var isReducedPayload = _canHaveReducedPayload && (_isUnloading || _isBeaconPayload(sendType) || (sendTransport === 3 /* TransportType.Beacon */ || (sendInterface._isSync && sendTransport === 2 /* TransportType.Fetch */)));
                         while (_canSendPayload(theBatches, sendType, retryCount)) {
                             var theBatch = theBatches.shift();
                             if (theBatch && theBatch.count() > 0) {
                                 if (!_killSwitch.isTenantKilled(theBatch.iKey())) {
                                     // Make sure we have a payload object
-                                    thePayload = thePayload || _serializer.createPayload(retryCount, isTeardown, isSynchronous_1, isBeaconTransport, sendReason, sendType);
+                                    thePayload = thePayload || _serializer.createPayload(retryCount, isTeardown, isSynchronous_1, isReducedPayload, sendReason, sendType);
                                     // Add the batch to the current payload
                                     if (!_serializer.appendPayload(thePayload, theBatch, maxEventsPerBatch)) {
                                         // Entire batch was not added so send the payload and retry adding this batch
@@ -645,7 +667,7 @@ var HttpManager = /** @class */ (function () {
                 }
                 _addRequestDetails(requestDetails, STR_CLIENT_ID, "NO_AUTH", useHeaders);
                 _addRequestDetails(requestDetails, STR_CLIENT_VERSION, FullVersionString, useHeaders);
-                var apiQsKeys = "";
+                var apiQsKeys = STR_EMPTY;
                 arrForEach(thePayload.apiKeys, function (apiKey) {
                     if (apiQsKeys.length > 0) {
                         apiQsKeys += ",";
@@ -672,9 +694,6 @@ var HttpManager = /** @class */ (function () {
                 }
                 return requestDetails;
             }
-            function _canUseSendBeaconApi() {
-                return !_customHttpInterface && _useBeacons && isBeaconsSupported();
-            }
             function _setTimingValue(timings, name, value) {
                 timings[name] = timings[name] || {};
                 timings[name][_postManager.identifier] = value;
@@ -722,11 +741,10 @@ var HttpManager = /** @class */ (function () {
                             headers: requestDetails_1.hdrs,
                             _thePayload: thePayload,
                             _sendReason: sendReason,
-                            timeout: _xhrTimeout
+                            timeout: _xhrTimeout,
+                            disableXhrSync: _disableXhrSync,
+                            disableFetchKeepAlive: _disableFetchKeepAlive
                         };
-                        if (!isUndefined(_disableXhrSync)) {
-                            orgPayloadData.disableXhrSync = !!_disableXhrSync;
-                        }
                         // Only automatically add the following headers if already sending headers and we are not attempting to avoid an options call
                         if (useHeaders_1) {
                             if (!_hasHeader(orgPayloadData.headers, STR_CACHE_CONTROL)) {
@@ -776,7 +794,8 @@ var HttpManager = /** @class */ (function () {
                                         urlString: orgPayloadData.urlString,
                                         headers: extend({}, orgPayloadData.headers),
                                         timeout: orgPayloadData.timeout,
-                                        disableXhrSync: orgPayloadData.disableXhrSync
+                                        disableXhrSync: orgPayloadData.disableXhrSync,
+                                        disableFetchKeepAlive: orgPayloadData.disableFetchKeepAlive
                                     };
                                     var senderCalled_1 = false;
                                     doPerf(_core, function () { return "HttpManager:_doPayloadSend.sendHook"; }, function () {
@@ -983,7 +1002,7 @@ var HttpManager = /** @class */ (function () {
                         return encodeURIComponent(msfpc);
                     }
                 }
-                return "";
+                return STR_EMPTY;
             }
             function _handleCollectorResponse(responseText) {
                 var responseHandlers = _self._responseHandlers;