msw 2.11.1 → 2.11.3

package/src/core/utils/handleRequest.ts

@@ -1,4 +1,4 @@
-import { until } from '@open-draft/until'
+import { until } from 'until-async'
 import { Emitter } from 'strict-event-emitter'
 import { LifeCycleEventsMap, SharedOptions } from '../sharedOptions'
 import { RequiredDeep } from '../typeUtils'
@@ -54,7 +54,7 @@ export async function handleRequest(
   }
 
   // Resolve a mocked response from the list of request handlers.
-  const lookupResult = await until(() => {
+  const [lookupError, lookupResult] = await until(() => {
     return executeHandlers({
       request,
       requestId,
@@ -63,19 +63,19 @@ export async function handleRequest(
     })
   })
 
-  if (lookupResult.error) {
+  if (lookupError) {
     // Allow developers to react to unhandled exceptions in request handlers.
     emitter.emit('unhandledException', {
-      error: lookupResult.error,
+      error: lookupError,
       request,
       requestId,
     })
-    throw lookupResult.error
+    throw lookupError
   }
 
   // If the handler lookup returned nothing, no request handler was found
   // matching this request. Report the request as unhandled.
-  if (!lookupResult.data) {
+  if (!lookupResult) {
     await onUnhandledRequest(request, options.onUnhandledRequest)
     emitter.emit('request:unhandled', { request, requestId })
     emitter.emit('request:end', { request, requestId })
@@ -83,7 +83,7 @@ export async function handleRequest(
     return
   }
 
-  const { response } = lookupResult.data
+  const { response } = lookupResult
 
   // When the handled request returned no mocked response, warn the developer,
   // as it may be an oversight on their part. Perform the request as-is.
@@ -110,7 +110,7 @@ export async function handleRequest(
   emitter.emit('request:match', { request, requestId })
 
   const requiredLookupResult =
-    lookupResult.data as RequiredDeep<HandlersExecutionResult>
+    lookupResult as RequiredDeep<HandlersExecutionResult>
 
   handleRequestOptions?.onMockedResponse?.(response, requiredLookupResult)
 

package/src/core/utils/internal/devUtils.ts

@@ -14,7 +14,6 @@ function formatMessage(message: string, ...positionals: any[]): string {
  * Prints a library-specific warning.
  */
 function warn(message: string, ...positionals: any[]): void {
-  // eslint-disable-next-line no-console
   console.warn(formatMessage(message, ...positionals))
 }
 
@@ -22,7 +21,6 @@ function warn(message: string, ...positionals: any[]): void {
  * Prints a library-specific error.
  */
 function error(message: string, ...positionals: any[]): void {
-  // eslint-disable-next-line no-console
   console.error(formatMessage(message, ...positionals))
 }
 

package/src/core/utils/internal/getCallFrame.ts

@@ -1,8 +1,8 @@
 // Ignore the source files traces for local testing.
-const SOURCE_FRAME = /[\/\\]msw[\/\\]src[\/\\](.+)/
+const SOURCE_FRAME = /[/\\]msw[/\\]src[/\\](.+)/
 
 const BUILD_FRAME =
-  /(node_modules)?[\/\\]lib[\/\\](core|browser|node|native|iife)[\/\\]|^[^\/\\]*$/
+  /(node_modules)?[/\\]lib[/\\](core|browser|node|native|iife)[/\\]|^[^/\\]*$/
 
 /**
  * Return the stack trace frame of a function's invocation.

package/src/core/utils/internal/parseGraphQLRequest.ts

@@ -168,6 +168,7 @@ async function getGraphQLInput(request: Request): Promise<GraphQLInput | null> {
           variables,
         }
       }
+      return null
     }
 
     default:

package/src/core/utils/matching/matchRequestUrl.ts

@@ -42,13 +42,13 @@ export function coercePath(path: string): string {
        * Escape the port so that "path-to-regexp" can match
        * absolute URLs including port numbers.
        */
-      .replace(/([^\/])(:)(?=\d+)/, '$1\\$2')
+      .replace(/([^/])(:)(?=\d+)/, '$1\\$2')
       /**
        * Escape the protocol so that "path-to-regexp" could match
        * absolute URL.
        * @see https://github.com/pillarjs/path-to-regexp/issues/259
        */
-      .replace(/^([^\/]+)(:)(?=\/\/)/, '$1\\$2')
+      .replace(/^([^/]+)(:)(?=\/\/)/, '$1\\$2')
   )
 }
 

package/src/core/utils/request/onUnhandledRequest.test.ts

@@ -17,7 +17,7 @@ Read more: https://mswjs.io/docs/http/intercepting-requests`,
 
   • POST ${url}
 
-  • Request body: {\"variables\":{\"id\":\"abc-123\"},\"query\":\"query UserName($id: String!) { user(id: $id) { name } }\"}
+  • Request body: {"variables":{"id":"abc-123"},"query":"query UserName($id: String!) { user(id: $id) { name } }"}
 
 If you still wish to intercept this unhandled request, please create a request handler for it.
 Read more: https://mswjs.io/docs/http/intercepting-requests`,

package/src/core/utils/url/cleanUrl.ts

@@ -1,4 +1,4 @@
-const REDUNDANT_CHARACTERS_EXP = /[\?|#].*$/g
+const REDUNDANT_CHARACTERS_EXP = /[?|#].*$/g
 
 export function getSearchParams(path: string) {
   return new URL(`/${path}`, 'http://localhost').searchParams

package/src/core/utils/url/isAbsoluteUrl.ts

@@ -2,5 +2,5 @@
  * Determines if the given URL string is an absolute URL.
  */
 export function isAbsoluteUrl(url: string): boolean {
-  return /^([a-z][a-z\d\+\-\.]*:)?\/\//i.test(url)
+  return /^([a-z][a-z\d+\-.]*:)?\/\//i.test(url)
 }

package/src/core/ws/WebSocketIndexedDBClientStore.ts

@@ -34,7 +34,6 @@ export class WebSocketIndexedDBClientStore implements WebSocketClientStore {
       promise.resolve()
     }
     request.onerror = () => {
-      // eslint-disable-next-line no-console
       console.error(request.error)
       promise.reject(
         new Error(
@@ -81,7 +80,6 @@ export class WebSocketIndexedDBClientStore implements WebSocketClientStore {
       promise.resolve()
     }
     store.transaction.onerror = () => {
-      // eslint-disable-next-line no-console
       console.error(store.transaction.error)
       promise.reject(
         new Error(
@@ -116,7 +114,6 @@ export class WebSocketIndexedDBClientStore implements WebSocketClientStore {
         promise.resolve(db)
       }
       store.transaction.onerror = () => {
-        // eslint-disable-next-line no-console
         console.error(store.transaction.error)
         promise.reject(
           new Error(
@@ -126,7 +123,6 @@ export class WebSocketIndexedDBClientStore implements WebSocketClientStore {
       }
     }
     request.onerror = () => {
-      // eslint-disable-next-line no-console
       console.error(request.error)
       promise.reject(
         new Error(

package/src/core/ws/utils/attachWebSocketLogger.ts

@@ -113,7 +113,6 @@ export function attachWebSocketLogger(
 export function logConnectionOpen(client: WebSocketClientConnection) {
   const publicUrl = toPublicUrl(client.url)
 
-  // eslint-disable-next-line no-console
   console.groupCollapsed(
     devUtils.formatMessage(`${getTimestamp()} %c▶%c ${publicUrl}`),
     `color:${colors.system}`,
@@ -121,7 +120,6 @@ export function logConnectionOpen(client: WebSocketClientConnection) {
   )
   // eslint-disable-next-line no-console
   console.log('Client:', client.socket)
-  // eslint-disable-next-line no-console
   console.groupEnd()
 }
 
@@ -129,7 +127,6 @@ function logConnectionClose(event: CloseEvent) {
   const target = event.target as WebSocket
   const publicUrl = toPublicUrl(target.url)
 
-  // eslint-disable-next-line no-console
   console.groupCollapsed(
     devUtils.formatMessage(
       `${getTimestamp({ milliseconds: true })} %c■%c ${publicUrl}`,
@@ -139,7 +136,6 @@ function logConnectionClose(event: CloseEvent) {
   )
   // eslint-disable-next-line no-console
   console.log(event)
-  // eslint-disable-next-line no-console
   console.groupEnd()
 }
 
@@ -147,7 +143,6 @@ function logClientError(event: Event) {
   const socket = event.target as WebSocket
   const publicUrl = toPublicUrl(socket.url)
 
-  // eslint-disable-next-line no-console
   console.groupCollapsed(
     devUtils.formatMessage(
       `${getTimestamp({ milliseconds: true })} %c\u00D7%c ${publicUrl}`,
@@ -157,7 +152,6 @@ function logClientError(event: Event) {
   )
   // eslint-disable-next-line no-console
   console.log(event)
-  // eslint-disable-next-line no-console
   console.groupEnd()
 }
 
@@ -169,7 +163,6 @@ async function logOutgoingClientMessage(event: MessageEvent<WebSocketData>) {
   const publicData = await getPublicData(event.data)
   const arrow = event.defaultPrevented ? '⇡' : '⬆'
 
-  // eslint-disable-next-line no-console
   console.groupCollapsed(
     devUtils.formatMessage(
       `${getTimestamp({ milliseconds: true })} %c${arrow}%c ${publicData} %c${byteLength}%c`,
@@ -181,7 +174,6 @@ async function logOutgoingClientMessage(event: MessageEvent<WebSocketData>) {
   )
   // eslint-disable-next-line no-console
   console.log(event)
-  // eslint-disable-next-line no-console
   console.groupEnd()
 }
 
@@ -195,7 +187,6 @@ async function logOutgoingMockedClientMessage(
   const byteLength = getMessageLength(event.data)
   const publicData = await getPublicData(event.data)
 
-  // eslint-disable-next-line no-console
   console.groupCollapsed(
     devUtils.formatMessage(
       `${getTimestamp({ milliseconds: true })} %c⬆%c ${publicData} %c${byteLength}%c`,
@@ -207,7 +198,6 @@ async function logOutgoingMockedClientMessage(
   )
   // eslint-disable-next-line no-console
   console.log(event)
-  // eslint-disable-next-line no-console
   console.groupEnd()
 }
 
@@ -221,7 +211,6 @@ async function logIncomingMockedClientMessage(
   const byteLength = getMessageLength(event.data)
   const publicData = await getPublicData(event.data)
 
-  // eslint-disable-next-line no-console
   console.groupCollapsed(
     devUtils.formatMessage(
       `${getTimestamp({ milliseconds: true })} %c⬇%c ${publicData} %c${byteLength}%c`,
@@ -233,7 +222,6 @@ async function logIncomingMockedClientMessage(
   )
   // eslint-disable-next-line no-console
   console.log(event)
-  // eslint-disable-next-line no-console
   console.groupEnd()
 }
 
@@ -242,7 +230,6 @@ async function logIncomingServerMessage(event: MessageEvent<WebSocketData>) {
   const publicData = await getPublicData(event.data)
   const arrow = event.defaultPrevented ? '⇣' : '⬇'
 
-  // eslint-disable-next-line no-console
   console.groupCollapsed(
     devUtils.formatMessage(
       `${getTimestamp({ milliseconds: true })} %c${arrow}%c ${publicData} %c${byteLength}%c`,
@@ -254,6 +241,5 @@ async function logIncomingServerMessage(event: MessageEvent<WebSocketData>) {
   )
   // eslint-disable-next-line no-console
   console.log(event)
-  // eslint-disable-next-line no-console
   console.groupEnd()
 }

package/src/mockServiceWorker.js

@@ -71,11 +71,6 @@ addEventListener('message', async function (event) {
       break
     }
 
-    case 'MOCK_DEACTIVATE': {
-      activeClientIds.delete(clientId)
-      break
-    }
-
     case 'CLIENT_CLOSED': {
       activeClientIds.delete(clientId)
 
@@ -94,6 +89,8 @@ addEventListener('message', async function (event) {
 })
 
 addEventListener('fetch', function (event) {
+  const requestInterceptedAt = Date.now()
+
   // Bypass navigation requests.
   if (event.request.mode === 'navigate') {
     return
@@ -110,23 +107,29 @@ addEventListener('fetch', function (event) {
 
   // Bypass all requests when there are no active clients.
   // Prevents the self-unregistered worked from handling requests
-  // after it's been deleted (still remains active until the next reload).
+  // after it's been terminated (still remains active until the next reload).
   if (activeClientIds.size === 0) {
     return
   }
 
   const requestId = crypto.randomUUID()
-  event.respondWith(handleRequest(event, requestId))
+  event.respondWith(handleRequest(event, requestId, requestInterceptedAt))
 })
 
 /**
  * @param {FetchEvent} event
  * @param {string} requestId
+ * @param {number} requestInterceptedAt
  */
-async function handleRequest(event, requestId) {
+async function handleRequest(event, requestId, requestInterceptedAt) {
   const client = await resolveMainClient(event)
   const requestCloneForEvents = event.request.clone()
-  const response = await getResponse(event, client, requestId)
+  const response = await getResponse(
+    event,
+    client,
+    requestId,
+    requestInterceptedAt,
+  )
 
   // Send back the response clone for the "response:*" life-cycle events.
   // Ensure MSW is active and ready to handle the message, otherwise
@@ -204,7 +207,7 @@ async function resolveMainClient(event) {
  * @param {string} requestId
  * @returns {Promise<Response>}
  */
-async function getResponse(event, client, requestId) {
+async function getResponse(event, client, requestId, requestInterceptedAt) {
   // Clone the request because it might've been already used
   // (i.e. its body has been read and sent to the client).
   const requestClone = event.request.clone()
@@ -255,6 +258,7 @@ async function getResponse(event, client, requestId) {
       type: 'REQUEST',
       payload: {
         id: requestId,
+        interceptedAt: requestInterceptedAt,
         ...serializedRequest,
       },
     },

package/src/browser/setupWorker/start/createFallbackStart.ts

@@ -1,21 +0,0 @@
-import { createFallbackRequestListener } from './createFallbackRequestListener'
-import { SetupWorkerInternalContext, StartHandler } from '../glossary'
-import { printStartMessage } from './utils/printStartMessage'
-
-export function createFallbackStart(
-  context: SetupWorkerInternalContext,
-): StartHandler {
-  return async function start(options) {
-    context.fallbackInterceptor = createFallbackRequestListener(
-      context,
-      options,
-    )
-
-    printStartMessage({
-      message: 'Mocking enabled (fallback mode).',
-      quiet: options.quiet,
-    })
-
-    return undefined
-  }
-}

package/src/browser/setupWorker/start/utils/createMessageChannel.ts

@@ -1,32 +0,0 @@
-import {
-  StringifiedResponse,
-  ServiceWorkerIncomingEventsMap,
-} from '../../glossary'
-
-export interface ServiceWorkerMessage<
-  EventType extends keyof ServiceWorkerIncomingEventsMap,
-  EventPayload,
-> {
-  type: EventType
-  payload: EventPayload
-}
-
-interface WorkerChannelEventsMap {
-  MOCK_RESPONSE: [
-    data: StringifiedResponse,
-    transfer?: [ReadableStream<Uint8Array>],
-  ]
-  PASSTHROUGH: []
-}
-
-export class WorkerChannel {
-  constructor(private readonly port: MessagePort) {}
-
-  public postMessage<Event extends keyof WorkerChannelEventsMap>(
-    event: Event,
-    ...rest: WorkerChannelEventsMap[Event]
-  ): void {
-    const [data, transfer] = rest
-    this.port.postMessage({ type: event, data }, { transfer })
-  }
-}

package/src/browser/setupWorker/stop/createFallbackStop.ts

@@ -1,11 +0,0 @@
-import { SetupWorkerInternalContext, StopHandler } from '../glossary'
-import { printStopMessage } from './utils/printStopMessage'
-
-export function createFallbackStop(
-  context: SetupWorkerInternalContext,
-): StopHandler {
-  return function stop() {
-    context.fallbackInterceptor?.dispose()
-    printStopMessage({ quiet: context.startOptions?.quiet })
-  }
-}

package/src/browser/setupWorker/stop/createStop.ts

@@ -1,35 +0,0 @@
-import { devUtils } from '~/core/utils/internal/devUtils'
-import { SetupWorkerInternalContext, StopHandler } from '../glossary'
-import { printStopMessage } from './utils/printStopMessage'
-
-export const createStop = (
-  context: SetupWorkerInternalContext,
-): StopHandler => {
-  return function stop() {
-    // Warn developers calling "worker.stop()" more times than necessary.
-    // This likely indicates a mistake in their code.
-    if (!context.isMockingEnabled) {
-      devUtils.warn(
-        'Found a redundant "worker.stop()" call. Note that stopping the worker while mocking already stopped has no effect. Consider removing this "worker.stop()" call.',
-      )
-      return
-    }
-
-    /**
-     * Signal the Service Worker to disable mocking for this client.
-     * Use this an an explicit way to stop the mocking, while preserving
-     * the worker-client relation. Does not affect the worker's lifecycle.
-     */
-    context.workerChannel.send('MOCK_DEACTIVATE')
-    context.isMockingEnabled = false
-    window.clearInterval(context.keepAliveInterval)
-
-    // Post the internal stop message on the window
-    // to let any logic know when the worker has stopped.
-    // E.g. the WebSocket client manager needs this to know
-    // when to clear its in-memory clients list.
-    window.postMessage({ type: 'msw/worker:stop' })
-
-    printStopMessage({ quiet: context.startOptions?.quiet })
-  }
-}