fixup! lib, test: use ping-pong instead of heartbeat

metarhia · Nov 22, 2017 · c93dfc0 · c93dfc0
1 parent 670d725
commit c93dfc0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git a/lib/connection.js b/lib/connection.js
@@ -236,7 +236,7 @@ class Connection extends EventEmitter {
 
   // Send a pong message
   //
-  pong(messageId) {
+  _pong(messageId) {
     if (this._closed) {
       return;
     }
@@ -252,10 +252,7 @@ class Connection extends EventEmitter {
       if (this._closed) {
         return;
       }
-      const pingId = this._nextMessageId;
-      this.ping(() => {
-        this.session.unbufferUpTo(pingId);
-      });
+      this.ping();
     };
 
     this._heartbeatInterval = setInterval(heartbeat, interval);
@@ -683,7 +680,7 @@ class Connection extends EventEmitter {
   //
   _processPingMessage(message) {
     const messageId = message.ping[0];
-    this.pong(messageId);
+    this._pong(messageId);
     this.session._onMessageRecieved(messageId);
   }
 

diff --git a/lib/session.js b/lib/session.js
@@ -25,13 +25,6 @@ class Session extends Map {
 
     Object.preventExtensions(this);
   }
-
-  unbufferUpTo(id) {
-    for (let i = this.guaranteedDeliveredCount + 1; i <= id; i++) {
-      this.buffer.delete(i);
-    }
-  }
-
   _bufferMessage(id, message) {
     this.buffer.set(Math.abs(id), message);
     this.latestBufferedMessageId = id;
@@ -53,7 +46,9 @@ class Session extends Map {
     if (this.connection) {
       this.connection.close();
     }
-    this.unbufferUpTo(recievedCount);
+    for (let i = this.guaranteedDeliveredCount + 1; i <= recievedCount; i++) {
+      this.buffer.delete(i);
+    }
     this.connection = newConnection;
     this.guaranteedDeliveredCount = recievedCount;
   }