@microsoft/applicationinsights-debugplugin-js 2.7.4-nightly.2202-09 → 2.8.0-beta.2202-06

package/browser/ai.dbg.2.js

@@ -1,5 +1,5 @@
 /*!
- * Application Insights JavaScript SDK - Debug Plugin, 2.7.4-nightly.2202-09
+ * Application Insights JavaScript SDK - Debug Plugin, 2.8.0-beta.2202-06
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */
 (function (global, factory) {
@@ -425,6 +425,7 @@
     var str__Proto = "__proto__";
     var strConstructor$1 = "constructor";
     var _objDefineProperty = ObjDefineProperty;
+    var _objFreeze = ObjClass.freeze;
     var _objKeys = ObjClass.keys;
     var StringProto = String[strShimPrototype];
     var _strTrim = StringProto[cStrTrim];
@@ -434,7 +435,7 @@
     var _isArray = Array.isArray;
     var _objToString = ObjProto[strToString];
     var _fnToString = ObjHasOwnProperty[strToString];
-    _fnToString.call(ObjClass);
+    var _objFunctionString = _fnToString.call(ObjClass);
     var _objGetPrototypeOf = Object["getPrototypeOf"];
     function _getObjProto(target) {
         if (target) {
@@ -548,6 +549,22 @@
     function isSymbol(value) {
         return typeof value === "symbol";
     }
+    function isPlainObject(value) {
+        var result = false;
+        if (value && typeof value === "object") {
+            var proto = _objGetPrototypeOf ? _objGetPrototypeOf(value) : _getObjProto(value);
+            if (!proto) {
+                result = true;
+            }
+            else {
+                if (proto[strConstructor$1] && ObjHasOwnProperty.call(proto, strConstructor$1)) {
+                    proto = proto[strConstructor$1];
+                }
+                result = typeof proto === strShimFunction && _fnToString.call(proto) === _objFunctionString;
+            }
+        }
+        return result;
+    }
     function toISOString(date) {
         if (date) {
             return _dataToISOString ? date[strToISOString]() : _toISOStringPoly(date);
@@ -713,6 +730,10 @@
         }
         return false;
     }
+    function _doNothing(value) {
+        return value;
+    }
+    var objFreeze = _objFreeze || _doNothing;
     function dateNow() {
         var dt = Date;
         return dt.now ? dt.now() : new dt().getTime();
@@ -737,6 +758,50 @@
     function isTruthy(value) {
         return !!value;
     }
+    function objExtend(obj, obj2, obj3, obj4, obj5, obj6) {
+        var theArgs = arguments;
+        var extended = theArgs[0] || {};
+        var argLen = theArgs.length;
+        var deep = false;
+        var idx = 1;
+        if (argLen > 0 && isBoolean(extended)) {
+            deep = extended;
+            extended = theArgs[idx] || {};
+            idx++;
+        }
+        if (!isObject(extended)) {
+            extended = {};
+        }
+        for (; idx < argLen; idx++) {
+            var arg = theArgs[idx];
+            var isArgArray = isArray(arg);
+            var isArgObj = isObject(arg);
+            for (var prop in arg) {
+                var propOk = (isArgArray && (prop in arg)) || (isArgObj && (ObjHasOwnProperty.call(arg, prop)));
+                if (!propOk) {
+                    continue;
+                }
+                var newValue = arg[prop];
+                var isNewArray = void 0;
+                if (deep && newValue && ((isNewArray = isArray(newValue)) || isPlainObject(newValue))) {
+                    var clone = extended[prop];
+                    if (isNewArray) {
+                        if (!isArray(clone)) {
+                            clone = [];
+                        }
+                    }
+                    else if (!isPlainObject(clone)) {
+                        clone = {};
+                    }
+                    newValue = objExtend(deep, clone, newValue);
+                }
+                if (newValue !== undefined) {
+                    extended[prop] = newValue;
+                }
+            }
+        }
+        return extended;
+    }
 
     var strWindow = "window";
     var strDocument = "document";
@@ -1153,252 +1218,240 @@
         return func();
     }
 
-    var TelemetryPluginChain = /** @class */ (function () {
-        function TelemetryPluginChain(plugin, defItemCtx) {
-            var _self = this;
-            var _nextProxy = null;
-            var _hasProcessTelemetry = isFunction(plugin.processTelemetry);
-            var _hasSetNext = isFunction(plugin.setNextPlugin);
-            _self._hasRun = false;
-            _self.getPlugin = function () {
-                return plugin;
-            };
-            _self.getNext = function () {
+    var strTelemetryPluginChain = "TelemetryPluginChain";
+    var strHasRunFlags = "_hasRun";
+    var strGetTelCtx = "_getTelCtx";
+    var _chainId = 0;
+    function _getNextProxyStart(proxy, config, core, startAt) {
+        while (proxy) {
+            if (proxy.getPlugin() === startAt) {
+                return proxy;
+            }
+            proxy = proxy.getNext();
+        }
+        return createTelemetryProxyChain([startAt], config, core);
+    }
+    function createProcessTelemetryContext(telemetryChain, config, core, startAt) {
+        var _nextProxy = null;
+        var _onComplete = null;
+        if (startAt) {
+            _nextProxy = _getNextProxyStart(telemetryChain, config, core, startAt);
+        }
+        else {
+            _nextProxy = telemetryChain;
+        }
+        var context = {
+            core: function () {
+                return core;
+            },
+            diagLog: function () {
+                return safeGetLogger(core, config);
+            },
+            getCfg: function () {
+                return config;
+            },
+            getExtCfg: _getExtCfg,
+            getConfig: _getConfig,
+            hasNext: function () {
+                return _nextProxy != null;
+            },
+            getNext: function () {
                 return _nextProxy;
-            };
-            _self.setNext = function (nextPlugin) {
+            },
+            setNext: function (nextPlugin) {
                 _nextProxy = nextPlugin;
-            };
-            _self.processTelemetry = function (env, itemCtx) {
-                if (!itemCtx) {
-                    itemCtx = defItemCtx;
+            },
+            processNext: function (env) {
+                _processChain(function (nextPlugin) {
+                    nextPlugin.processTelemetry(env, context);
+                });
+            },
+            iterate: _iterateChain,
+            createNew: function (plugins, startAt) {
+                if (plugins === void 0) { plugins = null; }
+                if (isArray(plugins)) {
+                    plugins = createTelemetryProxyChain(plugins, config, core, startAt);
                 }
-                var identifier = plugin ? plugin.identifier : "TelemetryPluginChain";
-                doPerf(itemCtx ? itemCtx.core() : null, function () { return identifier + ":processTelemetry"; }, function () {
-                    if (plugin && _hasProcessTelemetry) {
-                        _self._hasRun = true;
-                        try {
-                            itemCtx.setNext(_nextProxy);
-                            if (_hasSetNext) {
-                                plugin.setNextPlugin(_nextProxy);
-                            }
-                            _nextProxy && (_nextProxy._hasRun = false);
-                            plugin.processTelemetry(env, itemCtx);
-                        }
-                        catch (error) {
-                            var hasRun = _nextProxy && _nextProxy._hasRun;
-                            if (!_nextProxy || !hasRun) {
-                                itemCtx.diagLog().throwInternal(LoggingSeverity.CRITICAL, _InternalMessageId.PluginException, "Plugin [" + plugin.identifier + "] failed during processTelemetry - " + dumpObj(error));
-                            }
-                            if (_nextProxy && !hasRun) {
-                                _nextProxy.processTelemetry(env, itemCtx);
+                return createProcessTelemetryContext(plugins || _nextProxy, config, core, startAt);
+            },
+            onComplete: function (onComplete) {
+                _onComplete = onComplete;
+            }
+        };
+        function _getExtCfg(identifier, defaultValue, mergeDefault) {
+            if (defaultValue === void 0) { defaultValue = {}; }
+            if (mergeDefault === void 0) { mergeDefault = 0 ; }
+            var theConfig;
+            if (config) {
+                var extConfig = config.extensionConfig;
+                if (extConfig && identifier) {
+                    theConfig = extConfig[identifier];
+                }
+            }
+            if (!theConfig) {
+                theConfig = defaultValue;
+            }
+            else if (isObject(defaultValue)) {
+                if (mergeDefault !== 0 ) {
+                    var newConfig_1 = objExtend(true, defaultValue, theConfig);
+                    if (config && mergeDefault === 2 ) {
+                        objForEachKey(defaultValue, function (field) {
+                            if (isNullOrUndefined(newConfig_1[field])) {
+                                var cfgValue = config[field];
+                                if (!isNullOrUndefined(cfgValue)) {
+                                    newConfig_1[field] = cfgValue;
+                                }
                             }
-                        }
-                    }
-                    else if (_nextProxy) {
-                        _self._hasRun = true;
-                        _nextProxy.processTelemetry(env, itemCtx);
-                    }
-                }, function () { return ({ item: env }); }, !(env.sync));
-            };
-        }
-        return TelemetryPluginChain;
-    }());
-
-    function _createProxyChain(plugins, itemCtx) {
-        var proxies = [];
-        if (plugins && plugins.length > 0) {
-            var lastProxy = null;
-            for (var idx = 0; idx < plugins.length; idx++) {
-                var thePlugin = plugins[idx];
-                if (thePlugin && isFunction(thePlugin.processTelemetry)) {
-                    var newProxy = new TelemetryPluginChain(thePlugin, itemCtx);
-                    proxies.push(newProxy);
-                    if (lastProxy) {
-                        lastProxy.setNext(newProxy);
+                        });
                     }
-                    lastProxy = newProxy;
                 }
             }
+            return theConfig;
         }
-        return proxies.length > 0 ? proxies[0] : null;
-    }
-    function _copyProxyChain(proxy, itemCtx, startAt) {
-        var plugins = [];
-        var add = startAt ? false : true;
-        if (proxy) {
-            while (proxy) {
-                var thePlugin = proxy.getPlugin();
-                if (add || thePlugin === startAt) {
-                    add = true;
-                    plugins.push(thePlugin);
-                }
-                proxy = proxy.getNext();
+        function _getConfig(identifier, field, defaultValue) {
+            if (defaultValue === void 0) { defaultValue = false; }
+            var theValue;
+            var extConfig = _getExtCfg(identifier, null);
+            if (extConfig && !isNullOrUndefined(extConfig[field])) {
+                theValue = extConfig[field];
             }
+            else if (config && !isNullOrUndefined(config[field])) {
+                theValue = config[field];
+            }
+            return !isNullOrUndefined(theValue) ? theValue : defaultValue;
         }
-        if (!add) {
-            plugins.push(startAt);
-        }
-        return _createProxyChain(plugins, itemCtx);
-    }
-    function _copyPluginChain(srcPlugins, itemCtx, startAt) {
-        var plugins = srcPlugins;
-        var add = false;
-        if (startAt && srcPlugins) {
-            plugins = [];
-            arrForEach(srcPlugins, function (thePlugin) {
-                if (add || thePlugin === startAt) {
-                    add = true;
-                    plugins.push(thePlugin);
+        function _processChain(cb) {
+            var nextPlugin = _nextProxy;
+            if (nextPlugin) {
+                _nextProxy = nextPlugin.getNext();
+                cb(nextPlugin);
+            }
+            else {
+                if (_onComplete) {
+                    _onComplete();
+                    _onComplete = null;
                 }
-            });
+            }
         }
-        if (startAt && !add) {
-            if (!plugins) {
-                plugins = [];
+        function _iterateChain(cb) {
+            while (_nextProxy) {
+                _processChain(function (nextPlugin) {
+                    var plugin = nextPlugin.getPlugin();
+                    if (plugin) {
+                        cb(plugin);
+                    }
+                });
             }
-            plugins.push(startAt);
         }
-        return _createProxyChain(plugins, itemCtx);
+        return context;
     }
-    var ProcessTelemetryContext = /** @class */ (function () {
-        function ProcessTelemetryContext(plugins, config, core, startAt) {
-            var _self = this;
-            var _nextProxy = null;
-            if (startAt !== null) {
-                if (plugins && isFunction(plugins.getPlugin)) {
-                    _nextProxy = _copyProxyChain(plugins, _self, startAt || plugins.getPlugin());
+    function createTelemetryProxyChain(plugins, config, core, startAt) {
+        var firstProxy = null;
+        var add = startAt ? false : true;
+        if (isArray(plugins) && plugins.length > 0) {
+            var lastProxy_1 = null;
+            arrForEach(plugins, function (thePlugin) {
+                if (!add && startAt === thePlugin) {
+                    add = true;
                 }
-                else {
-                    if (startAt) {
-                        _nextProxy = _copyPluginChain(plugins, _self, startAt);
-                    }
-                    else if (isUndefined(startAt)) {
-                        _nextProxy = _createProxyChain(plugins, _self);
+                if (add && thePlugin && isFunction(thePlugin.processTelemetry)) {
+                    var newProxy = createTelemetryPluginProxy(thePlugin, config, core);
+                    if (!firstProxy) {
+                        firstProxy = newProxy;
                     }
-                }
-            }
-            _self.core = function () {
-                return core;
-            };
-            _self.diagLog = function () {
-                return safeGetLogger(core, config);
-            };
-            _self.getCfg = function () {
-                return config;
-            };
-            _self.getExtCfg = function (identifier, defaultValue) {
-                if (defaultValue === void 0) { defaultValue = {}; }
-                var theConfig;
-                if (config) {
-                    var extConfig = config.extensionConfig;
-                    if (extConfig && identifier) {
-                        theConfig = extConfig[identifier];
+                    if (lastProxy_1) {
+                        lastProxy_1._setNext(newProxy);
                     }
+                    lastProxy_1 = newProxy;
                 }
-                return (theConfig ? theConfig : defaultValue);
-            };
-            _self.getConfig = function (identifier, field, defaultValue) {
-                if (defaultValue === void 0) { defaultValue = false; }
-                var theValue;
-                var extConfig = _self.getExtCfg(identifier, null);
-                if (extConfig && !isNullOrUndefined(extConfig[field])) {
-                    theValue = extConfig[field];
-                }
-                else if (config && !isNullOrUndefined(config[field])) {
-                    theValue = config[field];
-                }
-                return !isNullOrUndefined(theValue) ? theValue : defaultValue;
-            };
-            _self.hasNext = function () {
-                return _nextProxy != null;
-            };
-            _self.getNext = function () {
-                return _nextProxy;
-            };
-            _self.setNext = function (nextPlugin) {
-                _nextProxy = nextPlugin;
-            };
-            _self.processNext = function (env) {
-                var nextPlugin = _nextProxy;
-                if (nextPlugin) {
-                    _nextProxy = nextPlugin.getNext();
-                    nextPlugin.processTelemetry(env, _self);
-                }
-            };
-            _self.createNew = function (plugins, startAt) {
-                if (plugins === void 0) { plugins = null; }
-                return new ProcessTelemetryContext(plugins || _nextProxy, config, core, startAt);
-            };
+            });
         }
-        return ProcessTelemetryContext;
-    }());
-
-    var strExtensionConfig = "extensionConfig";
-
-    var strGetPlugin = "getPlugin";
-    var BaseTelemetryPlugin = /** @class */ (function () {
-        function BaseTelemetryPlugin() {
-            var _self = this;
-            var _isinitialized = false;
-            var _rootCtx = null;
-            var _nextPlugin = null;
-            _self.core = null;
-            _self.diagLog = function (itemCtx) {
-                return _self._getTelCtx(itemCtx).diagLog();
-            };
-            _self.isInitialized = function () {
-                return _isinitialized;
-            };
-            _self.setInitialized = function (isInitialized) {
-                _isinitialized = isInitialized;
-            };
-            _self.setNextPlugin = function (next) {
-                _nextPlugin = next;
-            };
-            _self.processNext = function (env, itemCtx) {
-                if (itemCtx) {
-                    itemCtx.processNext(env);
-                }
-                else if (_nextPlugin && isFunction(_nextPlugin.processTelemetry)) {
-                    _nextPlugin.processTelemetry(env, null);
+        if (startAt && !firstProxy) {
+            return createTelemetryProxyChain([startAt], config, core);
+        }
+        return firstProxy;
+    }
+    function createTelemetryPluginProxy(plugin, config, core) {
+        var nextProxy = null;
+        var hasProcessTelemetry = isFunction(plugin.processTelemetry);
+        var hasSetNext = isFunction(plugin.setNextPlugin);
+        var chainId;
+        if (plugin) {
+            chainId = plugin.identifier + "-" + plugin.priority + "-" + _chainId++;
+        }
+        else {
+            chainId = "Unknown-0-" + _chainId++;
+        }
+        var proxyChain = {
+            getPlugin: function () {
+                return plugin;
+            },
+            getNext: function () {
+                return nextProxy;
+            },
+            processTelemetry: _processTelemetry,
+            _id: chainId,
+            _setNext: function (nextPlugin) {
+                nextProxy = nextPlugin;
+            }
+        };
+        function _processChain(itemCtx, processPluginFn, processProxyFn, name, details, isAsync) {
+            if (!itemCtx) {
+                if (plugin && isFunction(plugin[strGetTelCtx])) {
+                    itemCtx = plugin[strGetTelCtx]();
                 }
-            };
-            _self._getTelCtx = function (currentCtx) {
-                if (currentCtx === void 0) { currentCtx = null; }
-                var itemCtx = currentCtx;
                 if (!itemCtx) {
-                    var rootCtx = _rootCtx || new ProcessTelemetryContext(null, {}, _self.core);
-                    if (_nextPlugin && _nextPlugin[strGetPlugin]) {
-                        itemCtx = rootCtx.createNew(null, _nextPlugin[strGetPlugin]);
+                    itemCtx = createProcessTelemetryContext(proxyChain, config, core);
+                }
+            }
+            var identifier = plugin ? plugin.identifier : strTelemetryPluginChain;
+            var hasRunContext = itemCtx[strHasRunFlags];
+            if (!hasRunContext) {
+                hasRunContext = itemCtx[strHasRunFlags] = {};
+            }
+            doPerf(itemCtx.core(), function () { return identifier + ":" + name; }, function () {
+                hasRunContext[chainId] = true;
+                var hasRun = false;
+                itemCtx.setNext(nextProxy);
+                if (plugin) {
+                    try {
+                        var nextId = nextProxy ? nextProxy._id : "";
+                        if (nextId) {
+                            hasRunContext[nextId] = false;
+                        }
+                        hasRun = processPluginFn(itemCtx);
                     }
-                    else {
-                        itemCtx = rootCtx.createNew(null, _nextPlugin);
+                    catch (error) {
+                        var hasNextRun = nextProxy ? hasRunContext[nextProxy._id] : true;
+                        if (hasNextRun) {
+                            hasRun = true;
+                        }
+                        if (!nextProxy || !hasNextRun) {
+                            itemCtx.diagLog().throwInternal(LoggingSeverity.CRITICAL, _InternalMessageId.PluginException, "Plugin [" + plugin.identifier + "] failed during " + name + " - " + dumpObj(error) + ", run flags: " + dumpObj(hasRunContext));
+                        }
                     }
                 }
-                return itemCtx;
-            };
-            _self._baseTelInit = function (config, core, extensions, pluginChain) {
-                if (config) {
-                    setValue(config, strExtensionConfig, [], null, isNullOrUndefined);
+                if (nextProxy && !hasRun) {
+                    processProxyFn(itemCtx);
                 }
-                if (!pluginChain && core) {
-                    pluginChain = core.getProcessTelContext().getNext();
+            }, details, isAsync);
+        }
+        function _processTelemetry(env, itemCtx) {
+            _processChain(itemCtx, function (itemCtx) {
+                if (!hasProcessTelemetry) {
+                    return false;
                 }
-                var nextPlugin = _nextPlugin;
-                if (_nextPlugin && _nextPlugin[strGetPlugin]) {
-                    nextPlugin = _nextPlugin[strGetPlugin]();
+                if (hasSetNext) {
+                    plugin.setNextPlugin(nextProxy);
                 }
-                _self.core = core;
-                _rootCtx = new ProcessTelemetryContext(pluginChain, config, core, nextPlugin);
-                _isinitialized = true;
-            };
+                plugin.processTelemetry(env, itemCtx);
+                return true;
+            }, function (itemCtx) {
+                nextProxy.processTelemetry(env, itemCtx);
+            }, "processTelemetry", function () { return ({ item: env }); }, !(env.sync));
         }
-        BaseTelemetryPlugin.prototype.initialize = function (config, core, extensions, pluginChain) {
-            this._baseTelInit(config, core, extensions, pluginChain);
-        };
-        return BaseTelemetryPlugin;
-    }());
+        return objFreeze(proxyChain);
+    }
 
     var strToGMTString = "toGMTString";
     var strToUTCString = "toUTCString";
@@ -1627,6 +1680,93 @@
         return false;
     }
 
+    var strExtensionConfig = "extensionConfig";
+
+    var strGetPlugin = "getPlugin";
+    var BaseTelemetryPlugin = /** @class */ (function () {
+        function BaseTelemetryPlugin() {
+            var _self = this;
+            var _isinitialized;
+            var _rootCtx;
+            var _nextPlugin;
+            var _hooks;
+            _initDefaults();
+            dynamicProto(BaseTelemetryPlugin, _self, function (_self) {
+                _self.initialize = function (config, core, extensions, pluginChain) {
+                    _setDefaults(config, core, pluginChain);
+                    _isinitialized = true;
+                };
+                _self._addHook = function (hooks) {
+                    if (hooks) {
+                        if (isArray(hooks)) {
+                            _hooks = _hooks.concat(hooks);
+                        }
+                        else {
+                            _hooks.push(hooks);
+                        }
+                    }
+                };
+            });
+            _self.diagLog = function (itemCtx) {
+                return _getTelCtx(itemCtx).diagLog();
+            };
+            _self.isInitialized = function () {
+                return _isinitialized;
+            };
+            _self.setInitialized = function (isInitialized) {
+                _isinitialized = isInitialized;
+            };
+            _self.setNextPlugin = function (next) {
+                _nextPlugin = next;
+            };
+            _self.processNext = function (env, itemCtx) {
+                if (itemCtx) {
+                    itemCtx.processNext(env);
+                }
+                else if (_nextPlugin && isFunction(_nextPlugin.processTelemetry)) {
+                    _nextPlugin.processTelemetry(env, null);
+                }
+            };
+            _self._getTelCtx = _getTelCtx;
+            function _getTelCtx(currentCtx) {
+                if (currentCtx === void 0) { currentCtx = null; }
+                var itemCtx = currentCtx;
+                if (!itemCtx) {
+                    var rootCtx = _rootCtx || createProcessTelemetryContext(null, {}, _self.core);
+                    if (_nextPlugin && _nextPlugin[strGetPlugin]) {
+                        itemCtx = rootCtx.createNew(null, _nextPlugin[strGetPlugin]);
+                    }
+                    else {
+                        itemCtx = rootCtx.createNew(null, _nextPlugin);
+                    }
+                }
+                return itemCtx;
+            }
+            function _setDefaults(config, core, pluginChain) {
+                if (config) {
+                    setValue(config, strExtensionConfig, [], null, isNullOrUndefined);
+                }
+                if (!pluginChain && core) {
+                    pluginChain = core.getProcessTelContext().getNext();
+                }
+                var nextPlugin = _nextPlugin;
+                if (_nextPlugin && _nextPlugin[strGetPlugin]) {
+                    nextPlugin = _nextPlugin[strGetPlugin]();
+                }
+                _self.core = core;
+                _rootCtx = createProcessTelemetryContext(pluginChain, config, core, nextPlugin);
+            }
+            function _initDefaults() {
+                _isinitialized = false;
+                _self.core = null;
+                _rootCtx = null;
+                _nextPlugin = null;
+                _hooks = [];
+            }
+        }
+        return BaseTelemetryPlugin;
+    }());
+
     var UInt32Mask = 0x100000000;
     var MaxUInt32 = 0xffffffff;
     var _mwcSeeded = false;
@@ -1655,18 +1795,18 @@
         return 0;
     }
     function random32(signed) {
-        var value;
+        var value = 0;
         var c = getCrypto() || getMsCrypto();
         if (c && c.getRandomValues) {
             value = c.getRandomValues(new Uint32Array(1))[0] & MaxUInt32;
         }
-        else if (isIE()) {
+        if (value === 0 && isIE()) {
             if (!_mwcSeeded) {
                 _autoSeedMwc();
             }
             value = mwcRandom32() & MaxUInt32;
         }
-        else {
+        if (value === 0) {
             value = Math.floor((UInt32Mask * Math.random()) | 0);
         }
         if (!signed) {
@@ -1691,6 +1831,23 @@
         }
         return value;
     }
+    function newId(maxLength) {
+        if (maxLength === void 0) { maxLength = 22; }
+        var base64chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+        var number = random32() >>> 0;
+        var chars = 0;
+        var result = "";
+        while (result.length < maxLength) {
+            chars++;
+            result += base64chars.charAt(number & 0x3F);
+            number >>>= 6;
+            if (chars === 5) {
+                number = (((random32() << 2) & 0xFFFFFFFF) | (number & 0x03)) >>> 0;
+                chars = 0;
+            }
+        }
+        return result;
+    }
 
     var _cookieMgrs = null;
     var _canUseCookies;
@@ -1723,23 +1880,6 @@
         }
         return dateNow();
     }
-    function newId(maxLength) {
-        if (maxLength === void 0) { maxLength = 22; }
-        var base64chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-        var number = random32() >>> 0;
-        var chars = 0;
-        var result = "";
-        while (result.length < maxLength) {
-            chars++;
-            result += base64chars.charAt(number & 0x3F);
-            number >>>= 6;
-            if (chars === 5) {
-                number = (((random32() << 2) & 0xFFFFFFFF) | (number & 0x03)) >>> 0;
-                chars = 0;
-            }
-        }
-        return result;
-    }
     function generateW3CId() {
         var hexValues = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "a", "b", "c", "d", "e", "f"];
         var oct = "", tmp;
@@ -1895,6 +2035,7 @@
             };
             var hookCtx = [];
             var cbArgs = _createArgs([funcArgs], orgArgs);
+            funcArgs.evt = getGlobalInst("event");
             function _createArgs(target, theArgs) {
                 _arrLoop(theArgs, function (arg) {
                     target.push(arg);