Merge branch 'staging' into modern-users

bower.json

@@ -30,9 +30,8 @@
     "secure-fabric.js": "secure-v1.7.9",
     "hyperjson": "~1.4.0",
     "chainpad-crypto": "^0.2.0",
-    "chainpad-listmap": "^0.5.0",
+    "chainpad-listmap": "^0.6.0",
     "chainpad": "^5.1.0",
-    "chainpad-netflux": "^0.7.0",
     "file-saver": "1.3.1",
     "alertifyjs": "1.0.11",
     "scrypt-async": "1.2.0",

package.json

@@ -4,13 +4,14 @@
   "version": "2.3.0",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "chainpad-server": "^2.0.0",
+    "chainpad-server": "~2.1.0",
     "express": "~4.16.0",
     "mkdirp": "^0.5.1",
     "nthen": "~0.1.0",
     "pull-stream": "^3.6.1",
     "replify": "^1.2.0",
     "saferphore": "0.0.1",
+    "socket.io": "^2.1.1",
     "sortify": "^1.0.4",
     "stream-to-pull-stream": "^1.7.2",
     "tweetnacl": "~0.12.2",

server.js

@@ -5,7 +5,7 @@ var Express = require('express');
 var Http = require('http');
 var Https = require('https');
 var Fs = require('fs');
-var WebSocketServer = require('ws').Server;
+var SocketIO = require('socket.io');
 var NetfluxSrv = require('./node_modules/chainpad-server/NetfluxWebsocketSrv');
 var Package = require('./package.json');
 var Path = require("path");
@@ -249,7 +249,10 @@ var nt = nThen(function (w) {
         console.log("setting up a new websocket server");
         wsConfig = { port: websocketPort};
     }
-    var wsSrv = new WebSocketServer(wsConfig);
+    var wsSrv = new SocketIO(httpServer, {
+        path: config.websocketPath || '/cryptpad_websocket'
+    });
+
     Storage.create(config, function (store) {
         NetfluxSrv.run(store, wsSrv, config, rpc);
     });