move test helpers to own files

src/Client.ts

@@ -77,7 +77,7 @@ export class Client extends EventEmitter<ClientEvents> {
   private heartbeat: ReturnType<typeof setInterval>
 
   private serverConnection: WebSocket
-  private serverConnectionQueue: Message.ClientToServer[] = []
+  private pendingMessages: Message.ClientToServer[] = []
 
   /**
    * @param userName a string that identifies you uniquely, defaults to a CUID
@@ -124,7 +124,7 @@ export class Client extends EventEmitter<ClientEvents> {
         await isReady(this.serverConnection)
         this.retryDelay = this.minRetryDelay
         this.shouldReconnectIfClosed = true
-        this.drainQueue()
+        this.sendPendingMessages()
         this.emit("server-connect")
         this.open = true
 
@@ -296,9 +296,9 @@ export class Client extends EventEmitter<ClientEvents> {
     }
   }
 
-  private drainQueue() {
-    while (this.serverConnectionQueue.length) {
-      let message = this.serverConnectionQueue.shift()!
+  private sendPendingMessages() {
+    while (this.pendingMessages.length) {
+      let message = this.pendingMessages.shift()!
       this.send(message)
     }
   }
@@ -309,7 +309,7 @@ export class Client extends EventEmitter<ClientEvents> {
       const msgBytes = pack(message)
       this.serverConnection.send(msgBytes)
     } catch (err) {
-      this.serverConnectionQueue.push(message)
+      this.pendingMessages.push(message)
     }
   }
 

src/test/Client.test.ts

@@ -1,11 +1,11 @@
-import { getPortPromise as getAvailablePort } from "portfinder"
-import { describe, expect, it } from "vitest"
+import { pause } from "../lib/pause.js"
+import { expect, it } from "vitest"
 import { Client } from "../Client.js"
+import { Server } from "../index.js"
 import { eventPromise } from "../lib/eventPromise.js"
-import { DocumentId, Server } from "../index.js"
-import { PeerEventPayload } from "../types.js"
 import { pack, unpack } from "../lib/msgpack.js"
-import { WebSocket } from "isomorphic-ws"
+import { allConnected } from "./helpers/allConnected.js"
+import { allDisconnected } from "./helpers/allDisconnected.js"
 
 let testId = 0
 
@@ -180,31 +180,3 @@ it("closes when server disconnects", async () => {
   await eventPromise(alice, "server-disconnect")
   expect(alice.open).toBe(false)
 })
-
-const allConnected = (a: Client, b: Client, documentId?: DocumentId) =>
-  Promise.all([connection(a, b, documentId), connection(b, a, documentId)])
-
-const allDisconnected = (a: Client, b: Client) =>
-  Promise.all([disconnection(a, b), disconnection(b, a)])
-
-const connection = (a: Client, b: Client, documentId?: DocumentId) =>
-  new Promise<WebSocket>(resolve =>
-    a.on("peer-connect", ({ userName, documentId: d, socket }) => {
-      if (
-        userName === b.userName &&
-        // are we waiting to connect on a specific document ID?
-        (documentId === undefined || documentId === d)
-      )
-        resolve(socket)
-    })
-  )
-
-const disconnection = (a: Client, b: Client) =>
-  new Promise<void>(resolve =>
-    a.on("peer-disconnect", ({ userName = "" }) => {
-      if (userName === b.userName) resolve()
-    })
-  )
-
-const pause = (t = 100) =>
-  new Promise<void>(resolve => setTimeout(() => resolve(), t))

src/test/Server.test.ts

@@ -6,6 +6,7 @@ import { isReady } from "../lib/isReady.js"
 import { pack, unpack } from "../lib/msgpack.js"
 import { pause } from "../lib/pause.js"
 import type { Message } from "../types.js"
+import { permutationsOfTwo } from "./helpers/permutationsOfTwo.js"
 
 /**
  * In this context:
@@ -277,6 +278,3 @@ it("Should not crash when one peer disconnects mid-introduction", async () => {
 
   await teardown(...sockets)
 })
-
-const permutationsOfTwo = (n: number) => factorial(n) / factorial(n - 2)
-const factorial = (n: number): number => (n === 1 ? 1 : n * factorial(n - 1))

src/test/helpers/allConnected.ts

@@ -0,0 +1,10 @@
+import { Client } from "../../Client.js"
+import { DocumentId } from "../../index.js"
+import { connection } from "./connection.js"
+import { WebSocket } from "isomorphic-ws"
+
+export const allConnected = (a: Client, b: Client, documentId?: DocumentId) =>
+  Promise.all<WebSocket>([
+    connection(a, b, documentId),
+    connection(b, a, documentId),
+  ])

src/test/helpers/allDisconnected.ts

@@ -0,0 +1,5 @@
+import { Client } from "../../Client.js"
+import { disconnection } from "./disconnection.js"
+
+export const allDisconnected = (a: Client, b: Client) =>
+  Promise.all([disconnection(a, b), disconnection(b, a)])

src/test/helpers/connection.ts

@@ -0,0 +1,15 @@
+import { Client } from "../../Client.js"
+import { DocumentId } from "../../index.js"
+import { WebSocket } from "isomorphic-ws"
+
+export const connection = (a: Client, b: Client, documentId?: DocumentId) =>
+  new Promise<WebSocket>(resolve =>
+    a.on("peer-connect", ({ userName, documentId: d, socket }) => {
+      if (
+        userName === b.userName &&
+        // are we waiting to connect on a specific document ID?
+        (documentId === undefined || documentId === d)
+      )
+        resolve(socket)
+    })
+  )

src/test/helpers/disconnection.ts

@@ -0,0 +1,8 @@
+import { Client } from "../../Client.js"
+
+export const disconnection = (a: Client, b: Client) =>
+  new Promise<void>(resolve =>
+    a.on("peer-disconnect", ({ userName = "" }) => {
+      if (userName === b.userName) resolve()
+    })
+  )

src/test/helpers/factorial.ts

@@ -0,0 +1,2 @@
+export const factorial = (n: number): number =>
+  n === 1 ? 1 : n * factorial(n - 1)

src/test/helpers/permutationsOfTwo.ts

@@ -0,0 +1,3 @@
+import { factorial } from "./factorial.js"
+
+export const permutationsOfTwo = (n: number) => factorial(n) / factorial(n - 2)