Skip to content

Commit 11bb17b

Browse files
committed
v5.12.0 - Bump dependencies including ws module
1 parent 777894d commit 11bb17b

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "socketcluster-server",
3-
"version": "5.11.0",
3+
"version": "5.12.0",
44
"description": "Server module for SocketCluster",
55
"main": "index.js",
66
"repository": {
@@ -11,19 +11,19 @@
1111
"async": "2.0.0",
1212
"base64id": "0.1.0",
1313
"lodash.clonedeep": "4.5.0",
14-
"sc-auth": "~3.2.1",
14+
"sc-auth": "~3.3.0",
1515
"sc-domain": "~1.0.1",
1616
"sc-emitter": "~1.1.0",
17-
"sc-errors": "~1.1.0",
17+
"sc-errors": "~1.2.0",
1818
"sc-formatter": "~3.0.0",
1919
"sc-simple-broker": "~2.0.0",
2020
"uuid": "3.0.1",
2121
"uws": "0.14.5",
22-
"ws": "1.1.1"
22+
"ws": "3.0.0"
2323
},
2424
"devDependencies": {
2525
"mocha": "3.0.2",
26-
"socketcluster-client": "~5.3.0"
26+
"socketcluster-client": "~5.5.0"
2727
},
2828
"scripts": {
2929
"test": "mocha --reporter spec --timeout 3000 --slow 3000"

scserver.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,9 +372,14 @@ SCServer.prototype._processAuthToken = function (scSocket, signedAuthToken, call
372372
});
373373
};
374374

375-
SCServer.prototype._handleSocketConnection = function (wsSocket) {
375+
SCServer.prototype._handleSocketConnection = function (wsSocket, upgradeReq) {
376376
var self = this;
377377

378+
if (this.options.wsEngine == 'ws') {
379+
// Normalize ws module to match uws module.
380+
wsSocket.upgradeReq = upgradeReq;
381+
}
382+
378383
var id = this.generateId();
379384

380385
var socketDomain = domain.create();

0 commit comments

Comments
 (0)