opensource/code-server
1
0
Fork 0
mirror of https://github.com/coder/code-server.git synced 2025-07-31 05:54:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore(deps): update dependency @types/node to v16 (#5170)

Browse Source 
* Update Node types to 16

* Update Express core types

Fixes a number of conflicts it has with Node 16.

* Fix websocket router types

It seems req was `any` before so now we have to handle the types.  Also
it seems the socket is of type `stream.Duplex`, not `net.Socket`.

The ws types had to be updated to support the new type.

Unfortunately Code still uses the old type so cast for now.

In the web socket router just use a cast for the extra properties we
add.  We could add the types to the Express namespace but I am not sure
we really want these commonly accessible so keep with the casts for now.
Likely we should use Express's `locals` or something instead.

* Add missing return

Not sure why it only just now started complaining though.

Co-authored-by: Asher <ash@coder.com>
This commit is contained in:
renovate[bot]
2022-08-10 16:15:52 -05:00
committed by GitHub
parent 3335d0a456
commit 91589fd106
7 changed files with 35 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/node/wsRouter.ts
View File

@ -8,13 +8,14 @@ export const handleUpgrade = (app: express.Express, server: http.Server): void =
server.on("upgrade", (req, socket, head) => {
socket.pause()
req.ws = socket
req.head = head
req._ws_handled = false
const wreq = req as InternalWebsocketRequest
wreq.ws = socket
wreq.head = head
wreq._ws_handled = false
// Send the request off to be handled by Express.
;(app as any).handle(req, new http.ServerResponse(req), () => {
if (!req._ws_handled) {
;(app as any).handle(wreq, new http.ServerResponse(wreq), () => {
if (!wreq._ws_handled) {
socket.end("HTTP/1.1 404 Not Found\r\n\r\n")
}
})