@microsoft/applicationinsights-osplugin-js 3.4.0-nightlybeta3.2602-27 → 3.4.1

package/dist/es5/applicationinsights-osplugin-js.js

@@ -1,5 +1,5 @@
 /*!
- * Application Insights JavaScript SDK - OS Plugin, 3.4.0-nightlybeta3.2602-27
+ * Application Insights JavaScript SDK - OS Plugin, 3.4.1
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */
 (function (global, factory) {
@@ -14,7 +14,7 @@
     var strShimPrototype = "prototype";
     var ObjClass$1 = Object;
 
-    /*! https://github.com/nevware21/ts-utils v0.12.6 */
+    /*! https://github.com/nevware21/ts-utils v0.13.0 */
     /*#__NO_SIDE_EFFECTS__*/
     function _pureAssign(func1, func2) {
         return func1 || func2;
@@ -373,6 +373,9 @@
     function fnApply(fn, thisArg, argArray) {
         return fn.apply(thisArg, argArray);
     }
+    function fnCall(fn, thisArg) {
+        return fn.apply(thisArg, ArrSlice[CALL](arguments, 2));
+    }
     var _globalLazyTestHooks;
     function _initTestHooks() {
         _globalLazyTestHooks = _getGlobalConfig();
@@ -632,7 +635,7 @@
         name && (baseClass[NAME] = name);
     }
     /*#__NO_SIDE_EFFECTS__*/
-    function createCustomError(name, constructCb, errorBase) {
+    function createCustomError(name, constructCb, errorBase, superArgsFn) {
         var theBaseClass = errorBase || Error;
         var orgName = theBaseClass[PROTOTYPE][NAME];
         var captureFn = Error.captureStackTrace;
@@ -641,7 +644,7 @@
             var theArgs = arguments;
             try {
                 safe(_setName, [theBaseClass, name]);
-                var _self = fnApply(theBaseClass, _this, ArrSlice[CALL](theArgs)) || _this;
+                var _self = fnApply(theBaseClass, _this, superArgsFn ? superArgsFn(theArgs) : ArrSlice[CALL](theArgs)) || _this;
                 if (_self !== _this) {
                     var orgProto = objGetPrototypeOf(_this);
                     if (orgProto !== objGetPrototypeOf(_self)) {
@@ -1114,9 +1117,12 @@
     var _DYN_GET_CTX = "getCtx";
     var _DYN_SET_CTX = "setCtx";
     var _DYN_CONFIG = "config";
+    var _DYN_CALL = "call";
     var _DYN_REPLACE = "replace";
     var _DYN_TYPE = "type";
+    var _DYN_USER_AGENT = "userAgent";
     var _DYN_TO_STRING = "toString";
+    var _DYN_HANDLER = "handler";
     var _DYN_EVT_NAME = "evtName";
     var _DYN_CONCAT = "concat";
     var _DYN_REMOVE_ITEM = "removeItem";
@@ -1325,7 +1331,7 @@
         if (!_userAgent) {
             _userAgent = getLazy(function () {
                 var nav = getNavigator() || {};
-                return nav.userAgent || STR_EMPTY;
+                return nav[_DYN_USER_AGENT ] || STR_EMPTY;
             });
         }
         return _userAgent.v;
@@ -1437,7 +1443,7 @@
         return result;
     }
 
-    var version = '3.4.0-nightlybeta3.2602-27';
+    var version = '3.4.1';
     var instanceName = "." + newId(6);
     var _dataUid = 0;
     function _canAcceptData(target) {
@@ -2175,7 +2181,7 @@
     }());
     /*#__NO_SIDE_EFFECTS__*/
     function safeGetLogger(core, config) {
-        return (core || {})[_DYN_LOGGER ] || new DiagnosticLogger(config);
+        return (core || {})[_DYN_LOGGER ] || new DiagnosticLogger(config || (core || {})[_DYN_CONFIG ]);
     }
     var DiagnosticLogger = /** @class */ (function () {
         function DiagnosticLogger(config) {
@@ -2495,7 +2501,7 @@
                 if (onComplete && onComplete[_DYN_LENGTH ] > 0) {
                     arrForEach(onComplete, function (completeDetails) {
                         try {
-                            completeDetails.func.call(completeDetails.self, completeDetails.args);
+                            completeDetails.func[_DYN_CALL ](completeDetails.self, completeDetails.args);
                         }
                         catch (e) {
                             _throwInternal(core[_DYN_LOGGER ], 2 , 73 , "Unexpected Exception during onComplete - " + dumpObj(e));
@@ -2818,7 +2824,7 @@
             _hooks = [];
             arrForEach(oldHooks, function (fn) {
                 try {
-                    (fn.rm || fn.remove).call(fn);
+                    (fn.rm || fn.remove)[_DYN_CALL ](fn);
                 }
                 catch (e) {
                     _throwInternal(logger, 2 , 73 , "Unloading:" + dumpObj(e));
@@ -3081,7 +3087,7 @@
             if (theEvent) {
                 if (!evtName.ns || evtName.ns === theEvent[_DYN_EVT_NAME ].ns) {
                     if (!unRegFn || unRegFn(theEvent)) {
-                        _doDetach(target, theEvent[_DYN_EVT_NAME ], theEvent.handler, theEvent.capture);
+                        _doDetach(target, theEvent.evtName, theEvent[_DYN_HANDLER ], theEvent.capture);
                         events[_DYN_SPLICE ](idx, 1);
                     }
                 }
@@ -3148,7 +3154,7 @@
                 var evtName_1 = _getEvtNamespace(eventName, evtNamespace);
                 var found_1 = false;
                 _unregisterEvents(target, evtName_1, function (regEvent) {
-                    if ((evtName_1.ns && !handlerRef) || regEvent.handler === handlerRef) {
+                    if ((evtName_1.ns && !handlerRef) || regEvent[_DYN_HANDLER ] === handlerRef) {
                         found_1 = true;
                         return true;
                     }
@@ -3324,8 +3330,9 @@
         SDKExt: "sdk"
     };
 
-    var _DYN_PLATFORM_VERSION = "platformVersion";
     var _DYN_MERGE_OS_NAME_VERSIO0 = "mergeOsNameVersion";
+    var _DYN_IS_STORAGE_USE_DISAB1 = "isStorageUseDisabled";
+    var _DYN_PLATFORM_VERSION = "platformVersion";
 
     var defaultMaxTimeout = 200;
     var strExt = "ext";
@@ -3339,21 +3346,19 @@
             var _this = _super.call(this) || this;
             _this.identifier = "OsPlugin";
             _this.priority = 195;
-            _this.version = '3.4.0-nightlybeta3.2602-27';
+            _this.version = '3.4.1';
             var _core;
             var _ocConfig;
-            var _getOSInProgress;
             var _getOSTimeout;
-            var _maxTimeout;
-            var _platformVersionResponse;
-            var _retrieveFullVersion;
+            var _fetchedFullVersion;
             var _mergeOsNameVersion;
             var _eventQueue;
             var _evtNamespace;
             var _excludePageUnloadEvents;
+            var _disableFlushOnUnload;
+            var _addedUnloadEvents;
             var _os;
             var _osVer;
-            var _firstAttempt;
             dynamicProto(OsPlugin, _this, function (_self, _base) {
                 _initDefaults();
                 _self.initialize = function (coreConfig, core, extensions) {
@@ -3362,23 +3367,11 @@
                     _super.prototype.initialize.call(_this, coreConfig, core, extensions);
                     var identifier = _self.identifier;
                     _evtNamespace = mergeEvtNamespace(createUniqueNamespace(identifier), core.evtNamespace && core.evtNamespace());
-                    if (utlCanUseSessionStorage) {
-                        try {
-                            _platformVersionResponse = JSON.parse(utlGetSessionStorage(core.logger, "ai_osplugin"));
-                        }
-                        catch (error) {
-                        }
-                    }
-                    if (_platformVersionResponse) {
-                        _retrieveFullVersion = true;
-                        _osVer = parseInt(_platformVersionResponse[_DYN_PLATFORM_VERSION ]);
-                        _os = _platformVersionResponse.platform;
-                    }
+                    _fetchedFullVersion = _fetchCachedOSVersion(coreConfig);
                     _self._addHook(onConfigChange(coreConfig, function (details) {
                         var coreConfig = details.cfg;
                         var ctx = createProcessTelemetryContext(null, coreConfig, core);
                         _ocConfig = ctx.getExtCfg(identifier, defaultOSConfig);
-                        _maxTimeout = _ocConfig.maxTimeout;
                         if (_ocConfig[_DYN_MERGE_OS_NAME_VERSIO0 ] !== undefined) {
                             _mergeOsNameVersion = _ocConfig[_DYN_MERGE_OS_NAME_VERSIO0 ];
                         }
@@ -3389,87 +3382,141 @@
                             _mergeOsNameVersion = false;
                         }
                         var excludePageUnloadEvents = coreConfig.disablePageUnloadEvents || [];
-                        if (_excludePageUnloadEvents && _excludePageUnloadEvents !== excludePageUnloadEvents) {
-                            removePageUnloadEventListener(null, _evtNamespace);
-                            removePageHideEventListener(null, _evtNamespace);
+                        var disableFlushOnUnload = coreConfig.disableFlushOnUnload || false;
+                        var removeEvents = _excludePageUnloadEvents && _excludePageUnloadEvents !== excludePageUnloadEvents;
+                        if (_disableFlushOnUnload !== disableFlushOnUnload) {
+                            removeEvents = true;
+                        }
+                        if (removeEvents && _addedUnloadEvents) {
+                            _removeUnloadHandlers();
                             _excludePageUnloadEvents = null;
                         }
-                        if (!_excludePageUnloadEvents) {
-                            addPageUnloadEventListener(_doUnload, excludePageUnloadEvents, _evtNamespace);
-                            addPageHideEventListener(_doUnload, excludePageUnloadEvents, _evtNamespace);
+                        if (!_excludePageUnloadEvents && !disableFlushOnUnload) {
+                            _addUnloadHandlers(excludePageUnloadEvents);
                         }
                         _excludePageUnloadEvents = excludePageUnloadEvents;
+                        _disableFlushOnUnload = disableFlushOnUnload;
                     }));
-                    function _doUnload() {
-                        _releaseEventQueue();
+                    if (!_fetchedFullVersion) {
+                        _startRetrieveOsVersion(_ocConfig.maxTimeout);
                     }
                 };
                 _self.processTelemetry = function (event, itemCtx) {
                     itemCtx = _self._getTelCtx(itemCtx);
-                    if (!_retrieveFullVersion && !_getOSInProgress && _firstAttempt) {
-                        _getOSInProgress = true;
-                        startRetrieveOsVersion();
-                        _firstAttempt = false;
-                    }
-                    if (_getOSInProgress) {
+                    if (_getOSTimeout) {
                         _eventQueue.push({
                             ctx: itemCtx,
                             item: event
                         });
                     }
                     else {
-                        updateTeleItemWithOs(event);
+                        _updateTeleItemWithOs(event);
                         _self.processNext(event, itemCtx);
                     }
                 };
                 _self._doTeardown = function (unloadCtx, unloadState) {
                     _completeOsRetrieve();
-                    removePageUnloadEventListener(null, _evtNamespace);
-                    removePageHideEventListener(null, _evtNamespace);
+                    _removeUnloadHandlers();
                     _initDefaults();
                 };
-                function startRetrieveOsVersion() {
-                    var _a;
-                    _getOSTimeout = scheduleTimeout(function () {
-                        _completeOsRetrieve();
-                    }, _maxTimeout);
-                    if (navigator.userAgent) {
-                        var getHighEntropyValues = (_a = navigator.userAgentData) === null || _a === void 0 ? void 0 : _a.getHighEntropyValues;
-                        if (getHighEntropyValues) {
-                            doAwaitResponse(navigator.userAgentData.getHighEntropyValues(["platformVersion"]), function (response) {
-                                if (!response.rejected) {
-                                    _platformVersionResponse = response.value;
-                                    _retrieveFullVersion = true;
-                                    if (_platformVersionResponse[_DYN_PLATFORM_VERSION ] && _platformVersionResponse.platform) {
-                                        _os = _platformVersionResponse.platform;
-                                        _osVer = parseInt(_platformVersionResponse[_DYN_PLATFORM_VERSION ]);
-                                        if (_os === "Windows") {
-                                            if (_osVer == 0) {
-                                                _osVer = 8;
-                                            }
-                                            else if (_osVer < 13) {
-                                                _osVer = 10;
-                                            }
-                                            else {
-                                                _osVer = 11;
+                function _fetchCachedOSVersion(coreConfig) {
+                    var fetched = false;
+                    if (coreConfig[_DYN_IS_STORAGE_USE_DISAB1 ] !== true) {
+                        try {
+                            var platformVersionResponse = JSON.parse(utlGetSessionStorage(safeGetLogger(_core), "ai_osplugin"));
+                            if (platformVersionResponse) {
+                                _os = platformVersionResponse.platform;
+                                if (platformVersionResponse[_DYN_PLATFORM_VERSION ]) {
+                                    var ver = parseInt(platformVersionResponse[_DYN_PLATFORM_VERSION ]);
+                                    if (!isNaN(ver)) {
+                                        _osVer = ver;
+                                    }
+                                }
+                                fetched = !!(_os && _osVer);
+                            }
+                        }
+                        catch (error) {
+                        }
+                    }
+                    return fetched;
+                }
+                function _storeCachedOSVersion(coreConfig) {
+                    if (coreConfig[_DYN_IS_STORAGE_USE_DISAB1 ] !== true) {
+                        try {
+                            utlSetSessionStorage(safeGetLogger(_core), "ai_osplugin", JSON.stringify({ platform: _os, platformVersion: _osVer }));
+                        }
+                        catch (error) {
+                        }
+                    }
+                }
+                function _addUnloadHandlers(excludePageUnloadEvents) {
+                    function _unloading() {
+                        _releaseEventQueue();
+                        _removeUnloadHandlers();
+                    }
+                    if (!_addedUnloadEvents && !_fetchedFullVersion) {
+                        addPageUnloadEventListener(_unloading, excludePageUnloadEvents, _evtNamespace);
+                        addPageHideEventListener(_unloading, excludePageUnloadEvents, _evtNamespace);
+                        _addedUnloadEvents = true;
+                    }
+                }
+                function _removeUnloadHandlers() {
+                    if (_addedUnloadEvents) {
+                        removePageUnloadEventListener(null, _evtNamespace);
+                        removePageHideEventListener(null, _evtNamespace);
+                        _addedUnloadEvents = false;
+                    }
+                }
+                function _startRetrieveOsVersion(maxTimeout) {
+                    if (_core && !_getOSTimeout) {
+                        var nav = getNavigator();
+                        var userAgentData = (nav || {}).userAgentData;
+                        if (userAgentData) {
+                            var getHighEntropyValues = userAgentData.getHighEntropyValues;
+                            if (getHighEntropyValues) {
+                                _getOSTimeout = scheduleTimeout(function () {
+                                    _completeOsRetrieve();
+                                }, maxTimeout);
+                                doAwaitResponse(fnCall(getHighEntropyValues, userAgentData, ["platformVersion"]), function (response) {
+                                    _fetchedFullVersion = true;
+                                    try {
+                                        if (!response.rejected) {
+                                            var platformVersionResponse = response.value;
+                                            if (platformVersionResponse[_DYN_PLATFORM_VERSION ] && platformVersionResponse.platform) {
+                                                _os = platformVersionResponse.platform;
+                                                _osVer = parseInt(platformVersionResponse[_DYN_PLATFORM_VERSION ]);
+                                                if (_os === "Windows" && !isNaN(_osVer)) {
+                                                    if (_osVer == 0) {
+                                                        _osVer = 8;
+                                                    }
+                                                    else if (_osVer < 13) {
+                                                        _osVer = 10;
+                                                    }
+                                                    else {
+                                                        _osVer = 11;
+                                                    }
+                                                }
+                                                _storeCachedOSVersion((_core || {}).config);
                                             }
                                         }
-                                        utlSetSessionStorage(_core.logger, "ai_osplugin", JSON.stringify({ platform: _os, platformVersion: _osVer }));
+                                        else {
+                                            _throwInternal(safeGetLogger(_core), 1 , 73 , "Could not retrieve operating system: " + response.reason);
+                                        }
                                     }
-                                }
-                                else {
-                                    _throwInternal(_core.logger, 1 , 73 , "Could not retrieve operating system: " + response.reason);
-                                }
-                                _completeOsRetrieve();
-                            });
+                                    finally {
+                                        _completeOsRetrieve();
+                                    }
+                                });
+                            }
                         }
                     }
                 }
-                function updateTeleItemWithOs(event) {
-                    if (_retrieveFullVersion) {
+                function _updateTeleItemWithOs(event) {
+                    if (_fetchedFullVersion && (_os || _osVer)) {
                         var extOS = getSetValue(getSetValue(event, strExt), Extensions.OSExt);
                         if (_mergeOsNameVersion) {
-                            setValue(extOS, "osVer", _os + _osVer, isString);
+                            var mergedOS = (_os || "") + (_osVer ? asString(_osVer) : "");
+                            setValue(extOS, "osVer", mergedOS, isString);
                         }
                         else {
                             setValue(extOS, "osVer", _osVer);
@@ -3480,13 +3527,14 @@
                 function _completeOsRetrieve() {
                     if (_getOSTimeout) {
                         _getOSTimeout.cancel();
+                        _getOSTimeout = null;
                     }
-                    _getOSInProgress = false;
+                    _removeUnloadHandlers();
                     _releaseEventQueue();
                 }
                 function _releaseEventQueue() {
                     arrForEach(_eventQueue, function (evt) {
-                        updateTeleItemWithOs(evt.item);
+                        _updateTeleItemWithOs(evt.item);
                         _self.processNext(evt.item, evt.ctx);
                     });
                     _eventQueue = [];
@@ -3494,15 +3542,16 @@
                 function _initDefaults() {
                     _core = null;
                     _ocConfig = null;
-                    _getOSInProgress = false;
                     _getOSTimeout = null;
-                    _maxTimeout = null;
-                    _retrieveFullVersion = false;
                     _eventQueue = [];
-                    _firstAttempt = true;
+                    _os = null;
+                    _osVer = null;
+                    _fetchedFullVersion = false;
+                    _addedUnloadEvents = false;
+                    _excludePageUnloadEvents = null;
                 }
                 _self["_getDbgPlgTargets"] = function () {
-                    return [_platformVersionResponse, _eventQueue, _getOSInProgress];
+                    return [{ platform: _os, platformVersion: _osVer }, _eventQueue, !!_getOSTimeout];
                 };
             });
             return _this;