Retry peer ping

src/liowebrtc.js

@@ -172,8 +172,13 @@ class LioWebRTC extends WildEmitter {
       if (peer.id) {
         removeConnection(this.id, peer.id);
       }
+    });
 
-      if (this.config.dataOnly && this.config.network.maxPeers > 0 && getNeighbors(this.id).length < this.config.network.minPeers) {
+    self.on('channelClose', (channel) => {
+      if (channel.label === 'liowebrtc' &&
+        this.config.dataOnly &&
+        this.config.network.maxPeers > 0 &&
+        getNeighbors(this.id).length < this.config.network.minPeers) {
         this.connectToRandomPeer();
       }
     });
@@ -261,20 +266,23 @@ class LioWebRTC extends WildEmitter {
   }
 
   sendPing(peer, peerId, firstPing = false, channel = defaultChannel) {
-    const self = this;
     if (firstPing) peer.start();
-    setTimeout(() => {
-      if (peer.sendDirectly('_ping', Date.now(), channel)) {
-        // this.logger.log('sent ping to', peer.id);
-        if (firstPing) this.emit('createdPeer', peer);
-      } else {
-        // The channel is closed, remove the peer
-        // console.log('removing peer, ping failed', peerId);
-        self.unconnectivePeers[peerId] = true;
-        peer.end();
-        this.connectToRandomPeer();
+    setTimeout(this.ping.bind(this, peer, peerId, firstPing, channel), 1000);
+  }
+
+  ping(peer, peerId, firstPing, channel, tries = 0) {
+    if (peer.sendDirectly('_ping', Date.now(), channel)) {
+      // this.logger.log('sent ping to', peer.id);
+      if (firstPing) this.emit('createdPeer', peer);
+    } else {
+      // The channel is closed
+      if (tries === 2) {
+        this.unconnectivePeers[peerId] = true;
+        peer.end(false);
+        return;
       }
-    }, 1000);
+      setTimeout(this.ping.bind(this, peer, peerId, firstPing, channel, tries + 1), 1000);
+    }
   }
 
   connectToRandomPeer() {
@@ -310,6 +318,10 @@ class LioWebRTC extends WildEmitter {
       });
   }
 
+  getSlowestPeers() {
+    const peers = getDroppablePeers();
+  }
+
   leaveRoom() {
     if (this.roomName) {
       this.connection.emit('leave');

src/peer.js

@@ -61,7 +61,6 @@ class Peer extends WildEmitter {
           break;
         case 'closed':
           this.handleStreamRemoved(false);
-          self.parent.emit('removedPeer', self);
           break;
         default:
           break;
@@ -231,10 +230,13 @@ class Peer extends WildEmitter {
     this.pc.offer(constraints, (err, success) => { });
   }
 
-  end() {
+  end(emitRemoval = true) {
     if (this.closed) return;
     this.pc.close();
-    this.handleStreamRemoved();
+    this.handleStreamRemoved(emitRemoval);
+    if (emitRemoval) {
+      this.parent.emit('removedPeer', this);
+    }
   }
 
   handleRemoteStreamAdded(event) {