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

package/dist-esm/src/BatchNotificationActions.js

@@ -1,5 +1,5 @@
 /*
- * 1DS JS SDK POST plugin, 3.1.9
+ * 1DS JS SDK POST plugin, 3.1.10
  * 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.1.9
+ * 1DS JS SDK POST plugin, 3.1.10
  * Copyright (c) Microsoft and contributors. All rights reserved.
  * (Microsoft Internal Only)
  */

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

@@ -0,0 +1,24 @@
+export declare const Method = "POST";
+export declare const DisabledPropertyName: string;
+export declare const strDropped = "drop";
+export declare const strSending = "send";
+export declare const strRequeue = "requeue";
+export declare const strResponseFail = "rspFail";
+export declare const strOther = "oth";
+export declare const defaultCacheControl = "no-cache, no-store";
+export declare const defaultContentType = "application/x-json-stream";
+export declare const strCacheControl = "cache-control";
+export declare const strContentTypeHeader = "content-type";
+export declare const strKillTokensHeader = "kill-tokens";
+export declare const strKillDurationHeader = "kill-duration";
+export declare const strKillDurationSecondsHeader = "kill-duration-seconds";
+export declare const strTimeDeltaHeader = "time-delta-millis";
+export declare const strClientVersion = "client-version";
+export declare const strClientId = "client-id";
+export declare const strTimeDeltaToApply = "time-delta-to-apply-millis";
+export declare const strUploadTime = "upload-time";
+export declare const strApiKey = "apikey";
+export declare const strMsaDeviceTicket = "AuthMsaDeviceTicket";
+export declare const strAuthXToken = "AuthXToken";
+export declare const strSdkVersion = "sdk-version";
+export declare const strMsfpc = "msfpc";

package/dist-esm/src/Constants.js

@@ -0,0 +1,30 @@
+/*
+ * 1DS JS SDK POST plugin, 3.1.10
+ * Copyright (c) Microsoft and contributors. All rights reserved.
+ * (Microsoft Internal Only)
+ */
+export var Method = "POST";
+export var DisabledPropertyName = "Microsoft_ApplicationInsights_BypassAjaxInstrumentation";
+export var strDropped = "drop";
+export var strSending = "send";
+export var strRequeue = "requeue";
+export var strResponseFail = "rspFail";
+export var strOther = "oth";
+export var defaultCacheControl = "no-cache, no-store";
+export var defaultContentType = "application/x-json-stream";
+export var strCacheControl = "cache-control";
+export var strContentTypeHeader = "content-type";
+export var strKillTokensHeader = "kill-tokens";
+export var strKillDurationHeader = "kill-duration";
+export var strKillDurationSecondsHeader = "kill-duration-seconds";
+export var strTimeDeltaHeader = "time-delta-millis";
+export var strClientVersion = "client-version";
+export var strClientId = "client-id";
+export var strTimeDeltaToApply = "time-delta-to-apply-millis";
+export var strUploadTime = "upload-time";
+export var strApiKey = "apikey";
+export var strMsaDeviceTicket = "AuthMsaDeviceTicket";
+export var strAuthXToken = "AuthXToken";
+export var strSdkVersion = "sdk-version";
+export var strMsfpc = "msfpc";
+//# sourceMappingURL=Constants.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"Constants.js.map","sources":["Constants.js"],"sourcesContent":["export var Method = \"POST\";\r\nexport var DisabledPropertyName = \"Microsoft_ApplicationInsights_BypassAjaxInstrumentation\";\r\nexport var strDropped = \"drop\";\r\nexport var strSending = \"send\";\r\nexport var strRequeue = \"requeue\";\r\nexport var strResponseFail = \"rspFail\";\r\nexport var strOther = \"oth\";\r\nexport var defaultCacheControl = \"no-cache, no-store\";\r\nexport var defaultContentType = \"application/x-json-stream\";\r\nexport var strCacheControl = \"cache-control\";\r\nexport var strContentTypeHeader = \"content-type\";\r\nexport var strKillTokensHeader = \"kill-tokens\";\r\nexport var strKillDurationHeader = \"kill-duration\";\r\nexport var strKillDurationSecondsHeader = \"kill-duration-seconds\";\r\nexport var strTimeDeltaHeader = \"time-delta-millis\";\r\nexport var strClientVersion = \"client-version\";\r\nexport var strClientId = \"client-id\";\r\nexport var strTimeDeltaToApply = \"time-delta-to-apply-millis\";\r\nexport var strUploadTime = \"upload-time\";\r\nexport var strApiKey = \"apikey\";\r\nexport var strMsaDeviceTicket = \"AuthMsaDeviceTicket\";\r\nexport var strAuthXToken = \"AuthXToken\";\r\nexport var strSdkVersion = \"sdk-version\";\r\nexport var strMsfpc = \"msfpc\";\r\n//# sourceMappingURL=Constants.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"}

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

