@microsoft/applicationinsights-web-basic 3.0.0-beta.2210-17 → 3.0.0-beta.2210-18

package/browser/aib.2.js

@@ -1,5 +1,5 @@
 /*!
- * Application Insights JavaScript Web SDK - Basic, 3.0.0-beta.2210-17
+ * Application Insights JavaScript Web SDK - Basic, 3.0.0-beta.2210-18
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */
 (function (global, factory) {
@@ -67,7 +67,7 @@
     function _isObjectArrayOrFunctionPrototype(target) {
         return _isObjectOrArrayPrototype(target) || target === Function[Prototype];
     }
-    function _getObjProto$1(target) {
+    function _getObjProto(target) {
         var newProto;
         if (target) {
             if (_objGetPrototypeOf) {
@@ -141,7 +141,7 @@
         _forEachProp(instFuncs, function (name) {
             baseFuncs[name] = _instFuncProxy(thisTarget, instFuncs, name);
         });
-        var baseProto = _getObjProto$1(classProto);
+        var baseProto = _getObjProto(classProto);
         var visited = [];
         while (baseProto && !_isObjectArrayOrFunctionPrototype(baseProto) && !_hasVisited(visited, baseProto)) {
             _forEachProp(baseProto, function (name) {
@@ -150,7 +150,7 @@
                 }
             });
             visited.push(baseProto);
-            baseProto = _getObjProto$1(baseProto);
+            baseProto = _getObjProto(baseProto);
         }
         return baseFuncs;
     }
@@ -164,7 +164,7 @@
             }
             if (!instFunc[DynInstChkTag] && instFuncTable[DynAllowInstChkTag] !== false) {
                 var canAddInst = !_hasOwnProperty(target, funcName);
-                var objProto = _getObjProto$1(target);
+                var objProto = _getObjProto(target);
                 var visited = [];
                 while (canAddInst && objProto && !_isObjectArrayOrFunctionPrototype(objProto) && !_hasVisited(visited, objProto)) {
                     var protoFunc = objProto[funcName];
@@ -173,7 +173,7 @@
                         break;
                     }
                     visited.push(objProto);
-                    objProto = _getObjProto$1(objProto);
+                    objProto = _getObjProto(objProto);
                 }
                 try {
                     if (canAddInst) {
@@ -191,7 +191,7 @@
     function _getProtoFunc(funcName, proto, currentDynProtoProxy) {
         var protoFunc = proto[funcName];
         if (protoFunc === currentDynProtoProxy) {
-            protoFunc = _getObjProto$1(proto)[funcName];
+            protoFunc = _getObjProto(proto)[funcName];
         }
         if (typeof protoFunc !== strFunction) {
             _throwTypeError("[" + funcName + "] is not a " + strFunction);
@@ -227,13 +227,13 @@
     function _checkPrototype(classProto, thisTarget) {
         if (_objGetPrototypeOf) {
             var visited = [];
-            var thisProto = _getObjProto$1(thisTarget);
+            var thisProto = _getObjProto(thisTarget);
             while (thisProto && !_isObjectArrayOrFunctionPrototype(thisProto) && !_hasVisited(visited, thisProto)) {
                 if (thisProto === classProto) {
                     return true;
                 }
                 visited.push(thisProto);
-                thisProto = _getObjProto$1(thisProto);
+                thisProto = _getObjProto(thisProto);
             }
             return false;
         }
@@ -466,7 +466,7 @@
         return objHasOwnProperty(obj, prop) || !!objGetOwnPropertyDescriptor(obj, prop);
     }
 
-    function objForEachKey$1(theObject, callbackfn, thisArg) {
+    function objForEachKey(theObject, callbackfn, thisArg) {
         if (theObject && isObject(theObject)) {
             for (var prop in theObject) {
                 if (objHasOwn(theObject, prop)) {
@@ -497,7 +497,7 @@
     }
     function objDeepFreeze(value) {
         if (_objFreeze) {
-            objForEachKey$1(value, function (key, value) {
+            objForEachKey(value, function (key, value) {
                 if (isArray(value) || isObject(value)) {
                     _objFreeze(value);
                 }
@@ -510,7 +510,7 @@
 
     function createEnum(values) {
         var theEnum = {};
-        objForEachKey$1(values, function (field, value) {
+        objForEachKey(values, function (field, value) {
             theEnum[field] = value;
             theEnum[value] = field;
         });
@@ -518,7 +518,7 @@
     }
     function createSimpleMap(values) {
         var mapClass = {};
-        objForEachKey$1(values, function (field, value) {
+        objForEachKey(values, function (field, value) {
             mapClass[field] = value[1];
             mapClass[value[0]] = value[1];
         });
@@ -588,7 +588,7 @@
                 d.__proto__ = b;
             }) ||
             function (d, b) {
-                objForEachKey$1(b, function (key, value) {
+                objForEachKey(b, function (key, value) {
                     d[key] = value;
                 });
             };
@@ -838,10 +838,17 @@
 
     var arrMap = _unwrapFunction("map");
 
+    function utcNow() {
+        return (Date.now || polyUtcNow)();
+    }
+    function polyUtcNow() {
+        return new Date().getTime();
+    }
+
     var _fnToString$1;
     var _objCtrFnString;
     var _gblWindow;
-    function isPlainObject$1(value) {
+    function isPlainObject(value) {
         if (!value || typeof value !== OBJECT) {
             return false;
         }
@@ -986,7 +993,7 @@
     }
     function plainObjDeepCopyHandler(details) {
         var value = details.value;
-        if (isPlainObject$1(value)) {
+        if (isPlainObject(value)) {
             var target = details.result = {};
             details.copyTo(target, value);
             return true;
@@ -1009,6 +1016,9 @@
     }
 
     var strSubstring = _unwrapFunction("substring");
+    function strLeft(value, count) {
+        return strSubstring(value, 0, count);
+    }
 
     var ENDS_WITH = "endsWith";
     var strEndsWith = StrProto[ENDS_WITH] ? _unwrapFunction(ENDS_WITH) : polyStrEndsWith;
@@ -1079,11 +1089,10 @@
     var _DYN_CONFIGURABLE = "configurable";
     var _DYN_ENUMERABLE = "enumerable";
     var _DYN_APPLY = "apply";
-    var _DYN_INDEX_OF$1 = "indexOf";
     var _DYN_PUSH$1 = "push";
+    var _DYN_SPLICE = "splice";
     var _DYN_INITIALIZE$1 = "initialize";
     var _DYN_IDENTIFIER = "identifier";
-    var _DYN_SPLICE = "splice";
     var _DYN_IS_INITIALIZED = "isInitialized";
     var _DYN_NAME$2 = "name";
     var _DYN_TIME = "time";
@@ -1110,7 +1119,6 @@
     var _DYN_SET_NEXT_PLUGIN = "setNextPlugin";
     var _DYN_CREATE_NEW = "createNew";
     var _DYN_CONFIG = "config";
-    var _DYN_SUBSTRING$1 = "substring";
     var _DYN_USER_AGENT = "userAgent";
     var _DYN_SPLIT$1 = "split";
     var _DYN_NODE_TYPE = "nodeType";
@@ -1167,14 +1175,11 @@
     var STR_NOT_DYNAMIC_ERROR = "Not dynamic - ";
 
     var strToString = "toString";
-    var strGetPrototypeOf = "getPrototypeOf";
-    var strConstructor = "constructor";
     var _fnToString = ObjClass$1[strToString];
-    var _objFunctionString = _fnToString[_DYN_CALL ](ObjClass$1);
+    _fnToString[_DYN_CALL ](ObjClass$1);
     var rCamelCase = /-([a-z])/g;
     var rNormalizeInvalid = /([^\w\d_$])/g;
     var rLeadingNumeric = /^(\d+[\w\d_$])/;
-    var _getObjProto = Object[strGetPrototypeOf];
     function isNotNullOrUndefined(value) {
         return !isNullOrUndefined(value);
     }
@@ -1191,36 +1196,15 @@
         }
         return value;
     }
-    var objForEachKey = objForEachKey$1;
     function strContains(value, search) {
         if (value && search) {
             return strIndexOf(value, search) !== -1;
         }
         return false;
     }
-    function isPlainObject(value) {
-        var result = false;
-        if (value && typeof value === "object") {
-            var proto = _getObjProto(value);
-            if (!proto) {
-                result = true;
-            }
-            else {
-                if (proto[strConstructor] && objHasOwnProperty(proto, strConstructor)) {
-                    proto = proto[strConstructor];
-                }
-                result = typeof proto === strShimFunction && _fnToString[_DYN_CALL ](proto) === _objFunctionString;
-            }
-        }
-        return result;
-    }
     function toISOString(date) {
         return date && date.toISOString() || "";
     }
-    function dateNow() {
-        var dt = Date;
-        return dt.now ? dt.now() : new dt().getTime();
-    }
     function getExceptionName(object) {
         if (isError(object)) {
             return object[_DYN_NAME$2 ];
@@ -1506,7 +1490,7 @@
     }
     function _autoSeedMwc() {
         try {
-            var now = dateNow() & 0x7fffffff;
+            var now = utcNow() & 0x7fffffff;
             _mwcSeed(((Math.random() * UInt32Mask) ^ now) + now);
         }
         catch (e) {
@@ -1560,7 +1544,7 @@
     }
 
     var _objDefineProperty = ObjDefineProperty;
-    var version = "3.0.0-beta.2210-17";
+    var version = "3.0.0-beta.2210-18";
     var instanceName = "." + newId(6);
     var _dataUid = 0;
     function _createAccessor(target, prop, value) {
@@ -1645,7 +1629,7 @@
                 target_1 = {};
             }
             if (target_1) {
-                objForEachKey$1(source, function (key, value) {
+                objForEachKey(source, function (key, value) {
                     target_1[key] = _cfgDeepCopy(value);
                 });
                 return target_1;
@@ -1760,9 +1744,18 @@
         var detail = {
             n: name,
             h: [],
-            add: function (handler) {
-                if (handler && handler.fn && detail.h[_DYN_INDEX_OF$1 ](handler) === -1) {
-                    detail.h[_DYN_PUSH$1 ](handler);
+            trk: function (handler) {
+                if (handler && handler.fn) {
+                    if (arrIndexOf(detail.h, handler) === -1) {
+                        detail.h[_DYN_PUSH$1 ](handler);
+                    }
+                    state.trk(handler, detail);
+                }
+            },
+            clr: function (handler) {
+                var idx = arrIndexOf(detail.h, handler);
+                if (idx !== -1) {
+                    detail.h[_DYN_SPLICE ](idx, 1);
                 }
             }
         };
@@ -1776,25 +1769,28 @@
             }
             var activeHandler = state.act;
             if (activeHandler) {
-                detail.add(activeHandler);
+                detail.trk(activeHandler);
             }
             return value;
         }
-        _getProperty[state.prop] = true;
+        _getProperty[state.prop] = {
+            chng: function () {
+                state.add(detail);
+            }
+        };
         function _setProperty(newValue) {
             if (value !== newValue) {
                 if (!!_setProperty[state.ro] && state.upd) {
                     throwInvalidAccess("[" + name + "] is sealed from " + dumpObj(theConfig));
                 }
                 if (value && value[CFG_HANDLER_LINK]) {
-                    if (isPlainObject(value)) {
-                        objForEachKey$1(value, function (key) {
-                            value[key] = UNDEFINED_VALUE$1;
-                        });
-                    }
-                    else if (isArray(value)) {
-                        arrForEach(value, function (propValue, idx) {
-                            value[idx] = UNDEFINED_VALUE$1;
+                    if (isPlainObject(value) || isArray(value)) {
+                        objForEachKey(value, function (key) {
+                            var propDesc = objGetOwnPropertyDescriptor(value, key);
+                            if (propDesc && propDesc.get) {
+                                var valueState = propDesc.get[state.prop];
+                                valueState && valueState.chng();
+                            }
                         });
                     }
                 }
@@ -1826,7 +1822,7 @@
     }
     function _makeDynamicObject(state, target ) {
         var _a;
-        objForEachKey$1( target, function (key, value) {
+        objForEachKey( target, function (key, value) {
             _setDynamicProperty(state, target, key, value);
         });
         if (!target[CFG_HANDLER_LINK]) {
@@ -1844,19 +1840,10 @@
 
     var symPrefix = "[[ai_";
     var symPostfix = "]]";
-    function _insertWatcher(watchers, theDetail) {
-        if (theDetail && theDetail.h && theDetail.h[_DYN_LENGTH$2 ] > 0) {
-            arrForEach(theDetail.h, function (handler) {
-                if (handler && handler.fn && watchers[_DYN_INDEX_OF$1 ](handler) === -1) {
-                    watchers[_DYN_PUSH$1 ](handler);
-                }
-            });
-        }
-    }
     function _createState(cfgHandler) {
-        var _a;
         var dynamicPropertySymbol = newSymbol(symPrefix + "get" + cfgHandler.uid + symPostfix);
         var dynamicPropertyReadOnly = newSymbol(symPrefix + "ro" + cfgHandler.uid + symPostfix);
+        var dynamicPropertyDetail = newSymbol(symPrefix + "dtl" + cfgHandler.uid + symPostfix);
         var _waitingHandlers = null;
         var _watcherTimer = null;
         var theState;
@@ -1864,6 +1851,12 @@
             var prevWatcher = theState.act;
             try {
                 theState.act = activeHandler;
+                if (activeHandler && activeHandler[dynamicPropertyDetail]) {
+                    arrForEach(activeHandler[dynamicPropertyDetail], function (detail) {
+                        detail.clr(activeHandler);
+                    });
+                    activeHandler[dynamicPropertyDetail] = [];
+                }
                 callback({
                     cfg: cfgHandler.cfg,
                     set: cfgHandler.set.bind(cfgHandler),
@@ -1873,7 +1866,7 @@
             catch (e) {
                 var logger = cfgHandler[_DYN_LOGGER ];
                 if (logger) {
-                    logger[_DYN_THROW_INTERNAL ](1 , 107 , "Watcher [" + dumpObj(callback) + "] failed [" + dumpObj(e) + "]");
+                    logger[_DYN_THROW_INTERNAL ](1 , 107 , dumpObj(e));
                 }
                 throw e;
             }
@@ -1885,18 +1878,24 @@
             if (_waitingHandlers) {
                 var notifyHandlers = _waitingHandlers;
                 _waitingHandlers = null;
-                if (_watcherTimer) {
-                    _watcherTimer.cancel();
-                    _watcherTimer = null;
-                }
+                _watcherTimer && _watcherTimer.cancel();
+                _watcherTimer = null;
                 var watcherFailures_1 = [];
                 arrForEach(notifyHandlers, function (handler) {
-                    if (handler.fn) {
-                        try {
-                            _useHandler(handler, handler.fn);
+                    if (handler) {
+                        if (handler[dynamicPropertyDetail]) {
+                            arrForEach(handler[dynamicPropertyDetail], function (detail) {
+                                detail.clr(handler);
+                            });
+                            handler[dynamicPropertyDetail] = null;
                         }
-                        catch (e) {
-                            watcherFailures_1[_DYN_PUSH$1 ](e);
+                        if (handler.fn) {
+                            try {
+                                _useHandler(handler, handler.fn);
+                            }
+                            catch (e) {
+                                watcherFailures_1[_DYN_PUSH$1 ](e);
+                            }
                         }
                     }
                 });
@@ -1909,7 +1908,7 @@
                     }
                 }
                 if (watcherFailures_1[_DYN_LENGTH$2 ] > 0) {
-                    throwAggregationError("Unexpected watcher error occurred: ", watcherFailures_1);
+                    throwAggregationError("Watcher error(s): ", watcherFailures_1);
                 }
             }
         }
@@ -1924,18 +1923,31 @@
                         _notifyWatchers();
                     }, 0);
                 }
-                _insertWatcher(_waitingHandlers, detail);
+                for (var idx = 0; idx < detail.h[_DYN_LENGTH$2 ]; idx++) {
+                    var handler = detail.h[idx];
+                    if (handler && arrIndexOf(_waitingHandlers, handler) === -1) {
+                        _waitingHandlers[_DYN_PUSH$1 ](handler);
+                    }
+                }
             }
         }
-        theState = (_a = {
-                prop: dynamicPropertySymbol,
-                ro: dynamicPropertyReadOnly,
-                hdlr: cfgHandler,
-                add: _addWatcher
-            },
-            _a[_DYN_NOTIFY ] = _notifyWatchers,
-            _a.use = _useHandler,
-            _a);
+        function _trackHandler(handler, detail) {
+            if (handler) {
+                var details = handler[dynamicPropertyDetail] = handler[dynamicPropertyDetail] || [];
+                if (arrIndexOf(details, detail) === -1) {
+                    details[_DYN_PUSH$1 ](detail);
+                }
+            }
+        }
+        theState = {
+            prop: dynamicPropertySymbol,
+            ro: dynamicPropertyReadOnly,
+            hdlr: cfgHandler,
+            add: _addWatcher,
+            notify: _notifyWatchers,
+            use: _useHandler,
+            trk: _trackHandler
+        };
         return theState;
     }
 
@@ -2026,7 +2038,7 @@
         createDynamicConfig(config, null, logger)[_DYN_WATCH ](configHandler);
     }
 
-    var listenerFuncs = ["eventsSent", "eventsDiscarded", "eventsSendRequest", "perfEvent"];
+    var listenerFuncs = [STR_EVENTS_SENT, STR_EVENTS_DISCARDED, STR_EVENTS_SEND_REQUEST, STR_PERF_EVENT];
     var _aiNamespace = null;
     var _debugListener;
     function _listenerProxyFunc(name, config) {
@@ -2246,7 +2258,7 @@
     var PerfEvent = /** @class */ (function () {
         function PerfEvent(name, payloadDetails, isAsync) {
             var _self = this;
-            _self.start = dateNow();
+            _self.start = utcNow();
             _self[_DYN_NAME$2 ] = name;
             _self[_DYN_IS_ASYNC ] = isAsync;
             _self[_DYN_IS_CHILD_EVT ] = function () { return false; };
@@ -2297,7 +2309,7 @@
                         }
                     }
                 }
-                _self[_DYN_TIME ] = dateNow() - _self.start;
+                _self[_DYN_TIME ] = utcNow() - _self.start;
                 _self.exTime = _self[_DYN_TIME ] - childTime;
                 _self[_DYN_COMPLETE ] = function () { };
             };
@@ -2583,7 +2595,7 @@
                 if (!extCfg && createIfMissing) {
                     extCfg = {};
                 }
-                dynamicHandler.set(cfg, "extensionConfig", extCfg);
+                dynamicHandler.set(cfg, STR_EXTENSION_CONFIG, extCfg);
                 extCfg = cfg[STR_EXTENSION_CONFIG ];
                 if (extCfg) {
                     idCfg = extCfg[identifier];
@@ -2990,10 +3002,8 @@
                 function doCallback() {
                     waiting--;
                     if (doneIterating && waiting === 0) {
-                        if (cbTimer) {
-                            clearTimeout(cbTimer);
-                            cbTimer = null;
-                        }
+                        cbTimer && cbTimer.cancel();
+                        cbTimer = null;
                         callBack && callBack(doneIterating);
                         callBack = null;
                     }
@@ -3009,7 +3019,7 @@
                             }, sendReason)) {
                                 if (!handled_1) {
                                     if (isAsync && cbTimer == null) {
-                                        cbTimer = setTimeout(function () {
+                                        cbTimer = scheduleTimeout(function () {
                                             cbTimer = null;
                                             doCallback();
                                         }, cbTimeout);
@@ -3084,13 +3094,13 @@
     }
     function _isIgnoredCookie(cookieMgrCfg, name) {
         if (name && cookieMgrCfg && isArray(cookieMgrCfg.ignoreCookies)) {
-            return cookieMgrCfg.ignoreCookies[_DYN_INDEX_OF$1 ](name) !== -1;
+            return arrIndexOf(cookieMgrCfg.ignoreCookies, name) !== -1;
         }
         return false;
     }
     function _isBlockedCookie(cookieMgrCfg, name) {
         if (name && cookieMgrCfg && isArray(cookieMgrCfg.blockedCookies)) {
-            if (cookieMgrCfg.blockedCookies[_DYN_INDEX_OF$1 ](name) !== -1) {
+            if (arrIndexOf(cookieMgrCfg.blockedCookies, name) !== -1) {
                 return true;
             }
         }
@@ -3143,16 +3153,16 @@
                 if (_isMgrEnabled(cookieMgr) && !_isBlockedCookie(cookieMgrConfig, name)) {
                     var values = {};
                     var theValue = strTrim(value || STR_EMPTY);
-                    var idx = theValue[_DYN_INDEX_OF$1 ](";");
+                    var idx = strIndexOf(theValue, ";");
                     if (idx !== -1) {
-                        theValue = strTrim(value[_DYN_SUBSTRING$1 ](0, idx));
-                        values = _extractParts(value[_DYN_SUBSTRING$1 ](idx + 1));
+                        theValue = strTrim(strLeft(value, idx));
+                        values = _extractParts(strSubstring(value, idx + 1));
                     }
                     setValue(values, STR_DOMAIN, domain || _domain, isTruthy, isUndefined);
                     if (!isNullOrUndefined(maxAgeSec)) {
                         var _isIE = isIE();
                         if (isUndefined(values[strExpires])) {
-                            var nowMs = dateNow();
+                            var nowMs = utcNow();
                             var expireMs = nowMs + (maxAgeSec * 1000);
                             if (expireMs > 0) {
                                 var expiry = new Date();
@@ -3234,12 +3244,12 @@
             arrForEach(parts, function (thePart) {
                 thePart = strTrim(thePart || STR_EMPTY);
                 if (thePart) {
-                    var idx = thePart[_DYN_INDEX_OF$1 ]("=");
+                    var idx = strIndexOf(thePart, "=");
                     if (idx === -1) {
                         values[thePart] = null;
                     }
                     else {
-                        values[strTrim(thePart[_DYN_SUBSTRING$1 ](0, idx))] = strTrim(thePart[_DYN_SUBSTRING$1 ](idx + 1));
+                        values[strTrim(strLeft(thePart, idx))] = strTrim(strSubstring(thePart, idx + 1));
                     }
                 }
             });
@@ -3254,7 +3264,7 @@
     }
     function _formatCookieValue(value, values) {
         var cookieValue = value || STR_EMPTY;
-        objForEachKey$1(values, function (name, theValue) {
+        objForEachKey(values, function (name, theValue) {
             cookieValue += "; " + name + (!isNullOrUndefined(theValue) ? "=" + theValue : STR_EMPTY);
         });
         return cookieValue;
@@ -3308,7 +3318,7 @@
         arrForEach(listeners, function (listener) {
             if (listener && listener[name]) {
                 if (isAsync) {
-                    setTimeout(function () { return callback(listener); }, 0);
+                    scheduleTimeout(function () { return callback(listener); }, 0);
                 }
                 else {
                     try {
@@ -3359,7 +3369,7 @@
                         if (perfEvtsSendAll || !perfEvent[_DYN_IS_CHILD_EVT ]()) {
                             _runListeners(_self[_DYN_LISTENERS ], STR_PERF_EVENT, false, function (listener) {
                                 if (perfEvent[_DYN_IS_ASYNC ]) {
-                                    setTimeout(function () { return listener[STR_PERF_EVENT ](perfEvent); }, 0);
+                                    scheduleTimeout(function () { return listener[STR_PERF_EVENT ](perfEvent); }, 0);
                                 }
                                 else {
                                     listener[STR_PERF_EVENT ](perfEvent);
@@ -4489,7 +4499,6 @@
     var _DYN_REMOVE_ITEM = "removeItem";
     var _DYN_NAME$1 = "name";
     var _DYN_PATHNAME = "pathname";
-    var _DYN_INDEX_OF = "indexOf";
     var _DYN_EXCEPTIONS = "exceptions";
     var _DYN_PARSED_STACK = "parsedStack";
     var _DYN_PROPERTIES = "properties";
@@ -4577,7 +4586,7 @@
     function dataSanitizeProperties(logger, properties) {
         if (properties) {
             var tempProps_1 = {};
-            objForEachKey$1(properties, function (prop, value) {
+            objForEachKey(properties, function (prop, value) {
                 if (isObject(value) && hasJSON()) {
                     try {
                         value = getJSON()[_DYN_STRINGIFY$1 ](value);
@@ -4597,7 +4606,7 @@
     function dataSanitizeMeasurements(logger, measurements) {
         if (measurements) {
             var tempMeasurements_1 = {};
-            objForEachKey$1(measurements, function (measure, value) {
+            objForEachKey(measurements, function (measure, value) {
                 measure = dataSanitizeKeyAndAddUniqueness(logger, measure, tempMeasurements_1);
                 tempMeasurements_1[measure] = value;
             });
@@ -4798,7 +4807,7 @@
                 evtMessage = evtMessage + " @" + (theEvent["filename"] || "") + ":" + (theEvent["lineno"] || "?") + ":" + (theEvent["colno"] || "?");
             }
         }
-        if (errorType && errorType !== "String" && errorType !== "Object" && errorType !== "Error" && (evtMessage || "")[_DYN_INDEX_OF ](errorType) === -1) {
+        if (errorType && errorType !== "String" && errorType !== "Object" && errorType !== "Error" && strIndexOf(evtMessage || "", errorType) === -1) {
             evtMessage = errorType + ": " + evtMessage;
         }
         return evtMessage || "";
@@ -4991,7 +5000,7 @@
                         }
                         result = _stringify(errorObj, true);
                     }
-                    if (result[_DYN_INDEX_OF ](errorType) !== 0 && errorType !== "String") {
+                    if (strIndexOf(result, errorType) !== 0 && errorType !== "String") {
                         return errorType + ":" + result;
                     }
                     return result;
@@ -5696,12 +5705,12 @@
         var tgs = {};
         for (var i = itmTags[_DYN_LENGTH ] - 1; i >= 0; i--) {
             var tg = itmTags[i];
-            objForEachKey$1(tg, function (key, value) {
+            objForEachKey(tg, function (key, value) {
                 tgs[key] = value;
             });
             itmTags.splice(i, 1);
         }
-        objForEachKey$1(itmTags, function (tg, value) {
+        objForEachKey(itmTags, function (tg, value) {
             tgs[tg] = value;
         });
         var theTags = __assignFn(__assignFn({}, envTags), tgs);
@@ -5712,7 +5721,7 @@
     }
     function _extractPropsAndMeasurements(data, properties, measurements) {
         if (!isNullOrUndefined(data)) {
-            objForEachKey$1(data, function (key, value) {
+            objForEachKey(data, function (key, value) {
                 if (isNumber(value)) {
                     measurements[key] = value;
                 }
@@ -5727,7 +5736,7 @@
     }
     function _convertPropsUndefinedToCustomDefinedValue(properties, customUndefinedValue) {
         if (!isNullOrUndefined(properties)) {
-            objForEachKey$1(properties, function (key, value) {
+            objForEachKey(properties, function (key, value) {
                 properties[key] = value || customUndefinedValue;
             });
         }
@@ -5751,7 +5760,7 @@
         }
     }
     var EnvelopeCreator = {
-        Version: "3.0.0-beta.2210-17"
+        Version: "3.0.0-beta.2210-18"
     };
     function DependencyEnvelopeCreator(logger, telemetryItem, customUndefinedValue) {
         EnvelopeCreatorInit(logger, telemetryItem);
@@ -5858,7 +5867,7 @@
         }
         if (!isNullOrUndefined(bd[strProperties])) {
             var pageTags = bd[strProperties];
-            objForEachKey$1(pageTags, function (key, value) {
+            objForEachKey(pageTags, function (key, value) {
                 properties[key] = value;
             });
         }
@@ -6195,7 +6204,7 @@
                         return output;
                     }
                     source[circularReferenceCheck] = true;
-                    objForEachKey$1(source.aiDataContract, function (field, contract) {
+                    objForEachKey(source.aiDataContract, function (field, contract) {
                         var isRequired = (isFunction(contract)) ? (contract() & 1 ) : (contract & 1 );
                         var isHidden = (isFunction(contract)) ? (contract() & 4 ) : (contract & 4 );
                         var isArray = contract & 2 ;
@@ -6246,7 +6255,7 @@
                     var output;
                     if (map) {
                         output = {};
-                        objForEachKey$1(map, function (field, value) {
+                        objForEachKey(map, function (field, value) {
                             if (expectedType === "string") {
                                 if (value === undefined) {
                                     output[field] = "undefined";
@@ -7000,21 +7009,21 @@
                         backOffDelay = linearFactor * backOffDelay;
                         delayInSeconds = Math.max(Math.min(backOffDelay, 3600), SlotDelayInSeconds);
                     }
-                    var retryAfterTimeSpan = dateNow() + (delayInSeconds * 1000);
+                    var retryAfterTimeSpan = utcNow() + (delayInSeconds * 1000);
                     _retryAt = retryAfterTimeSpan;
                 }
                 function _setupTimer() {
                     if (!_timeoutHandle && !_paused) {
-                        var retryInterval = _retryAt ? Math.max(0, _retryAt - dateNow()) : 0;
+                        var retryInterval = _retryAt ? Math.max(0, _retryAt - utcNow()) : 0;
                         var timerValue = Math.max(_maxBatchInterval, retryInterval);
-                        _timeoutHandle = setTimeout(function () {
+                        _timeoutHandle = scheduleTimeout(function () {
                             _timeoutHandle = null;
                             _self[_DYN_TRIGGER_SEND ](true, null, 1 );
                         }, timerValue);
                     }
                 }
                 function _clearScheduledTimer() {
-                    clearTimeout(_timeoutHandle);
+                    _timeoutHandle && _timeoutHandle.cancel();
                     _timeoutHandle = null;
                     _retryAt = null;
                 }