fix(node-ws): create only one WebSocketServer instead of per websocket request (#539)
parent
e779454966
commit
ec6ec4ec02
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
'@hono/node-ws': patch
|
||||||
|
---
|
||||||
|
|
||||||
|
create only one WebSocketServer instead of per websocket request
|
|
@ -32,7 +32,7 @@ describe('WebSocket helper', () => {
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
injectWebSocket(server)
|
injectWebSocket(server)
|
||||||
const ws = new WebSocket('ws://localhost:3030/')
|
new WebSocket('ws://localhost:3030/')
|
||||||
|
|
||||||
expect(await mainPromise).toBe(true)
|
expect(await mainPromise).toBe(true)
|
||||||
})
|
})
|
||||||
|
|
|
@ -2,7 +2,6 @@ import { Buffer } from 'buffer'
|
||||||
import type { Server } from 'node:http'
|
import type { Server } from 'node:http'
|
||||||
import type { Http2SecureServer, Http2Server } from 'node:http2'
|
import type { Http2SecureServer, Http2Server } from 'node:http2'
|
||||||
import type { Hono } from 'hono'
|
import type { Hono } from 'hono'
|
||||||
import { createMiddleware } from 'hono/factory'
|
|
||||||
import type { UpgradeWebSocket, WSContext } from 'hono/ws'
|
import type { UpgradeWebSocket, WSContext } from 'hono/ws'
|
||||||
import { WebSocketServer } from 'ws'
|
import { WebSocketServer } from 'ws'
|
||||||
|
|
||||||
|
@ -15,27 +14,17 @@ export interface NodeWebSocketInit {
|
||||||
baseUrl?: string | URL
|
baseUrl?: string | URL
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Extended for telling WebSocket
|
|
||||||
* @internal
|
|
||||||
*/
|
|
||||||
class WSResponse extends Response {
|
|
||||||
readonly wss: WebSocketServer
|
|
||||||
constructor(wss: WebSocketServer) {
|
|
||||||
super()
|
|
||||||
this.wss = wss
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create WebSockets for Node.js
|
* Create WebSockets for Node.js
|
||||||
* @param init Options
|
* @param init Options
|
||||||
* @returns NodeWebSocket
|
* @returns NodeWebSocket
|
||||||
*/
|
*/
|
||||||
export const createNodeWebSocket = (init: NodeWebSocketInit): NodeWebSocket => {
|
export const createNodeWebSocket = (init: NodeWebSocketInit): NodeWebSocket => {
|
||||||
|
const wss = new WebSocketServer({noServer: true})
|
||||||
|
|
||||||
return {
|
return {
|
||||||
injectWebSocket(server) {
|
injectWebSocket(server) {
|
||||||
;(server as Server).on('upgrade', async (request, socket, head) => {
|
server.on('upgrade', async (request, socket, head) => {
|
||||||
const url = new URL(request.url ?? '/', init.baseUrl ?? 'http://localhost')
|
const url = new URL(request.url ?? '/', init.baseUrl ?? 'http://localhost')
|
||||||
const headers = new Headers()
|
const headers = new Headers()
|
||||||
for (const key in request.headers) {
|
for (const key in request.headers) {
|
||||||
|
@ -45,15 +34,11 @@ export const createNodeWebSocket = (init: NodeWebSocketInit): NodeWebSocket => {
|
||||||
}
|
}
|
||||||
headers.append(key, Array.isArray(value) ? value[0] : value)
|
headers.append(key, Array.isArray(value) ? value[0] : value)
|
||||||
}
|
}
|
||||||
const res = (await init.app.request(url, {
|
await init.app.request(url, {
|
||||||
headers: headers,
|
headers: headers,
|
||||||
})) as Response | WSResponse
|
})
|
||||||
if (!(res instanceof WSResponse)) {
|
wss.handleUpgrade(request, socket, head, (ws) => {
|
||||||
socket.destroy()
|
wss.emit('connection', ws, request)
|
||||||
return
|
|
||||||
}
|
|
||||||
res.wss.handleUpgrade(request, socket, head, (ws) => {
|
|
||||||
res.wss.emit('connection', ws, request)
|
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
@ -64,7 +49,6 @@ export const createNodeWebSocket = (init: NodeWebSocketInit): NodeWebSocket => {
|
||||||
await next()
|
await next()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
const wss = new WebSocketServer({ noServer: true })
|
|
||||||
const events = await createEvents(c)
|
const events = await createEvents(c)
|
||||||
wss.on('connection', (ws) => {
|
wss.on('connection', (ws) => {
|
||||||
const ctx: WSContext = {
|
const ctx: WSContext = {
|
||||||
|
@ -109,7 +93,8 @@ export const createNodeWebSocket = (init: NodeWebSocketInit): NodeWebSocket => {
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
return new WSResponse(wss)
|
|
||||||
|
return new Response()
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue