@microsoft/applicationinsights-common 3.0.0-beta.2301-20 → 3.0.0-beta.2302-02

package/browser/applicationinsights-common.integrity.json

@@ -1,25 +1,25 @@
 {
     "name": "applicationinsights-common",
-    "version": "3.0.0-beta.2301-20",
+    "version": "3.0.0-beta.2302-02",
     "ext": {
         "@js": {
             "file": "applicationinsights-common.js",
             "type": "text/javascript; charset=utf-8",
-            "integrity": "sha256-1+tl2kM9QRxvAbcKdO1GuCjpeXe2oein6Uj54iFJnpY= sha384-CuIBUIB8m6sr+x6qkXAmtMaokoWgUXY66UBBY+lvRF67EwgAa7kNvZC9MASXnxWJ sha512-JRZCkd7a5u2UDt9lnMKSlP9BOOAK4AN1cxHoMu1uqztbsHSUn2WEj/0RfEWOr/y55I2ZbwHzMsKPB05v4nTYQA==",
+            "integrity": "sha256-nAHKgqRkGhHGP/8QHQgksDLfndR8S7qV42q6GGrhDNI= sha384-NMSok1VW2FaARamhdz+XwkE+9ITpbSiEfSwwMJgNRZd8GuYli3w6cAqlIAqrUdCo sha512-JCZRMTcMbqBpfBO6doHDKfGpWorK52xZLNVdvPyXITYK6sTx7sx1b0IYFmwM4k6XF/Eeaswe9whz5p1RjkQsow==",
             "hashes": {
-                "sha256": "1+tl2kM9QRxvAbcKdO1GuCjpeXe2oein6Uj54iFJnpY=",
-                "sha384": "CuIBUIB8m6sr+x6qkXAmtMaokoWgUXY66UBBY+lvRF67EwgAa7kNvZC9MASXnxWJ",
-                "sha512": "JRZCkd7a5u2UDt9lnMKSlP9BOOAK4AN1cxHoMu1uqztbsHSUn2WEj/0RfEWOr/y55I2ZbwHzMsKPB05v4nTYQA=="
+                "sha256": "nAHKgqRkGhHGP/8QHQgksDLfndR8S7qV42q6GGrhDNI=",
+                "sha384": "NMSok1VW2FaARamhdz+XwkE+9ITpbSiEfSwwMJgNRZd8GuYli3w6cAqlIAqrUdCo",
+                "sha512": "JCZRMTcMbqBpfBO6doHDKfGpWorK52xZLNVdvPyXITYK6sTx7sx1b0IYFmwM4k6XF/Eeaswe9whz5p1RjkQsow=="
             }
         },
         "@min.js": {
             "file": "applicationinsights-common.min.js",
             "type": "text/javascript; charset=utf-8",
-            "integrity": "sha256-SewHGgsuS6E5Taa6jtgblfmxtjBnJVNSydPbfpWEHFc= sha384-qjvuqcd/5i0sn3GzBnI5aTtSMFI92CUrTJlL/A67XcwJuvOThkg9z2dzUE/zuY/m sha512-aisEwdBBGEIXDXn10iJXLMYvOl0rMROuZatRdsbiVQ4Fpd0SLAH5stlvOxfYxoHWEEGp6J1Jzg2TncdXmK94IQ==",
+            "integrity": "sha256-7y6diQXnu/HWLB7H5jUgYQhPdxF3Wiz+EXvpk8Jwx8M= sha384-3t5uQ2k6wNCc0nKqBTdaaVXARKbhlrKEDXQGUOJWPt6jhFQAvxFlp4xu41GmzII3 sha512-/PQDzHPlEZ2GJC90fnrHlgKDctuQiyuAyKHXwjssTJKUy+r0UMS8P+gY8ZnvherLgZiFk8d8oDE5TKMSEhstFA==",
             "hashes": {
-                "sha256": "SewHGgsuS6E5Taa6jtgblfmxtjBnJVNSydPbfpWEHFc=",
-                "sha384": "qjvuqcd/5i0sn3GzBnI5aTtSMFI92CUrTJlL/A67XcwJuvOThkg9z2dzUE/zuY/m",
-                "sha512": "aisEwdBBGEIXDXn10iJXLMYvOl0rMROuZatRdsbiVQ4Fpd0SLAH5stlvOxfYxoHWEEGp6J1Jzg2TncdXmK94IQ=="
+                "sha256": "7y6diQXnu/HWLB7H5jUgYQhPdxF3Wiz+EXvpk8Jwx8M=",
+                "sha384": "3t5uQ2k6wNCc0nKqBTdaaVXARKbhlrKEDXQGUOJWPt6jhFQAvxFlp4xu41GmzII3",
+                "sha512": "/PQDzHPlEZ2GJC90fnrHlgKDctuQiyuAyKHXwjssTJKUy+r0UMS8P+gY8ZnvherLgZiFk8d8oDE5TKMSEhstFA=="
             }
         }
     }

package/browser/applicationinsights-common.js

@@ -1,5 +1,5 @@
 /*!
- * Application Insights JavaScript SDK - Common, 3.0.0-beta.2301-20
+ * Application Insights JavaScript SDK - Common, 3.0.0-beta.2302-02
  * Copyright (c) Microsoft and contributors. All rights reserved.
  */
 (function (global, factory) {
@@ -509,6 +509,44 @@
     var TRIM = "trim";
     var strTrim = StrProto[TRIM] ? _unwrapFunction(TRIM) : polyStrTrim;
 
+    function _createTimerHandler(startTimer, refreshFn, cancelFn) {
+        var ref = true;
+        var timerId = startTimer ? refreshFn(null) : null;
+        function _unref() {
+            ref = false;
+            timerId && timerId["unref"] && timerId["unref"]();
+            return timer;
+        }
+        function _ref() {
+            ref = true;
+            timerId && timerId["ref"] && timerId["ref"]();
+            return timer;
+        }
+        function _hasRef() {
+            if (timerId && timerId["hasRef"]) {
+                return timerId["hasRef"]();
+            }
+            return ref;
+        }
+        var timer = {
+            cancel: function () {
+                timerId && cancelFn(timerId);
+                timerId = null;
+            },
+            refresh: function () {
+                timerId = refreshFn(timerId);
+                if (!ref) {
+                    _unref();
+                }
+                return timer;
+            },
+            hasRef: _hasRef,
+            ref: _ref,
+            unref: _unref
+        };
+        return timer;
+    }
+
     function _extractArgs(args, startAt) {
         var theArgs = [];
         for (var lp = startAt; lp < args[LENGTH]; lp++) {
@@ -517,22 +555,26 @@
         return theArgs;
     }
 
-    function _scheduleTimeoutWith(self, setTimeoutFn, clearTimeoutFn, theArgs) {
-        var timeoutId = setTimeoutFn.apply(self, theArgs);
-        return {
-            cancel: function () {
-                timeoutId && clearTimeoutFn.call(self, timeoutId);
-                timeoutId = null;
-            },
-            refresh: function () {
-                timeoutId && clearTimeoutFn.call(self, timeoutId);
-                timeoutId = setTimeoutFn.apply(self, theArgs);
-                return this;
+    function _createTimeoutWith(self, startTimer, overrideFn, theArgs) {
+        var isArr = isArray(overrideFn);
+        var len = isArr ? overrideFn.length : 0;
+        var setFn = (len > 0 ? overrideFn[0] : (!isArr ? overrideFn : UNDEF_VALUE)) || setTimeout;
+        var clearFn = (len > 1 ? overrideFn[1] : UNDEF_VALUE) || clearTimeout;
+        return _createTimerHandler(startTimer, function (timerId) {
+            if (timerId) {
+                if (timerId.refresh) {
+                    timerId.refresh();
+                    return timerId;
+                }
+                clearFn.call(self, timerId);
             }
-        };
+            return setFn.apply(self, theArgs);
+        }, function (timerId) {
+            clearFn.call(self, timerId);
+        });
     }
     function scheduleTimeout(callback, timeout) {
-        return _scheduleTimeoutWith(this, setTimeout, clearTimeout, _extractArgs(arguments, 0));
+        return _createTimeoutWith(this, true, UNDEF_VALUE, _extractArgs(arguments, 0));
     }
 
     var createEnumStyle = createEnum;
@@ -1146,7 +1188,7 @@
         return result;
     }
 
-    var version = "3.0.0-beta.2301-20";
+    var version = "3.0.0-beta.2302-02";
     var instanceName = "." + newId(6);
     var _dataUid = 0;
     function createUniqueNamespace(name, includeVersion) {
@@ -1947,9 +1989,10 @@
     var _DYN_COUNT = "count";
     var _DYN_PRE_TRIGGER_DATE = "preTriggerDate";
     var _DYN_DISABLED = "disabled";
+    var _DYN_INTERVAL = "interval";
+    var _DYN_DAYS_OF_MONTH = "daysOfMonth";
     var _DYN_DATE = "date";
     var _DYN_GET_UTCDATE = "getUTCDate";
-    var _DYN_MAX_TIMES_PER_MONTH = "maxTimesPerMonth";
     var _DYN_STRINGIFY = "stringify";
     var _DYN_PATHNAME = "pathname";
     var _DYN_CORRELATION_HEADER_E0 = "correlationHeaderExcludePatterns";
@@ -2487,6 +2530,7 @@
             var _namePrefix;
             var _queue;
             var _isReady = false;
+            var _isSpecificDaysGiven = false;
             _initConfig();
             _self.getConfig = function () {
                 return _config;
@@ -2560,7 +2604,7 @@
                 return null;
             };
             function _initConfig() {
-                var _a, _b, _c, _d, _e;
+                var _a, _b;
                 _canUseLocalStorage = utlCanUseLocalStorage();
                 _logger = safeGetLogger(core);
                 _isTriggered = false;
@@ -2570,15 +2614,12 @@
                 _config = {};
                 _config[_DYN_DISABLED ] = !!configMgr[_DYN_DISABLED ];
                 _config.msgKey = configMgr.msgKey;
-                var interval = {
-                    monthInterval: ((_a = configMgr.interval) === null || _a === void 0 ? void 0 : _a.monthInterval) || 3,
-                    dayInterval: ((_b = configMgr.interval) === null || _b === void 0 ? void 0 : _b.dayInterval) || 28,
-                    maxTimesPerMonth: ((_c = configMgr.interval) === null || _c === void 0 ? void 0 : _c.maxTimesPerMonth) || 1
-                };
-                _config.interval = interval;
+                var configInterval = configMgr[_DYN_INTERVAL ] || {};
+                _isSpecificDaysGiven = (configInterval === null || configInterval === void 0 ? void 0 : configInterval.daysOfMonth) && (configInterval === null || configInterval === void 0 ? void 0 : configInterval.daysOfMonth[_DYN_LENGTH ]) > 0;
+                _config[_DYN_INTERVAL ] = _getIntervalConfig(configInterval);
                 var limit = {
-                    samplingRate: ((_d = configMgr.limit) === null || _d === void 0 ? void 0 : _d.samplingRate) || 100,
-                    maxSendNumber: ((_e = configMgr.limit) === null || _e === void 0 ? void 0 : _e.maxSendNumber) || 1
+                    samplingRate: ((_a = configMgr.limit) === null || _a === void 0 ? void 0 : _a.samplingRate) || 100,
+                    maxSendNumber: ((_b = configMgr.limit) === null || _b === void 0 ? void 0 : _b.maxSendNumber) || 1
                 };
                 _config.limit = limit;
                 _localStorageName = _getLocalStorageName(_config.msgKey, _namePrefix);
@@ -2589,15 +2630,43 @@
                     _isTriggered = _isTriggeredOnCurDate(_localStorageObj[_DYN_PRE_TRIGGER_DATE ]);
                 }
             }
+            function _getIntervalConfig(interval) {
+                interval = interval || {};
+                var monthInterval = interval === null || interval === void 0 ? void 0 : interval.monthInterval;
+                var dayInterval = interval === null || interval === void 0 ? void 0 : interval.dayInterval;
+                if (isNullOrUndefined(monthInterval) && isNullOrUndefined(dayInterval)) {
+                    interval.monthInterval = 3;
+                    if (!_isSpecificDaysGiven) {
+                        interval[_DYN_DAYS_OF_MONTH ] = [28];
+                        _isSpecificDaysGiven = true;
+                    }
+                }
+                interval = {
+                    monthInterval: interval === null || interval === void 0 ? void 0 : interval.monthInterval,
+                    dayInterval: interval === null || interval === void 0 ? void 0 : interval.dayInterval,
+                    daysOfMonth: interval === null || interval === void 0 ? void 0 : interval.daysOfMonth
+                };
+                return interval;
+            }
             function _canThrottle(config, canUseLocalStorage, localStorageObj) {
                 if (!config[_DYN_DISABLED ] && canUseLocalStorage && isNotNullOrUndefined(localStorageObj)) {
                     var curDate = _getThrottleDate();
                     var date = localStorageObj[_DYN_DATE ];
-                    var interval = config.interval;
-                    var monthExpand = (curDate.getUTCFullYear() - date.getUTCFullYear()) * 12 + curDate.getUTCMonth() - date.getUTCMonth();
-                    var monthCheck = _checkInterval(interval.monthInterval, 0, monthExpand);
-                    var dayCheck = _checkInterval(interval.dayInterval, 0, curDate[_DYN_GET_UTCDATE ]()) - 1;
-                    return monthCheck >= 0 && dayCheck >= 0 && dayCheck <= config.interval[_DYN_MAX_TIMES_PER_MONTH ];
+                    var interval = config[_DYN_INTERVAL ];
+                    var monthCheck = 1;
+                    if (interval === null || interval === void 0 ? void 0 : interval.monthInterval) {
+                        var monthExpand = (curDate.getUTCFullYear() - date.getUTCFullYear()) * 12 + curDate.getUTCMonth() - date.getUTCMonth();
+                        monthCheck = _checkInterval(interval.monthInterval, 0, monthExpand);
+                    }
+                    var dayCheck = 1;
+                    if (_isSpecificDaysGiven) {
+                        dayCheck = arrIndexOf(interval[_DYN_DAYS_OF_MONTH ], curDate[_DYN_GET_UTCDATE ]());
+                    }
+                    else if (interval === null || interval === void 0 ? void 0 : interval.dayInterval) {
+                        var daySpan = Math.floor((curDate.getTime() - date.getTime()) / 86400000);
+                        dayCheck = _checkInterval(interval.dayInterval, 0, daySpan);
+                    }
+                    return monthCheck >= 0 && dayCheck >= 0;
                 }
                 return false;
             }