@cloudcare/browser-core 3.1.2 → 3.1.5

package/src/helper/deviceInfo.js

@@ -1,4 +1,5 @@
 import { display } from '../helper/display'
+import { monitor } from '../helper/monitor'
 var VariableLibrary = {
   navigator:
     typeof window !== 'undefined' && typeof window.navigator != 'undefined'
@@ -80,7 +81,7 @@ var VariableLibrary = {
 // 方法库
 var MethodLibrary = {
   // 获取匹配库
-  getMatchMap: function (u) {
+  getMatchMap: monitor(function (u) {
     return {
       // 内核
       Trident: u.indexOf('Trident') > -1 || u.indexOf('NET CLR') > -1,
@@ -154,9 +155,9 @@ var MethodLibrary = {
       Tablet: u.indexOf('Tablet') > -1 || u.indexOf('Nexus 7') > -1,
       iPad: u.indexOf('iPad') > -1
     }
-  },
+  }),
   // 在信息map和匹配库中进行匹配
-  matchInfoMap: function (_this) {
+  matchInfoMap: monitor(function (_this) {
     var u = VariableLibrary.navigator.userAgent || ''
     var match = MethodLibrary.getMatchMap(u)
     for (var s in VariableLibrary.infoMap) {
@@ -167,15 +168,15 @@ var MethodLibrary = {
         }
       }
     }
-  },
+  }),
   // 获取当前操作系统
-  getOS: function () {
+  getOS: monitor(function () {
     var _this = this
     MethodLibrary.matchInfoMap(_this)
     return _this.os || 'Unknown'
-  },
+  }),
   // 获取操作系统版本
-  getOSVersion: function () {
+  getOSVersion: monitor(function () {
     var _this = this
     var u = VariableLibrary.navigator.userAgent || ''
     _this.osVersion = ''
@@ -229,9 +230,9 @@ var MethodLibrary = {
       version: _this.osVersion,
       osMajor: _this.osMajor
     }
-  },
+  }),
   // 获取横竖屏状态
-  getOrientationStatu: function () {
+  getOrientationStatu: monitor(function () {
     var orientationStatus = ''
     var orientation = window.matchMedia('(orientation: portrait)')
     if (orientation.matches) {
@@ -240,16 +241,16 @@ var MethodLibrary = {
       orientationStatus = '横屏'
     }
     return orientationStatus
-  },
+  }),
   // 获取设备类型
-  getDeviceType: function () {
+  getDeviceType: monitor(function () {
     var _this = this
     _this.device = 'PC'
     MethodLibrary.matchInfoMap(_this)
     return _this.device
-  },
+  }),
   // 获取网络状态
-  getNetwork: function () {
+  getNetwork: monitor(function () {
     var connection =
       window.navigator.connection ||
       window.navigator.mozConnection ||
@@ -289,9 +290,9 @@ var MethodLibrary = {
       }
     }
     return result
-  },
+  }),
   // 获取当前语言
-  getLanguage: function () {
+  getLanguage: monitor(function () {
     var _this = this
     _this.language = (function () {
       var language =
@@ -305,9 +306,9 @@ var MethodLibrary = {
       return arr.join('_')
     })()
     return _this.language
-  },
+  }),
   // 浏览器信息
-  getBrowserInfo: function () {
+  getBrowserInfo: monitor(function () {
     var _this = this
     MethodLibrary.matchInfoMap(_this)
 
@@ -345,6 +346,7 @@ var MethodLibrary = {
         match['360SE'] = true
       } else if (
         VariableLibrary.navigator &&
+        VariableLibrary.navigator.connection &&
         typeof VariableLibrary.navigator['connection']['saveData'] ==
           'undefined'
       ) {
@@ -589,9 +591,9 @@ var MethodLibrary = {
       engine: _this.engine,
       browserMajor: _this.browserMajor
     }
-  },
+  }),
   // 获取地理位置
-  getGeoPostion: function (callback) {
+  getGeoPostion: monitor(function (callback) {
     navigator &&
       navigator.geolocation &&
       navigator.geolocation.getCurrentPosition(
@@ -604,12 +606,13 @@ var MethodLibrary = {
           display.warn(error)
         }
       )
-  }
+  })
 }
 var _deviceInfo = {}
 if (typeof window !== 'undefined') {
   _deviceInfo = {
     os: MethodLibrary.getOS(),
+    MethodLibrary,
     osVersion: MethodLibrary.getOSVersion().version,
     osVersionMajor: MethodLibrary.getOSVersion().osMajor,
     browser: MethodLibrary.getBrowserInfo().browser,

package/src/helper/errorTools.js

@@ -2,6 +2,7 @@ import { each, noop } from './tools'
 import { jsonStringify } from '../helper/serialisation/jsonStringify'
 import { computeStackTrace } from '../tracekit'
 import { callMonitored } from '../helper/monitor'
+import { sanitize } from '../helper/sanitize'
 export var NO_ERROR_STACK_PRESENT_MESSAGE =
   'No stack, consider using an instance of Error'
 export var ErrorSource = {

package/src/helper/monitor.js

@@ -38,6 +38,7 @@ export function callMonitored(fn, context, args) {
 
 export function displayIfDebugEnabled(api) {
   var args = [].slice.call(arguments, 1)
+  //   display.apply(null, [api, '[MONITOR]'].concat(args))
   if (debugMode) {
     display.apply(null, [api, '[MONITOR]'].concat(args))
   }

package/src/helper/serialisation/rowData.js

@@ -1,5 +1,5 @@
 import { jsonStringify } from './jsonStringify'
-import { isString } from '../tools'
+import { isString, isNumber } from '../tools'
 export function escapeRowData(str) {
   if (typeof str === 'object' && str) {
     str = jsonStringify(str)
@@ -12,12 +12,15 @@ export function escapeRowData(str) {
   })
 }
 
-export function escapeJsonValue(value) {
-  if (isString(value)) {
-    return value
-  } else {
-    return jsonStringify(value)
+export function escapeJsonValue(value, isTag) {
+  if (typeof value === 'object' && value) {
+    value = jsonStringify(value)
+  } else if (isTag) {
+    // tag  json  只能是字符串
+    value = '' + value
   }
+
+  return value
 }
 
 export function escapeFieldValueStr(str) {

package/src/helper/tools.js

@@ -228,6 +228,7 @@ export var matchList = function (list, value, useStartsWith) {
     } catch (e) {
       display.error(e)
     }
+    return false
   })
 }
 // https://github.com/jquery/jquery/blob/a684e6ba836f7c553968d7d026ed7941e1a612d8/src/selector/escapeSelector.js
@@ -1517,9 +1518,36 @@ export function getNavigationStart() {
   }
   return navigationStart
 }
+
+var COMMA_SEPARATED_KEY_VALUE = /([\w-]+)\s*=\s*([^;]+)/g
 export function findCommaSeparatedValue(rawString, name) {
-  var matches = rawString.match('(?:^|;)\\s*' + name + '\\s*=\\s*([^;]+)')
-  return matches ? matches[1] : undefined
+  COMMA_SEPARATED_KEY_VALUE.lastIndex = 0
+  // eslint-disable-next-line no-constant-condition
+  while (true) {
+    var match = COMMA_SEPARATED_KEY_VALUE.exec(rawString)
+    if (match) {
+      if (match[1] === name) {
+        return match[2]
+      }
+    } else {
+      break
+    }
+  }
+}
+
+export function findCommaSeparatedValues(rawString) {
+  var result = new Map()
+  COMMA_SEPARATED_KEY_VALUE.lastIndex = 0
+  // eslint-disable-next-line no-constant-condition
+  while (true) {
+    var match = COMMA_SEPARATED_KEY_VALUE.exec(rawString)
+    if (match) {
+      result.set(match[1], match[2])
+    } else {
+      break
+    }
+  }
+  return result
 }
 export function findByPath(source, path) {
   var pathArr = path.split('.')
@@ -1593,29 +1621,54 @@ export function isPercentage(value) {
 export function getLocationOrigin() {
   return getLinkElementOrigin(window.location)
 }
-
-var browserIsIE
+export var Browser = {
+  IE: 0,
+  CHROMIUM: 1,
+  SAFARI: 2,
+  OTHER: 3
+}
 export function isIE() {
-  if (browserIsIE === undefined) {
-    browserIsIE = Boolean(document.documentMode)
-  }
-  return browserIsIE
+  return detectBrowserCached() === Browser.IE
 }
-var browserIsChromium
 export function isChromium() {
-  if (browserIsChromium === undefined) {
-    browserIsChromium =
-      !!window.chrome || /HeadlessChrome/.test(window.navigator.userAgent)
-  }
-  return browserIsChromium
+  return detectBrowserCached() === Browser.CHROMIUM
 }
-var browserIsSafari
 export function isSafari() {
-  if (browserIsSafari === undefined) {
-    browserIsSafari = /^((?!chrome|android).)*safari/i.test(navigator.userAgent)
+  return detectBrowserCached() === Browser.SAFARI
+}
+var browserCache
+function detectBrowserCached() {
+  return isNullUndefinedDefaultValue(
+    browserCache,
+    (browserCache = detectBrowser())
+  )
+}
+export function detectBrowser(browserWindow) {
+  if (typeof browserWindow === 'undefined') {
+    browserWindow = window
   }
-  return browserIsSafari
+  var userAgent = browserWindow.navigator.userAgent
+  if (browserWindow.chrome || /HeadlessChrome/.test(userAgent)) {
+    return Browser.CHROMIUM
+  }
+
+  if (
+    // navigator.vendor is deprecated, but it is the most resilient way we found to detect
+    // "Apple maintained browsers" (AKA Safari). If one day it gets removed, we still have the
+    // useragent test as a semi-working fallback.
+    browserWindow.navigator.vendor?.indexOf('Apple') === 0 ||
+    (/safari/i.test(userAgent) && !/chrome|android/i.test(userAgent))
+  ) {
+    return Browser.SAFARI
+  }
+
+  if (browserWindow.document.documentMode) {
+    return Browser.IE
+  }
+
+  return Browser.OTHER
 }
+
 /**
  * IE fallback
  * https://developer.mozilla.org/en-US/docs/Web/API/HTMLHyperlinkElementUtils/origin

package/src/transport/batch.js

@@ -7,8 +7,6 @@ import {
   isArray,
   extend,
   isString,
-  toServerDuration,
-  isBoolean,
   isEmptyObject,
   isObject
 } from '../helper/tools'
@@ -21,6 +19,7 @@ import { commonTags, dataMap, commonFields } from '../dataMap'
 import { RumEventType } from '../helper/enums'
 import { computeBytesCount } from '../helper/byteUtils'
 import { isPageExitReason } from '../browser/pageExitObservable'
+import { jsonStringify } from '../helper/serialisation/jsonStringify'
 // https://en.wikipedia.org/wiki/UTF-8
 // eslint-disable-next-line no-control-regex
 var HAS_MULTI_BYTES_CHARACTERS = /[^\u0000-\u007F]/
@@ -46,7 +45,7 @@ export var processedMessageByDataMap = function (message) {
         var _value = findByPath(message, value_path)
         filterFileds.push(_key)
         if (_value || isNumber(_value)) {
-          rowData.tags[_key] = escapeJsonValue(_value)
+          rowData.tags[_key] = escapeJsonValue(_value, true)
           tagsStr.push(escapeRowData(_key) + '=' + escapeRowData(_value))
         }
       })
@@ -59,7 +58,7 @@ export var processedMessageByDataMap = function (message) {
           var _valueData = findByPath(message, value_path)
           filterFileds.push(_key)
           if (_valueData !== undefined && _valueData !== null) {
-            rowData.fields[_key] = _valueData // 这里不需要转译
+            rowData.fields[_key] = escapeJsonValue(_valueData) // 这里不需要转译
             fieldsStr.push(
               escapeRowData(_key) + '=' + escapeRowField(_valueData)
             )
@@ -68,7 +67,7 @@ export var processedMessageByDataMap = function (message) {
           var _valueData = findByPath(message, _value)
           filterFileds.push(_key)
           if (_valueData !== undefined && _valueData !== null) {
-            rowData.fields[_key] = _valueData // 这里不需要转译
+            rowData.fields[_key] = escapeJsonValue(_valueData) // 这里不需要转译
             fieldsStr.push(
               escapeRowData(_key) + '=' + escapeRowField(_valueData)
             )
@@ -88,12 +87,12 @@ export var processedMessageByDataMap = function (message) {
           filterFileds.push(_key)
           if (_value !== undefined && _value !== null) {
             _tagKeys.push(_key)
-            rowData.fields[_key] = _value // 这里不需要转译
+            rowData.fields[_key] = escapeJsonValue(_value) // 这里不需要转译
             fieldsStr.push(escapeRowData(_key) + '=' + escapeRowField(_value))
           }
         })
         if (_tagKeys.length) {
-          rowData.fields[CUSTOM_KEYS] = escapeRowField(_tagKeys)
+          rowData.fields[CUSTOM_KEYS] = escapeJsonValue(_tagKeys)
           fieldsStr.push(
             escapeRowData(CUSTOM_KEYS) + '=' + escapeRowField(_tagKeys)
           )
@@ -107,7 +106,7 @@ export var processedMessageByDataMap = function (message) {
             value !== undefined &&
             value !== null
           ) {
-            rowData.fields[key] = value // 这里不需要转译
+            rowData.fields[key] = escapeJsonValue(value) // 这里不需要转译
             fieldsStr.push(escapeRowData(key) + '=' + escapeRowField(value))
           }
         })
@@ -121,7 +120,7 @@ export var processedMessageByDataMap = function (message) {
         hasFileds = true
       }
       rowStr = rowStr + ' ' + message.date
-      rowData.time = toServerDuration(message.date) // 这里不需要转译
+      rowData.time = message.date // 这里不需要转译
     }
   })
   return {
@@ -129,12 +128,18 @@ export var processedMessageByDataMap = function (message) {
     rowData: hasFileds ? rowData : undefined
   }
 }
-var batch = function (request, flushController, messageBytesLimit) {
+var batch = function (
+  request,
+  flushController,
+  messageBytesLimit,
+  sendContentTypeByJson
+) {
   this.pushOnlyBuffer = []
   this.upsertBuffer = {}
   this.request = request
   this.flushController = flushController
   this.messageBytesLimit = messageBytesLimit
+  this.sendContentTypeByJson = sendContentTypeByJson
   var _this = this
   this.flushController.flushObservable.subscribe(function (event) {
     _this.flush(event)
@@ -151,8 +156,14 @@ batch.prototype.flush = function (event) {
   this.pushOnlyBuffer = []
   this.upsertBuffer = {}
   if (messages.length > 0) {
+    var payloadData = ''
+    if (this.sendContentTypeByJson) {
+      payloadData = '[' + messages.join(',') + ']'
+    } else {
+      payloadData = messages.join('\n')
+    }
     var payload = {
-      data: messages.join('\n'),
+      data: payloadData,
       bytesCount: event.bytesCount,
       flushReason: event.reason
     }
@@ -182,7 +193,12 @@ batch.prototype.addOrUpdate = function (message, key) {
   this.push(processedMessage, messageBytesCount, key)
 }
 batch.prototype.process = function (message) {
-  var processedMessage = processedMessageByDataMap(message).rowStr
+  var processedMessage = ''
+  if (this.sendContentTypeByJson) {
+    processedMessage = jsonStringify(processedMessageByDataMap(message).rowData)
+  } else {
+    processedMessage = processedMessageByDataMap(message).rowStr
+  }
   var messageBytesCount = computeBytesCount(processedMessage)
   return {
     processedMessage: processedMessage,

package/src/transport/httpRequest.js

@@ -13,10 +13,24 @@ function addBatchPrecision(url) {
   if (!url) return url
   return url + (url.indexOf('?') === -1 ? '?' : '&') + 'precision=ms'
 }
-export function createHttpRequest(endpointUrl, bytesLimit, reportError) {
+export function createHttpRequest(
+  endpointUrl,
+  bytesLimit,
+  sendContentTypeByJson,
+  reportError
+) {
+  var contentType = sendContentTypeByJson
+    ? 'application/json; charset=UTF-8'
+    : undefined
   var retryState = newRetryState()
   var sendStrategyForRetry = function (payload, onResponse) {
-    return fetchKeepAliveStrategy(endpointUrl, bytesLimit, payload, onResponse)
+    return fetchKeepAliveStrategy(
+      endpointUrl,
+      bytesLimit,
+      contentType,
+      payload,
+      onResponse
+    )
   }
 
   return {
@@ -34,19 +48,28 @@ export function createHttpRequest(endpointUrl, bytesLimit, reportError) {
      * keep using sendBeaconStrategy on exit
      */
     sendOnExit: function (payload) {
-      sendBeaconStrategy(endpointUrl, bytesLimit, payload)
+      sendBeaconStrategy(endpointUrl, bytesLimit, contentType, payload)
     }
   }
 }
 
-function sendBeaconStrategy(endpointUrl, bytesLimit, payload) {
+function sendBeaconStrategy(endpointUrl, bytesLimit, contentType, payload) {
   var data = payload.data
   var bytesCount = payload.bytesCount
   var url = addBatchPrecision(endpointUrl)
   var canUseBeacon = !!navigator.sendBeacon && bytesCount < bytesLimit
   if (canUseBeacon) {
     try {
-      var isQueued = navigator.sendBeacon(url, data)
+      var beaconData
+      if (contentType) {
+        beaconData = new Blob([data], {
+          type: contentType
+        })
+      } else {
+        beaconData = data
+      }
+
+      var isQueued = navigator.sendBeacon(url, beaconData)
 
       if (isQueued) {
         return
@@ -55,12 +78,13 @@ function sendBeaconStrategy(endpointUrl, bytesLimit, payload) {
       // reportBeaconError(e)
     }
   }
-  sendXHR(url, data)
+  sendXHR(url, contentType, data)
 }
 
 export function fetchKeepAliveStrategy(
   endpointUrl,
   bytesLimit,
+  contentType,
   payload,
   onResponse
 ) {
@@ -69,12 +93,18 @@ export function fetchKeepAliveStrategy(
   var url = addBatchPrecision(endpointUrl)
   var canUseKeepAlive = isKeepAliveSupported() && bytesCount < bytesLimit
   if (canUseKeepAlive) {
-    fetch(url, {
+    var fetchOption = {
       method: 'POST',
       body: data,
       keepalive: true,
       mode: 'cors'
-    }).then(
+    }
+    if (contentType) {
+      fetchOption.headers = {
+        'Content-Type': contentType
+      }
+    }
+    fetch(url, fetchOption).then(
       monitor(function (response) {
         if (typeof onResponse === 'function') {
           onResponse({ status: response.status, type: response.type })
@@ -82,11 +112,11 @@ export function fetchKeepAliveStrategy(
       }),
       monitor(function () {
         // failed to queue the request
-        sendXHR(url, data, onResponse)
+        sendXHR(url, contentType, data, onResponse)
       })
     )
   } else {
-    sendXHR(url, data, onResponse)
+    sendXHR(url, contentType, data, onResponse)
   }
 }
 
@@ -99,9 +129,14 @@ function isKeepAliveSupported() {
   }
 }
 
-function sendXHR(url, data, onResponse) {
+function sendXHR(url, contentType, data, onResponse) {
   const request = new XMLHttpRequest()
   request.open('POST', url, true)
+  if (contentType) {
+    //application/json; charset=UTF-8
+    request.setRequestHeader('Content-Type', contentType)
+  }
+
   addEventListener(
     request,
     'loadend',

package/src/transport/startBatchWithReplica.js

@@ -15,6 +15,7 @@ export function startBatchWithReplica(
       createHttpRequest(
         endpointUrl,
         configuration.batchBytesLimit,
+        configuration.sendContentTypeByJson,
         reportError
       ),
       createFlushController({
@@ -24,7 +25,8 @@ export function startBatchWithReplica(
         pageExitObservable: pageExitObservable,
         sessionExpireObservable: sessionExpireObservable
       }),
-      configuration.messageBytesLimit
+      configuration.messageBytesLimit,
+      configuration.sendContentTypeByJson
     )
   }