@cloudcare/browser-core 2.0.8 → 2.0.10

package/cjs/configuration/transportConfiguration.js

@@ -9,27 +9,30 @@ exports.isIntakeRequest = isIntakeRequest;
 var _tools = require("../helper/tools");
 
 var TRIM_REGIX = /^\s+|\s+$/g;
+var typeMap = {
+  rum: '/rum',
+  log: '/logging',
+  sessionReplay: '/rum/replay'
+};
+
+function getEndPointUrl(url, type) {
+  // type: rum, log,replay
+  var subUrl = typeMap[type];
+  if (!subUrl) return '';
+
+  if (url.indexOf('/') === 0) {
+    // 绝对路径这种 /xxx
+    url = location.origin + trim(url);
+  }
 
-function getDatakitUrl(url) {
-  if (url.lastIndexOf('/') === url.length - 1) return trim(url) + 'v1/write/rum';
-  return trim(url) + '/v1/write/rum';
+  if (url.lastIndexOf('/') === url.length - 1) return trim(url) + 'v1/write' + subUrl;
+  return trim(url) + '/v1/write' + subUrl;
 }
 
 function trim(str) {
   return str.replace(TRIM_REGIX, '');
 }
 
-function getLogsEndPoint(url) {
-  if (url.lastIndexOf('/') === url.length - 1) return trim(url) + 'v1/write/logging';
-  return trim(url) + '/v1/write/logging';
-}
-
-function getSessionReplayEndPoint(url) {
-  //   return 'http://localhost:3002/write_data'
-  if (url.lastIndexOf('/') === url.length - 1) return trim(url) + 'v1/write/rum/replay';
-  return trim(url) + '/v1/write/rum/replay';
-}
-
 function computeTransportConfiguration(initConfiguration) {
   var isIntakeUrl = function isIntakeUrl(url) {
     return false;
@@ -48,9 +51,9 @@ function computeTransportConfiguration(initConfiguration) {
   }
 
   return {
-    datakitUrl: getDatakitUrl(initConfiguration.datakitUrl || initConfiguration.datakitOrigin),
-    logsEndpoint: getLogsEndPoint(initConfiguration.datakitOrigin),
-    sessionReplayEndPoint: getSessionReplayEndPoint(initConfiguration.datakitOrigin),
+    datakitUrl: getEndPointUrl(initConfiguration.datakitUrl || initConfiguration.datakitOrigin, 'rum'),
+    logsEndpoint: getEndPointUrl(initConfiguration.datakitOrigin, 'log'),
+    sessionReplayEndPoint: getEndPointUrl(initConfiguration.datakitOrigin, 'sessionReplay'),
     isIntakeUrl: isIntakeUrl,
     isServerError: isServerError
   };
@@ -62,6 +65,10 @@ function isIntakeRequest(url, configuration) {
 
   if (configuration.logsEndpoint) {
     notTakeRequest.push(configuration.logsEndpoint);
+  }
+
+  if (configuration.sessionReplayEndPoint) {
+    notTakeRequest.push(configuration.sessionReplayEndPoint);
   } // datakit 地址，log 地址，以及客户自定义过滤方法定义url
 
 

package/cjs/dataMap.js

@@ -73,7 +73,6 @@ var dataMap = {
       dom_complete: 'view.dom_complete',
       load_event: 'view.load_event',
       first_input_time: 'view.first_input_time',
-      first_meaningful_paint: 'view.largest_contentful_paint',
       first_paint_time: 'view.fpt',
       resource_load_time: 'view.resource_load_time',
       time_to_interactive: 'view.tti',

package/cjs/transport/batch.js

@@ -114,7 +114,7 @@ var processedMessageByDataMap = function processedMessageByDataMap(message) {
       if (message.type === _enums.RumEventType.LOGGER) {
         // 这里处理日志类型数据自定义字段
         (0, _tools.each)(message, function (value, key) {
-          if (filterFileds.indexOf(key) === -1 && ((0, _tools.isNumber)(value) || (0, _tools.isString)(value) || (0, _tools.isBoolean)(value))) {
+          if (filterFileds.indexOf(key) === -1 && ((0, _tools.isNumber)(value) || value)) {
             rowData.fields[key] = value; // 这里不需要转译
 
             fieldsStr.push((0, _rowData.escapeRowData)(key) + '=' + (0, _rowData.escapeRowField)(value));

package/esm/configuration/transportConfiguration.js

@@ -1,24 +1,27 @@
 import { isFunction, isBoolean, some } from '../helper/tools';
 var TRIM_REGIX = /^\s+|\s+$/g;
+var typeMap = {
+  rum: '/rum',
+  log: '/logging',
+  sessionReplay: '/rum/replay'
+};
 
-function getDatakitUrl(url) {
-  if (url.lastIndexOf('/') === url.length - 1) return trim(url) + 'v1/write/rum';
-  return trim(url) + '/v1/write/rum';
-}
+function getEndPointUrl(url, type) {
+  // type: rum, log,replay
+  var subUrl = typeMap[type];
+  if (!subUrl) return '';
 
-function trim(str) {
-  return str.replace(TRIM_REGIX, '');
-}
+  if (url.indexOf('/') === 0) {
+    // 绝对路径这种 /xxx
+    url = location.origin + trim(url);
+  }
 
-function getLogsEndPoint(url) {
-  if (url.lastIndexOf('/') === url.length - 1) return trim(url) + 'v1/write/logging';
-  return trim(url) + '/v1/write/logging';
+  if (url.lastIndexOf('/') === url.length - 1) return trim(url) + 'v1/write' + subUrl;
+  return trim(url) + '/v1/write' + subUrl;
 }
 
-function getSessionReplayEndPoint(url) {
-  //   return 'http://localhost:3002/write_data'
-  if (url.lastIndexOf('/') === url.length - 1) return trim(url) + 'v1/write/rum/replay';
-  return trim(url) + '/v1/write/rum/replay';
+function trim(str) {
+  return str.replace(TRIM_REGIX, '');
 }
 
 export function computeTransportConfiguration(initConfiguration) {
@@ -39,9 +42,9 @@ export function computeTransportConfiguration(initConfiguration) {
   }
 
   return {
-    datakitUrl: getDatakitUrl(initConfiguration.datakitUrl || initConfiguration.datakitOrigin),
-    logsEndpoint: getLogsEndPoint(initConfiguration.datakitOrigin),
-    sessionReplayEndPoint: getSessionReplayEndPoint(initConfiguration.datakitOrigin),
+    datakitUrl: getEndPointUrl(initConfiguration.datakitUrl || initConfiguration.datakitOrigin, 'rum'),
+    logsEndpoint: getEndPointUrl(initConfiguration.datakitOrigin, 'log'),
+    sessionReplayEndPoint: getEndPointUrl(initConfiguration.datakitOrigin, 'sessionReplay'),
     isIntakeUrl: isIntakeUrl,
     isServerError: isServerError
   };
@@ -52,6 +55,10 @@ export function isIntakeRequest(url, configuration) {
 
   if (configuration.logsEndpoint) {
     notTakeRequest.push(configuration.logsEndpoint);
+  }
+
+  if (configuration.sessionReplayEndPoint) {
+    notTakeRequest.push(configuration.sessionReplayEndPoint);
   } // datakit 地址，log 地址，以及客户自定义过滤方法定义url
 
 

package/esm/dataMap.js

@@ -63,7 +63,6 @@ export var dataMap = {
       dom_complete: 'view.dom_complete',
       load_event: 'view.load_event',
       first_input_time: 'view.first_input_time',
-      first_meaningful_paint: 'view.largest_contentful_paint',
       first_paint_time: 'view.fpt',
       resource_load_time: 'view.resource_load_time',
       time_to_interactive: 'view.tti',

package/esm/transport/batch.js

@@ -99,7 +99,7 @@ export var processedMessageByDataMap = function processedMessageByDataMap(messag
       if (message.type === RumEventType.LOGGER) {
         // 这里处理日志类型数据自定义字段
         each(message, function (value, key) {
-          if (filterFileds.indexOf(key) === -1 && (isNumber(value) || isString(value) || isBoolean(value))) {
+          if (filterFileds.indexOf(key) === -1 && (isNumber(value) || value)) {
             rowData.fields[key] = value; // 这里不需要转译
 
             fieldsStr.push(escapeRowData(key) + '=' + escapeRowField(value));

package/package.json

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

package/src/configuration/transportConfiguration.js

@@ -1,23 +1,27 @@
 import { isFunction, isBoolean, some } from '../helper/tools'
 var TRIM_REGIX = /^\s+|\s+$/g
-function getDatakitUrl(url) {
-  if (url.lastIndexOf('/') === url.length - 1) return trim(url) + 'v1/write/rum'
-  return trim(url) + '/v1/write/rum'
+var typeMap = {
+  rum: '/rum',
+  log: '/logging',
+  sessionReplay: '/rum/replay'
 }
-function trim(str) {
-  return str.replace(TRIM_REGIX, '')
-}
-function getLogsEndPoint(url) {
+function getEndPointUrl(url, type) {
+  // type: rum, log,replay
+  var subUrl = typeMap[type]
+  if (!subUrl) return ''
+  if (url.indexOf('/') === 0) {
+    // 绝对路径这种 /xxx
+    url = location.origin + trim(url)
+  }
   if (url.lastIndexOf('/') === url.length - 1)
-    return trim(url) + 'v1/write/logging'
-  return trim(url) + '/v1/write/logging'
+    return trim(url) + 'v1/write' + subUrl
+  return trim(url) + '/v1/write' + subUrl
 }
-function getSessionReplayEndPoint(url) {
-  //   return 'http://localhost:3002/write_data'
-  if (url.lastIndexOf('/') === url.length - 1)
-    return trim(url) + 'v1/write/rum/replay'
-  return trim(url) + '/v1/write/rum/replay'
+
+function trim(str) {
+  return str.replace(TRIM_REGIX, '')
 }
+
 export function computeTransportConfiguration(initConfiguration) {
   var isIntakeUrl = function (url) {
     return false
@@ -40,12 +44,14 @@ export function computeTransportConfiguration(initConfiguration) {
     isServerError = initConfiguration.isServerError
   }
   return {
-    datakitUrl: getDatakitUrl(
-      initConfiguration.datakitUrl || initConfiguration.datakitOrigin
+    datakitUrl: getEndPointUrl(
+      initConfiguration.datakitUrl || initConfiguration.datakitOrigin,
+      'rum'
     ),
-    logsEndpoint: getLogsEndPoint(initConfiguration.datakitOrigin),
-    sessionReplayEndPoint: getSessionReplayEndPoint(
-      initConfiguration.datakitOrigin
+    logsEndpoint: getEndPointUrl(initConfiguration.datakitOrigin, 'log'),
+    sessionReplayEndPoint: getEndPointUrl(
+      initConfiguration.datakitOrigin,
+      'sessionReplay'
     ),
     isIntakeUrl: isIntakeUrl,
     isServerError: isServerError
@@ -57,6 +63,9 @@ export function isIntakeRequest(url, configuration) {
   if (configuration.logsEndpoint) {
     notTakeRequest.push(configuration.logsEndpoint)
   }
+  if (configuration.sessionReplayEndPoint) {
+    notTakeRequest.push(configuration.sessionReplayEndPoint)
+  }
   // datakit 地址，log 地址，以及客户自定义过滤方法定义url
   return (
     some(notTakeRequest, function (takeUrl) {

package/src/dataMap.js

@@ -62,7 +62,6 @@ export var dataMap = {
       dom_complete: 'view.dom_complete',
       load_event: 'view.load_event',
       first_input_time: 'view.first_input_time',
-      first_meaningful_paint: 'view.largest_contentful_paint',
       first_paint_time: 'view.fpt',
       resource_load_time: 'view.resource_load_time',
       time_to_interactive: 'view.tti',

package/src/transport/batch.js

@@ -109,10 +109,7 @@ export var processedMessageByDataMap = function (message) {
       if (message.type === RumEventType.LOGGER) {
         // 这里处理日志类型数据自定义字段
         each(message, function (value, key) {
-          if (
-            filterFileds.indexOf(key) === -1 &&
-            (isNumber(value) || isString(value) || isBoolean(value))
-          ) {
+          if (filterFileds.indexOf(key) === -1 && (isNumber(value) || value)) {
             rowData.fields[key] = value // 这里不需要转译
             fieldsStr.push(escapeRowData(key) + '=' + escapeRowField(value))
           }