@cloudcare/browser-core 1.1.2 → 1.1.3

package/cjs/configuration.js

@@ -57,7 +57,11 @@ var DEFAULT_CONFIGURATION = {
   beforeSend: function beforeSend(event) {},
   isServerError: function isServerError(request) {
     return false;
-  } // 判断请求是否为error 请求
+  },
+  // 判断请求是否为error 请求
+  isIntakeUrl: function isIntakeUrl(url) {
+    return false;
+  } // 自定义方法根据请求资源 url 判断是否需要采集对应资源数据，默认都采集。 返回：false 表示要采集，true 表示不需要采集
 
 };
 exports.DEFAULT_CONFIGURATION = DEFAULT_CONFIGURATION;
@@ -137,6 +141,10 @@ function commonInit(userConfiguration, buildEnv) {
     transportConfiguration.isServerError = userConfiguration.isServerError;
   }
 
+  if ('isIntakeUrl' in userConfiguration && (0, _tools.isFunction)(userConfiguration.isIntakeUrl) && (0, _tools.isBoolean)(userConfiguration.isIntakeUrl())) {
+    transportConfiguration.isIntakeUrl = userConfiguration.isIntakeUrl;
+  }
+
   if ('traceId128Bit' in userConfiguration) {
     transportConfiguration.traceId128Bit = !!userConfiguration.traceId128Bit;
   }
@@ -178,7 +186,8 @@ function isIntakeRequest(url, configuration) {
       isIntake = true;
       break;
     }
-  }
+  } // datakit 地址，log 地址，以及客户自定义过滤方法定义url
+
 
-  return isIntake;
+  return isIntake || configuration.isIntakeUrl(url);
 }

package/cjs/fetchProxy.js

@@ -80,7 +80,6 @@ function beforeSend(input, init) {
     init: init,
     input: input,
     method: method,
-    startTime: (0, _tools.relativeNow)(),
     startClocks: startClocks,
     url: url
   };
