@cloudcare/browser-core 1.0.18 → 1.0.21

package/cjs/configuration.js

@@ -3,10 +3,10 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.DEFAULT_CONFIGURATION = void 0;
 exports.buildCookieOptions = buildCookieOptions;
 exports.commonInit = commonInit;
 exports.isIntakeRequest = isIntakeRequest;
-exports.DEFAULT_CONFIGURATION = void 0;
 
 var _tools = require("./helper/tools");
 
@@ -151,5 +151,23 @@ function mustUseSecureCookie(userConfiguration) {
 }
 
 function isIntakeRequest(url, configuration) {
-  return (0, _urlPolyfill.haveSameOrigin)(url, configuration.datakitUrl);
+  // return haveSameOrigin(url, configuration.datakitUrl)
+  var notTakeRequest = [configuration.datakitUrl];
+
+  if (configuration.logsEndpoint) {
+    notTakeRequest.push(configuration.logsEndpoint);
+  }
+
+  var isIntake = false;
+
+  for (var _i = 0, _notTakeRequest = notTakeRequest; _i < _notTakeRequest.length; _i++) {
+    var _url = _notTakeRequest[_i];
+
+    if (url.indexOf(_url) === 0) {
+      isIntake = true;
+      break;
+    }
+  }
+
+  return isIntake;
 }

package/cjs/cookie.js

@@ -3,12 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.COOKIE_ACCESS_DELAY = void 0;
+exports.areCookiesAuthorized = areCookiesAuthorized;
 exports.cacheCookieAccess = cacheCookieAccess;
-exports.setCookie = setCookie;
 exports.getCookie = getCookie;
-exports.areCookiesAuthorized = areCookiesAuthorized;
 exports.getCurrentSite = getCurrentSite;
-exports.COOKIE_ACCESS_DELAY = void 0;
+exports.setCookie = setCookie;
 
 var _tools = require("./helper/tools");
 

package/cjs/dataMap.js

