Merge pull request #139 from peers/feature/brokenConnectionDetection

add checkConnections service

bin/peerjs

@@ -20,6 +20,11 @@ const opts = require('optimist')
       description: 'concurrent limit',
       default: 5000
     },
+    alive_timeout: {
+      demand: false,
+      description: 'broken connection check timeout (milliseconds)',
+      default: 60000
+    },
     key: {
       demand: false,
       alias: 'k',

config/index.js

@@ -1,6 +1,7 @@
 module.exports = {
   port: 9000,
   expire_timeout: 5000,
+  alive_timeout: 60000,
   key: 'peerjs',
   path: '/myapp',
   concurrent_limit: 5000,

package.json

@@ -13,7 +13,7 @@
   "author": "Michelle Bu, Eric Zhang",
   "license": "MIT",
   "scripts": {
-    "test": "eslint . && mocha test/**/*.js",
+    "test": "eslint . && mocha \"test/**/*.js\"",
     "start": "bin/peerjs --port ${PORT:=9000}"
   },
   "dependencies": {

src/index.js

@@ -11,7 +11,13 @@ const init = ({ app, server, options }) => {
   const realm = new Realm();
   const messageHandler = require('./messageHandler')({ realm });
   const api = require('./api')({ config, realm, messageHandler });
+
   const { startMessagesExpiration } = require('./services/messagesExpire')({ realm, config, messageHandler });
+  const checkBrokenConnections = require('./services/checkBrokenConnections')({
+    realm, config, onClose: (client) => {
+      app.emit('disconnect', client);
+    }
+  });
 
   app.use(options.path, api);
 
@@ -52,6 +58,8 @@ const init = ({ app, server, options }) => {
   });
 
   startMessagesExpiration();
+
+  checkBrokenConnections.start();
 };
 
 function ExpressPeerServer(server, options) {

src/messageHandler/handlers/heartbeat/index.js

@@ -0,0 +1,4 @@
+module.exports = (client) => {
+  const nowTime = new Date().getTime();
+  client.setLastPing(nowTime);
+};

src/messageHandler/index.js

@@ -23,6 +23,7 @@ class MessageHandlers {
 }
 module.exports = ({ realm }) => {
   const transmissionHandler = require('./handlers/transmission')({ realm });
+  const heartbeatHandler = require('./handlers/heartbeat');
 
   const messageHandlers = new MessageHandlers();
 
@@ -35,9 +36,7 @@ module.exports = ({ realm }) => {
     });
   };
 
-  const handleHeartbeat = () => {
-
-  };
+  const handleHeartbeat = (client) => heartbeatHandler(client);
 
   messageHandlers.registerHandler(MessageType.HEARTBEAT, handleHeartbeat);
   messageHandlers.registerHandler(MessageType.OFFER, handleTransmission);

src/models/client.js

@@ -3,6 +3,7 @@ class Client {
     this.id = id;
     this.token = token;
     this.socket = null;
+    this.lastPing = new Date().getTime();
   }
 
   getId() {
@@ -13,10 +14,22 @@ class Client {
     return this.token;
   }
 
+  getSocket() {
+    return this.socket;
+  }
+
   setSocket(socket) {
     this.socket = socket;
   }
 
+  getLastPing() {
+    return this.lastPing;
+  }
+
+  setLastPing(lastPing) {
+    this.lastPing = lastPing;
+  }
+
   send(data) {
     this.socket.send(JSON.stringify(data));
   }

src/services/checkBrokenConnections/index.js

@@ -0,0 +1,57 @@
+const DEFAULT_CHECK_INTERVAL = 300;
+
+module.exports = ({ realm, config, checkInterval = DEFAULT_CHECK_INTERVAL, onClose = () => { } }) => {
+  const checkConnections = () => {
+    const clientsIds = realm.getClientsIds();
+
+    const now = new Date().getTime();
+    const aliveTimeout = config.alive_timeout;
+
+    for (const clientId of clientsIds) {
+      const client = realm.getClientById(clientId);
+      const timeSinceLastPing = now - client.getLastPing();
+
+      if (timeSinceLastPing < aliveTimeout) continue;
+
+      try {
+        client.getSocket().close();
+        // eslint-disable-next-line no-empty
+      } catch (e) { } finally {
+        realm.clearMessageQueue(clientId);
+        realm.removeClientById(clientId);
+        client.setSocket(null);
+
+        if (onClose) onClose(client);
+      }
+    }
+  };
+
+  let timeoutId;
+
+  const start = () => {
+    if (timeoutId) {
+      clearTimeout(timeoutId);
+    }
+
+    timeoutId = setTimeout(() => {
+      checkConnections();
+
+      timeoutId = null;
+
+      start();
+    }, checkInterval);
+  };
+
+  const stop = () => {
+    if (timeoutId) {
+      clearTimeout(timeoutId);
+      timeoutId = null;
+    }
+  };
+
+  return {
+    start,
+    stop,
+    CHECK_INTERVAL: checkInterval
+  };
+};

test/messageHandler/handlers/heartbeat/index.js

@@ -0,0 +1,16 @@
+const { expect } = require('chai');
+const Client = require('../../../../src/models/client');
+const heartbeatHandler = require('../../../../src/messageHandler/handlers/heartbeat');
+
+describe('Heartbeat handler', () => {
+    it('should update last ping time', () => {
+        const client = new Client({ id: 'id', token: '' });
+        client.setLastPing(0);
+
+        const nowTime = new Date().getTime();
+
+        heartbeatHandler(client);
+
+        expect(client.getLastPing()).to.be.closeTo(nowTime, 2);
+    });
+});

test/services/checkBrokenConnections/index.js

@@ -0,0 +1,43 @@
+const { expect } = require('chai');
+const Client = require('../../../src/models/client');
+const Realm = require('../../../src/models/realm');
+const checkBrokenConnectionsBuilder = require('../../../src/services/checkBrokenConnections');
+
+describe('checkBrokenConnections service', () => {
+    it('should remove client after 2 checks', (done) => {
+        const realm = new Realm();
+        const doubleCheckTime = 55;//~ equals to checkBrokenConnections.CHECK_INTERVAL * 2
+        const checkBrokenConnections = checkBrokenConnectionsBuilder({ realm, config: { alive_timeout: doubleCheckTime }, checkInterval: 30 });
+        const client = new Client({ id: 'id', token: '' });
+        realm.setClient(client, 'id');
+
+        checkBrokenConnections.start();
+
+        setTimeout(() => {
+            expect(realm.getClientById('id')).to.be.undefined;
+            checkBrokenConnections.stop();
+            done();
+        }, checkBrokenConnections.CHECK_INTERVAL * 2 + 3);
+    });
+
+    it('should remove client after 1 ping', (done) => {
+        const realm = new Realm();
+        const doubleCheckTime = 55;//~ equals to checkBrokenConnections.CHECK_INTERVAL * 2
+        const checkBrokenConnections = checkBrokenConnectionsBuilder({ realm, config: { alive_timeout: doubleCheckTime }, checkInterval: 30 });
+        const client = new Client({ id: 'id', token: '' });
+        realm.setClient(client, 'id');
+
+        checkBrokenConnections.start();
+
+        //set ping after first check
+        setTimeout(() => {
+            client.setLastPing(new Date().getTime());
+
+            setTimeout(() => {
+                expect(realm.getClientById('id')).to.be.undefined;
+                checkBrokenConnections.stop();
+                done();
+            }, checkBrokenConnections.CHECK_INTERVAL * 2 + 10);
+        }, checkBrokenConnections.CHECK_INTERVAL);
+    });
+});