@wabot-dev/framework 0.1.0-beta.56 → 0.1.0-beta.58

package/dist/src/addon/auth/api-key/ApiKeyRepository.js

@@ -1,4 +1,9 @@
+import { ApiKey } from './ApiKey.js';
+
 class ApiKeyRepository {
+    findAuthInfo(secret) {
+        throw new Error('Method not implemented.');
+    }
     find(id) {
         throw new Error('Method not implemented.');
     }
@@ -8,6 +13,23 @@ class ApiKeyRepository {
     create(item) {
         throw new Error('Method not implemented.');
     }
+    generate(req) {
+        throw new Error('Method not implemented.');
+    }
+    static async generate(repository, req) {
+        const apiKey = new ApiKey(req);
+        const pass = apiKey.generatePassword();
+        await repository.create(apiKey);
+        const id = apiKey.id;
+        const secret = ApiKey.deflate({ id, pass });
+        return { id, secret };
+    }
+    static async findAuthInfo(repository, secret) {
+        const { id, pass } = ApiKey.inflate(secret);
+        const apiKey = await repository.findOrThrow(id);
+        apiKey.validatePassword(pass);
+        return apiKey.authInfo;
+    }
 }
 
 export { ApiKeyRepository };

package/dist/src/addon/auth/api-key/PgApiKeyRepository.js

@@ -3,6 +3,7 @@ import { ApiKey } from './ApiKey.js';
 import { Pool } from 'pg';
 import { PgCrudRepository } from '../../../feature/pg/PgCrudRepository.js';
 import { singleton } from 'tsyringe';
+import { ApiKeyRepository } from './ApiKeyRepository.js';
 
 let PgApiKeyRepository = class PgApiKeyRepository extends PgCrudRepository {
     constructor(pool) {
@@ -12,6 +13,12 @@ let PgApiKeyRepository = class PgApiKeyRepository extends PgCrudRepository {
             constructor: ApiKey,
         });
     }
+    findAuthInfo(secret) {
+        return ApiKeyRepository.findAuthInfo(this, secret);
+    }
+    async generate(req) {
+        return ApiKeyRepository.generate(this, req);
+    }
 };
 PgApiKeyRepository = __decorate([
     singleton(),

package/dist/src/addon/auth/api-key/RemoteApiKeyRepository.js

@@ -0,0 +1,42 @@
+import { ApiKeyRepository } from './ApiKeyRepository.js';
+
+class RemoteApiKeyRepository {
+    fetcher;
+    cacheSeconds;
+    cache = new Map();
+    constructor(fetcher, cacheSeconds) {
+        this.fetcher = fetcher;
+        this.cacheSeconds = cacheSeconds;
+    }
+    async find(id) {
+        const now = Date.now();
+        const cached = this.cache.get(id);
+        if (cached && cached.expiresAt > now) {
+            return cached.value;
+        }
+        const result = await this.fetcher(id);
+        this.cache.set(id, {
+            value: result,
+            expiresAt: now + this.cacheSeconds * 1000,
+        });
+        return result;
+    }
+    async findOrThrow(id) {
+        const result = await this.find(id);
+        if (!result) {
+            throw new Error(`API key with ID '${id}' not found.`);
+        }
+        return result;
+    }
+    findAuthInfo(secret) {
+        return ApiKeyRepository.findAuthInfo(this, secret);
+    }
+    create(item) {
+        throw new Error('Method not implemented.');
+    }
+    async generate(req) {
+        throw new Error('Method not implemented.');
+    }
+}
+
+export { RemoteApiKeyRepository };

package/dist/src/addon/chat-bot/google/GoogleChatAdapter.js

@@ -18,18 +18,14 @@ let GoogleChatAdapter = class GoogleChatAdapter {
     }
     async nextItem(req) {
         const messages = [];
-        // Add system prompt as system message
         messages.push({ role: 'system', content: req.systemPrompt });
-        // Add previous chat items
         messages.push(...this.mapChatItems(req.prevItems));
         const tools = req.tools.map((x) => this.mapTool(x));
         const request = {
             model: req.model,
             messages,
-            tools: tools.length > 0 ? tools : undefined,
-            tool_choice: 'auto',
+            tools,
         };
-        this.logger.debug(`Call Gemini API with Request: ${JSON.stringify(request)}`);
         const response = await this.openai.chat.completions.create(request);
         return this.mapResponse(response);
     }
@@ -65,21 +61,8 @@ let GoogleChatAdapter = class GoogleChatAdapter {
     mapFunctionCall(item) {
         return [
             {
-                role: 'assistant',
-                tool_calls: [
-                    {
-                        id: item.id,
-                        type: 'function',
-                        function: {
-                            name: item.name,
-                            arguments: item.arguments || '{}',
-                        },
-                    },
-                ],
-            },
-            {
-                role: 'tool',
-                tool_call_id: item.id,
+                role: 'function',
+                name: item.id,
                 content: item.result ?? 'No result',
             },
         ];
@@ -94,12 +77,14 @@ let GoogleChatAdapter = class GoogleChatAdapter {
                     type: 'object',
                     properties: tool.parameters.reduce((prev, param) => ({
                         ...prev,
-                        [param.name]: { type: param.type, description: param.description },
+                        [param.name]: {
+                            type: param.type,
+                            description: param.description,
+                        },
                     }), {}),
                     required: tool.parameters.map((param) => param.name),
                     additionalProperties: false,
-                },
-                strict: true,
+                }
             },
         };
     }

package/dist/src/index.d.ts

