fix: consume undisturbed request stream as-is

src/middleware.ts

@@ -7,7 +7,6 @@ import { Emitter } from 'strict-event-emitter'
 import type { RequestHandler as ExpressMiddleware } from 'express'
 import type { LifeCycleEventsMap, RequestHandler } from 'msw'
 
-const encoder = new TextEncoder()
 const emitter = new Emitter<LifeCycleEventsMap>()
 
 export function createMiddleware(
@@ -18,10 +17,8 @@ export function createMiddleware(
     const method = req.method || 'GET'
 
     // Ensure the request body input passed to the MockedRequest
-    // is always a string. Custom middleware like "express.json()"
-    // may coerce "req.body" to be an Object.
-    const requestBody =
-      typeof req.body === 'string' ? req.body : JSON.stringify(req.body)
+    // is always the raw body from express req.
+    // "express.raw({ type: '*/*' })" must be used to get "req.body".
 
     const mockedRequest = new Request(
       // Treat all relative URLs as the ones coming from the server.
@@ -31,9 +28,7 @@ export function createMiddleware(
         headers: new Headers(req.headers as HeadersInit),
         credentials: 'omit',
         // Request with GET/HEAD method cannot have body.
-        body: ['GET', 'HEAD'].includes(method)
-          ? undefined
-          : encoder.encode(requestBody),
+        body: ['GET', 'HEAD'].includes(method) ? undefined : req.body,
       },
     )
 

src/server.ts

@@ -5,7 +5,7 @@ import { createMiddleware } from './middleware'
 export function createServer(...handlers: Array<HttpHandler>): express.Express {
   const app = express()
 
-  app.use(express.json())
+  app.use(express.raw({ type: '*/*' }))
   app.use(createMiddleware(...handlers))
   app.use((_req, res) => {
     res.status(404).json({

test/with-express-json.test.ts

@@ -3,50 +3,52 @@
  */
 import fetch from 'node-fetch'
 import express from 'express'
-import { HttpServer } from '@open-draft/test-server/http'
 import { HttpResponse, http } from 'msw'
 import { createMiddleware } from '../src'
 
-const httpServer = new HttpServer((app) => {
-  // Apply a request body JSON middleware.
-  app.use(express.json())
-
-  app.use(
-    createMiddleware(
-      http.post<never, { firstName: string }>('/user', async ({ request }) => {
-        const { firstName } = await request.json()
-
-        return HttpResponse.json(
-          { firstName },
-          {
-            headers: {
-              'x-my-header': 'value',
-            },
+import httpModule from 'http'
+import { AddressInfo } from 'net'
+
+const app = express()
+
+app.use(express.raw({ type: '*/*' }))
+
+app.use(
+  createMiddleware(
+    http.post<never, { firstName: string }>('/user', async ({ request }) => {
+      const { firstName } = await request.json()
+
+      return HttpResponse.json(
+        { firstName },
+        {
+          headers: {
+            'x-my-header': 'value',
           },
-        )
-      }),
-    ),
-  )
-
-  app.use((_req, res) => {
-    res.status(404).json({
-      error: 'Mock not found',
-    })
+        },
+      )
+    }),
+  ),
+)
+
+app.use((_req, res) => {
+  res.status(404).json({
+    error: 'Mock not found',
   })
-
-  return app
 })
 
-beforeAll(async () => {
-  await httpServer.listen()
+const httpServer = httpModule.createServer(app)
+
+beforeAll(() => {
+  httpServer.listen({ port: 0 })
 })
 
 afterAll(async () => {
-  await httpServer.close()
+  httpServer.close()
 })
 
-it('supports usage alongside with the "express.json()" middleware', async () => {
-  const res = await fetch(httpServer.http.url('/user'), {
+it('supports usage with json payload', async () => {
+  const { port } = httpServer.address() as AddressInfo
+  const res = await fetch(`http://localhost:${port}/user`, {
     method: 'POST',
     headers: {
       'Content-Type': 'application/json',

test/with-express-multipart-form.test.ts

@@ -0,0 +1,69 @@
+/**
+ * @jest-environment node
+ */
+import express from 'express'
+import { HttpResponse, http } from 'msw'
+import { createMiddleware } from '../src'
+
+import httpModule from 'http'
+import { AddressInfo } from 'net'
+
+const app = express()
+
+app.use(express.raw({ type: '*/*' }))
+
+app.use(
+  createMiddleware(
+    http.post<never, { firstName: string }>('/user', async ({ request }) => {
+      const form = await request.formData()
+
+      const field1 = form.get('field1')
+      const field2 = form.get('field2')
+
+      if (!field1 || typeof field1 !== 'string') return HttpResponse.error()
+      if (!field2 || typeof field2 !== 'string') return HttpResponse.error()
+
+      return HttpResponse.json(
+        { field1, field2 },
+        {
+          headers: {
+            'x-my-header': 'value',
+          },
+        },
+      )
+    }),
+  ),
+)
+
+app.use((_req, res) => {
+  res.status(404).json({
+    error: 'Mock not found',
+  })
+})
+
+const httpServer = httpModule.createServer(app)
+
+beforeAll(() => {
+  httpServer.listen({ port: 0 })
+})
+
+afterAll(async () => {
+  httpServer.close()
+})
+
+it('supports usage with multipart/form-data payload', async () => {
+  const form = new FormData()
+
+  form.append('field1', 'value1')
+  form.append('field2', 'value2')
+
+  const { port } = httpServer.address() as AddressInfo
+  const res = await fetch(`http://localhost:${port}/user`, {
+    method: 'POST',
+    body: form,
+  })
+
+  expect(res.status).toBe(200)
+  expect(res.headers.get('x-my-header')).toBe('value')
+  expect(await res.json()).toEqual({ field1: 'value1', field2: 'value2' })
+})