@cloudcare/browser-core 3.2.39 → 3.2.40

package/esm/transport/flushController.js.map

@@ -1 +1 @@
-{"version":3,"file":"flushController.js","names":["Observable","clearTimeout","setTimeout","createFlushController","_ref","messagesLimit","bytesLimit","durationLimit","pageExitObservable","sessionExpireObservable","subscribe","event","flush","reason","flushObservable","pageExitSubscription","unsubscribe","sessionExpireSubscription","currentBytesCount","currentMessagesCount","flushReason","messagesCount","bytesCount","cancelDurationLimitTimeout","notify","durationLimitTimeoutId","scheduleDurationLimitTimeout","undefined","getMessagesCount","notifyBeforeAddMessage","estimatedMessageBytesCount","notifyAfterAddMessage","messageBytesCountDiff","notifyAfterRemoveMessage","messageBytesCount"],"sources":["../../src/transport/flushController.js"],"sourcesContent":["import { Observable } from '../helper/observable'\nimport { clearTimeout, setTimeout } from '../helper/timer'\n\n// type FlushReason = PageExitReason | 'duration_limit' | 'bytes_limit' | 'messages_limit' | 'session_expire'\n\n/**\n * Returns a \"flush controller\", responsible of notifying when flushing a pool of pending data needs\n * to happen. The implementation is designed to support both synchronous and asynchronous usages,\n * but relies on invariants described in each method documentation to keep a coherent state.\n */\nexport function createFlushController({\n  messagesLimit,\n  bytesLimit,\n  durationLimit,\n  pageExitObservable,\n  sessionExpireObservable\n}) {\n  pageExitObservable.subscribe(function (event) {\n    return flush(event.reason)\n  })\n  sessionExpireObservable.subscribe(function () {\n    return flush('session_expire')\n  })\n  var flushObservable = new Observable(function () {\n    return function () {\n      pageExitSubscription.unsubscribe()\n      sessionExpireSubscription.unsubscribe()\n    }\n  })\n\n  var currentBytesCount = 0\n  var currentMessagesCount = 0\n\n  function flush(flushReason) {\n    if (currentMessagesCount === 0) {\n      return\n    }\n\n    var messagesCount = currentMessagesCount\n    var bytesCount = currentBytesCount\n\n    currentMessagesCount = 0\n    currentBytesCount = 0\n    cancelDurationLimitTimeout()\n\n    flushObservable.notify({\n      reason: flushReason,\n      messagesCount: messagesCount,\n      bytesCount: bytesCount\n    })\n  }\n\n  var durationLimitTimeoutId\n  function scheduleDurationLimitTimeout() {\n    if (durationLimitTimeoutId === undefined) {\n      durationLimitTimeoutId = setTimeout(function () {\n        flush('duration_limit')\n      }, durationLimit)\n    }\n  }\n\n  function cancelDurationLimitTimeout() {\n    clearTimeout(durationLimitTimeoutId)\n    durationLimitTimeoutId = undefined\n  }\n\n  return {\n    flushObservable: flushObservable,\n    getMessagesCount: function () {\n      return currentMessagesCount\n    },\n\n    /**\n     * Notifies that a message will be added to a pool of pending messages waiting to be flushed.\n     *\n     * This function needs to be called synchronously, right before adding the message, so no flush\n     * event can happen after `notifyBeforeAddMessage` and before adding the message.\n     */\n    notifyBeforeAddMessage: function (estimatedMessageBytesCount) {\n      if (currentBytesCount + estimatedMessageBytesCount >= bytesLimit) {\n        flush('bytes_limit')\n      }\n      // Consider the message to be added now rather than in `notifyAfterAddMessage`, because if no\n      // message was added yet and `notifyAfterAddMessage` is called asynchronously, we still want\n      // to notify when a flush is needed (for example on page exit).\n      currentMessagesCount += 1\n      currentBytesCount += estimatedMessageBytesCount\n      scheduleDurationLimitTimeout()\n    },\n\n    /**\n     * Notifies that a message *was* added to a pool of pending messages waiting to be flushed.\n     *\n     * This function can be called asynchronously after the message was added, but in this case it\n     * should not be called if a flush event occurred in between.\n     */\n    notifyAfterAddMessage: function (messageBytesCountDiff) {\n      if (messageBytesCountDiff === undefined) {\n        messageBytesCountDiff = 0\n      }\n      currentBytesCount += messageBytesCountDiff\n\n      if (currentMessagesCount >= messagesLimit) {\n        flush('messages_limit')\n      } else if (currentBytesCount >= bytesLimit) {\n        flush('bytes_limit')\n      }\n    },\n\n    /**\n     * Notifies that a message was removed from a pool of pending messages waiting to be flushed.\n     *\n     * This function needs to be called synchronously, right after removing the message, so no flush\n     * event can happen after removing the message and before `notifyAfterRemoveMessage`.\n     *\n     * @param messageBytesCount: the message bytes count that was added to the pool. Should\n     * correspond to the sum of bytes counts passed to `notifyBeforeAddMessage` and\n     * `notifyAfterAddMessage`.\n     */\n    notifyAfterRemoveMessage: function (messageBytesCount) {\n      currentBytesCount -= messageBytesCount\n      currentMessagesCount -= 1\n      if (currentMessagesCount === 0) {\n        cancelDurationLimitTimeout()\n      }\n    }\n  }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"flushController.js","names":["Observable","clearTimeout","setTimeout","createFlushController","_ref","messagesLimit","bytesLimit","durationLimit","pageExitObservable","sessionExpireObservable","pageExitSubscription","subscribe","event","flush","reason","sessionExpireSubscription","flushObservable","unsubscribe","currentBytesCount","currentMessagesCount","flushReason","messagesCount","bytesCount","cancelDurationLimitTimeout","notify","durationLimitTimeoutId","scheduleDurationLimitTimeout","undefined","getMessagesCount","notifyBeforeAddMessage","estimatedMessageBytesCount","notifyAfterAddMessage","messageBytesCountDiff","notifyAfterRemoveMessage","messageBytesCount"],"sources":["../../src/transport/flushController.js"],"sourcesContent":["import { Observable } from '../helper/observable'\nimport { clearTimeout, setTimeout } from '../helper/timer'\n\n// type FlushReason = PageExitReason | 'duration_limit' | 'bytes_limit' | 'messages_limit' | 'session_expire'\n\n/**\n * Returns a \"flush controller\", responsible of notifying when flushing a pool of pending data needs\n * to happen. The implementation is designed to support both synchronous and asynchronous usages,\n * but relies on invariants described in each method documentation to keep a coherent state.\n */\nexport function createFlushController({\n  messagesLimit,\n  bytesLimit,\n  durationLimit,\n  pageExitObservable,\n  sessionExpireObservable\n}) {\n  var pageExitSubscription = pageExitObservable.subscribe(function (event) {\n    return flush(event.reason)\n  })\n  var sessionExpireSubscription = sessionExpireObservable.subscribe(\n    function () {\n      return flush('session_expire')\n    }\n  )\n  var flushObservable = new Observable(function () {\n    return function () {\n      pageExitSubscription.unsubscribe()\n      sessionExpireSubscription.unsubscribe()\n    }\n  })\n\n  var currentBytesCount = 0\n  var currentMessagesCount = 0\n\n  function flush(flushReason) {\n    if (currentMessagesCount === 0) {\n      return\n    }\n\n    var messagesCount = currentMessagesCount\n    var bytesCount = currentBytesCount\n\n    currentMessagesCount = 0\n    currentBytesCount = 0\n    cancelDurationLimitTimeout()\n\n    flushObservable.notify({\n      reason: flushReason,\n      messagesCount: messagesCount,\n      bytesCount: bytesCount\n    })\n  }\n\n  var durationLimitTimeoutId\n  function scheduleDurationLimitTimeout() {\n    if (durationLimitTimeoutId === undefined) {\n      durationLimitTimeoutId = setTimeout(function () {\n        flush('duration_limit')\n      }, durationLimit)\n    }\n  }\n\n  function cancelDurationLimitTimeout() {\n    clearTimeout(durationLimitTimeoutId)\n    durationLimitTimeoutId = undefined\n  }\n\n  return {\n    flushObservable: flushObservable,\n    getMessagesCount: function () {\n      return currentMessagesCount\n    },\n\n    /**\n     * Notifies that a message will be added to a pool of pending messages waiting to be flushed.\n     *\n     * This function needs to be called synchronously, right before adding the message, so no flush\n     * event can happen after `notifyBeforeAddMessage` and before adding the message.\n     */\n    notifyBeforeAddMessage: function (estimatedMessageBytesCount) {\n      if (currentBytesCount + estimatedMessageBytesCount >= bytesLimit) {\n        flush('bytes_limit')\n      }\n      // Consider the message to be added now rather than in `notifyAfterAddMessage`, because if no\n      // message was added yet and `notifyAfterAddMessage` is called asynchronously, we still want\n      // to notify when a flush is needed (for example on page exit).\n      currentMessagesCount += 1\n      currentBytesCount += estimatedMessageBytesCount\n      scheduleDurationLimitTimeout()\n    },\n\n    /**\n     * Notifies that a message *was* added to a pool of pending messages waiting to be flushed.\n     *\n     * This function can be called asynchronously after the message was added, but in this case it\n     * should not be called if a flush event occurred in between.\n     */\n    notifyAfterAddMessage: function (messageBytesCountDiff) {\n      if (messageBytesCountDiff === undefined) {\n        messageBytesCountDiff = 0\n      }\n      currentBytesCount += messageBytesCountDiff\n\n      if (currentMessagesCount >= messagesLimit) {\n        flush('messages_limit')\n      } else if (currentBytesCount >= bytesLimit) {\n        flush('bytes_limit')\n      }\n    },\n\n    /**\n     * Notifies that a message was removed from a pool of pending messages waiting to be flushed.\n     *\n     * This function needs to be called synchronously, right after removing the message, so no flush\n     * event can happen after removing the message and before `notifyAfterRemoveMessage`.\n     *\n     * @param messageBytesCount: the message bytes count that was added to the pool. Should\n     * correspond to the sum of bytes counts passed to `notifyBeforeAddMessage` and\n     * `notifyAfterAddMessage`.\n     */\n    notifyAfterRemoveMessage: function (messageBytesCount) {\n      currentBytesCount -= messageBytesCount\n      currentMessagesCount -= 1\n      if (currentMessagesCount === 0) {\n        cancelDurationLimitTimeout()\n      }\n    }\n  }\n}\n"],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudcare/browser-core",
-    "version": "3.2.39",
+    "version": "3.2.40",
     "main": "cjs/index.js",
     "module": "esm/index.js",
     "types": "types/index.d.ts",
@@ -15,11 +15,11 @@
         "sdk"
     ],
     "repository": {
-        "url": "https://github.com/DataFlux-cn/datakit-js",
+        "url": "https://github.com/GuanceCloud/datakit-js",
         "type": "git",
         "directory": "packages/core"
     },
     "author": "dataflux",
     "license": "MIT",
-    "gitHead": "bb05ce75b0853226ead81fc8f0a9e31ac722a6a5"
+    "gitHead": "73b515d510f5195a7d748a767c5b6685bab67606"
 }

