Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: MockHttpSocket: if passthrough: dont flush write buffer on stream read #659

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: MockHttpSocket: if passthrough: dont flush write buffer on stream read #659

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions src/interceptors/ClientRequest/MockHttpSocket.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ export class MockHttpSocket extends MockSocket {
private responseType: 'mock' | 'bypassed' = 'bypassed'
private responseParser: HTTPParser<1>
private responseStream?: Readable
private isPassthrough: boolean
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cannot this be represented via responseType === 'bypassed? We already have a flag to track this.


constructor(options: MockHttpSocketOptions) {
super({
Expand All @@ -84,6 +85,8 @@ export class MockHttpSocket extends MockSocket {
},
})

this.isPassthrough = false

this.connectionOptions = options.connectionOptions
this.createConnection = options.createConnection
this.onRequest = options.onRequest
Expand Down Expand Up @@ -156,6 +159,7 @@ export class MockHttpSocket extends MockSocket {
if (this.destroyed) {
return
}
this.isPassthrough = true

const socket = this.createConnection()

Expand All @@ -172,7 +176,6 @@ export class MockHttpSocket extends MockSocket {
// gets reused for different requests.
let writeArgs: NormalizedSocketWriteArgs | undefined
let headersWritten = false

while ((writeArgs = this.writeBuffer.shift())) {
if (writeArgs !== undefined) {
if (!headersWritten) {
Expand Down Expand Up @@ -441,6 +444,8 @@ export class MockHttpSocket extends MockSocket {
) => {
this.shouldKeepAlive = shouldKeepAlive

this.isPassthrough = false

const url = new URL(path, this.baseUrl)
const method = this.connectionOptions.method?.toUpperCase() || 'GET'
const headers = parseRawHeaders(rawHeaders)
Expand Down Expand Up @@ -472,7 +477,9 @@ export class MockHttpSocket extends MockSocket {
// flush the write buffer to trigger the callbacks.
// This way, if the request stream ends in the write callback,
// it will indeed end correctly.
this.flushWriteBuffer()
if (!this.isPassthrough) {
this.flushWriteBuffer()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As I've mentioned, this introduces an impossible state. You won't know if the request is passthrough until the handler is finished running. For the handler to finish running, it must be able to read the request's body, for which we must flush these first chunks.

}
},
})
}
Expand Down
Loading