@mswjs/interceptors 0.42.3 → 0.42.5

package/src/interceptors/fetch/web.ts

@@ -6,6 +6,7 @@ import { createRequestId } from '../../create-request-id'
 import { createNetworkError } from './utils/create-network-error'
 import { followFetchRedirect } from './utils/follow-redirect'
 import { decompressResponse } from './utils/decompression'
+import { cloneResponse } from '../../utils/clone-response'
 import { hasConfigurableGlobal } from '../../utils/has-configurable-global'
 import { FetchResponse } from '../../utils/fetch-utils'
 import { isResponseError } from '../../utils/response-utils'
@@ -79,7 +80,7 @@ export class FetchInterceptor extends Interceptor<HttpRequestEventMap> {
                 if (this.emitter.listenerCount('response') > 0) {
                   logger.verbose('emitting the "response" event')
 
-                  const responseClone = FetchResponse.clone(originalResponse)
+                  const [response, responseClone] = cloneResponse(originalResponse)
                   await this.emitter.emitAsPromise(
                     new HttpResponseEvent({
                       initiator: requestCloneForResponseEvent,
@@ -89,6 +90,9 @@ export class FetchInterceptor extends Interceptor<HttpRequestEventMap> {
                       responseType: 'original',
                     })
                   )
+
+                  responsePromise.resolve(response)
+                  return
                 }
 
                 // Resolve the response promise with the original response
@@ -151,6 +155,8 @@ export class FetchInterceptor extends Interceptor<HttpRequestEventMap> {
                 if (this.emitter.listenerCount('response') > 0) {
                   logger.verbose('emitting the "response" event')
 
+                  const [callerResponse, responseClone] = cloneResponse(response)
+
                   // Await the response listeners to finish before resolving
                   // the response promise. This ensures all your logic finishes
                   // before the interceptor resolves the pending response.
@@ -160,12 +166,15 @@ export class FetchInterceptor extends Interceptor<HttpRequestEventMap> {
                       // Clone the mocked response for the "response" event listener.
                       // This way, the listener can read the response and not lock its body
                       // for the actual fetch consumer.
-                      response: FetchResponse.clone(response),
+                      response: responseClone,
                       responseType: 'mock',
                       request,
                       requestId,
                     })
                   )
+
+                  responsePromise.resolve(callerResponse)
+                  return
                 }
 
                 responsePromise.resolve(response)

package/src/interceptors/http/http-parser/index.ts

@@ -29,6 +29,7 @@ const KIND_RESPONSE = constants.TYPE.RESPONSE
 type ParserKind = typeof KIND_REQUEST | typeof KIND_RESPONSE
 
 export interface ParserCallbacks<K extends ParserKind> {
+  onError?: (error: Error) => void
   onMessageBegin?: () => number | void
   onHeadersComplete?: (
     info: K extends typeof KIND_REQUEST
@@ -305,6 +306,13 @@ export class HttpParser<K extends ParserKind> {
     const buffer = new Uint8Array(llhttp_memory.buffer)
     const length = buffer.indexOf(0, errorPointer) - errorPointer
 
-    throw new Error(readStringFrom(errorPointer, length))
+    const error = new Error(readStringFrom(errorPointer, length))
+
+    if (this[kCallbacks].onError) {
+      this[kCallbacks].onError(error)
+      return
+    }
+
+    throw error
   }
 }

package/src/interceptors/http/http-parser.ts

@@ -4,6 +4,7 @@ import { FetchRequest, FetchResponse } from '../../utils/fetch-utils'
 import { HttpParser } from './http-parser/index'
 
 interface HttpRequestParserOptions {
+  onError: (error: Error) => void
   connectionOptions: {
     method?: string
     url: URL
@@ -18,6 +19,7 @@ export class HttpRequestParser extends HttpParser<1> {
 
   constructor(options: HttpRequestParserOptions) {
     super(1, {
+      onError: options.onError,
       onHeadersComplete: ({ rawHeaders, method, url: path, upgrade }) => {
         this.#upgrade = upgrade
         /**
@@ -82,6 +84,7 @@ export class HttpRequestParser extends HttpParser<1> {
       },
       onMessageComplete: () => {
         this.#requestBodyStream?.push(null)
+        this.#requestBodyStream = undefined
 
         /**
          * @note An upgraded exchange (e.g. "CONNECT", WebSocket) has
@@ -95,23 +98,30 @@ export class HttpRequestParser extends HttpParser<1> {
     })
   }
 
-  public free(): void {
+  public free(error?: Error): void {
     this.destroy()
-    this.#requestBodyStream?.destroy()
+    this.#requestBodyStream?.destroy(error)
     this.#requestBodyStream = undefined
   }
 }
 
 export class HttpResponseParser extends HttpParser<2> {
   #responseBodyStream?: Readable | null
+  #status = 0
 
-  constructor(options: { onResponse: (response: Response) => void }) {
+  constructor(options: {
+    onResponse: (response: Response) => void
+    onError: (error: Error) => void
+    onMessageComplete?: (status: number) => void
+  }) {
     super(2, {
+      onError: options.onError,
       onHeadersComplete: ({
         rawHeaders,
         statusCode: status,
         statusMessage: statusText,
       }) => {
+        this.#status = status
         const headers = FetchResponse.parseRawHeaders([...rawHeaders])
 
         const response = new FetchResponse(
@@ -139,12 +149,19 @@ export class HttpResponseParser extends HttpParser<2> {
       },
       onMessageComplete: () => {
         this.#responseBodyStream?.push(null)
+        this.#responseBodyStream = null
+        options.onMessageComplete?.(this.#status)
       },
     })
   }
 
-  public free(): void {
+  public free(error?: Error): void {
     this.destroy()
+
+    if (error) {
+      this.#responseBodyStream?.destroy(error)
+    }
+
     this.#responseBodyStream = null
   }
 }