@microsoft/applicationinsights-core-js 3.0.1-nightly3.2304-41 → 3.0.1-nightly3.2304-44

package/dist-es5/Config/ConfigDefaultHelpers.js

@@ -1,5 +1,5 @@
 /*
- * Application Insights JavaScript SDK - Core, 3.0.1-nightly3.2304-41
+ * Application Insights JavaScript SDK - Core, 3.0.1-nightly3.2304-44
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */
 

package/dist-es5/Config/ConfigDefaults.js

@@ -1,5 +1,5 @@
 /*
- * Application Insights JavaScript SDK - Core, 3.0.1-nightly3.2304-41
+ * Application Insights JavaScript SDK - Core, 3.0.1-nightly3.2304-44
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */
 

package/dist-es5/Config/DynamicConfig.js

@@ -1,5 +1,5 @@
 /*
- * Application Insights JavaScript SDK - Core, 3.0.1-nightly3.2304-41
+ * Application Insights JavaScript SDK - Core, 3.0.1-nightly3.2304-44
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */
 
@@ -156,6 +156,6 @@ export function onConfigChange(config, configHandler, logger) {
         return handler[_DYN_WATCH /* @min:%2ewatch */](configHandler);
     }
     _logInvalidAccess(logger, STR_NOT_DYNAMIC_ERROR + dumpObj(config));
-    createDynamicConfig(config, null, logger)[_DYN_WATCH /* @min:%2ewatch */](configHandler);
+    return createDynamicConfig(config, null, logger)[_DYN_WATCH /* @min:%2ewatch */](configHandler);
 }
 //# sourceMappingURL=DynamicConfig.js.map

