@cloudcare/browser-core 1.0.11 → 1.0.15

package/cjs/configuration.js

@@ -43,7 +43,11 @@ var DEFAULT_CONFIGURATION = {
   //是否开启交互action收集
   allowedDDTracingOrigins: [],
   //
-  beforeSend: function beforeSend(event) {}
+  beforeSend: function beforeSend(event) {},
+  isServerError: function isServerError(request) {
+    return false;
+  } // 判断请求是否为error 请求
+
 };
 exports.DEFAULT_CONFIGURATION = DEFAULT_CONFIGURATION;
 
@@ -105,7 +109,11 @@ function commonInit(userConfiguration, buildEnv) {
     transportConfiguration.trackInteractions = !!userConfiguration.trackInteractions;
   }
 
-  return (0, _tools.extend2Lev)(DEFAULT_CONFIGURATION, transportConfiguration);
+  if ('isServerError' in userConfiguration && (0, _tools.isFunction)(userConfiguration.isServerError) && (0, _tools.isBoolean)(userConfiguration.isServerError())) {
+    transportConfiguration.isServerError = userConfiguration.isServerError;
+  }
+
+  return (0, _tools.extend2Lev)({}, DEFAULT_CONFIGURATION, transportConfiguration);
 }
 
 function mustUseSecureCookie(userConfiguration) {

package/cjs/errorCollection.js

@@ -113,7 +113,7 @@ function trackNetworkError(configuration, errorObservable) {
   });
 
   function handleCompleteRequest(type, request) {
-    if (!(0, _configuration.isIntakeRequest)(request.url, configuration) && (!configuration.isEnabled('remove-network-errors') || !request.isAborted) && (isRejected(request) || isServerError(request))) {
+    if (!(0, _configuration.isIntakeRequest)(request.url, configuration) && !request.isAborted && (isRejected(request) || isServerError(request) || configuration.isServerError(request))) {
       errorObservable.notify({
         message: format(type) + ' error ' + request.method + ' ' + request.url,
         resource: {

package/cjs/xhrProxy.js

@@ -85,6 +85,8 @@ function proxyXhr() {
       var hasBeenReported = false;
 
       var reportXhr = function reportXhr() {
+        _this.removeEventListener('loadend', reportXhr);
+
         if (hasBeenReported) {
           return;
         }

package/esm/configuration.js

@@ -1,4 +1,4 @@
-import { ONE_KILO_BYTE, ONE_SECOND, extend2Lev, isArray, includes } from './helper/tools';
+import { ONE_KILO_BYTE, ONE_SECOND, extend2Lev, isArray, includes, isFunction, isBoolean } from './helper/tools';
 import { getCurrentSite } from './cookie';
 import { haveSameOrigin } from './helper/urlPolyfill';
 var TRIM_REGIX = /^\s+|\s+$/g;
@@ -30,7 +30,11 @@ export var DEFAULT_CONFIGURATION = {
   //是否开启交互action收集
   allowedDDTracingOrigins: [],
   //
-  beforeSend: function beforeSend(event) {}
+  beforeSend: function beforeSend(event) {},
+  isServerError: function isServerError(request) {
+    return false;
+  } // 判断请求是否为error 请求
+
 };
 
 function trim(str) {
@@ -91,7 +95,11 @@ export function commonInit(userConfiguration, buildEnv) {
     transportConfiguration.trackInteractions = !!userConfiguration.trackInteractions;
   }
 
-  return extend2Lev(DEFAULT_CONFIGURATION, transportConfiguration);
+  if ('isServerError' in userConfiguration && isFunction(userConfiguration.isServerError) && isBoolean(userConfiguration.isServerError())) {
+    transportConfiguration.isServerError = userConfiguration.isServerError;
+  }
+
+  return extend2Lev({}, DEFAULT_CONFIGURATION, transportConfiguration);
 }
 
 function mustUseSecureCookie(userConfiguration) {

package/esm/errorCollection.js

@@ -87,7 +87,7 @@ export function trackNetworkError(configuration, errorObservable) {
   });
 
   function handleCompleteRequest(type, request) {
-    if (!isIntakeRequest(request.url, configuration) && (!configuration.isEnabled('remove-network-errors') || !request.isAborted) && (isRejected(request) || isServerError(request))) {
+    if (!isIntakeRequest(request.url, configuration) && !request.isAborted && (isRejected(request) || isServerError(request) || configuration.isServerError(request))) {
       errorObservable.notify({
         message: format(type) + ' error ' + request.method + ' ' + request.url,
         resource: {

package/esm/xhrProxy.js

@@ -73,6 +73,8 @@ function proxyXhr() {
       var hasBeenReported = false;
 
       var reportXhr = function reportXhr() {
+        _this.removeEventListener('loadend', reportXhr);
+
         if (hasBeenReported) {
           return;
         }

package/package.json

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

package/src/configuration.js

@@ -3,7 +3,9 @@ import {
   ONE_SECOND,
   extend2Lev,
   isArray,
-  includes
+  includes,
+  isFunction,
+  isBoolean
 } from './helper/tools'
 import { getCurrentSite } from './cookie'
 import { haveSameOrigin } from './helper/urlPolyfill'
@@ -32,7 +34,8 @@ export var DEFAULT_CONFIGURATION = {
   logsEndpoint: '',
   trackInteractions: false, //是否开启交互action收集
   allowedDDTracingOrigins: [], //
-  beforeSend: function (event) {}
+  beforeSend: function (event) {},
+  isServerError: function(request) {return false}  // 判断请求是否为error 请求
 }
 function trim(str) {
   return str.replace(TRIM_REGIX, '')
@@ -94,7 +97,10 @@ export function commonInit(userConfiguration, buildEnv) {
   if ('trackInteractions' in userConfiguration) {
     transportConfiguration.trackInteractions = !!userConfiguration.trackInteractions
   }
-  return extend2Lev(DEFAULT_CONFIGURATION, transportConfiguration)
+  if ('isServerError' in userConfiguration && isFunction(userConfiguration.isServerError) && isBoolean(userConfiguration.isServerError())) {
+    transportConfiguration.isServerError = userConfiguration.isServerError
+  }
+  return extend2Lev({}, DEFAULT_CONFIGURATION, transportConfiguration)
 }
 function mustUseSecureCookie(userConfiguration) {
   return (

package/src/errorCollection.js

@@ -108,9 +108,8 @@ export function trackNetworkError(configuration, errorObservable) {
   function handleCompleteRequest(type, request) {
     if (
       !isIntakeRequest(request.url, configuration) &&
-      (!configuration.isEnabled('remove-network-errors') ||
-        !request.isAborted) &&
-      (isRejected(request) || isServerError(request))
+      !request.isAborted &&
+      (isRejected(request) || isServerError(request) || configuration.isServerError(request))
     ) {
       errorObservable.notify({
         message: format(type) + ' error ' + request.method + ' ' + request.url,

package/src/xhrProxy.js

@@ -71,6 +71,7 @@ function proxyXhr() {
 
       var hasBeenReported = false
       var reportXhr = function () {
+        _this.removeEventListener('loadend', reportXhr)
         if (hasBeenReported) {
           return
         }
@@ -83,7 +84,6 @@ function proxyXhr() {
           response: _this.response,
           status: _this.status
         })
-
         each(onRequestCompleteCallbacks, function (callback) {
           callback(xhrCompleteContext, _this)
         })