package/src/browser/xhrObservable.js

@@ -28,7 +28,11 @@ function createXhrObservable() {
       },
       { computeHandlingStack: true }
     )
-
+    var setRequestHeaderInstrumentMethod = instrumentMethod(
+      XMLHttpRequest.prototype,
+      'setRequestHeader',
+      setRequestHeaderXhr
+    )
     var abortInstrumentMethod = instrumentMethod(
       XMLHttpRequest.prototype,
       'abort',
@@ -39,6 +43,7 @@ function createXhrObservable() {
       openInstrumentMethod.stop()
       sendInstrumentMethod.stop()
       abortInstrumentMethod.stop()
+      setRequestHeaderInstrumentMethod.stop()
     }
   })
 }
@@ -53,7 +58,17 @@ function openXhr(params) {
     url: normalizeUrl(String(url))
   })
 }
-
+function setRequestHeaderXhr(params) {
+  var xhr = params.target
+  var headerKey = params.parameters[0]
+  var headerValue = params.parameters[1]
+  var context = xhrContexts.get(xhr)
+  if (context && headerKey) {
+    var requestHeaderContexts = context.requestHeaderContexts || {}
+    requestHeaderContexts[headerKey] = headerValue
+    context.requestHeaderContexts = requestHeaderContexts
+  }
+}
 function sendXhr(params, observable) {
   var xhr = params.target
   var handlingStack = params.handlingStack

package/src/configuration/remoteConfiguration.js

@@ -5,7 +5,8 @@ import { objectEntries, getType } from '../helper/tools'
 export function fetchAndApplyRemoteConfiguration(initConfiguration, callback) {
   fetchRemoteConfiguration(initConfiguration, (remoteInitConfiguration) => {
     callback(
-      applyRemoteConfiguration(initConfiguration, remoteInitConfiguration)
+      applyRemoteConfiguration(initConfiguration, remoteInitConfiguration),
+      getSimpleRemoteConfiguration(initConfiguration, remoteInitConfiguration)
     )
   })
 }
@@ -48,7 +49,7 @@ function modificationByFieldsPath(remoteConfiguration, modifiableFieldPaths) {
   })
   return result
 }
