@mswjs/interceptors 0.41.3 → 0.41.4

package/lib/node/index.d.cts

@@ -22,6 +22,25 @@ declare function encodeBuffer(text: string): Uint8Array;
 declare function decodeBuffer(buffer: ArrayBuffer, encoding?: string): string;
 //#endregion
 //#region src/utils/fetchUtils.d.ts
+interface FetchRequestInit extends Omit<RequestInit, 'mode'> {
+  mode?: RequestMode | 'websocket' | 'webtransport';
+  duplex?: 'half' | 'full';
+}
+declare class FetchRequest extends Request {
+  #private;
+  /**
+   * Check if the given request method is configurable.
+   * @see https://fetch.spec.whatwg.org/#methods
+   */
+  static isConfigurableMethod(method: string): boolean;
+  static isMethodWithBody(method: string): boolean;
+  /**
+   * Check if the given request `mode` is configurable.
+   * @see https://fetch.spec.whatwg.org/#concept-request-mode
+   */
+  static isConfigurableMode(mode: string): boolean;
+  constructor(input: URL | RequestInfo, init?: FetchRequestInit);
+}
 interface FetchResponseInit extends ResponseInit {
   url?: string;
 }
@@ -71,5 +90,5 @@ declare function getRawRequest(request: Request): unknown | undefined;
  */
 declare function resolveWebSocketUrl(url: string | URL): string;
 //#endregion
-export { BatchInterceptor, BatchInterceptorOptions, ExtractEventMapType, ExtractEventNames, FetchResponse, HttpRequestEventMap, INTERNAL_REQUEST_ID_HEADER_NAME, IS_PATCHED_MODULE, Interceptor, InterceptorEventMap, InterceptorReadyState, InterceptorSubscription, RequestController, type RequestControllerSource, RequestCredentials, createRequestId, decodeBuffer, deleteGlobalSymbol, encodeBuffer, getCleanUrl, getGlobalSymbol, getRawRequest, resolveWebSocketUrl };
+export { BatchInterceptor, BatchInterceptorOptions, ExtractEventMapType, ExtractEventNames, FetchRequest, FetchResponse, HttpRequestEventMap, INTERNAL_REQUEST_ID_HEADER_NAME, IS_PATCHED_MODULE, Interceptor, InterceptorEventMap, InterceptorReadyState, InterceptorSubscription, RequestController, type RequestControllerSource, RequestCredentials, createRequestId, decodeBuffer, deleteGlobalSymbol, encodeBuffer, getCleanUrl, getGlobalSymbol, getRawRequest, resolveWebSocketUrl };
 //# sourceMappingURL=index.d.cts.map

package/lib/node/index.d.mts

@@ -22,6 +22,25 @@ declare function encodeBuffer(text: string): Uint8Array;
 declare function decodeBuffer(buffer: ArrayBuffer, encoding?: string): string;
 //#endregion
 //#region src/utils/fetchUtils.d.ts
+interface FetchRequestInit extends Omit<RequestInit, 'mode'> {
+  mode?: RequestMode | 'websocket' | 'webtransport';
+  duplex?: 'half' | 'full';
+}
+declare class FetchRequest extends Request {
+  #private;
+  /**
+   * Check if the given request method is configurable.
+   * @see https://fetch.spec.whatwg.org/#methods
+   */
+  static isConfigurableMethod(method: string): boolean;
+  static isMethodWithBody(method: string): boolean;
+  /**
+   * Check if the given request `mode` is configurable.
+   * @see https://fetch.spec.whatwg.org/#concept-request-mode
+   */
+  static isConfigurableMode(mode: string): boolean;
+  constructor(input: URL | RequestInfo, init?: FetchRequestInit);
+}
 interface FetchResponseInit extends ResponseInit {
   url?: string;
 }
@@ -71,5 +90,5 @@ declare function getRawRequest(request: Request): unknown | undefined;
  */
 declare function resolveWebSocketUrl(url: string | URL): string;
 //#endregion
