@microsoft/applicationinsights-core-js 3.0.0-beta.2211-03 → 3.0.0-beta.2212-03

package/dist/applicationinsights-core-js.rollup.d.ts

@@ -1,5 +1,5 @@
 /*
- * Microsoft Application Insights Core Javascript SDK, 3.0.0-beta.2211-03
+ * Microsoft Application Insights Core Javascript SDK, 3.0.0-beta.2212-03
  * Copyright (c) Microsoft and contributors. All rights reserved.
  *
  * Microsoft Application Insights Team
@@ -157,7 +157,7 @@ export declare class AppInsightsCore implements IAppInsightsCore {
     getWParam: () => number;
     constructor();
     initialize(config: IConfiguration, extensions: IPlugin[], logger?: IDiagnosticLogger, notificationManager?: INotificationManager): void;
-    getTransmissionControls(): IChannelControls[][];
+    getChannels(): IChannelControls[];
     track(telemetryItem: ITelemetryItem): void;
     getProcessTelContext(): IProcessTelemetryContext;
     getNotifyMgr(): INotificationManager;
@@ -860,7 +860,7 @@ export declare interface IAppInsightsCore extends IPerfManagerProvider {
      */
     isInitialized?: () => boolean;
     initialize(config: IConfiguration, extensions: IPlugin[], logger?: IDiagnosticLogger, notificationManager?: INotificationManager): void;
-    getTransmissionControls(): IChannelControls[][];
+    getChannels(): IChannelControls[];
     track(telemetryItem: ITelemetryItem): void;
     /**
      * Get the current notification manager
@@ -1046,11 +1046,11 @@ export declare interface IChannelControls extends ITelemetryPlugin {
     /**
      * Pause sending data
      */
-    pause(): void;
+    pause?(): void;
     /**
      * Resume sending data
      */
-    resume(): void;
+    resume?(): void;
     /**
      * Tear down the plugin and remove any hooked value, the plugin should be removed so that it is no longer initialized and
      * therefore could be re-initialized after being torn down. The plugin should ensure that once this has been called any further
@@ -1059,7 +1059,7 @@ export declare interface IChannelControls extends ITelemetryPlugin {
      * @param unloadState - The details / state of the unload process, it holds details like whether it should be unloaded synchronously or asynchronously and the reason for the unload.
      * @returns boolean - true if the plugin has or will call processNext(), this for backward compatibility as previously teardown was synchronous and returned nothing.
      */
-    teardown: (unloadCtx?: IProcessTelemetryUnloadContext, unloadState?: ITelemetryUnloadState) => void | boolean;
+    teardown?: (unloadCtx?: IProcessTelemetryUnloadContext, unloadState?: ITelemetryUnloadState) => void | boolean;
     /**
      * Flush to send data immediately; channel should default to sending data asynchronously
      * @param async - send data asynchronously when true
@@ -1068,7 +1068,7 @@ export declare interface IChannelControls extends ITelemetryPlugin {
      * @param sendReason - specify the reason that you are calling "flush" defaults to ManualFlush (1) if not specified
      * @returns - true if the callback will be return after the flush is complete otherwise the caller should assume that any provided callback will never be called
      */
-    flush(async: boolean, callBack?: (flushComplete?: boolean) => void, sendReason?: SendRequestReason): boolean | void;
+    flush?(async: boolean, callBack?: (flushComplete?: boolean) => void, sendReason?: SendRequestReason): boolean | void;
 }
 
 /**

package/dist-esm/Config/ConfigDefaults.js

@@ -1,5 +1,5 @@
 /*
- * Application Insights JavaScript SDK - Core, 3.0.0-beta.2211-03
+ * Application Insights JavaScript SDK - Core, 3.0.0-beta.2212-03
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */
 

package/dist-esm/Config/DynamicConfig.js

@@ -1,5 +1,5 @@
 /*
- * Application Insights JavaScript SDK - Core, 3.0.0-beta.2211-03
+ * Application Insights JavaScript SDK - Core, 3.0.0-beta.2212-03
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */
 

package/dist-esm/Config/DynamicProperty.js

