@onebun/core 0.2.2 → 0.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onebun/core",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "Core package for OneBun framework - decorators, DI, modules, controllers",
   "license": "LGPL-3.0",
   "author": "RemRyahirev",

package/src/docs-examples.test.ts

@@ -3234,8 +3234,7 @@ describe('WebSocket Gateway API Documentation (docs/api/websocket.md)', () => {
       class TestGateway extends BaseWebSocketGateway {
         @OnConnect()
         handleConnect(@Client() client: WsClientData) {
-          // eslint-disable-next-line no-console
-          console.log(`Client ${client.id} connected`);
+          this.logger.info(`Client ${client.id} connected`);
 
           return { event: 'welcome', data: { message: 'Welcome!' } };
         }
@@ -3252,8 +3251,7 @@ describe('WebSocket Gateway API Documentation (docs/api/websocket.md)', () => {
       class TestGateway extends BaseWebSocketGateway {
         @OnDisconnect()
         handleDisconnect(@Client() client: WsClientData) {
-          // eslint-disable-next-line no-console
-          console.log(`Client ${client.id} disconnected`);
+          this.logger.info(`Client ${client.id} disconnected`);
         }
       }
 
@@ -3682,8 +3680,7 @@ describe('WebSocket Chat Example (docs/examples/websocket-chat.md)', () => {
 
         @OnConnect()
         async handleConnect(@Client() client: WsClientData) {
-          // eslint-disable-next-line no-console
-          console.log(`Client ${client.id} connected`);
+          this.logger.info(`Client ${client.id} connected`);
 
           return {
             event: 'welcome',
@@ -3697,8 +3694,7 @@ describe('WebSocket Chat Example (docs/examples/websocket-chat.md)', () => {
 
         @OnDisconnect()
         async handleDisconnect(@Client() client: WsClientData) {
-          // eslint-disable-next-line no-console
-          console.log(`Client ${client.id} disconnected`);
+          this.logger.info(`Client ${client.id} disconnected`);
 
           for (const room of client.rooms) {
             this.emitToRoom(room, 'user:left', {
@@ -3714,8 +3710,7 @@ describe('WebSocket Chat Example (docs/examples/websocket-chat.md)', () => {
           @RoomName() room: string,
           @PatternParams() params: { roomId: string },
         ) {
-          // eslint-disable-next-line no-console
-          console.log(`Client ${client.id} joining room ${params.roomId}`);
+          this.logger.info(`Client ${client.id} joining room ${params.roomId}`);
 
           await this.joinRoom(client.id, room);
 
@@ -3981,6 +3976,52 @@ describe('WebSocket Chat Example (docs/examples/websocket-chat.md)', () => {
   });
 });
 
+describe('WebSocket Gateway DI (docs/api/websocket.md#basewebsocketgateway)', () => {
+  /**
+   * @source docs/api/websocket.md#basewebsocketgateway
+   * Gateways receive this.logger and this.config just like controllers.
+   */
+  it('should inject logger and config into WebSocket gateway via module DI', async () => {
+    const effectLib = await import('effect');
+    const moduleMod = await import('./module/module');
+    const testUtils = await import('./testing/test-utils');
+
+    @WebSocketGateway({ path: '/ws' })
+    class TestGateway extends BaseWebSocketGateway {
+      @OnConnect()
+      handleConnect(@Client() client: WsClientData) {
+        this.logger.info(`Client ${client.id} connected`);
+
+        return { event: 'welcome', data: { id: client.id } };
+      }
+
+      getLoggerForTest() {
+        return this.logger;
+      }
+
+      getConfigForTest() {
+        return this.config;
+      }
+    }
+
+    @Module({ controllers: [TestGateway] })
+    class TestModule {}
+
+    const mod = new moduleMod.OneBunModule(TestModule, testUtils.makeMockLoggerLayer());
+    mod.getLayer();
+    await effectLib.Effect.runPromise(mod.setup() as import('effect').Effect.Effect<unknown, never, never>);
+
+    const gateway = mod.getControllerInstance(TestGateway) as unknown as TestGateway;
+    expect(gateway).toBeDefined();
+    expect(gateway.getLoggerForTest()).toBeDefined();
+    expect(typeof gateway.getLoggerForTest().info).toBe('function');
+    expect(typeof gateway.getLoggerForTest().warn).toBe('function');
+    expect(typeof gateway.getLoggerForTest().error).toBe('function');
+    expect(gateway.getConfigForTest()).toBeDefined();
+    expect(typeof gateway.getConfigForTest().get).toBe('function');
+  });
+});
+
 // ============================================================================
 // SSE (Server-Sent Events) Documentation Tests
 // ============================================================================

package/src/module/module.ts

@@ -6,6 +6,7 @@ import {
 
 import type { Controller } from './controller';
 import type { ModuleInstance } from '../types';
+import type { BaseWebSocketGateway } from '../websocket/ws-base-gateway';
 
 import {
   createSyncLogger,
@@ -540,8 +541,14 @@ export class OneBunModule implements ModuleInstance {
       const controllerConstructor = controllerClass as new (...args: unknown[]) => Controller;
       const controller = new controllerConstructor(...dependencies);
 
-      // Initialize controller with logger and config (skip for WebSocket gateways)
-      if (!isWebSocketGateway(controllerClass) && typeof controller.initializeController === 'function') {
+      // Initialize controller with logger and config
+      if (isWebSocketGateway(controllerClass)) {
+        // Initialize WebSocket gateway with logger and config
+        const gateway = controller as unknown as BaseWebSocketGateway;
+        if (typeof gateway._initializeBase === 'function') {
+          gateway._initializeBase(this.logger, this.config);
+        }
+      } else if (typeof controller.initializeController === 'function') {
         controller.initializeController(this.logger, this.config);
       }
 

package/src/websocket/ws-base-gateway.ts

@@ -11,8 +11,11 @@ import type {
   WsRoom,
   WsServer,
 } from './ws.types';
+import type { IConfig, OneBunAppConfig } from '../module/config.interface';
 import type { Server, ServerWebSocket } from 'bun';
 
+import type { SyncLogger } from '@onebun/logger';
+
 import { createFullEventMessage, createNativeMessage } from './ws-socketio-protocol';
 import { WsStorageEvent, isPubSubAdapter } from './ws-storage';
 
@@ -45,6 +48,12 @@ export function _resetClientSocketsForTesting(): void {
  * ```
  */
 export abstract class BaseWebSocketGateway {
+  /** Logger instance with gateway class name as context */
+  protected logger!: SyncLogger;
+
+  /** Configuration instance for accessing environment variables */
+  protected config!: IConfig<OneBunAppConfig>;
+
   /** Storage adapter for persisting client/room data */
   protected storage: WsStorageAdapter | null = null;
 
@@ -58,6 +67,17 @@ export abstract class BaseWebSocketGateway {
   // Initialization
   // ============================================================================
 
+  /**
+   * Initialize the gateway with logger and config
+   * Called internally by the framework during DI
+   * @internal
+   */
+  _initializeBase(logger: SyncLogger, config: IConfig<OneBunAppConfig>): void {
+    const className = this.constructor.name;
+    this.logger = logger.child({ className });
+    this.config = config;
+  }
+
   /**
    * Initialize the gateway with storage and server
    * Called internally by the framework