@wabot-dev/framework 0.0.10 → 0.0.11

package/dist/src/channels/cmd/CmdChannel.js

@@ -29,7 +29,6 @@ let CmdChannel = CmdChannel_1 = class CmdChannel {
     }
     connect() {
         this.rl.on('line', async (input) => {
-            debugger;
             const trimmedInput = input.trim();
             if (!trimmedInput) {
                 this.rl.prompt();

package/dist/src/core/chat/repository/ram/RamChatRepository.js

@@ -12,7 +12,7 @@ let RamChatRepository = class RamChatRepository {
             throw new Error('Chat already created');
         }
         chat['data'].id = v4();
-        chat['data'].createdAt = new Date();
+        chat['data'].createdAt = new Date().getTime();
         chat.validate();
         this.items.push(chat);
         const memory = {

package/dist/src/core/user/repository/ram/RamUserRepository.js

@@ -10,7 +10,7 @@ let RamUserRepository = class RamUserRepository {
             throw new Error('User already created');
         }
         chat['data'].id = v4();
-        chat['data'].createdAt = new Date();
+        chat['data'].createdAt = new Date().getTime();
         chat.validate();
         this.items.push(chat);
     }

package/dist/src/index.d.ts

@@ -4,6 +4,7 @@ import InterceptionOptions from 'tsyringe/dist/typings/types/interceptor-options
 import * as tsyringe from 'tsyringe';
 import { DependencyContainer as DependencyContainer$1 } from 'tsyringe';
 export { DependencyContainer } from 'tsyringe';
+import { Pool } from 'pg';
 import { Database } from 'sqlite';
 import sqlite3 from 'sqlite3';
 
@@ -32,12 +33,11 @@ interface IReversibleMapper<T1, T2> {
 
 interface IPersistent {
     id?: string;
-    createdAt?: Date | null;
-    discardedAt?: Date | null;
+    createdAt?: number | null;
+    discardedAt?: number | null;
 }
 declare class Persistent<D extends IPersistent> {
     protected data: D;
-    private originalData;
     constructor(data: D);
     getId(): string;
     getCreatedAt(): Date;
@@ -288,7 +288,7 @@ type ISystemFunctionCallItem = {
 };
 type IChatItemData = {
     id?: string;
-    createdAt?: Date;
+    createdAt?: number;
 } & (ISystemMessageItem | IReceivedMessageItem | ISystemFunctionCallItem);
 type IChatItemType = IChatItemData['type'];
 declare class ChatItem extends Persistent<IChatItemData> {
@@ -552,6 +552,11 @@ declare class RegisterUserModule {
     registerUserWithEmail(request: RegisterUserWithEmailRequest): Promise<string>;
 }
 
+interface IPgRecord {
+    id: string;
+    data: string;
+}
+
 interface ICrudRepository<T> {
     find(id: string): Promise<T | null>;
     findAll(id: string): Promise<T[]>;
@@ -560,6 +565,35 @@ interface ICrudRepository<T> {
     discard(item: T): Promise<void>;
 }
 
+declare class PgCrudRepository<P extends Persistent<IPersistent>> implements ICrudRepository<P> {
+    private readonly pool;
+    protected readonly tableName: string;
+    protected mapper: IReversibleMapper<P, string>;
+    private tableIsCreated;
+    constructor(pool: Pool, tableName: string, mapper: IReversibleMapper<P, string>);
+    find(id: string): Promise<P | null>;
+    findAll(): Promise<P[]>;
+    create(item: P): Promise<void>;
+    update(item: P): Promise<void>;
+    discard(item: P): Promise<void>;
+    protected getPool(): Promise<Pool>;
+    private createTableIfNotExists;
+}
+
+declare class PgPersistentMapper<P extends Persistent<IPersistent>> implements IReversibleMapper<P, string> {
+    private ctor;
+    constructor(ctor: IConstructor<P>);
+    map(input: P): string;
+    rev(input: string): P;
+}
+declare function pgMapperFor<P extends Persistent<IPersistent>>(ctor: IConstructor<P>): PgPersistentMapper<P>;
+
+declare class PgChatRepository extends PgCrudRepository<Chat> implements IChatRepository {
+    constructor(pool: Pool);
+    findByConnection(query: IChatConnection): Promise<Chat | null>;
+    findMemory(chatId: string): Promise<IChatMemory | null>;
+}
+
 declare class SqliteCrudRepository<P extends Persistent<IPersistent>> implements ICrudRepository<P> {
     private table;
     private dbPath;
@@ -576,7 +610,6 @@ declare class SqliteCrudRepository<P extends Persistent<IPersistent>> implements
 }
 
 declare class SqliteChatMemory extends SqliteCrudRepository<ChatItem> implements IChatMemory {
-    private chatId;
     constructor(chatId: string);
     findLastItems(count: number): Promise<ChatItem[]>;
     static getDbPath(chatId: string): string;
@@ -600,4 +633,12 @@ interface ISqliteRecord {
     data: string;
 }
 
-export { AuthenticationModule, Chat, ChatBot, ChatBotAdapter, ChatBotMetadataStore, ChatItem, ChatMemory, ChatRepository, ChatResolver, CmdChannel, Container, ControllerMetadataStore, EmailService, 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 IMessageContext, type IMindset, type IMindsetDecoration, type IMindsetFunctionConfig, type IMindsetFunctionDecoration, type IMindsetFunctionMetadata, type IMindsetFunctionParamMetadata, type IMindsetIdentity, type IMindsetMetadata, type IMindsetModuleConfig, type IMindsetModuleDecoration, type IMindsetModuleMetadata, type IOtpService, type IParamConfig, type IParamDecoration, type IPersistent, type IReceivedMessage, type IReceivedMessageItem, type IReversibleMapper, type ISendEmailRequest, type IServerConfig, type IServerProvider, type ISqliteRecord, type ISystemFunctionCallItem, type ISystemMessageItem, type ITelegramChannelConfig, type IUserConnection, type IUserData, type IUserRepository, type IchatControllerConfig, type IrunChannelProps, 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, RamChatMemory, RamChatRepository, RamUserRepository, RegisterUserModule, RegisterUserWithEmailRequest, SendOneTimePasswordRequest, SqliteChatMemory, SqliteChatRepository, SqliteCrudRepository, SqliteUserRepository, TelegramChannel, TelegramChannelConfig, User, UserRepository, UserResolver, ValidateOneTimePasswordRequest, chatBot, chatController, cmd, container, inject, injectable, isOptional, mindset, mindsetFunction, mindsetModule, param, prepareChatContainer, runChannel, runServer, singleton, telegram };
+declare class SqlitePersistentMapper<P extends Persistent<IPersistent>> implements IReversibleMapper<P, string> {
+    private ctor;
+    constructor(ctor: IConstructor<P>);
+    map(input: P): string;
+    rev(input: string): P;
+}
+declare function sqliteMapperFor<P extends Persistent<IPersistent>>(ctor: IConstructor<P>): SqlitePersistentMapper<P>;
+
+export { AuthenticationModule, Chat, ChatBot, ChatBotAdapter, ChatBotMetadataStore, ChatItem, ChatMemory, ChatRepository, ChatResolver, CmdChannel, Container, ControllerMetadataStore, EmailService, 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 IMessageContext, type IMindset, type IMindsetDecoration, type IMindsetFunctionConfig, type IMindsetFunctionDecoration, type IMindsetFunctionMetadata, type IMindsetFunctionParamMetadata, type IMindsetIdentity, type IMindsetMetadata, type IMindsetModuleConfig, type IMindsetModuleDecoration, type IMindsetModuleMetadata, type IOtpService, type IParamConfig, type IParamDecoration, type IPersistent, type IPgRecord, type IReceivedMessage, type IReceivedMessageItem, type IReversibleMapper, type ISendEmailRequest, type IServerConfig, type IServerProvider, type ISqliteRecord, type ISystemFunctionCallItem, type ISystemMessageItem, type ITelegramChannelConfig, type IUserConnection, type IUserData, type IUserRepository, type IchatControllerConfig, type IrunChannelProps, 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, PgChatRepository, PgCrudRepository, PgPersistentMapper, RamChatMemory, RamChatRepository, RamUserRepository, RegisterUserModule, RegisterUserWithEmailRequest, SendOneTimePasswordRequest, SqliteChatMemory, SqliteChatRepository, SqliteCrudRepository, SqlitePersistentMapper, SqliteUserRepository, TelegramChannel, TelegramChannelConfig, User, UserRepository, UserResolver, ValidateOneTimePasswordRequest, chatBot, chatController, cmd, container, inject, injectable, isOptional, mindset, mindsetFunction, mindsetModule, param, pgMapperFor, prepareChatContainer, runChannel, runServer, singleton, sqliteMapperFor, telegram };

package/dist/src/index.js

@@ -46,8 +46,12 @@ export { RegisterUserWithEmailRequest } from './pre-made/module/register-user/re
 export { RegisterUserModule } from './pre-made/module/register-user/RegisterUserModule.js';
 export { EmailService } from './pre-made/service/EmailService.js';
 export { OtpService } from './pre-made/service/OtpService.js';
+export { PgCrudRepository } from './pre-made/repository/pg/PgCrudRepository.js';
+export { PgPersistentMapper, pgMapperFor } from './pre-made/repository/pg/PgPersistentMapper.js';
+export { PgChatRepository } from './pre-made/repository/pg/chat/PgChatRepository.js';
 export { SqliteChatMemory } from './pre-made/repository/sqlite/chat/SqliteChatMemory.js';
 export { SqliteChatRepository } from './pre-made/repository/sqlite/chat/SqliteChatRepository.js';
 export { SqliteUserRepository } from './pre-made/repository/sqlite/user/SqliteUserRepository.js';
 export { SqliteCrudRepository } from './pre-made/repository/sqlite/SqliteCrudRepository.js';
+export { SqlitePersistentMapper, sqliteMapperFor } from './pre-made/repository/sqlite/SqlitePersistentMapper.js';
 export { Container } from './injection/Container.js';

package/dist/src/pre-made/repository/pg/PgCrudRepository.js

@@ -0,0 +1,70 @@
+import 'pg';
+
+class PgCrudRepository {
+    pool;
+    tableName;
+    mapper;
+    tableIsCreated = false;
+    constructor(pool, tableName, mapper) {
+        this.pool = pool;
+        this.tableName = tableName;
+        this.mapper = mapper;
+    }
+    async find(id) {
+        const sql = `
+      SELECT id, data
+        FROM ${this.tableName}
+       WHERE id = $1
+       LIMIT 1
+    `;
+        await this.createTableIfNotExists();
+        const { rows } = await this.pool.query(sql, [id]);
+        if (rows.length === 0)
+            return null;
+        return this.mapper.rev(rows[0].data);
+    }
+    async findAll() {
+        const sql = `SELECT id, data FROM ${this.tableName}`;
+        await this.createTableIfNotExists();
+        const { rows } = await this.pool.query(sql);
+        return rows.map((r) => this.mapper.rev(r.data));
+    }
+    async create(item) {
+        const sql = `
+      INSERT INTO ${this.tableName}(id, data)
+      VALUES ($1, $2)
+    `;
+        const data = this.mapper.map(item);
+        await this.createTableIfNotExists();
+        await this.pool.query(sql, [item.getId(), data]);
+    }
+    async update(item) {
+        const sql = `
+      UPDATE ${this.tableName}
+         SET data = $1
+       WHERE id = $2
+    `;
+        const data = this.mapper.map(item);
+        await this.createTableIfNotExists();
+        await this.pool.query(sql, [data, item.getId()]);
+    }
+    async discard(item) {
+        item.discard();
+        await this.update(item);
+    }
+    async getPool() {
+        await this.createTableIfNotExists();
+        return this.pool;
+    }
+    async createTableIfNotExists() {
+        if (this.tableIsCreated) {
+            return;
+        }
+        await this.pool.query(`CREATE TABLE IF NOT EXISTS ${this.tableName} (
+         id TEXT PRIMARY KEY,
+         data JSONB NOT NULL
+       )`);
+    }
+}
+
+export { PgCrudRepository };

package/dist/src/pre-made/repository/pg/PgPersistentMapper.js

@@ -0,0 +1,17 @@
+class PgPersistentMapper {
+    ctor;
+    constructor(ctor) {
+        this.ctor = ctor;
+    }
+    map(input) {
+        return JSON.stringify(input['data']);
+    }
+    rev(input) {
+        return new this.ctor(JSON.parse(input));
+    }
+}
+function pgMapperFor(ctor) {
+    return new PgPersistentMapper(ctor);
+}
+
+export { PgPersistentMapper, pgMapperFor };

package/dist/src/pre-made/repository/pg/chat/PgChatRepository.js

@@ -0,0 +1,30 @@
+import { __decorate, __metadata } from 'tslib';
+import '../../../../core/chat/repository/ram/RamChatRepository.js';
+import '../../../../core/chat/repository/IChatRepository.js';
+import { Chat } from '../../../../core/chat/Chat.js';
+import '../../../../core/user/repository/ram/RamUserRepository.js';
+import '../../../../core/user/repository/IUserRepository.js';
+import { Pool } from 'pg';
+import { PgCrudRepository } from '../PgCrudRepository.js';
+import { pgMapperFor } from '../PgPersistentMapper.js';
+import { singleton } from '../../../../injection/index.js';
+
+let PgChatRepository = class PgChatRepository extends PgCrudRepository {
+    constructor(pool) {
+        super(pool, 'chat', pgMapperFor(Chat));
+    }
+    async findByConnection(query) {
+        await this.getPool();
+        throw new Error('Method not implemented.');
+    }
+    async findMemory(chatId) {
+        await this.getPool();
+        throw new Error('Method not implemented.');
+    }
+};
+PgChatRepository = __decorate([
+    singleton(),
+    __metadata("design:paramtypes", [Pool])
+], PgChatRepository);
+
+export { PgChatRepository };

package/dist/src/pre-made/repository/sqlite/SqliteCrudRepository.js

@@ -38,7 +38,7 @@ class SqliteCrudRepository {
             throw new Error('Item already created');
         }
         item['data'].id = v4();
-        item['data'].createdAt = new Date();
+        item['data'].createdAt = new Date().getTime();
         item.validate();
         const db = await this.getDb();
         await db.run(`INSERT INTO ${this.table} VALUES (?, ?, ?)`, [

package/dist/src/pre-made/repository/sqlite/SqlitePersistentMapper.js

@@ -0,0 +1,17 @@
+class SqlitePersistentMapper {
+    ctor;
+    constructor(ctor) {
+        this.ctor = ctor;
+    }
+    map(input) {
+        return JSON.stringify(input['data']);
+    }
+    rev(input) {
+        return new this.ctor(JSON.parse(input));
+    }
+}
+function sqliteMapperFor(ctor) {
+    return new SqlitePersistentMapper(ctor);
+}
+
+export { SqlitePersistentMapper, sqliteMapperFor };

package/dist/src/pre-made/repository/sqlite/chat/SqliteChatMemory.js

@@ -5,23 +5,11 @@ import '../../../../core/chat/repository/IChatRepository.js';
 import '../../../../core/user/repository/ram/RamUserRepository.js';
 import '../../../../core/user/repository/IUserRepository.js';
 import { SqliteCrudRepository } from '../SqliteCrudRepository.js';
+import { sqliteMapperFor } from '../SqlitePersistentMapper.js';
 
-const chatItemSqliteMapper = {
-    map(input) {
-        return JSON.stringify(input['data']);
-    },
-    rev(input) {
-        const data = JSON.parse(input);
-        data.createdAt = new Date(data.createdAt);
-        data.discardedAt = data.discardedAt && new Date(data.discardedAt);
-        return new ChatItem(data);
-    },
-};
 class SqliteChatMemory extends SqliteCrudRepository {
-    chatId;
     constructor(chatId) {
-        super('chat_item', SqliteChatMemory.getDbPath(chatId), chatItemSqliteMapper);
-        this.chatId = chatId;
+        super('chat_item', SqliteChatMemory.getDbPath(chatId), sqliteMapperFor(ChatItem));
     }
     async findLastItems(count) {
         const allItems = await this.findAll();

package/dist/src/pre-made/repository/sqlite/chat/SqliteChatRepository.js

@@ -5,22 +5,12 @@ import '../../../../core/user/repository/ram/RamUserRepository.js';
 import '../../../../core/user/repository/IUserRepository.js';
 import path from 'path';
 import { SqliteCrudRepository } from '../SqliteCrudRepository.js';
+import { sqliteMapperFor } from '../SqlitePersistentMapper.js';
 import { SqliteChatMemory } from './SqliteChatMemory.js';
 
-const chatSqliteMapper = {
-    map(input) {
-        return JSON.stringify(input['data']);
-    },
-    rev(input) {
-        const data = JSON.parse(input);
-        data.createdAt = new Date(data.createdAt);
-        data.discardedAt = data.discardedAt && new Date(data.discardedAt);
-        return new Chat(data);
-    },
-};
 class SqliteChatRepository extends SqliteCrudRepository {
     constructor() {
-        super('chat', SqliteChatRepository.getDbPath(), chatSqliteMapper);
+        super('chat', SqliteChatRepository.getDbPath(), sqliteMapperFor(Chat));
     }
     async findByConnection(query) {
         const allChats = await this.findAll();

package/dist/src/shared/Persistent.js

@@ -1,9 +1,7 @@
 class Persistent {
     data;
-    originalData;
     constructor(data) {
         this.data = data;
-        this.originalData = { ...data };
     }
     getId() {
         if (!this.data.id) {
@@ -15,7 +13,7 @@ class Persistent {
         if (!this.data.createdAt) {
             throw new Error('createdAt is required');
         }
-        return this.data.createdAt;
+        return new Date(this.data.createdAt);
     }
     update(newData) {
         this.data = newData;
@@ -32,7 +30,7 @@ class Persistent {
         }
     }
     discard() {
-        this.data.discardedAt = new Date();
+        this.data.discardedAt = new Date().getTime();
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wabot-dev/framework",
-  "version": "0.0.10",
+  "version": "0.0.11",
   "description": "Framework for IA Chat Bots",
   "type": "module",
   "main": "dist/src/index.js",
@@ -35,6 +35,7 @@
     "typescript": "5.8.3"
   },
   "peerDependencies": {
+    "@types/pg": "^8.11.14",
     "@yucacodes/ts": "^0.0.4",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.1",
@@ -42,6 +43,7 @@
     "express": "^5.1.0",
     "grammy": "^1.36.0",
     "openai": "^4.93.0",
+    "pg": "^8.15.6",
     "reflect-metadata": "^0.2.2",
     "sqlite": "^5.1.1",
     "sqlite3": "^5.1.7",