redweb 0.6.9 → 0.7.1

package/README.md

@@ -1,239 +1,354 @@
 # RedWeb
 
-RedWeb is a simple and flexible Node.js framework built on top of Express.js and WebSocket. It allows you to quickly set up web servers and WebSocket servers with customizable options.
+**RedWeb** is a flexible Node.js framework built on top of **Express.js** and **WebSocket**. It enables quick setup of HTTP(S) and WebSocket servers with a modular route and handler system.
 
-## Installation
+---
 
-To install RedWeb, use npm:
+## 📦 Installation
 
 ```bash
 npm install redweb
 ```
 
-## Usage
+---
 
-### Basic Example
+## 🚀 Quick Start
 
-Initialize your RedWeb instance with the default options:
-
-```javascript
+```js
 const { HttpServer, SocketServer } = require('redweb');
 
-// HTTP server with default configuration
-const httpServer = new HttpServer();
-
-// WebSocket server with default configuration
-const socketServer = new SocketServer();
+new HttpServer(); // serves public/ by default
+new SocketServer(); // starts WS on :3000
 ```
 
-### Custom Configuration
-
-#### HTTP Server with HTMX Rendering
+---
 
-RedWeb now supports dynamic rendering of `.htmx` files using `enableHtmxRendering`.
+## 🌐 HTTP Server Example (HTMX Support)
 
-```javascript
+```js
 const { HttpServer, METHODS } = require('redweb');
 
-const options = {
-    port: 3000,
-    publicPaths: ['./public'],
-    enableHtmxRendering: true, // Enable .htmx rendering
-    services: [
-        {
-            serviceName: '/submit-form',
-            method: METHODS.POST,
-            function: (req, res) => {
-                const { name, email, message } = req.body;
-                if (!name || !email || !message) {
-                    return res.status(400).json({ error: 'All fields are required' });
-                }
-                res.status(200).json({ success: 'Form submitted successfully' });
-            }
-        }
-    ]
-};
-
-const app = new HttpServer(options);
+new HttpServer({
+  port: 3000,
+  publicPaths: ['./public'],
+  enableHtmxRendering: true,
+  services: [
+    {
+      serviceName: '/submit',
+      method: METHODS.POST,
+      function: (req, res) => {
+        if (!req.body.name) return res.status(400).json({ error: 'Missing name' });
+        res.status(200).json({ message: `Thanks, ${req.body.name}!` });
+      }
+    }
+  ]
+});
 ```
 
-Place `.htmx` files in the specified `publicPaths`, and they will be dynamically rendered.
-
-Example:
-
-**File: `public/index.htmx`**
-```javascript
-const name = 'RedWeb User';
+`.htmx` files under `public/` will render server-side. Example:
 
+```html
+<!-- public/hello.htmx -->
 <@>
-    <h1>Hello, {{name}}!</h1>
+  <h1>Hello, {{name}}!</h1>
 <@/>
 ```
 
-Accessing `/index.htmx` will render:
-```html
-<h1>Hello, RedWeb User!</h1>
-```
-
-#### HTTPS Server
+---
 
-```javascript
-const { HttpsServer } = require('redweb');
+## 🔌 WebSocket Broadcast Chat (🔥 Instant Testing)
 
-const options = {
-    port: 3443,
-    ssl: {
-        key: './path/to/key.pem',
-        cert: './path/to/cert.pem'
-    },
-    publicPaths: ['./public'],
-    enableHtmxRendering: true // Enable .htmx rendering
-};
+### 1. `ChatHandler.js`
 
-const app = new HttpsServer(options);
-```
-
-### WebSocket Server with Routes and Handlers
-
-RedWeb uses **route-based architecture** for WebSocket connections, allowing you to modularize and secure your WebSocket message handling logic.
-
-#### Defining a Custom Handler
-
-Handlers extend the `BaseHandler` class and manage their own connections and message types.
-
-```javascript
+```js
 const { BaseHandler } = require('redweb');
 
 class ChatHandler extends BaseHandler {
-    constructor() {
-        super('chat');
-    }
-
-    onMessage(socket, message) {
-        console.log(`Received chat message: ${message.text}`);
-        socket.send(JSON.stringify({ type: 'chatResponse', message: 'Hello!' }));
-    }
+  constructor() {
+    super('chat');
+  }
+
+  onMessage(socket, message) {
+    const text = message.text;
+    socket.broadcast({ type: 'chat', text });
+  }
 }
 
 module.exports = ChatHandler;
 ```
 
