Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions packages/vite/src/node/server/ws.ts
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,12 @@ export function createWebSocketServer(
parsedUrl.pathname === hmrBase
) {
handleUpgrade(req, socket as Socket, head, protocol === 'vite-ping')
} else {
// Node.js detaches its own socket error handler before emitting
// `upgrade`, so a socket that no listener takes over would crash the
// process when the client resets the connection (e.g. ECONNRESET).
// Other listeners (proxy, plugins) still receive the error as usual.
socket.on('error', noop)
}
}
wsServer.on('upgrade', hmrServerWsListener)
Expand Down
49 changes: 49 additions & 0 deletions playground/hmr/__tests__/ws.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
import { errorMonitor } from 'node:events'
import type { IncomingMessage } from 'node:http'
import type { Socket } from 'node:net'
import type { Duplex } from 'node:stream'
import { expect, test } from 'vitest'
import WebSocket from 'ws'
import { isServe, promiseWithResolvers, viteServer, viteTestUrl } from '~utils'

// https://github.com/vitejs/vite/issues/23727
test.runIf(isServe)(
'does not crash when an unhandled upgrade request is reset',
async () => {
const httpServer = viteServer.httpServer!
const upgrade = promiseWithResolvers<Duplex>()
const onUpgrade = (request: IncomingMessage, socket: Duplex) => {
if (request.url === '/unhandled-upgrade') {
upgrade.resolve(socket)
}
}
httpServer.on('upgrade', onUpgrade)

const wsUrl = new URL('/unhandled-upgrade', viteTestUrl)
wsUrl.protocol = 'ws:'
let socket: Socket
const client = new WebSocket(wsUrl, {
finishRequest(request) {
request.once('socket', (requestSocket) => {
socket = requestSocket
})
request.end()
},
})
// The connection is deliberately reset before the handshake completes.
client.on('error', () => {})
try {
const serverSocket = await upgrade.promise
const socketError = promiseWithResolvers<Error>()
serverSocket.once(errorMonitor, socketError.resolve)
socket!.resetAndDestroy()

await expect(socketError.promise).resolves.toMatchObject({
code: 'ECONNRESET',
})
} finally {
httpServer.off('upgrade', onUpgrade)
client.terminate()
}
},
)
3 changes: 2 additions & 1 deletion playground/hmr/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"preview": "vite preview"
},
"devDependencies": {
"tinyglobby": "^0.2.17"
"tinyglobby": "^0.2.17",
"ws": "^8.22.0"
}
}
3 changes: 3 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading