@wabot-dev/framework 0.1.0-beta.36 → 0.1.0-beta.38

package/dist/src/addon/chat-controller/whatsapp/WhatsAppReceiverByWebHook.js

@@ -2,6 +2,7 @@ import { __decorate, __metadata } from 'tslib';
 import { Logger } from '../../../core/logger/Logger.js';
 import { WhatsAppReceiver } from './WhatsAppReceiver.js';
 import { ExpressProvider } from '../../../feature/express/ExpressProvider.js';
+import { json } from 'express';
 import { WhatsAppRepository } from './WhatsAppRepository.js';
 import { singleton } from '../../../core/injection/index.js';
 
@@ -17,7 +18,7 @@ let WhatsAppReceiverByWebHook = class WhatsAppReceiverByWebHook extends WhatsApp
         this.expressApp = this.expressProvider.getExpress();
     }
     async connect() {
-        this.expressApp.get(this.webhookPath, async (req, res) => {
+        this.expressApp.get(this.webhookPath, json(), async (req, res) => {
             try {
                 let mode = req.query['hub.mode'];
                 let token = req.query['hub.verify_token'];
@@ -39,7 +40,7 @@ let WhatsAppReceiverByWebHook = class WhatsAppReceiverByWebHook extends WhatsApp
                 return;
             }
         });
-        this.expressApp.post(this.webhookPath, (req, res) => {
+        this.expressApp.post(this.webhookPath, json(), (req, res) => {
             const payload = req.body;
             this.handlePayload(payload);
             res.sendStatus(200);

package/dist/src/addon/rest-controller/jwt/@jwtGuard.js

@@ -1,10 +1,11 @@
 import '../../../core/injection/index.js';
 import '../../../feature/rest-controller/metadata/RestControllerMetadataStore.js';
 import { middleware } from '../../../feature/rest-controller/metadata/@middleware.js';
-import 'path';
 import 'debug';
-import '../../../feature/express/ExpressProvider.js';
 import '../../../core/validation/metadata/ValidationMetadataStore.js';
+import '../../../feature/express/ExpressProvider.js';
+import 'express';
+import 'path';
 import '../../../feature/rest-controller/auth/Auth.js';
 import { JwtGuardMiddleware } from './JwtGuardMiddleware.js';
 

package/dist/src/addon/rest-controller/jwt/Jwt.js

@@ -4,10 +4,11 @@ import { JwtRefreshTokenRepository } from './JwtRefreshTokenRepository.js';
 import { JwtRefreshToken } from './JwtRefreshToken.js';
 import { injectable } from '../../../core/injection/index.js';
 import '../../../feature/rest-controller/metadata/RestControllerMetadataStore.js';
-import 'path';
 import 'debug';
-import '../../../feature/express/ExpressProvider.js';
 import '../../../core/validation/metadata/ValidationMetadataStore.js';
+import '../../../feature/express/ExpressProvider.js';
+import 'express';
+import 'path';
 import { Auth } from '../../../feature/rest-controller/auth/Auth.js';
 
 let Jwt = class Jwt {

package/dist/src/addon/rest-controller/jwt/JwtGuardMiddleware.js

@@ -2,10 +2,11 @@ import { __decorate, __metadata } from 'tslib';
 import { CustomError } from '../../../core/error/CustomError.js';
 import { injectable } from '../../../core/injection/index.js';
 import '../../../feature/rest-controller/metadata/RestControllerMetadataStore.js';
-import 'path';
 import 'debug';
-import '../../../feature/express/ExpressProvider.js';
 import '../../../core/validation/metadata/ValidationMetadataStore.js';
+import '../../../feature/express/ExpressProvider.js';
+import 'express';
+import 'path';
 import { Auth } from '../../../feature/rest-controller/auth/Auth.js';
 import jwt from 'jsonwebtoken';
 import { JwtConfig } from './JwtConfig.js';

package/dist/src/feature/express/ExpressProvider.js

@@ -1,7 +1,6 @@
 import { __decorate, __metadata } from 'tslib';
 import { HttpServerProvider } from '../http/HttpServerProvider.js';
 import express from 'express';
-import bodyParser from 'body-parser';
 import { Logger } from '../../core/logger/Logger.js';
 import { singleton } from '../../core/injection/index.js';
 
@@ -23,7 +22,6 @@ let ExpressProvider = class ExpressProvider {
     }
     createExpress() {
         const expressApp = express();
-        expressApp.use(bodyParser.json());
         expressApp.use((req, res, next) => {
             const start = process.hrtime();
             res.on('finish', () => {

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/feature/rest-controller/metadata/@get.js

@@ -8,9 +8,9 @@ function get(config) {
         const store = container.resolve(RestControllerMetadataStore);
         store.saveEndPointMetadata({
             controllerConstructor: target.constructor,
-            functionName,
             method: 'get',
-            path: typeof config === 'string' ? config : config?.path,
+            config: typeof config === 'string' ? { path: config } : config,
+            functionName,
             paramsTypes,
         });
     };

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

@@ -8,9 +8,9 @@ function post(config) {
         const store = container.resolve(RestControllerMetadataStore);
         store.saveEndPointMetadata({
             controllerConstructor: target.constructor,
-            functionName,
             method: 'post',
-            path: typeof config === 'string' ? config : config?.path,
+            config: typeof config === 'string' ? { path: config } : config,
+            functionName,
             paramsTypes,
         });
     };

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

@@ -1,11 +1,13 @@
-import path from 'path';
+import { CustomError } from '../../core/error/CustomError.js';
 import { container } from '../../core/injection/index.js';
-import { RestControllerMetadataStore } from './metadata/RestControllerMetadataStore.js';
 import { Logger } from '../../core/logger/Logger.js';
-import { ExpressProvider } from '../express/ExpressProvider.js';
 import '../../core/validation/metadata/ValidationMetadataStore.js';
 import { validate } from '../../core/validation/validate.js';
-import { CustomError } from '../../core/error/CustomError.js';
+import { ExpressProvider } from '../express/ExpressProvider.js';
+import { json, urlencoded } from 'express';
+import path 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);
@@ -19,10 +21,21 @@ function runRestControllers(controllers) {
         const endPoints = metadataStore.getControllerEndPointsInfo(controller);
         endPoints.forEach((endPoint) => {
             const method = endPoint.method;
-            const route = path.join(endPoint.controller.path, endPoint.path ?? '').replaceAll('\\', '/');
+            const route = path
+                .join(endPoint.controller.path, endPoint.config?.path ?? '')
+                .replaceAll('\\', '/');
             logger.info(`config ${endPoint.method.toUpperCase()} ${route}`);
-            expressApp[method](route, async (req, res) => {
+            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) {

package/dist/src/index.d.ts

@@ -670,11 +670,13 @@ declare class ExpressProvider {
     private createExpress;
 }
 
-interface IGetConfig {
+interface IEndPointConfig {
     path?: string;
+    disableJsonParser?: boolean;
+    disableUrlEncodedParser?: boolean;
 }
 
-declare function get(config?: string | IGetConfig): (target: object, propertyKey: string | symbol) => void;
+declare function get(config?: string | IEndPointConfig): (target: object, propertyKey: string | symbol) => void;
 
 interface IMiddleware {
     handle(req: Request, res: Response, container: DependencyContainer$1): Promise<void>;
@@ -682,11 +684,7 @@ interface IMiddleware {
 
 declare function middleware(middlewareConstructor: IConstructor<IMiddleware>): (target: object, propertyKey: string | symbol) => void;
 
-interface IPostConfig {
-    path?: string;
-}
-
-declare function post(config?: string | IPostConfig): (target: object, propertyKey: string | symbol) => void;
+declare function post(config?: string | IEndPointConfig): (target: object, propertyKey: string | symbol) => void;
 
 interface IRestControllerConfig {
     path: string;
@@ -696,7 +694,7 @@ declare function restController(config: string | IRestControllerConfig): (target
 
 interface IEndPointMetadata {
     method: 'get' | 'post';
-    path?: string;
+    config?: IEndPointConfig;
     controllerConstructor: IConstructor<any>;
     functionName: string;
     paramsTypes: any[];
@@ -724,7 +722,7 @@ declare class RestControllerMetadataStore {
         middlewares: IMiddlewareMetadata[];
         controller: IRestControllerMetadata;
         method: "get" | "post";
-        path?: string;
+        config?: IEndPointConfig;
         controllerConstructor: IConstructor<any>;
         functionName: string;
         paramsTypes: any[];
@@ -739,6 +737,9 @@ declare class Auth<D extends IStorableData> {
     assign(authInfo: D): void;
 }
 
+declare const EXPRESS_REQ = "EXPRESS_REQ";
+declare const EXPRESS_RES = "EXPRESS_RES";
+
 declare class SocketServerProvider {
     private httpServerProvider;
     private socketServer;
@@ -1305,4 +1306,4 @@ interface IValidateMaxOptions {
 }
 declare function validateMax(value: any, options: IValidateMaxOptions): IValidationResult<any>;
 
-export { Async, Auth, Chat, ChatAdapter, ChatBot, ChatBotMetadataStore, ChatItem, ChatMemory, ChatRepository, ChatResolver, ClaudeChatAdapter, CmdChannel, Command, CommandMetadataStore, Container, ControllerMetadataStore, CustomError, DeepSeekChatAdapter, Entity, Env, EnvWhatsAppRepository, ExpressProvider, GeminiChatAdapter, HtmlModule, HttpServerProvider, type IArrayValidationError, type IArrayValidationResult, type IBotMessageItem, type IChannelMessage, type IChannelMetadata, type IChatAdapter, type IChatAdapterNextItemReq, type IChatAdapterNextItemRes, type IChatBot, type IChatBotMetadata, type IChatChannel, type IChatConnection, type IChatControllerMetadata, type IChatData, type IChatItem, type IChatItemData, type IChatItemType, type IChatMemory, type IChatMessage, type IChatRepository, type IChatType, type ICommandConfig, type ICommandHandler, type ICommandHandlerConfig, type IConstructor, type ICrudRepository, type ICustomErrorData, type IEndPointMetadata, type IEntityData, type IEnvType, type IFunctionCall, type IFunctionCallItem, type IGetConfig, type IGetWhatsAppTemplateRequest, type IHtmlModuleOptions, type IHumanMessageItem, type IJobData, type IJobEvent, type IJobEventListener, type IJobRepository, type IJwtRefreshTokenData, type ILanguageModelUsage, type IListenWhatsAppMessageRequest, type IMessageContext, type IMessageMetadata, type IMiddleware, type IMiddlewareMetadata, type IMindset, type IMindsetDecoration, type IMindsetFunctionConfig, type IMindsetFunctionDecoration, type IMindsetFunctionMetadata, type IMindsetFunctionParamMetadata, type IMindsetIdentity, type IMindsetMetadata, type IMindsetModuleConfig, type IMindsetModuleDecoration, type IMindsetModuleMetadata, type IMindsetTool, type IMindsetToolParameter, type IModelValidationError, type IModelValidationResult, type IModelValidatorsInfo, type IParamConfig, type IParamDecoration, type IPersistentData, type IPgRepositoryConfig, type IPostConfig, type IPrimitive, type IPropertyValidatorInfo, type IReceivedMessage, type IRestControllerConfig, type IRestControllerMetadata, type ISendWhatsAppRequest, type ISendWhatsAppTemplateRequest, type ISocketChannelConfig, type ISocketChannelReceivedMessage, type IStorableData, type ITelegramChannelConfig, type IValidateArrayOptions, type IValidateArrayOptionsWithItemsValidators, type IValidateMaxOptions, type IValidateMinOptions, type IValidationError, type IValidationResult, type IValidator, type IValidatorMetadata, type IWhatsAppBusinessAccount, type IWhatsAppBusinessNumber, type IWhatsAppContact, type IWhatsAppData, type IWhatsAppMessage, type IWhatsAppMessageListener, type IWhatsAppRepository, type IWhatsAppSenderOptions, type IWhatsAppTemplate, type IWhatsAppTemplateComponent, type IWhatsAppTemplateMessage, type IWhatsAppTemplateParameter, type IWhatsAppTemplateResponse, type IWhatsAppWebhookPayload, type IWhatsappChannelConfig, type IchatControllerConfig, Job, JobRepository, JobRunner, JobsEventsHub, Jwt, JwtAccessAndRefreshTokenDto, JwtConfig, JwtGuardMiddleware, JwtRefreshToken, JwtRefreshTokenRepository, JwtSigner, JwtTokenDto, Lifecycle, Logger, MINDSET_DECORATION_MINDSET, MINDSET_FUNCTION_DECORATION_FUNCTION, MINDSET_MODULE_DECORATION_MODULE, Mapper, Mindset, MindsetMetadataStore, MindsetOperator, OpenaiChatAdapter, PARAM_DECORATION_IS_OPTIONAL, PARAM_DECORATION_PARAM, Persistent, PgChatMemory, PgChatRepository, PgCrudRepository, PgJobRepository, PgRepositoryBase, PgWhatsAppRepository, RamChatMemory, RamChatRepository, Random, RestControllerMetadataStore, SocketChannel, SocketChannelConfig, SocketServerProvider, Storable, TelegramChannel, TelegramChannelConfig, ValidationMetadataStore, WhatsApp, WhatsAppChannel, WhatsAppReceiver, WhatsAppReceiverByDevConnection, WhatsAppReceiverByWebHook, WhatsAppRepository, WhatsAppSender, WhatsAppSenderByCloudApi, WhatsAppSenderByDevConnection, WhatsappChannelConfig, chatBot, chatController, chatItemTypeOptions, cmd, command, commandHandler, container, get, inject, injectable, isArray, isBoolean, isDate, isModel, isNotEmpty, isNumber, isOptional, isPresent, isString, jwtGuard, max, middleware, min, mindset, mindsetFunction, mindsetModule, modelInfo, param, post, restController, runAsyncCommandHandlers, runChatControllers, runRestControllers, scoped, singleton, socket, telegram, validate, validateArray, validateIsBoolean, validateIsDate, validateIsNotEmpty, validateIsNumber, validateIsPresent, validateIsString, validateMax, validateMin, validateModel, whatsapp };
+export { Async, Auth, Chat, ChatAdapter, ChatBot, ChatBotMetadataStore, ChatItem, ChatMemory, ChatRepository, ChatResolver, ClaudeChatAdapter, CmdChannel, Command, CommandMetadataStore, Container, ControllerMetadataStore, CustomError, DeepSeekChatAdapter, EXPRESS_REQ, EXPRESS_RES, Entity, Env, EnvWhatsAppRepository, ExpressProvider, GeminiChatAdapter, HtmlModule, HttpServerProvider, type IArrayValidationError, type IArrayValidationResult, type IBotMessageItem, type IChannelMessage, type IChannelMetadata, type IChatAdapter, type IChatAdapterNextItemReq, type IChatAdapterNextItemRes, type IChatBot, type IChatBotMetadata, type IChatChannel, type IChatConnection, type IChatControllerMetadata, type IChatData, type IChatItem, type IChatItemData, type IChatItemType, type IChatMemory, type IChatMessage, type IChatRepository, type IChatType, type ICommandConfig, type ICommandHandler, type ICommandHandlerConfig, type IConstructor, type ICrudRepository, type ICustomErrorData, type IEndPointConfig, type IEndPointMetadata, type IEntityData, type IEnvType, type IFunctionCall, type IFunctionCallItem, type IGetWhatsAppTemplateRequest, type IHtmlModuleOptions, type IHumanMessageItem, type IJobData, type IJobEvent, type IJobEventListener, type IJobRepository, type IJwtRefreshTokenData, type ILanguageModelUsage, type IListenWhatsAppMessageRequest, type IMessageContext, type IMessageMetadata, type IMiddleware, type IMiddlewareMetadata, type IMindset, type IMindsetDecoration, type IMindsetFunctionConfig, type IMindsetFunctionDecoration, type IMindsetFunctionMetadata, type IMindsetFunctionParamMetadata, type IMindsetIdentity, type IMindsetMetadata, type IMindsetModuleConfig, type IMindsetModuleDecoration, type IMindsetModuleMetadata, type IMindsetTool, type IMindsetToolParameter, type IModelValidationError, type IModelValidationResult, type IModelValidatorsInfo, type IParamConfig, type IParamDecoration, type IPersistentData, type IPgRepositoryConfig, type IPrimitive, type IPropertyValidatorInfo, type IReceivedMessage, type IRestControllerConfig, type IRestControllerMetadata, type ISendWhatsAppRequest, type ISendWhatsAppTemplateRequest, type ISocketChannelConfig, type ISocketChannelReceivedMessage, type IStorableData, type ITelegramChannelConfig, type IValidateArrayOptions, type IValidateArrayOptionsWithItemsValidators, type IValidateMaxOptions, type IValidateMinOptions, type IValidationError, type IValidationResult, type IValidator, type IValidatorMetadata, type IWhatsAppBusinessAccount, type IWhatsAppBusinessNumber, type IWhatsAppContact, type IWhatsAppData, type IWhatsAppMessage, type IWhatsAppMessageListener, type IWhatsAppRepository, type IWhatsAppSenderOptions, type IWhatsAppTemplate, type IWhatsAppTemplateComponent, type IWhatsAppTemplateMessage, type IWhatsAppTemplateParameter, type IWhatsAppTemplateResponse, type IWhatsAppWebhookPayload, type IWhatsappChannelConfig, type IchatControllerConfig, Job, JobRepository, JobRunner, JobsEventsHub, Jwt, JwtAccessAndRefreshTokenDto, JwtConfig, JwtGuardMiddleware, JwtRefreshToken, JwtRefreshTokenRepository, JwtSigner, JwtTokenDto, Lifecycle, Logger, MINDSET_DECORATION_MINDSET, MINDSET_FUNCTION_DECORATION_FUNCTION, MINDSET_MODULE_DECORATION_MODULE, Mapper, Mindset, MindsetMetadataStore, MindsetOperator, OpenaiChatAdapter, PARAM_DECORATION_IS_OPTIONAL, PARAM_DECORATION_PARAM, Persistent, PgChatMemory, PgChatRepository, PgCrudRepository, PgJobRepository, PgRepositoryBase, PgWhatsAppRepository, RamChatMemory, RamChatRepository, Random, RestControllerMetadataStore, SocketChannel, SocketChannelConfig, SocketServerProvider, Storable, TelegramChannel, TelegramChannelConfig, ValidationMetadataStore, WhatsApp, WhatsAppChannel, WhatsAppReceiver, WhatsAppReceiverByDevConnection, WhatsAppReceiverByWebHook, WhatsAppRepository, WhatsAppSender, WhatsAppSenderByCloudApi, WhatsAppSenderByDevConnection, WhatsappChannelConfig, chatBot, chatController, chatItemTypeOptions, cmd, command, commandHandler, container, get, inject, injectable, isArray, isBoolean, isDate, isModel, isNotEmpty, isNumber, isOptional, isPresent, isString, jwtGuard, max, middleware, min, mindset, mindsetFunction, mindsetModule, modelInfo, param, post, restController, runAsyncCommandHandlers, runChatControllers, runRestControllers, scoped, singleton, socket, telegram, validate, validateArray, validateIsBoolean, validateIsDate, validateIsNotEmpty, validateIsNumber, validateIsPresent, validateIsString, validateMax, validateMin, validateModel, whatsapp };

package/dist/src/index.js

@@ -57,6 +57,7 @@ export { restController } from './feature/rest-controller/metadata/@restControll
 export { RestControllerMetadataStore } from './feature/rest-controller/metadata/RestControllerMetadataStore.js';
 export { runRestControllers } from './feature/rest-controller/runRestControllers.js';
 export { Auth } from './feature/rest-controller/auth/Auth.js';
+export { EXPRESS_REQ, EXPRESS_RES } from './feature/rest-controller/injection-tokens.js';
 export { SocketServerProvider } from './feature/socket/SocketServerProvider.js';
 export { PgJobRepository } from './addon/async/pg/PgJobRepository.js';
 export { ClaudeChatAdapter } from './addon/chat-bot/claude/ClaudeChatAdapter.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wabot-dev/framework",
-  "version": "0.1.0-beta.36",
+  "version": "0.1.0-beta.38",
   "description": "Framework for IA Chat Bots",
   "type": "module",
   "main": "dist/src/index.js",