@cloudcare/browser-core 3.1.3 → 3.1.5

package/src/configuration/transportConfiguration.js

@@ -5,17 +5,29 @@ var typeMap = {
   log: '/logging',
   sessionReplay: '/rum/replay'
 }
-function getEndPointUrl(url, type) {
+function getEndPointUrl(configuration, type) {
   // type: rum, log,replay
   var subUrl = typeMap[type]
   if (!subUrl) return ''
+  var url =
+    configuration.datakitOrigin ||
+    configuration.datakitUrl ||
+    configuration.site
   if (url.indexOf('/') === 0) {
     // 绝对路径这种 /xxx
     url = location.origin + trim(url)
   }
-  if (url.lastIndexOf('/') === url.length - 1)
-    return trim(url) + 'v1/write' + subUrl
-  return trim(url) + '/v1/write' + subUrl
+  var endpoint = url
+  if (url.lastIndexOf('/') === url.length - 1) {
+    endpoint = trim(url) + 'v1/write' + subUrl
+  } else {
+    endpoint = trim(url) + '/v1/write' + subUrl
+  }
+  if (configuration.site && configuration.clientToken) {
+    endpoint =
+      endpoint + '?token=' + configuration.clientToken + '&to_headless=true'
+  }
+  return endpoint
 }
 
 function trim(str) {
@@ -44,15 +56,9 @@ export function computeTransportConfiguration(initConfiguration) {
     isServerError = initConfiguration.isServerError
   }
   return {
-    rumEndpoint: getEndPointUrl(
-      initConfiguration.datakitUrl || initConfiguration.datakitOrigin,
-      'rum'
-    ),
-    logsEndpoint: getEndPointUrl(initConfiguration.datakitOrigin, 'log'),
-    sessionReplayEndPoint: getEndPointUrl(
-      initConfiguration.datakitOrigin,
-      'sessionReplay'
-    ),
+    rumEndpoint: getEndPointUrl(initConfiguration, 'rum'),
+    logsEndpoint: getEndPointUrl(initConfiguration, 'log'),
+    sessionReplayEndPoint: getEndPointUrl(initConfiguration, 'sessionReplay'),
     isIntakeUrl: isIntakeUrl,
     isServerError: isServerError
   }

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/tools.js

@@ -1518,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('.')
@@ -1594,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
+  }
+  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
   }
-  return browserIsSafari
+
+  if (browserWindow.document.documentMode) {
+    return Browser.IE
+  }
+
+  return Browser.OTHER
 }
+
 /**
  * IE fallback
  * https://developer.mozilla.org/en-US/docs/Web/API/HTMLHyperlinkElementUtils/origin