@wabot-dev/framework 0.1.0-beta.10 → 0.1.0-beta.11

package/dist/src/channels/whatsapp/WhatsAppSender.js

@@ -22,6 +22,7 @@ class WhatsAppSender {
         }
         catch (error) {
             this.logger.error(`Error sending WhatsApp message: ${error}`);
+            throw new Error(`Error sending WhatsApp message: ${error}`, { cause: error });
         }
     }
     async sendWhatsAppTemplate(request, options) {
@@ -34,6 +35,7 @@ class WhatsAppSender {
         }
         catch (error) {
             this.logger.error(`Error sending WhatsApp message: ${error}`);
+            throw new Error(`Error sending WhatsApp message: ${error}`, { cause: error });
         }
     }
     async getWhatsAppTemplate(request) {

package/dist/src/error/CustomError.js

@@ -0,0 +1,13 @@
+class CustomError extends Error {
+    humanMessage;
+    code;
+    httpCode;
+    constructor(data) {
+        super(data.message, { cause: data.cause });
+        this.humanMessage = data.humanMessage;
+        this.code = data.code;
+        this.httpCode = data.httpCode;
+    }
+}
+
+export { CustomError };

package/dist/src/index.d.ts

@@ -1046,8 +1046,6 @@ declare function max(limit: any): (target: object, propertyKey: string | symbol)
 
 declare function min(limit: any): (target: object, propertyKey: string | symbol) => void;
 
-declare function validable<A>(): (target: IConstructor<A>) => void;
-
 interface IValidationError {
     description: string;
 }
@@ -1119,6 +1117,6 @@ declare function validateIsPresent(value: any): IValidationResult<any>;
 
 declare function validateModel<V>(value: any, info: IModelValidatorsInfo<V>): IModelValidationResult<V>;
 
-declare function validateModel2<V>(value: any, modelConstructor: IConstructor<V>): IModelValidationResult<V>;
+declare function validate<V>(value: any, modelConstructor: IConstructor<V>): IModelValidationResult<V>;
 
-export { AuthenticationModule, Chat, ChatBot, ChatBotAdapter, ChatBotMetadataStore, ChatItem, ChatMemory, ChatRepository, ChatResolver, CmdChannel, Container, ControllerMetadataStore, DeepSeekChatBotAdapter, EmailService, EnvWhatsAppRepository, ExpressProvider, HtmlModule, HttpServerProvider, type IChannelMetadata, type IChatBot, type IChatBotAdapter, type IChatBotMetadata, type IChatChannel, type IChatConnection, type IChatControllerMetadata, type IChatData, type IChatFunctionCall, type IChatItemData, type IChatItemType, type IChatMemory, type IChatMessage, type IChatRepository, type IChatType, type IConnectionChatMessage, type IConstructor, type ICrudRepository, type IEmailService, type IEndPointMetadata, type IGetConfig, type IGetWhatsAppTemplateRequest, type IHtmlModuleOptions, type IListenWhatsAppMessageRequest, type IMessageContext, type IMessageMetadata, type IMindset, type IMindsetDecoration, type IMindsetFunctionConfig, type IMindsetFunctionDecoration, type IMindsetFunctionMetadata, type IMindsetFunctionParamMetadata, type IMindsetIdentity, type IMindsetMetadata, type IMindsetModuleConfig, type IMindsetModuleDecoration, type IMindsetModuleMetadata, type IModelValidationError, type IModelValidationResult, type IModelValidatorsInfo, type IOtpService, type IParamConfig, type IParamDecoration, type IPersistentData, type IPgRepositoryConfig, type IPostConfig, type IPropertyValidatorInfo, type IReceivedMessage, type IReceivedMessageItem, type IRestControllerConfig, type IRestControllerMetadata, type IReversibleMapper, type ISendEmailRequest, type ISendWhatsAppRequest, type ISendWhatsAppTemplateRequest, type IServerConfig, type IServerProvider, type ISocketChannelConfig, type ISocketChannelReceivedMessage, type ISystemFunctionCallItem, type ISystemMessageItem, type ITelegramChannelConfig, type IUserConnection, type IUserData, type IUserRepository, type IValidateMaxOptions, type IValidateMinOptions, type IValidationError, type IValidationResult, type IValidator, type IValidatorMetadata, type IWabotEnvType, type IWhatsAppBusinessAccount, type IWhatsAppBusinessNumber, type IWhatsAppContact, type IWhatsAppData, type IWhatsAppMessage, type IWhatsAppMessageListener, type IWhatsAppRepository, type IWhatsAppSenderOptions, type IWhatsAppTemplateMessage, type IWhatsAppTemplateParameter, type IWhatsAppWebhookPayload, type IWhatsappChannelConfig, type IchatControllerConfig, type IrunChannelProps, Logger, MINDSET_DECORATION_MINDSET, MINDSET_FUNCTION_DECORATION_FUNCTION, MINDSET_MODULE_DECORATION_MODULE, MessageContext, Mindset, MindsetMetadataStore, MindsetOperator, OpenaiChatBotAdapter, OtpService, PARAM_DECORATION_IS_OPTIONAL, PARAM_DECORATION_PARAM, Persistent, PgChatMemory, PgChatRepository, PgCrudRepository, PgRepositoryBase, PgUserRepository, PgWhatsAppRepository, RamChatMemory, RamChatRepository, RamUserRepository, RegisterUserModule, RegisterUserWithEmailRequest, RestControllerMetadataStore, SendOneTimePasswordRequest, SocketChannel, SocketChannelConfig, SocketServerProvider, TelegramChannel, TelegramChannelConfig, User, UserRepository, UserResolver, ValidateOneTimePasswordRequest, ValidationMetadataStore, WabotEnv, WhatsApp, WhatsAppChannel, WhatsAppReceiver, WhatsAppReceiverByDevConnection, WhatsAppReceiverByWebHook, WhatsAppRepository, WhatsAppSender, WhatsAppSenderByCloudApi, WhatsAppSenderByDevConnection, WhatsappChannelConfig, chatBot, chatController, cmd, container, get, inject, injectable, isBoolean, isDate, isNotEmpty, isNumber, isOptional, isPresent, isString, max, min, mindset, mindsetFunction, mindsetModule, param, post, prepareChatContainer, restController, runChannel, runRestControllers, runServer, singleton, socket, telegram, validable, validateIsBoolean, validateIsDate, validateIsNotEmpty, validateIsNumber, validateIsPresent, validateIsString, validateMax, validateMin, validateModel, validateModel2, whatsapp };
+export { AuthenticationModule, Chat, ChatBot, ChatBotAdapter, ChatBotMetadataStore, ChatItem, ChatMemory, ChatRepository, ChatResolver, CmdChannel, Container, ControllerMetadataStore, DeepSeekChatBotAdapter, EmailService, EnvWhatsAppRepository, ExpressProvider, HtmlModule, HttpServerProvider, type IChannelMetadata, type IChatBot, type IChatBotAdapter, type IChatBotMetadata, type IChatChannel, type IChatConnection, type IChatControllerMetadata, type IChatData, type IChatFunctionCall, type IChatItemData, type IChatItemType, type IChatMemory, type IChatMessage, type IChatRepository, type IChatType, type IConnectionChatMessage, type IConstructor, type ICrudRepository, type IEmailService, type IEndPointMetadata, type IGetConfig, type IGetWhatsAppTemplateRequest, type IHtmlModuleOptions, type IListenWhatsAppMessageRequest, type IMessageContext, type IMessageMetadata, type IMindset, type IMindsetDecoration, type IMindsetFunctionConfig, type IMindsetFunctionDecoration, type IMindsetFunctionMetadata, type IMindsetFunctionParamMetadata, type IMindsetIdentity, type IMindsetMetadata, type IMindsetModuleConfig, type IMindsetModuleDecoration, type IMindsetModuleMetadata, type IModelValidationError, type IModelValidationResult, type IModelValidatorsInfo, type IOtpService, type IParamConfig, type IParamDecoration, type IPersistentData, type IPgRepositoryConfig, type IPostConfig, type IPropertyValidatorInfo, type IReceivedMessage, type IReceivedMessageItem, type IRestControllerConfig, type IRestControllerMetadata, type IReversibleMapper, type ISendEmailRequest, type ISendWhatsAppRequest, type ISendWhatsAppTemplateRequest, type IServerConfig, type IServerProvider, type ISocketChannelConfig, type ISocketChannelReceivedMessage, type ISystemFunctionCallItem, type ISystemMessageItem, type ITelegramChannelConfig, type IUserConnection, type IUserData, type IUserRepository, type IValidateMaxOptions, type IValidateMinOptions, type IValidationError, type IValidationResult, type IValidator, type IValidatorMetadata, type IWabotEnvType, type IWhatsAppBusinessAccount, type IWhatsAppBusinessNumber, type IWhatsAppContact, type IWhatsAppData, type IWhatsAppMessage, type IWhatsAppMessageListener, type IWhatsAppRepository, type IWhatsAppSenderOptions, type IWhatsAppTemplateMessage, type IWhatsAppTemplateParameter, type IWhatsAppWebhookPayload, type IWhatsappChannelConfig, type IchatControllerConfig, type IrunChannelProps, Logger, MINDSET_DECORATION_MINDSET, MINDSET_FUNCTION_DECORATION_FUNCTION, MINDSET_MODULE_DECORATION_MODULE, MessageContext, Mindset, MindsetMetadataStore, MindsetOperator, OpenaiChatBotAdapter, OtpService, PARAM_DECORATION_IS_OPTIONAL, PARAM_DECORATION_PARAM, Persistent, PgChatMemory, PgChatRepository, PgCrudRepository, PgRepositoryBase, PgUserRepository, PgWhatsAppRepository, RamChatMemory, RamChatRepository, RamUserRepository, RegisterUserModule, RegisterUserWithEmailRequest, RestControllerMetadataStore, SendOneTimePasswordRequest, SocketChannel, SocketChannelConfig, SocketServerProvider, TelegramChannel, TelegramChannelConfig, User, UserRepository, UserResolver, ValidateOneTimePasswordRequest, ValidationMetadataStore, WabotEnv, WhatsApp, WhatsAppChannel, WhatsAppReceiver, WhatsAppReceiverByDevConnection, WhatsAppReceiverByWebHook, WhatsAppRepository, WhatsAppSender, WhatsAppSenderByCloudApi, WhatsAppSenderByDevConnection, WhatsappChannelConfig, chatBot, chatController, cmd, container, get, inject, injectable, isBoolean, isDate, isNotEmpty, isNumber, isOptional, isPresent, isString, max, min, mindset, mindsetFunction, mindsetModule, param, post, prepareChatContainer, restController, runChannel, runRestControllers, runServer, singleton, socket, telegram, validate, validateIsBoolean, validateIsDate, validateIsNotEmpty, validateIsNumber, validateIsPresent, validateIsString, validateMax, validateMin, validateModel, whatsapp };

package/dist/src/index.js

@@ -87,7 +87,6 @@ export { isPresent } from './validation/metadata/@isPresent.js';
 export { isString } from './validation/metadata/@isString.js';
 export { max } from './validation/metadata/@max.js';
 export { min } from './validation/metadata/@min.js';
-export { validable } from './validation/metadata/@validable.js';
 export { ValidationMetadataStore } from './validation/metadata/ValidationMetadataStore.js';
 export { validateIsBoolean } from './validation/validators/validateIsBoolean.js';
 export { validateIsDate } from './validation/validators/validateIsDate.js';
@@ -98,5 +97,5 @@ export { validateMax } from './validation/validators/validateMax.js';
 export { validateMin } from './validation/validators/validateMin.js';
 export { validateIsPresent } from './validation/validators/validateIsPresent.js';
 export { validateModel } from './validation/validators/validateModel.js';
-export { validateModel2 } from './validation/validateModel2.js';
+export { validate } from './validation/validate.js';
 export { Container } from './injection/Container.js';

package/dist/src/repository/pg/PgCrudRepository.js

@@ -1,5 +1,6 @@
 import * as shortUUID from 'short-uuid';
 import { PgRepositoryBase } from './PgRepositoryBase.js';
+import { CustomError } from '../../error/CustomError.js';
 
 class PgCrudRepository extends PgRepositoryBase {
     config;
@@ -20,7 +21,10 @@ class PgCrudRepository extends PgRepositoryBase {
     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;
     }

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

@@ -1,7 +1,6 @@
-import '../injection/index.js';
-import { RestControllerMetadataStore } from './metadata/RestControllerMetadataStore.js';
 import '../controller/channel/ChatResolver.js';
 import '../controller/channel/UserResolver.js';
+import '../injection/index.js';
 import '../controller/metadata/ControllerMetadataStore.js';
 import '../channels/cmd/CmdChannel.js';
 import { ExpressProvider } from '../channels/express/ExpressProvider.js';
@@ -19,8 +18,11 @@ import '../channels/whatsapp/WhatsAppSenderByDevConnection.js';
 import '../channels/whatsapp/WhatsAppSenderByCloudApi.js';
 import '../channels/whatsapp/PgWhatsAppRepository.js';
 import '../channels/whatsapp/EnvWhatsAppRepository.js';
-import path from 'path';
 import { Logger } from '../logger/Logger.js';
+import '../validation/metadata/ValidationMetadataStore.js';
+import { validate } from '../validation/validate.js';
+import path from 'path';
+import { RestControllerMetadataStore } from './metadata/RestControllerMetadataStore.js';
 
 function buildRequest(req) {
     return Object.assign({}, req.body, req.query, req.params);
@@ -47,9 +49,8 @@ function runRestControllers(controllers, container) {
                         throw new Error(`Cant determine de parameter ${paramIndex} value`);
                     }
                     defaultArgFound = true;
-                    if (typeof paramType === 'function' && typeof paramType.__validate__ === 'function') {
-                        const { value, error } = paramType.__validate__(buildRequest(req));
-                        debugger;
+                    if (typeof paramType === 'function') {
+                        const { value, error } = validate(buildRequest(req), paramType);
                         if (error) {
                             res.status(400).json({ error });
                             return;
@@ -62,7 +63,17 @@ function runRestControllers(controllers, container) {
                     res.status(200).json(response);
                 }
                 catch (err) {
-                    res.sendStatus(500);
+                    if (err instanceof Error) {
+                        const keys = Object.keys(err).filter((key) => !['message', 'stack'].includes(key));
+                        const info = keys.reduce((acc, key) => {
+                            acc[key] = err[key];
+                            return acc;
+                        }, {});
+                        res.status(500).json({ error: { message: err.message, stack: err.stack, ...info } });
+                    }
+                    else {
+                        res.status(500).json({ error: { message: 'Unknown error' } });
+                    }
                 }
                 requestContainer.dispose();
             });

package/dist/src/validation/{validateModel2.js → validate.js}

@@ -2,10 +2,10 @@ import { container } from '../injection/index.js';
 import { ValidationMetadataStore } from './metadata/ValidationMetadataStore.js';
 import { validateModel } from './validators/validateModel.js';
 
-function validateModel2(value, modelConstructor) {
+function validate(value, modelConstructor) {
     const metadataStore = container.resolve(ValidationMetadataStore);
     const info = metadataStore.getModelValidatorsInfo(modelConstructor);
     return validateModel(value, info);
 }
 
-export { validateModel2 };
+export { validate };

package/package.json

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

package/dist/src/validation/metadata/@validable.js

@@ -1,14 +0,0 @@
-import { container } from 'tsyringe';
-import { ValidationMetadataStore } from './ValidationMetadataStore.js';
-import { validateModel } from '../validators/validateModel.js';
-
-function validable() {
-    return function (target) {
-        target.__validate__ = function (value) {
-            const info = container.resolve(ValidationMetadataStore).getModelValidatorsInfo(target);
-            return validateModel(value, info);
-        };
-    };
-}
-
-export { validable };