-#### Defining a WebSocket Route
+---
 
-Routes group handlers and specify the WebSocket path.
+### 2. `ChatRoute.js`
 
-```javascript
+```js
 const { SocketRoute } = require('redweb');
 const ChatHandler = require('./ChatHandler');
 
 class ChatRoute extends SocketRoute {
-    constructor() {
-        super({
-            path: '/chat',
-            handlers: [ChatHandler]
-        });
-    }
+  constructor() {
+    super({
+      path: '/chat',
+      handlers: [ChatHandler],
+      allowDuplicateConnections: true
+    });
+  }
 }
 
 module.exports = ChatRoute;
 ```
 
-#### Setting Up a WebSocket Server with Routes
+---
+
+### 3. `server.js`
 
-```javascript
+```js
 const { SocketServer } = require('redweb');
 const ChatRoute = require('./ChatRoute');
 
 new SocketServer({
-    port: 3000,
-    routes: [ChatRoute]
+  port: 3000,
+  routes: [ChatRoute]
 });
 ```
 
-### Adding Routes Dynamically
+---
 
-Routes can be added to the WebSocket server after initialization.
+### 4. `client.html`
 
-```javascript
-const { SocketServer, SocketRoute } = require('redweb');
-const ChatHandler = require('./ChatHandler');
+```html
+<!DOCTYPE html>
+<html>
+  <body>
+    <h1>Broadcast Chat</h1>
+    <input id="msg" placeholder="Type message..." />
+    <button onclick="send()">Send</button>
+    <pre id="log"></pre>
+
+    <script>
+      const log = document.getElementById('log');
+      const ws = new WebSocket('ws://localhost:3000/chat');
+
+      ws.onmessage = (e) => {
+        const msg = JSON.parse(e.data);
+        log.textContent += `\n${msg.text}`;
+      };
+
+      function send() {
+        const text = document.getElementById('msg').value;
+        ws.send(JSON.stringify({ type: 'chat', text }));
+      }
+    </script>
+  </body>
+</html>
+```
 
-class ChatRoute extends SocketRoute {
-    constructor() {
-        super({
-            path: '/chat',
-            handlers: [ChatHandler]
-        });
-    }
+Open multiple tabs to test.
+
+---
+
+## 🧩 Socket Architecture
+
+### `SocketRoute`
+
+Defines a WebSocket path, handlers, and optional route-scoped services:
+
+```js
+new SocketRoute({
+  path: '/game',
+  handlers: [ChatHandler, MoveHandler],
+  services: [MatchService], // ✅ Scoped only to this route
+  allowDuplicateConnections: true
+});
+```
+
+---
+
+### `BaseHandler`
+
+Handlers are message-type keyed classes:
+
+```js
+class MoveHandler extends BaseHandler {
+  constructor() {
+    super('move');
+  }
+
+  onMessage(socket, message) {
+    // handle movement logic
+  }
 }
+```
+
+---
+
+### `SocketService` (NEW)
+
+Socket services run alongside handlers on a route. Use for timers, logic, cleanup.
 
-const socketServer = new SocketServer({ port: 3000 });
+```js
+class MatchService extends SocketService {
+  constructor() {
+    super('match', 1000); // tick every 1s
+  }
 
-// Dynamically add a new route
-const chatRoute = new ChatRoute();
-socketServer.routes.push(chatRoute);
+  onInit(route) {
+    route.registry.on('maxPlayersReached', () => this.startMatch());
+  }
+
+  onTick() {
+    // tick logic
+  }
+
+  onShutdown() {
+    // cleanup
+  }
+}
 ```
 
-### Client Communication with a Route
+### 📦 `SocketRegistry` (NEW) – Event-Driven Socket Object Store
 
-The client connects to the WebSocket server using the specified route.
+`SocketRegistry` is a lightweight, extendable class for managing WebSocket-connected clients (or any socket-bound object). It provides add/remove/get/broadcast utilities with full `EventEmitter` support.
 
-```javascript
-const WebSocket = require('ws');
+Useful for managing players, NPCs, chat members, rooms, etc.
 
-const ws = new WebSocket('ws://localhost:3000/chat');
+---
 
-ws.on('open', () => {
-    ws.send(JSON.stringify({ type: 'chat', text: 'Hello there!' }));
-});
+### 🔧 Basic Usage
 
