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

package/browser/es5/ai.osplugin.3.integrity.json

@@ -1,65 +1,65 @@
 {
     "name": "ai.osplugin.3",
-    "version": "3.4.0-nightlybeta3.2602-27",
+    "version": "3.4.1",
     "ext": {
         "@cjs.js": {
             "file": "ai.osplugin.3.cjs.js",
             "type": "text/javascript; charset=utf-8",
-            "integrity": "sha256-LSdVEhuTvOKytxZ0/oCasrsHtg7r5W1Bm/FymhyvrCY= sha384-vgszfl/NKDv816yMs5lgFeb5mp2Seogps6uajR1olWoUvPoBxt9sQrzlz1cFkFor sha512-wMDtUIB9ugCow6xXr16a3x+IFcNqJzwrJMVUJ5XfrZBUh/7eauANIjIyPSpk+D3IrNp8APzw3gOmRG5GsBh9gQ==",
+            "integrity": "sha256-mej05//CmsbD9yMprWc8a1pzu3vqrjkirwJCwRmhpFE= sha384-djv2vAeD4UhGconOYfoGHhsvO7YzJZRN+aAsTO2+c9hekVEzJTTnzp+22mlpkYpJ sha512-/YeQI2VwCYqFWluasop1CkKa9L6ZODQWY+6iKxvtUVhlS7VmRmdQhMbLccCbMe6Ovy4EMgarEtLXPWX7m/Eb1g==",
             "hashes": {
-                "sha256": "LSdVEhuTvOKytxZ0/oCasrsHtg7r5W1Bm/FymhyvrCY=",
-                "sha384": "vgszfl/NKDv816yMs5lgFeb5mp2Seogps6uajR1olWoUvPoBxt9sQrzlz1cFkFor",
-                "sha512": "wMDtUIB9ugCow6xXr16a3x+IFcNqJzwrJMVUJ5XfrZBUh/7eauANIjIyPSpk+D3IrNp8APzw3gOmRG5GsBh9gQ=="
+                "sha256": "mej05//CmsbD9yMprWc8a1pzu3vqrjkirwJCwRmhpFE=",
+                "sha384": "djv2vAeD4UhGconOYfoGHhsvO7YzJZRN+aAsTO2+c9hekVEzJTTnzp+22mlpkYpJ",
+                "sha512": "/YeQI2VwCYqFWluasop1CkKa9L6ZODQWY+6iKxvtUVhlS7VmRmdQhMbLccCbMe6Ovy4EMgarEtLXPWX7m/Eb1g=="
             }
         },
         "@cjs.min.js": {
             "file": "ai.osplugin.3.cjs.min.js",
             "type": "text/javascript; charset=utf-8",
-            "integrity": "sha256-FZx0CALgn5VtOGwFJq8jGXlIsRJ8/PsaBBJDuqJED/A= sha384-Z1PeQq3ZXSRQ25gEhI2CKtwSG5EUC8ihkrxmQA1q4tFDrTv1Aai6I2g2UWVzwG3n sha512-Bjq3vGy/6TBDv88Leo3S5ijDL8kucUQV4SvRhv5YjXcr0K9ArTBSpzx8atRuyW2oCw6vv4ZQegCL+8hXoLYWpQ==",
+            "integrity": "sha256-nL7W2RbN0oXE9SAIUaqTb8beLZkmGmkt1cF83jc6klI= sha384-m2P2QTxNhdB+6NXqlmOb7g0ed/CyBVeF2jnZCd3tXiXCUBTsFEFFPq1gqpmInWAo sha512-2bwk0ZYk4OTlZTUr7FDy+h2TTIU6zDbyI9Eqy3uXGaca2r1sevjah3MTckcLUllgFVqMQ1HDkzAQzm1MjEcgbw==",
             "hashes": {
-                "sha256": "FZx0CALgn5VtOGwFJq8jGXlIsRJ8/PsaBBJDuqJED/A=",
-                "sha384": "Z1PeQq3ZXSRQ25gEhI2CKtwSG5EUC8ihkrxmQA1q4tFDrTv1Aai6I2g2UWVzwG3n",
-                "sha512": "Bjq3vGy/6TBDv88Leo3S5ijDL8kucUQV4SvRhv5YjXcr0K9ArTBSpzx8atRuyW2oCw6vv4ZQegCL+8hXoLYWpQ=="
+                "sha256": "nL7W2RbN0oXE9SAIUaqTb8beLZkmGmkt1cF83jc6klI=",
+                "sha384": "m2P2QTxNhdB+6NXqlmOb7g0ed/CyBVeF2jnZCd3tXiXCUBTsFEFFPq1gqpmInWAo",
+                "sha512": "2bwk0ZYk4OTlZTUr7FDy+h2TTIU6zDbyI9Eqy3uXGaca2r1sevjah3MTckcLUllgFVqMQ1HDkzAQzm1MjEcgbw=="
             }
         },
         "@gbl.js": {
             "file": "ai.osplugin.3.gbl.js",
             "type": "text/javascript; charset=utf-8",
-            "integrity": "sha256-azbDtdr2UXf3LLJyrrjU9HIE1cs5JP1B7WQa4TfwPSc= sha384-AMlyLHg5NZjNktjTjBLEMcfCaQMdbnhq3wHRFLcB8wqBJNZ2TN/9iozdKS+ArraQ sha512-eBjNm7SMZ7on7i/oyp216oNiZE93ouMtJW3OvQ94zxIl7LHHPTwabSdJU2OCex328yDhG9Ya5GLHZqEcrrUIVA==",
+            "integrity": "sha256-TQ/BIQlYwQ8eoT95vDl2SlSWXpkw8Pc84/pa1s10ooY= sha384-SsJpvkzor7Q6G99GbOXnYhvk33ddPHT9OiATTKP4Hmag9Xn1hFLZiJammFpSUBHJ sha512-fFITznZPNQ9M/bsLuN84IiLe99KYsaZ5jbjDRBFU5f4mZcJTmMDmsFAbhxg8hZ+5CpBBVNvfdnPoMdnCug0Zjw==",
             "hashes": {
-                "sha256": "azbDtdr2UXf3LLJyrrjU9HIE1cs5JP1B7WQa4TfwPSc=",
-                "sha384": "AMlyLHg5NZjNktjTjBLEMcfCaQMdbnhq3wHRFLcB8wqBJNZ2TN/9iozdKS+ArraQ",
-                "sha512": "eBjNm7SMZ7on7i/oyp216oNiZE93ouMtJW3OvQ94zxIl7LHHPTwabSdJU2OCex328yDhG9Ya5GLHZqEcrrUIVA=="
+                "sha256": "TQ/BIQlYwQ8eoT95vDl2SlSWXpkw8Pc84/pa1s10ooY=",
+                "sha384": "SsJpvkzor7Q6G99GbOXnYhvk33ddPHT9OiATTKP4Hmag9Xn1hFLZiJammFpSUBHJ",
+                "sha512": "fFITznZPNQ9M/bsLuN84IiLe99KYsaZ5jbjDRBFU5f4mZcJTmMDmsFAbhxg8hZ+5CpBBVNvfdnPoMdnCug0Zjw=="
             }
         },
         "@gbl.min.js": {
             "file": "ai.osplugin.3.gbl.min.js",
             "type": "text/javascript; charset=utf-8",
-            "integrity": "sha256-1S0aZnOg3/Q04fcwq1h4jvyqFHShvnbTXYL7jg3E+AU= sha384-lz2gsrjeHjcgb+kPKE3lCgi+YA6aogmCQIq9iGulYf2M4kWaueZTrNHUIZ5xHvDy sha512-7kaq317f+sgCRNkvlZI5l3lwfV+hOj5PAZCs1yzqupjPdL1cmYXwrbevsVS74KTcwpfv8NTW7qWvKHEhYAPxAQ==",
+            "integrity": "sha256-riUjJpm90KRKiCagzQAm+v4IRvpTOyAziGVOtYgp+60= sha384-iX+xlc7efBeZP2KnNHC1jeZBx6DQJ4vE/Wog63zTYBsoNEFbkTmP57ZLUeI5zEhq sha512-a+9SCSzaG0dIgI6cdf405fL5VBDMRjT9CxEwLtDNjMwjHMQtr8rpp3BwplHAYJW78m86lPuhIGynBYtz43GaLg==",
             "hashes": {
-                "sha256": "1S0aZnOg3/Q04fcwq1h4jvyqFHShvnbTXYL7jg3E+AU=",
-                "sha384": "lz2gsrjeHjcgb+kPKE3lCgi+YA6aogmCQIq9iGulYf2M4kWaueZTrNHUIZ5xHvDy",
-                "sha512": "7kaq317f+sgCRNkvlZI5l3lwfV+hOj5PAZCs1yzqupjPdL1cmYXwrbevsVS74KTcwpfv8NTW7qWvKHEhYAPxAQ=="
+                "sha256": "riUjJpm90KRKiCagzQAm+v4IRvpTOyAziGVOtYgp+60=",
+                "sha384": "iX+xlc7efBeZP2KnNHC1jeZBx6DQJ4vE/Wog63zTYBsoNEFbkTmP57ZLUeI5zEhq",
+                "sha512": "a+9SCSzaG0dIgI6cdf405fL5VBDMRjT9CxEwLtDNjMwjHMQtr8rpp3BwplHAYJW78m86lPuhIGynBYtz43GaLg=="
             }
         },
         "@js": {
             "file": "ai.osplugin.3.js",
             "type": "text/javascript; charset=utf-8",
-            "integrity": "sha256-VJvXatq+/oULWQ3IGnrEyPHurztb3SdS3Gj8ZRc0M+E= sha384-1zU13b0V8fU7fqSOWp/2FclJmhTXbFwJk3SmgUHdFQY1TcuS//NvR96fR5nxy1Xz sha512-x25riFEAl1X7AbawOe/z8rSJwsPcS0e+vSdd7kACEYQKLd9fW2MUZEOMMHbEhqV+HLYX2Qdwoiuj+x/PkYzaXA==",
+            "integrity": "sha256-VxNHplUxeSDmmWXVT2mWk5E0PMBvKigxOpHLFtCnS70= sha384-vavI9aO3rACZ1DMI0yxU6WvphX1AIWB0U6ol8Y8BajvhFF0A8W7JY2ecUki8RUfR sha512-c8iuRtKksPWjFqvbU0acf+5m4wbFghYcksurGSkdC8znTlfnZH6w1+b9NxwXuILc/foyAp7kA8Zj9roCbwB2tg==",
             "hashes": {
-                "sha256": "VJvXatq+/oULWQ3IGnrEyPHurztb3SdS3Gj8ZRc0M+E=",
-                "sha384": "1zU13b0V8fU7fqSOWp/2FclJmhTXbFwJk3SmgUHdFQY1TcuS//NvR96fR5nxy1Xz",
-                "sha512": "x25riFEAl1X7AbawOe/z8rSJwsPcS0e+vSdd7kACEYQKLd9fW2MUZEOMMHbEhqV+HLYX2Qdwoiuj+x/PkYzaXA=="
+                "sha256": "VxNHplUxeSDmmWXVT2mWk5E0PMBvKigxOpHLFtCnS70=",
+                "sha384": "vavI9aO3rACZ1DMI0yxU6WvphX1AIWB0U6ol8Y8BajvhFF0A8W7JY2ecUki8RUfR",
+                "sha512": "c8iuRtKksPWjFqvbU0acf+5m4wbFghYcksurGSkdC8znTlfnZH6w1+b9NxwXuILc/foyAp7kA8Zj9roCbwB2tg=="
             }
         },
         "@min.js": {
             "file": "ai.osplugin.3.min.js",
             "type": "text/javascript; charset=utf-8",
-            "integrity": "sha256-qzy6i/ctdvOFQjMjpeakSsd/XC4m/8JG+sGSSpHyeHg= sha384-0HkAI/Z6uJpYVJdBaiXg1TKzGa7GJ8gUzNoWULNy68l3gT8dLBHjCacraWU6PeuU sha512-UDOIi1C51WADHkR5TG2Q93b910ZTlvzRsez0SPN5Aj1raR9W/vn/NMCzdzYqaaucw8dIyHpYkkLwM8YzAbIFkg==",
+            "integrity": "sha256-5ut+glS+f4I289M2ice+RoLPvGYbSUB7p7Yk7SB/lNI= sha384-7wm2HIhI1a2iK68gBwV3P0YttQUyy8NtzCOH+5ELWOhhDz04sfCMqKKIE1AnLW4s sha512-gD0G4puSOlBTe9Q15SJNAQ4ksameEGYxrO9feiH71OeAUa+YSlieYlpZUwrrHbz4FWA9gEVzUUht0WwM2XOv/w==",
             "hashes": {
-                "sha256": "qzy6i/ctdvOFQjMjpeakSsd/XC4m/8JG+sGSSpHyeHg=",
-                "sha384": "0HkAI/Z6uJpYVJdBaiXg1TKzGa7GJ8gUzNoWULNy68l3gT8dLBHjCacraWU6PeuU",
-                "sha512": "UDOIi1C51WADHkR5TG2Q93b910ZTlvzRsez0SPN5Aj1raR9W/vn/NMCzdzYqaaucw8dIyHpYkkLwM8YzAbIFkg=="
+                "sha256": "5ut+glS+f4I289M2ice+RoLPvGYbSUB7p7Yk7SB/lNI=",
+                "sha384": "7wm2HIhI1a2iK68gBwV3P0YttQUyy8NtzCOH+5ELWOhhDz04sfCMqKKIE1AnLW4s",
+                "sha512": "gD0G4puSOlBTe9Q15SJNAQ4ksameEGYxrO9feiH71OeAUa+YSlieYlpZUwrrHbz4FWA9gEVzUUht0WwM2XOv/w=="
             }
         }
     }

package/browser/es5/ai.osplugin.3.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) {
@@ -7,8 +7,8 @@
     typeof exports === "object" && typeof module !== undef ? factory(exports) :
     typeof define === "function" && define.amd ? define(["exports"], factory) :
     (function(global){
-        var nsKey, key, nm, theExports = {}, modName = "es5_ai_osplugin_3_4_0_nightlybeta3_2602_27", msMod="__ms$mod__";
-        var mods={}, modDetail=mods[modName]={}, ver="3.4.0-nightlybeta3.2602-27";
+        var nsKey, key, nm, theExports = {}, modName = "es5_ai_osplugin_3_4_1", msMod="__ms$mod__";
+        var mods={}, modDetail=mods[modName]={}, ver="3.4.1";
         var baseNs=global, nsKey="Microsoft", baseNs=baseNs[nsKey]=(baseNs[nsKey]||{});
         // Versioned namespace "Microsoft.ApplicationInsights3"
         var exportNs=baseNs, nsKey="ApplicationInsights3", exportNs=exportNs[nsKey]=(exportNs[nsKey]||{});
@@ -36,7 +36,7 @@ var strShimUndefined = "undefined";
 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;
@@ -395,6 +395,9 @@ function polyUtcNow() {
 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();
@@ -654,7 +657,7 @@ function _setName(baseClass, name) {
     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;
@@ -663,7 +666,7 @@ function createCustomError(name, constructCb, errorBase) {
         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)) {
@@ -1136,9 +1139,12 @@ var _DYN_IS_CHILD_EVT = "isChildEvt";
 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";
@@ -1347,7 +1353,7 @@ function getUserAgentString() {
     if (!_userAgent) {
         _userAgent = getLazy(function () {
             var nav = getNavigator() || {};
-            return nav.userAgent || STR_EMPTY;
+            return nav[_DYN_USER_AGENT ] || STR_EMPTY;
         });
     }
     return _userAgent.v;
@@ -1459,7 +1465,7 @@ function newId(maxLength) {
     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) {
@@ -2197,7 +2203,7 @@ var _InternalLogMessage = /** @class */ (function () {
 }());
 /*#__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) {
@@ -2517,7 +2523,7 @@ function _createInternalContext(telemetryChain, dynamicHandler, core, startAt) {
             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));
@@ -2840,7 +2846,7 @@ function createUnloadHookContainer() {
         _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));
@@ -3103,7 +3109,7 @@ function _doUnregister(target, events, evtName, unRegFn) {
         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);
                 }
             }
@@ -3170,7 +3176,7 @@ function eventOff(target, eventName, handlerRef, evtNamespace, useCapture) {
             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;
                 }
@@ -3346,8 +3352,9 @@ var Extensions = {
     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";
@@ -3361,21 +3368,19 @@ var OsPlugin = /** @class */ (function (_super) {
         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) {
@@ -3384,23 +3389,11 @@ var OsPlugin = /** @class */ (function (_super) {
                 _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 ];
                     }
@@ -3411,87 +3404,141 @@ var OsPlugin = /** @class */ (function (_super) {
                         _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);
@@ -3502,13 +3549,14 @@ var OsPlugin = /** @class */ (function (_super) {
             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 = [];
@@ -3516,15 +3564,16 @@ var OsPlugin = /** @class */ (function (_super) {
             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;