fix(ClientRequest): support get with body (#2854)

mikicho · web-flow · commit 26fb02550dbd · 2025-04-20T07:53:33.000-07:00
diff --git a/lib/intercept.js b/lib/intercept.js
@@ -10,12 +10,13 @@ const { inherits } = require('util')
 const http = require('http')
 const { intercept: debug } = require('./debug')
 const globalEmitter = require('./global_emitter')
-const { BatchInterceptor } = require('@mswjs/interceptors')
+const { BatchInterceptor, getRawRequest } = require('@mswjs/interceptors')
 const {
   default: nodeInterceptors,
 } = require('@mswjs/interceptors/presets/node')
 const { createResponse } = require('./create_response')
 const { once } = require('events')
+const { arrayBuffer } = require('stream/consumers')
 
 const interceptor = new BatchInterceptor({
   name: 'nock-interceptor',
@@ -409,7 +410,17 @@ function activate() {
             once(nockRequest, 'error'),
             once(nockRequest, 'response'),
           ])
-          const buffer = await request.arrayBuffer()
+
+          const rawRequest = getRawRequest(mswRequest)
+
+          // If this is GET request with body, we need to read the body from the socket because Fetch API doesn't support this.
+          const buffer =
+            rawRequest instanceof originalClientRequest &&
+            rawRequest.method === 'GET' &&
+            rawRequest.getHeader('content-length') > 0
+              ? // TODO: use getClientRequestBodyStream instead of access to internal properties
+                await arrayBuffer(rawRequest.socket.requestStream)
+              : await request.arrayBuffer()
           nockRequest.write(buffer)
           nockRequest.end()
           await promise
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -22,7 +22,7 @@
   "main": "./index.js",
   "types": "types",
   "dependencies": {
-    "@mswjs/interceptors": "^0.38.1",
+    "@mswjs/interceptors": "^0.38.5",
     "json-stringify-safe": "^5.0.1",
     "propagate": "^2.0.0"
   },
diff --git a/tests/got/test_intercept.js b/tests/got/test_intercept.js
@@ -79,6 +79,21 @@ describe('Intercept', () => {
     req.end()
   })
 
+  it('should intercept a GET request with body', async () => {
+    const scope = nock('http://example.test')
+      .get('/')
+      .reply(200, (uri, body) => body)
+
+    const { body } = await got('http://example.test/', {
+      method: 'GET',
+      allowGetBody: true,
+      body: 'Hello World!',
+    })
+
+    expect(body).to.equal('Hello World!')
+    scope.done()
+  })
+
   it('should intercept a request with a base path', async () => {
     const scope = nock('http://example.test/abc').get('/def').reply(201)
 
