Skip to content
Open
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
17 changes: 16 additions & 1 deletion packages/vite/src/node/server/ws.ts
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,22 @@ export function createWebSocketServer(

const client = getSocketClient(socket)
for (const listener of listeners) {
listener(data, client)
const result: unknown = listener(data, client)
if (
result &&
typeof result === 'object' &&
'catch' in result &&
typeof result.catch === 'function'
) {
result.catch((err: unknown) => {
config.logger.error(
`${colors.red(`ws custom listener error:`)}\n${err}`,
{
timestamp: true,
},
)
})
}
}
}

Expand Down
39 changes: 39 additions & 0 deletions playground/hmr/__tests__/hmr.spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { stripVTControlCharacters } from 'node:util'
import { beforeAll, describe, expect, it, test } from 'vitest'
import type { Page } from 'playwright-chromium'
import WebSocket from 'ws'
import {
addFile,
browser,
Expand All @@ -9,6 +10,7 @@ import {
getBg,
getColor,
isBuild,
isServe,
page,
readFile,
removeFile,
Expand Down Expand Up @@ -1160,3 +1162,40 @@ if (!isBuild) {
await expect.poll(() => getColor('.test-css-link')).toBe('black')
})
}

describe.runIf(isServe)('malformed vite:invoke', () => {
function connectClient(
url: string,
): Promise<{ send: WebSocket['send']; [Symbol.dispose](): void }> {
return new Promise((resolve, reject) => {
const ws = new WebSocket(url, 'vite-hmr')
ws.on('open', () => {
// Wait for the { type: 'connected' } message before resolving
ws.once('message', () => {
resolve({
send: ws.send.bind(ws),
[Symbol.dispose]() {
ws.close()
},
})
})
})
ws.on('error', reject)
})
}

it('does not throw unhandled promise rejection for missing properties', async () => {
serverLogs.length = 0
const wsUrl = viteTestUrl.replace(/^http/, 'ws')
using ws = await connectClient(wsUrl)
ws.send(
JSON.stringify({
type: 'custom',
event: 'vite:invoke',
}),
)
await expect
.poll(() => serverLogs)
.toContainEqual(expect.stringContaining('ws custom listener error'))
})
})
3 changes: 3 additions & 0 deletions playground/hmr/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,8 @@
"build": "vite build",
"debug": "node --inspect-brk ../../packages/vite/bin/vite",
"preview": "vite preview"
},
"devDependencies": {
"ws": "^8.20.0"
}
}
6 changes: 5 additions & 1 deletion pnpm-lock.yaml

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

Loading