package/dist-es5/Config/DynamicConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"DynamicConfig.js.map","sources":["DynamicConfig.js"],"sourcesContent":["// Copyright (c) Microsoft Corporation. All rights reserved.\r\n// Licensed under the MIT License.\r\nimport { dumpObj, isUndefined, objDefine, objForEachKey } from \"@nevware21/ts-utils\";\r\nimport { createUniqueNamespace } from \"../JavaScriptSDK/DataCacheHelper\";\r\nimport { STR_NOT_DYNAMIC_ERROR, STR_WARN_TO_CONSOLE } from \"../JavaScriptSDK/InternalConstants\";\r\nimport { _DYN_LOGGER, _DYN_NOTIFY, _DYN_RD_ONLY, _DYN_SET_DF, _DYN_THROW_INTERNAL, _DYN_WATCH } from \"../__DynamicConstants\";\r\nimport { _applyDefaultValue } from \"./ConfigDefaults\";\r\nimport { _makeDynamicObject, _setDynamicProperty } from \"./DynamicProperty\";\r\nimport { _createState } from \"./DynamicState\";\r\nimport { CFG_HANDLER_LINK, _cfgDeepCopy, getDynamicConfigHandler, throwInvalidAccess } from \"./DynamicSupport\";\r\n/**\r\n * Identifies a function which will be re-called whenever any of it's accessed configuration values\r\n * change.\r\n * @param configHandler - The callback that will be called for the initial request and then whenever any\r\n * accessed configuration changes are identified.\r\n */\r\nfunction _createAndUseHandler(state, configHandler) {\r\n    var handler = {\r\n        fn: configHandler,\r\n        rm: function () {\r\n            // Clear all references to the handler so it can be garbage collected\r\n            // This will also cause this handler to never get called and eventually removed\r\n            handler.fn = null;\r\n            state = null;\r\n            configHandler = null;\r\n        }\r\n    };\r\n    state.use(handler, configHandler);\r\n    return handler;\r\n}\r\n/**\r\n * Creates the dynamic config handler and associates with the target config as the root object\r\n * @param target - The config that you want to be root of the dynamic config\r\n * @param inPlace - Should the passed config be converted in-place or a new proxy returned\r\n * @returns The existing dynamic handler or a new instance with the provided config values\r\n */\r\nfunction _createDynamicHandler(logger, target, inPlace) {\r\n    var _a;\r\n    var dynamicHandler = getDynamicConfigHandler(target);\r\n    if (dynamicHandler) {\r\n        // The passed config is already dynamic so return it's tracker\r\n        return dynamicHandler;\r\n    }\r\n    var uid = createUniqueNamespace(\"dyncfg\", true);\r\n    var newTarget = (target && inPlace !== false) ? target : _cfgDeepCopy(target);\r\n    var theState;\r\n    function _notifyWatchers() {\r\n        theState[_DYN_NOTIFY /* @min:%2enotify */]();\r\n    }\r\n    function _setValue(target, name, value) {\r\n        return _setDynamicProperty(theState, target, name, value)[name];\r\n    }\r\n    function _watch(configHandler) {\r\n        return _createAndUseHandler(theState, configHandler);\r\n    }\r\n    function _block(configHandler, allowUpdate) {\r\n        theState.use(null, function (details) {\r\n            var prevUpd = theState.upd;\r\n            try {\r\n                if (!isUndefined(allowUpdate)) {\r\n                    theState.upd = allowUpdate;\r\n                }\r\n                configHandler(details);\r\n            }\r\n            finally {\r\n                theState.upd = prevUpd;\r\n            }\r\n        });\r\n    }\r\n    function _ref(target, name) {\r\n        // Make sure it's dynamic and mark as referenced with it's current value\r\n        return _setDynamicProperty(theState, target, name, target[name], true)[name];\r\n    }\r\n    function _rdOnly(target, name) {\r\n        // Make sure it's dynamic and mark as readonly with it's current value\r\n        return _setDynamicProperty(theState, target, name, target[name], false, true)[name];\r\n    }\r\n    function _applyDefaults(theConfig, defaultValues) {\r\n        if (defaultValues) {\r\n            // Resolve/apply the defaults\r\n            objForEachKey(defaultValues, function (name, value) {\r\n                // Sets the value and makes it dynamic (if it doesn't already exist)\r\n                _applyDefaultValue(cfgHandler, theConfig, name, value);\r\n            });\r\n        }\r\n        return theConfig;\r\n    }\r\n    var cfgHandler = (_a = {\r\n            uid: null,\r\n            cfg: newTarget\r\n        },\r\n        _a[_DYN_LOGGER /* @min:logger */] = logger,\r\n        _a[_DYN_NOTIFY /* @min:notify */] = _notifyWatchers,\r\n        _a.set = _setValue,\r\n        _a[_DYN_SET_DF /* @min:setDf */] = _applyDefaults,\r\n        _a[_DYN_WATCH /* @min:watch */] = _watch,\r\n        _a.ref = _ref,\r\n        _a[_DYN_RD_ONLY /* @min:rdOnly */] = _rdOnly,\r\n        _a._block = _block,\r\n        _a);\r\n    objDefine(cfgHandler, \"uid\", {\r\n        c: false,\r\n        e: false,\r\n        w: false,\r\n        v: uid\r\n    });\r\n    theState = _createState(cfgHandler);\r\n    // Setup tracking for all defined default keys\r\n    _makeDynamicObject(theState, newTarget);\r\n    return cfgHandler;\r\n}\r\n/**\r\n * Log an invalid access message to the console\r\n * @param message\r\n */\r\nfunction _logInvalidAccess(logger, message) {\r\n    if (logger) {\r\n        logger[STR_WARN_TO_CONSOLE /* @min:%2ewarnToConsole */](message);\r\n        logger[_DYN_THROW_INTERNAL /* @min:%2ethrowInternal */](2 /* eLoggingSeverity.WARNING */, 108 /* _eInternalMessageId.DynamicConfigException */, message);\r\n    }\r\n    else {\r\n        // We don't have a logger so just throw an exception\r\n        throwInvalidAccess(message);\r\n    }\r\n}\r\n/**\r\n * Create or return a dynamic version of the passed config, if it is not already dynamic\r\n * @param config - The config to be converted into a dynamic config\r\n * @param defaultConfig - The default values to apply on the config if the properties don't already exist\r\n * @param inPlace - Should the config be converted in-place into a dynamic config or a new instance returned, defaults to true\r\n * @returns The dynamic config handler for the config (whether new or existing)\r\n */\r\nexport function createDynamicConfig(config, defaultConfig, logger, inPlace) {\r\n    var dynamicHandler = _createDynamicHandler(logger, config || {}, inPlace);\r\n    if (defaultConfig) {\r\n        dynamicHandler[_DYN_SET_DF /* @min:%2esetDf */](dynamicHandler.cfg, defaultConfig);\r\n    }\r\n    return dynamicHandler;\r\n}\r\n/**\r\n * Watch and track changes for accesses to the current config, the provided config MUST already be\r\n * a dynamic config or a child accessed via the dynamic config\r\n * @param config\r\n * @param configHandler\r\n * @param logger - The logger instance to use if there is no existing handler\r\n * @returns A watcher handler instance that can be used to remove itself when being unloaded\r\n * @throws TypeError if the provided config is not a dynamic config instance\r\n */\r\nexport function onConfigChange(config, configHandler, logger) {\r\n    var handler = config[CFG_HANDLER_LINK] || config;\r\n    if (handler.cfg && (handler.cfg === config || handler.cfg[CFG_HANDLER_LINK] === handler)) {\r\n        return handler[_DYN_WATCH /* @min:%2ewatch */](configHandler);\r\n    }\r\n    _logInvalidAccess(logger, STR_NOT_DYNAMIC_ERROR + dumpObj(config));\r\n    createDynamicConfig(config, null, logger)[_DYN_WATCH /* @min:%2ewatch */](configHandler);\r\n}\r\n//# sourceMappingURL=DynamicConfig.js.map"],"names":[],"mappings":";;;;AAA4D;AAC1B;AAClC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA"}
+{"version":3,"file":"DynamicConfig.js.map","sources":["DynamicConfig.js"],"sourcesContent":["// Copyright (c) Microsoft Corporation. All rights reserved.\r\n// Licensed under the MIT License.\r\nimport { dumpObj, isUndefined, objDefine, objForEachKey } from \"@nevware21/ts-utils\";\r\nimport { createUniqueNamespace } from \"../JavaScriptSDK/DataCacheHelper\";\r\nimport { STR_NOT_DYNAMIC_ERROR, STR_WARN_TO_CONSOLE } from \"../JavaScriptSDK/InternalConstants\";\r\nimport { _DYN_LOGGER, _DYN_NOTIFY, _DYN_RD_ONLY, _DYN_SET_DF, _DYN_THROW_INTERNAL, _DYN_WATCH } from \"../__DynamicConstants\";\r\nimport { _applyDefaultValue } from \"./ConfigDefaults\";\r\nimport { _makeDynamicObject, _setDynamicProperty } from \"./DynamicProperty\";\r\nimport { _createState } from \"./DynamicState\";\r\nimport { CFG_HANDLER_LINK, _cfgDeepCopy, getDynamicConfigHandler, throwInvalidAccess } from \"./DynamicSupport\";\r\n/**\r\n * Identifies a function which will be re-called whenever any of it's accessed configuration values\r\n * change.\r\n * @param configHandler - The callback that will be called for the initial request and then whenever any\r\n * accessed configuration changes are identified.\r\n */\r\nfunction _createAndUseHandler(state, configHandler) {\r\n    var handler = {\r\n        fn: configHandler,\r\n        rm: function () {\r\n            // Clear all references to the handler so it can be garbage collected\r\n            // This will also cause this handler to never get called and eventually removed\r\n            handler.fn = null;\r\n            state = null;\r\n            configHandler = null;\r\n        }\r\n    };\r\n    state.use(handler, configHandler);\r\n    return handler;\r\n}\r\n/**\r\n * Creates the dynamic config handler and associates with the target config as the root object\r\n * @param target - The config that you want to be root of the dynamic config\r\n * @param inPlace - Should the passed config be converted in-place or a new proxy returned\r\n * @returns The existing dynamic handler or a new instance with the provided config values\r\n */\r\nfunction _createDynamicHandler(logger, target, inPlace) {\r\n    var _a;\r\n    var dynamicHandler = getDynamicConfigHandler(target);\r\n    if (dynamicHandler) {\r\n        // The passed config is already dynamic so return it's tracker\r\n        return dynamicHandler;\r\n    }\r\n    var uid = createUniqueNamespace(\"dyncfg\", true);\r\n    var newTarget = (target && inPlace !== false) ? target : _cfgDeepCopy(target);\r\n    var theState;\r\n    function _notifyWatchers() {\r\n        theState[_DYN_NOTIFY /* @min:%2enotify */]();\r\n    }\r\n    function _setValue(target, name, value) {\r\n        return _setDynamicProperty(theState, target, name, value)[name];\r\n    }\r\n    function _watch(configHandler) {\r\n        return _createAndUseHandler(theState, configHandler);\r\n    }\r\n    function _block(configHandler, allowUpdate) {\r\n        theState.use(null, function (details) {\r\n            var prevUpd = theState.upd;\r\n            try {\r\n                if (!isUndefined(allowUpdate)) {\r\n                    theState.upd = allowUpdate;\r\n                }\r\n                configHandler(details);\r\n            }\r\n            finally {\r\n                theState.upd = prevUpd;\r\n            }\r\n        });\r\n    }\r\n    function _ref(target, name) {\r\n        // Make sure it's dynamic and mark as referenced with it's current value\r\n        return _setDynamicProperty(theState, target, name, target[name], true)[name];\r\n    }\r\n    function _rdOnly(target, name) {\r\n        // Make sure it's dynamic and mark as readonly with it's current value\r\n        return _setDynamicProperty(theState, target, name, target[name], false, true)[name];\r\n    }\r\n    function _applyDefaults(theConfig, defaultValues) {\r\n        if (defaultValues) {\r\n            // Resolve/apply the defaults\r\n            objForEachKey(defaultValues, function (name, value) {\r\n                // Sets the value and makes it dynamic (if it doesn't already exist)\r\n                _applyDefaultValue(cfgHandler, theConfig, name, value);\r\n            });\r\n        }\r\n        return theConfig;\r\n    }\r\n    var cfgHandler = (_a = {\r\n            uid: null,\r\n            cfg: newTarget\r\n        },\r\n        _a[_DYN_LOGGER /* @min:logger */] = logger,\r\n        _a[_DYN_NOTIFY /* @min:notify */] = _notifyWatchers,\r\n        _a.set = _setValue,\r\n        _a[_DYN_SET_DF /* @min:setDf */] = _applyDefaults,\r\n        _a[_DYN_WATCH /* @min:watch */] = _watch,\r\n        _a.ref = _ref,\r\n        _a[_DYN_RD_ONLY /* @min:rdOnly */] = _rdOnly,\r\n        _a._block = _block,\r\n        _a);\r\n    objDefine(cfgHandler, \"uid\", {\r\n        c: false,\r\n        e: false,\r\n        w: false,\r\n        v: uid\r\n    });\r\n    theState = _createState(cfgHandler);\r\n    // Setup tracking for all defined default keys\r\n    _makeDynamicObject(theState, newTarget);\r\n    return cfgHandler;\r\n}\r\n/**\r\n * Log an invalid access message to the console\r\n * @param message\r\n */\r\nfunction _logInvalidAccess(logger, message) {\r\n    if (logger) {\r\n        logger[STR_WARN_TO_CONSOLE /* @min:%2ewarnToConsole */](message);\r\n        logger[_DYN_THROW_INTERNAL /* @min:%2ethrowInternal */](2 /* eLoggingSeverity.WARNING */, 108 /* _eInternalMessageId.DynamicConfigException */, message);\r\n    }\r\n    else {\r\n        // We don't have a logger so just throw an exception\r\n        throwInvalidAccess(message);\r\n    }\r\n}\r\n/**\r\n * Create or return a dynamic version of the passed config, if it is not already dynamic\r\n * @param config - The config to be converted into a dynamic config\r\n * @param defaultConfig - The default values to apply on the config if the properties don't already exist\r\n * @param inPlace - Should the config be converted in-place into a dynamic config or a new instance returned, defaults to true\r\n * @returns The dynamic config handler for the config (whether new or existing)\r\n */\r\nexport function createDynamicConfig(config, defaultConfig, logger, inPlace) {\r\n    var dynamicHandler = _createDynamicHandler(logger, config || {}, inPlace);\r\n    if (defaultConfig) {\r\n        dynamicHandler[_DYN_SET_DF /* @min:%2esetDf */](dynamicHandler.cfg, defaultConfig);\r\n    }\r\n    return dynamicHandler;\r\n}\r\n/**\r\n * Watch and track changes for accesses to the current config, the provided config MUST already be\r\n * a dynamic config or a child accessed via the dynamic config\r\n * @param config\r\n * @param configHandler\r\n * @param logger - The logger instance to use if there is no existing handler\r\n * @returns A watcher handler instance that can be used to remove itself when being unloaded\r\n * @throws TypeError if the provided config is not a dynamic config instance\r\n */\r\nexport function onConfigChange(config, configHandler, logger) {\r\n    var handler = config[CFG_HANDLER_LINK] || config;\r\n    if (handler.cfg && (handler.cfg === config || handler.cfg[CFG_HANDLER_LINK] === handler)) {\r\n        return handler[_DYN_WATCH /* @min:%2ewatch */](configHandler);\r\n    }\r\n    _logInvalidAccess(logger, STR_NOT_DYNAMIC_ERROR + dumpObj(config));\r\n    return createDynamicConfig(config, null, logger)[_DYN_WATCH /* @min:%2ewatch */](configHandler);\r\n}\r\n//# sourceMappingURL=DynamicConfig.js.map"],"names":[],"mappings":";;;;AAA4D;AAC1B;AAClC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA"}

