Update server.js to fix ws@3.0.0 breaking changes#1
Open
netop wants to merge 7 commits intoRoll20:masterfrom
Open
Update server.js to fix ws@3.0.0 breaking changes#1netop wants to merge 7 commits intoRoll20:masterfrom
netop wants to merge 7 commits intoRoll20:masterfrom
Conversation
lpinca
reviewed
May 18, 2017
| this._wss.on('connection', function(socket) { | ||
| this._wss.on('connection', function(socket, req) { | ||
| socket.upgradeReq = req; | ||
| var query = url.parse(socket.upgradeReq.url, true).query; |
There was a problem hiding this comment.
If this is the only place where upgradeReq is used it is probably better to use:
var query = url.parse(req ? req.url : socket.upgradeReq.url, true).query;and remove the previous line. This will work with all ws versions.
Author
There was a problem hiding this comment.
I've updated the ws dependency version to 3.0.0 as well.
Thanks.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Update server.js due to ws@3.0.0 Breaking changes that removes the
upgradeReqfrom theWebSocketobject
websockets/ws#1099
websockets/ws#1104