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
10 changes: 5 additions & 5 deletions packages/nuxt-cli/src/dev/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1297,15 +1297,14 @@ export class NuxtDevServer extends EventEmitter<DevServerEventMap> {
const baseURL = nuxt.options.app.baseURL.startsWith('./') ? nuxt.options.app.baseURL.slice(1) : nuxt.options.app.baseURL
const assetsDir = nuxt.options.app.buildAssetsDir
const viteHmrPath = `${baseURL.replace(/\/$/, '')}/${assetsDir.replace(/^\//, '')}`
if (req.url?.startsWith(viteHmrPath)) {
return // Skip for Vite HMR
}
nuxt.server.upgrade(req, socket as any, head)

this.#websocketConnections.add(socket)
socket.on('close', () => {
this.#websocketConnections.delete(socket)
})
if (req.url?.startsWith(viteHmrPath)) {
return // Skip for Vite HMR
}
nuxt.server.upgrade(req, socket as any, head)
})
}

Expand Down Expand Up @@ -1399,6 +1398,7 @@ export class NuxtDevServer extends EventEmitter<DevServerEventMap> {
}

async close(): Promise<void> {
this.#closeWebSocketConnections()
if (this.#currentNuxt) {
await this.#currentNuxt.close()
}
Expand Down
29 changes: 28 additions & 1 deletion packages/nuxt-cli/test/unit/dev/lifecycle.spec.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import type { AddressInfo } from 'node:net'
import type { AddressInfo, Socket } from 'node:net'

import { EventEmitter } from 'node:events'
import { existsSync, readFileSync } from 'node:fs'
import { mkdtemp, rm } from 'node:fs/promises'
import { connect } from 'node:net'
import { tmpdir } from 'node:os'
import process from 'node:process'

Expand Down Expand Up @@ -493,6 +494,32 @@ describe('dev server shutdown', () => {
expect(existsSync(join(cwd, '.nuxt', 'nuxt.lock'))).toBe(false)
})

it('should drop open websocket connections before running nuxt close hooks', async () => {
const nuxt = createNuxt()
const upgraded = new Set<Socket>()
Object.assign(nuxt.server, {
upgrade: (_req: unknown, socket: Socket) => {
upgraded.add(socket)
socket.once('close', () => upgraded.delete(socket))
socket.write('HTTP/1.1 101 Switching Protocols\r\nUpgrade: websocket\r\nConnection: Upgrade\r\n\r\n')
},
})
nuxt.hook('close', () => vi.waitFor(() => expect(upgraded.size).toBe(0), { timeout: 2000 }))
nuxt.close = () => nuxt.callHook('close')
loadNuxt.mockImplementation(() => Promise.resolve(nuxt))
const server = createServer()
await server.init()
const { port } = server.listener.address as AddressInfo

const client = connect(port, '127.0.0.1')
client.on('error', () => {})
client.write('GET /_ws HTTP/1.1\r\nHost: 127.0.0.1\r\nUpgrade: websocket\r\nConnection: Upgrade\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nSec-WebSocket-Version: 13\r\n\r\n')
await vi.waitFor(() => expect(upgraded.size).toBe(1))

await expect(server.close()).resolves.toBeUndefined()
client.destroy()
})

it('should stop answering once the listener is closed', async () => {
const server = createServer()
await server.init()
Expand Down
Loading