@wabot-dev/framework 0.1.0-beta.9 → 0.2.0-beta.1

package/dist/src/{repository → feature}/pg/PgCrudRepository.js

@@ -1,5 +1,6 @@
 import * as shortUUID from 'short-uuid';
 import { PgRepositoryBase } from './PgRepositoryBase.js';
+import { CustomError } from '../../core/error/CustomError.js';
 
 class PgCrudRepository extends PgRepositoryBase {
     config;
@@ -17,10 +18,25 @@ class PgCrudRepository extends PgRepositoryBase {
         const items = await this.query(sql, [id]);
         return items.at(0) ?? null;
     }
+    async findByIds(ids) {
+        if (ids.length === 0) {
+            return [];
+        }
+        const sql = `
+      SELECT ${this.columns}
+      FROM ${this.table}
+      WHERE id IN (${ids.map((_, i) => '$' + (i + 1)).join(',')})
+    `;
+        const items = await this.query(sql, ids);
+        return items;
+    }
     async findOrThrow(id) {
         const item = await this.find(id);
         if (!item) {
-            throw new Error(`Not found ${this.config.constructor.name} with id = '${id}'`);
+            throw new CustomError({
+                message: `Not found ${this.config.constructor.name} with id = '${id}'`,
+                httpCode: 404,
+            });
         }
         return item;
     }
@@ -53,16 +69,14 @@ class PgCrudRepository extends PgRepositoryBase {
          SET ${this.updates}
       WHERE id = $${this.columnsList.length + 1}
     `;
-        await this.exec(sql, [...this.values(item), item.getId()]);
+        await this.exec(sql, [...this.values(item), item.id]);
     }
-    async discard(item) {
-        const _item = await this.find(item.getId());
-        if (!_item) {
-            throw new Error('Not found');
-        }
-        item.discard();
-        _item.discard();
-        await this.update(_item);
+    async delete(item) {
+        const sql = `
+      DELETE FROM ${this.table}
+      WHERE id = $1
+    `;
+        await this.exec(sql, [item.id]);
     }
 }
 

package/dist/src/{repository → feature}/pg/PgRepositoryBase.js

@@ -32,8 +32,8 @@ class PgRepositoryBase {
     }
     values(item) {
         return [
-            item.getId(),
-            item.getCreatedAt(),
+            item.id,
+            item.createdAt,
             JSON.stringify(item['data']),
             ...this.columnsList.slice(3).map((x) => this.addColumns[x].value(item)),
         ];

package/dist/src/feature/rest-controller/injection-tokens.js

@@ -0,0 +1,4 @@
+const EXPRESS_REQ = 'EXPRESS_REQ';
+const EXPRESS_RES = 'EXPRESS_RES';
+
+export { EXPRESS_REQ, EXPRESS_RES };

package/dist/src/{rest-controller/metadata/@post.js → feature/rest-controller/metadata/@middleware.js}

@@ -1,19 +1,16 @@
-import { container } from '../../injection/index.js';
+import { container } from '../../../core/injection/index.js';
 import { RestControllerMetadataStore } from './RestControllerMetadataStore.js';
 
-function post(config) {
+function middleware(middlewareConstructor) {
     return function (target, propertyKey) {
         const functionName = propertyKey.toString();
-        const paramsTypes = Reflect.getMetadata('design:paramtypes', target, functionName);
         const store = container.resolve(RestControllerMetadataStore);
-        store.saveEndPointMetadata({
+        store.saveMiddlewareMetadata({
             controllerConstructor: target.constructor,
             functionName,
-            method: 'post',
-            path: config?.path,
-            paramsTypes,
+            middlewareConstructor: middlewareConstructor,
         });
     };
 }
 
-export { post };
+export { middleware };

package/dist/src/feature/rest-controller/metadata/@onDelete.js

@@ -0,0 +1,7 @@
+import { methodDecorator } from './methodDecorator.js';
+
+function onDelete(config) {
+    return methodDecorator('delete', config);
+}
+
+export { onDelete };

package/dist/src/feature/rest-controller/metadata/@onGet.js

@@ -0,0 +1,7 @@
+import { methodDecorator } from './methodDecorator.js';
+
+function onGet(config) {
+    return methodDecorator('get', config);
+}
+
+export { onGet };

package/dist/src/feature/rest-controller/metadata/@onPost.js

@@ -0,0 +1,7 @@
+import { methodDecorator } from './methodDecorator.js';
+
+function onPost(config) {
+    return methodDecorator('post', config);
+}
+
+export { onPost };

package/dist/src/feature/rest-controller/metadata/@onPut.js

@@ -0,0 +1,7 @@
+import { methodDecorator } from './methodDecorator.js';
+
+function onPut(config) {
+    return methodDecorator('put', config);
+}
+
+export { onPut };

package/dist/src/{rest-controller → feature/rest-controller}/metadata/@restController.js

@@ -1,4 +1,4 @@
-import { container, injectable } from '../../injection/index.js';
+import { container, injectable } from '../../../core/injection/index.js';
 import { RestControllerMetadataStore } from './RestControllerMetadataStore.js';
 
 function restController(config) {
@@ -6,7 +6,7 @@ function restController(config) {
         const metaDataStore = container.resolve(RestControllerMetadataStore);
         metaDataStore.saveControllerMetadata({
             controllerConstructor: target,
-            path: config.path,
+            path: typeof config === 'string' ? config : config.path,
         });
         injectable()(target);
     };

package/dist/src/{rest-controller → feature/rest-controller}/metadata/RestControllerMetadataStore.js

@@ -1,8 +1,9 @@
 import { __decorate } from 'tslib';
-import { singleton } from 'tsyringe';
+import { singleton } from '../../../core/injection/index.js';
 
 let RestControllerMetadataStore = class RestControllerMetadataStore {
     endPoints = new Map();
+    middlewares = new Map();
     restControllers = new Map();
     saveControllerMetadata(controllerMetadata) {
         this.restControllers.set(controllerMetadata.controllerConstructor, controllerMetadata);
@@ -14,6 +15,17 @@ let RestControllerMetadataStore = class RestControllerMetadataStore {
         }
         controllerEndPoints.set(endPointMetadata.functionName, endPointMetadata);
     }
+    saveMiddlewareMetadata(middlewareMetadata) {
+        let controllerMiddlewares = this.middlewares.get(middlewareMetadata.controllerConstructor);
+        if (!controllerMiddlewares) {
+            this.middlewares.set(middlewareMetadata.controllerConstructor, (controllerMiddlewares = new Map()));
+        }
+        let methodMiddlewares = controllerMiddlewares.get(middlewareMetadata.functionName);
+        if (!methodMiddlewares) {
+            controllerMiddlewares.set(middlewareMetadata.functionName, (methodMiddlewares = []));
+        }
+        methodMiddlewares.unshift(middlewareMetadata);
+    }
     getControllerEndPointsInfo(controllerConstructor) {
         const controller = this.restControllers.get(controllerConstructor);
         if (!controller) {
@@ -26,6 +38,7 @@ let RestControllerMetadataStore = class RestControllerMetadataStore {
         }
         return [...endPoints.values()].map((endPoint) => ({
             ...endPoint,
+            middlewares: this.middlewares.get(endPoint.controllerConstructor)?.get(endPoint.functionName) ?? [],
             controller: this.restControllers.get(endPoint.controllerConstructor),
         }));
     }

package/dist/src/{rest-controller/metadata/@get.js → feature/rest-controller/metadata/methodDecorator.js}

@@ -1,19 +1,19 @@
-import { container } from '../../injection/index.js';
+import { container } from '../../../core/injection/index.js';
 import { RestControllerMetadataStore } from './RestControllerMetadataStore.js';
 
-function get(config) {
+function methodDecorator(method, config) {
     return function (target, propertyKey) {
         const functionName = propertyKey.toString();
         const paramsTypes = Reflect.getMetadata('design:paramtypes', target, functionName);
         const store = container.resolve(RestControllerMetadataStore);
         store.saveEndPointMetadata({
             controllerConstructor: target.constructor,
+            method,
+            config: typeof config === 'string' ? { path: config } : config,
             functionName,
-            method: 'get',
-            path: config?.path,
             paramsTypes,
         });
     };
 }
 
-export { get };
+export { methodDecorator };

package/dist/src/feature/rest-controller/runRestControllers.js

@@ -0,0 +1,103 @@
+import { CustomError } from '../../core/error/CustomError.js';
+import { container } from '../../core/injection/index.js';
+import { Logger } from '../../core/logger/Logger.js';
+import '../../core/validation/metadata/ValidationMetadataStore.js';
+import { validate } from '../../core/validation/validate.js';
+import { ExpressProvider } from '../express/ExpressProvider.js';
+import { json, urlencoded } from 'express';
+import path__default from 'path';
+import { EXPRESS_REQ, EXPRESS_RES } from './injection-tokens.js';
+import { RestControllerMetadataStore } from './metadata/RestControllerMetadataStore.js';
+
+function buildRequest(req) {
+    return Object.assign({}, req.body, req.query, req.params);
+}
+function runRestControllers(controllers) {
+    const logger = new Logger('wabot:rest');
+    const metadataStore = container.resolve(RestControllerMetadataStore);
+    const expressProvider = container.resolve(ExpressProvider);
+    const expressApp = expressProvider.getExpress();
+    controllers.forEach((controller) => {
+        const endPoints = metadataStore.getControllerEndPointsInfo(controller);
+        endPoints.forEach((endPoint) => {
+            const method = endPoint.method;
+            const route = path__default
+                .join(endPoint.controller.path, endPoint.config?.path ?? '')
+                .replaceAll('\\', '/');
+            logger.info(`config ${endPoint.method.toUpperCase()} ${route}`);
+            const rawMiddlewares = [];
+            if (!endPoint.config?.disableJsonParser) {
+                rawMiddlewares.push(json());
+            }
+            if (!endPoint.config?.disableUrlEncodedParser) {
+                rawMiddlewares.push(urlencoded({ extended: true }));
+            }
+            expressApp[method](route, ...rawMiddlewares, async (req, res) => {
+                const requestContainer = container.createChildContainer();
+                requestContainer.register(EXPRESS_REQ, { useValue: req });
+                requestContainer.register(EXPRESS_RES, { useValue: req });
+                try {
+                    const middlewares = endPoint.middlewares.map((x) => requestContainer.resolve(x.middlewareConstructor));
+                    for (const middleware of middlewares) {
+                        await middleware.handle(req, res, requestContainer);
+                    }
+                    const controllerInstance = requestContainer.resolve(endPoint.controllerConstructor);
+                    const endPointArgs = [];
+                    let defaultArgFound = false;
+                    for (let paramIndex = 0; paramIndex < endPoint.paramsTypes.length; paramIndex++) {
+                        const paramType = endPoint.paramsTypes[paramIndex];
+                        if (defaultArgFound) {
+                            throw new Error(`Cant determine de parameter ${paramIndex} value`);
+                        }
+                        defaultArgFound = true;
+                        if (typeof paramType === 'function') {
+                            const { value, error } = validate(buildRequest(req), paramType);
+                            if (error) {
+                                throw new CustomError({ httpCode: 400, message: error.description, info: error });
+                            }
+                            endPointArgs.push(value);
+                        }
+                    }
+                    const response = await controllerInstance[endPoint.functionName].apply(controllerInstance, endPointArgs);
+                    res.status(200).json(response);
+                }
+                catch (err) {
+                    logger.error(err);
+                    if (err instanceof Error) {
+                        const keys = Object.keys(err).filter((key) => !['message', 'stack'].includes(key));
+                        const { httpCode, ...info } = keys.reduce((acc, key) => {
+                            acc[key] = err[key];
+                            return acc;
+                        }, {});
+                        res
+                            .status(httpCode ?? 500)
+                            .json(removeCircular({ error: { message: err.message, stack: err.stack, ...info } }));
+                    }
+                    else {
+                        res.status(500).json({ error: { message: 'Unknown error' } });
+                    }
+                }
+                finally {
+                    requestContainer.dispose();
+                }
+            });
+        });
+    });
+    expressProvider.listen();
+}
+function removeCircular(obj, seen = new WeakSet()) {
+    if (obj && typeof obj === 'object') {
+        if (seen.has(obj)) {
+            return undefined; // remove circular ref
+        }
+        seen.add(obj);
+        const clone = Array.isArray(obj) ? [] : {};
+        for (const key in obj) {
+            clone[key] = removeCircular(obj[key], seen);
+        }
+        return clone;
+    }
+    return obj;
+}
+
+export { runRestControllers };

package/dist/src/{channels → feature}/socket/SocketServerProvider.js

@@ -1,8 +1,8 @@
 import { __decorate, __metadata } from 'tslib';
-import { Logger } from '../../logger/Logger.js';
+import { singleton } from '../../core/injection/index.js';
+import { Logger } from '../../core/logger/Logger.js';
 import { HttpServerProvider } from '../http/HttpServerProvider.js';
 import { Server } from 'socket.io';
-import { singleton } from 'tsyringe';
 
 let SocketServerProvider = class SocketServerProvider {
     httpServerProvider;

package/dist/src/feature/socket-controller/metadata/@connectionMiddleware.js

@@ -0,0 +1,16 @@
+import { SocketControllerMetadataStore } from './SocketControllerMetadataStore.js';
+import { container } from '../../../core/injection/index.js';
+
+function connectionMiddleware(middlewareConstructor) {
+    return function (target, propertyKey) {
+        const functionName = propertyKey.toString();
+        const store = container.resolve(SocketControllerMetadataStore);
+        store.saveConnectionMiddlewareMetadata({
+            controllerConstructor: target.constructor,
+            functionName,
+            middlewareConstructor: middlewareConstructor,
+        });
+    };
+}
+
+export { connectionMiddleware };

package/dist/src/feature/socket-controller/metadata/@socketConnection.js

@@ -0,0 +1,18 @@
+import { container } from '../../../core/injection/index.js';
+import { SocketControllerMetadataStore } from './SocketControllerMetadataStore.js';
+
+function socketConnection(config) {
+    return function (target, propertyKey) {
+        const functionName = propertyKey.toString();
+        const paramsTypes = Reflect.getMetadata('design:paramtypes', target, functionName);
+        const store = container.resolve(SocketControllerMetadataStore);
+        store.saveSocketConnectionMetadata({
+            controllerConstructor: target.constructor,
+            config: typeof config === 'string' ? { namespace: config } : config,
+            functionName,
+            paramsTypes,
+        });
+    };
+}
+
+export { socketConnection };

package/dist/src/feature/socket-controller/metadata/@socketController.js

@@ -0,0 +1,15 @@
+import { SocketControllerMetadataStore } from './SocketControllerMetadataStore.js';
+import { container, injectable } from '../../../core/injection/index.js';
+
+function socketController(config) {
+    return function (target) {
+        const metaDataStore = container.resolve(SocketControllerMetadataStore);
+        metaDataStore.saveControllerMetadata({
+            controllerConstructor: target,
+            config: typeof config === 'string' ? { namespace: config } : config,
+        });
+        injectable()(target);
+    };
+}
+
+export { socketController };

package/dist/src/feature/socket-controller/metadata/@socketEvent.js

@@ -0,0 +1,18 @@
+import { container } from '../../../core/injection/index.js';
+import { SocketControllerMetadataStore } from './SocketControllerMetadataStore.js';
+
+function socketEvent(config) {
+    return function (target, propertyKey) {
+        const functionName = propertyKey.toString();
+        const paramsTypes = Reflect.getMetadata('design:paramtypes', target, functionName);
+        const store = container.resolve(SocketControllerMetadataStore);
+        store.saveSocketEventMetadata({
+            controllerConstructor: target.constructor,
+            config: typeof config === 'string' ? { event: config } : config,
+            functionName,
+            paramsTypes,
+        });
+    };
+}
+
+export { socketEvent };

package/dist/src/feature/socket-controller/metadata/SocketControllerMetadataStore.js

@@ -0,0 +1,65 @@
+import { __decorate } from 'tslib';
+import { singleton } from '../../../core/injection/index.js';
+
+let SocketControllerMetadataStore = class SocketControllerMetadataStore {
+    socketControllers = new Map();
+    socketConnections = new Map();
+    socketEvents = new Map();
+    connectionMiddlewares = new Map();
+    saveControllerMetadata(controllerMetadata) {
+        this.socketControllers.set(controllerMetadata.controllerConstructor, controllerMetadata);
+    }
+    saveSocketConnectionMetadata(socketConnectionMetadata) {
+        let controllerConnections = this.socketConnections.get(socketConnectionMetadata.controllerConstructor);
+        if (!controllerConnections) {
+            this.socketConnections.set(socketConnectionMetadata.controllerConstructor, (controllerConnections = new Map()));
+        }
+        controllerConnections.set(socketConnectionMetadata.functionName, socketConnectionMetadata);
+    }
+    saveSocketEventMetadata(socketEventMetadata) {
+        let controllerEvents = this.socketEvents.get(socketEventMetadata.controllerConstructor);
+        if (!controllerEvents) {
+            this.socketEvents.set(socketEventMetadata.controllerConstructor, (controllerEvents = new Map()));
+        }
+        controllerEvents.set(socketEventMetadata.functionName, socketEventMetadata);
+    }
+    saveConnectionMiddlewareMetadata(middlewareMetadata) {
+        let controllerMiddlewares = this.connectionMiddlewares.get(middlewareMetadata.controllerConstructor);
+        if (!controllerMiddlewares) {
+            this.connectionMiddlewares.set(middlewareMetadata.controllerConstructor, (controllerMiddlewares = new Map()));
+        }
+        let methodMiddlewares = controllerMiddlewares.get(middlewareMetadata.functionName);
+        if (!methodMiddlewares) {
+            controllerMiddlewares.set(middlewareMetadata.functionName, (methodMiddlewares = []));
+        }
+        methodMiddlewares.unshift(middlewareMetadata);
+    }
+    getControllerSockerConnectionsInfo(controllerConstructor) {
+        const controller = this.socketControllers.get(controllerConstructor);
+        if (!controller) {
+            throw new Error(`${controllerConstructor.name} should be decorated with @socketController`);
+        }
+        const connections = this.socketConnections.get(controllerConstructor);
+        const events = this.socketEvents.get(controllerConstructor) ?? new Map();
+        if (!connections?.size) {
+            // TODO: Warning
+            return [];
+        }
+        return [...connections.values()].map((connection) => ({
+            ...connection,
+            events: (() => {
+                const connectionNamespace = connection.config?.namespace;
+                return [...events.values()].filter((x) => x.config?.namespace === connectionNamespace);
+            })(),
+            connectionMiddlewares: this.connectionMiddlewares
+                .get(connection.controllerConstructor)
+                ?.get(connection.functionName) ?? [],
+            controller: this.socketControllers.get(connection.controllerConstructor),
+        }));
+    }
+};
+SocketControllerMetadataStore = __decorate([
+    singleton()
+], SocketControllerMetadataStore);
+
+export { SocketControllerMetadataStore };

package/dist/src/feature/socket-controller/runSocketControllers.js

@@ -0,0 +1,99 @@
+import { SocketControllerMetadataStore } from './metadata/SocketControllerMetadataStore.js';
+import { container } from '../../core/injection/index.js';
+import path__default from 'path';
+import { Logger } from '../../core/logger/Logger.js';
+import { SocketServerProvider } from '../socket/SocketServerProvider.js';
+import { CustomError } from '../../core/error/CustomError.js';
+import '../../core/validation/metadata/ValidationMetadataStore.js';
+import { validate } from '../../core/validation/validate.js';
+
+function runSocketControllers(controllers) {
+    const logger = new Logger('wabot:socket');
+    const metadataStore = container.resolve(SocketControllerMetadataStore);
+    const socketServerProvider = container.resolve(SocketServerProvider);
+    const socketServer = socketServerProvider.getSocketServer();
+    controllers.forEach((controller) => {
+        const connections = metadataStore.getControllerSockerConnectionsInfo(controller);
+        connections.forEach((connection) => {
+            const namespace = path__default
+                .join(connection.controller.config?.namespace ?? '/', connection.config?.namespace ?? '')
+                .replaceAll('\\', '/');
+            logger.info(`config connection to ${namespace}`);
+            const namespaceServer = socketServer.of(namespace);
+            namespaceServer.use(async (socket, next) => {
+                const connectionContainer = container.createChildContainer();
+                try {
+                    const middlewares = connection.connectionMiddlewares.map((x) => connectionContainer.resolve(x.middlewareConstructor));
+                    for (const middleware of middlewares) {
+                        await middleware.handle(socket, connectionContainer);
+                    }
+                    socket.data.connectionContainer = connectionContainer;
+                    next();
+                }
+                catch (err) {
+                    next(err);
+                    connectionContainer.dispose();
+                }
+            });
+            namespaceServer.on('connection', async (socket) => {
+                logger.trace(`connection on '${namespace}'`);
+                const connectionContainer = socket.data.connectionContainer;
+                try {
+                    const controllerInstance = connectionContainer.resolve(connection.controllerConstructor);
+                    connection.events.forEach((event) => {
+                        logger.trace(`config listener to '${event.config.event}' event on '${namespace}'`);
+                        socket.on(event.config.event, async (req, callback) => {
+                            logger.trace(`received '${event.config.event}' event on '${namespace}'`);
+                            try {
+                                const reqType = event.paramsTypes[0];
+                                if (typeof reqType !== 'function') {
+                                    throw new CustomError({
+                                        httpCode: 400,
+                                        message: 'Unable to validate request',
+                                    });
+                                }
+                                const { value, error } = validate(req, reqType);
+                                if (error) {
+                                    throw new CustomError({
+                                        httpCode: 400,
+                                        message: error.description,
+                                        info: error,
+                                    });
+                                }
+                                const out = await controllerInstance[event.functionName].apply(controllerInstance, [value, socket]);
+                                callback(out);
+                            }
+                            catch (err) {
+                                logger.error(err);
+                                if (err instanceof Error) {
+                                    const keys = Object.keys(err).filter((key) => !['message', 'stack'].includes(key));
+                                    const { httpCode, ...info } = keys.reduce((acc, key) => {
+                                        acc[key] = err[key];
+                                        return acc;
+                                    }, {});
+                                    if (typeof callback === 'function') {
+                                        callback({ error: { ...info, message: err.message, stack: err.stack } });
+                                    }
+                                }
+                                else {
+                                    if (typeof callback === 'function') {
+                                        callback({ error: { message: 'Unspected error' } });
+                                    }
+                                }
+                            }
+                        });
+                    });
+                    await controllerInstance[connection.functionName].apply(controllerInstance, [socket]);
+                }
+                catch (err) {
+                    logger.error(err);
+                    socket.disconnect();
+                    connectionContainer.dispose();
+                }
+            });
+        });
+    });
+    socketServerProvider.listen();
+}
+
+export { runSocketControllers };