package/dist-es5/Config/DynamicProperty.js

@@ -1,5 +1,5 @@
 /*
- * Application Insights JavaScript SDK - Core, 3.0.1-nightly3.2304-41
+ * Application Insights JavaScript SDK - Core, 3.0.1-nightly3.2304-44
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */
 

package/dist-es5/Config/DynamicState.js

@@ -1,5 +1,5 @@
 /*
- * Application Insights JavaScript SDK - Core, 3.0.1-nightly3.2304-41
+ * Application Insights JavaScript SDK - Core, 3.0.1-nightly3.2304-44
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */
 

package/dist-es5/Config/DynamicSupport.js

@@ -1,5 +1,5 @@
 /*
- * Application Insights JavaScript SDK - Core, 3.0.1-nightly3.2304-41
+ * Application Insights JavaScript SDK - Core, 3.0.1-nightly3.2304-44
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */
 

package/dist-es5/Config/IConfigDefaults.js

@@ -1,5 +1,5 @@
 /*
- * Application Insights JavaScript SDK - Core, 3.0.1-nightly3.2304-41
+ * Application Insights JavaScript SDK - Core, 3.0.1-nightly3.2304-44
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */
 

package/dist-es5/Config/IDynamicConfigHandler.js

@@ -1,5 +1,5 @@
 /*
- * Application Insights JavaScript SDK - Core, 3.0.1-nightly3.2304-41
+ * Application Insights JavaScript SDK - Core, 3.0.1-nightly3.2304-44
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */
 

