@cloudcare/browser-core 2.0.17 → 2.0.18

package/cjs/init.js

@@ -54,19 +54,19 @@ function getGlobalObject() {
     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
+    // on safari _gc_temp_ is available on window but not globally
     // fallback on other browser globals check
     if ((typeof self === "undefined" ? "undefined" : _typeof(self)) === 'object') {
       globalObject = self;

package/cjs/tracekit/tracekit.js

@@ -7,10 +7,12 @@ exports.startUnhandledErrorCollection = startUnhandledErrorCollection;
 
 var _instrumentMethod = require("../helper/instrumentMethod");
 
+var _tools = require("../helper/tools");
+
 var _computeStackTrace = require("./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
  *
@@ -63,40 +65,48 @@ function startUnhandledErrorCollection(callback) {
 
 function instrumentOnError(callback) {
   return (0, _instrumentMethod.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 = (0, _computeStackTrace.computeStackTrace)(errorObj);
-        callback(stack, errorObj);
+      if (errorObj instanceof Error) {
+        stackTrace = (0, _computeStackTrace.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, (0, _tools.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/cjs/transport/eventBridge.js

@@ -0,0 +1,35 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.canUseEventBridge = canUseEventBridge;
+exports.getEventBridge = getEventBridge;
+
+var _init = require("../init");
+
+function getEventBridgeGlobal() {
+  return (0, _init.getGlobalObject)().FTWebViewJavascriptBridge;
+}
+
+function getEventBridge() {
+  var eventBridgeGlobal = getEventBridgeGlobal();
+
+  if (!eventBridgeGlobal) {
+    return;
+  }
+
+  return {
+    send: function send(eventType, event) {
+      eventBridgeGlobal.sendEvent(JSON.stringify({
+        name: eventType,
+        data: event
+      }));
+    }
+  };
+}
+
+function canUseEventBridge() {
+  var bridge = getEventBridge();
+  return !!bridge;
+}

package/cjs/transport/index.js

@@ -9,6 +9,12 @@ Object.defineProperty(exports, "Batch", {
     return _batch.Batch;
   }
 });
+Object.defineProperty(exports, "canUseEventBridge", {
+  enumerable: true,
+  get: function get() {
+    return _eventBridge.canUseEventBridge;
+  }
+});
 Object.defineProperty(exports, "createFlushController", {
   enumerable: true,
   get: function get() {
@@ -21,6 +27,18 @@ Object.defineProperty(exports, "createHttpRequest", {
     return _httpRequest.createHttpRequest;
   }
 });
+Object.defineProperty(exports, "getEventBridge", {
+  enumerable: true,
+  get: function get() {
+    return _eventBridge.getEventBridge;
+  }
+});
+Object.defineProperty(exports, "processedMessageByDataMap", {
+  enumerable: true,
+  get: function get() {
+    return _batch.processedMessageByDataMap;
+  }
+});
 Object.defineProperty(exports, "startBatchWithReplica", {
   enumerable: true,
   get: function get() {
@@ -34,4 +52,6 @@ var _batch = require("./batch");
 
 var _startBatchWithReplica = require("./startBatchWithReplica");
 
-var _flushController = require("./flushController");
+var _flushController = require("./flushController");
+
+var _eventBridge = require("./eventBridge");

package/esm/init.js

@@ -38,19 +38,19 @@ export function getGlobalObject() {
     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
+    // on safari _gc_temp_ is available on window but not globally
     // fallback on other browser globals check
     if (typeof self === 'object') {
       globalObject = self;

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,27 @@
+import { getGlobalObject } from '../init';
+
+function getEventBridgeGlobal() {
+  return getGlobalObject().FTWebViewJavascriptBridge;
+}
+
+export function getEventBridge() {
+  var eventBridgeGlobal = getEventBridgeGlobal();
+
+  if (!eventBridgeGlobal) {
+    return;
+  }
+
+  return {
+    send(eventType, event) {
+      eventBridgeGlobal.sendEvent(JSON.stringify({
+        name: eventType,
+        data: event
+      }));
+    }
+
+  };
+}
+export function canUseEventBridge() {
+  var bridge = getEventBridge();
+  return !!bridge;
+}

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/package.json

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

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

package/src/tracekit/tracekit.js

@@ -1,10 +1,10 @@
 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): )?(.*)$/
-
+  /^(?:[Uu]ncaught (?:exception: )?)?(?:((?:Eval|Internal|Range|Reference|Syntax|Type|URI|)Error): )?([\s\S]*)$/
 /**
  * Cross-browser collection of unhandled errors
  *
@@ -41,10 +41,10 @@ export function startUnhandledErrorCollection(callback) {
   var _instrumentOnError = instrumentOnError(callback)
   var _instrumentUnhandledRejection = instrumentUnhandledRejection(callback)
   return {
-    stop: function() {
+    stop: function () {
       _instrumentOnError.stop()
       _instrumentUnhandledRejection.stop()
-    },
+    }
   }
 }
 
@@ -53,48 +53,49 @@ export function startUnhandledErrorCollection(callback) {
  */
 function instrumentOnError(callback) {
   return instrumentMethodAndCallOriginal(window, 'onerror', {
-    before: function(message, url, lineNo, columnNo, errorObj) {
-      var stack
-      if (errorObj) {
-        stack = computeStackTrace(errorObj)
-        callback(stack, errorObj)
+    before: function (messageObj, url, line, column, errorObj) {
+      var stackTrace
+      if (errorObj instanceof Error) {
+        stackTrace = computeStackTrace(errorObj)
       } else {
         var location = {
           url: url,
-          column: columnNo,
-          line: lineNo,
-        }
-        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]
-          }
+          column: column,
+          line: line
         }
+        var parse = tryToParseMessage(messageObj)
 
-        stack = {
-          name: name,
-          message: typeof msg === 'string' ? msg : undefined,
-          stack: [location],
+        stackTrace = {
+          name: parse.name,
+          message: parse.message,
+          stack: [location]
         }
-
-        callback(stack, message)
       }
-    },
+      callback(stackTrace, isNullUndefinedDefaultValue(errorObj, messageObj))
+    }
   })
 }
-
+function tryToParseMessage(messageObj) {
+  let name
+  let 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
  */
 function instrumentUnhandledRejection(callback) {
   return instrumentMethodAndCallOriginal(window, 'onunhandledrejection', {
-    before: function(e) {
+    before: function (e) {
       var reason = e.reason || 'Empty reason'
       var stack = computeStackTrace(reason)
       callback(stack, reason)
-    },
+    }
   })
 }

package/src/transport/eventBridge.js

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

package/src/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 { getEventBridge, canUseEventBridge } from './eventBridge'