Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: handle null server address #118

Merged
merged 1 commit into from
Jul 29, 2024
Merged

fix: handle null server address #118

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 17 additions & 7 deletions src/server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,25 @@ class Server extends EventEmitter {
}

onWsServerConnection (socket: WebSocket, req: http.IncomingMessage): void {
const addr = this.wsServer.address()
let addr: string | AddressInfo

if (typeof addr === 'string') {
this.emit('error', new Error('Cannot listen on unix sockets'))
return
}
try {
if (req.socket.remoteAddress == null || req.socket.remotePort == null) {
throw new Error('Remote connection did not have address and/or port')
}

addr = this.wsServer.address()

if (typeof addr === 'string') {
throw new Error('Cannot listen on unix sockets')
}

if (req.socket.remoteAddress == null || req.socket.remotePort == null) {
this.emit('error', new Error('Remote connection did not have address and/or port'))
if (addr == null) {
throw new Error('Server was closing or not running')
}
} catch (err: any) {
req.destroy(err)
this.emit('error', err)
return
}

Expand Down
Loading