@newrelic/browser-agent 1.318.0-rc.5 → 1.318.0-rc.7

package/dist/cjs/common/constants/env.cdn.js

@@ -17,7 +17,7 @@ exports.VERSION = exports.RRWEB_VERSION = exports.RRWEB_PACKAGE_NAME = exports.D
 /**
  * Exposes the version of the agent
  */
-const VERSION = exports.VERSION = "1.318.0-rc.5";
+const VERSION = exports.VERSION = "1.318.0-rc.7";
 
 /**
  * Exposes the build type of the agent

package/dist/cjs/common/constants/env.npm.js

@@ -17,7 +17,7 @@ exports.VERSION = exports.RRWEB_VERSION = exports.RRWEB_PACKAGE_NAME = exports.D
 /**
  * Exposes the version of the agent
  */
-const VERSION = exports.VERSION = "1.318.0-rc.5";
+const VERSION = exports.VERSION = "1.318.0-rc.7";
 
 /**
  * Exposes the build type of the agent

package/dist/cjs/common/payloads/payloads.js

@@ -17,13 +17,31 @@ var _constants = require("../../features/ajax/constants");
 
 /**
  * Determines whether payload data should be captured based on the capture mode setting,
- * HTTP status code, and GraphQL error status.
+ * HTTP status code, and GraphQL error status.  Will never capture agent's own payloads.
  * @param {string} captureMode - The capture mode setting ('none', 'all', or 'failures')
- * @param {number} statusCode - The HTTP status code
- * @param {boolean} hasGQLErrors - Whether the response contains GraphQL errors
+ * @param {Object} event - An object representing the AJAX event
+ * @param {number} event.statusCode - The HTTP status code
+ * @param {boolean} event.hasGQLErrors - Whether the response contains GraphQL errors
+ * @param {string} event.payloadHost - The host of the AJAX payload (includes port)
+ * @param {string} event.payloadHostname - The hostname of the AJAX payload
+ * @param {string} [event.payloadPathname=''] - The pathname of the AJAX payload
+ * @param {string[]} [beacons=[]] - Array of beacon hostnames to avoid capturing
  * @returns {boolean} True if payload should be captured
  */