@@ -132,6 +132,12 @@ export interface IChannelConfiguration {
      * This is used during initialization to identify the requested send transport, it will be ignored if a httpXHROverride is provided.
      */
     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.
+     */
+    avoidOptions?: 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.1.9
+ * 1DS JS SDK POST plugin, 3.1.10
  * Copyright (c) Microsoft and contributors. All rights reserved.
  * (Microsoft Internal Only)
  */

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

@@ -20,6 +20,10 @@ export declare class EventBatch {
      * Returns the iKey associated with this batch of events
      */
     iKey: () => string;
+    /**
+     * Returns the first msfpc value from the batch
+     */
+    Msfpc: () => string;
     /**
      * Returns the number of events contained in the batch
      */
@@ -29,10 +33,9 @@ export declare class EventBatch {
      * Add all of the events to the current batch, if the max number of events would be exceeded then no
      * events are added.
      * @param theEvents - The events that needs to be batched.
-     * @param append - True (default) add the event to the end of the queue otherwise prepend (used for re-queuing)
      * @returns The number of events added.
      */
-    addEvents: (theEvents: IPostTransmissionTelemetryItem[], append: boolean) => number;
+    addEvent: (theEvents: IPostTransmissionTelemetryItem) => boolean;
     /**
      * Split this batch into 2 with any events > fromEvent returned in the new batch and all other
      * events are kept in the current batch.

package/dist-esm/src/EventBatch.js

@@ -1,9 +1,24 @@
 /*
- * 1DS JS SDK POST plugin, 3.1.9
+ * 1DS JS SDK POST plugin, 3.1.10
  * Copyright (c) Microsoft and contributors. All rights reserved.
  * (Microsoft Internal Only)
  */
-import { isNullOrUndefined } from "@microsoft/1ds-core-js";
+import { isNullOrUndefined, isValueAssigned } from "@microsoft/1ds-core-js";
+import { strMsfpc } from "./Constants";
+function _getEventMsfpc(theEvent) {
+    var intWeb = ((theEvent.ext || {})["intweb"]);
+    if (intWeb && 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;
+}
 /**
 * This class defines a "batch" events related to a specific iKey, it is used by the PostChannel and HttpManager
 * to collect and transfer ownership of events without duplicating them in-memory. This reduces the previous
@@ -19,39 +34,44 @@ 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 the cached value unless it's undefined -- used to avoid cpu
+            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);
-                }
-                else {
-                    events = theEvents.concat(events);
+        _self.addEvent = function (theEvent) {
+            if (theEvent) {
+                events.push(theEvent);
+                if (!_msfpc) {
+                    // Not found so try and find one
+                    _msfpc = _getEventMsfpc(theEvent);
                 }
-                return theEvents.length;
+                return true;
             }
-            return 0;
+            return false;
         };
         _self.split = function (fromEvent, numEvents) {
             // Create a new batch with the same iKey
-            var newBatch = new EventBatch(iKey);
+            var theEvents;
             if (fromEvent < events.length) {
                 var cnt = events.length - fromEvent;
                 if (!isNullOrUndefined(numEvents)) {
                     cnt = numEvents < cnt ? numEvents : cnt;
                 }
-                newBatch.addEvents(events.splice(fromEvent, cnt), true);
+                theEvents = events.splice(fromEvent, cnt);
+                // reset the fetched msfpc value
+                _msfpc = _getMsfpc(events);
             }
-            return newBatch;
+            return new EventBatch(iKey, theEvents);
         };
     }
     /**

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

@@ -1 +1 @@
-{"version":3,"file":"EventBatch.js.map","sources":["EventBatch.js"],"sourcesContent":["import { isNullOrUndefined } from \"@microsoft/1ds-core-js\";\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        _self.iKey = function () {\r\n            return iKey;\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.addEvents = function (theEvents, append) {\r\n            if (append === void 0) { append = true; }\r\n            if (theEvents && theEvents.length > 0) {\r\n                if (append) {\r\n                    events = events.concat(theEvents);\r\n                }\r\n                else {\r\n                    events = theEvents.concat(events);\r\n                }\r\n                return theEvents.length;\r\n            }\r\n            return 0;\r\n        };\r\n        _self.split = function (fromEvent, numEvents) {\r\n            // Create a new batch with the same iKey\r\n            var newBatch = new EventBatch(iKey);\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                newBatch.addEvents(events.splice(fromEvent, cnt), true);\r\n            }\r\n            return newBatch;\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"}
+{"version":3,"file":"EventBatch.js.map","sources":["EventBatch.js"],"sourcesContent":["import { isNullOrUndefined, isValueAssigned } from \"@microsoft/1ds-core-js\";\r\nimport { strMsfpc } from \"./Constants\";\r\nfunction _getEventMsfpc(theEvent) {\r\n    var intWeb = ((theEvent.ext || {})[\"intweb\"]);\r\n    if (intWeb && isValueAssigned(intWeb[strMsfpc])) {\r\n        return intWeb[strMsfpc];\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"}

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

@@ -11,7 +11,7 @@ import { IChannelConfiguration } from "./Index";
 /**
  * Class managing the sending of requests.
  */
-export default class HttpManager {
+export declare class HttpManager {
     sendHook: PayloadPreprocessorFunction | undefined;
     sendListener: PayloadListenerFunction | undefined;
     _responseHandlers: Array<(responseText: string) => void>;

package/dist-esm/src/HttpManager.js

@@ -1,5 +1,5 @@
 /*
- * 1DS JS SDK POST plugin, 3.1.9
+ * 1DS JS SDK POST plugin, 3.1.10
  * Copyright (c) Microsoft and contributors. All rights reserved.
  * (Microsoft Internal Only)
  */
@@ -15,21 +15,7 @@ import RetryPolicy from "./RetryPolicy";
 import EVTKillSwitch from "./KillSwitch";
 import EVTClockSkewManager from "./ClockSkewManager";
 import dynamicProto from "@microsoft/dynamicproto-js";
-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";
+import { defaultCacheControl, defaultContentType, DisabledPropertyName, Method, strApiKey, strCacheControl, strClientId, strClientVersion, strContentTypeHeader, strDropped, strKillDurationHeader, strKillDurationSecondsHeader, strKillTokensHeader, strMsaDeviceTicket, strMsfpc, strOther, strRequeue, strResponseFail, strSending, strTimeDeltaHeader, strTimeDeltaToApply, strUploadTime } from "./Constants";
 /**
  * Identifies the default notification reason to the action names
  */
@@ -40,6 +26,13 @@ var _eventActionMap = (_a = {},
     _a[8004 /* KillSwitch */] = strDropped,
     _a[8003 /* SizeLimitExceeded */] = strDropped,
     _a);
+var _collectorQsHeaders = {};
+var _collectorHeaderToQs = {};
+function _addCollectorHeaderQsMapping(qsName, headerName) {
+    _collectorQsHeaders[qsName] = headerName;
+    _collectorHeaderToQs[headerName] = qsName;
+}
+_addCollectorHeaderQsMapping(strMsaDeviceTicket, strMsaDeviceTicket);
 function _getResponseText(xhr) {
     try {
         return xhr.responseText;
@@ -67,6 +60,17 @@ function _hasHeader(headers, header) {
     }
     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;
+        }
+    }
+}
 /**
  * Class managing the sending of requests.
  */
@@ -77,8 +81,7 @@ var HttpManager = /** @class */ (function () {
      */
     function HttpManager(maxEventsPerBatch, maxConnections, maxRetries, actions) {
         this._responseHandlers = [];
-        var _urlString = "?cors=true&" + strContentTypeHeader.toLowerCase() + "=" + defaultContentType + "&client-id=NO_AUTH&client-version="
-            + FullVersionString;
+        var _urlString = "?cors=true&" + strContentTypeHeader.toLowerCase() + "=" + defaultContentType;
         var _killSwitch = new EVTKillSwitch();
         var _paused = false;
         var _clockSkewManager = new EVTClockSkewManager();
@@ -95,6 +98,7 @@ var HttpManager = /** @class */ (function () {
         var _enableEventTimings = false;
         var _cookieMgr;
         var _isUnloading = false;
+        var _useHeaders = false;
         dynamicProto(HttpManager, this, function (_self) {
             var _sendCredentials = true;
             _self.initialize = function (endpointUrl, core, postChannel, httpInterface, channelConfig) {
@@ -103,6 +107,8 @@ var HttpManager = /** @class */ (function () {
                     channelConfig = {};
                 }
                 _urlString = endpointUrl + _urlString;
+                // Task 12886642: Defaulting to 'false' until the Collector handles sending upload-time header in the OPTIONS call
+                _useHeaders = !isUndefined(channelConfig.avoidOptions) ? !channelConfig.avoidOptions : false;
                 _core = core;
                 _cookieMgr = core.getCookieMgr();
                 _enableEventTimings = !_core.config.disableEventTimings;
@@ -113,12 +119,6 @@ var HttpManager = /** @class */ (function () {
                 if (!isUndefined(channelConfig.enableCompoundKey)) {
                     enableCompoundKey = !!channelConfig.enableCompoundKey;
                 }
-                // For this to work the collection MUST return "Cache-control" in the OPTIONS response in the Allow-Control-Allow-Headers
-                // ONLY un-comment the below once the collector has changed and deployed.
-                // if (!!channelConfig.disableCacheHeader) {
-                //     // Stop Chrome from stalling/throttling requests see task #7178858
-                //     _self.addHeader("Cache-control", "no-cache, no-store");
-                // }
                 _useBeacons = !isReactNative(); // Only use beacons if not running in React Native
                 _serializer = new Serializer(_core, valueSanitizer, stringifyObjects, enableCompoundKey);
                 var syncHttpInterface = httpInterface;
@@ -229,6 +229,8 @@ var HttpManager = /** @class */ (function () {
             }
             function _fetchSendPost(payload, oncomplete, sync) {
                 var _a;
+                var ignoreResponse = false;
+                var responseHandled = false;
                 var requestInit = (_a = {
                         body: payload.data,
                         method: Method
@@ -237,6 +239,11 @@ var HttpManager = /** @class */ (function () {
                     _a);
                 if (sync) {
                     requestInit.keepalive = true;
+                    if (payload._sendReason === 2 /* Unload */) {
+                        // As a sync request (during unload), it is unlikely that we will get a chance to process the response so
+                        // just like beacon send assume that the events have been accepted and processed
+                        ignoreResponse = true;
+                    }
                 }
                 if (_sendCredentials) {
                     // Don't send credentials when URL is file://
@@ -259,13 +266,24 @@ var HttpManager = /** @class */ (function () {
                             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) {
                     // In case there is an error in the request. Set the status to 0
                     // so that the events can be retried later.
-                    _doOnComplete(oncomplete, 0, {});
+                    if (!responseHandled) {
+                        responseHandled = true;
+                        _doOnComplete(oncomplete, 0, {});
+                    }
                 });
+                if (ignoreResponse && !responseHandled) {
+                    // Assume success during unload processing
+                    responseHandled = true;
+                    _doOnComplete(oncomplete, 200, {});
+                }
             }
             function _xhrSendPost(payload, oncomplete, sync) {
                 function _appendHeader(theHeaders, xhr, name) {
@@ -563,8 +581,34 @@ var HttpManager = /** @class */ (function () {
                     _postManager.diagLog().throwInternal(LoggingSeverity.WARNING, _ExtendedInternalMessageId.CannotSerializeObject, "Unexpected Exception sending batch: " + dumpObj(ex));
                 }
             }
-            function _buildQueryString(thePayload) {
-                var urlString = _urlString;
+            function _buildRequestDetails(thePayload, useHeaders) {
+                var requestDetails = {
+                    url: _urlString,
+                    hdrs: {},
+                    useHdrs: false // Assume no headers
+                };
+                // ----------------------------------------------------------------------------------------------------------------
+                // Task 12886642: Need to wait until an updated version of the collector is released to return these as allowed in the OPTIONS call
+                // ----------------------------------------------------------------------------------------------------------------
+                // if (!useHeaders) {
+                //     // Attempt to map headers to a query string if possible
+                //     objForEachKey(_headers, (name, value) => {
+                //         if (_collectorHeaderToQs[name]) {
+                //             _addRequestDetails(requestDetails, _collectorHeaderToQs[name], value, false);
+                //         } else {
+                //             // No mapping, so just include in the headers anyway (may not get sent if using sendBeacon())
+                //             requestDetails.hdrs[name] = value;
+                //             requestDetails.useHdrs = true;
+                //         }
+                //     });
+                // } else {
+                // Copy the pre-defined headers into the payload headers
+                requestDetails.hdrs = extend(requestDetails.hdrs, _headers);
+                requestDetails.useHdrs = (objKeys(requestDetails.hdrs).length > 0);
+                // }
+                // ----------------------------------------------------------------------------------------------------------------
+                _addRequestDetails(requestDetails, strClientId, "NO_AUTH", useHeaders);
+                _addRequestDetails(requestDetails, strClientVersion, FullVersionString, useHeaders);
                 var apiQsKeys = "";
                 arrForEach(thePayload.apiKeys, function (apiKey) {
                     if (apiQsKeys.length > 0) {
@@ -572,27 +616,25 @@ var HttpManager = /** @class */ (function () {
                     }
                     apiQsKeys += apiKey;
                 });
-                if (apiQsKeys.length > 0) {
-                    urlString += "&apikey=" + apiQsKeys;
-                }
-                urlString += "&upload-time=" + dateNow().toString();
+                _addRequestDetails(requestDetails, strApiKey, apiQsKeys, useHeaders);
+                _addRequestDetails(requestDetails, strUploadTime, dateNow().toString(), useHeaders);
                 var msfpc = _getMsfpc(thePayload);
                 if (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 && isBeaconsSupported();
@@ -603,7 +645,19 @@ var HttpManager = /** @class */ (function () {
             }
             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];
+                    // Send all data using a beacon style transport if closing mode is on or channel was teared down
+                    if (!_isBeaconPayload(thePayload.sendType) && thePayload.isBeacon && thePayload.sendReason === 2 /* Unload */) {
+                        sendInterface_1 = _sendInterfaces[2 /* SendBeacon */] || _sendInterfaces[3 /* SyncFetch */] || sendInterface_1;
+                    }
+                    var useHeaders_1 = _useHeaders;
+                    // Disable header usage if we know we are using sendBeacon as additional headers are not supported
+                    if (thePayload.isBeacon || sendInterface_1._transport === 3 /* Beacon */) {
+                        useHeaders_1 = false;
+                    }
+                    var requestDetails_1 = _buildRequestDetails(thePayload, useHeaders_1);
+                    useHeaders_1 = useHeaders_1 || requestDetails_1.useHdrs;
                     var sendEventStart_1 = getTime();
                     var strSendAttempt_1 = "sendAttempt";
                     doPerf(_core, function () { return "HttpManager:_doPayloadSend"; }, function () {
@@ -629,25 +683,22 @@ var HttpManager = /** @class */ (function () {
                         // eslint-disable-next-line prefer-const
                         var orgPayloadData = {
                             data: thePayload.payloadBlob,
-                            urlString: urlString_1,
-                            headers: extend({}, _headers),
+                            urlString: requestDetails_1.url,
+                            headers: requestDetails_1.hdrs,
                             _thePayload: thePayload,
                             _sendReason: sendReason
                         };
-                        if (!_hasHeader(orgPayloadData.headers, strCacheControl)) {
-                            orgPayloadData.headers[strCacheControl] = defaultCacheControl;
-                        }
-                        if (!_hasHeader(orgPayloadData.headers, strContentTypeHeader)) {
-                            orgPayloadData.headers[strContentTypeHeader] = defaultContentType;
+                        // 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, 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];
-                        // Send all data using a beacon style transport if closing mode is on or channel was teared down
-                        if (!_isBeaconPayload(thePayload.sendType) && thePayload.isBeacon && thePayload.sendReason === 2 /* Unload */) {
-                            sendInterface = _sendInterfaces[2 /* SendBeacon */] || _sendInterfaces[3 /* SyncFetch */] || sendInterface;
-                        }
-                        if (sendInterface) {
+                        if (sendInterface_1) {
                             // Send sync requests if the request is immediate or we are tearing down telemetry.
                             sender = function (payload) {
                                 // Notify the clock skew manager that we are sending the first request (Potentially blocking all further requests)
@@ -657,7 +708,7 @@ var HttpManager = /** @class */ (function () {
                                 };
                                 var isSync = thePayload.isTeardown || thePayload.isSync;
                                 try {
-                                    sendInterface.sendPOST(payload, onComplete, isSync);
+                                    sendInterface_1.sendPOST(payload, onComplete, isSync);
                                     if (_self.sendListener) {
                                         // Send the original payload to the listener
                                         _self.sendListener(orgPayloadData, payload, isSync, thePayload.isBeacon);
@@ -675,7 +726,7 @@ var HttpManager = /** @class */ (function () {
                                     _outstandingRequests++;
                                 }
                                 // Only call the hook if it's defined and we are not using sendBeacon as additional headers are not supported
-                                if (useSendHook && !thePayload.isBeacon && sendInterface._transport !== 3 /* Beacon */) {
+                                if (useSendHook_1 && !thePayload.isBeacon && sendInterface_1._transport !== 3 /* Beacon */) {
                                     // Create a new IPayloadData that is sent into the hook method, so that the hook method
                                     // can't change the object references to the orgPayloadData (it can still change the content -- mainly the headers)
                                     // Disabling the use of const because of Issue: 
@@ -880,12 +931,9 @@ var HttpManager = /** @class */ (function () {
             }
             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 (isValueAssigned(intWeb["msfpc"])) {
-                            return encodeURIComponent(intWeb["msfpc"]);
-                        }
+                    var msfpc = thePayload.batches[lp].Msfpc();
+                    if (msfpc) {
+                        return encodeURIComponent(msfpc);
                     }
                 }
                 return "";
@@ -903,9 +951,9 @@ var HttpManager = /** @class */ (function () {
                     }
                     if (responseText) {
                         var response = JSON.parse(responseText);
-                        if (isValueAssigned(response.webResult) && isValueAssigned(response.webResult.msfpc)) {
+                        if (isValueAssigned(response.webResult) && isValueAssigned(response.webResult[strMsfpc])) {
                             // Set cookie
-                            _cookieMgr.set("MSFPC", response.webResult.msfpc, 365 * 86400);
+                            _cookieMgr.set("MSFPC", response.webResult[strMsfpc], 365 * 86400);
                         }
                     }
                 }
@@ -963,5 +1011,5 @@ var HttpManager = /** @class */ (function () {
 // Removed Stub for HttpManager.prototype.sendSynchronousBatch.
     return HttpManager;
 }());
-export default HttpManager;
+export { HttpManager };
 //# sourceMappingURL=HttpManager.js.map