package/dist-es5/Config/IDynamicPropertyHandler.js

@@ -1,5 +1,5 @@
 /*
- * Application Insights JavaScript SDK - Core, 3.0.1-nightly3.2304-41
+ * Application Insights JavaScript SDK - Core, 3.0.1-nightly3.2304-44
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */
 

package/dist-es5/Config/IDynamicWatcher.js

@@ -1,5 +1,5 @@
 /*
- * Application Insights JavaScript SDK - Core, 3.0.1-nightly3.2304-41
+ * Application Insights JavaScript SDK - Core, 3.0.1-nightly3.2304-44
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */
 

package/dist-es5/Config/_IDynamicConfigHandlerState.js

@@ -1,5 +1,5 @@
 /*
- * Application Insights JavaScript SDK - Core, 3.0.1-nightly3.2304-41
+ * Application Insights JavaScript SDK - Core, 3.0.1-nightly3.2304-44
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */
 export {};

package/dist-es5/JavaScriptSDK/AggregationError.js

@@ -1,5 +1,5 @@
 /*
- * Application Insights JavaScript SDK - Core, 3.0.1-nightly3.2304-41
+ * Application Insights JavaScript SDK - Core, 3.0.1-nightly3.2304-44
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */
 

package/dist-es5/JavaScriptSDK/AppInsightsCore.js

