feat: put back some utils extracted from replay for now

Author: logaretm

packages/browser-utils/src/index.ts

@@ -28,14 +28,7 @@ export { fetch, setTimeout, clearCachedImplementation, getNativeImplementation }
 
 export { addXhrInstrumentationHandler, SENTRY_XHR_DATA_KEY } from './instrument/xhr';
 
-export {
-  getBodyString,
-  getFetchRequestArgBody,
-  serializeFormData,
-  parseXhrResponseHeaders,
-  getFetchResponseHeaders,
-  filterAllowedHeaders,
-} from './networkUtils';
+export { getBodyString, getFetchRequestArgBody, serializeFormData, parseXhrResponseHeaders } from './networkUtils';
 
 export { resourceTimingToSpanAttributes } from './metrics/resourceTiming';
 

packages/browser-utils/src/networkUtils.ts

@@ -80,38 +80,3 @@ export function parseXhrResponseHeaders(xhr: XMLHttpRequest): Record<string, str
     return acc;
   }, {});
 }
-
-/**
- * Gets specific headers from a Headers object (Fetch API).
- * Extracted from replay internals to be reusable.
- */
-export function getFetchResponseHeaders(headers: Headers, allowedHeaders: string[]): Record<string, string> {
-  const allHeaders: Record<string, string> = {};
-
-  allowedHeaders.forEach(header => {
-    const value = headers.get(header);
-    if (value) {
-      allHeaders[header.toLowerCase()] = value;
-    }
-  });
-
-  return allHeaders;
-}
-
-/**
- * Filters headers based on an allowed list.
- * Extracted from replay internals to be reusable.
- */
-export function filterAllowedHeaders(
-  headers: Record<string, string>,
-  allowedHeaders: string[],
-): Record<string, string> {
-  return Object.entries(headers).reduce((filteredHeaders: Record<string, string>, [key, value]) => {
-    const normalizedKey = key.toLowerCase();
-    // Avoid putting empty strings into the headers
-    if (allowedHeaders.includes(normalizedKey) && value) {
-      filteredHeaders[normalizedKey] = value;
-    }
-    return filteredHeaders;
-  }, {});
-}

packages/replay-internal/src/coreHandlers/util/fetchUtils.ts

@@ -1,11 +1,6 @@
 import type { Breadcrumb, FetchBreadcrumbData } from '@sentry/core';
 import type { FetchHint, NetworkMetaWarning } from '@sentry-internal/browser-utils';
-import {
-  getBodyString,
-  getFetchRequestArgBody,
-  getFetchResponseHeaders,
-  setTimeout,
-} from '@sentry-internal/browser-utils';
+import { getBodyString, getFetchRequestArgBody, setTimeout } from '@sentry-internal/browser-utils';
 import { DEBUG_BUILD } from '../../debug-build';
 import type {
   ReplayContainer,
@@ -144,7 +139,7 @@ export async function _getResponseInfo(
     return buildSkippedNetworkRequestOrResponse(responseBodySize);
   }
 
-  const headers = response ? getFetchResponseHeaders(response.headers, networkResponseHeaders) : {};
+  const headers = response ? getAllHeaders(response.headers, networkResponseHeaders) : {};
 
   if (!response || (!networkCaptureBodies && responseBodySize !== undefined)) {
     return buildNetworkRequestOrResponse(headers, responseBodySize, undefined);
@@ -220,6 +215,18 @@ async function _parseFetchResponseBody(response: Response): Promise<[string | un
   }
 }
 
+function getAllHeaders(headers: Headers, allowedHeaders: string[]): Record<string, string> {
+  const allHeaders: Record<string, string> = {};
+
+  allowedHeaders.forEach(header => {
+    if (headers.get(header)) {
+      allHeaders[header] = headers.get(header) as string;
+    }
+  });
+
+  return allHeaders;
+}
+
 function getRequestHeaders(fetchArgs: unknown[], allowedHeaders: string[]): Record<string, string> {
   if (fetchArgs.length === 1 && typeof fetchArgs[0] !== 'string') {
     return getHeadersFromOptions(fetchArgs[0] as Request | RequestInit, allowedHeaders);
@@ -247,7 +254,7 @@ function getHeadersFromOptions(
   }
 
   if (headers instanceof Headers) {
-    return getFetchResponseHeaders(headers, allowedHeaders);
+    return getAllHeaders(headers, allowedHeaders);
   }
 
   // We do not support this, as it is not really documented (anymore?)