Skip to content

Upgrade ws to 5.x #57

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
nickbrowne merged 1 commit into from
Nov 14, 2024
Merged

Upgrade ws to 5.x #57

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"sockjs": ">= 0.3.1",
"socket.io": "2.5.0",
"socket.io-client": "2.4.0",
"ws": "2.3.1",
"ws": "5.2.4",
"request": ">= 2.1.1",
"coffee-script": "1.7.0",
"hat": "*"
Expand Down
8 changes: 4 additions & 4 deletions src/server/websocket.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ sessionHandler = require('./session').handler
STATISTICS_INTERVAL = 10000 # 10 seconds
CLIENT_TIMEOUT = 30000 # 30 seconds

wrapSession = (conn) ->
wrapSession = (conn, req) ->
wrapper = new EventEmitter
wrapper.abort = -> conn.close()
wrapper.stop = -> conn.close()
Expand All @@ -28,17 +28,17 @@ wrapSession = (conn) ->
else
wrapper.emit 'message', msg

wrapper.headers = conn.upgradeReq.headers
wrapper.headers = req.headers
# TODO - I don't think this is the right way to get the address
wrapper.address = conn._socket.server._connectionKey?
wrapper

exports.attach = (server, createAgent, options) ->
options.prefix or= '/websocket'
wss = new WebSocketServer {server: server, path: options.prefix, headers: options.headers}
wss.on 'connection', (conn) ->
wss.on 'connection', (conn, req) ->
conn.isAlive = true
sessionHandler wrapSession(conn), createAgent
sessionHandler wrapSession(conn, req), createAgent

if !!options.trackStats
setInterval ->
Expand Down