fix: Use FIFO queue when buffering peer messages

BREAKING CHANGE: We were using an inconsistent FIFO/LIFO approach by mistake.
relaycorp · Jun 25, 2021 · 170d315 · 170d315
1 parent c56e17e
commit 170d315
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/lib/MockPeer.ts b/src/lib/MockPeer.ts
@@ -32,16 +32,16 @@ export abstract class MockPeer {
   public async receive(): Promise<WSData> {
     this.requireConnectionStillOpen();
 
-    const lastMessage = this.popLastPeerMessage();
-    if (lastMessage) {
-      return lastMessage;
+    const oldestMessage = this.popOldestPeerMessage();
+    if (oldestMessage) {
+      return oldestMessage;
     }
 
     return this.peerWebSocket.getLastMessageSent();
   }
 
-  public popLastPeerMessage(): WSData | undefined {
-    return this.peerWebSocket.popLastMessage();
+  public popOldestPeerMessage(): WSData | undefined {
+    return this.peerWebSocket.popOldestMessage();
   }
 
   public async waitForPeerClosure(): Promise<CloseFrame> {

diff --git a/src/lib/MockWebSocket.ts b/src/lib/MockWebSocket.ts
@@ -32,8 +32,8 @@ export class MockWebSocket extends EventEmitter {
   /**
    * @internal
    */
-  public popLastMessage(): WSData | undefined {
-    return this.messagesSent.pop();
+  public popOldestMessage(): WSData | undefined {
+    return this.messagesSent.shift();
   }
 
   public close(code?: number, reason?: string): void {