-export { BatchInterceptor, BatchInterceptorOptions, ExtractEventMapType, ExtractEventNames, FetchResponse, HttpRequestEventMap, INTERNAL_REQUEST_ID_HEADER_NAME, IS_PATCHED_MODULE, Interceptor, InterceptorEventMap, InterceptorReadyState, InterceptorSubscription, RequestController, type RequestControllerSource, RequestCredentials, createRequestId, decodeBuffer, deleteGlobalSymbol, encodeBuffer, getCleanUrl, getGlobalSymbol, getRawRequest, resolveWebSocketUrl };
+export { BatchInterceptor, BatchInterceptorOptions, ExtractEventMapType, ExtractEventNames, FetchRequest, FetchResponse, HttpRequestEventMap, INTERNAL_REQUEST_ID_HEADER_NAME, IS_PATCHED_MODULE, Interceptor, InterceptorEventMap, InterceptorReadyState, InterceptorSubscription, RequestController, type RequestControllerSource, RequestCredentials, createRequestId, decodeBuffer, deleteGlobalSymbol, encodeBuffer, getCleanUrl, getGlobalSymbol, getRawRequest, resolveWebSocketUrl };
 //# sourceMappingURL=index.d.mts.map

package/lib/node/index.mjs

@@ -1,6 +1,6 @@
 import { t as IS_PATCHED_MODULE } from "./glossary-glQBRnVD.mjs";
-import { c as InterceptorReadyState, i as RequestController, l as deleteGlobalSymbol, o as INTERNAL_REQUEST_ID_HEADER_NAME, r as createRequestId, s as Interceptor, t as FetchResponse, u as getGlobalSymbol } from "./fetchUtils-CoU35g3M.mjs";
-import { t as BatchInterceptor } from "./BatchInterceptor-DFaBPilf.mjs";
+import { a as RequestController, c as Interceptor, d as getGlobalSymbol, i as createRequestId, l as InterceptorReadyState, n as FetchResponse, s as INTERNAL_REQUEST_ID_HEADER_NAME, t as FetchRequest, u as deleteGlobalSymbol } from "./fetchUtils-BTrdMHGp.mjs";
+import { t as BatchInterceptor } from "./BatchInterceptor-BxgAXyLw.mjs";
 import { n as encodeBuffer, t as decodeBuffer } from "./bufferUtils-_8XfKIfX.mjs";
 import { t as getRawRequest } from "./getRawRequest-DnwmXyOW.mjs";
 
@@ -36,5 +36,5 @@ function resolveWebSocketUrl(url) {
 }
 
 //#endregion
-export { BatchInterceptor, FetchResponse, INTERNAL_REQUEST_ID_HEADER_NAME, IS_PATCHED_MODULE, Interceptor, InterceptorReadyState, RequestController, createRequestId, decodeBuffer, deleteGlobalSymbol, encodeBuffer, getCleanUrl, getGlobalSymbol, getRawRequest, resolveWebSocketUrl };
+export { BatchInterceptor, FetchRequest, FetchResponse, INTERNAL_REQUEST_ID_HEADER_NAME, IS_PATCHED_MODULE, Interceptor, InterceptorReadyState, RequestController, createRequestId, decodeBuffer, deleteGlobalSymbol, encodeBuffer, getCleanUrl, getGlobalSymbol, getRawRequest, resolveWebSocketUrl };
 //# sourceMappingURL=index.mjs.map

package/lib/node/interceptors/ClientRequest/index.cjs

@@ -1,6 +1,6 @@
-require('../../fetchUtils-BaY5iWXw.cjs');
-const require_ClientRequest = require('../../ClientRequest-2rDe54Ui.cjs');
-require('../../handleRequest-Bb7Y-XLw.cjs');
+require('../../fetchUtils-DE_q7tpr.cjs');
+const require_ClientRequest = require('../../ClientRequest-CMSXChAM.cjs');
+require('../../handleRequest-pLIe3KKo.cjs');
 require('../../node-dKdAf3tC.cjs');
 
 exports.ClientRequestInterceptor = require_ClientRequest.ClientRequestInterceptor;

package/lib/node/interceptors/ClientRequest/index.mjs

