@mswjs/interceptors 0.33.3 → 0.34.0

package/lib/node/presets/node.d.ts

@@ -1,5 +1,6 @@
 import { ClientRequestInterceptor } from '../interceptors/ClientRequest/index.js';
 import { XMLHttpRequestInterceptor } from '../interceptors/XMLHttpRequest/index.js';
+import { FetchInterceptor } from '../interceptors/fetch/index.js';
 import '../Interceptor-a31b1217.js';
 import '@open-draft/deferred-promise';
 import '@open-draft/logger';
@@ -10,6 +11,6 @@ import 'node:net';
  * The default preset provisions the interception of requests
  * regardless of their type (http/https/XMLHttpRequest).
  */
-declare const _default: readonly [ClientRequestInterceptor, XMLHttpRequestInterceptor];
+declare const _default: readonly [ClientRequestInterceptor, XMLHttpRequestInterceptor, FetchInterceptor];
 
 export { _default as default };

package/lib/node/presets/node.js

@@ -5,6 +5,9 @@ var _chunkI57YSVAVjs = require('../chunk-I57YSVAV.js');
 
 var _chunkT34TGCMRjs = require('../chunk-T34TGCMR.js');
 require('../chunk-LK6DILFK.js');
+
+
+var _chunkUN335ZTDjs = require('../chunk-UN335ZTD.js');
 require('../chunk-IDEEMJ3F.js');
 require('../chunk-5WWNCLB3.js');
 require('../chunk-YGM3BCJU.js');
@@ -12,7 +15,8 @@ require('../chunk-YGM3BCJU.js');
 // src/presets/node.ts
 var node_default = [
   new (0, _chunkI57YSVAVjs.ClientRequestInterceptor)(),
-  new (0, _chunkT34TGCMRjs.XMLHttpRequestInterceptor)()
+  new (0, _chunkT34TGCMRjs.XMLHttpRequestInterceptor)(),
+  new (0, _chunkUN335ZTDjs.FetchInterceptor)()
 ];
 
 

