redweb 0.5.8 → 0.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "redweb",
-  "version": "0.5.8",
+  "version": "0.6.0",
   "description": "A way to quickly set up an express server",
   "main": "index.js",
   "scripts": {
@@ -21,6 +21,7 @@
   "devDependencies": {
     "@types/express": "^4.17.21",
     "@types/jest": "^29.5.12",
-    "jest": "^29.7.0"
+    "jest": "^29.7.0",
+    "supertest": "^7.0.0"
   }
 }

package/src/ws/BaseSocketServer.js

@@ -1,4 +1,3 @@
-const { randomUUID } = require('crypto');
 const WebSocket = require('ws');
 
 /**
@@ -59,6 +58,20 @@ class BaseSocketServer {
         return handlerConfig.map(HandlerClass => new HandlerClass());
     }
 
+    /**
+     * Adds a new handler to the WebSocket server.
+     * @param {new () => BaseHandler} HandlerClass - The handler class to add.
+     */
+    addHandler(HandlerClass) {
+        const newHandler = new HandlerClass();
+        if (this.handlers.find(handler => handler.name === newHandler.name)) {
+            console.warn(`Handler with name '${newHandler.name}' already exists.`);
+            return;
+        }
+        this.handlers.push(newHandler);
+        console.log(`Handler '${newHandler.name}' added successfully.`);
+    }
+
     /**
      * Handles a new WebSocket connection.
      * @param {WebSocket} socket - The WebSocket connection instance.
@@ -67,14 +80,22 @@ class BaseSocketServer {
     handleConnection(socket, req) {
         const ip = req.socket.remoteAddress;
         console.log(`New client connected: ${ip}`);
-        this.clients.set(randomUUID(), socket);
+        if (this.clients.get(ip) !== undefined) {
+            const oldClient = this.clients.get(ip);
+            console.warn(`Client ${ip} already connected, disconnecting existing connection.`);
+            oldClient.send(
+                JSON.stringify({ msg: 'You are being disconnected because a new client is connected with your IP address.' })
+            );
+            oldClient.close();
+        }
+        this.clients.set(ip, socket);
         socket.isAssigned = false; // Tracks whether the socket has been assigned a handler.
 
         if (this.connectionOpenCallback) this.connectionOpenCallback(socket);
 
-        socket.on('message', (message) => this.initialMessageHandler(socket, message, ip));
+        socket.on('message', message => this.initialMessageHandler(socket, message, ip));
         socket.on('close', () => this.handleClose(socket, ip));
-        socket.on('error', (error) => this.handleError(socket, error, ip));
+        socket.on('error', error => this.handleError(socket, error, ip));
     }
 
     /**
@@ -127,7 +148,7 @@ class BaseSocketServer {
 
         // Optional: Perform authentication with `key`
         socket.removeAllListeners('message');
-        handler.newConnection(socket, data);
+        handler.newConnection(socket, connectMessage.data);
     }
 
     /**