@cloudcare/browser-core 3.2.9 → 3.2.11

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudcare/browser-core",
-    "version": "3.2.9",
+    "version": "3.2.11",
     "main": "cjs/index.js",
     "module": "esm/index.js",
     "types": "types/index.d.ts",
@@ -22,5 +22,5 @@
     "author": "dataflux",
     "license": "MIT",
     "description": "DataFlux RUM Web 端数据指标监控",
-    "gitHead": "b613ce3dff95ad63a9c937e014f032769b1bc9e3"
+    "gitHead": "d1439ec0f5e5586dd59466f7aaafabf5afdcb8e3"
 }

package/src/dataMap.js

@@ -98,12 +98,6 @@ export var dataMap = {
       trace_id: '_gc.trace_id',
       span_id: '_gc.span_id',
       resource_id: 'resource.id',
-      resource_url: 'resource.url',
-      resource_url_host: 'resource.url_host',
-      resource_url_path: 'resource.url_path',
-      resource_url_path_group: 'resource.url_path_group',
-      resource_url_query: 'resource.url_query',
-      resource_type: 'resource.type',
       resource_status: 'resource.status',
       resource_status_group: 'resource.status_group',
       resource_method: 'resource.method'
@@ -111,6 +105,14 @@ export var dataMap = {
     fields: {
       duration: 'resource.duration',
       resource_size: 'resource.size',
+      resource_url: 'resource.url',
+      resource_url_host: 'resource.url_host',
+      resource_url_path: 'resource.url_path',
+      resource_url_path_group: 'resource.url_path_group',
+      resource_url_query: 'resource.url_query',
+      resource_delivery_type: 'resource.delivery_type',
+      resource_type: 'resource.type',
+      resource_protocol: 'resource.protocol',
       resource_encode_size: 'resource.encoded_body_size',
       resource_decode_size: 'resource.decoded_body_size',
       resource_transfer_size: 'resource.transfer_size',

package/src/helper/sanitize.js

@@ -210,11 +210,11 @@ function sanitizeObjects(value) {
   try {
     // Handle events - Keep a simple implementation to avoid breaking changes
     if (value instanceof Event) {
-      return {
-        isTrusted: value.isTrusted
-      }
+      return sanitizeEvent(value)
+    }
+    if (value instanceof RegExp) {
+      return `[RegExp] ${value.toString()}`
     }
-
     // Handle all remaining object types in a generic way
     var result = Object.prototype.toString.call(value)
     var match = result.match(/\[object (.*)\]/)
@@ -227,7 +227,16 @@ function sanitizeObjects(value) {
   }
   return '[Unserializable]'
 }
-
+function sanitizeEvent(event) {
+  return {
+    type: event.type,
+    isTrusted: event.isTrusted,
+    currentTarget: event.currentTarget
+      ? sanitizeObjects(event.currentTarget)
+      : null,
+    target: event.target ? sanitizeObjects(event.target) : null
+  }
+}
 /**
  * Checks if a toJSON function exists and tries to execute it
  *

package/src/helper/taskQueue.js

@@ -46,7 +46,7 @@ export function createTaskQueue() {
   }
 
   return {
-    push(task) {
+    push: function (task) {
       if (pendingTasks.push(task) === 1) {
         scheduleNextRun()
       }

package/src/helper/tools.js

@@ -1383,7 +1383,7 @@ export var stringSplice = function (src, k, e, sp) {
   return src.substring(ps, pe)
 }
 export function getStatusGroup(status) {
-  if (!status) return status
+  if (!status) return status === 0 ? undefined : status
   return (
     String(status).substr(0, 1) + String(status).substr(1).replace(/\d*/g, 'x')
   )

package/src/tracekit/computeStackTrace.js

@@ -8,10 +8,17 @@ export function computeStackTrace(ex) {
   var stack = []
 
   var stackProperty = tryToGetString(ex, 'stack')
+  var exString = String(ex)
+  if (stackProperty && stackProperty.startsWith(exString)) {
+    stackProperty = stackProperty.slice(exString.length)
+  }
   if (stackProperty) {
-    each(stackProperty.split('\n'), function(line) {
+    each(stackProperty.split('\n'), function (line) {
       var stackFrame =
-        parseChromeLine(line) || parseChromeAnonymousLine(line) || parseWinLine(line) || parseGeckoLine(line)
+        parseChromeLine(line) ||
+        parseChromeAnonymousLine(line) ||
+        parseWinLine(line) ||
+        parseGeckoLine(line)
       if (stackFrame) {
         if (!stackFrame.func && stackFrame.line) {
           stackFrame.func = UNKNOWN_FUNCTION
@@ -24,15 +31,26 @@ export function computeStackTrace(ex) {
   return {
     message: tryToGetString(ex, 'message'),
     name: tryToGetString(ex, 'name'),
-    stack: stack,
+    stack: stack
   }
 }
-var fileUrl = '((?:file|https?|blob|chrome-extension|native|eval|webpack|<anonymous>|\\w+\\.|\\/).*?)'
+var fileUrl =
+  '((?:file|https?|blob|chrome-extension|electron|native|eval|webpack|<anonymous>|\\w+\\.|\\/).*?)'
 var filePosition = '(?::(\\d+))'
-var CHROME_LINE_RE = new RegExp('^\\s*at (.*?) ?\\('+ fileUrl + filePosition + '?' + filePosition + '?\\)?\\s*$', 'i')
-var CHROME_EVAL_RE = new RegExp('\\((\\S*)' + filePosition + filePosition + '\\)')
-
-function parseChromeLine(line){
+var CHROME_LINE_RE = new RegExp(
+  '^\\s*at (.*?) ?\\(' +
+    fileUrl +
+    filePosition +
+    '?' +
+    filePosition +
+    '?\\)?\\s*$',
+  'i'
+)
+var CHROME_EVAL_RE = new RegExp(
+  '\\((\\S*)' + filePosition + filePosition + '\\)'
+)
+
+function parseChromeLine(line) {
   var parts = CHROME_LINE_RE.exec(line)
 
   if (!parts) {
@@ -55,13 +73,16 @@ function parseChromeLine(line){
     column: parts[4] ? +parts[4] : undefined,
     func: parts[1] || UNKNOWN_FUNCTION,
     line: parts[3] ? +parts[3] : undefined,
-    url: !isNative ? parts[2] : undefined,
+    url: !isNative ? parts[2] : undefined
   }
 }
 
-var CHROME_ANONYMOUS_FUNCTION_RE = new RegExp('^\\s*at ?' + fileUrl + filePosition + '?' + filePosition + '??\\s*$', 'i')
+var CHROME_ANONYMOUS_FUNCTION_RE = new RegExp(
+  '^\\s*at ?' + fileUrl + filePosition + '?' + filePosition + '??\\s*$',
+  'i'
+)
 
-function parseChromeAnonymousLine(line){
+function parseChromeAnonymousLine(line) {
   var parts = CHROME_ANONYMOUS_FUNCTION_RE.exec(line)
 
   if (!parts) {
@@ -73,7 +94,7 @@ function parseChromeAnonymousLine(line){
     column: parts[3] ? +parts[3] : undefined,
     func: UNKNOWN_FUNCTION,
     line: parts[2] ? +parts[2] : undefined,
-    url: parts[1],
+    url: parts[1]
   }
 }
 
@@ -91,7 +112,7 @@ function parseWinLine(line) {
     column: parts[4] ? +parts[4] : undefined,
     func: parts[1] || UNKNOWN_FUNCTION,
     line: +parts[3],
-    url: parts[2],
+    url: parts[2]
   }
 }
 
@@ -120,7 +141,7 @@ function parseGeckoLine(line) {
     column: parts[5] ? +parts[5] : undefined,
     func: parts[1] || UNKNOWN_FUNCTION,
     line: parts[4] ? +parts[4] : undefined,
-    url: parts[3],
+    url: parts[3]
   }
 }