Merge pull request #12 from kalm/v2.6.0

v2.6.0
kalm · Jan 27, 2018 · 5b71784 · 5b71784
2 parents 1a3c25e + 717abcf
commit 5b71784
Show file tree

Hide file tree

Showing 3 changed files with 358 additions and 6 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,10 +1,10 @@
 {
   "name": "kalm",
-  "version": "2.5.1",
+  "version": "2.6.0",
   "description": "The socket manager",
   "main": "./index.js",
   "scripts": {
-    "test": "mocha tests/unit --recursive && mocha tests/integration",
+    "test": "mocha tests/unit --recursive && mocha tests/integration --exit",
     "bench": "node tests/benchmarks"
   },
   "engines": {
@@ -50,8 +50,8 @@
   },
   "devDependencies": {
     "chai": "~4.1.0",
-    "mocha": "~3.5.0",
-    "sinon": "~3.3.0"
+    "mocha": "~5.0.0",
+    "sinon": "~4.2.0"
   },
   "browser": {
     "net": false,
@@ -61,4 +61,4 @@
   "contributors": [
     "frederic charette <[email protected]>"
   ]
-}
+}
diff --git a/src/components/server.js b/src/components/server.js
@@ -79,7 +79,12 @@ function Server(scope, crypto, clientFactory) {
       secretKey: scope.secretKey,
       isServer: true,
       hostname: origin.host,
-      port: origin.port
+      port: origin.port,
+      server: {
+        connections: scope.connections,
+        broadcast,
+        stop
+      }
     }, options));
 
     scope.connections.push(client);