@@ -98,7 +97,7 @@ function afterSend(responsePromise, context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              context.duration = (0, _tools.elapsed)(context.startClocks.relative, (0, _tools.relativeNow)());
+              context.duration = (0, _tools.elapsed)(context.startClocks.timeStamp, (0, _tools.timeStampNow)());
 
               if (!('stack' in response || response instanceof Error)) {
                 _context.next = 9;

package/cjs/helper/tools.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ONE_SECOND = exports.ONE_MINUTE = exports.ONE_KILO_BYTE = exports.ONE_HOUR = void 0;
+exports.ONE_YEAR = exports.ONE_SECOND = exports.ONE_MINUTE = exports.ONE_KILO_BYTE = exports.ONE_HOUR = exports.ONE_DAY = void 0;
 exports.UUID = UUID;
 exports.addEvent = exports._URL = void 0;
 exports.addEventListener = addEventListener;
@@ -15,6 +15,7 @@ exports.clocksNow = clocksNow;
 exports.clocksOrigin = clocksOrigin;
 exports.coverExtend = exports.cookie = void 0;
 exports.createContextManager = createContextManager;
+exports.dateNow = dateNow;
 exports.decodeURIComponent = void 0;
 exports.deepClone = deepClone;
 exports.deepSnakeCase = deepSnakeCase;
@@ -45,7 +46,9 @@ exports.isObject = exports.isNumber = exports.isJSONString = exports.isFunction
 exports.isPercentage = isPercentage;
 exports.isUndefined = exports.isSupportCors = exports.isString = void 0;
 exports.jsonStringify = jsonStringify;
-exports.map = exports.localStorage = exports.loadScript = exports.keys = void 0;
+exports.localStorage = exports.loadScript = exports.keys = void 0;
+exports.looksLikeRelativeTime = looksLikeRelativeTime;
+exports.map = void 0;
 exports.mapValues = mapValues;
 exports.mediaQueriesSupported = void 0;
 exports.mergeInto = mergeInto;
@@ -62,10 +65,10 @@ exports.replaceNumberCharByPath = replaceNumberCharByPath;
 exports.round = round;
 exports.safeJSONParse = void 0;
 exports.safeTruncate = safeTruncate;
-exports.sessionStorage = exports.searchObjString = exports.searchObjDate = exports.searchConfigData = void 0;
+exports.searchObjDate = exports.searchConfigData = void 0;
+exports.sessionStorage = exports.searchObjString = void 0;
 exports.shallowClone = shallowClone;
-exports.strToUnicode = void 0;
-exports.throttle = exports.strip_sa_properties = exports.strip_empty_properties = exports.stringSplice = void 0;
+exports.throttle = exports.strip_sa_properties = exports.strip_empty_properties = exports.stringSplice = exports.strToUnicode = void 0;
 exports.timeStampNow = timeStampNow;
 exports.toArray = exports.tirm = void 0;
 exports.toServerDuration = toServerDuration;
@@ -1770,6 +1773,10 @@ var ONE_MINUTE = 60 * ONE_SECOND;
 exports.ONE_MINUTE = ONE_MINUTE;
 var ONE_HOUR = 60 * ONE_MINUTE;
 exports.ONE_HOUR = ONE_HOUR;
+var ONE_DAY = 24 * ONE_HOUR;
+exports.ONE_DAY = ONE_DAY;
+var ONE_YEAR = 365 * ONE_DAY;
+exports.ONE_YEAR = ONE_YEAR;
 var ONE_KILO_BYTE = 1024;
 /**
  * Return true if the draw is successful
@@ -1819,7 +1826,7 @@ function preferredNow() {
 }
 
 function getTimestamp(relativeTime) {
-  return Math.floor(getNavigationStart() + relativeTime);
+  return Math.round(getNavigationStart() + relativeTime);
 }
 
 function relativeNow() {
@@ -1834,6 +1841,19 @@ function clocksNow() {
 }
 
 function timeStampNow() {
+  return dateNow();
+}
+
+function looksLikeRelativeTime(time) {
+  return time < ONE_YEAR;
+}
+
+function dateNow() {
+  // Do not use `Date.now` because sometimes websites are wrongly "polyfilling" it. For example, we
+  // had some users using a very old version of `datejs`, which patched `Date.now` to return a Date
+  // instance instead of a timestamp[1]. Those users are unlikely to fix this, so let's handle this
+  // case ourselves.
+  // [1]: https://github.com/datejs/Datejs/blob/97f5c7c58c5bc5accdab8aa7602b6ac56462d778/src/core-debug.js#L14-L16
   return new Date().getTime();
 }
 
@@ -1859,9 +1879,19 @@ function preferredTimeStamp(clocks) {
 function relativeToClocks(relative) {
   return {
     relative: relative,
-    timeStamp: getTimestamp(relative)
+    timeStamp: getCorrectedTimeStamp(relative)
   };
 }
+
+function getCorrectedTimeStamp(relativeTime) {
+  var correctedOrigin = dateNow() - performance.now(); // apply correction only for positive drift
+
+  if (correctedOrigin > getNavigationStart()) {
+    return Math.round(correctedOrigin + relativeTime);
+  }
+
+  return getTimestamp(relativeTime);
+}
 /**
  * Navigation start slightly change on some rare cases
  */

package/cjs/xhrProxy.js

@@ -93,7 +93,7 @@ function proxyXhr() {
 
         hasBeenReported = true;
         var xhrCompleteContext = (0, _tools.extend)({}, xhrPendingContext, {
-          duration: (0, _tools.elapsed)(xhrPendingContext.startClocks.relative, (0, _tools.relativeNow)()),
+          duration: (0, _tools.elapsed)(xhrPendingContext.startClocks.timeStamp, (0, _tools.timeStampNow)()),
           response: _this.response,
           status: _this.status
         });

package/esm/configuration.js

@@ -43,7 +43,11 @@ export var DEFAULT_CONFIGURATION = {
   beforeSend: function beforeSend(event) {},
   isServerError: function isServerError(request) {
     return false;
-  } // 判断请求是否为error 请求
+  },
+  // 判断请求是否为error 请求
+  isIntakeUrl: function isIntakeUrl(url) {
+    return false;
+  } // 自定义方法根据请求资源 url 判断是否需要采集对应资源数据，默认都采集。 返回：false 表示要采集，true 表示不需要采集
 
 };
 
@@ -122,6 +126,10 @@ export function commonInit(userConfiguration, buildEnv) {
     transportConfiguration.isServerError = userConfiguration.isServerError;
   }
 
+  if ('isIntakeUrl' in userConfiguration && isFunction(userConfiguration.isIntakeUrl) && isBoolean(userConfiguration.isIntakeUrl())) {
+    transportConfiguration.isIntakeUrl = userConfiguration.isIntakeUrl;
+  }
+
   if ('traceId128Bit' in userConfiguration) {
     transportConfiguration.traceId128Bit = !!userConfiguration.traceId128Bit;
   }
@@ -161,7 +169,8 @@ export function isIntakeRequest(url, configuration) {
       isIntake = true;
       break;
     }
-  }
+  } // datakit 地址，log 地址，以及客户自定义过滤方法定义url
+
 
