Unverified Commit 9d043f6e authored by JJ Kasper's avatar JJ Kasper Committed by GitHub

Ensure upgrade request has request meta (#51590)

x-ref: [slack
thread](https://vercel.slack.com/archives/C03S8ED1DKM/p1686906407341689)
parent 4a507434
...@@ -808,7 +808,14 @@ export default class NextNodeServer extends BaseServer { ...@@ -808,7 +808,14 @@ export default class NextNodeServer extends BaseServer {
} }
protected async handleUpgrade(req: NodeNextRequest, socket: any, head: any) { protected async handleUpgrade(req: NodeNextRequest, socket: any, head: any) {
await this.router.execute(req, socket, nodeParseUrl(req.url, true), head) try {
const parsedUrl = nodeParseUrl(req.url, true)
this.attachRequestMeta(req, parsedUrl, true)
await this.router.execute(req, socket, parsedUrl, head)
} catch (err) {
console.error(err)
socket.end('Internal Server Error')
}
} }
protected async proxyRequest( protected async proxyRequest(
...@@ -1486,6 +1493,15 @@ export default class NextNodeServer extends BaseServer { ...@@ -1486,6 +1493,15 @@ export default class NextNodeServer extends BaseServer {
}, },
getRequestMeta(req, '__NEXT_CLONABLE_BODY')?.cloneBodyStream() getRequestMeta(req, '__NEXT_CLONABLE_BODY')?.cloneBodyStream()
) )
// if this is an upgrade request just pipe body back
if (!res.setHeader) {
invokeRes.pipe(res as any as ServerResponse)
return {
finished: true,
}
}
const noFallback = invokeRes.headers['x-no-fallback'] const noFallback = invokeRes.headers['x-no-fallback']
if (noFallback) { if (noFallback) {
...@@ -2748,7 +2764,8 @@ export default class NextNodeServer extends BaseServer { ...@@ -2748,7 +2764,8 @@ export default class NextNodeServer extends BaseServer {
protected attachRequestMeta( protected attachRequestMeta(
req: BaseNextRequest, req: BaseNextRequest,
parsedUrl: NextUrlWithParsedQuery parsedUrl: NextUrlWithParsedQuery,
isUpgradeReq?: boolean
) { ) {
const protocol = ( const protocol = (
(req as NodeNextRequest).originalRequest?.socket as TLSSocket (req as NodeNextRequest).originalRequest?.socket as TLSSocket
...@@ -2767,7 +2784,10 @@ export default class NextNodeServer extends BaseServer { ...@@ -2767,7 +2784,10 @@ export default class NextNodeServer extends BaseServer {
addRequestMeta(req, '__NEXT_INIT_URL', initUrl) addRequestMeta(req, '__NEXT_INIT_URL', initUrl)
addRequestMeta(req, '__NEXT_INIT_QUERY', { ...parsedUrl.query }) addRequestMeta(req, '__NEXT_INIT_QUERY', { ...parsedUrl.query })
addRequestMeta(req, '_protocol', protocol) addRequestMeta(req, '_protocol', protocol)
addRequestMeta(req, '__NEXT_CLONABLE_BODY', getCloneableBody(req.body))
if (!isUpgradeReq) {
addRequestMeta(req, '__NEXT_CLONABLE_BODY', getCloneableBody(req.body))
}
} }
protected async runEdgeFunction(params: { protected async runEdgeFunction(params: {
......
...@@ -19,6 +19,10 @@ module.exports = { ...@@ -19,6 +19,10 @@ module.exports = {
destination: destination:
'http://localhost:__EXTERNAL_PORT__/_next/webpack-hmr?page=/about', 'http://localhost:__EXTERNAL_PORT__/_next/webpack-hmr?page=/about',
}, },
{
source: '/websocket-to-page',
destination: '/hello',
},
{ {
source: '/to-nowhere', source: '/to-nowhere',
destination: 'http://localhost:12233', destination: 'http://localhost:12233',
......
...@@ -103,6 +103,33 @@ const runTests = (isDev = false, isTurbo = false) => { ...@@ -103,6 +103,33 @@ const runTests = (isDev = false, isTurbo = false) => {
expect([...externalServerHits]).toEqual(['/_next/webpack-hmr?page=/about']) expect([...externalServerHits]).toEqual(['/_next/webpack-hmr?page=/about'])
}) })
it('should successfully rewrite a WebSocket request to a page', async () => {
// TODO: remove once test failure has been fixed
if (isTurbo) return
const messages = []
try {
const ws = await new Promise((resolve, reject) => {
let socket = new WebSocket(
`ws://localhost:${appPort}/websocket-to-page`
)
socket.on('message', (data) => {
messages.push(data.toString())
})
socket.on('open', () => resolve(socket))
socket.on('error', (err) => {
console.error(err)
socket.close()
reject()
})
})
ws.close()
} catch (err) {
messages.push(err)
}
expect(stderr).not.toContain('unhandledRejection')
})
it('should not rewrite for _next/data route when a match is found', async () => { it('should not rewrite for _next/data route when a match is found', async () => {
const initial = await fetchViaHTTP(appPort, '/overridden/first') const initial = await fetchViaHTTP(appPort, '/overridden/first')
expect(initial.status).toBe(200) expect(initial.status).toBe(200)
...@@ -2210,6 +2237,11 @@ const runTests = (isDev = false, isTurbo = false) => { ...@@ -2210,6 +2237,11 @@ const runTests = (isDev = false, isTurbo = false) => {
regex: normalizeRegEx('^\\/to-websocket(?:\\/)?$'), regex: normalizeRegEx('^\\/to-websocket(?:\\/)?$'),
source: '/to-websocket', source: '/to-websocket',
}, },
{
destination: '/hello',
regex: normalizeRegEx('^\\/websocket-to-page(?:\\/)?$'),
source: '/websocket-to-page',
},
{ {
destination: 'http://localhost:12233', destination: 'http://localhost:12233',
regex: normalizeRegEx('^\\/to-nowhere(?:\\/)?$'), regex: normalizeRegEx('^\\/to-nowhere(?:\\/)?$'),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment