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

package/dist/ms.post.js

@@ -1,13 +1,13 @@
 /*!
- * 1DS JS SDK POST plugin, 3.2.0
+ * 1DS JS SDK POST plugin, 3.2.3
  * Copyright (c) Microsoft and contributors. All rights reserved.
  * (Microsoft Internal Only)
  */
 (function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@microsoft/applicationinsights-shims'), require('@microsoft/1ds-core-js'), require('@microsoft/dynamicproto-js')) :
-    typeof define === 'function' && define.amd ? define(['exports', '@microsoft/applicationinsights-shims', '@microsoft/1ds-core-js', '@microsoft/dynamicproto-js'], factory) :
-    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.oneDS = global.oneDS || {}, global.applicationinsightsShims, global._1dsCoreJs, global.dynamicProto));
-})(this, (function (exports, applicationinsightsShims, _1dsCoreJs, dynamicProto) { 'use strict';
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@microsoft/applicationinsights-shims'), require('@microsoft/dynamicproto-js'), require('@microsoft/1ds-core-js')) :
+    typeof define === 'function' && define.amd ? define(['exports', '@microsoft/applicationinsights-shims', '@microsoft/dynamicproto-js', '@microsoft/1ds-core-js'], factory) :
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.oneDS = global.oneDS || {}, global.applicationinsightsShims, global.dynamicProto, global._1dsCoreJs));
+})(this, (function (exports, applicationinsightsShims, dynamicProto, _1dsCoreJs) { 'use strict';
 
     function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e["default"] : e; }
 
@@ -517,7 +517,7 @@
         }
     }
     var HttpManager = /** @class */ (function () {
-        function HttpManager(maxEventsPerBatch, maxConnections, maxRequestRetriesBeforeBackoff, actions) {
+        function HttpManager(maxEventsPerBatch, maxConnections, maxRequestRetriesBeforeBackoff, actions, timeoutOverride) {
             this._responseHandlers = [];
             var _urlString = "?cors=true&" + strContentTypeHeader.toLowerCase() + "=" + defaultContentType;
             var _killSwitch = new KillSwitch();
@@ -656,7 +656,7 @@
                         xdr.send(payload.data);
                     }
                     else {
-                        _postManager._setTimeoutOverride(function () {
+                        timeoutOverride.set(function () {
                             xdr.send(payload.data);
                         }, 0);
                     }
@@ -714,7 +714,7 @@
                         _doOnComplete(oncomplete, 200, {});
                     }
                     if (!responseHandled && payload.timeout > 0) {
-                        _postManager._setTimeoutOverride(function () {
+                        timeoutOverride.set(function () {
                             if (!responseHandled) {
                                 responseHandled = true;
                                 _doOnComplete(oncomplete, 500, {});
@@ -1253,7 +1253,7 @@
                         cb();
                     }
                     else {
-                        _postManager._setTimeoutOverride(cb, interval);
+                        timeoutOverride.set(cb, interval);
                     }
                 }
                 function _convertAllHeadersToMap(headersString) {
@@ -1345,13 +1345,29 @@
         return HttpManager;
     }());
 
+    function defaultSetTimeout(callback, ms) {
+        var args = [];
+        for (var _i = 2; _i < arguments.length; _i++) {
+            args[_i - 2] = arguments[_i];
+        }
+        return setTimeout(callback, ms, args);
+    }
+    function defaultClearTimeout(timeoutId) {
+        clearTimeout(timeoutId);
+    }
+    function createTimeoutWrapper(argSetTimeout, argClearTimeout) {
+        return {
+            set: argSetTimeout || defaultSetTimeout,
+            clear: argClearTimeout || defaultClearTimeout
+        };
+    }
+
     var FlushCheckTimer = 0.250;
     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 MaxRequestRetriesBeforeBackoff = 1;
     var strEventsDiscarded = "eventsDiscarded";
@@ -1365,7 +1381,7 @@
             var _this = _super.call(this) || this;
             _this.identifier = "PostChannel";
             _this.priority = 1011;
-            _this.version = '3.2.0';
+            _this.version = '3.2.3';
             var _config;
             var _isTeardownCalled = false;
             var _flushCallbackQueue = [];
@@ -1390,10 +1406,10 @@
             var _delayedBatchReason;
             var _optimizeObject = true;
             var _isPageUnloadTriggered = false;
-            var _disableXhrSync = false;
             var _maxEventSendAttempts = MaxSendAttempts;
             var _maxUnloadEventSendAttempts = MaxSyncUnloadSendAttempts;
             var _evtNamespace;
+            var _timeoutWrapper;
             dynamicProto__default(PostChannel, _this, function (_self, _base) {
                 _initDefaults();
                 _self["_getDbgPlgTargets"] = function () {
@@ -1409,8 +1425,7 @@
                             var ctx = _self._getTelCtx();
                             coreConfig.extensionConfig[_self.identifier] = coreConfig.extensionConfig[_self.identifier] || {};
                             _config = ctx.getExtCfg(_self.identifier);
-                            _self._setTimeoutOverride = _config.setTimeoutOverride ? _config.setTimeoutOverride : setTimeout.bind(globalContext);
-                            _self._clearTimeoutOverride = _config.clearTimeoutOverride ? _config.clearTimeoutOverride : clearTimeout.bind(globalContext);
+                            _timeoutWrapper = createTimeoutWrapper(_config.setTimeoutOverride, _config.clearTimeoutOverride);
                             _optimizeObject = !_config.disableOptimizeObj && _1dsCoreJs.isChromium();
                             _hookWParam(extendedCore);
                             if (_config.eventsLimitInMem > 0) {
@@ -1422,7 +1437,6 @@
                             if (_config.autoFlushEventsLimit > 0) {
                                 _autoFlushEventsLimit = _config.autoFlushEventsLimit;
                             }
-                            _disableXhrSync = _config.disableXhrSync;
                             if (_1dsCoreJs.isNumber(_config[strMaxEventRetryAttempts])) {
                                 _maxEventSendAttempts = _config[strMaxEventRetryAttempts];
                             }
@@ -1630,13 +1644,13 @@
                 _self.flush = function (async, callback, sendReason) {
                     if (async === void 0) { async = true; }
                     if (!_paused) {
-                        _clearScheduledTimer();
                         sendReason = sendReason || 1 ;
                         if (async) {
-                            _queueBatches(1 , 0 , sendReason);
-                            _resetQueueCounts();
                             if (_flushCallbackTimerId == null) {
+                                _clearScheduledTimer();
+                                _queueBatches(1 , 0 , sendReason);
                                 _flushCallbackTimerId = _createTimer(function () {
+                                    _flushCallbackTimerId = null;
                                     _flushImpl(callback, sendReason);
                                 }, 0);
                             }
@@ -1645,10 +1659,14 @@
                             }
                         }
                         else {
+                            var cleared = _clearScheduledTimer();
                             _sendEventsForLatencyAndAbove(1 , 1 , sendReason);
                             if (callback !== null && callback !== undefined) {
                                 callback();
                             }
+                            if (cleared) {
+                                _scheduleTimer();
+                            }
                         }
                     }
                 };
@@ -1739,10 +1757,10 @@
                     _delayedBatchReason = null;
                     _optimizeObject = true;
                     _isPageUnloadTriggered = false;
-                    _disableXhrSync = false;
                     _maxEventSendAttempts = MaxSendAttempts;
                     _maxUnloadEventSendAttempts = MaxSyncUnloadSendAttempts;
                     _evtNamespace = null;
+                    _timeoutWrapper = createTimeoutWrapper();
                     _httpManager = new HttpManager(MaxNumberEventPerBatch, MaxConnections, MaxRequestRetriesBeforeBackoff, {
                         requeue: _requeueEvents,
                         send: _sendingEvent,
@@ -1750,7 +1768,7 @@
                         drop: _eventsDropped,
                         rspFail: _eventsResponseFail,
                         oth: _otherEvent
-                    });
+                    }, _timeoutWrapper);
                     _initializeProfiles();
                     _clearQueues();
                     _setAutoLimits();
@@ -1763,19 +1781,21 @@
                     if (_currentBackoffCount) {
                         timerMultiplier = retryPolicyGetMillisToBackoffForRetry(_currentBackoffCount - 1);
                     }
-                    return _self._setTimeoutOverride(theTimerFunc, timeOut * timerMultiplier);
+                    return _timeoutWrapper.set(theTimerFunc, timeOut * timerMultiplier);
                 }
                 function _clearScheduledTimer() {
                     if (_scheduledTimerId !== null) {
-                        _self._clearTimeoutOverride(_scheduledTimerId);
+                        _timeoutWrapper.clear(_scheduledTimerId);
                         _scheduledTimerId = null;
                         _timerCount = 0;
+                        return true;
                     }
+                    return false;
                 }
                 function _releaseAllQueues(sendType, sendReason) {
                     _clearScheduledTimer();
                     if (_flushCallbackTimerId) {
-                        _self._clearTimeoutOverride(_flushCallbackTimerId);
+                        _timeoutWrapper.clear(_flushCallbackTimerId);
                         _flushCallbackTimerId = null;
                     }
                     if (!_paused) {
@@ -1934,18 +1954,20 @@
                 }
                 function _flushImpl(callback, sendReason) {
                     _sendEventsForLatencyAndAbove(1 , 0 , sendReason);
+                    _resetQueueCounts();
                     _waitForIdleManager(function () {
                         if (callback) {
                             callback();
                         }
                         if (_flushCallbackQueue.length > 0) {
-                            _flushCallbackTimerId = _createTimer(function () { return _flushImpl(_flushCallbackQueue.shift(), sendReason); }, 0);
+                            _flushCallbackTimerId = _createTimer(function () {
+                                _flushCallbackTimerId = null;
+                                _flushImpl(_flushCallbackQueue.shift(), sendReason);
+                            }, 0);
                         }
                         else {
                             _flushCallbackTimerId = null;
-                            if (_hasEvents()) {
-                                _scheduleTimer();
-                            }
+                            _scheduleTimer();
                         }
                     });
                 }
@@ -1955,6 +1977,7 @@
                     }
                     else {
                         _flushCallbackTimerId = _createTimer(function () {
+                            _flushCallbackTimerId = null;
                             _waitForIdleManager(callback);
                         }, FlushCheckTimer);
                     }
@@ -2069,6 +2092,12 @@
                         _autoFlushBatchLimit = 0;
                     }
                 }
+                _1dsCoreJs.objDefineAccessors(_self, "_setTimeoutOverride", function () { return _timeoutWrapper.set; }, function (value) {
+                    _timeoutWrapper = createTimeoutWrapper(value, _timeoutWrapper.clear);
+                });
+                _1dsCoreJs.objDefineAccessors(_self, "_clearTimeoutOverride", function () { return _timeoutWrapper.clear; }, function (value) {
+                    _timeoutWrapper = createTimeoutWrapper(_timeoutWrapper.set, value);
+                });
             });
             return _this;
         }