OCram85/code-server
Archived
1
0
Fork 0
Code Pull Requests 2 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

10
src/node/socket.ts
View File

@ -1,6 +1,7 @@
import { promises as fs } from "fs"
import * as net from "net"
import * as path from "path"
import * as stream from "stream"
import * as tls from "tls"
import { Emitter } from "../common/emitter"
import { generateUuid } from "../common/util"
@ -27,10 +28,13 @@ export class SocketProxyProvider {
}
/**
* Create a socket proxy for TLS sockets. If it's not a TLS socket the
* original socket is returned. This will spawn a proxy server on demand.
* Create a socket proxy for TLS sockets. If it is not a TLS socket the
* original socket or stream is returned. This will spawn a proxy server on
* demand.
*/
public async createProxy(socket: net.Socket): Promise<net.Socket> {
public async createProxy(socket: tls.TLSSocket | net.Socket): Promise<net.Socket>
public async createProxy(socket: stream.Duplex): Promise<stream.Duplex>
public async createProxy(socket: tls.TLSSocket | net.Socket | stream.Duplex): Promise<net.Socket | stream.Duplex> {
if (!(socket instanceof tls.TLSSocket)) {
return socket
}