-ws.on('message', (message) => {
-    console.log('Received:', message);
-});
+```js
+const { SocketRegistry } = require('redweb');
+
+class Player {
+    constructor(socket, id) {
+        this.socket = socket;
+        this.id = id;
+    }
+
+    send(type, payload) {
+        this.socket.send(JSON.stringify({ type, ...payload }));
+    }
+
+    getSanitized() {
+        return { id: this.id };
+    }
+}
 ```
 
-### Managing Connected Clients
+---
 
-RedWeb's WebSocket server maintains a list of connected clients by their IP addresses for each route. This list is automatically updated when clients connect or disconnect.
+### 🚀 Extending `SocketRegistry` to Create a Player Registry
 
-```javascript
-const { SocketRoute } = require('redweb');
+```js
+class PlayerRegistry extends SocketRegistry {
+    create(socket, id) {
+        return new Player(socket, id);
+    }
 
-class ChatRoute extends SocketRoute {
-    constructor() {
-        super({
-            path: '/chat',
-            handlers: []
-        });
+    addPlayer(socket, id) {
+        const player = this.create(socket, id);
+        const success = this.add(player);
+        if (success) this.emit('playerJoined', player);
+        return success;
+    }
+
+    removePlayer(id) {
+        const success = this.remove(id);
+        if (success) this.emit('playerLeft', id);
+        return success;
     }
 
-    onConnection(socket) {
-        console.log('New client connected:', socket.remoteAddress);
+    broadcastToAll(message) {
+        this.items.forEach(player => player.send(message.type, message));
     }
 }
+```
 
-module.exports = ChatRoute;
+---
+
+### 📣 Built-in Events
+
+You can listen to events:
+
+```js
+const registry = new PlayerRegistry();
+
+registry.on('playerJoined', player => {
+    console.log('New player:', player.id);
+});
+
+registry.on('playerLeft', id => {
+    console.log('Player left:', id);
+});
 ```
 
-## Options
+---
+
+### 🔄 Built-in Methods
+
+* `add(player)`
+* `remove(id)`
+* `getById(id)`
+* `getBySocket(socket)`
+* `all()`
+* `count()`
+* `broadcast(message, excludeSocket?)`
+* `getSanitizedList()`
+
+---
+
+## 🔧 Configuration
+
+### HTTP / HTTPS Options
+
+| Option                | Type      | Default        | Description                    |
+| --------------------- | --------- | -------------- | ------------------------------ |
+| `port`                | number    | `80`           | Port to listen on              |
+| `bind`                | string    | `'0.0.0.0'`    | Bind address                   |
+| `publicPaths`         | string\[] | `['./public']` | Serve static and `.htmx` files |
+| `services`            | object\[] | `[]`           | REST endpoints                 |
+| `enableHtmxRendering` | boolean   | `false`        | Enables `.htmx` file rendering |
+| `ssl`                 | object    | `undefined`    | Used in `HttpsServer`          |
+
+---
+
+### WebSocket Server Options
+
+| Option   | Type            | Default | Description                  |
+| -------- | --------------- | ------- | ---------------------------- |
+| `port`   | number          | `3000`  | WebSocket port               |
+| `routes` | `SocketRoute[]` | `[]`    | List of custom route classes |
+
+&nbsp;
+
+# Changelog
+Here’s the updated `CHANGELOG.md` entry for **RedWeb v0.7.1**, written professionally and focused only on the framework-level additions:
+
+---
+
+## 📦 RedWeb v0.7.1 – Socket Services & Registries
+
+### ✨ Added
+
+* `SocketService`: A new class for running autonomous, lifecycle-aware logic alongside a `SocketRoute`. Ideal for game loops, timers, state machines, or server-side AI.
+
+  * Hooks: `onInit(route)`, `onTick()`, `onShutdown()`
+  * Optional `tickRateMs` support for periodic execution
+
+* `SocketRegistry`: A generic, event-driven registry for managing WebSocket-bound entities
 
-### HttpServer and HttpsServer Options
+  * Includes `.add()`, `.remove()`, `.getById()`, `.broadcast()`
+  * Fully compatible with custom socket wrappers and `EventEmitter`
 
-- **port**: Port number (default: `80`).
-- **bind**: Bind address (default: `0.0.0.0`).
-- **publicPaths**: Array of paths to serve static files (default: `['./public']`).
-- **services**: Array of services with endpoints and handlers (default: `[]`).
-- **listenCallback**: Function to execute once the server starts listening.
-- **encoding**: Encoding type for request bodies (`'json'` or `'urlencoded'`).
-- **ssl**: SSL configuration for HTTPS server (`{ key: './path/to/key.pem', cert: './path/to/cert.pem' }`).
-- **enableHtmxRendering**: Enable dynamic rendering of `.htmx` files (default: `false`).
+## 0.7.0 Update Highlights
 
-### SocketServer Options
+* allowDuplicateConnections for multi-tab testing
+* Robust message validation
+* socket.broadcast() now excludes sender
+* Better error handling
 
-- **port**: Port number (default: `3000`).
-- **routes**: Array of `SocketRoute` classes to define WebSocket routes and handlers.
-- **ssl**: SSL configuration for SecureSocketServer (`{ key: './path/to/key.pem', cert: './path/to/cert.pem' }`).
+---
 
-## License
+## 🪪 License
 
-MIT License
+MIT

package/index.d.ts

@@ -1,177 +1,172 @@
 declare module 'redweb' {
-    import { Request, Response } from 'express';
-    import { Server as HTTPServer } from 'http';
-    import { Server as HTTPSServer } from 'https';
-    import WebSocket from 'ws';
-
-    /**
-     * RedWeb encoding types.
-     */
-    export type RedWebEncoding = 'json' | 'urlencoded';
+    import { Application } from 'express';
+    import { CorsOptions } from 'cors';
+    import { Server as HttpServer } from 'http';
+    import { WebSocket } from 'ws';
 
-    /**
-     * Service configuration for RedWeb.
-     */
-    export interface Service {
-        serviceName: string;
-        method: 'get' | 'post' | 'put' | 'delete' | 'patch' | 'options' | 'head';
-        function: (req: Request, res: Response) => void;
-    }
+    /** ─────────────────── HTTP / CORE ─────────────────── */
+
+    export type RedWebEncoding = 'json' | 'urlencoded';
 
-    /**
-     * Options for configuring a RedWeb server.
-     */
     export interface RedWebOptions {
         port?: number;
         bind?: string;
         publicPaths?: string[];
-        services?: Service[];
+        services?: Array<{ serviceName: string; method: string; function: Function }>;
         listenCallback?: () => void;
         encoding?: RedWebEncoding;
-        ssl?: {
-            key: string;
-            cert: string;
-        };
-        corsOptions?: import('cors').CorsOptions;
-        enableHtmxRendering?: boolean; // New flag to enable HTMX rendering
+        ssl?: { key: string; cert: string };
+        server?: Application;
+        corsOptions?: CorsOptions;
+        enableHtmxRendering?: boolean;
     }
 
-    /**
-     * Configuration for a WebSocket handler.
-     */
-    export interface HandlerConfig {
-        name: string;
-        handlers: {
-            [type: string]: (socket: WebSocket, data: any) => void;
-        };
-    }
+    /** ─────────────────── SOCKET SERVER ─────────────────── */
 
-    /**
-     * Options for configuring a WebSocket server.
-     */
     export interface SocketServerOptions {
+        server?: HttpServer;
         port?: number;
-        connectionOpenCallback?: (socket: WebSocket) => void;
-        connectionCloseCallback?: (socket: WebSocket) => void;
-        messageCallback?: (socket: WebSocket, message: string) => void;
-        messageHandlers?: {
-            [type: string]: (socket: WebSocket, data: any) => void;
-        };
-        ssl?: {
-            key: string;
-            cert: string;
-        };
         routes?: Array<new () => SocketRoute>;
+        ssl?: { key: string; cert: string };
     }
 
-    /**
-     * WebSocket route configuration.
-     */
+    /** ─────────────────── ROUTES & HANDLERS ─────────────────── */
+
     export interface SocketRouteConfig {
         path: string;
         handlers: Array<new () => BaseHandler>;
+        services?: Array<new () => SocketService>;
+        allowDuplicateConnections?: boolean;
     }
 
-    /**
-     * Represents a WebSocket route.
-     */
-    export class SocketRoute {
-        path: string;
-        handlers: BaseHandler[];
+    /** Socket‑side autonomous service (game loops, timers, etc.) */
+    export abstract class SocketService {
+        name: string;
+        tickRateMs?: number;
+        protected _tickHandle?: NodeJS.Timeout;
 
-        constructor(config: SocketRouteConfig);
+        constructor(name: string, tickRateMs?: number);
 
-        addHandler(HandlerClass: new () => BaseHandler): void;
-        handleConnection(socket: WebSocket, req: import('http').IncomingMessage): void;
-        handleMessage(socket: WebSocket, data: any): void;
-        handleClose(socket: WebSocket): void;
-        handleError(socket: WebSocket, error: Error): void;
+        /** Called once when the route is initialised */
+        onInit(route: SocketRoute): void;
+
+        /** Optional recurring tick (respecting tickRateMs) */
+        onTick?(): void;
+
+        /** Called on process shutdown / route removal */
+        onShutdown(): void;
     }
 
-    /**
-     * Base class for WebSocket handlers.
-     */
+    /** Message handler, triggered by client messages */
     export class BaseHandler {
         name: string;
-
         constructor(name: string);
-        onMessage(socket: WebSocket, message: Object): void;
+
+        handleMessage(
+            socket: WebSocket & {
+                sendJson: (message: object) => void;
+                broadcast: (message: object) => void;
+            },
+            message: any
+        ): void;
+
+        onMessage(socket: WebSocket, message: any): void;
         onInitialContact(socket: WebSocket): void;
-        onClose(socket: WebSocket): void;
     }
 
-    /**
-     * Base WebSocket server class.
-     */
+    export class SocketRoute {
+        path: string;
+        handlers: BaseHandler[];
+        clients: Map<string, WebSocket>;
+        allowDuplicateConnections?: boolean;
+
+        constructor(config: SocketRouteConfig);
+
+        addHandler(handler: new () => BaseHandler): void;
+        handleMessage(sock: WebSocket, data: any): void;
+    }
+
+    /** ─────────────────── SERVER BASE ─────────────────── */
+
     export class BaseSocketServer {
+        clients: Map<string, WebSocket>;
+        server: HttpServer;
         routes: SocketRoute[];
 
-        constructor(server: HTTPServer | HTTPSServer, options?: SocketServerOptions);
-        handleUpgrade(req: import('http').IncomingMessage, socket: import('net').Socket, head: Buffer): void;
+        constructor(server: HttpServer, options?: SocketServerOptions);
+
         addRoute(route: new () => SocketRoute): void;
     }
 
-    /**
-     * HTTP server class.
-     */
-    export class HttpServer {
-        constructor(options?: RedWebOptions);
+    /** ─────────────────── REGISTRY & UTIL TYPES ─────────────────── */
+
+    export interface SocketWrapper {
+        socket: WebSocket;
+        id: string;
+        send: (type: string, payload: Record<string, any>) => void;
+        getSanitized?(): Record<string, any>;
     }
 
-    /**
-     * HTTPS server class.
-     */
-    export class HttpsServer {
-        constructor(options?: RedWebOptions);
+    export type SocketMessage = {
+        type: string;
+        [key: string]: any;
+    };
+
+    /** Generic event‑driven registry for socket objects */
+    export class SocketRegistry<T extends SocketWrapper = SocketWrapper> {
+        protected clients: T[];
+
+        onCreate?: (client: T) => boolean | void;
+        onRemove?: (client: T) => boolean | void;
+
+        constructor();
+
+        setCreateValidator(fn: (client: T) => boolean | void): void;
+        setRemoveValidator(fn: (client: T) => boolean | void): void;
+
+        add(client: T): boolean;
+        removeById(id: string): boolean;
+
+        getById(id: string): T | undefined;
+        getBySocket(socket: WebSocket): T | undefined;
+        allWithout(socket: WebSocket): T[];
+
+        broadcast(message: SocketMessage, excludeSocket?: WebSocket | null): void;
+        getSanitizedList(): Record<string, any>[];
     }
 
-    /**
-     * WebSocket server class.
-     */
+    /** ─────────────────── CONCRETE SERVERS ─────────────────── */
+
     export class SocketServer extends BaseSocketServer {
         constructor(options?: SocketServerOptions);
     }
 
-    /**
-     * Secure WebSocket server class.
-     */
     export class SecureSocketServer extends BaseSocketServer {
         constructor(options?: SocketServerOptions);
     }
 
-    /**
-     * SSL configuration loader.
-     */
-    export function loadSslConfig(sslOptions: { key: string; cert: string }): { key: string; cert: string };
+    export class HttpServer {
+        constructor(options?: RedWebOptions);
+    }
 
-    /**
-     * Constants for encoding types.
-     */
-    export const ENCODINGS: {
-        json: 'json';
-        urlencoded: 'urlencoded';
-    };
+    export class HttpsServer {
+        constructor(options?: RedWebOptions);
+    }
+
+    /** ─────────────────── CONSTANTS ─────────────────── */
 
-    /**
-     * Constants for HTTP methods.
-     */
     export const METHODS: {
-        POST: 'post';
         GET: 'get';
+        POST: 'post';
         PUT: 'put';
         DELETE: 'delete';
-        PATCH: 'patch';
-        OPTIONS: 'options';
-        HEAD: 'head';
     };
 
-    /**
-     * Default HTTP options.
-     */
-    export const HTTP_OPTIONS: RedWebOptions;
+    export const ENCODINGS: {
+        json: 'json';
+        urlencoded: 'urlencoded';
+    };
 
-    /**
-     * Default socket options.
-     */
+    export const HTTP_OPTIONS: RedWebOptions;
     export const SOCKET_OPTIONS: SocketServerOptions;
 }

package/index.js

@@ -1,6 +1,6 @@
 const { METHODS } = require('./src/http');
 const { sendJson } = require('./src/ws/util');
-const { SocketServer, SecureSocketServer, SOCKET_OPTIONS, SocketRoute } = require('./src/ws');
+const { SocketServer, SecureSocketServer, SOCKET_OPTIONS, SocketRoute, SocketService, SocketRegistry } = require('./src/ws');
 const { BaseHandler } = require('./src/ws/BaseHandler');
 const HttpServer = require('./src/http/HttpServer');
 const HttpsServer = require('./src/http/HttpsServer');
@@ -11,6 +11,8 @@ module.exports = {
     SecureSocketServer,
     BaseHandler,
     SocketRoute,
+    SocketService,
+    SocketRegistry,
     sendJson,
     SOCKET_OPTIONS,
     METHODS

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "redweb",
-  "version": "0.6.9",
+  "version": "0.7.1",
   "description": "A way to quickly set up an express server",
   "main": "index.js",
   "scripts": {

package/src/ws/BaseHandler.js

@@ -16,7 +16,7 @@ class BaseHandler {
     /**
      * Handles an incoming message and routes it to the appropriate handler function.
      * @param {WebSocket & {sendJson: (message: Object) => void, broadcast: (message: Object) => void}} socket - The WebSocket connection that sent the message.
-     * @param {string} message - The incoming message in JSON string format.
+     * @param {any} message - The incoming message in parsed JSON.
      */
     handleMessage(socket, message) {
         this.onMessage(socket, message);
@@ -25,7 +25,7 @@ class BaseHandler {
     /**
      * Method to be overriden to process messages.
      * @param {WebSocket} socket - The WebSocket connection that sent the message.
-     * @param {string} message - The incoming message in JSON string format.
+     * @param {any} message - The incoming message in parsed JSON.
      */
     onMessage(socket, message) {
         throw "Not yet implemented!";

package/src/ws/BaseSocketServer.js

@@ -1,57 +1,62 @@
 /**
  * @typedef {Object} SocketServerOptions
- * @property {import('http').Server} [server] - The HTTP server instance to bind the WebSocket server to.
- * @property {number} [port=3000] - The port number for the WebSocket server.
- * @property {Array<new () => import('./SocketRoute').SocketRoute>} [routes] - An array of handler classes to use for routing.
+ * @property {import('http').Server} [server]                    HTTP server to bind to
+ * @property {number}              [port=3000]                  Port to listen on
+ * @property {Array<new () => import('./SocketRoute').SocketRoute>} [routes]
  */
 
 const DefaultRoute = require('./DefaultRoute');
 
 const SOCKET_OPTIONS = {
-    port: 3000,
-    ssl: null,
-    routes: []
+  port: 3000,
+  ssl:  null,
+  routes: []
 };
 
 /**
- * Broadcasts a message to all connected clients.
- * @param {BaseSocketServer} socketServer - The WebSocket server instance.
- * @param {object} message - The message to broadcast.
- */
-function broadcast(socketServer, message) {
-    socketServer.clients.forEach(client => client.send(JSON.stringify(message)));
-}
-
-/**
- * Represents the base WebSocket server.
+ * Base WebSocket server
  */
 class BaseSocketServer {
-    /**
-     * @param {import('http').Server} server - The HTTP server instance to bind the WebSocket server to.
-     * @param {SocketServerOptions} options - The configuration options for the WebSocket server.
-     */
-    constructor(server, options = {}) {
-        this.clients = new Map(); // Map of clients by their IP addresses.
-        Object.assign(this, { ...SOCKET_OPTIONS, ...options });
-        this.server = server;
-        if (!options.routes?.length) options.routes = [ DefaultRoute ];
-        this.routes = options.routes.map((route) => new route(server));
-        this.server.on('upgrade', this.handleUpgrade.bind(this));
-    }
-
-    handleUpgrade(req, sock, head) {
-        const route = this.routes.find(route => route.path == req.url);
-        if (!route) sock.destroy();
-        else route.server.handleUpgrade(req, sock, head, (s, r) => route.server.emit('connection', s, r));
-    }
-
-    /**
-     * 
-     * @param {new () => import('./SocketRoute')} route 
-     */
-    addRoute(route) {
-        this.routes.push(new route(this.server));
-    }
+  /**
+   * @param {import('http').Server} server
+   * @param {SocketServerOptions}  [options]
+   */
+  constructor(server, options = {}) {
+    this.clients = new Map();
+    Object.assign(this, { ...SOCKET_OPTIONS, ...options });
+    this.server = server;
+
+    /* ─── ROUTE INITIALISATION ─────────────────────────── */
+    if (!options.routes?.length) options.routes = [DefaultRoute];
+    this.routes = options.routes.map(RouteClass => new RouteClass(server));
+
+    this.server.on('upgrade', this.handleUpgrade.bind(this));
+  }
+
+  handleUpgrade(req, sock, head) {
+    const route = this.routes.find(r => r.path === req.url);
+    if (!route) return sock.destroy();
+
+    route.server.handleUpgrade(req, sock, head, (s, r) =>
+      route.server.emit('connection', s, r)
+    );
+  }
+
+  /**
+   * Dynamically attach a new route at runtime
+   * @param {new () => import('./SocketRoute').SocketRoute} RouteClass
+   */
+  addRoute(RouteClass) {
+    this.routes.push(new RouteClass(this.server));
+  }
+
+  /**
+   * Gracefully tear down all routes (and their services)
+   */
+  shutdown() {
+    this.routes.forEach(route => route.shutdown?.());
+    this.server.close();
+  }
 }
 
 module.exports = { BaseSocketServer, SOCKET_OPTIONS };

package/src/ws/SocketRegistry.js

@@ -0,0 +1,37 @@
+// handlers/SocketRegistry.js
+const { EventEmitter } = require("events");
+
+class SocketRegistry extends EventEmitter {
+    constructor() {
+        super();
+        this.items = [];
+    }
+
+    add(item) {
+        this.items.push(item);
+        this.emit("added", item);
+    }
+
+    remove(itemOrId, by = "id") {
+        const idx = typeof itemOrId === "object"
+            ? this.items.findIndex(i => i === itemOrId)
+            : this.items.findIndex(i => i[by] === itemOrId);
+
+        if (idx !== -1) {
+            const [removed] = this.items.splice(idx, 1);
+            this.emit("removed", removed);
+            return true;
+        }
+        return false;
+    }
+
+    all() {
+        return [...this.items];
+    }
+
+    count() {
+        return this.all().length;
+    }
+}
+
+module.exports = SocketRegistry;

package/src/ws/SocketRoute.js

@@ -1,5 +1,6 @@
 const { WebSocketServer } = require("ws");
 const { sendJson, broadcast } = require("./util");
+const { randomUUID } = require("crypto");
 
 /**
  * Represents a WebSocket route configuration.
@@ -10,9 +11,11 @@ class SocketRoute {
      * Creates a new instance of `SocketRoute`.
      * @param {Object} options - Configuration options for the WebSocket route.
      * @param {string} options.path - The path of the WebSocket route (e.g., `/chat`, `/lobby`).
+     * @param {boolean} options.allowDuplicateConnections - Whether to allow multiple connections from the same client IP address.
      * @param {import('./BaseHandler').BaseHandler[]} options.handlers - An array of handler instances that manage connections and messages for this route.
-     */
-    constructor({path, handlers } = {}) {
+     * @param {Array<new () => SocketService>} [options.services] 
+    */
+    constructor({ path, handlers, services = [], allowDuplicateConnections } = {}) {
         if (!path) {
             throw new Error('A `path` must be specified for the SocketRoute.');
         }
@@ -34,6 +37,14 @@ class SocketRoute {
         this.clients = new Map();
         this.server = new WebSocketServer({ noServer: true, path });
         this.server.on('connection', this.handleConnection.bind(this));
+        this.allowDuplicateConnections = allowDuplicateConnections;
+
+        /* ─── ROUTE‑SCOPED SERVICES ─────────────────────────── */
+        this.services = services.map(SvcClass => {
+            const svc = new SvcClass();
+            if (typeof svc.onInit === 'function') svc.onInit(this);
+            return svc;
+        });
     }
     /**
      * Adds a new handler to the WebSocket server.
@@ -56,23 +67,37 @@ class SocketRoute {
     handleConnection(socket, req) {
         const ip = req.socket.remoteAddress;
         console.log(`New client connected: ${ip}`);
-        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();
+        if (this.allowDuplicateConnections) {
+            this.clients.set(randomUUID(), socket);
+        } else {
+            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);
         }
-        this.clients.set(ip, socket);
         socket.isAssigned = false; // Tracks whether the socket has been assigned a handler.
         socket.sendJson = (data) => sendJson(socket, data);
-        socket.broadcast = (data) => broadcast([...this.clients.values()], data);
+        socket.broadcast = (data) => broadcast([...this.clients.values()].filter(sock => sock !== socket), data);
 
         this.connectionOpenCallback(socket);
-        socket.on('message', (message) => this.handleMessage(socket, JSON.parse(message)));
         socket.on('close', this.handleClose.bind(this));
         socket.on('error', this.handleError.bind(this));
+        socket.on('message', (message) => {
+            try {
+                const parsed = JSON.parse(message);
+                this.handleMessage(socket, parsed);
+            } catch (error) {
+                console.error(`Error parsing message from ${ip}:`, error);
+                socket.sendJson({ error: 'Invalid JSON format' });
+                socket.close();
+                return;
+            }
+        });
     }
 
     connectionOpenCallback(socket) {
@@ -82,10 +107,16 @@ class SocketRoute {
     handleMessage(sock, data) {
         const handler = this.handlers.find((handler) => handler.name == data.type);
         if (!handler) {
-            sendJson(sock, {error: `No such handler ${data.type}`});
+            sendJson(sock, { error: `No such handler ${data.type}` });
             sock.close();
         } else {
-            handler.handleMessage(sock, data);
+            try {
+                handler.handleMessage(sock, data);
+            } catch (error) {
+                console.error(`Error handling message in handler ${handler.name}:`, error);
+                sendJson(sock, { error: `${error.message}` });
+                sock.close();
+            }
         }
     }
 
@@ -100,6 +131,11 @@ class SocketRoute {
         if (this.connectionCloseCallback) this.connectionCloseCallback(socket);
     }
 
+    shutdown() {
+        this.services.forEach(svc => svc.onShutdown && svc.onShutdown());
+        this.server.close();
+    }
+
     /**
      * Handles socket errors.
      * @param {WebSocket} socket - The WebSocket connection instance.

package/src/ws/SocketService.js

@@ -0,0 +1,33 @@
+// handlers/SocketService.js
+class SocketService {
+    /**
+     * @param {string} name            – service identifier
+     * @param {?number} tickRateMs     – optional tick interval (ms)
+     */
+    constructor(name, tickRateMs = null) {
+      this.name        = name;
+      this.tickRateMs  = tickRateMs;
+      this._tickHandle = null;
+    }
+  
+    /**
+     * Called once by the owning SocketRoute.
+     * @param {import('../SocketRoute')} route – the route this service belongs to
+     */
+    onInit(route) {
+      this.route = route;                        // full access to route, clients, broadcast…
+      if (this.tickRateMs && this.onTick) {
+        this._tickHandle = setInterval(() => this.onTick(), this.tickRateMs);
+      }
+    }
+  
+    /* Optional */
+    // onTick() {}
+  
+    onShutdown() {
+      if (this._tickHandle) clearInterval(this._tickHandle);
+    }
+  }
+  
+  module.exports = SocketService;
+  

package/src/ws/index.js

@@ -3,5 +3,7 @@ module.exports = {
     SecureSocketServer: require('./SecureSocketServer'),
     SocketServer: require('./SocketServer'),
     SocketRoute: require('./SocketRoute'),
+    SocketService: require('./SocketService'),
+    SocketRegistry: require('./SocketRegistry'),
     SOCKET_OPTIONS
 }