minor refactor

subfuzion · Aug 11, 2022 · 09576f0 · 09576f0
1 parent 6cdc0c5
commit 09576f0
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 18 deletions.
diff --git a/src/server/pong/client.ts b/src/server/pong/client.ts
@@ -1,21 +1,35 @@
 import {EventEmitter} from "events";
 import {WebSocket} from "ws";
 import {v4 as uuid} from "uuid";
+import {Message} from "../../common/pong/messages.js";
+
 
 /**
- * A Client wraps a websocket.
+ * A Client is a light wrapper over a websocket with a unique ID.
  */
 export class Client extends EventEmitter {
-  public readonly ws: WebSocket;
-  public readonly id: string;
+  readonly ws: WebSocket;
+  readonly id: string;
 
   constructor(ws: WebSocket) {
     super();
     this.ws = ws;
     this.id = uuid();
   }
 
-  send(data: any, cb?: (err?: Error) => void): void {
-    this.ws.send(data, cb);
+  /**
+   * Data are sent with no callbacks.
+   * @param data Stringified JSON.
+   */
+  send(data: string): void {
+    this.ws.send(data);
+  }
+
+  /**
+   * Messages are sent with no callbacks.
+   * @param m An instance of Message (or one of its subclasses).
+   */
+  sendMessage(m: Message): void {
+    this.ws.send(JSON.stringify(m));
   }
-}
+}
diff --git a/src/server/pong/connections.ts b/src/server/pong/connections.ts
@@ -61,30 +61,36 @@ export class Connections extends EventEmitter {
   }
 
   // Simple broadcast to all clients.
-  broadcast(message: any): void {
+  broadcast(message: string): void {
     for (const client of this.connections.values()) {
-      client.send(message, (err) => {
-        console.log(err);
-      });
+      client.send(message);
     }
   }
 
   // Broadcast to all clients using a generator function.
-  broadcastg(g: Generator<[Client, any]>): void {
+  broadcastg(g: Generator<[Client, string]>): void {
     for (const [client, message] of g) {
-      client.send(message, err => {
-        if (err) console.log(err);
-      });
+      client.send(message);
     }
   }
 
   startBroadcasting(
-      g: () => Generator<[Client, any]>,
+      g: () => Generator<[Client, string]>,
       intervalMs: number): void {
     this.intervalId = setInterval(() => this.broadcastg(g()), intervalMs);
   }
 
-  stopBroadcasting() {
+  stopBroadcasting(): void {
     clearInterval(this.intervalId);
   }
+
+  close(): Promise<void> {
+    return new Promise(resolve => {
+      this.stopBroadcasting();
+      for (const [ws] of this.connections) {
+        ws.close();
+      }
+      resolve();
+    });
+  }
 }
diff --git a/src/server/pong/pongserver.ts b/src/server/pong/pongserver.ts
@@ -52,7 +52,8 @@ export class PongServer {
   }
 
   async close(): Promise<void> {
-    return new Promise((resolve, reject) => {
+    return new Promise(async (resolve, reject) => {
+      await this.connections.close();
       this.server.close(err => {
         if (err) return reject(err);
         resolve();
@@ -91,7 +92,8 @@ export class PongServer {
 
     game.onStateChange((m: Message) => {
       // console.log(m);
-      ws.send(JSON.stringify(m));
+      //ws.send(JSON.stringify(m));
+      client.sendMessage(m);
     });
 
     ws.on("message", data => {