@scpxl/nodejs-framework 1.0.22 → 1.0.25

package/dist/websocket/websocket-client.js

@@ -4,6 +4,7 @@ import WebSocket from "ws";
 import { generateClientId, log, parseServerMessage } from "./utils.js";
 import WebSocketBase from "./websocket-base.js";
 import path from "path";
+import { safeSerializeError } from "../error/error-reporter.js";
 import { baseDir } from "../index.js";
 class WebSocketClient extends WebSocketBase {
   static {
@@ -24,6 +25,12 @@ class WebSocketClient extends WebSocketBase {
   ws;
   clientId;
   isConnected = false;
+  reconnectAttempts = 0;
+  maxReconnectAttempts = 10;
+  reconnectDelay = 1e3;
+  // Start with 1 second
+  reconnectTimer;
+  shouldReconnect = true;
   constructor(props) {
     super();
     this.applicationConfig = props.applicationConfig;
@@ -75,15 +82,18 @@ class WebSocketClient extends WebSocketBase {
         resolve();
       });
       ws.on("message", this.handleIncomingMessage);
-      ws.on("close", () => {
+      ws.on("close", (code) => {
         this.isConnected = false;
-        log("Connection to server closed");
+        log("Connection to server closed", { Code: code });
         if (this.options.events?.onDisconnected) {
           this.options.events.onDisconnected({ clientId: this.clientId });
         }
         ws.removeAllListeners();
         this.ws = void 0;
         this.clientId = void 0;
+        if (this.shouldReconnect) {
+          this.scheduleReconnect();
+        }
       });
       ws.on("error", (error) => {
         log("WebSocket error", { error: error.message });
@@ -132,13 +142,17 @@ class WebSocketClient extends WebSocketBase {
       return;
     }
     const webSocketMessage = JSON.stringify(data);
-    console.log("SENDING LCIENT MESSAGE: ", webSocketMessage);
     this.ws.send(webSocketMessage, { binary });
   }, "sendClientMessage");
   sendMessage = /* @__PURE__ */ __name((data) => {
     this.sendClientMessage(data);
   }, "sendMessage");
   disconnect() {
+    this.shouldReconnect = false;
+    if (this.reconnectTimer) {
+      clearTimeout(this.reconnectTimer);
+      this.reconnectTimer = void 0;
+    }
     if (this.ws && this.isConnected) {
       this.ws.removeAllListeners();
       this.ws.close();
@@ -151,6 +165,86 @@ class WebSocketClient extends WebSocketBase {
   isClientConnected() {
     return this.isConnected && this.ws?.readyState === WebSocket.OPEN;
   }
+  /**
+   * Schedule a reconnection attempt with exponential backoff
+   */
+  scheduleReconnect() {
+    if (this.reconnectAttempts >= this.maxReconnectAttempts) {
+      log("Max reconnection attempts reached", {
+        Attempts: this.reconnectAttempts
+      });
+      if (this.options.events?.onReconnectFailed) {
+        this.options.events.onReconnectFailed({
+          attempts: this.reconnectAttempts
+        });
+      }
+      return;
+    }
+    const delay = Math.min(this.reconnectDelay * Math.pow(2, this.reconnectAttempts), 3e4);
+    this.reconnectAttempts++;
+    log("Scheduling reconnection", {
+      Attempt: this.reconnectAttempts,
+      Delay: `${delay}ms`
+    });
+    if (this.options.events?.onReconnecting) {
+      this.options.events.onReconnecting({
+        attempt: this.reconnectAttempts,
+        delay
+      });
+    }
+    this.reconnectTimer = setTimeout(() => {
+      this.attemptReconnect();
+    }, delay);
+  }
+  /**
+   * Attempt to reconnect to the server
+   */
+  async attemptReconnect() {
+    try {
+      log("Attempting to reconnect...", {
+        Attempt: this.reconnectAttempts
+      });
+      await this.connectToServer();
+      this.reconnectAttempts = 0;
+      log("Reconnection successful");
+      if (this.options.events?.onReconnected) {
+        this.options.events.onReconnected({
+          clientId: this.clientId
+        });
+      }
+    } catch (error) {
+      log("Reconnection failed", {
+        Error: error instanceof Error ? error.message : safeSerializeError(error)
+      });
+      this.scheduleReconnect();
+    }
+  }
+  /**
+   * Enable auto-reconnection
+   */
+  enableAutoReconnect() {
+    this.shouldReconnect = true;
+  }
+  /**
+   * Disable auto-reconnection
+   */
+  disableAutoReconnect() {
+    this.shouldReconnect = false;
+    if (this.reconnectTimer) {
+      clearTimeout(this.reconnectTimer);
+      this.reconnectTimer = void 0;
+    }
+  }
+  /**
+   * Get connection status
+   */
+  getConnectionStatus() {
+    return {
+      isConnected: this.isConnected,
+      reconnectAttempts: this.reconnectAttempts,
+      autoReconnectEnabled: this.shouldReconnect
+    };
+  }
 }
 export {
   WebSocketClient as default

package/dist/websocket/websocket-client.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/websocket/websocket-client.ts"],
-  "sourcesContent": ["import WebSocket, { type RawData } from 'ws';\nimport type { WebSocketOptions, WebSocketRoute, WebSocketType } from './websocket.interface.js';\nimport type RedisInstance from '../redis/instance.js';\nimport type QueueManager from '../queue/manager.js';\nimport type DatabaseInstance from '../database/instance.js';\nimport type { WebSocketClientProps } from './websocket-client.interface.js';\nimport { generateClientId, log, parseServerMessage } from './utils.js';\nimport WebSocketBase from './websocket-base.js';\nimport type { ApplicationConfig } from '../application/base-application.interface.js';\nimport path from 'path';\nimport { baseDir } from '../index.js';\n\nexport default class WebSocketClient extends WebSocketBase {\n  protected defaultRoutes: WebSocketRoute[] = [\n    {\n      type: 'system',\n      action: 'clientList',\n      controllerName: 'system',\n    },\n  ];\n\n  private applicationConfig: ApplicationConfig;\n  private options: WebSocketOptions;\n  private redisInstance: RedisInstance;\n  private queueManager: QueueManager;\n  private databaseInstance: DatabaseInstance;\n  private ws?: WebSocket;\n  private clientId?: string;\n  private isConnected: boolean = false;\n\n  constructor(props: WebSocketClientProps) {\n    super();\n\n    this.applicationConfig = props.applicationConfig;\n    this.options = props.options;\n    this.redisInstance = props.redisInstance;\n    this.queueManager = props.queueManager;\n    this.databaseInstance = props.databaseInstance;\n    this.routes = props.routes;\n  }\n\n  public get type(): WebSocketType {\n    return 'client';\n  }\n\n  public async load(): Promise<void> {\n    const libraryControllersDirectory = path.join(baseDir, 'websocket', 'controllers', 'client');\n\n    await this.configureRoutes(this.defaultRoutes, libraryControllersDirectory);\n\n    await this.configureRoutes(this.routes, this.options.controllersDirectory);\n  }\n\n  public async connectToServer(): Promise<void> {\n    const url = this.options.url;\n    // const host = this.options.host;\n    // const port = this.options.port;\n\n    return new Promise(resolve => {\n      const ws = new WebSocket(url);\n\n      ws.on('open', () => {\n        this.clientId = generateClientId();\n        this.isConnected = true;\n\n        log('Connected to server', { ID: this.clientId });\n\n        if (this.options.events?.onConnected) {\n          this.options.events.onConnected({\n            ws,\n            clientId: this.clientId,\n            joinRoom: ({\n              userId,\n              userType,\n              username,\n              roomName,\n            }: {\n              userId?: string;\n              userType?: string;\n              username: string;\n              roomName: string;\n            }) => {\n              this.sendClientMessage({\n                type: 'system',\n                action: 'joinRoom',\n                data: {\n                  userId,\n                  userType,\n                  username,\n                  roomName,\n                },\n              });\n            },\n          });\n        }\n\n        resolve();\n      });\n\n      ws.on('message', this.handleIncomingMessage);\n\n      ws.on('close', () => {\n        this.isConnected = false;\n        log('Connection to server closed');\n\n        if (this.options.events?.onDisconnected) {\n          this.options.events.onDisconnected({ clientId: this.clientId });\n        }\n\n        // Clean up event listeners to prevent memory leaks\n        ws.removeAllListeners();\n        this.ws = undefined;\n        this.clientId = undefined;\n      });\n\n      ws.on('error', error => {\n        log('WebSocket error', { error: error.message });\n\n        if (this.options.events?.onError) {\n          this.options.events.onError({ error });\n        }\n      });\n\n      this.ws = ws;\n    });\n  }\n\n  protected getControllerDependencies(): {\n    sendMessage: (data: unknown) => void;\n    redisInstance: RedisInstance;\n    queueManager: QueueManager;\n    databaseInstance: DatabaseInstance;\n  } {\n    return {\n      sendMessage: this.sendMessage,\n      redisInstance: this.redisInstance,\n      queueManager: this.queueManager,\n      databaseInstance: this.databaseInstance,\n    };\n  }\n  protected shouldPrintRoutes(): boolean {\n    return this.options.debug?.printRoutes ?? false;\n  }\n\n  private handleIncomingMessage = async (message: RawData): Promise<void> => {\n    if (!this.ws || !this.clientId) {\n      log('WebSocket not initialized or client ID not set');\n\n      return;\n    }\n\n    if (this.options.events?.onMessage) {\n      const parsedMessage = parseServerMessage(message);\n\n      this.options.events.onMessage({\n        ws: this.ws,\n        clientId: this.clientId,\n        data: parsedMessage as { type: string; action: string; data: unknown },\n        redisInstance: this.redisInstance,\n        queueManager: this.queueManager,\n        databaseInstance: this.databaseInstance,\n      });\n    }\n\n    await this.handleServerMessage(this.ws, message, this.clientId);\n  };\n\n  protected handleMessageError(clientId: string, error: string): void {\n    log(error);\n  }\n\n  public sendClientMessage = (data: unknown, binary: boolean = false): void => {\n    if (!this.ws) {\n      log('WebSocket not initialized');\n\n      return;\n    }\n\n    const webSocketMessage = JSON.stringify(data);\n\n    console.log('SENDING LCIENT MESSAGE: ', webSocketMessage);\n\n    this.ws.send(webSocketMessage, { binary });\n  };\n\n  public sendMessage = (data: unknown): void => {\n    this.sendClientMessage(data);\n  };\n\n  public disconnect(): void {\n    if (this.ws && this.isConnected) {\n      this.ws.removeAllListeners();\n      this.ws.close();\n      this.ws = undefined;\n      this.clientId = undefined;\n      this.isConnected = false;\n      log('WebSocket client disconnected');\n    }\n  }\n\n  public isClientConnected(): boolean {\n    return this.isConnected && this.ws?.readyState === WebSocket.OPEN;\n  }\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import WebSocket, { type RawData } from 'ws';\nimport type { WebSocketOptions, WebSocketRoute, WebSocketType } from './websocket.interface.js';\nimport type RedisInstance from '../redis/instance.js';\nimport type QueueManager from '../queue/manager.js';\nimport type DatabaseInstance from '../database/instance.js';\nimport type { WebSocketClientProps } from './websocket-client.interface.js';\nimport { generateClientId, log, parseServerMessage } from './utils.js';\nimport WebSocketBase from './websocket-base.js';\nimport type { ApplicationConfig } from '../application/base-application.interface.js';\nimport path from 'path';\nimport { safeSerializeError } from '../error/error-reporter.js';\nimport { baseDir } from '../index.js';\n\nexport default class WebSocketClient extends WebSocketBase {\n  protected defaultRoutes: WebSocketRoute[] = [\n    {\n      type: 'system',\n      action: 'clientList',\n      controllerName: 'system',\n    },\n  ];\n\n  private applicationConfig: ApplicationConfig;\n  private options: WebSocketOptions;\n  private redisInstance: RedisInstance;\n  private queueManager: QueueManager;\n  private databaseInstance: DatabaseInstance;\n  private ws?: WebSocket;\n  private clientId?: string;\n  private isConnected: boolean = false;\n  private reconnectAttempts: number = 0;\n  private maxReconnectAttempts: number = 10;\n  private reconnectDelay: number = 1000; // Start with 1 second\n  private reconnectTimer?: NodeJS.Timeout;\n  private shouldReconnect: boolean = true;\n\n  constructor(props: WebSocketClientProps) {\n    super();\n\n    this.applicationConfig = props.applicationConfig;\n    this.options = props.options;\n    this.redisInstance = props.redisInstance;\n    this.queueManager = props.queueManager;\n    this.databaseInstance = props.databaseInstance;\n    this.routes = props.routes;\n  }\n\n  public get type(): WebSocketType {\n    return 'client';\n  }\n\n  public async load(): Promise<void> {\n    const libraryControllersDirectory = path.join(baseDir, 'websocket', 'controllers', 'client');\n\n    await this.configureRoutes(this.defaultRoutes, libraryControllersDirectory);\n\n    await this.configureRoutes(this.routes, this.options.controllersDirectory);\n  }\n\n  public async connectToServer(): Promise<void> {\n    const url = this.options.url;\n    // const host = this.options.host;\n    // const port = this.options.port;\n\n    return new Promise(resolve => {\n      const ws = new WebSocket(url);\n\n      ws.on('open', () => {\n        this.clientId = generateClientId();\n        this.isConnected = true;\n\n        log('Connected to server', { ID: this.clientId });\n\n        if (this.options.events?.onConnected) {\n          this.options.events.onConnected({\n            ws,\n            clientId: this.clientId,\n            joinRoom: ({\n              userId,\n              userType,\n              username,\n              roomName,\n            }: {\n              userId?: string;\n              userType?: string;\n              username: string;\n              roomName: string;\n            }) => {\n              this.sendClientMessage({\n                type: 'system',\n                action: 'joinRoom',\n                data: {\n                  userId,\n                  userType,\n                  username,\n                  roomName,\n                },\n              });\n            },\n          });\n        }\n\n        resolve();\n      });\n\n      ws.on('message', this.handleIncomingMessage);\n\n      ws.on('close', code => {\n        this.isConnected = false;\n        log('Connection to server closed', { Code: code });\n\n        if (this.options.events?.onDisconnected) {\n          this.options.events.onDisconnected({ clientId: this.clientId });\n        }\n\n        // Clean up event listeners to prevent memory leaks\n        ws.removeAllListeners();\n        this.ws = undefined;\n        this.clientId = undefined;\n\n        // Attempt to reconnect if not manually disconnected\n        if (this.shouldReconnect) {\n          this.scheduleReconnect();\n        }\n      });\n\n      ws.on('error', error => {\n        log('WebSocket error', { error: error.message });\n\n        if (this.options.events?.onError) {\n          this.options.events.onError({ error });\n        }\n      });\n\n      this.ws = ws;\n    });\n  }\n\n  protected getControllerDependencies(): {\n    sendMessage: (data: unknown) => void;\n    redisInstance: RedisInstance;\n    queueManager: QueueManager;\n    databaseInstance: DatabaseInstance;\n  } {\n    return {\n      sendMessage: this.sendMessage,\n      redisInstance: this.redisInstance,\n      queueManager: this.queueManager,\n      databaseInstance: this.databaseInstance,\n    };\n  }\n  protected shouldPrintRoutes(): boolean {\n    return this.options.debug?.printRoutes ?? false;\n  }\n\n  private handleIncomingMessage = async (message: RawData): Promise<void> => {\n    if (!this.ws || !this.clientId) {\n      log('WebSocket not initialized or client ID not set');\n\n      return;\n    }\n\n    if (this.options.events?.onMessage) {\n      const parsedMessage = parseServerMessage(message);\n\n      this.options.events.onMessage({\n        ws: this.ws,\n        clientId: this.clientId,\n        data: parsedMessage as { type: string; action: string; data: unknown },\n        redisInstance: this.redisInstance,\n        queueManager: this.queueManager,\n        databaseInstance: this.databaseInstance,\n      });\n    }\n\n    await this.handleServerMessage(this.ws, message, this.clientId);\n  };\n\n  protected handleMessageError(clientId: string, error: string): void {\n    log(error);\n  }\n\n  public sendClientMessage = (data: unknown, binary: boolean = false): void => {\n    if (!this.ws) {\n      log('WebSocket not initialized');\n\n      return;\n    }\n\n    const webSocketMessage = JSON.stringify(data);\n\n    this.ws.send(webSocketMessage, { binary });\n  };\n\n  public sendMessage = (data: unknown): void => {\n    this.sendClientMessage(data);\n  };\n\n  public disconnect(): void {\n    // Disable auto-reconnect on manual disconnect\n    this.shouldReconnect = false;\n\n    // Clear any pending reconnect timer\n    if (this.reconnectTimer) {\n      clearTimeout(this.reconnectTimer);\n      this.reconnectTimer = undefined;\n    }\n\n    if (this.ws && this.isConnected) {\n      this.ws.removeAllListeners();\n      this.ws.close();\n      this.ws = undefined;\n      this.clientId = undefined;\n      this.isConnected = false;\n      log('WebSocket client disconnected');\n    }\n  }\n\n  public isClientConnected(): boolean {\n    return this.isConnected && this.ws?.readyState === WebSocket.OPEN;\n  }\n\n  /**\n   * Schedule a reconnection attempt with exponential backoff\n   */\n  private scheduleReconnect(): void {\n    // Don't reconnect if we've exceeded max attempts\n    if (this.reconnectAttempts >= this.maxReconnectAttempts) {\n      log('Max reconnection attempts reached', {\n        Attempts: this.reconnectAttempts,\n      });\n\n      if (this.options.events?.onReconnectFailed) {\n        this.options.events.onReconnectFailed({\n          attempts: this.reconnectAttempts,\n        });\n      }\n\n      return;\n    }\n\n    // Calculate delay with exponential backoff (max 30 seconds)\n    const delay = Math.min(this.reconnectDelay * Math.pow(2, this.reconnectAttempts), 30000);\n    this.reconnectAttempts++;\n\n    log('Scheduling reconnection', {\n      Attempt: this.reconnectAttempts,\n      Delay: `${delay}ms`,\n    });\n\n    if (this.options.events?.onReconnecting) {\n      this.options.events.onReconnecting({\n        attempt: this.reconnectAttempts,\n        delay,\n      });\n    }\n\n    this.reconnectTimer = setTimeout(() => {\n      this.attemptReconnect();\n    }, delay);\n  }\n\n  /**\n   * Attempt to reconnect to the server\n   */\n  private async attemptReconnect(): Promise<void> {\n    try {\n      log('Attempting to reconnect...', {\n        Attempt: this.reconnectAttempts,\n      });\n\n      await this.connectToServer();\n\n      // Reset reconnect attempts on successful connection\n      this.reconnectAttempts = 0;\n\n      log('Reconnection successful');\n\n      if (this.options.events?.onReconnected) {\n        this.options.events.onReconnected({\n          clientId: this.clientId,\n        });\n      }\n    } catch (error) {\n      log('Reconnection failed', {\n        Error: error instanceof Error ? error.message : safeSerializeError(error),\n      });\n\n      // Schedule next attempt\n      this.scheduleReconnect();\n    }\n  }\n\n  /**\n   * Enable auto-reconnection\n   */\n  public enableAutoReconnect(): void {\n    this.shouldReconnect = true;\n  }\n\n  /**\n   * Disable auto-reconnection\n   */\n  public disableAutoReconnect(): void {\n    this.shouldReconnect = false;\n\n    if (this.reconnectTimer) {\n      clearTimeout(this.reconnectTimer);\n      this.reconnectTimer = undefined;\n    }\n  }\n\n  /**\n   * Get connection status\n   */\n  public getConnectionStatus(): {\n    isConnected: boolean;\n    reconnectAttempts: number;\n    autoReconnectEnabled: boolean;\n  } {\n    return {\n      isConnected: this.isConnected,\n      reconnectAttempts: this.reconnectAttempts,\n      autoReconnectEnabled: this.shouldReconnect,\n    };\n  }\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/websocket/websocket-room-manager.d.ts

@@ -0,0 +1,32 @@
+import type WebSocketClientManager from './websocket-client-manager.js';
+export default class WebSocketRoomManager {
+    private clientManager;
+    rooms: Map<string, Set<string>>;
+    constructor({ clientManager }: {
+        clientManager: WebSocketClientManager;
+    });
+    addClientToRoom({ clientId, user, roomName, broadcast, }: {
+        clientId: string;
+        user: any;
+        roomName: string;
+        broadcast?: boolean;
+    }): void;
+    removeClientFromRoom({ roomName, clientId, broadcast, }: {
+        roomName: string;
+        clientId: string;
+        broadcast?: boolean;
+    }): void;
+    removeClientFromAllRooms({ clientId }: {
+        clientId: string;
+    }): void;
+    isClientInRoom({ clientId, roomName }: {
+        clientId: string;
+        roomName: string;
+    }): boolean;
+    printRooms(): void;
+    getRoomClients({ roomName }: {
+        roomName: string;
+    }): string[];
+    cleanup(): void;
+}
+//# sourceMappingURL=websocket-room-manager.d.ts.map

package/dist/websocket/websocket-room-manager.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"websocket-room-manager.d.ts","sourceRoot":"","sources":["../../src/websocket/websocket-room-manager.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,sBAAsB,MAAM,+BAA+B,CAAC;AAExE,MAAM,CAAC,OAAO,OAAO,oBAAoB;IACvC,OAAO,CAAC,aAAa,CAAyB;IAEvC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAa;gBAEvC,EAAE,aAAa,EAAE,EAAE;QAAE,aAAa,EAAE,sBAAsB,CAAA;KAAE;IAIjE,eAAe,CAAC,EACrB,QAAQ,EACR,IAAI,EACJ,QAAQ,EACR,SAAS,GACV,EAAE;QACD,QAAQ,EAAE,MAAM,CAAC;QACjB,IAAI,EAAE,GAAG,CAAC;QACV,QAAQ,EAAE,MAAM,CAAC;QACjB,SAAS,CAAC,EAAE,OAAO,CAAC;KACrB;IAwCM,oBAAoB,CAAC,EAC1B,QAAQ,EACR,QAAQ,EACR,SAAS,GACV,EAAE;QACD,QAAQ,EAAE,MAAM,CAAC;QACjB,QAAQ,EAAE,MAAM,CAAC;QACjB,SAAS,CAAC,EAAE,OAAO,CAAC;KACrB;IA0CM,wBAAwB,CAAC,EAAE,QAAQ,EAAE,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE;IAc3D,cAAc,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE;IAY7E,UAAU;IAqCV,cAAc,CAAC,EAAE,QAAQ,EAAE,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE,GAAG,MAAM,EAAE;IAK5D,OAAO,IAAI,IAAI;CAKvB"}

package/dist/websocket/websocket-server.d.ts

@@ -0,0 +1,102 @@
+import { WebSocketServer as WS, WebSocket } from 'ws';
+import { type WebSocketRoute, type WebSocketType } from './websocket.interface.js';
+import type RedisInstance from '../redis/instance.js';
+import type QueueManager from '../queue/manager.js';
+import type DatabaseInstance from '../database/instance.js';
+import type { WebSocketServerProps } from './websocket-server.interface.js';
+import WebSocketClientManager from './websocket-client-manager.js';
+import WebSocketBase from './websocket-base.js';
+import type { FastifyInstance } from 'fastify';
+export default class WebSocketServer extends WebSocketBase {
+    protected defaultRoutes: WebSocketRoute[];
+    private server?;
+    private abortController;
+    private workerId;
+    private uniqueInstanceId;
+    private applicationConfig;
+    private options;
+    clientManager: WebSocketClientManager;
+    private roomManager;
+    private authService;
+    get rooms(): Map<string, Set<string>>;
+    private redisInstance;
+    private queueManager;
+    private databaseInstance;
+    /** Redis subscriber events */
+    private redisSubscriberEvents;
+    constructor(props: WebSocketServerProps);
+    get type(): WebSocketType;
+    private validateWebSocketAuth;
+    load(): Promise<void>;
+    start({ fastifyServer }: {
+        fastifyServer: FastifyInstance;
+    }): Promise<{
+        server: WS;
+    }>;
+    stop(): Promise<void>;
+    protected getControllerDependencies(): {
+        webSocketServer: WebSocketServer;
+        redisInstance: RedisInstance;
+        queueManager: QueueManager;
+        databaseInstance: DatabaseInstance;
+    };
+    protected shouldPrintRoutes(): boolean;
+    private handleServerStart;
+    /**
+     * Handle subscriber message.
+     */
+    private handleSubscriberMessage;
+    private handleServerError;
+    private handleServerClientConnection;
+    leaveRoom({ ws, roomName }: {
+        ws: WebSocket;
+        roomName: string;
+    }): void;
+    private onClientConnect;
+    private onClientDisconnect;
+    private handleServerClientDisconnection;
+    private handleClientMessage;
+    protected handleMessageError(clientId: string, error: string): void;
+    /**
+     * Check and disconnect inactive clients based on configuration
+     * This helps prevent stale connections from accumulating
+     */
+    private checkInactiveClients;
+    /**
+     * Broadcast a message to all connected WebSocket clients
+     * @param data - The data to broadcast (will be JSON stringified)
+     * @param excludeClientId - Optional client ID to exclude from broadcast
+     */
+    broadcastToAllClients({ data, excludeClientId, }: {
+        data: {
+            [key: string]: any;
+        };
+        excludeClientId?: string;
+    }): void;
+    sendMessageError({ webSocketClientId, error }: {
+        webSocketClientId: string;
+        error: string;
+    }): void;
+    private onJoinRoom;
+    joinRoom({ ws, userId, userType, username, roomName, }: {
+        ws: WebSocket;
+        userId?: number;
+        userType?: string;
+        username?: string;
+        roomName: string;
+    }): Promise<true | undefined>;
+    sendClientMessage: (ws: WebSocket, data: unknown, binary?: boolean) => void;
+    sendMessage: ({ data }: {
+        data: unknown;
+    }) => void;
+    sendMessageToAll: ({ data }: {
+        data: unknown;
+    }) => void;
+    sendCustomMessage: ({ data }: {
+        data: unknown;
+    }) => void;
+    getClients({ userType }: {
+        userType?: string;
+    }): any[];
+}
+//# sourceMappingURL=websocket-server.d.ts.map

package/dist/websocket/websocket-server.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"websocket-server.d.ts","sourceRoot":"","sources":["../../src/websocket/websocket-server.ts"],"names":[],"mappings":"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"}

package/dist/websocket/websocket-server.interface.d.ts

@@ -0,0 +1,16 @@
+import type { ApplicationConfig } from '../application/base-application.interface.js';
+import type DatabaseInstance from '../database/instance.js';
+import type QueueManager from '../queue/manager.js';
+import type { RedisInstance } from '../redis/index.js';
+import type { WebSocketOptions, WebSocketRoute } from './websocket.interface.js';
+export interface WebSocketServerProps {
+    uniqueInstanceId: string;
+    applicationConfig: ApplicationConfig;
+    options: WebSocketOptions;
+    redisInstance: RedisInstance;
+    queueManager: QueueManager;
+    databaseInstance: DatabaseInstance;
+    routes: WebSocketRoute[];
+    workerId: number | null;
+}
+//# sourceMappingURL=websocket-server.interface.d.ts.map

package/dist/websocket/websocket-server.interface.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"websocket-server.interface.d.ts","sourceRoot":"","sources":["../../src/websocket/websocket-server.interface.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8CAA8C,CAAC;AACtF,OAAO,KAAK,gBAAgB,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,YAAY,MAAM,qBAAqB,CAAC;AACpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,KAAK,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAEjF,MAAM,WAAW,oBAAoB;IACnC,gBAAgB,EAAE,MAAM,CAAC;IACzB,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,OAAO,EAAE,gBAAgB,CAAC;IAC1B,aAAa,EAAE,aAAa,CAAC;IAC7B,YAAY,EAAE,YAAY,CAAC;IAC3B,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,MAAM,EAAE,cAAc,EAAE,CAAC;IACzB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB"}

package/dist/websocket/websocket-server.js

@@ -12,8 +12,7 @@ import path from "path";
 import { baseDir } from "../index.js";
 import WebSocketRoomManager from "./websocket-room-manager.js";
 import logger from "../logger/logger.js";
-import { URL } from "url";
-import Jwt from "../auth/jwt.js";
+import { WebSocketAuthService } from "./websocket-auth.js";
 class WebSocketServer extends WebSocketBase {
   static {
     __name(this, "WebSocketServer");
@@ -40,6 +39,7 @@ class WebSocketServer extends WebSocketBase {
   roomManager = new WebSocketRoomManager({
     clientManager: this.clientManager
   });
+  authService;
   get rooms() {
     return this.roomManager.rooms;
   }
@@ -70,33 +70,13 @@ class WebSocketServer extends WebSocketBase {
     this.databaseInstance = props.databaseInstance;
     this.routes = props.routes;
     this.workerId = props.workerId;
+    this.authService = new WebSocketAuthService(props.applicationConfig);
   }
   get type() {
     return "server";
   }
   async validateWebSocketAuth(url) {
-    try {
-      const parsedUrl = new URL(url, "ws://localhost");
-      const token = parsedUrl.searchParams.get("token");
-      if (!token) {
-        return null;
-      }
-      const jwtSecretKey = this.applicationConfig.auth?.jwtSecretKey;
-      if (!jwtSecretKey) {
-        throw new Error("JWT secret key not configured");
-      }
-      const importedJwtSecretKey = await Jwt.importJwtSecretKey({
-        jwtSecretKey
-      });
-      const { payload } = await Jwt.jwtVerify(token, importedJwtSecretKey);
-      const userId = parseInt(payload.sub);
-      if (isNaN(userId)) {
-        throw new Error("Invalid user ID in token");
-      }
-      return { userId, payload };
-    } catch (error) {
-      throw new Error(`JWT verification failed: ${error.message}`);
-    }
+    return this.authService.validateAuth(url);
   }
   async load() {
     const libraryControllersDirectory = path.join(baseDir, "websocket", "controllers", "server");
@@ -241,10 +221,6 @@ class WebSocketServer extends WebSocketBase {
           clientId: parsedMessage.clientId
           // requireWs: true,
         });
-        log(
-          `GOT A REQUEST TO POTENTIALLY DISCONNECT LCIENT IF THIS CLIENT IS CONNETED HERE, GET CLIENT ------------------------- ${clientToDisconnect ?? "NO CLIENT"}`
-        );
-        console.log("clientToDisconnect", clientToDisconnect, "workerId: ", this.workerId);
         if (clientToDisconnect) {
           this.clientManager.disconnectClient({
             clientId: parsedMessage.clientId
@@ -288,7 +264,10 @@ class WebSocketServer extends WebSocketBase {
         break;
       }
       case WebSocketRedisSubscriberEvent.QueueJobError: {
-        parsedMessage.data = parsedMessage.error;
+        parsedMessage.data = {
+          ...parsedMessage.data ?? {},
+          error: parsedMessage.error
+        };
         break;
       }
       case WebSocketRedisSubscriberEvent.Custom: {
@@ -441,7 +420,14 @@ class WebSocketServer extends WebSocketBase {
           response: serverMessageResponse?.response
         });
         if (serverMessageResponse?.response && typeof serverMessageResponse.response === "object" && "error" in serverMessageResponse.response) {
-          Logger.error({ error: serverMessageResponse.response.error });
+          Logger.error({
+            error: serverMessageResponse.response.error,
+            meta: {
+              clientId,
+              type: serverMessageResponse.type,
+              action: serverMessageResponse.action
+            }
+          });
         }
       }
     } catch (error) {
@@ -461,11 +447,38 @@ class WebSocketServer extends WebSocketBase {
       })
     );
   }
+  /**
+   * Check and disconnect inactive clients based on configuration
+   * This helps prevent stale connections from accumulating
+   */
   checkInactiveClients() {
-    if (this.options.disconnectInactiveClients?.enabled && this.options.disconnectInactiveClients.log) {
+    const config = this.options.disconnectInactiveClients;
+    if (!config?.enabled || !config.inactiveTime) {
+      return;
+    }
+    if (config.log) {
       log("Checking inactive clients...");
     }
+    const now = Date.now();
+    const clients = this.clientManager.getClients();
+    for (const client of clients) {
+      const inactiveTime = now - client.lastActivity;
+      if (inactiveTime > config.inactiveTime) {
+        this.clientManager.disconnectClient(client.clientId);
+        if (config.log) {
+          log("Disconnected inactive client", {
+            "Client ID": client.clientId,
+            "Inactive Time": `${inactiveTime}ms`
+          });
+        }
+      }
+    }
   }
+  /**
+   * Broadcast a message to all connected WebSocket clients
+   * @param data - The data to broadcast (will be JSON stringified)
+   * @param excludeClientId - Optional client ID to exclude from broadcast
+   */
   broadcastToAllClients({
     data,
     excludeClientId
@@ -474,18 +487,18 @@ class WebSocketServer extends WebSocketBase {
       log("Server not started when broadcasting to all clients");
       return;
     }
-    this.server.clients.forEach((client) => {
-      let excludeClient = false;
-      if (excludeClientId) {
-        const clientId = this.clientManager.getClientId({
-          ws: client
-        });
-        excludeClient = clientId === excludeClientId;
+    for (const client of this.server.clients) {
+      if (client.readyState !== WebSocket.OPEN) {
+        continue;
       }
-      if (client.readyState === WebSocket.OPEN && !excludeClient) {
-        client.send(JSON.stringify(data));
+      if (excludeClientId) {
+        const clientId = this.clientManager.getClientId({ ws: client });
+        if (clientId === excludeClientId) {
+          continue;
+        }
       }
-    });
+      client.send(JSON.stringify(data));
+    }
   }
   sendMessageError({ webSocketClientId, error }) {
     const client = this.clientManager.getClient({
@@ -532,14 +545,14 @@ class WebSocketServer extends WebSocketBase {
       });
       return;
     }
-    const clientCanJoinMultipleRooms = false;
-    if (clientCanJoinMultipleRooms !== true) {
-      if (client.roomName) {
-        this.roomManager.removeClientFromRoom({
-          roomName: client.roomName,
-          clientId
-        });
-      }
+    const canJoinMultipleRooms = this.options.rooms?.clientCanJoinMultipleRooms ?? true;
+    if (!canJoinMultipleRooms && client.roomName) {
+      this.roomManager.removeClientFromRoom({
+        roomName: client.roomName,
+        clientId,
+        broadcast: false
+        // Don't broadcast here, will broadcast after adding to new room
+      });
     }
     this.clientManager.updateClient({
       clientId,
@@ -649,7 +662,6 @@ class WebSocketServer extends WebSocketBase {
       ...data,
       workerId: this.workerId
     };
-    console.log("SEND CUSTOM MESSAGE:", formattedData);
     this.redisInstance.publisherClient.publish(WebSocketRedisSubscriberEvent.Custom, JSON.stringify(formattedData));
   }, "sendCustomMessage");
   getClients({ userType }) {