@cloudcare/browser-core 3.2.22 → 3.2.25

package/src/browser/asyncClocks.js

@@ -0,0 +1,69 @@
+import { addEventListener } from './addEventListener'
+import { display } from '../helper/display'
+import { trim } from '../configuration/transportConfiguration'
+let timeOffset
+export function fetchAndApplyRemoteClocks(initConfiguration, callback) {
+  const start = performance.now()
+  fetchRemoteClocks(initConfiguration, (serverTimestamp) => {
+    const end = performance.now()
+    const rtt = end - start
+    callback(applyRemoteClocks(serverTimestamp, rtt))
+  })
+}
+function applyRemoteClocks(serverTimestamp, rtt) {
+  const estimatedClientTime =
+    performance.timing.navigationStart + start + rtt / 2
+
+  // 计算时间偏移
+  const offset = serverTimestamp - estimatedClientTime
+  return offset
+}
+export function fetchRemoteClocks(configuration, callback) {
+  const xhr = new XMLHttpRequest()
+
+  addEventListener(xhr, 'load', function () {
+    if (xhr.status === 200) {
+      const remoteConfiguration = JSON.parse(xhr.responseText)
+      callback(remoteConfiguration.content)
+    } else {
+      displayRemoteClocksFetchingError()
+    }
+  })
+
+  addEventListener(xhr, 'error', function () {
+    callback({})
+    displayRemoteClocksFetchingError()
+  })
+
+  xhr.open('GET', buildEndpoint(configuration))
+  xhr.send()
+}
+
+export function buildEndpoint(configuration) {
+  var url =
+    configuration.datakitOrigin ||
+    configuration.datakitUrl ||
+    configuration.site
+  if (url.indexOf('/') === 0) {
+    // 绝对路径这种 /xxx
+    url = location.origin + trim(url)
+  }
+  var endpoint = url
+  if (url.lastIndexOf('/') === url.length - 1) {
+    endpoint = trim(url) + 'v1/env_variable'
+  } else {
+    endpoint = trim(url) + '/v1/env_variable'
+  }
+  // 这里需要加上token和app_id
+  endpoint += '?app_id=' + configuration.applicationId
+  //testing-openway.dataflux.cn/v1/env_variable?token=a47fb0cdddaa4561a90d941317cdbc0b&app_id=d1b454d0_22eb_11ef_9b66_95ca11aa2c6c&to_headless=true
+  if (configuration.site && configuration.clientToken) {
+    endpoint =
+      endpoint + '&token=' + configuration.clientToken + '&to_headless=true'
+  }
+  return endpoint
+}
+
+function displayRemoteClocksFetchingError() {
+  display.error('Error fetching the remote configuration.')
+}

package/src/dataMap.js

@@ -22,6 +22,7 @@ export var commonTags = {
   browser_version_major: 'device.browser_version_major',
   screen_size: 'device.screen_size',
   network_type: 'device.network_type',
+  time_zone: 'device.time_zone',
   device: 'device.device',
   view_id: 'view.id',
   view_referrer: 'view.referrer',

package/src/helper/deviceInfo.js

@@ -307,6 +307,10 @@ var MethodLibrary = {
     })()
     return _this.language
   }),