@@ -1,5 +1,5 @@
 /*
- * Application Insights JavaScript SDK - Core, 3.0.0-beta.2211-03
+ * Application Insights JavaScript SDK - Core, 3.0.0-beta.2212-03
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */
 

package/dist-esm/Config/DynamicState.js

@@ -1,5 +1,5 @@
 /*
- * Application Insights JavaScript SDK - Core, 3.0.0-beta.2211-03
+ * Application Insights JavaScript SDK - Core, 3.0.0-beta.2212-03
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */
 

package/dist-esm/Config/DynamicSupport.js

@@ -1,5 +1,5 @@
 /*
- * Application Insights JavaScript SDK - Core, 3.0.0-beta.2211-03
+ * Application Insights JavaScript SDK - Core, 3.0.0-beta.2212-03
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */
 

package/dist-esm/Config/IConfigDefaults.js

@@ -1,5 +1,5 @@
 /*
- * Application Insights JavaScript SDK - Core, 3.0.0-beta.2211-03
+ * Application Insights JavaScript SDK - Core, 3.0.0-beta.2212-03
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */
 

package/dist-esm/Config/IDynamicConfigHandler.js

@@ -1,5 +1,5 @@
 /*
- * Application Insights JavaScript SDK - Core, 3.0.0-beta.2211-03
+ * Application Insights JavaScript SDK - Core, 3.0.0-beta.2212-03
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */
 

package/dist-esm/Config/IDynamicPropertyHandler.js

@@ -1,5 +1,5 @@
 /*
- * Application Insights JavaScript SDK - Core, 3.0.0-beta.2211-03
+ * Application Insights JavaScript SDK - Core, 3.0.0-beta.2212-03
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */
 

package/dist-esm/Config/IDynamicWatcher.js

@@ -1,5 +1,5 @@
 /*
- * Application Insights JavaScript SDK - Core, 3.0.0-beta.2211-03
+ * Application Insights JavaScript SDK - Core, 3.0.0-beta.2212-03
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */
 

package/dist-esm/Config/_IDynamicConfigHandlerState.js

@@ -1,5 +1,5 @@
 /*
- * Application Insights JavaScript SDK - Core, 3.0.0-beta.2211-03
+ * Application Insights JavaScript SDK - Core, 3.0.0-beta.2212-03
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */
 export {};

package/dist-esm/JavaScriptSDK/AggregationError.js

@@ -1,5 +1,5 @@
 /*
- * Application Insights JavaScript SDK - Core, 3.0.0-beta.2211-03
+ * Application Insights JavaScript SDK - Core, 3.0.0-beta.2212-03
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */
 

package/dist-esm/JavaScriptSDK/AppInsightsCore.js

@@ -1,5 +1,5 @@
 /*
- * Application Insights JavaScript SDK - Core, 3.0.0-beta.2211-03
+ * Application Insights JavaScript SDK - Core, 3.0.0-beta.2212-03
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */
 
@@ -8,10 +8,10 @@
 var _a;
 import { __spreadArrayFn as __spreadArray } from "@microsoft/applicationinsights-shims";
 import dynamicProto from "@microsoft/dynamicproto-js";
-import { arrAppend, arrForEach, arrIndexOf, deepExtend, dumpObj, hasDocument, isFunction, isNullOrUndefined, isPlainObject, objDeepFreeze, objDefineProp, objForEachKey, objFreeze, objHasOwn, scheduleInterval, throwError } from "@nevware21/ts-utils";
+import { arrAppend, arrForEach, arrIndexOf, deepExtend, dumpObj, hasDocument, isFunction, isNullOrUndefined, isPlainObject, objDeepFreeze, objDefineProp, objForEachKey, objFreeze, objHasOwn, scheduleInterval, scheduleTimeout, throwError } from "@nevware21/ts-utils";
 import { createDynamicConfig, onConfigChange } from "../Config/DynamicConfig";