@@ -1,6 +1,6 @@
-import "../../fetchUtils-CoU35g3M.mjs";
-import { t as ClientRequestInterceptor } from "../../ClientRequest-Ca8Qykuv.mjs";
-import "../../handleRequest-Y97UwBbF.mjs";
+import "../../fetchUtils-BTrdMHGp.mjs";
+import { t as ClientRequestInterceptor } from "../../ClientRequest-Cl3Ky7Tw.mjs";
+import "../../handleRequest-CDabRyt1.mjs";
 import "../../node-DwCc6iuP.mjs";
 
 export { ClientRequestInterceptor };

package/lib/node/interceptors/XMLHttpRequest/index.cjs

@@ -1,6 +1,6 @@
-require('../../fetchUtils-BaY5iWXw.cjs');
+require('../../fetchUtils-DE_q7tpr.cjs');
 require('../../bufferUtils-DiCTqG-7.cjs');
-require('../../handleRequest-Bb7Y-XLw.cjs');
-const require_XMLHttpRequest = require('../../XMLHttpRequest-B7kJdYYI.cjs');
+require('../../handleRequest-pLIe3KKo.cjs');
+const require_XMLHttpRequest = require('../../XMLHttpRequest-Dj3xJgke.cjs');
 
 exports.XMLHttpRequestInterceptor = require_XMLHttpRequest.XMLHttpRequestInterceptor;

package/lib/node/interceptors/XMLHttpRequest/index.mjs

@@ -1,6 +1,6 @@
-import "../../fetchUtils-CoU35g3M.mjs";
+import "../../fetchUtils-BTrdMHGp.mjs";
 import "../../bufferUtils-_8XfKIfX.mjs";
-import "../../handleRequest-Y97UwBbF.mjs";
-import { t as XMLHttpRequestInterceptor } from "../../XMLHttpRequest-C8dIZpds.mjs";
+import "../../handleRequest-CDabRyt1.mjs";
+import { t as XMLHttpRequestInterceptor } from "../../XMLHttpRequest-BBbs-p9i.mjs";
 
 export { XMLHttpRequestInterceptor };

package/lib/node/interceptors/fetch/index.cjs

@@ -1,5 +1,5 @@
-require('../../fetchUtils-BaY5iWXw.cjs');
-require('../../handleRequest-Bb7Y-XLw.cjs');
-const require_fetch = require('../../fetch-BmXpK10r.cjs');
+require('../../fetchUtils-DE_q7tpr.cjs');
+require('../../handleRequest-pLIe3KKo.cjs');
+const require_fetch = require('../../fetch-BoCFyaYx.cjs');
 
 exports.FetchInterceptor = require_fetch.FetchInterceptor;

package/lib/node/interceptors/fetch/index.mjs

@@ -1,5 +1,5 @@
-import "../../fetchUtils-CoU35g3M.mjs";
-import "../../handleRequest-Y97UwBbF.mjs";
-import { t as FetchInterceptor } from "../../fetch-G1DVwDKG.mjs";
+import "../../fetchUtils-BTrdMHGp.mjs";
+import "../../handleRequest-CDabRyt1.mjs";
+import { t as FetchInterceptor } from "../../fetch-DmiwAmpu.mjs";
 
 export { FetchInterceptor };

package/lib/node/presets/node.cjs

@@ -1,10 +1,10 @@
-require('../fetchUtils-BaY5iWXw.cjs');
+require('../fetchUtils-DE_q7tpr.cjs');
 require('../bufferUtils-DiCTqG-7.cjs');
-const require_ClientRequest = require('../ClientRequest-2rDe54Ui.cjs');
-require('../handleRequest-Bb7Y-XLw.cjs');
+const require_ClientRequest = require('../ClientRequest-CMSXChAM.cjs');
+require('../handleRequest-pLIe3KKo.cjs');
 require('../node-dKdAf3tC.cjs');