-export function applyRemoteConfiguration(
+export function getSimpleRemoteConfiguration(
   initConfiguration,
   remoteInitConfiguration
 ) {
@@ -70,6 +71,16 @@ export function applyRemoteConfiguration(
       simpleRemoteInitConfiguration[simpleKey] = remoteInitConfiguration[key]
     }
   }
+  return simpleRemoteInitConfiguration
+}
+export function applyRemoteConfiguration(
+  initConfiguration,
+  remoteInitConfiguration
+) {
+  const simpleRemoteInitConfiguration = getSimpleRemoteConfiguration(
+    initConfiguration,
+    remoteInitConfiguration
+  )
   return {
     ...initConfiguration,
     ...modificationByFieldsPath(

package/src/dataMap.js

@@ -12,6 +12,7 @@ export var commonTags = {
   user_name: 'user.name',
   session_id: 'session.id',
   session_type: 'session.type',
+  session_is_forced: 'session.is_forced_session',
   session_sampling: 'session.is_sampling',
   is_signin: 'user.is_signin',
   os: 'device.os',
@@ -24,6 +25,7 @@ export var commonTags = {
   network_type: 'device.network_type',
   time_zone: 'device.time_zone',
   device: 'device.device',
+  user_agent: 'device.user_agent',
   view_id: 'view.id',
   view_referrer: 'view.referrer',
   view_url: 'view.url',

package/src/helper/deviceInfo.js

@@ -601,7 +601,8 @@ if (typeof window !== 'undefined') {
     screenSize: window.screen.width + '*' + window.screen.height,
     networkType: MethodLibrary.getNetwork(),
     device: MethodLibrary.getDeviceType(),
-    timeZone: MethodLibrary.getTimeZone()
+    timeZone: MethodLibrary.getTimeZone(),
+    userAgent: VariableLibrary.navigator.userAgent || ''
   }
 }
 export var deviceInfo = _deviceInfo

package/src/index.js

@@ -46,7 +46,8 @@ export {
 export {
   SESSION_TIME_OUT_DELAY,
   SESSION_STORE_KEY,
-  SessionPersistence
+  SessionPersistence,
+  SESSION_NOT_TRACKED
 } from './session/sessionConstants'
 export { STORAGE_POLL_DELAY } from './session/sessionStore'
 export * from './transport'

package/src/session/sessionConstants.js

@@ -2,6 +2,7 @@ import { ONE_HOUR, ONE_MINUTE } from '../helper/tools'
 export var SESSION_TIME_OUT_DELAY = 4 * ONE_HOUR
 export var SESSION_EXPIRATION_DELAY = 15 * ONE_MINUTE
 export var SESSION_STORE_KEY = '_gc_s'
+export const SESSION_NOT_TRACKED = '0'
 export const SessionPersistence = {
   COOKIE: 'cookie',
   LOCAL_STORAGE: 'local-storage'

package/src/session/sessionManagement.js

@@ -7,7 +7,7 @@ import {
   addEventListeners
 } from '../browser/addEventListener'
 import { clearInterval, setInterval } from '../helper/timer'
-import { SESSION_TIME_OUT_DELAY } from './sessionConstants'
+import { SESSION_TIME_OUT_DELAY, SESSION_NOT_TRACKED } from './sessionConstants'
 import { startSessionStore } from './sessionStore'
 
 export const VISIBILITY_CHECK_DELAY = ONE_MINUTE
@@ -62,10 +62,20 @@ export function startSessionManager(
   })
 
   function buildSessionContext() {
+    const session = sessionStore.getSession()
+    if (!session) {
+      return {
+        id: 'invalid',
+        trackingType: SESSION_NOT_TRACKED,
+        isSessionForced: false,
+        hasError: false
+      }
+    }
     return {
-      id: sessionStore.getSession().id,
-      trackingType: sessionStore.getSession()[productKey],
-      hasError: !!sessionStore.getSession().hasError
+      id: session.id,
+      trackingType: session[productKey],
+      hasError: !!session.hasError,
+      isSessionForced: !!session.forcedSession
     }
   }
 

package/src/session/sessionStore.js

@@ -225,7 +225,7 @@ export function startSessionStore(
     expandOrRenewSession: throttledExpandOrRenewSession,
     expandSession,
     getSession: function () {
-      return sessionCache || {}
+      return sessionCache
     },
     renewObservable,
     expireObservable,

package/src/transport/flushController.js

@@ -15,12 +15,14 @@ export function createFlushController({
   pageExitObservable,
   sessionExpireObservable
 }) {
-  pageExitObservable.subscribe(function (event) {
+  var pageExitSubscription = pageExitObservable.subscribe(function (event) {
     return flush(event.reason)
   })
-  sessionExpireObservable.subscribe(function () {
-    return flush('session_expire')
-  })
+  var sessionExpireSubscription = sessionExpireObservable.subscribe(
+    function () {
+      return flush('session_expire')
+    }
+  )
   var flushObservable = new Observable(function () {
     return function () {
       pageExitSubscription.unsubscribe()