[fix] Allow URL instances as URL for WebSocket constructors #1329
Conversation
This file contains hidden or 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
lpinca
reviewed
Mar 15, 2018
test/websocket.test.js
Outdated
| @@ -5,6 +5,7 @@ | |||
| const assert = require('assert'); | |||
| const crypto = require('crypto'); | |||
| const https = require('https'); | |||
| const { URL } = require('url'); | |||
There was a problem hiding this comment.
Node 4 doesn't have the URL instance either, so I've opted for adding in some horrible if statements in the test suite :/
lpinca
reviewed
Mar 15, 2018
lib/websocket.js
Outdated
|
|
||
| const serverUrl = url.parse(address); | ||
| let serverUrl; |
There was a problem hiding this comment.
We are still using var when const can not be used.
There was a problem hiding this comment.
FML, I've been writing to much ES6.
lpinca
reviewed
Mar 15, 2018
lib/websocket.js
Outdated
| @@ -511,6 +519,9 @@ function initAsClient (address, protocols, options) { | |||
| } | |||
| if (options.host) requestOptions.headers.Host = options.host; | |||
| if (serverUrl.auth) requestOptions.auth = serverUrl.auth; | |||
| else if (serverUrl.username && serverUrl.password) { | |||
There was a problem hiding this comment.
Still not enough I think:
var u = new url.URL('ws://[email protected]')
undefined
> u
URL {
href: 'ws://[email protected]/',
origin: 'ws://example.org',
protocol: 'ws:',
username: 'foo',
password: '',
host: 'example.org',
hostname: 'example.org',
port: '',
pathname: '/',
search: '',
searchParams: URLSearchParams {},
hash: '' }
auth should be 'foo' but it doesn't get set as serverUrl.password is falsy.
test/websocket.test.js
Outdated
| @@ -361,6 +362,15 @@ describe('WebSocket', function () { | |||
|
|
|||
| assert.strictEqual(ws.url, url); | |||
| }); | |||
|
|
|||
| if (URL) { | |||
| it('accepts URL instances as url', function () { | |||
There was a problem hiding this comment.
I would use this.skip() for consistency if WHATWG URL is not supported.
|
I think this can be merged. |
|
yeah, sorry, my internet decided to shit it self today :/ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Addresses #1143