-import { _DYN_ADD_NOTIFICATION_LIS1, _DYN_CALL, _DYN_CANCEL, _DYN_CONFIGURABLE, _DYN_ENUMERABLE, _DYN_FLUSH, _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 { ChannelControllerPriority, createChannelControllerPlugin, createChannelQueues } from "./ChannelController";
+import { _DYN_ADD_NOTIFICATION_LIS1, _DYN_CALL, _DYN_CANCEL, _DYN_CONFIGURABLE, _DYN_CREATE_NEW, _DYN_ENUMERABLE, _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 { ChannelControllerPriority } from "./Constants";
 import { createCookieMgr } from "./CookieMgr";
 import { createUniqueNamespace } from "./DataCacheHelper";
 import { getDebugListener } from "./DbgExtensionUtils";
@@ -56,6 +56,7 @@ function _validateExtensions(logger, channelPriority, allExtensions) {
     var _a;
     // Concat all available extensions
     var coreExtensions = [];
+    var channels = [];
     // Check if any two extensions have the same priority, then warn to console
     // And extract the local extensions from the
     var extPriorities = {};
@@ -76,16 +77,18 @@ function _validateExtensions(logger, channelPriority, allExtensions) {
                 extPriorities[extPriority] = identifier;
             }
         }
-        // Split extensions to core and channelController
+        // Split extensions to core and channels
         if (!extPriority || extPriority < channelPriority) {
             // Add to core extension that will be managed by AppInsightsCore
             coreExtensions[_DYN_PUSH /* @min:%2epush */](ext);
         }
+        else {
+            channels[_DYN_PUSH /* @min:%2epush */](ext);
+        }
     });
-    return _a = {
-            all: allExtensions
-        },
+    return _a = {},
         _a[STR_CORE /* @min:core */] = coreExtensions,
