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

package/dist/ms.post.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)
  */
@@ -17,42 +17,81 @@
     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 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);
-                    }
-                    else {
-                        events = theEvents.concat(events);
+            _self.addEvent = function (theEvent) {
+                if (theEvent) {
+                    events.push(theEvent);
+                    if (!_msfpc) {
+                        _msfpc = _getEventMsfpc(theEvent);
                     }
-                    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) {
@@ -419,21 +458,6 @@
     }());
 
     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 _eventActionMap = (_a = {},
         _a[1 ] = strRequeue,
         _a[100 ] = strRequeue,
@@ -441,6 +465,13 @@
         _a[8004 ] = strDropped,
         _a[8003 ] = 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;
@@ -467,11 +498,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) {
             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 +529,7 @@
             var _enableEventTimings = false;
             var _cookieMgr;
             var _isUnloading = false;
+            var _useHeaders = false;
             dynamicProto__default(HttpManager, this, function (_self) {
                 var _sendCredentials = true;
                 _self.initialize = function (endpointUrl, core, postChannel, httpInterface, channelConfig) {
@@ -496,6 +538,7 @@
                         channelConfig = {};
                     }
                     _urlString = endpointUrl + _urlString;
+                    _useHeaders = !_1dsCoreJs.isUndefined(channelConfig.avoidOptions) ? !channelConfig.avoidOptions : false;
                     _core = core;
                     _cookieMgr = core.getCookieMgr();
                     _enableEventTimings = !_core.config.disableEventTimings;
@@ -604,6 +647,8 @@
                 }
                 function _fetchSendPost(payload, oncomplete, sync) {
                     var _a;
+                    var ignoreResponse = false;
+                    var responseHandled = false;
                     var requestInit = (_a = {
                             body: payload.data,
                             method: Method
@@ -612,6 +657,9 @@
                         _a);
                     if (sync) {
                         requestInit.keepalive = true;
+                        if (payload._sendReason === 2 ) {
+                            ignoreResponse = true;
+                        }
                     }
                     if (_sendCredentials) {
                         requestInit.credentials = "include";
@@ -632,11 +680,21 @@
                                 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, {});
+                    }
                 }
                 function _xhrSendPost(payload, oncomplete, sync) {
                     function _appendHeader(theHeaders, xhr, name) {
@@ -886,8 +944,16 @@
                         _postManager.diagLog().throwInternal(_1dsCoreJs.LoggingSeverity.WARNING, _1dsCoreJs._ExtendedInternalMessageId.CannotSerializeObject, "Unexpected Exception sending batch: " + _1dsCoreJs.dumpObj(ex));
                     }
                 }
-                function _buildQueryString(thePayload) {
-                    var urlString = _urlString;
+                function _buildRequestDetails(thePayload, useHeaders) {
+                    var requestDetails = {
+                        url: _urlString,
+                        hdrs: {},
+                        useHdrs: false
+                    };
+                    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 +961,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,7 +990,17 @@
                 }
                 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 () {
@@ -947,24 +1021,21 @@
                             _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
                             };
-                            if (!_hasHeader(orgPayloadData.headers, strCacheControl)) {
-                                orgPayloadData.headers[strCacheControl] = defaultCacheControl;
-                            }
-                            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 +1043,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,7 +1059,7 @@
                                     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,
@@ -1155,12 +1226,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 "";
@@ -1178,8 +1246,8 @@
                         }
                         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);
                             }
                         }
                     }
@@ -1241,7 +1309,7 @@
             var _this = _super.call(this) || this;
             _this.identifier = "PostChannel";
             _this.priority = 1011;
-            _this.version = '3.1.9';
+            _this.version = '3.1.10';
             var _config;
             var _isTeardownCalled = false;
             var _flushCallbackQueue = [];
@@ -1514,7 +1582,7 @@
                     }
                 };
                 _self.setMsaAuthTicket = function (ticket) {
-                    _httpManager.addHeader("AuthMsaDeviceTicket", ticket);
+                    _httpManager.addHeader(strMsaDeviceTicket, ticket);
                 };
                 _self.hasEvents = _hasEvents;
                 _self._setTransmitProfile = function (profileName) {
@@ -1651,7 +1719,7 @@
                     }
                     var latency = event.latency;
                     var eventBatch = _getEventBatch(event.iKey, latency, true);
-                    if (eventBatch.addEvents([event], append)) {
+                    if (eventBatch.addEvent(event)) {
                         if (latency !== _1dsCoreJs.EventLatency.Immediate) {
                             _queueSize++;
                             if (append && event.sendAttempt === 0) {