Update package websocket to ws and improve errors

app/components/Broadcast.js

@@ -1,17 +1,22 @@
 const store = require('../store');
 const events = require('../events');
 
-function Broadcast(event, data) {
+function Broadcast(event, data, collection) {
   const connections = Object.values(store.activeConnections);
 
   if (!Object.values(events).includes(event)) return console.log('Invalid event:', event);
 
   connections.forEach(({ connection, id }) => {
     if (!connection) return;
 
-    connection.send(JSON.stringify({ event, data }));
+    connection.send(JSON.stringify({ event, data, collection }), (error) => {
+      if (!error) return;
 
-    console.log('Broadcasted event: ', id, event);
+      // If connection no longer exists delete it.
+      delete connections[id];
+    });
+
+    console.log('Broadcasted event: ', [id], event);
   });
 
   return Object.keys(store.activeConnections);

app/components/Connect.js

@@ -2,27 +2,39 @@ const store = require('../store');
 const events = require('../events');
 const Broadcast = require('./Broadcast');
 
-function Connect(connection, { protocol }) {
+function Connect(connection, req) {
+  const ip = req.headers['x-forwarded-for'] || req.connection.remoteAddress;
+
+  // const location = url.parse(req.url, true);
+  // You might use location.query.access_token to authenticate or share sessions
+  // or req.headers.cookie (see http://stackoverflow.com/a/16395220/151312)
+
   const id = store.globalCounter;
 
   store.activeConnections[id] = { connection, id };
 
   // Connected.
-  connection.sendUTF(JSON.stringify({ event: events.CONNECT }));
+  connection.send(JSON.stringify({ event: events.CONNECT }));
   store.globalCounter += 1;
 
   connection.on('message', (message) => {
-    if (message.type !== 'utf8') return;
-
-    // Only broadcast preview messages.
-    if (protocol !== 'preview-protocol') return;
-
-    Broadcast(events.COLLECTIONS_PREVIEW);
+    let data;
+    try {
+      data = JSON.parse(message);
+    } catch (error) {
+      return;
+    }
+
+    Broadcast(data.event, data.entry);
   });
 
-  connection.on('close', (reasonCode, description) => {
-    console.log(`${new Date()} Peer ${connection.remoteAddress} disconnected. ${description}`);
+  connection.on('error', (error) => {
+    console.log(`${new Date()} Peer ${ip} disconnected. ${error}`);
+    delete store.activeConnections[connection.id];
+  });
 
+  connection.on('close', (error) => {
+    console.log(`${new Date()} Peer ${ip} disconnected. ${error}`);
     delete store.activeConnections[connection.id];
   });
 }

app/webServer.js

@@ -14,9 +14,9 @@ function webServer() {
   app.use(bodyParser.json());
 
   app.post('/update', (req, res) => {
-    const { body: { event, args } } = req.body;
+    const { body: { event, args } } = req;
 
-    Broadcast(event, args);
+    Broadcast(event, args[1], args[0]);
 
     res.send('ok');
   });

app/webSocketServer.js

@@ -1,35 +1,11 @@
-const WebSocketServer = require('websocket').server;
-const WebSocketRouter = require('websocket').router;
+const WebSocket = require('ws');
 const Connect = require('./components/Connect');
 
-const originIsAllowed = origin => true || origin;
+function webSocketServer(server) {
+  const wss = new WebSocket.Server({ server });
 
-function webSocketServer(httpServer) {
-  const wsServer = new WebSocketServer({
-    httpServer,
-    // You should not use autoAcceptConnections for production
-    // applications, as it defeats all standard cross-origin protection
-    // facilities built into the protocol and the browser.  You should
-    // *always* verify the connection's origin and decide whether or not
-    // to accept it.
-    autoAcceptConnections: false,
-  });
-
-  // Ws Router.
-  const router = new WebSocketRouter();
-
-  router.attachServer(wsServer);
-
-  // Accepts all protocols.
-  router.mount('*', '*', (request) => {
-    if (!originIsAllowed(request.origin)) {
-      request.reject();
-      return;
-    }
-
-    const connection = request.accept(request.origin);
-
-    Connect(connection, request);
+  wss.on('connection', (connection, req) => {
+    Connect(connection, req);
   });
 }
 

package.json

@@ -26,7 +26,7 @@
 		"fetch": "^1.1.0",
 		"isomorphic-fetch": "^2.2.1",
 		"node-fetch": "^2.0.0-alpha.9",
-		"websocket": "^1.0.24"
+		"ws": "^3.3.3"
 	},
 	"devDependencies": {
 		"eslint": "^4.11.0",