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

package/dist/ms.post.js

@@ -1,5 +1,5 @@
 /*!
- * 1DS JS SDK POST plugin, 3.1.10
+ * 1DS JS SDK POST plugin, 3.1.11
  * Copyright (c) Microsoft and contributors. All rights reserved.
  * (Microsoft Internal Only)
  */
@@ -38,6 +38,7 @@
     var strUploadTime = "upload-time";
     var strApiKey = "apikey";
     var strMsaDeviceTicket = "AuthMsaDeviceTicket";
+    var strNoResponseBody = "NoResponseBody";
     var strMsfpc = "msfpc";
 
     function _getEventMsfpc(theEvent) {
@@ -458,6 +459,8 @@
     }());
 
     var _a;
+    var strSendAttempt = "sendAttempt";
+    var _noResponseQs = "&" + strNoResponseBody + "=true";
     var _eventActionMap = (_a = {},
         _a[1 ] = strRequeue,
         _a[100 ] = strRequeue,
@@ -510,7 +513,7 @@
         }
     }
     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;
             var _killSwitch = new KillSwitch();
@@ -530,6 +533,8 @@
             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) {
@@ -549,9 +554,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();
@@ -583,8 +592,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) {
@@ -624,6 +633,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);
@@ -647,6 +659,7 @@
                 }
                 function _fetchSendPost(payload, oncomplete, sync) {
                     var _a;
+                    var theUrl = payload.urlString;
                     var ignoreResponse = false;
                     var responseHandled = false;
                     var requestInit = (_a = {
@@ -659,6 +672,7 @@
                         requestInit.keepalive = true;
                         if (payload._sendReason === 2 ) {
                             ignoreResponse = true;
+                            theUrl += _noResponseQs;
                         }
                     }
                     if (_sendCredentials) {
@@ -667,7 +681,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) {
@@ -695,8 +709,17 @@
                         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);
@@ -721,22 +744,25 @@
                     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 {
@@ -750,16 +776,17 @@
                     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;
                                             }
@@ -1002,7 +1029,6 @@
                         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];
@@ -1015,7 +1041,7 @@
                                         _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);
@@ -1024,8 +1050,12 @@
                                 urlString: requestDetails_1.url,
                                 headers: requestDetails_1.hdrs,
                                 _thePayload: thePayload,
-                                _sendReason: sendReason
+                                _sendReason: sendReason,
+                                timeout: _xhrTimeout
                             };
+                            if (!_1dsCoreJs.isUndefined(_disableXhrSync)) {
+                                orgPayloadData.disableXhrSync = !!_disableXhrSync;
+                            }
                             if (useHeaders_1) {
                                 if (!_hasHeader(orgPayloadData.headers, strCacheControl)) {
                                     orgPayloadData.headers[strCacheControl] = defaultCacheControl;
@@ -1063,7 +1093,9 @@
                                         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 () {
@@ -1128,7 +1160,7 @@
                                     });
                                 });
                             }
-                            if (status == 200) {
+                            if (status == 200 || status == 204) {
                                 reason = 200 ;
                                 return;
                             }
@@ -1141,7 +1173,7 @@
                             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 ) {
@@ -1152,6 +1184,9 @@
                                 }
                                 else {
                                     backOffTrans = true;
+                                    if (_isUnloading) {
+                                        reason = 8001 ;
+                                    }
                                 }
                             }
                         }
@@ -1297,19 +1332,22 @@
     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 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.10';
+            _this.version = '3.1.11';
             var _config;
             var _isTeardownCalled = false;
             var _flushCallbackQueue = [];
@@ -1334,11 +1372,13 @@
             var _delayedBatchReason;
             var _optimizeObject = true;
             var _isPageUnloadTriggered = false;
+            var _maxEventSendAttempts = MaxSendAttempts;
+            var _maxUnloadEventSendAttempts = MaxSyncUnloadSendAttempts;
             dynamicProto__default(PostChannel, _this, function (_self, _base) {
                 _initializeProfiles();
                 _clearQueues();
                 _setAutoLimits();
-                _httpManager = new HttpManager(MaxNumberEventPerBatch, MaxConnections, MaxRetries, {
+                _httpManager = new HttpManager(MaxNumberEventPerBatch, MaxConnections, MaxRequestRetriesBeforeBackoff, {
                     requeue: _requeueEvents,
                     send: _sendingEvent,
                     sent: _eventsSentEvent,
@@ -1360,14 +1400,7 @@
                         _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;
-                            }
-                            return wparam | existingGetWParamMethod();
-                        };
+                        _hookWParam(extendedCore);
                         if (_config.eventsLimitInMem > 0) {
                             _queueSizeLimit = _config.eventsLimitInMem;
                         }
@@ -1377,6 +1410,12 @@
                         if (_config.autoFlushEventsLimit > 0) {
                             _autoFlushEventsLimit = _config.autoFlushEventsLimit;
                         }
+                        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;
@@ -1389,21 +1428,10 @@
                         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);
-                            }
-                            _releaseAllQueues(2 , 2 );
-                        }
                         var excludePageUnloadEvents = coreConfig.disablePageUnloadEvents || [];
                         _1dsCoreJs.addPageUnloadEventListener(_handleUnloadEvents, excludePageUnloadEvents);
                         _1dsCoreJs.addPageHideEventListener(_handleUnloadEvents, excludePageUnloadEvents);
-                        _1dsCoreJs.addPageShowEventListener(function (evt) {
-                            _isPageUnloadTriggered = false;
-                            _httpManager.setUnloading(_isPageUnloadTriggered);
-                        }, coreConfig.disablePageShowEvents);
+                        _1dsCoreJs.addPageShowEventListener(_handleShowEvents, coreConfig.disablePageShowEvents);
                         _self.setInitialized(true);
                     }, function () { return ({ coreConfig: coreConfig, core: core, extensions: extensions }); });
                 };
@@ -1433,6 +1461,28 @@
                     }
                     _self.processNext(event, itemCtx);
                 };
+                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;
@@ -1862,6 +1912,10 @@
                 }
                 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) {
@@ -1870,7 +1924,7 @@
                                         theEvent.latency = _1dsCoreJs.EventLatency.Immediate;
                                         theEvent.sync = false;
                                     }
-                                    if (theEvent.sendAttempt < MaxSendAttempts) {
+                                    if (theEvent.sendAttempt < maxSendAttempts) {
                                         _1dsCoreJs.setProcessTelemetryTimings(theEvent, _self.identifier);
                                         _addEventToQueues(theEvent, false);
                                     }