+  getTimeZone: monitor(function () {
+    const timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone
+    return timeZone
+  }),
   // 浏览器信息
   getBrowserInfo: monitor(function () {
     var _this = this
@@ -619,7 +623,8 @@ if (typeof window !== 'undefined') {
     browserVersionMajor: MethodLibrary.getBrowserInfo().browserMajor,
     screenSize: window.screen.width + '*' + window.screen.height,
     networkType: MethodLibrary.getNetwork(),
-    device: MethodLibrary.getDeviceType()
+    device: MethodLibrary.getDeviceType(),
+    timeZone: MethodLibrary.getTimeZone()
   }
 }
 export var deviceInfo = _deviceInfo

package/src/helper/getZoneJsOriginalValue.js

@@ -1,3 +1,4 @@
+import { getGlobalObject } from '../init'
 /**
  * Gets the original value for a DOM API that was potentially patched by Zone.js.
  *
@@ -12,7 +13,7 @@
  * [1]: https://github.com/angular/angular/tree/main/packages/zone.js
  */
 export function getZoneJsOriginalValue(target, name) {
-  var browserWindow = window
+  var browserWindow = getGlobalObject()
   var original
   if (
     browserWindow.Zone &&

package/src/helper/valueHistory.js

@@ -3,7 +3,13 @@ import { setInterval, clearInterval } from './timer'
 var END_OF_TIMES = Infinity
 
 export var CLEAR_OLD_VALUES_INTERVAL = ONE_MINUTE
+let cleanupHistoriesInterval = null
 
+const cleanupTasks = new Set()
+
+function cleanupHistories() {
+  cleanupTasks.forEach((task) => task())
+}
 /**
  *
  * @param {expireDelay,maxEntries } params
@@ -14,11 +20,13 @@ export function createValueHistory(params) {
   var maxEntries = params.maxEntries
 
   var entries = []
-  var clearOldValuesInterval = setInterval(function () {
-    return clearOldValues()
-  }, CLEAR_OLD_VALUES_INTERVAL)
+  if (cleanupHistoriesInterval) {
+    cleanupHistoriesInterval = setInterval(function () {
+      return clearExpiredValues()
+    }, CLEAR_OLD_VALUES_INTERVAL)
+  }
 
-  function clearOldValues() {
+  function clearExpiredValues() {
     var oldTimeThreshold = relativeNow() - expireDelay
     while (
       entries.length > 0 &&
@@ -27,7 +35,7 @@ export function createValueHistory(params) {
       entries.pop()
     }
   }
-
+  cleanupTasks.add(clearExpiredValues)
   function add(value, startTime) {
     var entry = {
       value: value,
@@ -103,7 +111,11 @@ export function createValueHistory(params) {
    * Stop internal garbage collection of past entries.
    */
   function stop() {
-    clearInterval(clearOldValuesInterval)
+    cleanupTasks.delete(clearExpiredValues)
+    if (cleanupTasks.size === 0 && cleanupHistoriesInterval) {
+      clearInterval(cleanupHistoriesInterval)
+      cleanupHistoriesInterval = null
+    }
   }
 
   return {

package/src/session/sessionStoreOperations.js

@@ -48,10 +48,7 @@ export function processSessionStoreOperations(
   let currentStore = retrieveStore()
   if (isLockEnabled) {
     // if someone has lock, retry later
-    if (
-      currentStore.lock &&
-      !isSessionInNotStartedState(currentStore.session)
-    ) {
+    if (currentStore.lock) {
       retryLater(operations, sessionStoreStrategy, numberOfRetries)
       return
     }
@@ -60,10 +57,7 @@ export function processSessionStoreOperations(
     persistWithLock(currentStore.session)
     // if lock is not acquired, retry later
     currentStore = retrieveStore()
-    if (
-      currentStore.lock !== currentLock &&
-      !isSessionInNotStartedState(currentStore.session)
-    ) {
+    if (currentStore.lock !== currentLock) {
       retryLater(operations, sessionStoreStrategy, numberOfRetries)
       return
     }
@@ -72,10 +66,7 @@ export function processSessionStoreOperations(
   if (isLockEnabled) {
     // if lock corrupted after process, retry later
     currentStore = retrieveStore()
-    if (
-      currentStore.lock !== currentLock &&
-      !isSessionInNotStartedState(currentStore.session)
-    ) {
+    if (currentStore.lock !== currentLock) {
       retryLater(operations, sessionStoreStrategy, numberOfRetries)
       return
     }
@@ -96,10 +87,7 @@ export function processSessionStoreOperations(
     if (!(processedSession && isSessionInExpiredState(processedSession))) {
       // if lock corrupted after persist, retry later
       currentStore = retrieveStore()
-      if (
-        currentStore.lock !== currentLock &&
-        !isSessionInNotStartedState(currentStore.session)
-      ) {
+      if (currentStore.lock !== currentLock) {
         retryLater(operations, sessionStoreStrategy, numberOfRetries)
         return
       }

package/src/tracekit/computeStackTrace.js

@@ -36,6 +36,7 @@ export function computeStackTrace(ex) {
 }
 var fileUrl =
   '((?:file|https?|blob|chrome-extension|electron|native|eval|webpack|<anonymous>|\\w+\\.|\\/).*?)'
+
 var filePosition = '(?::(\\d+))'
 var CHROME_LINE_RE = new RegExp(
   '^\\s*at (.*?) ?\\(' +
@@ -117,7 +118,7 @@ function parseWinLine(line) {
 }
 
 var GECKO_LINE_RE =
-  /^\s*(.*?)(?:\((.*?)\))?(?:^|@)((?:file|https?|blob|chrome|webpack|resource|capacitor|\[native).*?|[^@]*bundle)(?::(\d+))?(?::(\d+))?\s*$/i
+  /^\s*(.*?)(?:\((.*?)\))?(?:^|@)((?:file|https?|blob|chrome|webpack|resource|capacitor|\[native).*?|[^@]*bundle|\[wasm code\])(?::(\d+))?(?::(\d+))?\s*$/i
 var GECKO_EVAL_RE = /(\S+) line (\d+)(?: > eval line \d+)* > eval/i
 
 function parseGeckoLine(line) {

package/src/transport/eventBridge.js

@@ -24,7 +24,11 @@ export function getEventBridge() {
       )
     },
     getAllowedWebViewHosts() {
-      return JSON.parse(eventBridgeGlobal.getAllowedWebViewHosts())
+      return JSON.parse(
+        (eventBridgeGlobal.getAllowedWebViewHosts &&
+          eventBridgeGlobal.getAllowedWebViewHosts()) ||
+          '[]'
+      )
     },
     send(eventType, event, viewId) {
       const view = viewId ? { id: viewId } : undefined
@@ -45,8 +49,22 @@ export function bridgeSupports(capability) {
 export function canUseEventBridge(
   currentHost = getGlobalObject().location?.hostname
 ) {
+  const eventBridgeGlobal = getEventBridgeGlobal()
+  if (
+    eventBridgeGlobal &&
+    eventBridgeGlobal.getAllowedWebViewHosts === undefined
+  ) {
+    return true
+  }
+  if (
+    eventBridgeGlobal &&
+    eventBridgeGlobal.getAllowedWebViewHosts &&
+    (eventBridgeGlobal.getAllowedWebViewHosts() === null ||
+      eventBridgeGlobal.getAllowedWebViewHosts() === undefined)
+  ) {
+    return true
+  }
   var bridge = getEventBridge()
-
   return (
     !!bridge &&
     bridge