@@ -12,6 +12,7 @@ var commonTags = {
   sdk_version: '_dd.sdk_version',
   app_id: 'application.id',
   env: '_dd.env',
+  service: '_dd.service',
   version: '_dd.version',
   userid: 'user.id',
   user_email: 'user.email',

package/cjs/errorCollection.js

@@ -5,8 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.startAutomaticErrorCollection = startAutomaticErrorCollection;
 exports.startConsoleTracking = startConsoleTracking;
-exports.stopConsoleTracking = stopConsoleTracking;
 exports.startRuntimeErrorTracking = startRuntimeErrorTracking;
+exports.stopConsoleTracking = stopConsoleTracking;
 exports.stopRuntimeErrorTracking = stopRuntimeErrorTracking;
 exports.trackNetworkError = trackNetworkError;
 

package/cjs/fetchProxy.js

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.startFetchProxy = startFetchProxy;
 exports.resetFetchProxy = resetFetchProxy;
+exports.startFetchProxy = startFetchProxy;
 
 var _tools = require("./helper/tools");
 

package/cjs/helper/enums.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ErrorHandling = exports.TraceType = exports.RequestType = exports.RumEventType = exports.ActionType = exports.ResourceType = exports.DOM_EVENT = void 0;
+exports.TraceType = exports.RumEventType = exports.ResourceType = exports.RequestType = exports.ErrorHandling = exports.DOM_EVENT = exports.ActionType = void 0;
 var DOM_EVENT = {
   BEFORE_UNLOAD: 'beforeunload',
   CLICK: 'click',

package/cjs/helper/errorTools.js

@@ -3,11 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.formatUnknownError = formatUnknownError;
+exports.ErrorSource = void 0;
 exports.createHandlingStack = createHandlingStack;
-exports.toStackTraceString = toStackTraceString;
 exports.formatErrorMessage = formatErrorMessage;
-exports.ErrorSource = void 0;
+exports.formatUnknownError = formatUnknownError;
+exports.toStackTraceString = toStackTraceString;
 
 var _tools = require("./tools");
 

package/cjs/helper/mobileUtil.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.jsBirdge = exports.isIos = exports.isAndroid = exports.userAgent = void 0;
+exports.userAgent = exports.jsBirdge = exports.isIos = exports.isAndroid = void 0;
 var userAgent = navigator.userAgent.toLowerCase();
 exports.userAgent = userAgent;
 

package/cjs/helper/tools.js

@@ -3,47 +3,68 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.ONE_SECOND = exports.ONE_MINUTE = exports.ONE_KILO_BYTE = exports.ONE_HOUR = void 0;
 exports.UUID = UUID;
-exports.replaceNumberCharByPath = replaceNumberCharByPath;
-exports.getType = getType;
-exports.mergeInto = mergeInto;
+exports.addEvent = exports._URL = void 0;
+exports.addEventListener = addEventListener;
+exports.addEventListeners = addEventListeners;
+exports.base64Encode = exports.autoExeQueue = exports.ajax = exports.addSinglePageEvent = exports.addHashEvent = void 0;
+exports.clocksNow = clocksNow;
+exports.clocksOrigin = clocksOrigin;
+exports.coverExtend = exports.cookie = void 0;
+exports.createContextManager = createContextManager;
+exports.decodeURIComponent = void 0;
 exports.deepClone = deepClone;
+exports.deepSnakeCase = deepSnakeCase;
+exports.each = void 0;
+exports.elapsed = elapsed;
+exports.encodeDates = void 0;
+exports.escapeRowData = escapeRowData;
+exports.filter = exports.extend2Lev = exports.extend = void 0;
+exports.find = find;
+exports.findByPath = findByPath;
+exports.findCommaSeparatedValue = findCommaSeparatedValue;
+exports.getHostname = exports.getCurrentDomain = exports.getCookieTopLevelDomain = exports.formatJsonString = exports.formatDate = void 0;
+exports.getLinkElementOrigin = getLinkElementOrigin;
+exports.getLocationOrigin = getLocationOrigin;
+exports.getNavigationStart = getNavigationStart;
+exports.getReferrer = exports.getQueryParamsFromUrl = exports.getQueryParam = void 0;
+exports.getRelativeTime = getRelativeTime;
+exports.getScreenOrientation = void 0;
 exports.getStatusGroup = getStatusGroup;
+exports.getTimestamp = getTimestamp;
+exports.getType = getType;
+exports.hashCode = exports.hasAttribute = exports.getURLSearchParams = void 0;
+exports.includes = includes;
+exports.isObject = exports.isNumber = exports.isJSONString = exports.isFunction = exports.isEmptyObject = exports.isElement = exports.isDate = exports.isBoolean = exports.isArray = exports.isArguments = exports.inherit = exports.indexOf = void 0;
+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.mapValues = mapValues;
+exports.mediaQueriesSupported = void 0;
+exports.mergeInto = mergeInto;
+exports.msToNs = msToNs;
 exports.noop = noop;
+exports.objectEntries = exports.now = void 0;
 exports.performDraw = performDraw;
-exports.round = round;
-exports.msToNs = msToNs;
-exports.mapValues = mapValues;
-exports.toServerDuration = toServerDuration;
-exports.getRelativeTime = getRelativeTime;
-exports.preferredNow = preferredNow;
-exports.getTimestamp = getTimestamp;
-exports.relativeNow = relativeNow;
-exports.clocksNow = clocksNow;
-exports.timeStampNow = timeStampNow;
-exports.elapsed = elapsed;
-exports.clocksOrigin = clocksOrigin;
 exports.preferredClock = preferredClock;
+exports.preferredNow = preferredNow;
 exports.preferredTimeStamp = preferredTimeStamp;
+exports.relativeNow = relativeNow;
 exports.relativeToClocks = relativeToClocks;
-exports.getNavigationStart = getNavigationStart;
-exports.findCommaSeparatedValue = findCommaSeparatedValue;
-exports.findByPath = findByPath;
+exports.replaceNumberCharByPath = replaceNumberCharByPath;
+exports.round = round;
+exports.safeJSONParse = void 0;
 exports.safeTruncate = safeTruncate;
-exports.addEventListener = addEventListener;
-exports.addEventListeners = addEventListeners;
-exports.includes = includes;
-exports.createContextManager = createContextManager;
-exports.find = find;
-exports.isPercentage = isPercentage;
-exports.getLocationOrigin = getLocationOrigin;
-exports.getLinkElementOrigin = getLinkElementOrigin;
-exports.withSnakeCaseKeys = withSnakeCaseKeys;
-exports.deepSnakeCase = deepSnakeCase;
+exports.throttle = exports.strip_sa_properties = exports.strip_empty_properties = exports.stringSplice = exports.strToUnicode = exports.sessionStorage = exports.searchObjString = exports.searchObjDate = exports.searchConfigData = void 0;
+exports.timeStampNow = timeStampNow;
+exports.toArray = exports.tirm = void 0;
+exports.toServerDuration = toServerDuration;
 exports.toSnakeCase = toSnakeCase;
-exports.escapeRowData = escapeRowData;
-exports.ONE_KILO_BYTE = exports.ONE_HOUR = exports.ONE_MINUTE = exports.ONE_SECOND = exports.typeDecide = exports.getReferrer = exports.stringSplice = exports.searchConfigData = exports.strip_sa_properties = exports.autoExeQueue = exports.strToUnicode = exports.getCookieTopLevelDomain = exports.getCurrentDomain = exports._URL = exports.getURLSearchParams = exports.getQueryParamsFromUrl = exports.getHostname = exports.loadScript = exports.ajax = exports.xhr = exports.isSupportCors = exports.sessionStorage = exports.localStorage = exports.cookie = exports.addSinglePageEvent = exports.addHashEvent = exports.addEvent = exports.urlParse = exports.getQueryParam = exports.base64Encode = exports.utf8Encode = exports.strip_empty_properties = exports.unique = exports.searchObjString = exports.formatJsonString = exports.searchObjDate = exports.formatDate = exports.hashCode = exports.throttle = exports.now = exports.getScreenOrientation = exports.mediaQueriesSupported = exports.encodeDates = exports.decodeURIComponent = exports.safeJSONParse = exports.isJSONString = exports.isElement = exports.isNumber = exports.isBoolean = exports.isDate = exports.isString = exports.isUndefined = exports.objectEntries = exports.isEmptyObject = exports.isObject = exports.tirm = exports.inherit = exports.map = exports.filter = exports.hasAttribute = exports.indexOf = exports.keys = exports.values = exports.toArray = exports.isArguments = exports.isFunction = exports.isArray = exports.coverExtend = exports.extend2Lev = exports.extend = exports.each = void 0;
+exports.values = exports.utf8Encode = exports.urlParse = exports.unique = exports.typeDecide = void 0;
+exports.withSnakeCaseKeys = withSnakeCaseKeys;
+exports.xhr = void 0;
 
 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); }
 
