msw 2.10.2 → 2.10.4

package/lib/mockServiceWorker.js

@@ -7,7 +7,7 @@
  * - Please do NOT modify this file.
  */
 
-const PACKAGE_VERSION = '2.10.2'
+const PACKAGE_VERSION = '2.10.4'
 const INTEGRITY_CHECKSUM = 'f5825c521429caf22a4dd13b66e243af'
 const IS_MOCKED_RESPONSE = Symbol('isMockedResponse')
 const activeClientIds = new Set()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "msw",
-  "version": "2.10.2",
+  "version": "2.10.4",
   "description": "Seamless REST/GraphQL API mocking library for browser and Node.js.",
   "type": "commonjs",
   "main": "./lib/core/index.js",
@@ -280,7 +280,7 @@
     "vitest-environment-miniflare": "^2.14.4",
     "webpack": "^5.95.0",
     "webpack-http-server": "^0.5.0",
-    "msw": "2.10.2"
+    "msw": "2.10.4"
   },
   "peerDependencies": {
     "typescript": ">= 4.8.x"

package/src/core/getResponse.test.ts

@@ -1,40 +1,38 @@
-/**
- * @vitest-environment node
- */
+// @vitest-environment node
 import { http } from './http'
 import { getResponse } from './getResponse'
 
 it('returns undefined given empty headers array', async () => {
-  expect(
-    await getResponse([], new Request('http://localhost/')),
-  ).toBeUndefined()
+  await expect(
+    getResponse([], new Request('http://localhost/')),
+  ).resolves.toBeUndefined()
 })
 
 it('returns undefined given no matching handlers', async () => {
-  expect(
-    await getResponse(
+  await expect(
+    getResponse(
       [http.get('/product', () => void 0)],
       new Request('http://localhost/user'),
     ),
-  ).toBeUndefined()
+  ).resolves.toBeUndefined()
 })
 
 it('returns undefined given a matching handler that returned no response', async () => {
-  expect(
-    await getResponse(
+  await expect(
+    getResponse(
       [http.get('*/user', () => void 0)],
       new Request('http://localhost/user'),
     ),
-  ).toBeUndefined()
+  ).resolves.toBeUndefined()
 })
 
 it('returns undefined given a matching handler that returned explicit undefined', async () => {
-  expect(
-    await getResponse(
+  await expect(
+    getResponse(
       [http.get('*/user', () => undefined)],
       new Request('http://localhost/user'),
     ),
-  ).toBeUndefined()
+  ).resolves.toBeUndefined()
 })
 
 it('returns the response returned from a matching handler', async () => {
@@ -45,7 +43,7 @@ it('returns the response returned from a matching handler', async () => {
 
   expect(response?.status).toBe(200)
   expect(response?.headers.get('Content-Type')).toBe('application/json')
-  expect(await response?.json()).toEqual({ name: 'John' })
+  await expect(response?.json()).resolves.toEqual({ name: 'John' })
 })
 
 it('returns the response from the first matching handler if multiple match', async () => {
@@ -59,5 +57,18 @@ it('returns the response from the first matching handler if multiple match', asy
 
   expect(response?.status).toBe(200)
   expect(response?.headers.get('Content-Type')).toBe('application/json')
-  expect(await response?.json()).toEqual({ name: 'John' })
+  await expect(response?.json()).resolves.toEqual({ name: 'John' })
+})
+
+it('supports custom base url', async () => {
+  const response = await getResponse(
+    [http.get('/resource', () => new Response('hello world'))],
+    new Request('https://localhost:3000/resource'),
+    {
+      baseUrl: 'https://localhost:3000/',
+    },
+  )
+
+  expect(response?.status).toBe(200)
+  await expect(response?.text()).resolves.toBe('hello world')
 })

package/src/core/getResponse.ts

@@ -1,22 +1,28 @@
 import { createRequestId } from '@mswjs/interceptors'
 import type { RequestHandler } from './handlers/RequestHandler'
-import { executeHandlers } from './utils/executeHandlers'
+import {
+  executeHandlers,
+  type ResponseResolutionContext,
+} from './utils/executeHandlers'
 
 /**
  * Finds a response for the given request instance
  * in the array of request handlers.
  * @param handlers The array of request handlers.
  * @param request The `Request` instance.
+ * @param resolutionContext Request resolution options.
  * @returns {Response} A mocked response, if any.
  */
 export const getResponse = async (
   handlers: Array<RequestHandler>,
   request: Request,
+  resolutionContext?: ResponseResolutionContext,
 ): Promise<Response | undefined> => {
   const result = await executeHandlers({
     request,
     requestId: createRequestId(),
     handlers,
+    resolutionContext,
   })
 
   return result?.response

package/src/core/handlers/HttpHandler.ts

@@ -102,7 +102,7 @@ export class HttpHandler extends RequestHandler<
     })
 
     devUtils.warn(
-      `Found a redundant usage of query parameters in the request handler URL for "${method} ${path}". Please match against a path instead and access query parameters using "new URL(request.url).searchParams" instead. Learn more: https://mswjs.io/docs/http/intercepting-requestsquery-parameters`,
+      `Found a redundant usage of query parameters in the request handler URL for "${method} ${path}". Please match against a path instead and access query parameters using "new URL(request.url).searchParams" instead. Learn more: https://mswjs.io/docs/http/intercepting-requests#querysearch-parameters`,
     )
   }
 

package/src/core/handlers/WebSocketHandler.test.ts

@@ -108,4 +108,20 @@ describe('parse', () => {
       },
     })
   })
+
+  it('supports a custom resolution context (base url)', () => {
+    expect(
+      new WebSocketHandler('/api/ws').parse({
+        url: new URL('ws://localhost:3000/api/ws'),
+        resolutionContext: {
+          baseUrl: 'ws://localhost:3000/',
+        },
+      }),
+    ).toEqual({
+      match: {
+        matches: true,
+        params: {},
+      },
+    })
+  })
 })

package/src/core/handlers/WebSocketHandler.ts

@@ -29,6 +29,10 @@ export interface WebSocketHandlerConnection {
   params: PathParams
 }
 
+export interface WebSocketResolutionContext {
+  baseUrl?: string
+}
+
 export const kEmitter = Symbol('kEmitter')
 export const kSender = Symbol('kSender')
 const kStopPropagationPatched = Symbol('kStopPropagationPatched')
@@ -50,7 +54,10 @@ export class WebSocketHandler {
     this.__kind = 'EventHandler'
   }
 
-  public parse(args: { url: URL }): WebSocketHandlerParsedResult {
+  public parse(args: {
+    url: URL
+    resolutionContext?: WebSocketResolutionContext
+  }): WebSocketHandlerParsedResult {
     const clientUrl = new URL(args.url)
 
     /**
@@ -60,7 +67,11 @@ export class WebSocketHandler {
      */
     clientUrl.pathname = clientUrl.pathname.replace(/^\/socket.io\//, '/')
 
-    const match = matchRequestUrl(clientUrl, this.url)
+    const match = matchRequestUrl(
+      clientUrl,
+      this.url,
+      args.resolutionContext?.baseUrl,
+    )
 
     return {
       match,
@@ -76,9 +87,11 @@ export class WebSocketHandler {
 
   public async run(
     connection: Omit<WebSocketHandlerConnection, 'params'>,
+    resolutionContext?: WebSocketResolutionContext,
   ): Promise<boolean> {
     const parsedResult = this.parse({
       url: connection.client.url,
+      resolutionContext,
     })
 
     if (!this.predicate({ url: connection.client.url, parsedResult })) {