-function canCapturePayload(captureMode, statusCode, hasGQLErrors) {
+function canCapturePayload(captureMode, {
+  statusCode,
+  hasGQLErrors,
+  payloadHost,
+  payloadHostname,
+  payloadPathname = ''
+}, beacons = []) {
+  if (payloadHostname) {
+    const payloadUrl = payloadHostname + payloadPathname;
+    const payloadUrlWithPort = payloadHost + payloadPathname;
+    if (beacons.some(b => {
+      return b === payloadUrl || payloadUrl.startsWith(b + '/') || b === payloadUrlWithPort || payloadUrlWithPort.startsWith(b + '/');
+    })) return false;
+  }
   if (captureMode === _constants.CAPTURE_PAYLOAD_SETTINGS.ALL) return true;
   if (!captureMode || captureMode === _constants.CAPTURE_PAYLOAD_SETTINGS.NONE) return false;
 

package/dist/cjs/features/ajax/aggregate/index.js

@@ -103,7 +103,13 @@ class Aggregate extends _aggregateBase.AggregateBase {
     });
     if (event.gql) event.gql.operationHasErrors = (0, _gql.hasGQLErrors)(ctx.responseBody);
     const capturePayloadSetting = this.agentRef.init.ajax.capture_payloads;
-    const shouldCapturePayload = (0, _payloads.canCapturePayload)(capturePayloadSetting, params.status, event.gql?.operationHasErrors);
+    const shouldCapturePayload = (0, _payloads.canCapturePayload)(capturePayloadSetting, {
+      statusCode: event.status,
+      hasGQLErrors: event.gql?.operationHasErrors,
+      payloadHostname: params.hostname,
+      payloadHost: params.host,
+      payloadPathname: params.pathname
+    }, this.agentRef.beacons);
     if (shouldCapturePayload) {
       // Store raw data; obfuscation and truncation will happen in the serializer
       event.requestQuery = (0, _payloads.parseQueryString)(ctx.parsedOrigin?.search);

package/dist/esm/common/constants/env.cdn.js

@@ -11,7 +11,7 @@
 /**
  * Exposes the version of the agent
  */
-export const VERSION = "1.318.0-rc.5";
+export const VERSION = "1.318.0-rc.7";
 
 /**
  * Exposes the build type of the agent

package/dist/esm/common/constants/env.npm.js

@@ -11,7 +11,7 @@
 /**
  * Exposes the version of the agent
  */
-export const VERSION = "1.318.0-rc.5";
+export const VERSION = "1.318.0-rc.7";
 
 /**
  * Exposes the build type of the agent

package/dist/esm/common/payloads/payloads.js

@@ -8,13 +8,31 @@ import { CAPTURE_PAYLOAD_SETTINGS } from '../../features/ajax/constants';
 
 /**
  * Determines whether payload data should be captured based on the capture mode setting,
- * HTTP status code, and GraphQL error status.
+ * HTTP status code, and GraphQL error status.  Will never capture agent's own payloads.
  * @param {string} captureMode - The capture mode setting ('none', 'all', or 'failures')
- * @param {number} statusCode - The HTTP status code
- * @param {boolean} hasGQLErrors - Whether the response contains GraphQL errors
+ * @param {Object} event - An object representing the AJAX event
+ * @param {number} event.statusCode - The HTTP status code
+ * @param {boolean} event.hasGQLErrors - Whether the response contains GraphQL errors
+ * @param {string} event.payloadHost - The host of the AJAX payload (includes port)
+ * @param {string} event.payloadHostname - The hostname of the AJAX payload
+ * @param {string} [event.payloadPathname=''] - The pathname of the AJAX payload
+ * @param {string[]} [beacons=[]] - Array of beacon hostnames to avoid capturing
  * @returns {boolean} True if payload should be captured
  */
-export function canCapturePayload(captureMode, statusCode, hasGQLErrors) {
+export function canCapturePayload(captureMode, {
+  statusCode,
+  hasGQLErrors,
+  payloadHost,
+  payloadHostname,
+  payloadPathname = ''
+}, beacons = []) {
+  if (payloadHostname) {
+    const payloadUrl = payloadHostname + payloadPathname;
+    const payloadUrlWithPort = payloadHost + payloadPathname;
+    if (beacons.some(b => {
+      return b === payloadUrl || payloadUrl.startsWith(b + '/') || b === payloadUrlWithPort || payloadUrlWithPort.startsWith(b + '/');
+    })) return false;
+  }
   if (captureMode === CAPTURE_PAYLOAD_SETTINGS.ALL) return true;
   if (!captureMode || captureMode === CAPTURE_PAYLOAD_SETTINGS.NONE) return false;
 

package/dist/esm/features/ajax/aggregate/index.js

@@ -96,7 +96,13 @@ export class Aggregate extends AggregateBase {
     });
     if (event.gql) event.gql.operationHasErrors = hasGQLErrors(ctx.responseBody);
     const capturePayloadSetting = this.agentRef.init.ajax.capture_payloads;
-    const shouldCapturePayload = canCapturePayload(capturePayloadSetting, params.status, event.gql?.operationHasErrors);
+    const shouldCapturePayload = canCapturePayload(capturePayloadSetting, {
+      statusCode: event.status,
+      hasGQLErrors: event.gql?.operationHasErrors,
+      payloadHostname: params.hostname,
+      payloadHost: params.host,
+      payloadPathname: params.pathname
+    }, this.agentRef.beacons);
     if (shouldCapturePayload) {
       // Store raw data; obfuscation and truncation will happen in the serializer
       event.requestQuery = parseQueryString(ctx.parsedOrigin?.search);

package/dist/types/common/payloads/payloads.d.ts

@@ -1,12 +1,23 @@
 /**
  * Determines whether payload data should be captured based on the capture mode setting,
- * HTTP status code, and GraphQL error status.
+ * HTTP status code, and GraphQL error status.  Will never capture agent's own payloads.
  * @param {string} captureMode - The capture mode setting ('none', 'all', or 'failures')
- * @param {number} statusCode - The HTTP status code
- * @param {boolean} hasGQLErrors - Whether the response contains GraphQL errors
+ * @param {Object} event - An object representing the AJAX event
+ * @param {number} event.statusCode - The HTTP status code
+ * @param {boolean} event.hasGQLErrors - Whether the response contains GraphQL errors
+ * @param {string} event.payloadHost - The host of the AJAX payload (includes port)
+ * @param {string} event.payloadHostname - The hostname of the AJAX payload
+ * @param {string} [event.payloadPathname=''] - The pathname of the AJAX payload
+ * @param {string[]} [beacons=[]] - Array of beacon hostnames to avoid capturing
  * @returns {boolean} True if payload should be captured
  */
-export function canCapturePayload(captureMode: string, statusCode: number, hasGQLErrors: boolean): boolean;
+export function canCapturePayload(captureMode: string, { statusCode, hasGQLErrors, payloadHost, payloadHostname, payloadPathname }: {
+    statusCode: number;
+    hasGQLErrors: boolean;
+    payloadHost: string;
+    payloadHostname: string;
+    payloadPathname?: string | undefined;
+}, beacons?: string[]): boolean;
 /**
  * Parses a query string into an object of key-value pairs.
  * @param {string} search a query string starting with "?" or without (ex. new URL(...).search)

package/dist/types/common/payloads/payloads.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"payloads.d.ts","sourceRoot":"","sources":["../../../../src/common/payloads/payloads.js"],"names":[],"mappings":"AAQA;;;;;;;GAOG;AACH,+CALW,MAAM,cACN,MAAM,gBACN,OAAO,GACL,OAAO,CAQnB;AAED;;;;GAIG;AACH,yCAHW,MAAM,GACJ,MAAM,GAAC,SAAS,CAgB5B;AAED;;;;;GAKG;AACH,+CAJW,MAAM,QACN,GAAC,GACC,OAAO,CA2BnB;AAED;;;;;;GAMG;AACH,uCAHW,GAAC,GACC,MAAM,CA2BlB;AAED;;;;;;GAMG;AACH,8EAHW,MAAM,GACJ;IAAC,SAAS,WAAW;IAAC,uBAAuB,WAAU;CAAC,CAiBpE"}
+{"version":3,"file":"payloads.d.ts","sourceRoot":"","sources":["../../../../src/common/payloads/payloads.js"],"names":[],"mappings":"AAQA;;;;;;;;;;;;GAYG;AACH,+CAVW,MAAM,+EAEd;IAAsB,UAAU,EAAxB,MAAM;IACS,YAAY,EAA3B,OAAO;IACO,WAAW,EAAzB,MAAM;IACQ,eAAe,EAA7B,MAAM;IACS,eAAe;CACtC,YAAQ,MAAM,EAAE,GACN,OAAO,CAqBnB;AAED;;;;GAIG;AACH,yCAHW,MAAM,GACJ,MAAM,GAAC,SAAS,CAgB5B;AAED;;;;;GAKG;AACH,+CAJW,MAAM,QACN,GAAC,GACC,OAAO,CA2BnB;AAED;;;;;;GAMG;AACH,uCAHW,GAAC,GACC,MAAM,CA2BlB;AAED;;;;;;GAMG;AACH,8EAHW,MAAM,GACJ;IAAC,SAAS,WAAW;IAAC,uBAAuB,WAAU;CAAC,CAiBpE"}

package/dist/types/features/ajax/aggregate/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/features/ajax/aggregate/index.js"],"names":[],"mappings":"AAoBA;IACE,2BAAiC;IAEjC,2BA6BC;IAvBC,uBAA4D;IAyB9D,0GAqFC;IAED,+CAOC;IAED,iDAoEC;CACF;8BAjN6B,4BAA4B;2BAK/B,gCAAgC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/features/ajax/aggregate/index.js"],"names":[],"mappings":"AAoBA;IACE,2BAAiC;IAEjC,2BA6BC;IAvBC,uBAA4D;IAyB9D,0GA2FC;IAED,+CAOC;IAED,iDAoEC;CACF;8BAvN6B,4BAA4B;2BAK/B,gCAAgC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@newrelic/browser-agent",
-  "version": "1.318.0-rc.5",
+  "version": "1.318.0-rc.7",
   "private": false,
   "author": "New Relic Browser Agent Team <browser-agent@newrelic.com>",
   "description": "New Relic Browser Agent",

package/src/common/payloads/payloads.js

@@ -8,13 +8,31 @@ import { CAPTURE_PAYLOAD_SETTINGS } from '../../features/ajax/constants'
 
 /**
  * Determines whether payload data should be captured based on the capture mode setting,
- * HTTP status code, and GraphQL error status.
+ * HTTP status code, and GraphQL error status.  Will never capture agent's own payloads.
  * @param {string} captureMode - The capture mode setting ('none', 'all', or 'failures')
- * @param {number} statusCode - The HTTP status code
- * @param {boolean} hasGQLErrors - Whether the response contains GraphQL errors
+ * @param {Object} event - An object representing the AJAX event
+ * @param {number} event.statusCode - The HTTP status code
+ * @param {boolean} event.hasGQLErrors - Whether the response contains GraphQL errors
+ * @param {string} event.payloadHost - The host of the AJAX payload (includes port)
+ * @param {string} event.payloadHostname - The hostname of the AJAX payload
+ * @param {string} [event.payloadPathname=''] - The pathname of the AJAX payload
+ * @param {string[]} [beacons=[]] - Array of beacon hostnames to avoid capturing
  * @returns {boolean} True if payload should be captured
  */
-export function canCapturePayload (captureMode, statusCode, hasGQLErrors) {
+export function canCapturePayload (captureMode, {
+  statusCode,
+  hasGQLErrors,
+  payloadHost,
+  payloadHostname,
+  payloadPathname = ''
+}, beacons = []) {
+  if (payloadHostname) {
+    const payloadUrl = payloadHostname + payloadPathname
+    const payloadUrlWithPort = payloadHost + payloadPathname
+    if (beacons.some((b) => {
+      return b === payloadUrl || payloadUrl.startsWith(b + '/') || b === payloadUrlWithPort || payloadUrlWithPort.startsWith(b + '/')
+    })) return false
+  }
   if (captureMode === CAPTURE_PAYLOAD_SETTINGS.ALL) return true
   if (!captureMode || captureMode === CAPTURE_PAYLOAD_SETTINGS.NONE) return false
 

package/src/features/ajax/aggregate/index.js

@@ -109,7 +109,13 @@ export class Aggregate extends AggregateBase {
     if (event.gql) event.gql.operationHasErrors = hasGQLErrors(ctx.responseBody)
 
     const capturePayloadSetting = this.agentRef.init.ajax.capture_payloads
-    const shouldCapturePayload = canCapturePayload(capturePayloadSetting, params.status, event.gql?.operationHasErrors)
+    const shouldCapturePayload = canCapturePayload(capturePayloadSetting, {
+      statusCode: event.status,
+      hasGQLErrors: event.gql?.operationHasErrors,
+      payloadHostname: params.hostname,
+      payloadHost: params.host,
+      payloadPathname: params.pathname
+    }, this.agentRef.beacons)
 
     if (shouldCapturePayload) {
       // Store raw data; obfuscation and truncation will happen in the serializer