@@ -1,5 +1,5 @@
 /*
- * Application Insights JavaScript SDK - Core, 3.0.1-nightly3.2304-41
+ * Application Insights JavaScript SDK - Core, 3.0.1-nightly3.2304-44
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */
 
@@ -8,9 +8,11 @@
 var _a;
 import { __spreadArrayFn as __spreadArray } from "@microsoft/applicationinsights-shims";
 import dynamicProto from "@microsoft/dynamicproto-js";
+import { createPromise } from "@nevware21/ts-async";
 import { arrAppend, arrForEach, arrIndexOf, createTimeout, deepExtend, hasDocument, isFunction, isNullOrUndefined, isPlainObject, objDeepFreeze, objDefine, objForEachKey, objFreeze, objHasOwn, scheduleTimeout, throwError } from "@nevware21/ts-utils";
 import { createDynamicConfig, onConfigChange } from "../Config/DynamicConfig";
-import { _DYN_ADD_NOTIFICATION_LIS1, _DYN_CANCEL, _DYN_CREATE_NEW, _DYN_ENABLED, _DYN_GET_NOTIFY_MGR, _DYN_GET_PLUGIN, _DYN_GET_PROCESS_TEL_CONT0, _DYN_IDENTIFIER, _DYN_INITIALIZE, _DYN_IS_ASYNC, _DYN_IS_INITIALIZED, _DYN_LENGTH, _DYN_LOGGER, _DYN_LOGGING_LEVEL_CONSOL4, _DYN_MESSAGE, _DYN_MESSAGE_ID, _DYN_NAME, _DYN_NOTIFY, _DYN_ON_COMPLETE, _DYN_POLL_INTERNAL_LOGS, _DYN_PROCESS_NEXT, _DYN_PUSH, _DYN_REMOVE_NOTIFICATION_2, _DYN_SET_DF, _DYN_SPLICE, _DYN_STOP_POLLING_INTERNA3, _DYN_TEARDOWN, _DYN_TIME, _DYN_VERSION, _DYN_WATCH } from "../__DynamicConstants";
+import { _DYN_ADD_NOTIFICATION_LIS1, _DYN_CANCEL, _DYN_CREATE_NEW, _DYN_ENABLED, _DYN_GET_NOTIFY_MGR, _DYN_GET_PLUGIN, _DYN_GET_PROCESS_TEL_CONT0, _DYN_IDENTIFIER, _DYN_INITIALIZE, _DYN_IS_ASYNC, _DYN_IS_INITIALIZED, _DYN_LENGTH, _DYN_LOGGER, _DYN_LOGGING_LEVEL_CONSOL4, _DYN_MESSAGE, _DYN_MESSAGE_ID, _DYN_NAME, _DYN_NOTIFY, _DYN_ON_COMPLETE, _DYN_POLL_INTERNAL_LOGS, _DYN_PROCESS_NEXT, _DYN_PUSH, _DYN_REMOVE_NOTIFICATION_2, _DYN_SET_DF, _DYN_SPLICE, _DYN_STOP_POLLING_INTERNA3, _DYN_TEARDOWN, _DYN_TIME, _DYN_UNLOAD, _DYN_VERSION, _DYN_WATCH } from "../__DynamicConstants";
+import { doUnloadAll, runTargetUnload } from "./AsyncUtils";
 import { ChannelControllerPriority } from "./Constants";
 import { createCookieMgr } from "./CookieMgr";
 import { createUniqueNamespace } from "./DataCacheHelper";
