@cloudcare/browser-core 2.0.10 → 2.0.12

package/cjs/browser/cookie.js

@@ -46,7 +46,6 @@ function areCookiesAuthorized(options) {
     setCookie(testCookieName, testCookieValue, _tools.ONE_SECOND, options);
     return getCookie(testCookieName) === testCookieValue;
   } catch (error) {
-    console.error(error);
     return false;
   }
 }

package/cjs/dataMap.js

@@ -53,10 +53,10 @@ var dataMap = {
     type: _enums.RumEventType.VIEW,
     tags: {
       view_loading_type: 'view.loading_type',
-      view_apdex_level: 'view.apdex_level',
-      is_active: 'view.is_active'
+      view_apdex_level: 'view.apdex_level'
     },
     fields: {
+      is_active: 'view.is_active',
       session_replay_stats: '_dd.replay_stats',
       session_is_active: 'session.is_active',
       view_error_count: 'view.error.count',

package/cjs/helper/contextHistory.js

@@ -14,9 +14,10 @@ var END_OF_TIMES = Infinity;
 var CLEAR_OLD_CONTEXTS_INTERVAL = _tools.ONE_MINUTE;
 exports.CLEAR_OLD_CONTEXTS_INTERVAL = CLEAR_OLD_CONTEXTS_INTERVAL;
 
-function ContextHistory(expireDelay) {
+function ContextHistory(expireDelay, maxEntries) {
   this.expireDelay = expireDelay;
   this.entries = [];
+  this.maxEntries = maxEntries;
 
   var _this = this;
 
@@ -43,6 +44,11 @@ ContextHistory.prototype.add = function (context, startTime) {
       entry.endTime = endTime;
     }
   };
+
+  if (this.maxEntries && this.entries.length >= this.maxEntries) {
+    this.entries.pop();
+  }
+
   this.entries.unshift(entry);
   return entry;
 };
@@ -83,13 +89,19 @@ ContextHistory.prototype.closeActive = function (endTime) {
  */
 
 
-ContextHistory.prototype.findAll = function (startTime) {
+ContextHistory.prototype.findAll = function (startTime, duration) {
+  if (typeof duration === 'undefined') {
+    duration = 0;
+  }
+
+  var endTime = (0, _tools.addDuration)(startTime, duration);
+
   if (typeof startTime === 'undefined') {
     startTime = END_OF_TIMES;
   }
 
   var result = (0, _tools.filter)(this.entries, function (entry) {
-    return entry.startTime <= startTime && startTime <= entry.endTime;
+    return entry.startTime <= endTime && startTime <= entry.endTime;
   });
   return (0, _tools.map)(result, function (entry) {
     return entry.context;

package/cjs/helper/tools.js

@@ -86,7 +86,7 @@ exports.values = exports.utf8Encode = exports.urlParse = exports.unique = export
 exports.withSnakeCaseKeys = withSnakeCaseKeys;
 exports.xhr = void 0;
 
-var _enums = require("./enums");
+var _display = require("./display");
 
 var _timer = require("./timer");
 
@@ -385,9 +385,23 @@ var every = function every(arr, fn, self) {
 
 exports.every = every;
 
-var matchList = function matchList(list, value) {
+var matchList = function matchList(list, value, useStartsWith) {
+  if (useStartsWith === undefined) {
+    useStartsWith = false;
+  }
+
   return some(list, function (item) {
-    return item === value || item instanceof RegExp && item.test(value);
+    try {
+      if (typeof item === 'function') {
+        return item(value);
+      } else if (item instanceof RegExp) {
+        return item.test(value);
+      } else if (typeof item === 'string') {
+        return useStartsWith ? startsWith(value, item) : item === value;
+      }
+    } catch (e) {
+      _display.display.error(e);
+    }
   });
 }; // https://github.com/jquery/jquery/blob/a684e6ba836f7c553968d7d026ed7941e1a612d8/src/selector/escapeSelector.js
 

package/cjs/transport/batch.js

@@ -57,21 +57,14 @@ var processedMessageByDataMap = function processedMessageByDataMap(message) {
       var fields = (0, _tools.extend)({}, _dataMap.commonFields, value.fields);
       (0, _tools.each)(fields, function (_value, _key) {
         if ((0, _tools.isArray)(_value) && _value.length === 2) {
-          var type = _value[0],
-              value_path = _value[1];
+          var value_path = _value[1];
 
           var _valueData = (0, _tools.findByPath)(message, value_path);
 
           filterFileds.push(_key);
 
-          if (_valueData || (0, _tools.isNumber)(_valueData)) {
+          if (_valueData !== undefined && _valueData !== null) {
             rowData.fields[_key] = _valueData; // 这里不需要转译
-            // _valueData =
-            //   type === 'string'
-            //     ? '"' +
-            //       _valueData.replace(/[\\]*"/g, '"').replace(/"/g, '\\"') +
-            //       '"'
-            //     : escapeRowData(_valueData)
 
             fieldsStr.push((0, _rowData.escapeRowData)(_key) + '=' + (0, _rowData.escapeRowField)(_valueData));
           }
@@ -80,7 +73,7 @@ var processedMessageByDataMap = function processedMessageByDataMap(message) {
 
           filterFileds.push(_key);
 
-          if (_valueData || (0, _tools.isNumber)(_valueData)) {
+          if (_valueData !== undefined && _valueData !== null) {
             rowData.fields[_key] = _valueData; // 这里不需要转译
 
             fieldsStr.push((0, _rowData.escapeRowData)(_key) + '=' + (0, _rowData.escapeRowField)(_valueData));
@@ -96,7 +89,7 @@ var processedMessageByDataMap = function processedMessageByDataMap(message) {
           if (filterFileds.indexOf(_key) > -1) return;
           filterFileds.push(_key);
 
-          if (_value || (0, _tools.isNumber)(_value)) {
+          if (_value !== undefined && _value !== null) {
             _tagKeys.push(_key);
 
             rowData.fields[_key] = _value; // 这里不需要转译
@@ -114,7 +107,7 @@ var processedMessageByDataMap = function processedMessageByDataMap(message) {
       if (message.type === _enums.RumEventType.LOGGER) {
         // 这里处理日志类型数据自定义字段
         (0, _tools.each)(message, function (value, key) {
-          if (filterFileds.indexOf(key) === -1 && ((0, _tools.isNumber)(value) || value)) {
+          if (filterFileds.indexOf(key) === -1 && value !== undefined && value !== null) {
             rowData.fields[key] = value; // 这里不需要转译
 
             fieldsStr.push((0, _rowData.escapeRowData)(key) + '=' + (0, _rowData.escapeRowField)(value));

package/esm/browser/cookie.js

@@ -28,7 +28,6 @@ export function areCookiesAuthorized(options) {
     setCookie(testCookieName, testCookieValue, ONE_SECOND, options);
     return getCookie(testCookieName) === testCookieValue;
   } catch (error) {
-    console.error(error);
     return false;
   }
 }

package/esm/dataMap.js

@@ -43,10 +43,10 @@ export var dataMap = {
     type: RumEventType.VIEW,
     tags: {
       view_loading_type: 'view.loading_type',
-      view_apdex_level: 'view.apdex_level',
-      is_active: 'view.is_active'
+      view_apdex_level: 'view.apdex_level'
     },
     fields: {
+      is_active: 'view.is_active',
       session_replay_stats: '_dd.replay_stats',
       session_is_active: 'session.is_active',
       view_error_count: 'view.error.count',

package/esm/helper/contextHistory.js

@@ -1,10 +1,11 @@
-import { relativeNow, ONE_MINUTE, filter, map } from './tools';
+import { relativeNow, ONE_MINUTE, filter, map, addDuration } from './tools';
 import { setInterval, clearInterval } from './timer';
 var END_OF_TIMES = Infinity;
 export var CLEAR_OLD_CONTEXTS_INTERVAL = ONE_MINUTE;
-export function ContextHistory(expireDelay) {
+export function ContextHistory(expireDelay, maxEntries) {
   this.expireDelay = expireDelay;
   this.entries = [];
+  this.maxEntries = maxEntries;
 
   var _this = this;
 
@@ -31,6 +32,11 @@ ContextHistory.prototype.add = function (context, startTime) {
       entry.endTime = endTime;
     }
   };
+
+  if (this.maxEntries && this.entries.length >= this.maxEntries) {
+    this.entries.pop();
+  }
+
   this.entries.unshift(entry);
   return entry;
 };
@@ -71,13 +77,19 @@ ContextHistory.prototype.closeActive = function (endTime) {
  */
 
 
-ContextHistory.prototype.findAll = function (startTime) {
+ContextHistory.prototype.findAll = function (startTime, duration) {
+  if (typeof duration === 'undefined') {
+    duration = 0;
+  }
+
+  var endTime = addDuration(startTime, duration);
+
   if (typeof startTime === 'undefined') {
     startTime = END_OF_TIMES;
   }
 
   var result = filter(this.entries, function (entry) {
-    return entry.startTime <= startTime && startTime <= entry.endTime;
+    return entry.startTime <= endTime && startTime <= entry.endTime;
   });
   return map(result, function (entry) {
     return entry.context;

package/esm/helper/tools.js

@@ -1,4 +1,4 @@
-import { DOM_EVENT } from './enums';
+import { display } from './display';
 import { setTimeout, clearTimeout } from './timer';
 var ArrayProto = Array.prototype;
 var FuncProto = Function.prototype;
@@ -242,9 +242,23 @@ export var every = function every(arr, fn, self) {
 
   return flag;
 };
-export var matchList = function matchList(list, value) {
+export var matchList = function matchList(list, value, useStartsWith) {
+  if (useStartsWith === undefined) {
+    useStartsWith = false;
+  }
+
   return some(list, function (item) {
-    return item === value || item instanceof RegExp && item.test(value);
+    try {
+      if (typeof item === 'function') {
+        return item(value);
+      } else if (item instanceof RegExp) {
+        return item.test(value);
+      } else if (typeof item === 'string') {
+        return useStartsWith ? startsWith(value, item) : item === value;
+      }
+    } catch (e) {
+      display.error(e);
+    }
   });
 }; // https://github.com/jquery/jquery/blob/a684e6ba836f7c553968d7d026ed7941e1a612d8/src/selector/escapeSelector.js
 

package/esm/transport/batch.js

@@ -42,21 +42,14 @@ export var processedMessageByDataMap = function processedMessageByDataMap(messag
       var fields = extend({}, commonFields, value.fields);
       each(fields, function (_value, _key) {
         if (isArray(_value) && _value.length === 2) {
-          var type = _value[0],
-              value_path = _value[1];
+          var value_path = _value[1];
 
           var _valueData = findByPath(message, value_path);
 
           filterFileds.push(_key);
 
-          if (_valueData || isNumber(_valueData)) {
+          if (_valueData !== undefined && _valueData !== null) {
             rowData.fields[_key] = _valueData; // 这里不需要转译
-            // _valueData =
-            //   type === 'string'
-            //     ? '"' +
-            //       _valueData.replace(/[\\]*"/g, '"').replace(/"/g, '\\"') +
-            //       '"'
-            //     : escapeRowData(_valueData)
 
             fieldsStr.push(escapeRowData(_key) + '=' + escapeRowField(_valueData));
           }
@@ -65,7 +58,7 @@ export var processedMessageByDataMap = function processedMessageByDataMap(messag
 
           filterFileds.push(_key);
 
-          if (_valueData || isNumber(_valueData)) {
+          if (_valueData !== undefined && _valueData !== null) {
             rowData.fields[_key] = _valueData; // 这里不需要转译
 
             fieldsStr.push(escapeRowData(_key) + '=' + escapeRowField(_valueData));
@@ -81,7 +74,7 @@ export var processedMessageByDataMap = function processedMessageByDataMap(messag
           if (filterFileds.indexOf(_key) > -1) return;
           filterFileds.push(_key);
 
-          if (_value || isNumber(_value)) {
+          if (_value !== undefined && _value !== null) {
             _tagKeys.push(_key);
 
             rowData.fields[_key] = _value; // 这里不需要转译
@@ -99,7 +92,7 @@ export var processedMessageByDataMap = function processedMessageByDataMap(messag
       if (message.type === RumEventType.LOGGER) {
         // 这里处理日志类型数据自定义字段
         each(message, function (value, key) {
-          if (filterFileds.indexOf(key) === -1 && (isNumber(value) || value)) {
+          if (filterFileds.indexOf(key) === -1 && value !== undefined && value !== null) {
             rowData.fields[key] = value; // 这里不需要转译
 
             fieldsStr.push(escapeRowData(key) + '=' + escapeRowField(value));

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudcare/browser-core",
-    "version": "2.0.10",
+    "version": "2.0.12",
     "main": "cjs/index.js",
     "module": "esm/index.js",
     "scripts": {
@@ -20,5 +20,5 @@
     "author": "dataflux",
     "license": "MIT",
     "description": "DataFlux RUM Web 端数据指标监控",
-    "gitHead": "197457783c66faf642df01e4a6149fd4fc559d37"
+    "gitHead": "98664a15be351def98c4e9b33c8366b1fb8aa652"
 }

package/src/browser/cookie.js

@@ -28,7 +28,6 @@ export function deleteCookie(name, options) {
   setCookie(name, '', 0, options)
 }
 
-
 export function areCookiesAuthorized(options) {
   if (document.cookie === undefined || document.cookie === null) {
     return false
@@ -41,7 +40,6 @@ export function areCookiesAuthorized(options) {
     setCookie(testCookieName, testCookieValue, ONE_SECOND, options)
     return getCookie(testCookieName) === testCookieValue
   } catch (error) {
-    console.error(error)
     return false
   }
 }

package/src/dataMap.js

@@ -42,10 +42,10 @@ export var dataMap = {
     type: RumEventType.VIEW,
     tags: {
       view_loading_type: 'view.loading_type',
-      view_apdex_level: 'view.apdex_level',
-      is_active: 'view.is_active'
+      view_apdex_level: 'view.apdex_level'
     },
     fields: {
+      is_active: 'view.is_active',
       session_replay_stats: '_dd.replay_stats',
       session_is_active: 'session.is_active',
       view_error_count: 'view.error.count',

package/src/helper/contextHistory.js

@@ -1,16 +1,18 @@
-import { relativeNow, ONE_MINUTE, filter, map } from './tools'
+import { relativeNow, ONE_MINUTE, filter, map, addDuration } from './tools'
 import { setInterval, clearInterval } from './timer'
 var END_OF_TIMES = Infinity
 
 export var CLEAR_OLD_CONTEXTS_INTERVAL = ONE_MINUTE
-export function ContextHistory(expireDelay) {
+export function ContextHistory(expireDelay, maxEntries) {
   this.expireDelay = expireDelay
   this.entries = []
+  this.maxEntries = maxEntries
   var _this = this
   this.clearOldContextsInterval = setInterval(function () {
     _this.clearOldContexts()
   }, CLEAR_OLD_CONTEXTS_INTERVAL)
 }
+
 ContextHistory.prototype.add = function (context, startTime) {
   var _this = this
   var entry = {
@@ -27,6 +29,9 @@ ContextHistory.prototype.add = function (context, startTime) {
       entry.endTime = endTime
     }
   }
+  if (this.maxEntries && this.entries.length >= this.maxEntries) {
+    this.entries.pop()
+  }
   this.entries.unshift(entry)
   return entry
 }
@@ -58,12 +63,16 @@ ContextHistory.prototype.closeActive = function (endTime) {
  * Return all contexts that were active during `startTime`, or all currently active contexts if no
  * `startTime` is provided.
  */
-ContextHistory.prototype.findAll = function (startTime) {
+ContextHistory.prototype.findAll = function (startTime, duration) {
+  if (typeof duration === 'undefined') {
+    duration = 0
+  }
+  var endTime = addDuration(startTime, duration)
   if (typeof startTime === 'undefined') {
     startTime = END_OF_TIMES
   }
   var result = filter(this.entries, function (entry) {
-    return entry.startTime <= startTime && startTime <= entry.endTime
+    return entry.startTime <= endTime && startTime <= entry.endTime
   })
   return map(result, function (entry) {
     return entry.context

package/src/helper/tools.js

@@ -1,4 +1,4 @@
-import { DOM_EVENT } from './enums'
+import { display } from './display'
 import { setTimeout, clearTimeout } from './timer'
 var ArrayProto = Array.prototype
 var FuncProto = Function.prototype
@@ -214,9 +214,22 @@ export var every = function (arr, fn, self) {
   }
   return flag
 }
-export var matchList = function (list, value) {
+export var matchList = function (list, value, useStartsWith) {
+  if (useStartsWith === undefined) {
+    useStartsWith = false
+  }
   return some(list, function (item) {
-    return item === value || (item instanceof RegExp && item.test(value))
+    try {
+      if (typeof item === 'function') {
+        return item(value)
+      } else if (item instanceof RegExp) {
+        return item.test(value)
+      } else if (typeof item === 'string') {
+        return useStartsWith ? startsWith(value, item) : item === value
+      }
+    } catch (e) {
+      display.error(e)
+    }
   })
 }
 // https://github.com/jquery/jquery/blob/a684e6ba836f7c553968d7d026ed7941e1a612d8/src/selector/escapeSelector.js

package/src/transport/batch.js

@@ -55,18 +55,11 @@ export var processedMessageByDataMap = function (message) {
       var fields = extend({}, commonFields, value.fields)
       each(fields, function (_value, _key) {
         if (isArray(_value) && _value.length === 2) {
-          var type = _value[0],
-            value_path = _value[1]
+          var value_path = _value[1]
           var _valueData = findByPath(message, value_path)
           filterFileds.push(_key)
-          if (_valueData || isNumber(_valueData)) {
+          if (_valueData !== undefined && _valueData !== null) {
             rowData.fields[_key] = _valueData // 这里不需要转译
-            // _valueData =
-            //   type === 'string'
-            //     ? '"' +
-            //       _valueData.replace(/[\\]*"/g, '"').replace(/"/g, '\\"') +
-            //       '"'
-            //     : escapeRowData(_valueData)
             fieldsStr.push(
               escapeRowData(_key) + '=' + escapeRowField(_valueData)
             )
@@ -74,7 +67,7 @@ export var processedMessageByDataMap = function (message) {
         } else if (isString(_value)) {
           var _valueData = findByPath(message, _value)
           filterFileds.push(_key)
-          if (_valueData || isNumber(_valueData)) {
+          if (_valueData !== undefined && _valueData !== null) {
             rowData.fields[_key] = _valueData // 这里不需要转译
             fieldsStr.push(
               escapeRowData(_key) + '=' + escapeRowField(_valueData)
@@ -93,7 +86,7 @@ export var processedMessageByDataMap = function (message) {
           // 如果和之前tag重名，则舍弃
           if (filterFileds.indexOf(_key) > -1) return
           filterFileds.push(_key)
-          if (_value || isNumber(_value)) {
+          if (_value !== undefined && _value !== null) {
             _tagKeys.push(_key)
             rowData.fields[_key] = _value // 这里不需要转译
             fieldsStr.push(escapeRowData(_key) + '=' + escapeRowField(_value))
@@ -109,7 +102,11 @@ export var processedMessageByDataMap = function (message) {
       if (message.type === RumEventType.LOGGER) {
         // 这里处理日志类型数据自定义字段
         each(message, function (value, key) {
-          if (filterFileds.indexOf(key) === -1 && (isNumber(value) || value)) {
+          if (
+            filterFileds.indexOf(key) === -1 &&
+            value !== undefined &&
+            value !== null
+          ) {
             rowData.fields[key] = value // 这里不需要转译
             fieldsStr.push(escapeRowData(key) + '=' + escapeRowField(value))
           }