@mswjs/interceptors 0.22.10 → 0.22.11

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

@@ -7,12 +7,12 @@ var _chunkVQ4DZOBBjs = require('../../chunk-VQ4DZOBB.js');
 var _chunkZJOF5MEZjs = require('../../chunk-ZJOF5MEZ.js');
 
 
-var _chunk62KFIM4Wjs = require('../../chunk-62KFIM4W.js');
+var _chunk6KJ5M2VRjs = require('../../chunk-6KJ5M2VR.js');
 
 // src/interceptors/fetch/index.ts
 var _outvariant = require('outvariant');
 var _until = require('@open-draft/until');
-var _FetchInterceptor = class extends _chunk62KFIM4Wjs.Interceptor {
+var _FetchInterceptor = class extends _chunk6KJ5M2VRjs.Interceptor {
   constructor() {
     super(_FetchInterceptor.symbol);
   }
@@ -26,16 +26,17 @@ var _FetchInterceptor = class extends _chunk62KFIM4Wjs.Interceptor {
       'Failed to patch the "fetch" module: already patched.'
     );
     globalThis.fetch = async (input, init) => {
+      var _a;
       const requestId = _chunkZJOF5MEZjs.uuidv4.call(void 0, );
       const request = new Request(input, init);
-      this.log("[%s] %s", request.method, request.url);
+      this.logger.info("[%s] %s", request.method, request.url);
       const interactiveRequest = _chunkZJOF5MEZjs.toInteractiveRequest.call(void 0, request);
-      this.log(
+      this.logger.info(
         'emitting the "request" event for %d listener(s)...',
         this.emitter.listenerCount("request")
       );
       this.emitter.emit("request", interactiveRequest, requestId);
-      this.log("awaiting for the mocked response...");
+      this.logger.info("awaiting for the mocked response...");
       const resolverResult = await _until.until.call(void 0, async () => {
         await this.emitter.untilIdle(
           "request",
@@ -43,9 +44,9 @@ var _FetchInterceptor = class extends _chunk62KFIM4Wjs.Interceptor {
             return pendingRequestId === requestId;
           }
         );
-        this.log("all request listeners have been resolved!");
+        this.logger.info("all request listeners have been resolved!");
         const [mockedResponse2] = await interactiveRequest.respondWith.invoked();
-        this.log("event.respondWith called with:", mockedResponse2);
+        this.logger.info("event.respondWith called with:", mockedResponse2);
         return mockedResponse2;
       });
       if (resolverResult.error) {
@@ -56,8 +57,8 @@ var _FetchInterceptor = class extends _chunk62KFIM4Wjs.Interceptor {
         return Promise.reject(error);
       }
       const mockedResponse = resolverResult.data;
-      if (mockedResponse) {
-        this.log("received mocked response:", mockedResponse);
+      if (mockedResponse && !((_a = request.signal) == null ? void 0 : _a.aborted)) {
+        this.logger.info("received mocked response:", mockedResponse);
         const responseCloine = mockedResponse.clone();
         this.emitter.emit(
           "response",
@@ -74,10 +75,10 @@ var _FetchInterceptor = class extends _chunk62KFIM4Wjs.Interceptor {
         });
         return response;
       }
-      this.log("no mocked response received!");
+      this.logger.info("no mocked response received!");
       return pureFetch(request).then((response) => {
         const responseClone = response.clone();
-        this.log("original fetch performed", responseClone);
+        this.logger.info("original fetch performed", responseClone);
         this.emitter.emit(
           "response",
           responseClone,
@@ -97,7 +98,10 @@ var _FetchInterceptor = class extends _chunk62KFIM4Wjs.Interceptor {
         value: void 0
       });
       globalThis.fetch = pureFetch;
-      this.log('restored native "globalThis.fetch"!', globalThis.fetch.name);
+      this.logger.info(
+        'restored native "globalThis.fetch"!',
+        globalThis.fetch.name
+      );
     });
   }
 };

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

@@ -7,7 +7,7 @@ import {
 } from "../../chunk-STA6QBYM.mjs";
 import {
   Interceptor
-} from "../../chunk-6CRMKMDL.mjs";
+} from "../../chunk-3V5OWTY7.mjs";
 
 // src/interceptors/fetch/index.ts
 import { invariant } from "outvariant";
@@ -26,16 +26,17 @@ var _FetchInterceptor = class extends Interceptor {
       'Failed to patch the "fetch" module: already patched.'
     );
     globalThis.fetch = async (input, init) => {
+      var _a;
       const requestId = uuidv4();
       const request = new Request(input, init);
-      this.log("[%s] %s", request.method, request.url);
+      this.logger.info("[%s] %s", request.method, request.url);
       const interactiveRequest = toInteractiveRequest(request);
-      this.log(
+      this.logger.info(
         'emitting the "request" event for %d listener(s)...',
         this.emitter.listenerCount("request")
       );
       this.emitter.emit("request", interactiveRequest, requestId);
-      this.log("awaiting for the mocked response...");
+      this.logger.info("awaiting for the mocked response...");
       const resolverResult = await until(async () => {
         await this.emitter.untilIdle(
           "request",
@@ -43,9 +44,9 @@ var _FetchInterceptor = class extends Interceptor {
             return pendingRequestId === requestId;
           }
         );
-        this.log("all request listeners have been resolved!");
+        this.logger.info("all request listeners have been resolved!");
         const [mockedResponse2] = await interactiveRequest.respondWith.invoked();
-        this.log("event.respondWith called with:", mockedResponse2);
+        this.logger.info("event.respondWith called with:", mockedResponse2);
         return mockedResponse2;
       });
       if (resolverResult.error) {
@@ -56,8 +57,8 @@ var _FetchInterceptor = class extends Interceptor {
         return Promise.reject(error);
       }
       const mockedResponse = resolverResult.data;
-      if (mockedResponse) {
-        this.log("received mocked response:", mockedResponse);
+      if (mockedResponse && !((_a = request.signal) == null ? void 0 : _a.aborted)) {
+        this.logger.info("received mocked response:", mockedResponse);
         const responseCloine = mockedResponse.clone();
         this.emitter.emit(
           "response",
@@ -74,10 +75,10 @@ var _FetchInterceptor = class extends Interceptor {
         });
         return response;
       }
-      this.log("no mocked response received!");
+      this.logger.info("no mocked response received!");
       return pureFetch(request).then((response) => {
         const responseClone = response.clone();
-        this.log("original fetch performed", responseClone);
+        this.logger.info("original fetch performed", responseClone);
         this.emitter.emit(
           "response",
           responseClone,
@@ -97,7 +98,10 @@ var _FetchInterceptor = class extends Interceptor {
         value: void 0
       });
       globalThis.fetch = pureFetch;
-      this.log('restored native "globalThis.fetch"!', globalThis.fetch.name);
+      this.logger.info(
+        'restored native "globalThis.fetch"!',
+        globalThis.fetch.name
+      );
     });
   }
 };

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

@@ -2,9 +2,9 @@ import { ClientRequestInterceptor } from '../interceptors/ClientRequest/index.js
 import { XMLHttpRequestInterceptor } from '../interceptors/XMLHttpRequest/index.js';
 import 'http';
 import 'https';
-import '../Interceptor-b3a4098c.js';
+import '../Interceptor-f9dfe016.js';
+import '@open-draft/logger';
 import 'strict-event-emitter';
-import 'debug';
 
 /**
  * The default preset provisions the interception of requests

package/lib/node/presets/node.js

@@ -1,18 +1,18 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkA3X67VOLjs = require('../chunk-A3X67VOL.js');
+var _chunk7XU7Q63Wjs = require('../chunk-7XU7Q63W.js');
 
 
-var _chunkVTP5KY7Wjs = require('../chunk-VTP5KY7W.js');
-require('../chunk-MUUQLKVJ.js');
+var _chunk2OJRZCGSjs = require('../chunk-2OJRZCGS.js');
+require('../chunk-PKB2CXQV.js');
 require('../chunk-VQ4DZOBB.js');
 require('../chunk-ZJOF5MEZ.js');
-require('../chunk-62KFIM4W.js');
+require('../chunk-6KJ5M2VR.js');
 
 // src/presets/node.ts
 var node_default = [
-  new (0, _chunkA3X67VOLjs.ClientRequestInterceptor)(),
-  new (0, _chunkVTP5KY7Wjs.XMLHttpRequestInterceptor)()
+  new (0, _chunk7XU7Q63Wjs.ClientRequestInterceptor)(),
+  new (0, _chunk2OJRZCGSjs.XMLHttpRequestInterceptor)()
 ];
 
 

package/lib/node/presets/node.mjs

@@ -1,13 +1,13 @@
 import {
   ClientRequestInterceptor
-} from "../chunk-W27FTX2A.mjs";
+} from "../chunk-XVHIXGXD.mjs";
 import {
   XMLHttpRequestInterceptor
-} from "../chunk-EHQJSMSD.mjs";
-import "../chunk-RFVEKRYP.mjs";
+} from "../chunk-RL5IV5PL.mjs";
+import "../chunk-S5A4P4BZ.mjs";
 import "../chunk-GFH37L5D.mjs";
 import "../chunk-STA6QBYM.mjs";
-import "../chunk-6CRMKMDL.mjs";
+import "../chunk-3V5OWTY7.mjs";
 
 // src/presets/node.ts
 var node_default = [

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mswjs/interceptors",
   "description": "Low-level HTTP/HTTPS/XHR/fetch request interception library.",
-  "version": "0.22.10",
+  "version": "0.22.11",
   "main": "./lib/node/index.js",
   "module": "./lib/node/index.mjs",
   "types": "./lib/node/index.d.ts",
@@ -138,9 +138,8 @@
   },
   "dependencies": {
     "@open-draft/deferred-promise": "^2.1.0",
+    "@open-draft/logger": "^0.2.0",
     "@open-draft/until": "^2.0.0",
-    "@types/debug": "^4.1.7",
-    "debug": "^4.3.3",
     "headers-polyfill": "^3.1.0",
     "outvariant": "^1.2.1",
     "strict-event-emitter": "^0.5.0"

package/src/BatchInterceptor.ts

@@ -35,15 +35,15 @@ export class BatchInterceptor<
   }
 
   protected setup() {
-    const log = this.log.extend('setup')
+    const logger = this.logger.extend('setup')
 
-    log('applying all %d interceptors...', this.interceptors.length)
+    logger.info('applying all %d interceptors...', this.interceptors.length)
 
     for (const interceptor of this.interceptors) {
-      log('applying "%s" interceptor...', interceptor.constructor.name)
+      logger.info('applying "%s" interceptor...', interceptor.constructor.name)
       interceptor.apply()
 
-      log('adding interceptor dispose subscription')
+      logger.info('adding interceptor dispose subscription')
       this.subscriptions.push(() => interceptor.dispose())
     }
   }

package/src/Interceptor.ts

@@ -1,7 +1,7 @@
+import { Logger } from '@open-draft/logger'
 import { Listener } from 'strict-event-emitter'
 import { AsyncEventEmitter } from './utils/AsyncEventEmitter'
 import { nextTick } from './utils/nextTick'
-import { debug, Debugger } from './utils/debug'
 
 export type InterceptorEventMap = Record<string, any>
 export type InterceptorSubscription = () => void
@@ -37,7 +37,7 @@ export type ExtractEventNames<Events extends Record<string, any>> =
 export class Interceptor<Events extends InterceptorEventMap> {
   protected emitter: AsyncEventEmitter<Events>
   protected subscriptions: Array<InterceptorSubscription>
-  protected log: Debugger
+  protected logger: Logger
 
   public readyState: InterceptorReadyState
 
@@ -46,13 +46,13 @@ export class Interceptor<Events extends InterceptorEventMap> {
 
     this.emitter = new AsyncEventEmitter()
     this.subscriptions = []
-    this.log = debug(symbol.description!)
+    this.logger = new Logger(symbol.description!)
 
     // Do not limit the maximum number of listeners
     // so not to limit the maximum amount of parallel events emitted.
     this.emitter.setMaxListeners(0)
 
-    this.log('constructing the interceptor...')
+    this.logger.info('constructing the interceptor...')
   }
 
   /**
@@ -68,18 +68,18 @@ export class Interceptor<Events extends InterceptorEventMap> {
    * Returns an already running interceptor instance if it's present.
    */
   public apply(): void {
-    const log = this.log.extend('apply')
-    log('applying the interceptor...')
+    const logger = this.logger.extend('apply')
+    logger.info('applying the interceptor...')
 
     if (this.readyState === InterceptorReadyState.APPLIED) {
-      log('intercepted already applied!')
+      logger.info('intercepted already applied!')
       return
     }
 
     const shouldApply = this.checkEnvironment()
 
     if (!shouldApply) {
-      log('the interceptor cannot be applied in this environment!')
+      logger.info('the interceptor cannot be applied in this environment!')
       return
     }
 
@@ -89,7 +89,7 @@ export class Interceptor<Events extends InterceptorEventMap> {
     // This will ensure the interceptor can process events after it's
     // been disposed and re-applied again (it may be a singleton).
     this.emitter.activate()
-    log('activated the emiter!', this.emitter.readyState)
+    logger.info('activated the emiter!', this.emitter.readyState)
 
     // Whenever applying a new interceptor, check if it hasn't been applied already.
     // This enables to apply the same interceptor multiple times, for example from a different
@@ -97,11 +97,11 @@ export class Interceptor<Events extends InterceptorEventMap> {
     const runningInstance = this.getInstance()
 
     if (runningInstance) {
-      log('found a running instance, reusing...')
+      logger.info('found a running instance, reusing...')
 
       // Proxy any listeners you set on this instance to the running instance.
       this.on = (event, listener) => {
-        log('proxying the "%s" listener', event)
+        logger.info('proxying the "%s" listener', event)
 
         // Add listeners to the running instance so they appear
         // at the top of the event listeners list and are executed first.
@@ -111,7 +111,7 @@ export class Interceptor<Events extends InterceptorEventMap> {
         // it removes all listeners it has appended to the running interceptor instance.
         this.subscriptions.push(() => {
           runningInstance.emitter.removeListener(event, listener)
-          log('removed proxied "%s" listener!', event)
+          logger.info('removed proxied "%s" listener!', event)
         })
       }
 
@@ -122,7 +122,7 @@ export class Interceptor<Events extends InterceptorEventMap> {
       return
     }
 
-    log('no running instance found, setting up a new instance...')
+    logger.info('no running instance found, setting up a new instance...')
 
     // Setup the interceptor.
     this.setup()
@@ -149,17 +149,17 @@ export class Interceptor<Events extends InterceptorEventMap> {
     eventName: EventName,
     listener: Listener<Events[EventName]>
   ): void {
-    const log = this.log.extend('on')
+    const logger = this.logger.extend('on')
 
     if (
       this.readyState === InterceptorReadyState.DISPOSING ||
       this.readyState === InterceptorReadyState.DISPOSED
     ) {
-      log('cannot listen to events, already disposed!')
+      logger.info('cannot listen to events, already disposed!')
       return
     }
 
-    log('adding "%s" event listener:', eventName, listener.name)
+    logger.info('adding "%s" event listener:', eventName, listener.name)
 
     this.emitter.on(eventName, listener)
   }
@@ -168,18 +168,18 @@ export class Interceptor<Events extends InterceptorEventMap> {
    * Disposes of any side-effects this interceptor has introduced.
    */
   public dispose(): void {
-    const log = this.log.extend('dispose')
+    const logger = this.logger.extend('dispose')
 
     if (this.readyState === InterceptorReadyState.DISPOSED) {
-      log('cannot dispose, already disposed!')
+      logger.info('cannot dispose, already disposed!')
       return
     }
 
-    log('disposing the interceptor...')
+    logger.info('disposing the interceptor...')
     this.readyState = InterceptorReadyState.DISPOSING
 
     if (!this.getInstance()) {
-      log('no interceptors running, skipping dispose...')
+      logger.info('no interceptors running, skipping dispose...')
       return
     }
 
@@ -187,10 +187,10 @@ export class Interceptor<Events extends InterceptorEventMap> {
     // indicating that the interceptor is no longer running.
     this.clearInstance()
 
-    log('global symbol deleted:', getGlobalSymbol(this.symbol))
+    logger.info('global symbol deleted:', getGlobalSymbol(this.symbol))
 
     if (this.subscriptions.length > 0) {
-      log('disposing of %d subscriptions...', this.subscriptions.length)
+      logger.info('disposing of %d subscriptions...', this.subscriptions.length)
 
       for (const dispose of this.subscriptions) {
         dispose()
@@ -198,11 +198,11 @@ export class Interceptor<Events extends InterceptorEventMap> {
 
       this.subscriptions = []
 
-      log('disposed of all subscriptions!', this.subscriptions.length)
+      logger.info('disposed of all subscriptions!', this.subscriptions.length)
     }
 
     this.emitter.deactivate()
-    log('destroyed the listener!')
+    logger.info('destroyed the listener!')
 
     nextTick(() => {
       this.readyState = InterceptorReadyState.DISPOSED
@@ -211,17 +211,17 @@ export class Interceptor<Events extends InterceptorEventMap> {
 
   private getInstance(): this | undefined {
     const instance = getGlobalSymbol<this>(this.symbol)
-    this.log('retrieved global instance:', instance?.constructor?.name)
+    this.logger.info('retrieved global instance:', instance?.constructor?.name)
     return instance
   }
 
   private setInstance(): void {
     setGlobalSymbol(this.symbol, this)
-    this.log('set global instance!', this.symbol.description)
+    this.logger.info('set global instance!', this.symbol.description)
   }
 
   private clearInstance(): void {
     deleteGlobalSymbol(this.symbol)
-    this.log('cleared global instance!', this.symbol.description)
+    this.logger.info('cleared global instance!', this.symbol.description)
   }
 }

package/src/RemoteHttpInterceptor.ts

@@ -60,7 +60,10 @@ export class RemoteHttpInterceptor extends BatchInterceptor<
           : await request.text(),
       } as SerializedRequest)
 
-      this.log('sent serialized request to the child:', serializedRequest)
+      this.logger.info(
+        'sent serialized request to the child:',
+        serializedRequest
+      )
       process.send?.(`request:${serializedRequest}`)
 
       const responsePromise = new Promise<void>((resolve) => {
@@ -94,7 +97,7 @@ export class RemoteHttpInterceptor extends BatchInterceptor<
       })
 
       // Listen for the mocked response message from the parent.
-      this.log(
+      this.logger.info(
         'add "message" listener to the parent process',
         handleParentMessage
       )
@@ -136,13 +139,13 @@ export class RemoteHttpResolver extends Interceptor<HttpRequestEventMap> {
   }
 
   protected setup() {
-    const log = this.log.extend('setup')
+    const logger = this.logger.extend('setup')
 
     const handleChildMessage: NodeJS.MessageListener = async (message) => {
-      log('received message from child!', message)
+      logger.info('received message from child!', message)
 
       if (typeof message !== 'string' || !message.startsWith('request:')) {
-        log('unknown message, ignoring...')
+        logger.info('unknown message, ignoring...')
         return
       }
 
@@ -155,7 +158,7 @@ export class RemoteHttpResolver extends Interceptor<HttpRequestEventMap> {
         serializedRequest,
         requestReviver
       ) as RevivedRequest
-      log('parsed intercepted request', requestJson)
+      logger.info('parsed intercepted request', requestJson)
 
       const capturedRequest = new Request(requestJson.url, {
         method: requestJson.method,
@@ -179,7 +182,7 @@ export class RemoteHttpResolver extends Interceptor<HttpRequestEventMap> {
         return
       }
 
-      log('event.respondWith called with:', mockedResponse)
+      logger.info('event.respondWith called with:', mockedResponse)
       const responseClone = mockedResponse.clone()
       const responseText = await mockedResponse.text()
 
@@ -209,15 +212,18 @@ export class RemoteHttpResolver extends Interceptor<HttpRequestEventMap> {
         }
       )
 
-      log('sent serialized mocked response to the parent:', serializedResponse)
+      logger.info(
+        'sent serialized mocked response to the parent:',
+        serializedResponse
+      )
     }
 
     this.subscriptions.push(() => {
       this.process.removeListener('message', handleChildMessage)
-      log('removed the "message" listener from the child process!')
+      logger.info('removed the "message" listener from the child process!')
     })
 
-    log('adding a "message" listener to the child process')
+    logger.info('adding a "message" listener to the child process')
     this.process.addListener('message', handleChildMessage)
 
     this.process.once('error', () => this.dispose())

package/src/interceptors/ClientRequest/NodeClientRequest.test.ts

@@ -1,6 +1,7 @@
 import { vi, it, expect, beforeAll, afterAll } from 'vitest'
 import express from 'express'
 import { IncomingMessage } from 'http'
+import { Logger } from '@open-draft/logger'
 import { HttpServer } from '@open-draft/test-server/http'
 import { DeferredPromise } from '@open-draft/deferred-promise'
 import { NodeClientRequest } from './NodeClientRequest'
@@ -9,7 +10,6 @@ import { normalizeClientRequestArgs } from './utils/normalizeClientRequestArgs'
 import { AsyncEventEmitter } from '../../utils/AsyncEventEmitter'
 import { sleep } from '../../../test/helpers'
 import { HttpRequestEventMap } from '../../glossary'
-import { debug } from '../../utils/debug'
 
 interface ErrorConnectionRefused extends NodeJS.ErrnoException {
   address: string
@@ -26,7 +26,7 @@ const httpServer = new HttpServer((app) => {
   })
 })
 
-const log = debug('test')
+const logger = new Logger('test')
 
 beforeAll(async () => {
   await httpServer.listen()
@@ -44,7 +44,7 @@ it('gracefully finishes the request when it has a mocked response', async () =>
     }),
     {
       emitter,
-      log,
+      logger,
     }
   )
 
@@ -86,7 +86,7 @@ it('responds with a mocked response when requesting an existing hostname', async
     normalizeClientRequestArgs('http:', httpServer.http.url('/comment')),
     {
       emitter,
-      log,
+      logger,
     }
   )
 
@@ -116,7 +116,7 @@ it('performs the request as-is given resolver returned no mocked response', asyn
     }),
     {
       emitter,
-      log,
+      logger,
     }
   )
 
@@ -143,7 +143,7 @@ it('emits the ENOTFOUND error connecting to a non-existing hostname given no moc
   const emitter = new AsyncEventEmitter<HttpRequestEventMap>()
   const request = new NodeClientRequest(
     normalizeClientRequestArgs('http:', 'http://non-existing-url.com'),
-    { emitter, log }
+    { emitter, logger }
   )
   request.end()
 
@@ -163,7 +163,7 @@ it('emits the ECONNREFUSED error connecting to an inactive server given no mocke
     normalizeClientRequestArgs('http:', 'http://127.0.0.1:12345'),
     {
       emitter,
-      log,
+      logger,
     }
   )
 
@@ -188,7 +188,7 @@ it('does not emit ENOTFOUND error connecting to an inactive server given mocked
   const handleError = vi.fn()
   const request = new NodeClientRequest(
     normalizeClientRequestArgs('http:', 'http://non-existing-url.com'),
-    { emitter, log }
+    { emitter, logger }
   )
 
   emitter.on('request', async (request) => {
@@ -220,7 +220,7 @@ it('does not emit ECONNREFUSED error connecting to an inactive server given mock
     normalizeClientRequestArgs('http:', 'http://localhost:9876'),
     {
       emitter,
-      log,
+      logger,
     }
   )
 
@@ -256,7 +256,7 @@ it('sends the request body to the server given no mocked response', async () =>
     }),
     {
       emitter,
-      log,
+      logger,
     }
   )
 
@@ -284,7 +284,7 @@ it('does not send request body to the original server given mocked response', as
     }),
     {
       emitter,
-      log,
+      logger,
     }
   )