-const require_XMLHttpRequest = require('../XMLHttpRequest-B7kJdYYI.cjs');
-const require_fetch = require('../fetch-BmXpK10r.cjs');
+const require_XMLHttpRequest = require('../XMLHttpRequest-Dj3xJgke.cjs');
+const require_fetch = require('../fetch-BoCFyaYx.cjs');
 
 //#region src/presets/node.ts
 /**

package/lib/node/presets/node.mjs

@@ -1,10 +1,10 @@
-import "../fetchUtils-CoU35g3M.mjs";
+import "../fetchUtils-BTrdMHGp.mjs";
 import "../bufferUtils-_8XfKIfX.mjs";
-import { t as ClientRequestInterceptor } from "../ClientRequest-Ca8Qykuv.mjs";
-import "../handleRequest-Y97UwBbF.mjs";
+import { t as ClientRequestInterceptor } from "../ClientRequest-Cl3Ky7Tw.mjs";
+import "../handleRequest-CDabRyt1.mjs";
 import "../node-DwCc6iuP.mjs";
-import { t as XMLHttpRequestInterceptor } from "../XMLHttpRequest-C8dIZpds.mjs";
-import { t as FetchInterceptor } from "../fetch-G1DVwDKG.mjs";
+import { t as XMLHttpRequestInterceptor } from "../XMLHttpRequest-BBbs-p9i.mjs";
+import { t as FetchInterceptor } from "../fetch-DmiwAmpu.mjs";
 
 //#region src/presets/node.ts
 /**

package/package.json

@@ -2,7 +2,7 @@
   "type": "commonjs",
   "name": "@mswjs/interceptors",
   "description": "Low-level HTTP/HTTPS/XHR/fetch request interception library.",
-  "version": "0.41.3",
+  "version": "0.41.4",
   "main": "./lib/node/index.cjs",
   "module": "./lib/node/index.mjs",
   "types": "./lib/node/index.d.cts",

package/src/RemoteHttpInterceptor.ts

@@ -7,7 +7,7 @@ import { XMLHttpRequestInterceptor } from './interceptors/XMLHttpRequest'
 import { FetchInterceptor } from './interceptors/fetch'
 import { handleRequest } from './utils/handleRequest'
 import { RequestController } from './RequestController'
-import { FetchResponse } from './utils/fetchUtils'
+import { FetchRequest, FetchResponse } from './utils/fetchUtils'
 import { isResponseError } from './utils/responseUtils'
 
 export interface SerializedRequest {
@@ -172,7 +172,7 @@ export class RemoteHttpResolver extends Interceptor<HttpRequestEventMap> {
 
       logger.info('parsed intercepted request', requestJson)
 
-      const request = new Request(requestJson.url, {
+      const request = new FetchRequest(requestJson.url, {
         method: requestJson.method,
         headers: new Headers(requestJson.headers),
         credentials: requestJson.credentials,

package/src/index.ts

@@ -10,6 +10,6 @@ export {
 export { createRequestId } from './createRequestId'
 export { getCleanUrl } from './utils/getCleanUrl'
 export { encodeBuffer, decodeBuffer } from './utils/bufferUtils'
-export { FetchResponse } from './utils/fetchUtils'
+export { FetchRequest, FetchResponse } from './utils/fetchUtils'
 export { getRawRequest } from './getRawRequest'
 export { resolveWebSocketUrl } from './utils/resolveWebSocketUrl'

package/src/interceptors/ClientRequest/MockHttpSocket.ts

@@ -15,7 +15,7 @@ import { isPropertyAccessible } from '../../utils/isPropertyAccessible'
 import { baseUrlFromConnectionOptions } from '../Socket/utils/baseUrlFromConnectionOptions'
 import { createRequestId } from '../../createRequestId'
 import { getRawFetchHeaders } from './utils/recordRawHeaders'
-import { FetchResponse } from '../../utils/fetchUtils'
+import { FetchRequest, FetchResponse } from '../../utils/fetchUtils'
 import { setRawRequest } from '../../getRawRequest'
 import { setRawRequestBodyStream } from '../../utils/node'
 import { freeParser } from './utils/parserUtils'
@@ -576,7 +576,7 @@ export class MockHttpSocket extends MockSocket {
     })
 
     const requestId = createRequestId()
-    this.request = new Request(url, {
+    this.request = new FetchRequest(url, {
       method,
       headers,
       credentials: 'same-origin',

package/src/interceptors/ClientRequest/utils/recordRawHeaders.ts

@@ -1,3 +1,5 @@
+import { FetchRequest, FetchResponse } from '../../../utils/fetchUtils'
+
 type HeaderTuple = [string, string]
 type RawHeaders = Array<HeaderTuple>
 type SetHeaderBehavior = 'set' | 'append'
@@ -92,6 +94,11 @@ export function recordRawFetchHeaders() {
       globalThis.Request = OriginalRequest
       globalThis.Response = OriginalResponse
 
+      Object.setPrototypeOf(FetchRequest, OriginalRequest)
+      Object.setPrototypeOf(FetchRequest.prototype, OriginalRequest.prototype)
+      Object.setPrototypeOf(FetchResponse, OriginalResponse)
+      Object.setPrototypeOf(FetchResponse.prototype, OriginalResponse.prototype)
+
       Reflect.deleteProperty(Headers, kRestorePatches)
     },
     enumerable: false,
@@ -222,6 +229,17 @@ export function recordRawFetchHeaders() {
       },
     }),
   })
+
+  /**
+   * Re-parent FetchRequest/FetchResponse so their `super()` calls go
+   * through the proxied globalThis.Request/Response above. Without this,
+   * FetchRequest extends the statically-captured (original) Request,
+   * bypassing the construct proxy that records raw headers.
+   */
+  Object.setPrototypeOf(FetchRequest, globalThis.Request)
+  Object.setPrototypeOf(FetchRequest.prototype, globalThis.Request.prototype)
+  Object.setPrototypeOf(FetchResponse, globalThis.Response)
+  Object.setPrototypeOf(FetchResponse.prototype, globalThis.Response.prototype)
 }
 
 export function restoreHeadersPrototype() {

package/src/interceptors/XMLHttpRequest/XMLHttpRequestController.ts

@@ -16,6 +16,7 @@ import { INTERNAL_REQUEST_ID_HEADER_NAME } from '../../Interceptor'
 import { createRequestId } from '../../createRequestId'
 import { getBodyByteLength } from './utils/getBodyByteLength'
 import { setRawRequest } from '../../getRawRequest'
+import { FetchRequest } from '../../utils/fetchUtils'
 
 const kIsRequestHandled = Symbol('kIsRequestHandled')
 const IS_NODE = isNodeProcess()
@@ -671,7 +672,7 @@ export class XMLHttpRequestController {
     const resolvedBody =
       body instanceof Document ? body.documentElement.innerText : body
 
-    const fetchRequest = new Request(this.url.href, {
+    const fetchRequest = new FetchRequest(this.url.href, {
       method: this.method,
       headers: this.requestHeaders,
       /**

package/src/interceptors/fetch/index.ts

@@ -12,7 +12,7 @@ import { createNetworkError } from './utils/createNetworkError'
 import { followFetchRedirect } from './utils/followRedirect'
 import { decompressResponse } from './utils/decompression'
 import { hasConfigurableGlobal } from '../../utils/hasConfigurableGlobal'
-import { FetchResponse } from '../../utils/fetchUtils'
+import { FetchRequest, FetchResponse } from '../../utils/fetchUtils'
 import { setRawRequest } from '../../getRawRequest'
 import { isResponseError } from '../../utils/responseUtils'
 
@@ -51,7 +51,7 @@ export class FetchInterceptor extends Interceptor<HttpRequestEventMap> {
           ? new URL(input, location.href)
           : input
 
-      const request = new Request(resolvedInput, init)
+      const request = new FetchRequest(resolvedInput, init)
 
       /**
        * @note Set the raw request only if a Request instance was provided to fetch.

package/src/utils/fetchUtils.test.ts

@@ -0,0 +1,85 @@
+import { describe, it, expect } from 'vitest'
+import { FetchRequest } from './fetchUtils'
+
+describe('FetchRequest', () => {
+  const URL = 'https://example.com/'
+
+  it('passes instanceof check with the regular Request', () => {
+    expect(new FetchRequest(URL)).toBeInstanceOf(Request)
+  })
+
+  it('creates a request with a non-configurable method', () => {
+    expect
+      .soft(new FetchRequest(URL, { method: 'CONNECT' }))
+      .toHaveProperty('method', 'CONNECT')
+
+    expect
+      .soft(new FetchRequest(URL, { method: 'TRACE' }))
+      .toHaveProperty('method', 'TRACE')
+    expect
+      .soft(new FetchRequest(new FetchRequest(URL, { method: 'TRACE' })))
+      .toHaveProperty('method', 'TRACE')
+
+    expect
+      .soft(new FetchRequest(URL, { method: 'TRACK' }))
+      .toHaveProperty('method', 'TRACK')
+    expect
+      .soft(new FetchRequest(new FetchRequest(URL, { method: 'TRACK' })))
+      .toHaveProperty('method', 'TRACK')
+  })
+
+  it('creates a request with a non-configurable mode', () => {
+    expect
+      .soft(new FetchRequest(URL, { mode: 'navigate' }))
+      .toHaveProperty('mode', 'navigate')
+    expect
+      .soft(new FetchRequest(new FetchRequest(URL, { mode: 'navigate' })))
+      .toHaveProperty('mode', 'navigate')
+
+    expect
+      .soft(new FetchRequest(URL, { mode: 'websocket' }))
+      .toHaveProperty('mode', 'websocket')
+    expect
+      .soft(new FetchRequest(new FetchRequest(URL, { mode: 'websocket' })))
+      .toHaveProperty('mode', 'websocket')
+
+    expect
+      .soft(new FetchRequest(URL, { mode: 'webtransport' }))
+      .toHaveProperty('mode', 'webtransport')
+    expect
+      .soft(new FetchRequest(new FetchRequest(URL, { mode: 'webtransport' })))
+      .toHaveProperty('mode', 'webtransport')
+  })
+
+  it('ignores body for the requests without a body', () => {
+    expect
+      .soft(new FetchRequest(URL, { body: null }))
+      .toHaveProperty('body', null)
+    expect
+      .soft(new FetchRequest(URL, { body: undefined }))
+      .toHaveProperty('body', null)
+    expect
+      .soft(new FetchRequest(URL, { body: 'hello' }))
+      .toHaveProperty('body', null)
+
+    expect
+      .soft(new FetchRequest(URL, { method: 'GET', body: 'hello' }))
+      .toHaveProperty('body', null)
+    expect
+      .soft(new FetchRequest(URL, { method: 'HEAD', body: 'hello' }))
+      .toHaveProperty('body', null)
+    expect
+      .soft(new FetchRequest(URL, { method: 'CONNECT', body: 'hello' }))
+      .toHaveProperty('body', null)
+    expect
+      .soft(new FetchRequest(URL, { method: 'TRACE', body: 'hello' }))
+      .toHaveProperty('body', null)
+    expect
+      .soft(new FetchRequest(URL, { method: 'TRACK', body: 'hello' }))
+      .toHaveProperty('body', null)
+
+    expect
+      .soft(new FetchRequest(URL, { method: 'POST', body: 'hello' }))
+      .toHaveProperty('body', expect.any(ReadableStream))
+  })
+})

package/src/utils/fetchUtils.ts

@@ -1,11 +1,147 @@
 import { canParseUrl } from './canParseUrl'
 import { getValueBySymbol } from './getValueBySymbol'
 
+interface UndiciRequestState extends RequestInit {}
+
+interface FetchRequestInit extends Omit<RequestInit, 'mode'> {
+  mode?: RequestMode | 'websocket' | 'webtransport'
+  duplex?: 'half' | 'full'
+}
+
+export class FetchRequest extends Request {
+  static #resolveProperty<T extends keyof FetchRequestInit & keyof Request>(
+    input: RequestInfo | URL,
+    init: FetchRequestInit = {},
+    key: T
+  ): FetchRequestInit[T] {
+    return init[key] ?? (input instanceof Request ? input[key] : undefined)
+  }
+
+  /**
+   * Check if the given request method is configurable.
+   * @see https://fetch.spec.whatwg.org/#methods
+   */
+  static isConfigurableMethod(method: string): boolean {
+    return method !== 'CONNECT' && method !== 'TRACE' && method !== 'TRACK'
+  }
+
+  static isMethodWithBody(method: string): boolean {
+    return (
+      method !== 'HEAD' &&
+      method !== 'GET' &&
+      FetchRequest.isConfigurableMethod(method)
+    )
+  }
+
+  /**
+   * Check if the given request `mode` is configurable.
+   * @see https://fetch.spec.whatwg.org/#concept-request-mode
+   */
+  static isConfigurableMode(mode: string): boolean {
+    return (
+      mode !== 'navigate' && mode !== 'websocket' && mode !== 'webtransport'
+    )
+  }
+
+  constructor(input: URL | RequestInfo, init?: FetchRequestInit) {
+    const method = FetchRequest.#resolveProperty(input, init, 'method') || 'GET'
+    const safeMethod = FetchRequest.isConfigurableMethod(method)
+      ? method
+      : 'GET'
+
+    const hasExplicitBody = init != null && 'body' in init
+
+    /**
+     * Only include `body` in the super init when it needs to be overridden.
+     * When `input` is a Request and no explicit body is in `init`, let the
+     * Request constructor handle body transfer naturally so it properly
+     * marks the original request's body as consumed (bodyUsed = true).
+     */
+    const bodyInit: { body?: BodyInit | null } = !FetchRequest.isMethodWithBody(
+      method
+    )
+      ? { body: undefined }
+      : hasExplicitBody
+        ? { body: init.body }
+        : {}
+
+    const mode =
+      (FetchRequest.#resolveProperty(input, init, 'mode') as RequestMode) ??
+      undefined
+    const safeMode = FetchRequest.isConfigurableMode(mode) ? mode : undefined
+
+    super(input, {
+      ...(init || {}),
+      method: safeMethod,
+      mode: safeMode,
+      // @ts-expect-error Untyped Node.js property.
+      duplex:
+        init?.duplex ??
+        (FetchRequest.isMethodWithBody(method) ? 'half' : undefined),
+      ...bodyInit,
+    })
+
+    if (method !== safeMethod) {
+      this.#setInternalProperty('method', method)
+    }
+
+    if (method === 'CONNECT') {
+      const url = new URL(input instanceof Request ? input.url : input)
+
+      let authority: string
+
+      /**
+       * @note Node.js has a bug parsing raw CONNECT requests URLs like
+       * "http://127.0.0.1:1337/localhost:80". It would treat "localhost:" as a protocol.
+       */
+      if (url.protocol === 'localhost:') {
+        authority = url.href
+      } else {
+        authority = url.pathname.replace(/^\/+/, '')
+      }
+
+      /**
+       * @note Define "url" as a getter because Undici uses their own
+       * logic to resolve the "request.url" property. Simply reassigning
+       * its value doesn't do anything. This is a destructive action
+       * but it's safe because "CONNECT" requests are forbidden per fetch.
+       */
+      Object.defineProperty(this, 'url', {
+        get: () => authority,
+        enumerable: true,
+        configurable: true,
+      })
+    }
+
+    if (mode != null && mode !== safeMode) {
+      this.#setInternalProperty('mode', mode)
+    }
+  }
+
+  #setInternalProperty<T extends keyof Request>(
+    key: T,
+    value: Request[T]
+  ): void {
+    const internalState = getValueBySymbol<UndiciRequestState>('state', this)
+
+    if (internalState) {
+      Reflect.set(internalState, key, value)
+    } else {
+      Object.defineProperty(this, key, {
+        value,
+        enumerable: true,
+        configurable: true,
+        writable: false,
+      })
+    }
+  }
+}
+
 export interface FetchResponseInit extends ResponseInit {
   url?: string
 }
 
-interface UndiciFetchInternalState {
+interface UndiciResponseState {
   aborted: boolean
   rangeRequested: boolean
   timingAllowPassed: boolean
@@ -54,7 +190,7 @@ export class FetchResponse extends Response {
       return
     }
 
-    const state = getValueBySymbol<UndiciFetchInternalState>('state', response)
+    const state = getValueBySymbol<UndiciResponseState>('state', response)
 
     if (state) {
       // In Undici, push the URL to the internal list of URLs.
@@ -100,7 +236,7 @@ export class FetchResponse extends Response {
        * @note Undici keeps an internal "Symbol(state)" that holds
        * the actual value of response status. Update that in Node.js.
        */
-      const state = getValueBySymbol<UndiciFetchInternalState>('state', this)
+      const state = getValueBySymbol<UndiciResponseState>('state', this)
 
       if (state) {
         state.status = status