@@ -166,6 +168,7 @@ var AppInsightsCore = /** @class */ (function () {
         // NOTE!: DON'T set default values here, instead set them in the _initDefaults() function as it is also called during teardown()
         var _configHandler;
         var _isInitialized;
+        var _logger;
         var _eventQueue;
         var _notificationManager;
         var _perfManager;
@@ -231,8 +234,7 @@ var AppInsightsCore = /** @class */ (function () {
                 _notificationManager = notificationManager;
                 _initDebugListener();
                 _initPerfManager();
-                _self[_DYN_LOGGER /* @min:%2elogger */] = logger || new DiagnosticLogger(config);
-                _configHandler[_DYN_LOGGER /* @min:%2elogger */] = _self[_DYN_LOGGER /* @min:%2elogger */];
+                _self[_DYN_LOGGER /* @min:%2elogger */] = logger;
                 var cfgExtensions = config[STR_EXTENSIONS /* @min:%2eextensions */];
                 // Extension validation
                 _configExtensions = [];
@@ -245,10 +247,10 @@ var AppInsightsCore = /** @class */ (function () {
                 if (_channels[_DYN_LENGTH /* @min:%2elength */] > 1) {
                     var teeController = _self[_DYN_GET_PLUGIN /* @min:%2egetPlugin */]("TeeChannelController");
                     if (!teeController || !teeController.plugin) {
-                        _throwInternal(_self[_DYN_LOGGER /* @min:%2elogger */], 1 /* eLoggingSeverity.CRITICAL */, 28 /* _eInternalMessageId.SenderNotInitialized */, "TeeChannel required");
+                        _throwInternal(_logger, 1 /* eLoggingSeverity.CRITICAL */, 28 /* _eInternalMessageId.SenderNotInitialized */, "TeeChannel required");
                     }
                 }
-                _registerDelayedCfgListener(config, _cfgListeners, _self[_DYN_LOGGER /* @min:%2elogger */]);
+                _registerDelayedCfgListener(config, _cfgListeners, _logger);
                 _cfgListeners = null;
                 _isInitialized = true;
                 _self.releaseQueue();
@@ -294,11 +296,9 @@ var AppInsightsCore = /** @class */ (function () {
             _self[_DYN_GET_PROCESS_TEL_CONT0 /* @min:%2egetProcessTelContext */] = _createTelCtx;
             _self[_DYN_GET_NOTIFY_MGR /* @min:%2egetNotifyMgr */] = function () {
                 if (!_notificationManager) {
-                    _addUnloadHook(_configHandler[_DYN_WATCH /* @min:%2ewatch */](function (details) {
-                        _notificationManager = new NotificationManager(details.cfg);
-                        // For backward compatibility only
-                        _self[strNotificationManager] = _notificationManager;
-                    }));
+                    _notificationManager = new NotificationManager(_configHandler.cfg);
+                    // For backward compatibility only
+                    _self[strNotificationManager] = _notificationManager;
                 }
                 return _notificationManager;
             };
@@ -322,14 +322,15 @@ var AppInsightsCore = /** @class */ (function () {
             };
             _self.getCookieMgr = function () {
                 if (!_cookieManager) {
-                    _addUnloadHook(_configHandler[_DYN_WATCH /* @min:%2ewatch */](function (details) {
-                        _cookieManager = createCookieMgr(details.cfg, _self[_DYN_LOGGER /* @min:%2elogger */]);
-                    }));
+                    _cookieManager = createCookieMgr(_configHandler.cfg, _self[_DYN_LOGGER /* @min:%2elogger */]);
                 }
                 return _cookieManager;
             };
             _self.setCookieMgr = function (cookieMgr) {
-                _cookieManager = cookieMgr;
+                if (_cookieManager !== cookieMgr) {
+                    runTargetUnload(_cookieManager, false);
+                    _cookieManager = cookieMgr;
+                }
             };
             _self[STR_GET_PERF_MGR /* @min:%2egetPerfMgr */] = function () {
                 if (!_perfManager && !_cfgPerfManager) {
@@ -367,7 +368,7 @@ var AppInsightsCore = /** @class */ (function () {
             };
             function _startLogPoller(alwaysStart) {
                 if ((!_internalLogPoller || !_internalLogPoller[_DYN_ENABLED /* @min:%2eenabled */]) && !_forceStopInternalLogPoller) {
-                    var shouldStart = alwaysStart || (_self.logger && _self.logger.queue[_DYN_LENGTH /* @min:%2elength */] > 0);
+                    var shouldStart = alwaysStart || (_logger && _logger.queue[_DYN_LENGTH /* @min:%2elength */] > 0);
                     if (shouldStart) {
                         if (!_internalLogPollerListening) {
                             _internalLogPollerListening = true;
@@ -403,7 +404,7 @@ var AppInsightsCore = /** @class */ (function () {
             };
             // Add addTelemetryInitializer
             proxyFunctions(_self, function () { return _telemetryInitializerPlugin; }, ["addTelemetryInitializer"]);
-            _self.unload = function (isAsync, unloadComplete, cbTimeout) {
+            _self[_DYN_UNLOAD /* @min:%2eunload */] = function (isAsync, unloadComplete, cbTimeout) {
                 var _a;
                 if (isAsync === void 0) { isAsync = true; }
                 if (!_isInitialized) {
@@ -421,11 +422,21 @@ var AppInsightsCore = /** @class */ (function () {
                     _a[_DYN_IS_ASYNC /* @min:isAsync */] = isAsync,
                     _a.flushComplete = false,
                     _a);
+                var result;
+                if (isAsync && !unloadComplete) {
+                    result = createPromise(function (resolve) {
+                        // Set the callback to the promise resolve callback
+                        unloadComplete = resolve;
+                    });
+                }
                 var processUnloadCtx = createProcessTelemetryUnloadContext(_getPluginChain(), _self);
                 processUnloadCtx[_DYN_ON_COMPLETE /* @min:%2eonComplete */](function () {
                     _hookContainer.run(_self[_DYN_LOGGER /* @min:%2elogger */]);
-                    _initDefaults();
-                    unloadComplete && unloadComplete(unloadState);
+                    // Run any "unload" functions for the _cookieManager, _notificationManager and _logger
+                    doUnloadAll([_cookieManager, _notificationManager, _logger], isAsync, function () {
+                        _initDefaults();
+                        unloadComplete && unloadComplete(unloadState);
+                    });
                 }, _self);
                 function _doUnload(flushComplete) {
                     unloadState.flushComplete = flushComplete;
@@ -441,6 +452,7 @@ var AppInsightsCore = /** @class */ (function () {
                 if (!_flushChannels(isAsync, _doUnload, 6 /* SendRequestReason.SdkUnload */, cbTimeout)) {
                     _doUnload(false);
                 }
+                return result;
             };
             _self[_DYN_GET_PLUGIN /* @min:%2egetPlugin */] = _getPlugin;
             _self.addPlugin = function (plugin, replaceExisting, isAsync, addCb) {
@@ -618,6 +630,22 @@ var AppInsightsCore = /** @class */ (function () {
                         return _pluginVersionString || STR_EMPTY;
                     }
                 });
+                objDefine(_self, "logger", {
+                    g: function () {
+                        if (!_logger) {
+                            _logger = new DiagnosticLogger(_configHandler.cfg);
+                            _configHandler[_DYN_LOGGER /* @min:%2elogger */] = _logger;
+                        }
+                        return _logger;
+                    },
+                    s: function (newLogger) {
+                        _configHandler[_DYN_LOGGER /* @min:%2elogger */] = newLogger;
+                        if (_logger !== newLogger) {
+                            runTargetUnload(_logger, false);
+                            _logger = newLogger;
+                        }
+                    }
+                });
                 _self[_DYN_LOGGER /* @min:%2elogger */] = new DiagnosticLogger(_configHandler.cfg);
                 _extensions = [];
                 var cfgExtensions = _self.config[STR_EXTENSIONS /* @min:%2eextensions */] || [];
@@ -625,9 +653,11 @@ var AppInsightsCore = /** @class */ (function () {
                 arrAppend(cfgExtensions, _extensions);
                 _telemetryInitializerPlugin = new TelemetryInitializerPlugin();
                 _eventQueue = [];
+                runTargetUnload(_notificationManager, false);
                 _notificationManager = null;
                 _perfManager = null;
                 _cfgPerfManager = null;
+                runTargetUnload(_cookieManager, false);
                 _cookieManager = null;
                 _pluginChain = null;
                 _configExtensions = [];
@@ -795,9 +825,9 @@ var AppInsightsCore = /** @class */ (function () {
                 }
             }
             function _flushInternalLogs() {
-                if (_self[_DYN_LOGGER /* @min:%2elogger */] && _self[_DYN_LOGGER /* @min:%2elogger */].queue) {
-                    var queue = _self[_DYN_LOGGER /* @min:%2elogger */].queue.slice(0);
-                    _self.logger.queue[_DYN_LENGTH /* @min:%2elength */] = 0;
+                if (_logger && _logger.queue) {
+                    var queue = _logger.queue.slice(0);
+                    _logger.queue[_DYN_LENGTH /* @min:%2elength */] = 0;
                     arrForEach(queue, function (logMessage) {
                         var _a;
                         var item = (_a = {},