Skip to content

[pull] master from webtorrent:master #10

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

Merged
pull merged 4 commits into from
Jan 28, 2021
Merged

[pull] master from webtorrent:master #10

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
db1b63d
Support ws noServer option and server option objects
jhiesey Jan 28, 2021
a2bbaab
Merge pull request #357 from jhiesey/master
feross Jan 28, 2021
69976e8
give user a friendlier error when address() is unavailable due to noS…
feross Jan 28, 2021
0c4911e
9.16.0
feross Jan 28, 2021
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
Prev Previous commit
Next Next commit
give user a friendlier error when address() is unavailable due to noS… 
…erver
  • Loading branch information
@feross
feross committed Jan 28, 2021
commit 69976e80d7b761a72479f5b942f1c7d6a4582aec
9 changes: 6 additions & 3 deletions server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,11 +120,14 @@ class Server extends EventEmitter {
clientTracking: false,
...(isObject(opts.ws) ? opts.ws : undefined)
})
if (!noServer) {
this.ws.address = () => {
return this.http.address()

this.ws.address = () => {
if (noServer) {
throw new Error('address() unavailable with { noServer: true }')
}
return this.http.address()
}

this.ws.on('error', err => { this._onError(err) })
this.ws.on('connection', (socket, req) => {
// Note: socket.upgradeReq was removed in [email protected], so re-add it.
Expand Down