-  return isIntake;
+  return isIntake || configuration.isIntakeUrl(url);
 }

package/esm/fetchProxy.js

@@ -2,7 +2,7 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 
-import { each, relativeNow, clocksNow, elapsed } from './helper/tools';
+import { each, timeStampNow, clocksNow, elapsed } from './helper/tools';
 import { computeStackTrace } from './tracekit';
 import { toStackTraceString } from './helper/errorTools';
 import { normalizeUrl } from './helper/urlPolyfill';
@@ -64,7 +64,6 @@ function beforeSend(input, init) {
     init: init,
     input: input,
     method: method,
-    startTime: relativeNow(),
     startClocks: startClocks,
     url: url
   };
@@ -77,7 +76,7 @@ function beforeSend(input, init) {
 function afterSend(responsePromise, context) {
   var reportFetch = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator(function* (response) {
-      context.duration = elapsed(context.startClocks.relative, relativeNow());
+      context.duration = elapsed(context.startClocks.timeStamp, timeStampNow());
 
       if ('stack' in response || response instanceof Error) {
         context.status = 0;

package/esm/helper/tools.js

@@ -1487,6 +1487,8 @@ export function noop() {}
 export var ONE_SECOND = 1000;
 export var ONE_MINUTE = 60 * ONE_SECOND;
 export var ONE_HOUR = 60 * ONE_MINUTE;
+export var ONE_DAY = 24 * ONE_HOUR;
+export var ONE_YEAR = 365 * ONE_DAY;
 export var ONE_KILO_BYTE = 1024;
 /**
  * Return true if the draw is successful
@@ -1527,7 +1529,7 @@ export function preferredNow() {
   return relativeNow();
 }
 export function getTimestamp(relativeTime) {
-  return Math.floor(getNavigationStart() + relativeTime);
+  return Math.round(getNavigationStart() + relativeTime);
 }
 export function relativeNow() {
   return performance.now();
@@ -1539,6 +1541,17 @@ export function clocksNow() {
   };
 }
 export function timeStampNow() {
+  return dateNow();
+}
+export function looksLikeRelativeTime(time) {
+  return time < ONE_YEAR;
+}
+export function dateNow() {
+  // Do not use `Date.now` because sometimes websites are wrongly "polyfilling" it. For example, we
+  // had some users using a very old version of `datejs`, which patched `Date.now` to return a Date
+  // instance instead of a timestamp[1]. Those users are unlikely to fix this, so let's handle this
+  // case ourselves.
+  // [1]: https://github.com/datejs/Datejs/blob/97f5c7c58c5bc5accdab8aa7602b6ac56462d778/src/core-debug.js#L14-L16
   return new Date().getTime();
 }
 export function elapsed(start, end) {
@@ -1559,13 +1572,24 @@ export function preferredTimeStamp(clocks) {
 export function relativeToClocks(relative) {
   return {
     relative: relative,
-    timeStamp: getTimestamp(relative)
+    timeStamp: getCorrectedTimeStamp(relative)
   };
 }
+
+function getCorrectedTimeStamp(relativeTime) {
+  var correctedOrigin = dateNow() - performance.now(); // apply correction only for positive drift
+
+  if (correctedOrigin > getNavigationStart()) {
+    return Math.round(correctedOrigin + relativeTime);
+  }
+
+  return getTimestamp(relativeTime);
+}
 /**
  * Navigation start slightly change on some rare cases
  */
 
+
 var navigationStart;
 export function getNavigationStart() {
   if (navigationStart === undefined) {

package/esm/xhrProxy.js

@@ -1,5 +1,5 @@
 import { normalizeUrl } from './helper/urlPolyfill';
-import { each, relativeNow, clocksNow, elapsed, extend } from './helper/tools';
+import { each, relativeNow, clocksNow, elapsed, extend, timeStampNow } from './helper/tools';
 var xhrProxySingleton;
 var beforeSendCallbacks = [];
 var onRequestCompleteCallbacks = [];
@@ -81,7 +81,7 @@ function proxyXhr() {
 
         hasBeenReported = true;
         var xhrCompleteContext = extend({}, xhrPendingContext, {
-          duration: elapsed(xhrPendingContext.startClocks.relative, relativeNow()),
+          duration: elapsed(xhrPendingContext.startClocks.timeStamp, timeStampNow()),
           response: _this.response,
           status: _this.status
         });

package/package.json

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

package/src/configuration.js

@@ -43,7 +43,8 @@ export var DEFAULT_CONFIGURATION = {
   isJsBirdge: false,// 是否需要对webview 发送数据，需要装我们对应ios sdk
   isLineProtocolToJson: false,
   beforeSend: function (event) {},
-  isServerError: function(request) {return false}  // 判断请求是否为error 请求
+  isServerError: function(request) {return false},  // 判断请求是否为error 请求
+  isIntakeUrl: function(url) { return false } // 自定义方法根据请求资源 url 判断是否需要采集对应资源数据，默认都采集。 返回：false 表示要采集，true 表示不需要采集
 }
 function trim(str) {
   return str.replace(TRIM_REGIX, '')
@@ -117,6 +118,9 @@ export function commonInit(userConfiguration, buildEnv) {
   if ('isServerError' in userConfiguration && isFunction(userConfiguration.isServerError) && isBoolean(userConfiguration.isServerError())) {
     transportConfiguration.isServerError = userConfiguration.isServerError
   }
+  if ('isIntakeUrl' in userConfiguration && isFunction(userConfiguration.isIntakeUrl) && isBoolean(userConfiguration.isIntakeUrl())) {
+    transportConfiguration.isIntakeUrl = userConfiguration.isIntakeUrl
+  }
   if ('traceId128Bit' in userConfiguration) {
     transportConfiguration.traceId128Bit = !!userConfiguration.traceId128Bit
   }
@@ -152,5 +156,6 @@ export function isIntakeRequest(url, configuration) {
       break;
     }
   }
-  return isIntake
+  // datakit 地址，log 地址，以及客户自定义过滤方法定义url
+  return isIntake || configuration.isIntakeUrl(url)
 }

package/src/fetchProxy.js

@@ -1,4 +1,4 @@
-import { each, relativeNow, clocksNow, elapsed } from './helper/tools'
+import { each, timeStampNow, clocksNow, elapsed } from './helper/tools'
 import { computeStackTrace } from './tracekit'
 import { toStackTraceString } from './helper/errorTools'
 import { normalizeUrl } from './helper/urlPolyfill'
@@ -63,7 +63,6 @@ function beforeSend(input, init) {
     init: init,
     input: input,
     method: method,
-    startTime: relativeNow(),
     startClocks: startClocks,
     url: url
   }
@@ -76,7 +75,7 @@ function beforeSend(input, init) {
 
 function afterSend(responsePromise, context) {
   var reportFetch = async function (response) {
-    context.duration = elapsed(context.startClocks.relative, relativeNow())
+    context.duration = elapsed(context.startClocks.timeStamp, timeStampNow())
 
     if ('stack' in response || response instanceof Error) {
       context.status = 0

package/src/helper/tools.js

@@ -1463,6 +1463,8 @@ export function noop() {}
 export var ONE_SECOND = 1000
 export var ONE_MINUTE = 60 * ONE_SECOND
 export var ONE_HOUR = 60 * ONE_MINUTE
+export var ONE_DAY = 24 * ONE_HOUR
+export var ONE_YEAR = 365 * ONE_DAY
 export var ONE_KILO_BYTE = 1024
 /**
  * Return true if the draw is successful
@@ -1504,7 +1506,7 @@ export function preferredNow() {
   return relativeNow()
 }
 export function getTimestamp(relativeTime) {
-  return Math.floor(getNavigationStart() + relativeTime)
+  return Math.round(getNavigationStart() + relativeTime)
 }
 export function relativeNow() {
   return performance.now()
@@ -1514,8 +1516,21 @@ export function clocksNow() {
   return { relative: relativeNow(), timeStamp: timeStampNow() }
 }
 export function timeStampNow() {
+  return dateNow()
+}
+
+export function looksLikeRelativeTime(time) {
+  return time < ONE_YEAR
+}
+export function dateNow() {
+  // Do not use `Date.now` because sometimes websites are wrongly "polyfilling" it. For example, we
+  // had some users using a very old version of `datejs`, which patched `Date.now` to return a Date
+  // instance instead of a timestamp[1]. Those users are unlikely to fix this, so let's handle this
+  // case ourselves.
+  // [1]: https://github.com/datejs/Datejs/blob/97f5c7c58c5bc5accdab8aa7602b6ac56462d778/src/core-debug.js#L14-L16
   return new Date().getTime()
 }
+
 export function elapsed(start, end) {
   return end - start
 }
@@ -1530,7 +1545,15 @@ export function preferredTimeStamp(clocks) {
   return getTimestamp(clocks.relative)
 }
 export function relativeToClocks(relative) {
-  return { relative: relative, timeStamp: getTimestamp(relative) }
+  return { relative: relative, timeStamp: getCorrectedTimeStamp(relative) }
+}
+function getCorrectedTimeStamp(relativeTime) {
+  const correctedOrigin = dateNow() - performance.now()
+  // apply correction only for positive drift
+  if (correctedOrigin > getNavigationStart()) {
+    return Math.round(correctedOrigin + relativeTime)
+  }
+  return getTimestamp(relativeTime)
 }
 /**
  * Navigation start slightly change on some rare cases

package/src/xhrProxy.js

@@ -1,5 +1,5 @@
 import { normalizeUrl } from './helper/urlPolyfill'
-import { each, relativeNow, clocksNow, elapsed, extend } from './helper/tools'
+import { each, relativeNow, clocksNow, elapsed, extend, timeStampNow } from './helper/tools'
 
 var xhrProxySingleton
 var beforeSendCallbacks = []
@@ -78,8 +78,8 @@ function proxyXhr() {
         hasBeenReported = true
         var xhrCompleteContext = extend({}, xhrPendingContext, {
           duration: elapsed(
-            xhrPendingContext.startClocks.relative,
-            relativeNow()
+            xhrPendingContext.startClocks.timeStamp,
+            timeStampNow()
           ),
           response: _this.response,
           status: _this.status