+        _a[STR_CHANNELS /* @min:channels */] = channels,
         _a;
 }
 function _isPluginPresent(thePlugin, plugins) {
@@ -169,10 +172,8 @@ var AppInsightsCore = /** @class */ (function () {
         var _cookieManager;
         var _pluginChain;
         var _configExtensions;
-        var _coreExtensions;
-        var _channelControl;
         var _channelConfig;
-        var _channelQueue;
+        var _channels;
         var _isUnloading;
         var _telemetryInitializerPlugin;
         var _internalLogsEventName;
@@ -229,20 +230,26 @@ var AppInsightsCore = /** @class */ (function () {
                 _configExtensions[_DYN_PUSH /* @min:%2epush */].apply(_configExtensions, __spreadArray(__spreadArray([], extensions, false), cfgExtensions, false));
                 _channelConfig = config[STR_CHANNELS /* @min:%2echannels */];
                 _initPluginChain(null);
-                if (!_channelQueue || _channelQueue[_DYN_LENGTH /* @min:%2elength */] === 0) {
+                if (!_channels || _channels[_DYN_LENGTH /* @min:%2elength */] === 0) {
                     throwError("No " + STR_CHANNELS + " available");
                 }
+                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");
+                    }
+                }
                 _registerDelayedCfgListener(config, _cfgListeners, _self[_DYN_LOGGER /* @min:%2elogger */]);
                 _cfgListeners = null;
                 _isInitialized = true;
                 _self.releaseQueue();
                 _self[_DYN_POLL_INTERNAL_LOGS /* @min:%2epollInternalLogs */]();
             };
-            _self.getTransmissionControls = function () {
+            _self.getChannels = function () {
                 var controls = [];
-                if (_channelQueue) {
-                    arrForEach(_channelQueue, function (channels) {
-                        controls[_DYN_PUSH /* @min:%2epush */](channels.queue);
+                if (_channels) {
+                    arrForEach(_channels, function (channel) {
+                        controls[_DYN_PUSH /* @min:%2epush */](channel);
                     });
                 }
                 return objFreeze(controls);
@@ -523,7 +530,7 @@ var AppInsightsCore = /** @class */ (function () {
             _self.evtNamespace = function () {
                 return _evtNamespace;
             };
-            _self[_DYN_FLUSH /* @min:%2eflush */] = _flushChannels;
+            _self.flush = _flushChannels;
             _self.getTraceCtx = function (createNew) {
                 if (!_traceCtx) {
                     _traceCtx = createDistributedTraceContext();
@@ -624,11 +631,9 @@ var AppInsightsCore = /** @class */ (function () {
                 _cfgPerfManager = null;
                 _cookieManager = null;
                 _pluginChain = null;
-                _coreExtensions = null;
                 _configExtensions = [];
-                _channelControl = null;
                 _channelConfig = null;
-                _channelQueue = null;
+                _channels = null;
                 _isUnloading = false;
                 _internalLogsEventName = null;
                 _evtNamespace = createUniqueNamespace("AIBaseCore", true);
@@ -647,42 +652,24 @@ var AppInsightsCore = /** @class */ (function () {
             function _initPluginChain(updateState) {
                 // Extension validation
                 var theExtensions = _validateExtensions(_self[_DYN_LOGGER /* @min:%2elogger */], ChannelControllerPriority, _configExtensions);
-                _coreExtensions = theExtensions[STR_CORE /* @min:%2ecore */];
                 _pluginChain = null;
                 _pluginVersionString = null;
                 _pluginVersionStringArr = null;
-                // Sort the complete set of extensions by priority
-                var allExtensions = theExtensions.all;
-                // Initialize the Channel Queues and the channel plugins first
-                _channelQueue = objFreeze(createChannelQueues(_channelConfig, allExtensions, _self));
-                if (_channelControl) {
-                    // During add / remove of a plugin this may get called again, so don't re-add if already present
-                    // But we also want the controller as the last, so remove if already present
-                    // And reusing the existing instance, just in case an installed plugin has a reference and
-                    // is using it.
-                    var idx = arrIndexOf(allExtensions, _channelControl);
-                    if (idx !== -1) {
-                        allExtensions[_DYN_SPLICE /* @min:%2esplice */](idx, 1);
-                    }
-                    idx = arrIndexOf(_coreExtensions, _channelControl);
-                    if (idx !== -1) {
-                        _coreExtensions[_DYN_SPLICE /* @min:%2esplice */](idx, 1);
-                    }
-                    _channelControl._setQueue(_channelQueue);
-                }
-                else {
-                    _channelControl = createChannelControllerPlugin(_channelQueue, _self);
-                }
-                // Add on "channelController" as the last "plugin"
-                allExtensions[_DYN_PUSH /* @min:%2epush */](_channelControl);
-                _coreExtensions[_DYN_PUSH /* @min:%2epush */](_channelControl);
+                // Get the primary channel queue and include as part of the normal extensions
+                _channels = (_channelConfig || [])[0] || [];
+                // Add any channels provided in the extensions and sort them
+                _channels = sortPlugins(arrAppend(_channels, theExtensions[STR_CHANNELS /* @min:%2echannels */]));
+                // Create an array of all extensions, including the _channels
+                var allExtensions = arrAppend(sortPlugins(theExtensions[STR_CORE /* @min:%2ecore */]), _channels);
                 // Required to allow plugins to call core.getPlugin() during their own initialization
-                _extensions = sortPlugins(allExtensions);
-                // Initialize the controls
-                _channelControl[_DYN_INITIALIZE /* @min:%2einitialize */](_configHandler.cfg, _self, allExtensions);
-                initializePlugins(_createTelCtx(), allExtensions);
-                // Now reset the extensions to just those being managed by AppInsightsCore
-                _extensions = objFreeze(sortPlugins(_coreExtensions || [])).slice();
+                _extensions = objFreeze(allExtensions);
+                var rootCtx = _createTelCtx();
+                // Initializing the channels first
+                if (_channels && _channels[_DYN_LENGTH /* @min:%2elength */] > 0) {
+                    initializePlugins(rootCtx[_DYN_CREATE_NEW /* @min:%2ecreateNew */](_channels), allExtensions);
+                }
+                // Now initialize the normal extensions (explicitly not including the _channels as this can cause duplicate initialization)
+                initializePlugins(rootCtx, allExtensions);
                 if (updateState) {
                     _doUpdate(updateState);
                 }
@@ -691,15 +678,17 @@ var AppInsightsCore = /** @class */ (function () {
                 var theExt = null;
                 var thePlugin = null;
                 arrForEach(_extensions, function (ext) {
-                    if (ext[_DYN_IDENTIFIER /* @min:%2eidentifier */] === pluginIdentifier && ext !== _channelControl && ext !== _telemetryInitializerPlugin) {
+                    if (ext[_DYN_IDENTIFIER /* @min:%2eidentifier */] === pluginIdentifier && ext !== _telemetryInitializerPlugin) {
                         thePlugin = ext;
                         return -1;
                     }
+                    // TODO: Check if the extension is an extension "host" (like the TeeChannel)
+                    // So that if the extension is not found we can ask the "host" plugins for the plugin
                 });
-                if (!thePlugin && _channelControl) {
-                    // Check the channel Controller
-                    thePlugin = _channelControl.getChannel(pluginIdentifier);
-                }
+                // if (!thePlugin && _channelControl) {
+                //     // Check the channel Controller
+                //     thePlugin = _channelControl.getChannel(pluginIdentifier);
+                // }
                 if (thePlugin) {
                     theExt = {
                         plugin: thePlugin,
@@ -737,8 +726,8 @@ var AppInsightsCore = /** @class */ (function () {
             function _getPluginChain() {
                 if (!_pluginChain) {
                     // copy the collection of extensions
-                    var extensions = (_coreExtensions || []).slice();
-                    // During add / remove this may get called again, so don't readd if already present
+                    var extensions = (_extensions || []).slice();
+                    // During add / remove this may get called again, so don't read if already present
                     if (arrIndexOf(extensions, _telemetryInitializerPlugin) === -1) {
                         extensions[_DYN_PUSH /* @min:%2epush */](_telemetryInitializerPlugin);
                     }
@@ -808,10 +797,51 @@ var AppInsightsCore = /** @class */ (function () {
                 }
             }
             function _flushChannels(isAsync, callBack, sendReason, cbTimeout) {
-                if (_channelControl) {
-                    return _channelControl[_DYN_FLUSH /* @min:%2eflush */](isAsync, callBack, sendReason || 6 /* SendRequestReason.SdkUnload */, cbTimeout);
+                // Setting waiting to one so that we don't call the callBack until we finish iterating
+                var waiting = 1;
+                var doneIterating = false;
+                var cbTimer = null;
+                cbTimeout = cbTimeout || 5000;
+                function doCallback() {
+                    waiting--;
+                    if (doneIterating && waiting === 0) {
+                        cbTimer && cbTimer[_DYN_CANCEL /* @min:%2ecancel */]();
+                        cbTimer = null;
+                        callBack && callBack(doneIterating);
+                        callBack = null;
+                    }
+                }
+                if (_channels && _channels[_DYN_LENGTH /* @min:%2elength */] > 0) {
+                    var flushCtx = _createTelCtx()[_DYN_CREATE_NEW /* @min:%2ecreateNew */](_channels);
+                    flushCtx.iterate(function (plugin) {
+                        if (plugin.flush) {
+                            waiting++;
+                            var handled_1 = false;
+                            // Not all channels will call this callback for every scenario
+                            if (!plugin.flush(isAsync, function () {
+                                handled_1 = true;
+                                doCallback();
+                            }, sendReason)) {
+                                if (!handled_1) {
+                                    // If any channel doesn't return true and it didn't call the callback, then we should assume that the callback
+                                    // will never be called, so use a timeout to allow the channel(s) some time to "finish" before triggering any
+                                    // followup function (such as unloading)
+                                    if (isAsync && cbTimer == null) {
+                                        cbTimer = scheduleTimeout(function () {
+                                            cbTimer = null;
+                                            doCallback();
+                                        }, cbTimeout);
+                                    }
+                                    else {
+                                        doCallback();
+                                    }
+                                }
+                            }
+                        }
+                    });
                 }
-                callBack && callBack(false);
+                doneIterating = true;
+                doCallback();
                 return true;
             }
             function _initDebugListener() {
@@ -875,7 +905,7 @@ var AppInsightsCore = /** @class */ (function () {
         });
     }
 // Removed Stub for AppInsightsCore.prototype.initialize.
-// Removed Stub for AppInsightsCore.prototype.getTransmissionControls.
+// Removed Stub for AppInsightsCore.prototype.getChannels.
 // Removed Stub for AppInsightsCore.prototype.track.
 // Removed Stub for AppInsightsCore.prototype.getProcessTelContext.
 // Removed Stub for AppInsightsCore.prototype.getNotifyMgr.