@cloudcare/browser-core 2.0.12 → 2.0.14

package/cjs/browser/fetchObservable.js

@@ -76,7 +76,12 @@ function afterSend(observable, responsePromise, startContext) {
       context.error = response;
     } else if ('status' in response) {
       context.response = response;
-      context.responseType = response.constructor === Response && response.type || ''; // issue The Response type getter can only be used on instances of Response
+
+      try {
+        context.responseType = response.constructor === Response && response.type || ''; // issue The Response type getter can only be used on instances of Response
+      } catch (err) {
+        context.responseType = '';
+      }
 
       context.status = response.status;
       context.isAborted = false;

package/cjs/configuration/transportConfiguration.js

@@ -60,7 +60,6 @@ function computeTransportConfiguration(initConfiguration) {
 }
 
 function isIntakeRequest(url, configuration) {
-  // return haveSameOrigin(url, configuration.datakitUrl)
   var notTakeRequest = [configuration.datakitUrl];
 
   if (configuration.logsEndpoint) {

package/cjs/dataMap.js

@@ -159,7 +159,9 @@ var dataMap = {
       action_error_count: 'action.error.count',
       action_resource_count: 'action.resource.count',
       action_frustration_types: 'action.frustration.type',
-      action_long_task_count: 'action.long_task.count'
+      action_long_task_count: 'action.long_task.count',
+      action_target: '_dd.action.target',
+      action_position: '_dd.action.position'
     }
   },
   browser_log: {

package/cjs/helper/serialisation/rowData.js

@@ -36,7 +36,7 @@ function escapeJsonValue(value) {
 }
 
 function escapeFieldValueStr(str) {
-  return '"' + str.replace(/\\/g, '\\\\').replace(/[\\]*"/g, '"').replace(/"/g, '\\"') + '"';
+  return '"' + str.replace(/\\/g, '\\\\').replace(/"/g, '\\"') + '"';
 }
 
 function escapeRowField(value) {

package/cjs/helper/tools.js

@@ -1960,7 +1960,7 @@ function isChromium() {
 
 
 function getLinkElementOrigin(element) {
-  if (element.origin) {
+  if (element.origin && element.origin !== 'null') {
     return element.origin;
   }
 

package/cjs/helper/urlPolyfill.js

@@ -8,7 +8,6 @@ exports.getHash = getHash;
 exports.getOrigin = getOrigin;
 exports.getPathName = getPathName;
 exports.getSearch = getSearch;
-exports.haveSameOrigin = haveSameOrigin;
 exports.isValidUrl = isValidUrl;
 exports.normalizeUrl = normalizeUrl;
 
@@ -24,11 +23,10 @@ function isValidUrl(url) {
   } catch (e) {
     return false;
   }
-}
+} // export function haveSameOrigin(url1, url2) {
+//   return getOrigin(url1) === getOrigin(url2)
+// }
 
-function haveSameOrigin(url1, url2) {
-  return getOrigin(url1) === getOrigin(url2);
-}
 
 function getOrigin(url) {
   return (0, _tools.getLinkElementOrigin)(buildUrl(url));

package/esm/browser/fetchObservable.js

@@ -64,7 +64,12 @@ function afterSend(observable, responsePromise, startContext) {
       context.error = response;
     } else if ('status' in response) {
       context.response = response;
-      context.responseType = response.constructor === Response && response.type || ''; // issue The Response type getter can only be used on instances of Response
+
+      try {
+        context.responseType = response.constructor === Response && response.type || ''; // issue The Response type getter can only be used on instances of Response
+      } catch (err) {
+        context.responseType = '';
+      }
 
       context.status = response.status;
       context.isAborted = false;

package/esm/configuration/transportConfiguration.js

@@ -50,7 +50,6 @@ export function computeTransportConfiguration(initConfiguration) {
   };
 }
 export function isIntakeRequest(url, configuration) {
-  // return haveSameOrigin(url, configuration.datakitUrl)
   var notTakeRequest = [configuration.datakitUrl];
 
   if (configuration.logsEndpoint) {

package/esm/dataMap.js

@@ -149,7 +149,9 @@ export var dataMap = {
       action_error_count: 'action.error.count',
       action_resource_count: 'action.resource.count',
       action_frustration_types: 'action.frustration.type',
-      action_long_task_count: 'action.long_task.count'
+      action_long_task_count: 'action.long_task.count',
+      action_target: '_dd.action.target',
+      action_position: '_dd.action.position'
     }
   },
   browser_log: {

package/esm/helper/serialisation/rowData.js

@@ -20,7 +20,7 @@ export function escapeJsonValue(value) {
   }
 }
 export function escapeFieldValueStr(str) {
-  return '"' + str.replace(/\\/g, '\\\\').replace(/[\\]*"/g, '"').replace(/"/g, '\\"') + '"';
+  return '"' + str.replace(/\\/g, '\\\\').replace(/"/g, '\\"') + '"';
 }
 export function escapeRowField(value) {
   if (typeof value === 'object' && value) {

package/esm/helper/tools.js

@@ -1621,7 +1621,7 @@ export function isChromium() {
  */
 
 export function getLinkElementOrigin(element) {
-  if (element.origin) {
+  if (element.origin && element.origin !== 'null') {
     return element.origin;
   }
 

package/esm/helper/urlPolyfill.js

@@ -8,10 +8,10 @@ export function isValidUrl(url) {
   } catch (e) {
     return false;
   }
-}
-export function haveSameOrigin(url1, url2) {
-  return getOrigin(url1) === getOrigin(url2);
-}
+} // export function haveSameOrigin(url1, url2) {
+//   return getOrigin(url1) === getOrigin(url2)
+// }
+
 export function getOrigin(url) {
   return getLinkElementOrigin(buildUrl(url));
 }

package/package.json

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

package/src/browser/fetchObservable.js

@@ -79,8 +79,13 @@ function afterSend(observable, responsePromise, startContext) {
       context.error = response
     } else if ('status' in response) {
       context.response = response
-      context.responseType =
-        (response.constructor === Response && response.type) || '' // issue The Response type getter can only be used on instances of Response
+      try {
+        context.responseType =
+          (response.constructor === Response && response.type) || '' // issue The Response type getter can only be used on instances of Response
+      } catch (err) {
+        context.responseType = ''
+      }
+
       context.status = response.status
       context.isAborted = false
     }

package/src/configuration/transportConfiguration.js

@@ -58,7 +58,6 @@ export function computeTransportConfiguration(initConfiguration) {
   }
 }
 export function isIntakeRequest(url, configuration) {
-  // return haveSameOrigin(url, configuration.datakitUrl)
   var notTakeRequest = [configuration.datakitUrl]
   if (configuration.logsEndpoint) {
     notTakeRequest.push(configuration.logsEndpoint)

package/src/dataMap.js

@@ -148,7 +148,9 @@ export var dataMap = {
       action_error_count: 'action.error.count',
       action_resource_count: 'action.resource.count',
       action_frustration_types: 'action.frustration.type',
-      action_long_task_count: 'action.long_task.count'
+      action_long_task_count: 'action.long_task.count',
+      action_target: '_dd.action.target',
+      action_position: '_dd.action.position'
     }
   },
   browser_log: {

package/src/helper/serialisation/rowData.js

@@ -21,14 +21,7 @@ export function escapeJsonValue(value) {
 }
 
 export function escapeFieldValueStr(str) {
-  return (
-    '"' +
-    str
-      .replace(/\\/g, '\\\\')
-      .replace(/[\\]*"/g, '"')
-      .replace(/"/g, '\\"') +
-    '"'
-  )
+  return '"' + str.replace(/\\/g, '\\\\').replace(/"/g, '\\"') + '"'
 }
 export function escapeRowField(value) {
   if (typeof value === 'object' && value) {

package/src/helper/tools.js

@@ -1603,7 +1603,7 @@ export function isChromium() {
  * https://developer.mozilla.org/en-US/docs/Web/API/HTMLHyperlinkElementUtils/origin
  */
 export function getLinkElementOrigin(element) {
-  if (element.origin) {
+  if (element.origin && element.origin !== 'null') {
     return element.origin
   }
   var sanitizedHost = element.host.replace(/(:80|:443)$/, '')

package/src/helper/urlPolyfill.js

@@ -12,9 +12,9 @@ export function isValidUrl(url) {
   }
 }
 
-export function haveSameOrigin(url1, url2) {
-  return getOrigin(url1) === getOrigin(url2)
-}
+// export function haveSameOrigin(url1, url2) {
+//   return getOrigin(url1) === getOrigin(url2)
+// }
 
 export function getOrigin(url) {
   return getLinkElementOrigin(buildUrl(url))