package/lib/node/presets/node.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/presets/node.ts"],"names":[],"mappings":";;;;;;;;;;;;AAOA,IAAO,eAAQ;AAAA,EACb,IAAI,yBAAyB;AAAA,EAC7B,IAAI,0BAA0B;AAChC","sourcesContent":["import { ClientRequestInterceptor } from '../interceptors/ClientRequest'\nimport { XMLHttpRequestInterceptor } from '../interceptors/XMLHttpRequest'\n\n/**\n * The default preset provisions the interception of requests\n * regardless of their type (http/https/XMLHttpRequest).\n */\nexport default [\n  new ClientRequestInterceptor(),\n  new XMLHttpRequestInterceptor(),\n] as const\n"]}
+{"version":3,"sources":["../../../src/presets/node.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAQA,IAAO,eAAQ;AAAA,EACb,IAAI,yBAAyB;AAAA,EAC7B,IAAI,0BAA0B;AAAA,EAC9B,IAAI,iBAAiB;AACvB","sourcesContent":["import { ClientRequestInterceptor } from '../interceptors/ClientRequest'\nimport { XMLHttpRequestInterceptor } from '../interceptors/XMLHttpRequest'\nimport { FetchInterceptor } from '../interceptors/fetch'\n\n/**\n * The default preset provisions the interception of requests\n * regardless of their type (http/https/XMLHttpRequest).\n */\nexport default [\n  new ClientRequestInterceptor(),\n  new XMLHttpRequestInterceptor(),\n  new FetchInterceptor(),\n] as const\n"]}

package/lib/node/presets/node.mjs

@@ -5,6 +5,9 @@ import {
   XMLHttpRequestInterceptor
 } from "../chunk-RJGP7FQP.mjs";
 import "../chunk-6HYIRFX2.mjs";
+import {
+  FetchInterceptor
+} from "../chunk-RTGLFNO3.mjs";
 import "../chunk-BZ3Y7YV5.mjs";
 import "../chunk-KY3RJ2M3.mjs";
 import "../chunk-BUCULLYM.mjs";
@@ -12,7 +15,8 @@ import "../chunk-BUCULLYM.mjs";
 // src/presets/node.ts
 var node_default = [
   new ClientRequestInterceptor(),
-  new XMLHttpRequestInterceptor()
+  new XMLHttpRequestInterceptor(),
+  new FetchInterceptor()
 ];
 export {
   node_default as default

package/lib/node/presets/node.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/presets/node.ts"],"sourcesContent":["import { ClientRequestInterceptor } from '../interceptors/ClientRequest'\nimport { XMLHttpRequestInterceptor } from '../interceptors/XMLHttpRequest'\n\n/**\n * The default preset provisions the interception of requests\n * regardless of their type (http/https/XMLHttpRequest).\n */\nexport default [\n  new ClientRequestInterceptor(),\n  new XMLHttpRequestInterceptor(),\n] as const\n"],"mappings":";;;;;;;;;;;;AAOA,IAAO,eAAQ;AAAA,EACb,IAAI,yBAAyB;AAAA,EAC7B,IAAI,0BAA0B;AAChC;","names":[]}
+{"version":3,"sources":["../../../src/presets/node.ts"],"sourcesContent":["import { ClientRequestInterceptor } from '../interceptors/ClientRequest'\nimport { XMLHttpRequestInterceptor } from '../interceptors/XMLHttpRequest'\nimport { FetchInterceptor } from '../interceptors/fetch'\n\n/**\n * The default preset provisions the interception of requests\n * regardless of their type (http/https/XMLHttpRequest).\n */\nexport default [\n  new ClientRequestInterceptor(),\n  new XMLHttpRequestInterceptor(),\n  new FetchInterceptor(),\n] as const\n"],"mappings":";;;;;;;;;;;;;;;AAQA,IAAO,eAAQ;AAAA,EACb,IAAI,yBAAyB;AAAA,EAC7B,IAAI,0BAA0B;AAAA,EAC9B,IAAI,iBAAiB;AACvB;","names":[]}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mswjs/interceptors",
   "description": "Low-level HTTP/HTTPS/XHR/fetch request interception library.",
-  "version": "0.33.3",
+  "version": "0.34.0",
   "main": "./lib/node/index.js",
   "module": "./lib/node/index.mjs",
   "types": "./lib/node/index.d.ts",

package/src/interceptors/WebSocket/WebSocketOverride.ts

@@ -2,6 +2,7 @@ import { invariant } from 'outvariant'
 import type { WebSocketData } from './WebSocketTransport'
 import { bindEvent } from './utils/bindEvent'
 import { CloseEvent } from './utils/events'
+import { DeferredPromise } from '@open-draft/deferred-promise'
 
 export type WebSocketEventListener<
   EventType extends WebSocketEventMap[keyof WebSocketEventMap] = Event
@@ -10,6 +11,7 @@ export type WebSocketEventListener<
 const WEBSOCKET_CLOSE_CODE_RANGE_ERROR =
   'InvalidAccessError: close code out of user configurable range'
 
+export const kPassthroughPromise = Symbol('kPassthroughPromise')
 export const kOnSend = Symbol('kOnSend')
 export const kClose = Symbol('kClose')
 
@@ -37,6 +39,7 @@ export class WebSocketOverride extends EventTarget implements WebSocket {
   private _onerror: WebSocketEventListener | null = null
   private _onclose: WebSocketEventListener<CloseEvent> | null = null
 
+  private [kPassthroughPromise]: DeferredPromise<boolean>
   private [kOnSend]?: (data: WebSocketData) => void
 
   constructor(url: string | URL, protocols?: string | Array<string>) {
@@ -48,9 +51,15 @@ export class WebSocketOverride extends EventTarget implements WebSocket {
     this.readyState = this.CONNECTING
     this.bufferedAmount = 0
 
-    Reflect.set(this, 'readyState', this.CONNECTING)
-    queueMicrotask(() => {
-      Reflect.set(this, 'readyState', this.OPEN)
+    this[kPassthroughPromise] = new DeferredPromise<boolean>()
+
+    queueMicrotask(async () => {
+      if (await this[kPassthroughPromise]) {
+        return
+      }
+
+      this.readyState = this.OPEN
+
       this.protocol =
         typeof protocols === 'string'
           ? protocols
@@ -151,26 +160,24 @@ export class WebSocketOverride extends EventTarget implements WebSocket {
       WEBSOCKET_CLOSE_CODE_RANGE_ERROR
     )
 
-    if (this.readyState === this.CLOSING || this.readyState === this.CLOSED) {
-      return
-    }
-
     this[kClose](code, reason)
   }
 
   private [kClose](code: number = 1000, reason?: string): void {
+    /**
+     * @note Move this check here so that even internall closures,
+     * like those triggered by the `server` connection, are not
+     * performed twice.
+     */
+    if (this.readyState === this.CLOSING || this.readyState === this.CLOSED) {
+      return
+    }
+
     this.readyState = this.CLOSING
 
     queueMicrotask(() => {
       this.readyState = this.CLOSED
 
-      // Non-user-configurable close status codes
-      // represent connection termination and must
-      // emit the "error" event before closing.
-      if (code > 1000 && code <= 1015) {
-        this.dispatchEvent(bindEvent(this, new Event('error')))
-      }
-
       this.dispatchEvent(
         bindEvent(
           this,

package/src/interceptors/WebSocket/index.ts

@@ -5,7 +5,8 @@ import {
 } from './WebSocketClientConnection'
 import { WebSocketServerConnection } from './WebSocketServerConnection'
 import { WebSocketClassTransport } from './WebSocketClassTransport'
-import { WebSocketOverride } from './WebSocketOverride'
+import { kPassthroughPromise, WebSocketOverride } from './WebSocketOverride'
+import { bindEvent } from './utils/bindEvent'
 
 export { type WebSocketData, WebSocketTransport } from './WebSocketTransport'
 export {
@@ -82,20 +83,42 @@ export class WebSocketInterceptor extends Interceptor<WebSocketEventMap> {
         // so the client can modify WebSocket options, like "binaryType"
         // while the connection is already pending.
         queueMicrotask(() => {
+          const server = new WebSocketServerConnection(
+            socket,
+            transport,
+            createConnection
+          )
+
           // The "globalThis.WebSocket" class stands for
           // the client-side connection. Assume it's established
           // as soon as the WebSocket instance is constructed.
-          this.emitter.emit('connection', {
+          const hasConnectionListeners = this.emitter.emit('connection', {
             client: new WebSocketClientConnection(socket, transport),
-            server: new WebSocketServerConnection(
-              socket,
-              transport,
-              createConnection
-            ),
+            server,
             info: {
               protocols,
             },
           })
+
+          if (hasConnectionListeners) {
+            socket[kPassthroughPromise].resolve(false)
+          } else {
+            socket[kPassthroughPromise].resolve(true)
+
+            server.connect()
+
+            // Forward the "open" event from the original server
+            // to the mock WebSocket client in the case of a passthrough connection.
+            server.addEventListener('open', () => {
+              socket.dispatchEvent(bindEvent(socket, new Event('open')))
+
+              // Forward the original connection protocol to the
+              // mock WebSocket client.
+              if (server['realWebSocket']) {
+                socket.protocol = server['realWebSocket'].protocol
+              }
+            })
+          }
         })
 
         return socket

package/src/presets/node.ts

@@ -1,5 +1,6 @@
 import { ClientRequestInterceptor } from '../interceptors/ClientRequest'
 import { XMLHttpRequestInterceptor } from '../interceptors/XMLHttpRequest'
+import { FetchInterceptor } from '../interceptors/fetch'
 
 /**
  * The default preset provisions the interception of requests
@@ -8,4 +9,5 @@ import { XMLHttpRequestInterceptor } from '../interceptors/XMLHttpRequest'
 export default [
   new ClientRequestInterceptor(),
   new XMLHttpRequestInterceptor(),
+  new FetchInterceptor(),
 ] as const