forked from pull-stream/pull-ws
-
Notifications
You must be signed in to change notification settings - Fork 11
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.
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
feat: add properties and functions to client and server #1
Merged
alanshaw
merged 7 commits into
alanshaw:master
from
vasco-santos:feat/add-properties-and-functions-to-client-and-server
Feb 7, 2020
Merged
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
0c7e43b
feat: add properties and functions to cient and server
vasco-santos 7c7466b
feat: allow options for websocket instance
vasco-santos c78168d
chore: address review
vasco-santos 653da40
chore: add socket property for client and server
vasco-santos 499a2c8
chore: add socket property for client and server (#1)
vasco-santos f843e29
chore: update dependencies
5b036f9
chore: test on Node.js 12 and 13
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,12 +7,14 @@ var wsurl = require('./ws-url') | |
|
||
module.exports = function (addr, opts) { | ||
const location = typeof window === 'undefined' ? {} : window.location | ||
opts = opts || {} | ||
|
||
const url = wsurl(addr, location) | ||
const socket = new WebSocket(url) | ||
const socket = new WebSocket(url, opts.websocket) | ||
|
||
const stream = duplex(socket, opts) | ||
stream.remoteAddress = url | ||
stream.socket = socket | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is this needed? Can we map |
||
stream.close = () => new Promise((resolve, reject) => { | ||
socket.addEventListener('close', resolve) | ||
socket.close() | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd move this to a default param instead of checking here.
module.exports = function (addr, opts = {}) {