Skip to content

Commit 5b71784

Browse files
authored
Merge pull request #12 from kalm/v2.6.0
v2.6.0
2 parents 1a3c25e + 717abcf commit 5b71784

File tree

3 files changed

+358
-6
lines changed

3 files changed

+358
-6
lines changed

package-lock.json

Lines changed: 347 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"name": "kalm",
3-
"version": "2.5.1",
3+
"version": "2.6.0",
44
"description": "The socket manager",
55
"main": "./index.js",
66
"scripts": {
7-
"test": "mocha tests/unit --recursive && mocha tests/integration",
7+
"test": "mocha tests/unit --recursive && mocha tests/integration --exit",
88
"bench": "node tests/benchmarks"
99
},
1010
"engines": {
@@ -50,8 +50,8 @@
5050
},
5151
"devDependencies": {
5252
"chai": "~4.1.0",
53-
"mocha": "~3.5.0",
54-
"sinon": "~3.3.0"
53+
"mocha": "~5.0.0",
54+
"sinon": "~4.2.0"
5555
},
5656
"browser": {
5757
"net": false,
@@ -61,4 +61,4 @@
6161
"contributors": [
6262
"frederic charette <fredericcharette@gmail.com>"
6363
]
64-
}
64+
}

src/components/server.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,12 @@ function Server(scope, crypto, clientFactory) {
7979
secretKey: scope.secretKey,
8080
isServer: true,
8181
hostname: origin.host,
82-
port: origin.port
82+
port: origin.port,
83+
server: {
84+
connections: scope.connections,
85+
broadcast,
86+
stop
87+
}
8388
}, options));
8489

8590
scope.connections.push(client);

0 commit comments

Comments
 (0)