@cloudcare/browser-core 3.0.23 → 3.0.29

package/esm/helper/timer.js

@@ -1,13 +1,14 @@
 import { getZoneJsOriginalValue } from './getZoneJsOriginalValue';
 import { getGlobalObject } from '../init';
+import { monitor } from './monitor';
 export function setTimeout(callback, delay) {
-  return getZoneJsOriginalValue(getGlobalObject(), 'setTimeout')(callback, delay);
+  return getZoneJsOriginalValue(getGlobalObject(), 'setTimeout')(monitor(callback), delay);
 }
 export function clearTimeout(timeoutId) {
   getZoneJsOriginalValue(getGlobalObject(), 'clearTimeout')(timeoutId);
 }
 export function setInterval(callback, delay) {
-  return getZoneJsOriginalValue(window, 'setInterval')(callback, delay);
+  return getZoneJsOriginalValue(window, 'setInterval')(monitor(callback), delay);
 }
 export function clearInterval(timeoutId) {
   getZoneJsOriginalValue(window, 'clearInterval')(timeoutId);

package/esm/helper/tools.js

@@ -263,6 +263,8 @@ export var matchList = function matchList(list, value, useStartsWith) {
 }; // https://github.com/jquery/jquery/blob/a684e6ba836f7c553968d7d026ed7941e1a612d8/src/selector/escapeSelector.js
 
 export var cssEscape = function cssEscape(str) {
+  str = str + '';
+
   if (window.CSS && window.CSS.escape) {
     return window.CSS.escape(str);
   } // eslint-disable-next-line no-control-regex
@@ -1664,24 +1666,6 @@ export function isNullUndefinedDefaultValue(data, defaultValue) {
     return defaultValue;
   }
 }
-export function requestIdleCallback(callback, opts) {
-  // Use 'requestIdleCallback' when available: it will throttle the mutation processing if the
-  // browser is busy rendering frames (ex: when frames are below 60fps). When not available, the
-  // fallback on 'requestAnimationFrame' will still ensure the mutations are processed after any
-  // browser rendering process (Layout, Recalculate Style, etc.), so we can serialize DOM nodes
-  // efficiently.
-  if (window.requestIdleCallback) {
-    var id = window.requestIdleCallback(callback, opts);
-    return function () {
-      return window.cancelIdleCallback(id);
-    };
-  }
-
-  var id = window.requestAnimationFrame(callback);
-  return function () {
-    return window.cancelAnimationFrame(id);
-  };
-}
 export function objectHasValue(object, value) {
   return some(keys(object), function (key) {
     return object[key] === value;

package/esm/index.js

@@ -9,6 +9,7 @@ export * from './error/trackRuntimeError';
 export * from './console/consoleObservable';
 export * from './report/reportObservable';
 export * from './helper/display';
+export * from './helper/monitor';
 export * from './helper/sanitize';
 export * from './helper/eventEmitter';
 export * from './helper/lifeCycle';

package/esm/init.js

@@ -1,28 +1,22 @@
 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, {
-    onReady: function onReady(callback) {
-      callback();
-    }
-  });
-  return global;
-}
+import { each, assign } from './helper/tools';
+import { setDebugMode } from './helper/monitor';
+import { catchUserErrors } from './helper/catchUserErrors';
 export function makePublicApi(stub) {
-  var publicApi = extend({}, stub, {
+  var publicApi = assign({
     onReady: function onReady(callback) {
       callback();
     }
-  }); // Add an "hidden" property to set debug mode. We define it that way to hide it
+  }, stub); // Add an "hidden" property to set debug mode. We define it that way to hide it
   // as much as possible but of course it's not a real protection.
-  //   Object.defineProperty(publicApi, '_setDebug', {
-  //     get: function () {
-  //       return setDebugMode
-  //     },
-  //     enumerable: false
-  //   })
 
+  Object.defineProperty(publicApi, '_setDebug', {
+    get: function get() {
+      return setDebugMode;
+    },
+    enumerable: false
+  });
   return publicApi;
 }
 export function defineGlobal(global, name, api) {
@@ -31,7 +25,7 @@ export function defineGlobal(global, name, api) {
 
   if (existingGlobalVariable && existingGlobalVariable.q) {
     each(existingGlobalVariable.q, function (fn) {
-      fn();
+      catchUserErrors(fn, 'onReady callback threw an error:')();
     });
   }
 }

package/esm/report/reportObservable.js

@@ -3,6 +3,7 @@ import { mergeObservables, Observable } from '../helper/observable';
 import { includes, safeTruncate, filter, each } from '../helper/tools';
 import { addEventListener } from '../browser/addEventListener';
 import { DOM_EVENT } from '../helper/enums';
+import { monitor } from '../helper/monitor';
 export var RawReportType = {
   intervention: 'intervention',
   deprecation: 'deprecation',
@@ -32,12 +33,11 @@ function createReportObservable(reportTypes) {
       return;
     }
 
-    var handleReports = function handleReports(reports) {
+    var handleReports = monitor(function (reports) {
       each(reports, function (report) {
         observable.notify(buildRawReportFromReport(report));
       });
-    };
-
+    });
     var observer = new window.ReportingObserver(handleReports, {
       types: reportTypes,
       buffered: true

package/esm/transport/batch.js

@@ -66,10 +66,10 @@ export var processedMessageByDataMap = function processedMessageByDataMap(messag
         }
       });
 
-      if (message.tags && isObject(message.tags) && !isEmptyObject(message.tags)) {
+      if (message.context && isObject(message.context) && !isEmptyObject(message.context)) {
         // 自定义tag， 存储成field
         var _tagKeys = [];
-        each(message.tags, function (_value, _key) {
+        each(message.context, function (_value, _key) {
           // 如果和之前tag重名，则舍弃
           if (filterFileds.indexOf(_key) > -1) return;
           filterFileds.push(_key);

package/esm/transport/httpRequest.js

@@ -1,5 +1,6 @@
 import { newRetryState, sendWithRetryStrategy } from './sendWithRetryStrategy';
 import { addEventListener } from '../browser/addEventListener';
+import { monitor } from '../helper/monitor';
 /**
  * Use POST request without content type to:
  * - avoid CORS preflight requests
@@ -68,17 +69,17 @@ export function fetchKeepAliveStrategy(endpointUrl, bytesLimit, payload, onRespo
       body: data,
       keepalive: true,
       mode: 'cors'
-    }).then(function (response) {
+    }).then(monitor(function (response) {
       if (typeof onResponse === 'function') {
         onResponse({
           status: response.status,
           type: response.type
         });
       }
-    }, function () {
+    }), monitor(function () {
       // failed to queue the request
       sendXHR(url, data, onResponse);
-    });
+    }));
   } else {
     sendXHR(url, data, onResponse);
   }

package/package.json

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

package/src/browser/addEventListener.js

@@ -1,5 +1,6 @@
 import { each } from '../helper/tools'
 import { getZoneJsOriginalValue } from '../helper/getZoneJsOriginalValue'
+import { monitor } from '../helper/monitor'
 export function addEventListener(eventTarget, event, listener, options) {
   return addEventListeners(eventTarget, [event], listener, options)
 }
@@ -20,28 +21,28 @@ export function addEventListener(eventTarget, event, listener, options) {
  *   listened
  */
 
-export function addEventListeners(eventTarget, events, listener, options) {
-  var wrappedListener =
+export function addEventListeners(eventTarget, eventNames, listener, options) {
+  var wrappedListener = monitor(
     options && options.once
       ? function (event) {
           stop()
           listener(event)
         }
       : listener
-
+  )
   options =
     options && options.passive
       ? { capture: options.capture, passive: options.passive }
       : options && options.capture
   var add = getZoneJsOriginalValue(eventTarget, 'addEventListener')
 
-  each(events, function (event) {
-    add.call(eventTarget, event, wrappedListener, options)
+  each(eventNames, function (eventName) {
+    add.call(eventTarget, eventName, wrappedListener, options)
   })
   var stop = function () {
     var remove = getZoneJsOriginalValue(eventTarget, 'removeEventListener')
-    each(events, function (event) {
-      remove.call(eventTarget, event, wrappedListener, options)
+    each(eventNames, function (eventName) {
+      remove.call(eventTarget, eventName, wrappedListener, options)
     })
   }
   return {

package/src/browser/fetchObservable.js

@@ -1,6 +1,7 @@
 import { instrumentMethod } from '../helper/instrumentMethod'
 import { Observable } from '../helper/observable'
 import { clocksNow } from '../helper/tools'
+import { monitor, callMonitored } from '../helper/monitor'
 import { normalizeUrl } from '../helper/urlPolyfill'
 
 var fetchObservable
@@ -24,14 +25,22 @@ function createFetchObservable() {
       function (originalFetch) {
         return function (input, init) {
           var responsePromise
-          var context = beforeSend(observable, input, init)
+          var context = callMonitored(beforeSend, null, [
+            observable,
+            input,
+            init
+          ])
           if (context) {
             responsePromise = originalFetch.call(
               this,
               context.input,
               context.init
             )
-            afterSend(observable, responsePromise, context)
+            callMonitored(afterSend, null, [
+              observable,
+              responsePromise,
+              context
+            ])
           } else {
             responsePromise = originalFetch.call(this, input, init)
           }
@@ -91,5 +100,5 @@ function afterSend(observable, responsePromise, startContext) {
     }
     observable.notify(context)
   }
-  responsePromise.then(reportFetch, reportFetch)
+  responsePromise.then(monitor(reportFetch), monitor(reportFetch))
 }

package/src/console/consoleObservable.js

@@ -8,7 +8,7 @@ import { mergeObservables, Observable } from '../helper/observable'
 import { find, map } from '../helper/tools'
 import { jsonStringify } from '../helper/serialisation/jsonStringify'
 import { ConsoleApiName } from '../helper/display'
-
+import { callMonitored } from '../helper/monitor'
 var consoleObservablesByApi = {}
 
 export function initConsoleObservable(apis) {
@@ -30,7 +30,9 @@ function createConsoleObservable(api) {
       var params = [].slice.call(arguments)
       originalConsoleApi.apply(console, arguments)
       var handlingStack = createHandlingStack()
-      observable.notify(buildConsoleLog(params, api, handlingStack))
+      callMonitored(function () {
+        observable.notify(buildConsoleLog(params, api, handlingStack))
+      })
     }
     return function () {
       console[api] = originalConsoleApi

package/src/helper/errorTools.js

@@ -1,7 +1,7 @@
 import { each, noop } from './tools'
 import { jsonStringify } from '../helper/serialisation/jsonStringify'
 import { computeStackTrace } from '../tracekit'
-
+import { callMonitored } from '../helper/monitor'
 export var ErrorSource = {
   AGENT: 'agent',
   CONSOLE: 'console',
@@ -97,10 +97,11 @@ export function createHandlingStack() {
       noop()
     }
   }
-
-  var stackTrace = computeStackTrace(error)
-  stackTrace.stack = stackTrace.stack.slice(internalFramesToSkip)
-  formattedStack = toStackTraceString(stackTrace)
+  callMonitored(function () {
+    var stackTrace = computeStackTrace(error)
+    stackTrace.stack = stackTrace.stack.slice(internalFramesToSkip)
+    formattedStack = toStackTraceString(stackTrace)
+  })
 
   return formattedStack
 }

package/src/helper/instrumentMethod.js

@@ -1,5 +1,6 @@
 import { noop } from './tools'
 import { setTimeout } from './timer'
+import { callMonitored } from './monitor'
 export function instrumentMethod(object, method, instrumentationFactory) {
   var original = object[method]
 
@@ -29,14 +30,16 @@ export function instrumentMethodAndCallOriginal(object, method, aliasOption) {
     return function () {
       var result
       if (aliasOption && aliasOption.before) {
-        aliasOption.before.apply(this, arguments)
+        callMonitored(aliasOption.before, this, arguments)
+        // aliasOption.before.apply(this, arguments)
       }
       if (typeof original === 'function') {
         // eslint-disable-next-line @typescript-eslint/no-unsafe-call
         result = original.apply(this, arguments)
       }
       if (aliasOption && aliasOption.after) {
-        aliasOption.after.apply(this, arguments)
+        callMonitored(aliasOption.after, this, arguments)
+        // aliasOption.after.apply(this, arguments)
       }
       return result
     }

package/src/helper/monitor.js

@@ -0,0 +1,44 @@
+import { ConsoleApiName, display } from './display'
+var onMonitorErrorCollected
+var debugMode = false
+
+export function startMonitorErrorCollection(newOnMonitorErrorCollected) {
+  onMonitorErrorCollected = newOnMonitorErrorCollected
+}
+
+export function setDebugMode(newDebugMode) {
+  debugMode = newDebugMode
+}
+
+export function resetMonitor() {
+  onMonitorErrorCollected = undefined
+  debugMode = false
+}
+
+export function monitor(fn) {
+  return function () {
+    return callMonitored(fn, this, arguments)
+  }
+}
+
+export function callMonitored(fn, context, args) {
+  try {
+    return fn.apply(context, args)
+  } catch (e) {
+    displayIfDebugEnabled(ConsoleApiName.error, e)
+    if (onMonitorErrorCollected) {
+      try {
+        onMonitorErrorCollected(e)
+      } catch (e) {
+        displayIfDebugEnabled(ConsoleApiName.error, e)
+      }
+    }
+  }
+}
+
+export function displayIfDebugEnabled(api) {
+  var args = [].slice.call(arguments, 1)
+  if (debugMode) {
+    display.apply(null, [api, '[MONITOR]'].concat(args))
+  }
+}

package/src/helper/observable.js

@@ -12,14 +12,14 @@ _Observable.prototype = {
     this.observers.push(f)
     var _this = this
     return {
-      unsubscribe: function() {
-        _this.observers = filter(_this.observers, function(other) {
+      unsubscribe: function () {
+        _this.observers = filter(_this.observers, function (other) {
           return f !== other
         })
         if (!_this.observers.length && _this.onLastUnsubscribe) {
           _this.onLastUnsubscribe()
         }
-      },
+      }
     }
   },
   notify: function (data) {
@@ -32,12 +32,14 @@ export var Observable = _Observable
 
 export function mergeObservables() {
   var observables = [].slice.call(arguments)
-  var globalObservable = new Observable(function(){
-    var subscriptions = map(observables, function(observable) {
-     return observable.subscribe(function(data) { return globalObservable.notify(data) })
+  var globalObservable = new Observable(function () {
+    var subscriptions = map(observables, function (observable) {
+      return observable.subscribe(function (data) {
+        return globalObservable.notify(data)
+      })
     })
-    return function() {
-      return each(subscriptions, function(subscription) {
+    return function () {
+      return each(subscriptions, function (subscription) {
         return subscription.unsubscribe()
       })
     }

package/src/helper/readBytesFromStream.js

@@ -1,5 +1,5 @@
 import { noop, each } from './tools'
-
+import { monitor } from './monitor'
 /**
  * Read bytes from a ReadableStream until at least `limit` bytes have been read (or until the end of
  * the stream). The callback is invoked with the at most `limit` bytes, and indicates that the limit
@@ -14,7 +14,7 @@ export function readBytesFromStream(stream, callback, options) {
 
   function readMore() {
     reader.read().then(
-      function (result) {
+      monitor(function (result) {
         if (result.done) {
           onDone()
           return
@@ -30,10 +30,10 @@ export function readBytesFromStream(stream, callback, options) {
         } else {
           readMore()
         }
-      },
-      function (error) {
+      }),
+      monitor(function (error) {
         callback(error)
-      }
+      })
     )
   }
 

package/src/helper/timer.js

@@ -1,9 +1,9 @@
 import { getZoneJsOriginalValue } from './getZoneJsOriginalValue'
 import { getGlobalObject } from '../init'
-
+import { monitor } from './monitor'
 export function setTimeout(callback, delay) {
   return getZoneJsOriginalValue(getGlobalObject(), 'setTimeout')(
-    callback,
+    monitor(callback),
     delay
   )
 }
@@ -13,7 +13,7 @@ export function clearTimeout(timeoutId) {
 }
 
 export function setInterval(callback, delay) {
-  return getZoneJsOriginalValue(window, 'setInterval')(callback, delay)
+  return getZoneJsOriginalValue(window, 'setInterval')(monitor(callback), delay)
 }
 
 export function clearInterval(timeoutId) {

package/src/helper/tools.js

@@ -232,6 +232,7 @@ export var matchList = function (list, value, useStartsWith) {
 }
 // https://github.com/jquery/jquery/blob/a684e6ba836f7c553968d7d026ed7941e1a612d8/src/selector/escapeSelector.js
 export var cssEscape = function (str) {
+  str = str + ''
   if (window.CSS && window.CSS.escape) {
     return window.CSS.escape(str)
   }
@@ -1649,23 +1650,6 @@ export function isNullUndefinedDefaultValue(data, defaultValue) {
   }
 }
 
-export function requestIdleCallback(callback, opts) {
-  // Use 'requestIdleCallback' when available: it will throttle the mutation processing if the
-  // browser is busy rendering frames (ex: when frames are below 60fps). When not available, the
-  // fallback on 'requestAnimationFrame' will still ensure the mutations are processed after any
-  // browser rendering process (Layout, Recalculate Style, etc.), so we can serialize DOM nodes
-  // efficiently.
-  if (window.requestIdleCallback) {
-    var id = window.requestIdleCallback(callback, opts)
-    return function () {
-      return window.cancelIdleCallback(id)
-    }
-  }
-  var id = window.requestAnimationFrame(callback)
-  return function () {
-    return window.cancelAnimationFrame(id)
-  }
-}
 export function objectHasValue(object, value) {
   return some(keys(object), function (key) {
     return object[key] === value

package/src/index.js

@@ -9,6 +9,7 @@ export * from './error/trackRuntimeError'
 export * from './console/consoleObservable'
 export * from './report/reportObservable'
 export * from './helper/display'
+export * from './helper/monitor'
 export * from './helper/sanitize'
 export * from './helper/eventEmitter'
 export * from './helper/lifeCycle'

package/src/init.js

@@ -1,27 +1,25 @@
-import { extend, each } from './helper/tools'
-export function makeGlobal(stub) {
-  var global = extend({}, stub, {
-    onReady: function (callback) {
-      callback()
-    }
-  })
-  return global
-}
+import { each, assign } from './helper/tools'
+import { setDebugMode } from './helper/monitor'
+import { catchUserErrors } from './helper/catchUserErrors'
+
 export function makePublicApi(stub) {
-  var publicApi = extend({}, stub, {
-    onReady: function (callback) {
-      callback()
-    }
-  })
+  var publicApi = assign(
+    {
+      onReady: function (callback) {
+        callback()
+      }
+    },
+    stub
+  )
 
   // Add an "hidden" property to set debug mode. We define it that way to hide it
   // as much as possible but of course it's not a real protection.
-  //   Object.defineProperty(publicApi, '_setDebug', {
-  //     get: function () {
-  //       return setDebugMode
-  //     },
-  //     enumerable: false
-  //   })
+  Object.defineProperty(publicApi, '_setDebug', {
+    get: function () {
+      return setDebugMode
+    },
+    enumerable: false
+  })
 
   return publicApi
 }
@@ -30,7 +28,7 @@ export function defineGlobal(global, name, api) {
   global[name] = api
   if (existingGlobalVariable && existingGlobalVariable.q) {
     each(existingGlobalVariable.q, function (fn) {
-      fn()
+      catchUserErrors(fn, 'onReady callback threw an error:')()
     })
   }
 }

package/src/report/reportObservable.js

@@ -3,6 +3,7 @@ import { mergeObservables, Observable } from '../helper/observable'
 import { includes, safeTruncate, filter, each } from '../helper/tools'
 import { addEventListener } from '../browser/addEventListener'
 import { DOM_EVENT } from '../helper/enums'
+import { monitor } from '../helper/monitor'
 export var RawReportType = {
   intervention: 'intervention',
   deprecation: 'deprecation',
@@ -30,11 +31,11 @@ function createReportObservable(reportTypes) {
       return
     }
 
-    var handleReports = function (reports) {
+    var handleReports = monitor(function (reports) {
       each(reports, function (report) {
         observable.notify(buildRawReportFromReport(report))
       })
-    }
+    })
 
     var observer = new window.ReportingObserver(handleReports, {
       types: reportTypes,

package/src/transport/batch.js

@@ -76,13 +76,13 @@ export var processedMessageByDataMap = function (message) {
         }
       })
       if (
-        message.tags &&
-        isObject(message.tags) &&
-        !isEmptyObject(message.tags)
+        message.context &&
+        isObject(message.context) &&
+        !isEmptyObject(message.context)
       ) {
         // 自定义tag， 存储成field
         var _tagKeys = []
-        each(message.tags, function (_value, _key) {
+        each(message.context, function (_value, _key) {
           // 如果和之前tag重名，则舍弃
           if (filterFileds.indexOf(_key) > -1) return
           filterFileds.push(_key)

package/src/transport/httpRequest.js

@@ -1,5 +1,6 @@
 import { newRetryState, sendWithRetryStrategy } from './sendWithRetryStrategy'
 import { addEventListener } from '../browser/addEventListener'
+import { monitor } from '../helper/monitor'
 /**
  * Use POST request without content type to:
  * - avoid CORS preflight requests
@@ -74,15 +75,15 @@ export function fetchKeepAliveStrategy(
       keepalive: true,
       mode: 'cors'
     }).then(
-      function (response) {
+      monitor(function (response) {
         if (typeof onResponse === 'function') {
           onResponse({ status: response.status, type: response.type })
         }
-      },
-      function () {
+      }),
+      monitor(function () {
         // failed to queue the request
         sendXHR(url, data, onResponse)
-      }
+      })
     )
   } else {
     sendXHR(url, data, onResponse)