@cloudcare/browser-core 3.1.1 → 3.1.3

package/src/helper/serialisation/storedContextManager.js

@@ -0,0 +1,56 @@
+import { computeBytesCount } from '../byteUtils'
+import { DOM_EVENT } from '../enums'
+import { map } from '../tools'
+import { addEventListener } from '../../browser/addEventListener'
+import { createContextManager } from './contextManager'
+var CONTEXT_STORE_KEY_PREFIX = '_gc_s'
+
+var storageListeners = []
+
+export function createStoredContextManager(
+  productKey,
+  customerDataType,
+  computeBytesCountImpl
+) {
+  if (computeBytesCountImpl === undefined) {
+    computeBytesCountImpl = computeBytesCount
+  }
+  var storageKey = buildStorageKey(productKey, customerDataType)
+  var contextManager = createContextManager(
+    customerDataType,
+    computeBytesCountImpl
+  )
+
+  synchronizeWithStorage()
+  storageListeners.push(
+    addEventListener(window, DOM_EVENT.STORAGE, function (params) {
+      if (storageKey === params.key) {
+        synchronizeWithStorage()
+      }
+    })
+  )
+  contextManager.changeObservable.subscribe(dumpToStorage)
+  function synchronizeWithStorage() {
+    var rawContext = localStorage.getItem(storageKey)
+    var context = rawContext !== null ? JSON.parse(rawContext) : {}
+    contextManager.setContext(context)
+  }
+
+  function dumpToStorage() {
+    localStorage.setItem(
+      storageKey,
+      JSON.stringify(contextManager.getContext())
+    )
+  }
+  return contextManager
+}
+
+export function buildStorageKey(productKey, customerDataType) {
+  return CONTEXT_STORE_KEY_PREFIX + '_' + productKey + '_' + customerDataType
+}
+
+export function removeStorageListeners() {
+  map(storageListeners, function (listener) {
+    listener.stop()
+  })
+}

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
@@ -1594,14 +1595,28 @@ export function getLocationOrigin() {
   return getLinkElementOrigin(window.location)
 }
 
+var browserIsIE
 export function isIE() {
-  return Boolean(document.documentMode)
+  if (browserIsIE === undefined) {
+    browserIsIE = Boolean(document.documentMode)
+  }
+  return browserIsIE
 }
-
+var browserIsChromium
 export function isChromium() {
-  return !!window.chrome || /HeadlessChrome/.test(window.navigator.userAgent)
+  if (browserIsChromium === undefined) {
+    browserIsChromium =
+      !!window.chrome || /HeadlessChrome/.test(window.navigator.userAgent)
+  }
+  return browserIsChromium
+}
+var browserIsSafari
+export function isSafari() {
+  if (browserIsSafari === undefined) {
+    browserIsSafari = /^((?!chrome|android).)*safari/i.test(navigator.userAgent)
+  }
+  return browserIsSafari
 }
-
 /**
  * IE fallback
  * https://developer.mozilla.org/en-US/docs/Web/API/HTMLHyperlinkElementUtils/origin

package/src/index.js

@@ -47,6 +47,7 @@ export * from './helper/serialisation/contextManager'
 export * from './helper/serialisation/heavyCustomerDataWarning'
 export * from './helper/serialisation/jsonStringify'
 export * from './helper/serialisation/rowData'
+export * from './helper/serialisation/storedContextManager'
 export * from './user'
 
 export * from './telemetry/telemetry'

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
     )
   }