@@ -983,6 +983,7 @@ declare function apiKeyGuard(): (target: object, propertyKey: string | symbol) =
 interface IApiKeyData<A extends IStorableData> extends IEntityData {
     passwordHash?: string;
     authInfo: A;
+    name: string;
 }
 declare class ApiKey<A extends IStorableData> extends Entity<IApiKeyData<A>> {
     get authInfo(): A;
@@ -1004,12 +1005,29 @@ interface IApiKeyRepository<A extends IStorableData> {
     find(id: string): Promise<ApiKey<A> | null>;
     findOrThrow(id: string): Promise<ApiKey<A>>;
     create(item: ApiKey<A>): Promise<void>;
+    generate(req: IGenerateApiKeyReq<A>): Promise<IGenerateApiKeyRes>;
+    findAuthInfo(secret: string): Promise<A>;
+}
+interface IGenerateApiKeyReq<A extends IStorableData> extends IStorableData {
+    name: string;
+    authInfo: A;
+}
+interface IGenerateApiKeyRes {
+    id: string;
+    secret: string;
 }
 
 declare class ApiKeyRepository<A extends IStorableData> implements IApiKeyRepository<A> {
+    findAuthInfo(secret: string): Promise<A>;
     find(id: string): Promise<ApiKey<A> | null>;
     findOrThrow(id: string): Promise<ApiKey<A>>;
     create(item: ApiKey<A>): Promise<void>;
+    generate(req: IGenerateApiKeyReq<A>): Promise<IGenerateApiKeyRes>;
+    static generate(repository: ApiKeyRepository<any>, req: IGenerateApiKeyReq<any>): Promise<{
+        id: string;
+        secret: string;
+    }>;
+    static findAuthInfo<A extends IStorableData>(repository: ApiKeyRepository<A>, secret: string): Promise<A>;
 }
 
 declare class ApiKeyGuardMiddleware implements IMiddleware {
@@ -1021,6 +1039,20 @@ declare class ApiKeyGuardMiddleware implements IMiddleware {
 
 declare class PgApiKeyRepository<A extends IStorableData> extends PgCrudRepository<ApiKey<A>> implements IApiKeyRepository<A> {
     constructor(pool: Pool);
+    findAuthInfo(secret: string): Promise<A>;
+    generate(req: IGenerateApiKeyReq<A>): Promise<IGenerateApiKeyRes>;
+}
+
+declare class RemoteApiKeyRepository<A extends IStorableData> implements IApiKeyRepository<A> {
+    private fetcher;
+    private cacheSeconds;
+    private cache;
+    constructor(fetcher: (id: string) => Promise<ApiKey<A> | null>, cacheSeconds: number);
+    find(id: string): Promise<ApiKey<A> | null>;
+    findOrThrow(id: string): Promise<ApiKey<A>>;
+    findAuthInfo(secret: string): Promise<A>;
+    create(item: ApiKey<A>): Promise<void>;
+    generate(req: IGenerateApiKeyReq<A>): Promise<IGenerateApiKeyRes>;
 }
 
 declare function jwtConnectionGuard(): (target: object, propertyKey: string | symbol) => void;
@@ -1557,4 +1589,4 @@ declare function HtmlModule(options: IHtmlModuleOptions): {
     new (): {};
 };
 
-export { AnthropicChatAdapter, ApiKey, 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 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 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 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, 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, apiKeyGuard, chatBot, chatController, chatItemTypeOptions, cmd, command, commandHandler, connectionMiddleware, container, inject, injectable, isArray, isBoolean, isDate, isModel, isNotEmpty, isNumber, isOptional, isPresent, isString, jwtConnectionGuard, jwtGuard, max, middleware, min, mindset, mindsetFunction, mindsetModule, modelInfo, onDelete, onGet, onPost, onPut, param, restController, runAsyncCommandHandlers, runChatControllers, runRestControllers, runSocketControllers, scoped, singleton, socket, socketConnection, socketController, socketEvent, telegram, validate, validateArray, validateIsBoolean, validateIsDate, validateIsNotEmpty, validateIsNumber, validateIsPresent, validateIsString, validateMax, validateMin, validateModel, whatsApp };
+export { AnthropicChatAdapter, ApiKey, 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 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 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, apiKeyGuard, chatBot, chatController, chatItemTypeOptions, cmd, command, commandHandler, connectionMiddleware, container, inject, injectable, isArray, isBoolean, isDate, isModel, isNotEmpty, isNumber, isOptional, isPresent, isString, jwtConnectionGuard, jwtGuard, max, middleware, min, mindset, mindsetFunction, mindsetModule, modelInfo, onDelete, onGet, onPost, onPut, param, restController, runAsyncCommandHandlers, runChatControllers, runRestControllers, runSocketControllers, scoped, singleton, socket, socketConnection, socketController, socketEvent, telegram, validate, validateArray, validateIsBoolean, validateIsDate, validateIsNotEmpty, validateIsNumber, validateIsPresent, validateIsString, validateMax, validateMin, validateModel, whatsApp };

package/dist/src/index.js

@@ -94,6 +94,7 @@ export { ApiKey } from './addon/auth/api-key/ApiKey.js';
 export { ApiKeyGuardMiddleware } from './addon/auth/api-key/ApiKeyGuardMiddleware.js';
 export { ApiKeyRepository } from './addon/auth/api-key/ApiKeyRepository.js';
 export { PgApiKeyRepository } from './addon/auth/api-key/PgApiKeyRepository.js';
+export { RemoteApiKeyRepository } from './addon/auth/api-key/RemoteApiKeyRepository.js';
 export { jwtConnectionGuard } from './addon/auth/jwt/@jwtConnectionGuard.js';
 export { jwtGuard } from './addon/auth/jwt/@jwtGuard.js';
 export { Jwt } from './addon/auth/jwt/Jwt.js';

package/package.json

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