fix(isFirst): dont send isFirst twice, ping only members

coast-team · Sep 14, 2017 · 3570e8f · 3570e8f
1 parent de3dd4b
commit 3570e8f
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 35 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -11,7 +11,7 @@
     "node": ">=8.1.4"
   },
   "scripts": {
-    "dev": "npm run pbjs && npm run build && node server.js --host 0.0.0.0 --port 8181 | bunyan",
+    "dev": "npm run proto && npm run build && node server.js --host 0.0.0.0 --port 8010 | bunyan",
     "lint": "eslint ./",
     "build": "rollup -c",
     "proto": "pbjs -t static-module --es6 -w es6 --no-verify --no-delimited --no-comments --no-convert -o src/Protobuf.js src/message.proto",
@@ -47,7 +47,7 @@
     "commitizen": "^2.5.0",
     "cz-conventional-changelog": "^2.0.0",
     "eslint": "^4.6.1",
-    "eslint-config-conaclos": "^2.0.0",
+    "eslint-config-conaclos": "^2.1.0",
     "eslint-config-standard": "^10.0.0",
     "eslint-plugin-extra-rules": "0.8.1",
     "eslint-plugin-import": "^2.3.0",

diff --git a/server.js b/server.js
@@ -2823,7 +2823,7 @@ class SigverError extends Error {
   }
 }
 
-const PING_INTERVAL = 4000;
+const PING_TIMEOUT = 5000;
 const ID_MAX_VALUE = 4294967295;
 
 class Peer extends require('rxjs/Rx').ReplaySubject {
@@ -2832,31 +2832,28 @@ class Peer extends require('rxjs/Rx').ReplaySubject {
     this.key = key;
     this.id = 1 + Math.ceil(Math.random() * ID_MAX_VALUE);
     this.network = undefined;
-    this.pongTimeout = undefined;
+    this.pingTimer = undefined;
     this.pongReceived = false;
   }
 
   clean () {
-    if (this.pongTimeout !== undefined) {
-      clearTimeout(this.pongTimeout);
-    }
+    clearTimeout(this.pingTimer);
     if (this.network !== undefined) {
       this.network.removeMember(this);
     }
-    this.close(SigverError.PONG_TIMEOUT_ERROR, `Pong not received in ${PING_INTERVAL} seconds`);
+    this.close(SigverError.PONG_TIMEOUT_ERROR, `Signaling: pong not received in ${PING_TIMEOUT} milliseconds`);
   }
 
   startPing () {
     this.pongReceived = false;
     this.send({ ping: true });
-    this.pongTimeout = setTimeout(() => {
+    this.pingTimer = setTimeout(() => {
       if (!this.pongReceived) {
-        this.pongTimeout = undefined;
         this.error(new SigverError(SigverError.PONG_TIMEOUT_ERROR));
       } else {
         this.startPing();
       }
-    }, PING_INTERVAL);
+    }, PING_TIMEOUT);
   }
 
   connect (member) {
@@ -3045,9 +3042,6 @@ class ServerCore {
       },
       () => peer.clean()
     );
-
-    // Start ping
-    peer.startPing();
   }
 
   becomeMember (peer) {
@@ -3060,9 +3054,7 @@ class ServerCore {
         const net = new Network(peer.key, peer);
         networks.add(peer.key, net);
       }
-      peer.send({ isFirst: true });
-    } else {
-      peer.send({ isFirst: false });
+      peer.startPing();
     }
   }
 }

diff --git a/src/Peer.js b/src/Peer.js
@@ -1,6 +1,6 @@
 import SigverError from './SigverError'
 
-const PING_INTERVAL = 4000
+const PING_TIMEOUT = 5000
 const ID_MAX_VALUE = 4294967295
 
 export default class Peer extends require('rxjs/Rx').ReplaySubject {
@@ -9,31 +9,28 @@ export default class Peer extends require('rxjs/Rx').ReplaySubject {
     this.key = key
     this.id = 1 + Math.ceil(Math.random() * ID_MAX_VALUE)
     this.network = undefined
-    this.pongTimeout = undefined
+    this.pingTimer = undefined
     this.pongReceived = false
   }
 
   clean () {
-    if (this.pongTimeout !== undefined) {
-      clearTimeout(this.pongTimeout)
-    }
+    clearTimeout(this.pingTimer)
     if (this.network !== undefined) {
       this.network.removeMember(this)
     }
-    this.close(SigverError.PONG_TIMEOUT_ERROR, `Pong not received in ${PING_INTERVAL} seconds`)
+    this.close(SigverError.PONG_TIMEOUT_ERROR, `Signaling: pong not received in ${PING_TIMEOUT} milliseconds`)
   }
 
   startPing () {
     this.pongReceived = false
     this.send({ ping: true })
-    this.pongTimeout = setTimeout(() => {
+    this.pingTimer = setTimeout(() => {
       if (!this.pongReceived) {
-        this.pongTimeout = undefined
         this.error(new SigverError(SigverError.PONG_TIMEOUT_ERROR))
       } else {
         this.startPing()
       }
-    }, PING_INTERVAL)
+    }, PING_TIMEOUT)
   }
 
   connect (member) {

diff --git a/src/ServerCore.js b/src/ServerCore.js
@@ -38,9 +38,6 @@ export default class ServerCore {
       },
       () => peer.clean()
     )
-
-    // Start ping
-    peer.startPing()
   }
 
   becomeMember (peer) {
@@ -53,9 +50,7 @@ export default class ServerCore {
         const net = new Network(peer.key, peer)
         networks.add(peer.key, net)
       }
-      peer.send({ isFirst: true })
-    } else {
-      peer.send({ isFirst: false })
+      peer.startPing()
     }
   }
 }