@cloudcare/browser-core 2.0.17 → 3.0.22

package/esm/helper/serialisation/jsonStringify.js

@@ -1,3 +1,5 @@
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
 import { noop } from '../tools';
 /**
  * Custom implementation of JSON.stringify that ignores some toJSON methods. We need to do that
@@ -9,7 +11,7 @@ import { noop } from '../tools';
  */
 
 export function jsonStringify(value, replacer, space) {
-  if (typeof value !== 'object' || value === null) {
+  if (_typeof(value) !== 'object' || value === null) {
     return JSON.stringify(value);
   } // Note: The order matter here. We need to detach toJSON methods on parent classes before their
   // subclasses.
@@ -37,7 +39,7 @@ export function detachToJsonMethod(value) {
 
   if (objectToJson) {
     delete object.toJSON;
-    return () => {
+    return function () {
       object.toJSON = objectToJson;
     };
   }

package/esm/helper/serialisation/rowData.js

@@ -1,7 +1,9 @@
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
 import { jsonStringify } from './jsonStringify';
 import { isString } from '../tools';
 export function escapeRowData(str) {
-  if (typeof str === 'object' && str) {
+  if (_typeof(str) === 'object' && str) {
     str = jsonStringify(str);
   } else if (!isString(str)) {
     return str;
@@ -23,7 +25,7 @@ export function escapeFieldValueStr(str) {
   return '"' + str.replace(/\\/g, '\\\\').replace(/"/g, '\\"') + '"';
 }
 export function escapeRowField(value) {
-  if (typeof value === 'object' && value) {
+  if (_typeof(value) === 'object' && value) {
     return escapeFieldValueStr(jsonStringify(value));
   } else if (isString(value)) {
     return escapeFieldValueStr(value);

package/esm/helper/tools.js

@@ -1,3 +1,5 @@
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
 import { display } from './display';
 import { setTimeout, clearTimeout } from './timer';
 var ArrayProto = Array.prototype;
@@ -6,9 +8,7 @@ var ObjProto = Object.prototype;
 var slice = ArrayProto.slice;
 var toString = ObjProto.toString;
 var hasOwnProperty = ObjProto.hasOwnProperty;
-var nativeBind = FuncProto.bind;
 var nativeForEach = ArrayProto.forEach;
-var nativeIndexOf = ArrayProto.indexOf;
 var nativeIsArray = Array.isArray;
 var breaker = false;
 export var each = function each(obj, iterator, context) {
@@ -272,7 +272,7 @@ export var cssEscape = function cssEscape(str) {
     if (asCodePoint) {
       // U+0000 NULL becomes U+FFFD REPLACEMENT CHARACTER
       if (ch === '\0') {
-        return '\uFFFD';
+        return "\uFFFD";
       } // Control characters and (dependent upon position) numbers get escaped as code points
 
 
@@ -445,15 +445,15 @@ export var hashCode = function hashCode(str) {
   }
 
   var hash = 0;
-  var char = null;
+  var _char = null;
 
   if (str.length == 0) {
     return hash;
   }
 
   for (var i = 0; i < str.length; i++) {
-    char = str.charCodeAt(i);
-    hash = (hash << 5) - hash + char;
+    _char = str.charCodeAt(i);
+    hash = (hash << 5) - hash + _char;
     hash = hash & hash;
   }
 
@@ -689,7 +689,7 @@ export var urlParse = function urlParse(para) {
   };
 
   URLParser.prototype.addQueryString = function (queryObj) {
-    if (typeof queryObj !== 'object') {
+    if (_typeof(queryObj) !== 'object') {
       return false;
     }
 
@@ -944,7 +944,7 @@ export var ajax = function ajax(para) {
   }, para);
 
   try {
-    if (typeof g === 'object' && 'timeout' in g) {
+    if (_typeof(g) === 'object' && 'timeout' in g) {
       g.timeout = para.timeout;
     } else {
       setTimeout(function () {
@@ -1134,7 +1134,7 @@ export function getType(value) {
     return 'array';
   }
 
-  return typeof value;
+  return _typeof(value);
 }
 /**
  * Iterate over source and affect its sub values into destination, recursively.
@@ -1151,7 +1151,7 @@ export function mergeInto(destination, source, circularReferenceChecker) {
     return destination;
   }
 
-  if (typeof source !== 'object' || source === null) {
+  if (_typeof(source) !== 'object' || source === null) {
     // primitive values - just return source
     return source;
   } else if (source instanceof Date) {
@@ -1360,7 +1360,7 @@ export var strip_sa_properties = function strip_sa_properties(p) {
   return p;
 };
 export var searchConfigData = function searchConfigData(data) {
-  if (typeof data === 'object' && data.$option) {
+  if (_typeof(data) === 'object' && data.$option) {
     var data_config = data.$option;
     delete data.$option;
     return data_config;
@@ -1646,7 +1646,7 @@ export function deepSnakeCase(candidate) {
     });
   }
 
-  if (typeof candidate === 'object' && candidate !== null) {
+  if (_typeof(candidate) === 'object' && candidate !== null) {
     return withSnakeCaseKeys(candidate);
   }
 

package/esm/init.js

@@ -1,3 +1,5 @@
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
 import { extend, each } from './helper/tools';
 export function makeGlobal(stub) {
   var global = extend({}, stub, {
@@ -34,27 +36,27 @@ export function defineGlobal(global, name, api) {
   }
 }
 export function getGlobalObject() {
-  if (typeof globalThis === 'object') {
+  if ((typeof globalThis === "undefined" ? "undefined" : _typeof(globalThis)) === 'object') {
     return globalThis;
   }
 
-  Object.defineProperty(Object.prototype, '_dd_temp_', {
+  Object.defineProperty(Object.prototype, '_gc_temp_', {
     get: function get() {
       return this;
     },
     configurable: true
   }); // @ts-ignore
 
-  var globalObject = _dd_temp_; // @ts-ignore
+  var globalObject = _gc_temp_; // @ts-ignore
 
-  delete Object.prototype._dd_temp_;
+  delete Object.prototype._gc_temp_;
 
-  if (typeof globalObject !== 'object') {
-    // on safari _dd_temp_ is available on window but not globally
+  if (_typeof(globalObject) !== 'object') {
+    // on safari _gc_temp_ is available on window but not globally
     // fallback on other browser globals check
-    if (typeof self === 'object') {
+    if ((typeof self === "undefined" ? "undefined" : _typeof(self)) === 'object') {
       globalObject = self;
-    } else if (typeof window === 'object') {
+    } else if ((typeof window === "undefined" ? "undefined" : _typeof(window)) === 'object') {
       globalObject = window;
     } else {
       globalObject = {};

package/esm/tracekit/computeStackTrace.js

@@ -1,3 +1,5 @@
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
 import { each } from '../helper/tools';
 var UNKNOWN_FUNCTION = '?';
 /**
@@ -130,7 +132,7 @@ function parseGeckoLine(line) {
 }
 
 function tryToGetString(candidate, property) {
-  if (typeof candidate !== 'object' || !candidate || !(property in candidate)) {
+  if (_typeof(candidate) !== 'object' || !candidate || !(property in candidate)) {
     return undefined;
   }
 

package/esm/tracekit/tracekit.js

@@ -1,7 +1,8 @@
 import { instrumentMethodAndCallOriginal } from '../helper/instrumentMethod';
+import { isNullUndefinedDefaultValue } from '../helper/tools';
 import { computeStackTrace } from './computeStackTrace'; // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error#Error_types
 
-var ERROR_TYPES_RE = /^(?:[Uu]ncaught (?:exception: )?)?(?:((?:Eval|Internal|Range|Reference|Syntax|Type|URI|)Error): )?(.*)$/;
+var ERROR_TYPES_RE = /^(?:[Uu]ncaught (?:exception: )?)?(?:((?:Eval|Internal|Range|Reference|Syntax|Type|URI|)Error): )?([\s\S]*)$/;
 /**
  * Cross-browser collection of unhandled errors
  *
@@ -53,40 +54,48 @@ export function startUnhandledErrorCollection(callback) {
 
 function instrumentOnError(callback) {
   return instrumentMethodAndCallOriginal(window, 'onerror', {
-    before: function before(message, url, lineNo, columnNo, errorObj) {
-      var stack;
+    before: function before(messageObj, url, line, column, errorObj) {
+      var stackTrace;
 
-      if (errorObj) {
-        stack = computeStackTrace(errorObj);
-        callback(stack, errorObj);
+      if (errorObj instanceof Error) {
+        stackTrace = computeStackTrace(errorObj);
       } else {
         var location = {
           url: url,
-          column: columnNo,
-          line: lineNo
+          column: column,
+          line: line
         };
-        var name;
-        var msg = message;
-
-        if ({}.toString.call(message) === '[object String]') {
-          var groups = ERROR_TYPES_RE.exec(msg);
-
-          if (groups) {
-            name = groups[1];
-            msg = groups[2];
-          }
-        }
-
-        stack = {
-          name: name,
-          message: typeof msg === 'string' ? msg : undefined,
+        var parse = tryToParseMessage(messageObj);
+        stackTrace = {
+          name: parse.name,
+          message: parse.message,
           stack: [location]
         };
-        callback(stack, message);
       }
+
+      callback(stackTrace, isNullUndefinedDefaultValue(errorObj, messageObj));
     }
   });
 }
+
+function tryToParseMessage(messageObj) {
+  var name;
+  var message;
+
+  if ({}.toString.call(messageObj) === '[object String]') {
+    var groups = ERROR_TYPES_RE.exec(messageObj);
+
+    if (groups) {
+      name = groups[1];
+      message = groups[2];
+    }
+  }
+
+  return {
+    name: name,
+    message: message
+  };
+}
 /**
  * Install a global onunhandledrejection handler
  */

package/esm/transport/eventBridge.js

@@ -0,0 +1,26 @@
+import { getGlobalObject } from '../init';
+
+function getEventBridgeGlobal() {
+  return getGlobalObject().FTWebViewJavascriptBridge;
+}
+
+export function getEventBridge() {
+  var eventBridgeGlobal = getEventBridgeGlobal();
+
+  if (!eventBridgeGlobal) {
+    return;
+  }
+
+  return {
+    send: function send(eventType, event) {
+      eventBridgeGlobal.sendEvent(JSON.stringify({
+        name: eventType,
+        data: event
+      }));
+    }
+  };
+}
+export function canUseEventBridge() {
+  var bridge = getEventBridge();
+  return !!bridge;
+}

package/esm/transport/flushController.js

@@ -8,13 +8,11 @@ import { clearTimeout, setTimeout } from '../helper/timer'; // type FlushReason
  */
 
 export function createFlushController(_ref) {
-  var {
-    messagesLimit,
-    bytesLimit,
-    durationLimit,
-    pageExitObservable,
-    sessionExpireObservable
-  } = _ref;
+  var messagesLimit = _ref.messagesLimit,
+      bytesLimit = _ref.bytesLimit,
+      durationLimit = _ref.durationLimit,
+      pageExitObservable = _ref.pageExitObservable,
+      sessionExpireObservable = _ref.sessionExpireObservable;
   var flushObservable = new Observable();
   pageExitObservable.subscribe(function (event) {
     return flush(event.reason);

package/esm/transport/httpRequest.js

@@ -23,7 +23,7 @@ export function createHttpRequest(endpointUrl, bytesLimit, reportError) {
 
   return {
     send: function send(payload) {
-      sendWithRetryStrategy(payload, retryState, sendStrategyForRetry, reportError);
+      sendWithRetryStrategy(payload, retryState, sendStrategyForRetry, endpointUrl, reportError);
     },
 
     /**

package/esm/transport/index.js

@@ -1,4 +1,5 @@
 export { createHttpRequest } from './httpRequest';
-export { Batch } from './batch';
+export { Batch, processedMessageByDataMap } from './batch';
 export { startBatchWithReplica } from './startBatchWithReplica';
-export { createFlushController } from './flushController';
+export { createFlushController } from './flushController';
+export { getEventBridge, canUseEventBridge } from './eventBridge';

package/esm/transport/sendWithRetryStrategy.js

@@ -16,15 +16,15 @@ var RetryReason = {
   AFTER_SUCCESS: 0,
   AFTER_RESUME: 1
 };
-export function sendWithRetryStrategy(payload, state, sendStrategy, reportError) {
+export function sendWithRetryStrategy(payload, state, sendStrategy, endpointUrl, reportError) {
   if (state.transportStatus === TransportStatus.UP && state.queuedPayloads.size() === 0 && state.bandwidthMonitor.canHandle(payload)) {
     send(payload, state, sendStrategy, {
       onSuccess: function onSuccess() {
-        return retryQueuedPayloads(RetryReason.AFTER_SUCCESS, state, sendStrategy, reportError);
+        return retryQueuedPayloads(RetryReason.AFTER_SUCCESS, state, sendStrategy, endpointUrl, reportError);
       },
       onFailure: function onFailure() {
         state.queuedPayloads.enqueue(payload);
-        scheduleRetry(state, sendStrategy, reportError);
+        scheduleRetry(state, sendStrategy, endpointUrl, reportError);
       }
     });
   } else {
@@ -32,7 +32,7 @@ export function sendWithRetryStrategy(payload, state, sendStrategy, reportError)
   }
 }
 
-function scheduleRetry(state, sendStrategy, reportError) {
+function scheduleRetry(state, sendStrategy, endpointUrl, reportError) {
   if (state.transportStatus !== TransportStatus.DOWN) {
     return;
   }
@@ -48,11 +48,11 @@ function scheduleRetry(state, sendStrategy, reportError) {
         // }
 
         state.currentBackoffTime = INITIAL_BACKOFF_TIME;
-        retryQueuedPayloads(RetryReason.AFTER_RESUME, state, sendStrategy, reportError);
+        retryQueuedPayloads(RetryReason.AFTER_RESUME, state, sendStrategy, endpointUrl, reportError);
       },
       onFailure: function onFailure() {
         state.currentBackoffTime = Math.min(MAX_BACKOFF_TIME, state.currentBackoffTime * 2);
-        scheduleRetry(state, sendStrategy, reportError);
+        scheduleRetry(state, sendStrategy, endpointUrl, reportError);
       }
     });
   }, state.currentBackoffTime);
@@ -77,10 +77,10 @@ function send(payload, state, sendStrategy, responseData) {
   });
 }
 
-function retryQueuedPayloads(reason, state, sendStrategy, reportError) {
+function retryQueuedPayloads(reason, state, sendStrategy, endpointUrl, reportError) {
   if (reason === RetryReason.AFTER_SUCCESS && state.queuedPayloads.isFull() && !state.queueFullReported) {
     reportError({
-      message: 'Reached max events size queued for upload: ' + MAX_QUEUE_BYTES_COUNT / ONE_MEBI_BYTE + 'MiB',
+      message: 'Reached max ' + endpointUrl + ' events size queued for upload: ' + MAX_QUEUE_BYTES_COUNT / ONE_MEBI_BYTE + 'MiB',
       source: ErrorSource.AGENT,
       startClocks: clocksNow()
     });
@@ -91,7 +91,7 @@ function retryQueuedPayloads(reason, state, sendStrategy, reportError) {
   state.queuedPayloads = newPayloadQueue();
 
   while (previousQueue.size() > 0) {
-    sendWithRetryStrategy(previousQueue.dequeue(), state, sendStrategy, reportError);
+    sendWithRetryStrategy(previousQueue.dequeue(), state, sendStrategy, endpointUrl, reportError);
   }
 }
 

package/esm/user/user.js

@@ -3,7 +3,6 @@ import { assign, getType, each } from '../helper/tools';
 /**
  * Clone input data and ensure known user properties (id, name, email)
  * are strings, as defined here:
- * https://docs.datadoghq.com/logs/log_configuration/attributes_naming_convention/#user-related-attributes
  */
 
 export function sanitizeUser(newUser) {

package/esm/worker.js

@@ -0,0 +1 @@
+export { concatBuffers } from './helper/byteUtils';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudcare/browser-core",
-    "version": "2.0.17",
+    "version": "3.0.22",
     "main": "cjs/index.js",
     "module": "esm/index.js",
     "scripts": {
@@ -20,5 +20,5 @@
     "author": "dataflux",
     "license": "MIT",
     "description": "DataFlux RUM Web 端数据指标监控",
-    "gitHead": "ea5e097ee7a211e948b0766be016b50d671e4724"
+    "gitHead": "c42f3cdce8c9f1af6ac6bec06c7a7e83a9638467"
 }

package/src/dataMap.js

@@ -68,6 +68,7 @@ export var dataMap = {
       dom: 'view.dom',
       dom_ready: 'view.dom_ready',
       time_spent: 'view.time_spent',
+      first_byte: 'view.first_byte',
       in_foreground_periods: 'view.in_foreground_periods',
       frustration_count: 'view.frustration.count'
     }

package/src/helper/byteUtils.js

@@ -15,3 +15,15 @@ export function computeBytesCount(candidate) {
 
   return new Blob([candidate]).size
 }
+export function concatBuffers(buffers) {
+  var length = buffers.reduce(function (total, buffer) {
+    return total + buffer.length
+  }, 0)
+  var result = new Uint8Array(length)
+  var offset = 0
+  for (var buffer of buffers) {
+    result.set(buffer, offset)
+    offset += buffer.length
+  }
+  return result
+}

package/src/helper/deviceInfo.js

@@ -1,6 +1,9 @@
 import { display } from '../helper/display'
 var VariableLibrary = {
-  navigator: typeof window.navigator != 'undefined' ? window.navigator : {},
+  navigator:
+    typeof window !== 'undefined' && typeof window.navigator != 'undefined'
+      ? window.navigator
+      : {},
   // 信息map
   infoMap: {
     engine: ['WebKit', 'Trident', 'Gecko', 'Presto'],
@@ -154,7 +157,7 @@ var MethodLibrary = {
   },
   // 在信息map和匹配库中进行匹配
   matchInfoMap: function (_this) {
-    var u = VariableLibrary.navigator.userAgent || {}
+    var u = VariableLibrary.navigator.userAgent || ''
     var match = MethodLibrary.getMatchMap(u)
     for (var s in VariableLibrary.infoMap) {
       for (var i = 0; i < VariableLibrary.infoMap[s].length; i++) {
@@ -174,7 +177,7 @@ var MethodLibrary = {
   // 获取操作系统版本
   getOSVersion: function () {
     var _this = this
-    var u = VariableLibrary.navigator.userAgent || {}
+    var u = VariableLibrary.navigator.userAgent || ''
     _this.osVersion = ''
     _this.osMajor = ''
     // 系统版本信息
@@ -293,7 +296,8 @@ var MethodLibrary = {
     _this.language = (function () {
       var language =
         VariableLibrary.navigator.browserLanguage ||
-        VariableLibrary.navigator.language
+        VariableLibrary.navigator.language ||
+        ''
       var arr = language.split('-')
       if (arr[1]) {
         arr[1] = arr[1].toUpperCase()
@@ -307,7 +311,7 @@ var MethodLibrary = {
     var _this = this
     MethodLibrary.matchInfoMap(_this)
 
-    var u = VariableLibrary.navigator.userAgent || {}
+    var u = VariableLibrary.navigator.userAgent || ''
 
     var _mime = function (option, value) {
       var mimeTypes = VariableLibrary.navigator.mimeTypes
@@ -322,7 +326,7 @@ var MethodLibrary = {
     var match = MethodLibrary.getMatchMap(u)
 
     var is360 = false
-    if (window.chrome) {
+    if (typeof window !== 'undefined' && window.chrome) {
       var chrome_version = u.replace(/^.*Chrome\/([\d]+).*$/, '$1')
       if (chrome_version > 36 && window.showModalDialog) {
         is360 = true
@@ -602,15 +606,18 @@ var MethodLibrary = {
       )
   }
 }
-
-export var deviceInfo = {
-  os: MethodLibrary.getOS(),
-  osVersion: MethodLibrary.getOSVersion().version,
-  osVersionMajor: MethodLibrary.getOSVersion().osMajor,
-  browser: MethodLibrary.getBrowserInfo().browser,
-  browserVersion: MethodLibrary.getBrowserInfo().browserVersion,
-  browserVersionMajor: MethodLibrary.getBrowserInfo().browserMajor,
-  screenSize: window.screen.width + '*' + window.screen.height,
-  networkType: MethodLibrary.getNetwork(),
-  divice: MethodLibrary.getDeviceType()
+var _deviceInfo = {}
+if (typeof window !== 'undefined') {
+  _deviceInfo = {
+    os: MethodLibrary.getOS(),
+    osVersion: MethodLibrary.getOSVersion().version,
+    osVersionMajor: MethodLibrary.getOSVersion().osMajor,
+    browser: MethodLibrary.getBrowserInfo().browser,
+    browserVersion: MethodLibrary.getBrowserInfo().browserVersion,
+    browserVersionMajor: MethodLibrary.getBrowserInfo().browserMajor,
+    screenSize: window.screen.width + '*' + window.screen.height,
+    networkType: MethodLibrary.getNetwork(),
+    divice: MethodLibrary.getDeviceType()
+  }
 }
+export var deviceInfo = _deviceInfo

package/src/helper/tools.js

@@ -6,9 +6,7 @@ var ObjProto = Object.prototype
 var slice = ArrayProto.slice
 var toString = ObjProto.toString
 var hasOwnProperty = ObjProto.hasOwnProperty
-var nativeBind = FuncProto.bind
 var nativeForEach = ArrayProto.forEach
-var nativeIndexOf = ArrayProto.indexOf
 var nativeIsArray = Array.isArray
 var breaker = false
 export var each = function (obj, iterator, context) {

package/src/init.js

@@ -39,18 +39,18 @@ export function getGlobalObject() {
   if (typeof globalThis === 'object') {
     return globalThis
   }
-  Object.defineProperty(Object.prototype, '_dd_temp_', {
+  Object.defineProperty(Object.prototype, '_gc_temp_', {
     get: function () {
       return this
     },
     configurable: true
   })
   // @ts-ignore
-  var globalObject = _dd_temp_
+  var globalObject = _gc_temp_
   // @ts-ignore
-  delete Object.prototype._dd_temp_
+  delete Object.prototype._gc_temp_
   if (typeof globalObject !== 'object') {
-    // on safari _dd_temp_ is available on window but not globally
+    // on safari _gc_temp_ is available on window but not globally
     // fallback on other browser globals check
     if (typeof self === 'object') {
       globalObject = self