@@ -720,7 +741,7 @@ function UUID(placeholder) {
 
 function replaceNumberCharByPath(path) {
   if (path) {
-    return path.replace(/\/([^\/]*)\d([^\/]*)/g, '/?');
+    return path.replace(/\/([^\/]*)\d([^\/]*)/g, '/?').replace(/\/$/g, '');
   } else {
     return '';
   }

package/cjs/helper/urlPolyfill.js

@@ -3,14 +3,14 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.normalizeUrl = normalizeUrl;
-exports.isValidUrl = isValidUrl;
-exports.haveSameOrigin = haveSameOrigin;
+exports.buildUrl = buildUrl;
+exports.getHash = getHash;
 exports.getOrigin = getOrigin;
 exports.getPathName = getPathName;
 exports.getSearch = getSearch;
-exports.getHash = getHash;
-exports.buildUrl = buildUrl;
+exports.haveSameOrigin = haveSameOrigin;
+exports.isValidUrl = isValidUrl;
+exports.normalizeUrl = normalizeUrl;
 
 var _tools = require("./tools");
 

package/cjs/init.js

@@ -3,12 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.makeGlobal = makeGlobal;
-exports.makePublicApi = makePublicApi;
-exports.defineGlobal = defineGlobal;
-exports.getGlobalObject = getGlobalObject;
 exports.checkCookiesAuthorized = checkCookiesAuthorized;
 exports.checkIsNotLocalFile = checkIsNotLocalFile;
+exports.defineGlobal = defineGlobal;
+exports.getGlobalObject = getGlobalObject;
+exports.makeGlobal = makeGlobal;
+exports.makePublicApi = makePublicApi;
 
 var _tools = require("./helper/tools");
 

package/cjs/sessionManagement.js

@@ -3,12 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.startSessionManagement = startSessionManagement;
+exports.VISIBILITY_CHECK_DELAY = exports.SESSION_TIME_OUT_DELAY = exports.SESSION_EXPIRATION_DELAY = exports.SESSION_COOKIE_NAME = exports.ANONYMOUS_ID_EXPIRATION = exports.ANONYMOUS_ID_COOKIE_NAME = void 0;
 exports.isValidSessionString = isValidSessionString;
 exports.persistSession = persistSession;
+exports.startSessionManagement = startSessionManagement;
 exports.stopSessionManagement = stopSessionManagement;
 exports.trackActivity = trackActivity;
-exports.ANONYMOUS_ID_EXPIRATION = exports.ANONYMOUS_ID_COOKIE_NAME = exports.VISIBILITY_CHECK_DELAY = exports.SESSION_TIME_OUT_DELAY = exports.SESSION_EXPIRATION_DELAY = exports.SESSION_COOKIE_NAME = void 0;
 
 var _cookie = require("./cookie");
 

package/cjs/tracekit/computeStackTrace.js

@@ -3,9 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.augmentStackTraceWithInitialElement = augmentStackTraceWithInitialElement;
 exports.computeStackTrace = computeStackTrace;
 exports.computeStackTraceFromStackProp = computeStackTraceFromStackProp;
-exports.augmentStackTraceWithInitialElement = augmentStackTraceWithInitialElement;
 exports.computeStackTraceOfCaller = computeStackTraceOfCaller;
 
 var _report = require("./report");

package/cjs/tracekit/report.js

@@ -5,8 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.report = report;
 exports.subscribe = subscribe;
-exports.unsubscribe = unsubscribe;
 exports.traceKitWindowOnError = traceKitWindowOnError;
+exports.unsubscribe = unsubscribe;
 
 var _computeStackTrace = require("./computeStackTrace");
 

package/cjs/transport.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.Batch = exports.processedMessageByDataMap = exports.HttpRequest = void 0;
+exports.processedMessageByDataMap = exports.HttpRequest = exports.Batch = void 0;
 
 var _tools = require("./helper/tools");
 

package/cjs/xhrProxy.js

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.startXhrProxy = startXhrProxy;
 exports.resetXhrProxy = resetXhrProxy;
+exports.startXhrProxy = startXhrProxy;
 
 var _urlPolyfill = require("./helper/urlPolyfill");
 

package/esm/configuration.js

@@ -136,5 +136,21 @@ function mustUseSecureCookie(userConfiguration) {
 }
 
 export function isIntakeRequest(url, configuration) {
-  return haveSameOrigin(url, configuration.datakitUrl);
+  // return haveSameOrigin(url, configuration.datakitUrl)
+  var notTakeRequest = [configuration.datakitUrl];
+
+  if (configuration.logsEndpoint) {
+    notTakeRequest.push(configuration.logsEndpoint);
+  }
+
+  var isIntake = false;
+
+  for (var _url of notTakeRequest) {
+    if (url.indexOf(_url) === 0) {
+      isIntake = true;
+      break;
+    }
+  }
+
+  return isIntake;
 }

package/esm/dataMap.js

@@ -4,6 +4,7 @@ export var commonTags = {
   sdk_version: '_dd.sdk_version',
   app_id: 'application.id',
   env: '_dd.env',
+  service: '_dd.service',
   version: '_dd.version',
   userid: 'user.id',
   user_email: 'user.email',

package/esm/helper/tools.js

@@ -543,7 +543,7 @@ export function UUID(placeholder) {
 
 export function replaceNumberCharByPath(path) {
   if (path) {
-    return path.replace(/\/([^\/]*)\d([^\/]*)/g, '/?');
+    return path.replace(/\/([^\/]*)\d([^\/]*)/g, '/?').replace(/\/$/g, '');
   } else {
     return '';
   }

package/package.json

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

package/src/configuration.js

@@ -132,5 +132,17 @@ function mustUseSecureCookie(userConfiguration) {
 }
 
 export function isIntakeRequest(url, configuration) {
-  return haveSameOrigin(url, configuration.datakitUrl)
+  // return haveSameOrigin(url, configuration.datakitUrl)
+  var notTakeRequest = [configuration.datakitUrl]
+  if (configuration.logsEndpoint) {
+    notTakeRequest.push(configuration.logsEndpoint)
+  }
+  var isIntake = false
+  for(var _url of notTakeRequest) {
+    if (url.indexOf(_url) === 0) {
+      isIntake = true
+      break;
+    }
+  }
+  return isIntake
 }

package/src/dataMap.js

@@ -4,6 +4,7 @@ export var commonTags = {
   sdk_version: '_dd.sdk_version',
   app_id: 'application.id',
   env: '_dd.env',
+  service: '_dd.service',
   version: '_dd.version',
   userid: 'user.id',
   user_email: 'user.email',

package/src/helper/tools.js

@@ -536,7 +536,7 @@ export function UUID(placeholder) {
 // 替换url包含数字的路由
 export function replaceNumberCharByPath(path) {
   if (path) {
-    return path.replace(/\/([^\/]*)\d([^\/]*)/g, '/?')
+    return path.replace(/\/([^\/]*)\d([^\/]*)/g, '/?').replace(/\/$/g, '')
   } else {
     return ''
   }

package/src/transport.js

@@ -48,6 +48,7 @@ export var processedMessageByDataMap = function (message) {
     rowStr: '',
     rowData: undefined
   }
+  
   var rowData = { tags: {}, fields: {} }
   var hasFileds = false
   var rowStr = ''