Merge added functionality from the /more branch into main

package.json

@@ -27,29 +27,34 @@
     "posttest": "npm run lint"
   },
   "dependencies": {
-    "@nestjs/common": "^9.0.0",
-    "@nestjs/core": "^9.0.0",
-    "@nestjs/platform-express": "^9.0.0",
-    "@nestjs/platform-socket.io": "^9.4.0",
-    "@nestjs/websockets": "^9.4.0",
+    "@nestjs/common": "^10.3.7",
+    "@nestjs/core": "^10.3.7",
+    "@nestjs/platform-express": "^10.3.7",
+    "@nestjs/platform-ws": "^10.3.7",
+    "@nestjs/websockets": "^10.3.7",
+    "lodash": "^4.17.21",
     "reflect-metadata": "^0.1.13",
     "rimraf": "^3.0.2",
     "rxjs": "^7.2.0",
-    "socket.io-client": "^4.6.1"
+    "uuid": "^11.0.2",
+    "ws": "^8.18.0"
   },
   "devDependencies": {
     "@nestjs/cli": "^9.0.0",
     "@nestjs/schematics": "^9.0.0",
-    "@nestjs/testing": "^9.0.0",
+    "@nestjs/testing": "^10.3.7",
     "@types/express": "^4.17.13",
     "@types/jest": "28.1.8",
+    "@types/lodash": "^4.17.13",
     "@types/node": "^16.0.0",
     "@types/supertest": "^2.0.11",
+    "@types/ws": "^8.5.12",
     "@typescript-eslint/eslint-plugin": "^5.0.0",
     "@typescript-eslint/parser": "^5.0.0",
     "eslint": "^8.0.1",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-prettier": "^4.0.0",
+    "gts": "^3.1.1",
     "jest": "28.1.3",
     "prettier": "^2.3.2",
     "source-map-support": "^0.5.20",
@@ -58,8 +63,7 @@
     "ts-loader": "^9.2.3",
     "ts-node": "^10.0.0",
     "tsconfig-paths": "4.1.0",
-    "typescript": "^4.7.4",
-    "gts": "^3.1.1"
+    "typescript": "^4.7.4"
   },
   "jest": {
     "moduleFileExtensions": [

src/app.module.ts

@@ -2,9 +2,10 @@ import { Module } from '@nestjs/common';
 import { AppController } from './app.controller';
 import { AppService } from './app.service';
 import { EventsModule } from './events/events.module';
+import { ClientModule } from './clients/client.module';
 
 @Module({
-  imports: [EventsModule],
+  imports: [EventsModule, ClientModule],
   controllers: [AppController],
   providers: [AppService],
 })

src/clients/client.module.ts

@@ -0,0 +1,8 @@
+import { Module } from '@nestjs/common';
+import { ClientService } from './client.service';
+
+@Module({
+  providers: [ClientService],
+  exports: [ClientService],
+})
+export class ClientModule {}

src/clients/client.service.ts

@@ -0,0 +1,86 @@
+import { Injectable } from '@nestjs/common';
+import WebSocket = require('ws');
+import { EventMessage } from '../events/events.types';
+import { SocketId, LobbyCode, ROOMMAN } from '../types/models.types';
+import { v4 as uuid } from 'uuid';
+@Injectable()
+export class ClientService {
+  // Mapping from socketId to the lobby code for the spectators.
+  private clients: Record<SocketId, WebSocket> = {};
+
+  getSocketId(targetSocket: WebSocket): SocketId {
+    for (const [socketId, socket] of Object.entries(this.clients)) {
+      if (socket === targetSocket) return socketId;
+    }
+    throw new Error('Socket not found');
+  }
+
+  /** Sends a message to all connected clients */
+  sendAll(response: EventMessage) {
+    for (const client of Object.values(this.clients)) {
+      if (client.readyState === WebSocket.OPEN) {
+        client.send(JSON.stringify(response));
+      }
+    }
+  }
+
+  /** Sends a message to a specific socket */
+  sendSocket(response: EventMessage, socketId: SocketId) {
+    const socket = this.clients[socketId];
+    if (!socket || socket.readyState !== WebSocket.OPEN) {
+      console.warn('Cannot send to socket, socket is not connected');
+      return;
+    }
+    socket.send(JSON.stringify(response));
+  }
+
+  /** Sends a message to all clients in a particular lobby */
+  sendLobby(response: EventMessage, code: LobbyCode) {
+    for (const [socketId, socket] of Object.entries(this.clients)) {
+      // skip clients not in the lobby
+      if (!ROOMMAN.isJoined(socketId, code)) return;
+
+      if (socket.readyState === WebSocket.OPEN) {
+        socket.send(JSON.stringify(response));
+      }
+    }
+  }
+
+  disconnect(socketId: SocketId, reason?: string) {
+    console.log('Client disconnecting', socketId);
+    if (!this.clients[socketId]) {
+      console.warn(`Client ${socketId} not connected`);
+      return;
+    }
+
+    const message: EventMessage = {
+      event: 'clientDisconnected',
+      data: { reason: reason || 'Just because' },
+    };
+
+    const client = this.clients[socketId];
+    if (!client) return;
+
+    if (client.readyState === WebSocket.OPEN) {
+      client.close(1000, JSON.stringify(message));
+    }
+    delete this.clients[socketId];
+  }
+
+  connect(socket: WebSocket): string {
+    // Assert we're not already connected
+    console.log('Client connecting');
+    const entry = Object.entries(this.clients).find(
+      ([, value]) => socket === value,
+    );
+    if (entry) {
+      console.warn(`Socket ${entry[0]} is already connected`);
+      return entry[0];
+    }
+
+    // Generate an id for the entry, set and return it
+    const socketId = uuid();
+    this.clients[socketId] = socket;
+    return socketId;
+  }
+}