quantum-flow 1.7.0 → 1.8.0

package/dist/app/http/Application.d.ts

@@ -8,6 +8,7 @@ export declare class HttpServer extends Socket {
     constructor(configOrClass: new (...args: any[]) => any);
     private logConfig;
     listen(port?: number, host?: string): Promise<http.Server>;
+    private getAllControllers;
     close(): Promise<void>;
     status(): {
         running: boolean;

package/dist/app/http/Application.js

@@ -19,9 +19,8 @@ class HttpServer extends Socket_1.Socket {
         this.config = (0, _utils_1.resolveConfig)(configOrClass);
         const app = http_1.default.createServer(this.requestHandler.bind(this));
         if (this.config.websocket?.enabled) {
-            this.wss = new WebsocketServer_1.WebSocketServer(app, {
-                path: this.config.websocket.path || '/',
-            });
+            this.wss = new WebsocketServer_1.WebSocketServer(app, { path: this.config.websocket.path });
+            this.wss.registerControllers(this.getAllControllers(this.config.controllers));
             WebsocketService_1.WebSocketService.getInstance().initialize(this.wss);
         }
         this.app = app;
@@ -73,6 +72,16 @@ class HttpServer extends Socket_1.Socket {
             }
         });
     }
+    getAllControllers(controllers = []) {
+        const result = [];
+        for (const ControllerClass of controllers || []) {
+            const instance = new ControllerClass();
+            result.push(instance);
+            const subControllers = Reflect.getMetadata(_constants_1.CONTROLLERS, ControllerClass.prototype) || [];
+            result.push(...this.getAllControllers(subControllers));
+        }
+        return result;
+    }
     async close() {
         return new Promise((resolve, reject) => {
             if (!this.isRunning) {

package/dist/app/http/decorators.js

@@ -16,9 +16,6 @@ function Server(config = {}) {
             interceptors: existingConfig.interceptor ?? config.interceptor,
         };
         Reflect.defineMetadata(_constants_1.SERVER_CONFIG_KEY, mergedConfig, target);
-        if (config.controllers) {
-            Reflect.defineMetadata(_constants_1.SERVER_MODULES_KEY, config.controllers, target);
-        }
         return target;
     };
 }

package/dist/app/http/websocket/WebsocketServer.d.ts

@@ -6,9 +6,10 @@ export declare class WebSocketServer {
     private topics;
     private controllers;
     private options;
-    constructor(server: http.Server, options?: any);
+    constructor(server: http.Server, options?: {
+        path?: string;
+    });
     private shouldHandleWebSocket;
-    private ensureServer;
     private handleConnection;
     private handleMessage;
     private handleClose;

package/dist/app/http/websocket/WebsocketServer.js

@@ -7,18 +7,28 @@ exports.WebSocketServer = void 0;
 const uuid_1 = require("uuid");
 const ws_1 = __importDefault(require("ws"));
 class WebSocketServer {
-    wss = null;
+    wss;
     clients = new Map();
     topics = new Map();
     controllers = [];
     options;
     constructor(server, options) {
         this.options = options;
+        this.wss = new ws_1.default.Server({
+            noServer: true,
+            path: this.options?.path || '/',
+        });
+        this.wss.on('connection', (socket, request) => {
+            this.handleConnection(socket);
+        });
         server.on('upgrade', (request, socket, head) => {
+            if (socket.__wsHandled) {
+                return;
+            }
+            socket.__wsHandled = true;
             if (this.shouldHandleWebSocket(request.url)) {
-                this.ensureServer(server);
-                this.wss?.handleUpgrade(request, socket, head, (ws) => {
-                    this.wss?.emit('connection', ws, request);
+                this.wss.handleUpgrade(request, socket, head, (ws) => {
+                    this.wss.emit('connection', ws, request);
                 });
             }
             else {
@@ -30,19 +40,7 @@ class WebSocketServer {
         const path = this.options?.path || '/ws';
         return url.startsWith(path);
     }
-    ensureServer(server) {
-        if (!this.wss) {
-            this.wss = new ws_1.default.Server({
-                server,
-                path: this.options?.path || '/ws',
-                noServer: true,
-            });
-            this.wss.on('connection', (socket, request) => {
-                this.handleConnection(socket, request);
-            });
-        }
-    }
-    async handleConnection(socket, request) {
+    async handleConnection(socket) {
         const clientId = (0, uuid_1.v4)();
         const client = {
             id: clientId,
@@ -66,8 +64,9 @@ class WebSocketServer {
     async handleMessage(client, data) {
         try {
             const message = JSON.parse(data.toString());
-            if (message.type === 'subscribe' && message.topic) {
-                this.subscribeToTopic(client, message.topic);
+            const topic = message.topic ?? message.data?.topic;
+            if (message.type === 'subscribe' && topic) {
+                this.subscribeToTopic(client, topic);
                 return;
             }
             if (message.type === 'unsubscribe' && message.topic) {
@@ -121,22 +120,27 @@ class WebSocketServer {
     }
     async triggerHandlers(eventType, event, topic) {
         for (const controller of this.controllers) {
-            const handlers = Reflect.getMetadata('websocket:handler', controller.constructor) || [];
-            const matchingHandlers = handlers.filter((h) => h.type === eventType && (!h.topic || h.topic === topic));
+            const controllerHandlers = controller.handlers?.[eventType] ?? [];
+            const matchingHandlers = controllerHandlers.filter((h) => {
+                if (h.type !== eventType)
+                    return false;
+                if (!topic)
+                    return !h.topic;
+                return !h.topic || h.topic === topic;
+            });
             for (const handler of matchingHandlers) {
                 try {
-                    await controller[handler.method](event);
+                    await handler.fn(event);
                 }
                 catch (error) {
                     console.error(`Error in WebSocket handler ${handler.method}:`, error);
                 }
             }
-            const subscriptions = Reflect.getMetadata('websocket:topic', controller.constructor) || [];
             if (eventType === 'message' && topic) {
-                const matchingSubs = subscriptions.filter((s) => s.topic === topic);
+                const matchingSubs = controller.topics.filter((s) => s.topic === topic);
                 for (const sub of matchingSubs) {
                     try {
-                        await controller[sub.method](event);
+                        await sub.fn(event);
                     }
                     catch (error) {
                         console.error(`Error in subscription ${sub.method}:`, error);
@@ -146,7 +150,12 @@ class WebSocketServer {
         }
     }
     registerControllers(controllers) {
-        this.controllers = controllers;
+        this.controllers = controllers.map((controller) => {
+            if (controller.getWebSocketController) {
+                return controller.getWebSocketController();
+            }
+            return controller;
+        });
     }
     subscribeToTopic(client, topic) {
         if (!this.topics.has(topic)) {
@@ -186,8 +195,11 @@ class WebSocketServer {
             timestamp: new Date().toISOString(),
         });
         topicClients.forEach((clientId) => {
+            if (exclude && exclude.includes(clientId)) {
+                return;
+            }
             const client = this.clients.get(clientId);
-            if (client && exclude?.includes(client.id)) {
+            if (client) {
                 client.socket.send(message);
             }
         });

package/dist/constants.d.ts

@@ -8,9 +8,8 @@ export declare const INTERCEPTOR = "app:interceptors";
 export declare const ENDPOINT = "route:endpoints";
 export declare const OK_METADATA_KEY = "custom:ok";
 export declare const SERVER_CONFIG_KEY = "server:config";
-export declare const SERVER_MODULES_KEY = "server:modules";
 export declare const USE_MIDDLEWARE = "controller:usemiddleware";
-export declare const WS_METADATA_KEY = "websocket:handler";
+export declare const WS_HANDLER = "websocket:handler";
 export declare const WS_TOPIC_KEY = "websocket:topic";
 export declare const WS_SERVICE_KEY = "websocket:service";
 export declare const INTECEPT = "server:intercept";

package/dist/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CORS_METADATA = exports.INCREMENT_STATISTIC = exports.STATISTIC = exports.TO_VALIDATE = exports.OK_STATUSES = exports.STOPPED = exports.SANITIZE = exports.CATCH = exports.INTECEPT = exports.WS_SERVICE_KEY = exports.WS_TOPIC_KEY = exports.WS_METADATA_KEY = exports.USE_MIDDLEWARE = exports.SERVER_MODULES_KEY = exports.SERVER_CONFIG_KEY = exports.OK_METADATA_KEY = exports.ENDPOINT = exports.INTERCEPTOR = exports.CONTROLLERS = exports.MIDDLEWARES = exports.ROUTE_MIDDLEWARES = exports.ROUTE_PREFIX = exports.APP_METADATA_KEY = exports.PARAM_METADATA_KEY = void 0;
+exports.CORS_METADATA = exports.INCREMENT_STATISTIC = exports.STATISTIC = exports.TO_VALIDATE = exports.OK_STATUSES = exports.STOPPED = exports.SANITIZE = exports.CATCH = exports.INTECEPT = exports.WS_SERVICE_KEY = exports.WS_TOPIC_KEY = exports.WS_HANDLER = exports.USE_MIDDLEWARE = exports.SERVER_CONFIG_KEY = exports.OK_METADATA_KEY = exports.ENDPOINT = exports.INTERCEPTOR = exports.CONTROLLERS = exports.MIDDLEWARES = exports.ROUTE_MIDDLEWARES = exports.ROUTE_PREFIX = exports.APP_METADATA_KEY = exports.PARAM_METADATA_KEY = void 0;
 exports.PARAM_METADATA_KEY = 'design:parameters';
 exports.APP_METADATA_KEY = 'app:configuration';
 exports.ROUTE_PREFIX = 'route:prefix';
@@ -11,9 +11,8 @@ exports.INTERCEPTOR = 'app:interceptors';
 exports.ENDPOINT = 'route:endpoints';
 exports.OK_METADATA_KEY = 'custom:ok';
 exports.SERVER_CONFIG_KEY = 'server:config';
-exports.SERVER_MODULES_KEY = 'server:modules';
 exports.USE_MIDDLEWARE = 'controller:usemiddleware';
-exports.WS_METADATA_KEY = 'websocket:handler';
+exports.WS_HANDLER = 'websocket:handler';
 exports.WS_TOPIC_KEY = 'websocket:topic';
 exports.WS_SERVICE_KEY = 'websocket:service';
 exports.INTECEPT = 'server:intercept';

package/dist/core/Controller.d.ts

@@ -29,5 +29,17 @@ export declare function Controller(config: string | ControllerConfig, middleware
         getControllerMethods: (controller: import("../types/index.js").ControllerInstance) => import("../types/index.js").ControllerMethods;
         handleRequest: (request: AppRequest, response: ServerResponse) => Promise<any>;
         routeWalker(context: RouteContext, request: AppRequest, response: ServerResponse): Promise<any>;
+        getWebSocketController(): {
+            instance: /*elided*/ any;
+            handlers: {
+                connection: any;
+                message: any;
+                close: any;
+                error: any;
+            };
+            topics: any;
+        };
+        getWSHandlers(type: string): any;
+        getWSTopics(): any;
     };
 } & T;

package/dist/core/Controller.js

@@ -200,6 +200,34 @@ function Controller(config, middlewares = []) {
                 }
                 return null;
             }
+            getWebSocketController() {
+                return {
+                    instance: this,
+                    handlers: {
+                        connection: this.getWSHandlers('connection'),
+                        message: this.getWSHandlers('message'),
+                        close: this.getWSHandlers('close'),
+                        error: this.getWSHandlers('error'),
+                    },
+                    topics: this.getWSTopics(),
+                };
+            }
+            getWSHandlers(type) {
+                const handlers = Reflect.getMetadata(_constants_1.WS_HANDLER, this.constructor) || [];
+                return handlers
+                    .filter((h) => h.type === type)
+                    .map((h) => ({
+                    ...h,
+                    fn: this[h.method].bind(this),
+                }));
+            }
+            getWSTopics() {
+                const topics = Reflect.getMetadata(_constants_1.WS_TOPIC_KEY, this.constructor) || [];
+                return topics.map((t) => ({
+                    ...t,
+                    fn: this[t.method].bind(this),
+                }));
+            }
         };
     };
 }

package/dist/core/utils/websocket.js

@@ -15,9 +15,9 @@ const _constants_1 = require("../../constants.js");
  */
 function OnWS(type, topic) {
     return function (target, propertyKey, descriptor) {
-        const handlers = Reflect.getMetadata(_constants_1.WS_METADATA_KEY, target.constructor) || [];
+        const handlers = Reflect.getMetadata(_constants_1.WS_HANDLER, target.constructor) || [];
         handlers.push({ type, topic, method: propertyKey });
-        Reflect.defineMetadata(_constants_1.WS_METADATA_KEY, handlers, target.constructor);
+        Reflect.defineMetadata(_constants_1.WS_HANDLER, handlers, target.constructor);
         return descriptor;
     };
 }

package/dist/examples/app.js

@@ -1,49 +1,16 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.App = exports.Root = void 0;
-const Joi = __importStar(require("joi"));
 const core_1 = require("quantum-flow/core");
 const http_1 = require("quantum-flow/http");
 const middlewares_1 = require("quantum-flow/middlewares");
+const socket_1 = require("./controllers/socket");
 const user_1 = require("./controllers/user");
 let Root = class Root {
 };
@@ -51,7 +18,7 @@ exports.Root = Root;
 exports.Root = Root = __decorate([
     (0, core_1.Controller)({
         prefix: 'api',
-        controllers: [user_1.User],
+        controllers: [user_1.User, socket_1.Socket],
         middlewares: [function Global(req, res, next) { }],
     }),
     (0, middlewares_1.Cors)({ origin: '*' }),
@@ -60,15 +27,6 @@ exports.Root = Root = __decorate([
     }),
     (0, middlewares_1.Catch)(function GLOBALCATCH(err) {
         return { status: 400 };
-    }),
-    (0, middlewares_1.Sanitize)({
-        schema: Joi.object({
-            name: Joi.string().trim().min(2).max(50).required(),
-        }),
-        action: 'both',
-        options: { abortEarly: false },
-        stripUnknown: true,
-        type: 'body',
     })
 ], Root);
 let App = class App {
@@ -77,7 +35,7 @@ exports.App = App;
 exports.App = App = __decorate([
     (0, http_1.Server)({
         controllers: [Root],
-        websocket: { enabled: true },
+        websocket: { enabled: true, path: '/ws' },
         interceptor: (data) => data,
         errorHandler: (err) => err,
         cors: { origin: '*' },
@@ -86,14 +44,5 @@ exports.App = App = __decorate([
     (0, http_1.Port)(3000),
     (0, middlewares_1.Use)(() => { }),
     (0, middlewares_1.Use)([() => { }, () => { }]),
-    (0, middlewares_1.Catch)((err) => err),
-    (0, middlewares_1.Sanitize)({
-        schema: Joi.object({
-            name: Joi.string().trim().min(2).max(50).required(),
-        }),
-        action: 'both',
-        options: { abortEarly: false },
-        stripUnknown: true,
-        type: 'headers',
-    })
+    (0, middlewares_1.Catch)((err) => err)
 ], App);

package/dist/examples/controllers/socket.d.ts

@@ -1,8 +1,7 @@
 import { WebSocketEvent } from 'quantum-flow/core';
 export declare class Socket {
-    onConnection(event: WebSocketEvent): void;
-    onChatMessage(event: WebSocketEvent): void;
-    onNewsMessage(event: WebSocketEvent): void;
+    aaa(event: WebSocketEvent): void;
+    sunbcription(event: WebSocketEvent): void;
     onPing(event: WebSocketEvent): void;
-    onSubscribe(event: WebSocketEvent): void;
+    onChat(event: WebSocketEvent): void;
 }

package/dist/examples/controllers/socket.js

@@ -11,23 +11,25 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Socket = void 0;
 const core_1 = require("quantum-flow/core");
+const core_2 = require("quantum-flow/core");
 let Socket = class Socket {
-    onConnection(event) {
+    aaa(event) {
+        console.log('onConnection', event.message);
         event.client.socket.send(JSON.stringify({ type: 'welcome', data: { message: 'welcome' } }));
     }
-    onChatMessage(event) {
+    sunbcription(event) {
         const msg = event.message?.data;
         if (msg?.text.includes('bad')) {
             return;
         }
     }
-    onNewsMessage(event) { }
     onPing(event) {
-        event.client.socket.send(JSON.stringify({ type: 'pong', data: { time: Date.now() } }));
+        console.log('ping', event.message);
+        event.client.socket.send(JSON.stringify({ type: 'ping', data: { time: Date.now() } }));
     }
-    onSubscribe(event) {
-        const topic = event.message?.data.topic;
-        event.client.socket.send(JSON.stringify({ type: 'subscribed', topic, data: { success: true } }));
+    onChat(event) {
+        console.log('chat', event.message);
+        event.client.socket.send(JSON.stringify({ type: 'onChat', data: { time: Date.now() } }));
     }
 };
 exports.Socket = Socket;
@@ -36,19 +38,13 @@ __decorate([
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", void 0)
-], Socket.prototype, "onConnection", null);
+], Socket.prototype, "aaa", null);
 __decorate([
-    (0, core_1.Subscribe)('chat'),
+    (0, core_2.Subscribe)('chat'),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", void 0)
-], Socket.prototype, "onChatMessage", null);
-__decorate([
-    (0, core_1.Subscribe)('news'),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object]),
-    __metadata("design:returntype", void 0)
-], Socket.prototype, "onNewsMessage", null);
+], Socket.prototype, "sunbcription", null);
 __decorate([
     (0, core_1.OnMessage)('ping'),
     __metadata("design:type", Function),
@@ -56,11 +52,11 @@ __decorate([
     __metadata("design:returntype", void 0)
 ], Socket.prototype, "onPing", null);
 __decorate([
-    (0, core_1.OnMessage)('subscribe'),
+    (0, core_1.OnMessage)('chat'),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", void 0)
-], Socket.prototype, "onSubscribe", null);
+], Socket.prototype, "onChat", null);
 exports.Socket = Socket = __decorate([
     (0, core_1.Controller)('socket')
 ], Socket);

package/dist/examples/controllers/userMetadata.d.ts

@@ -1,6 +1,7 @@
+import { IWebSocketService } from 'quantum-flow/core';
 export declare class UserMetadata {
     getUserMetadata(params: any): Promise<any>;
-    createMeta(mult: any, body: any, params: any): Promise<{
+    createMeta(ws: IWebSocketService, mult: any, body: any, params: any): Promise<{
         body: any;
         params: any;
     }>;

package/dist/examples/controllers/userMetadata.js

@@ -64,7 +64,7 @@ let UserMetadata = class UserMetadata {
     async getUserMetadata(params) {
         return params;
     }
-    async createMeta(mult, body, params) {
+    async createMeta(ws, mult, body, params) {
         return { body, params };
     }
 };
@@ -85,11 +85,12 @@ __decorate([
         stripUnknown: true,
         type: 'body',
     }),
-    __param(0, (0, core_1.Multipart)()),
-    __param(1, (0, core_1.Body)(DTO)),
-    __param(2, (0, core_1.Params)('meta')),
+    __param(0, (0, core_1.InjectWS)()),
+    __param(1, (0, core_1.Multipart)()),
+    __param(2, (0, core_1.Body)(DTO)),
+    __param(3, (0, core_1.Params)('meta')),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, Object, Object]),
+    __metadata("design:paramtypes", [Object, Object, Object, Object]),
     __metadata("design:returntype", Promise)
 ], UserMetadata.prototype, "createMeta", null);
 exports.UserMetadata = UserMetadata = __decorate([

package/dist/utils/server.js

@@ -6,7 +6,6 @@ const resolveConfig = (configOrClass) => {
     let config = {};
     if (configOrClass && typeof configOrClass === 'function') {
         const decoratorConfig = Reflect.getMetadata(_constants_1.SERVER_CONFIG_KEY, configOrClass) || {};
-        const controllers = Reflect.getMetadata(_constants_1.SERVER_MODULES_KEY, configOrClass) || [];
         const errorHandler = Reflect.getMetadata(_constants_1.CATCH, configOrClass);
         const interceptors = Reflect.getMetadata(_constants_1.INTECEPT, configOrClass);
         const middlewares = Reflect.getMetadata(_constants_1.USE_MIDDLEWARE, configOrClass);
@@ -19,7 +18,7 @@ const resolveConfig = (configOrClass) => {
             interceptors,
             middlewares: decoratorConfig.middlewares.concat(middlewares),
             cors: decoratorConfig.cors,
-            controllers: [...controllers, ...(decoratorConfig.controllers || [])],
+            controllers: decoratorConfig.controllers || [],
             sanitizers,
         };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quantum-flow",
-  "version": "1.7.0",
+  "version": "1.8.0",
   "description": "Decorator-based API framework",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",