@wabot-dev/framework 0.2.0-beta.3 → 0.2.0-beta.5

package/dist/src/addon/auth/jwt/JwtSigner.js

@@ -23,7 +23,7 @@ let JwtSigner = class JwtSigner {
         const token = jwt.sign(_authInfo, this.config.secretOrPrivateKey, {
             expiresIn: this.config.accessExpirationSeconds,
         });
-        const expiration = new Date().getTime() + this.config.accessExpirationSeconds * 1000;
+        const expiration = new Date(new Date().getTime() + this.config.accessExpirationSeconds * 1000);
         return this.mapper.map({ token, expiration }, JwtTokenDto);
     }
 };

package/dist/src/core/mapper/Mapper.js

@@ -2,9 +2,9 @@ import { Storable } from '../storable/Storable.js';
 import { CustomError } from '../error/CustomError.js';
 import '../injection/index.js';
 import '../validation/metadata/ValidationMetadataStore.js';
-import { validate } from '../validation/validate.js';
+import { validateAndTransform } from '../validation/validateAndTransform.js';
 
-function deepCopyWithStorable(obj) {
+function deepCopyWithStorable(obj, visited = new WeakMap()) {
     if (obj === null || typeof obj !== 'object') {
         return obj;
     }
@@ -12,22 +12,38 @@ function deepCopyWithStorable(obj) {
         return obj.getTime();
     }
     if (obj instanceof Storable) {
-        return deepCopyWithStorable(obj['data']);
+        const dataCopy = deepCopyWithStorable(obj['data'], visited);
+        const result = { ...dataCopy };
+        // Handle getters from prototype
+        const proto = Object.getPrototypeOf(obj);
+        const descriptors = Object.getOwnPropertyDescriptors(proto);
+        for (const [key, descriptor] of Object.entries(descriptors)) {
+            if (typeof descriptor.get === 'function') {
+                try {
+                    const value = obj[key];
+                    result[key] = deepCopyWithStorable(value, visited);
+                }
+                catch {
+                    // Silently ignore getters that throw
+                }
+            }
+        }
+        return result;
     }
     if (Array.isArray(obj)) {
-        return obj.map((item) => deepCopyWithStorable(item));
+        return obj.map((item) => deepCopyWithStorable(item, visited));
     }
     const copy = {};
     for (const key in obj) {
         if (Object.prototype.hasOwnProperty.call(obj, key)) {
-            copy[key] = deepCopyWithStorable(obj[key]);
+            copy[key] = deepCopyWithStorable(obj[key], visited);
         }
     }
     return copy;
 }
 class Mapper {
     map(data, ctor) {
-        const validationResult = validate(deepCopyWithStorable(data), ctor);
+        const validationResult = validateAndTransform(deepCopyWithStorable(data), ctor);
         if (validationResult.error) {
             throw new CustomError({
                 httpCode: 500,

package/dist/src/core/validation/{validate.js → validateAndTransform.js}

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

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

@@ -2,7 +2,7 @@ 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 { validateAndTransform } from '../../core/validation/validateAndTransform.js';
 import { ExpressProvider } from '../express/ExpressProvider.js';
 import { json, urlencoded } from 'express';
 import path__default from 'path';
@@ -51,7 +51,7 @@ function runRestControllers(controllers) {
                         }
                         defaultArgFound = true;
                         if (typeof paramType === 'function') {
-                            const { value, error } = validate(buildRequest(req), paramType);
+                            const { value, error } = validateAndTransform(buildRequest(req), paramType);
                             if (error) {
                                 throw new CustomError({ httpCode: 400, message: error.description, info: error });
                             }

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

@@ -5,7 +5,7 @@ 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';
+import { validateAndTransform } from '../../core/validation/validateAndTransform.js';
 
 function runSocketControllers(controllers) {
     const logger = new Logger('wabot:socket');
@@ -52,7 +52,7 @@ function runSocketControllers(controllers) {
                                         message: 'Unable to validate request',
                                     });
                                 }
-                                const { value, error } = validate(req, reqType);
+                                const { value, error } = validateAndTransform(req, reqType);
                                 if (error) {
                                     throw new CustomError({
                                         httpCode: 400,

package/dist/src/index.d.ts

@@ -129,47 +129,6 @@ declare class Logger {
     private log;
 }
 
-declare class Mapper {
-    map<T>(data: any, ctor: IConstructor<T>): T;
-}
-
-interface PasswordHashOptions {
-    password: string;
-    saltLength?: number;
-    keyLength?: number;
-}
-declare class Password {
-    static hash(options: PasswordHashOptions): string;
-    static isValid(req: {
-        password: string;
-        hash: string;
-    }): boolean;
-    static generate(length: number): string;
-}
-
-declare class Random {
-    static integer(options: {
-        min: number;
-        max: number;
-    }): number;
-    static slug(name: string, options: {
-        randomLength: number;
-    }): string;
-    static alphaNumeric(length: number): string;
-    static alphaNumericLowerCase(length: number): string;
-    static numberCode(length: number): string;
-}
-
-interface ICrudRepository<T> {
-    find(id: string): Promise<T | null>;
-    findOrThrow(id: string): Promise<T>;
-    findByIds(ids: string[]): Promise<T[]>;
-    findAll(id: string): Promise<T[]>;
-    create(item: T): Promise<void>;
-    update(item: T): Promise<void>;
-    delete(item: T): Promise<void>;
-}
-
 declare function isModel(model: IConstructor<any>): (target: object, propertyKey: string | symbol) => void;
 
 declare function isOptional(): (target: object, propertyKey: string | symbol) => void;
@@ -252,7 +211,10 @@ declare class ValidationMetadataStore {
 
 declare function validateModel<V>(value: any, info: IModelValidatorsInfo<V>): IModelValidationResult<V>;
 
-declare function validate<V>(value: any, modelConstructor: IConstructor<V>): IModelValidationResult<V>;
+type IValidateInputShape<T> = T extends Date ? Date : T extends Array<infer U> ? Array<IValidateInputShape<U>> : T extends object ? {
+    [K in keyof T]: IValidateInputShape<T[K]>;
+} : T;
+declare function validateAndTransform<V>(value: IValidateInputShape<V>, modelConstructor: IConstructor<V>): IModelValidationResult<V>;
 
 declare function modelInfo<V>(modelConstructor: IConstructor<V>): IModelValidatorsInfo<V>;
 
@@ -301,6 +263,47 @@ interface IValidateMinOptions {
 }
 declare function validateMin(value: any, options: IValidateMinOptions): IValidationResult<any>;
 
+declare class Mapper {
+    map<T>(data: IValidateInputShape<T>, ctor: IConstructor<T>): T;
+}
+
+interface PasswordHashOptions {
+    password: string;
+    saltLength?: number;
+    keyLength?: number;
+}
+declare class Password {
+    static hash(options: PasswordHashOptions): string;
+    static isValid(req: {
+        password: string;
+        hash: string;
+    }): boolean;
+    static generate(length: number): string;
+}
+
+declare class Random {
+    static integer(options: {
+        min: number;
+        max: number;
+    }): number;
+    static slug(name: string, options: {
+        randomLength: number;
+    }): string;
+    static alphaNumeric(length: number): string;
+    static alphaNumericLowerCase(length: number): string;
+    static numberCode(length: number): string;
+}
+
+interface ICrudRepository<T> {
+    find(id: string): Promise<T | null>;
+    findOrThrow(id: string): Promise<T>;
+    findByIds(ids: string[]): Promise<T[]>;
+    findAll(id: string): Promise<T[]>;
+    create(item: T): Promise<void>;
+    update(item: T): Promise<void>;
+    delete(item: T): Promise<void>;
+}
+
 interface ICommandConfig {
     name?: string;
 }
@@ -1632,4 +1635,4 @@ declare function HtmlModule(options: IHtmlModuleOptions): {
     new (): {};
 };
 
-export { AnthropicChatAdapter, ApiKey, ApiKeyConnectionGuardMiddleware, ApiKeyGuardMiddleware, ApiKeyRepository, Async, Auth, Chat, ChatAdapter, ChatBot, ChatBotMetadataStore, ChatItem, ChatMemory, ChatRepository, ChatResolver, CmdChannel, Command, CommandMetadataStore, Container, ControllerMetadataStore, CustomError, DeepSeekChatAdapter, EXPRESS_REQ, EXPRESS_RES, Entity, Env, EnvWhatsAppRepository, ExpressProvider, GoogleChatAdapter, HtmlModule, HttpServerProvider, type IApiKeyData, type IApiKeyRepository, 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 IConnectionMiddleware, type IConnectionMiddlewareMetadata, type IConstructor, type ICrudRepository, type ICustomErrorData, type IEndPointConfig, type IEndPointMetadata, type IEntityData, type IEnvType, type IFunctionCall, type IFunctionCallItem, type IGenerateApiKeyReq, type IGenerateApiKeyRes, type IGetWhatsAppTemplateRequest, type IHtmlModuleOptions, type IHumanMessageItem, type IJobData, type IJobEvent, type IJobEventListener, type IJobRepository, type IJwtRefreshTokenData, type IJwtRefreshTokenRepository, type ILanguageModelUsage, type IListenWhatsAppMessageRequest, type IMessageContext, type IMiddleware, type IMiddlewareMetadata, type IMindset, type IMindsetDecoration, type IMindsetFunctionConfig, type IMindsetFunctionDecoration, type IMindsetFunctionMetadata, type IMindsetFunctionParamMetadata, type IMindsetIdentity, type IMindsetLlm, type IMindsetMetadata, type IMindsetModuleConfig, type IMindsetModuleDecoration, type IMindsetModuleMetadata, type IMindsetTool, type IMindsetToolParameter, type IModelValidationError, type IModelValidationResult, type IModelValidatorsInfo, type IMoneyData, type IParamConfig, type IParamDecoration, type IPersistentData, type IPgRepositoryConfig, type IPrimitive, type IPropertyValidatorInfo, type IReceivedMessage, type IRemoteApiKeyFetcher, type IRestControllerConfig, type IRestControllerMetadata, type ISendWhatsAppRequest, type ISendWhatsAppTemplateRequest, type ISocketChannelConfig, type ISocketChannelReceivedMessage, type ISocketConnectionConfig, type ISocketConnectionMetadata, type ISocketControllerConfig, type ISocketControllerMetadata, type ISocketEventConfig, type ISocketEventMetadata, type IStorableData, type ITelegramChannelConfig, type IValidateArrayOptions, type IValidateArrayOptionsWithItemsValidators, type IValidateIsInOptions, type IValidateMaxOptions, type IValidateMinOptions, type IValidationError, type IValidationResult, type IValidator, type IValidatorMetadata, type IWhatsAppBusinessAccount, type IWhatsAppBusinessNumber, type IWhatsAppCloudContact, type IWhatsAppCloudMessage, type IWhatsAppCloudMessageMetadata, type IWhatsAppCloudTemplate, type IWhatsAppCloudTemplateComponent, type IWhatsAppCloudTemplateMessage, type IWhatsAppCloudTemplateParameter, type IWhatsAppCloudTemplateResponse, type IWhatsAppCloudWebhookPayload, type IWhatsAppData, type IWhatsAppMessageListener, type IWhatsAppProxyListenMessageEventData, type IWhatsAppProxyListenMessageEventReq, type IWhatsAppProxyMessage, type IWhatsAppProxyMessageContent, type IWhatsAppProxyMessageEventReq, type IWhatsAppProxySendMessageEventReq, type IWhatsAppRepository, type IWhatsAppSenderOptions, type IWhatsappChannelConfig, type IchatControllerConfig, Job, JobRepository, JobRunner, JobsEventsHub, Jwt, JwtAccessAndRefreshTokenDto, JwtConfig, JwtConnectionGuardMiddleware, JwtGuardMiddleware, JwtRefreshToken, JwtRefreshTokenRepository, JwtSigner, JwtTokenDto, Lifecycle, Logger, MINDSET_DECORATION_MINDSET, MINDSET_FUNCTION_DECORATION_FUNCTION, MINDSET_MODULE_DECORATION_MODULE, Mapper, Mindset, MindsetMetadataStore, MindsetOperator, Money, MoneyDto, OpenaiChatAdapter, PARAM_DECORATION_IS_OPTIONAL, PARAM_DECORATION_PARAM, Password, type PasswordHashOptions, Persistent, PgApiKeyRepository, PgChatMemory, PgChatRepository, PgCrudRepository, PgJobRepository, PgJwtRefreshTokenRepository, PgRepositoryBase, PgWhatsAppRepository, RamChatMemory, RamChatRepository, Random, RemoteApiKeyRepository, RestControllerMetadataStore, SocketChannel, SocketChannelConfig, SocketControllerMetadataStore, SocketServerProvider, Storable, TelegramChannel, TelegramChannelConfig, ValidationMetadataStore, WHATSAPP_MESSAGE_EVENT, WHATSAPP_PROXY_LISTEN_MESSAGE_EVENT, WHATSAPP_PROXY_SEND_MESSAGE_EVENT, WabotChatAdapter, WhatsApp, WhatsAppChannel, WhatsAppReceiver, WhatsAppReceiverByCloudApi, WhatsAppReceiverByWabotProxy, WhatsAppRepository, WhatsAppSender, WhatsAppSenderByCloudApi, WhatsAppSenderByWabotProxy, WhatsAppWabotProxyConnection, WhatsappChannelConfig, apiKeyConnectionGuard, apiKeyGuard, chatBot, chatController, chatItemTypeOptions, cmd, command, commandHandler, connectionMiddleware, container, inject, injectable, isArray, isBoolean, isDate, isIn, isModel, isNotEmpty, isNumber, isOptional, isPresent, isString, jwtConnectionGuard, jwtGuard, max, middleware, min, mindset, mindsetFunction, mindsetModule, modelInfo, onDelete, onGet, onPost, onPut, param, readJsonFromFile, restController, runAsyncCommandHandlers, runChatControllers, runRestControllers, runSocketControllers, scoped, singleton, socket, socketConnection, socketController, socketEvent, telegram, validate, validateArray, validateIsBoolean, validateIsDate, validateIsIn, validateIsNotEmpty, validateIsNumber, validateIsPresent, validateIsString, validateMax, validateMin, validateModel, whatsApp, writeJsonToFile };
+export { AnthropicChatAdapter, ApiKey, ApiKeyConnectionGuardMiddleware, ApiKeyGuardMiddleware, ApiKeyRepository, Async, Auth, Chat, ChatAdapter, ChatBot, ChatBotMetadataStore, ChatItem, ChatMemory, ChatRepository, ChatResolver, CmdChannel, Command, CommandMetadataStore, Container, ControllerMetadataStore, CustomError, DeepSeekChatAdapter, EXPRESS_REQ, EXPRESS_RES, Entity, Env, EnvWhatsAppRepository, ExpressProvider, GoogleChatAdapter, HtmlModule, HttpServerProvider, type IApiKeyData, type IApiKeyRepository, 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 IConnectionMiddleware, type IConnectionMiddlewareMetadata, type IConstructor, type ICrudRepository, type ICustomErrorData, type IEndPointConfig, type IEndPointMetadata, type IEntityData, type IEnvType, type IFunctionCall, type IFunctionCallItem, type IGenerateApiKeyReq, type IGenerateApiKeyRes, type IGetWhatsAppTemplateRequest, type IHtmlModuleOptions, type IHumanMessageItem, type IJobData, type IJobEvent, type IJobEventListener, type IJobRepository, type IJwtRefreshTokenData, type IJwtRefreshTokenRepository, type ILanguageModelUsage, type IListenWhatsAppMessageRequest, type IMessageContext, type IMiddleware, type IMiddlewareMetadata, type IMindset, type IMindsetDecoration, type IMindsetFunctionConfig, type IMindsetFunctionDecoration, type IMindsetFunctionMetadata, type IMindsetFunctionParamMetadata, type IMindsetIdentity, type IMindsetLlm, type IMindsetMetadata, type IMindsetModuleConfig, type IMindsetModuleDecoration, type IMindsetModuleMetadata, type IMindsetTool, type IMindsetToolParameter, type IModelValidationError, type IModelValidationResult, type IModelValidatorsInfo, type IMoneyData, type IParamConfig, type IParamDecoration, type IPersistentData, type IPgRepositoryConfig, type IPrimitive, type IPropertyValidatorInfo, type IReceivedMessage, type IRemoteApiKeyFetcher, type IRestControllerConfig, type IRestControllerMetadata, type ISendWhatsAppRequest, type ISendWhatsAppTemplateRequest, type ISocketChannelConfig, type ISocketChannelReceivedMessage, type ISocketConnectionConfig, type ISocketConnectionMetadata, type ISocketControllerConfig, type ISocketControllerMetadata, type ISocketEventConfig, type ISocketEventMetadata, type IStorableData, type ITelegramChannelConfig, type IValidateArrayOptions, type IValidateArrayOptionsWithItemsValidators, type IValidateInputShape, type IValidateIsInOptions, type IValidateMaxOptions, type IValidateMinOptions, type IValidationError, type IValidationResult, type IValidator, type IValidatorMetadata, type IWhatsAppBusinessAccount, type IWhatsAppBusinessNumber, type IWhatsAppCloudContact, type IWhatsAppCloudMessage, type IWhatsAppCloudMessageMetadata, type IWhatsAppCloudTemplate, type IWhatsAppCloudTemplateComponent, type IWhatsAppCloudTemplateMessage, type IWhatsAppCloudTemplateParameter, type IWhatsAppCloudTemplateResponse, type IWhatsAppCloudWebhookPayload, type IWhatsAppData, type IWhatsAppMessageListener, type IWhatsAppProxyListenMessageEventData, type IWhatsAppProxyListenMessageEventReq, type IWhatsAppProxyMessage, type IWhatsAppProxyMessageContent, type IWhatsAppProxyMessageEventReq, type IWhatsAppProxySendMessageEventReq, type IWhatsAppRepository, type IWhatsAppSenderOptions, type IWhatsappChannelConfig, type IchatControllerConfig, Job, JobRepository, JobRunner, JobsEventsHub, Jwt, JwtAccessAndRefreshTokenDto, JwtConfig, JwtConnectionGuardMiddleware, JwtGuardMiddleware, JwtRefreshToken, JwtRefreshTokenRepository, JwtSigner, JwtTokenDto, Lifecycle, Logger, MINDSET_DECORATION_MINDSET, MINDSET_FUNCTION_DECORATION_FUNCTION, MINDSET_MODULE_DECORATION_MODULE, Mapper, Mindset, MindsetMetadataStore, MindsetOperator, Money, MoneyDto, OpenaiChatAdapter, PARAM_DECORATION_IS_OPTIONAL, PARAM_DECORATION_PARAM, Password, type PasswordHashOptions, Persistent, PgApiKeyRepository, PgChatMemory, PgChatRepository, PgCrudRepository, PgJobRepository, PgJwtRefreshTokenRepository, PgRepositoryBase, PgWhatsAppRepository, RamChatMemory, RamChatRepository, Random, RemoteApiKeyRepository, RestControllerMetadataStore, SocketChannel, SocketChannelConfig, SocketControllerMetadataStore, SocketServerProvider, Storable, TelegramChannel, TelegramChannelConfig, ValidationMetadataStore, WHATSAPP_MESSAGE_EVENT, WHATSAPP_PROXY_LISTEN_MESSAGE_EVENT, WHATSAPP_PROXY_SEND_MESSAGE_EVENT, WabotChatAdapter, WhatsApp, WhatsAppChannel, WhatsAppReceiver, WhatsAppReceiverByCloudApi, WhatsAppReceiverByWabotProxy, WhatsAppRepository, WhatsAppSender, WhatsAppSenderByCloudApi, WhatsAppSenderByWabotProxy, WhatsAppWabotProxyConnection, WhatsappChannelConfig, apiKeyConnectionGuard, apiKeyGuard, chatBot, chatController, chatItemTypeOptions, cmd, command, commandHandler, connectionMiddleware, container, inject, injectable, isArray, isBoolean, isDate, isIn, isModel, isNotEmpty, isNumber, isOptional, isPresent, isString, jwtConnectionGuard, jwtGuard, max, middleware, min, mindset, mindsetFunction, mindsetModule, modelInfo, onDelete, onGet, onPost, onPut, param, readJsonFromFile, restController, runAsyncCommandHandlers, runChatControllers, runRestControllers, runSocketControllers, scoped, singleton, socket, socketConnection, socketController, socketEvent, telegram, validateAndTransform, validateArray, validateIsBoolean, validateIsDate, validateIsIn, validateIsNotEmpty, validateIsNumber, validateIsPresent, validateIsString, validateMax, validateMin, validateModel, whatsApp, writeJsonToFile };

package/dist/src/index.js

@@ -14,7 +14,7 @@ export { isArray } from './core/validation/metadata/@isArray.js';
 export { ValidationMetadataStore } from './core/validation/metadata/ValidationMetadataStore.js';
 export { validateModel } from './core/validation/core/validateModel.js';
 export { validateArray } from './core/validation/core/validateArray.js';
-export { validate } from './core/validation/validate.js';
+export { validateAndTransform } from './core/validation/validateAndTransform.js';
 export { modelInfo } from './core/validation/modelInfo.js';
 export { isBoolean } from './core/validation/validators/is-boolean/@isBoolean.js';
 export { validateIsBoolean } from './core/validation/validators/is-boolean/validateIsBoolean.js';

package/package.json

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