chz-telegram-bot 0.0.2 → 0.0.3

package/dist/main.d.ts

@@ -0,0 +1,8 @@
+import BotInstance from './entities/bot.js';
+import CommandAction from './entities/actions/commandAction.js';
+import IActionState from './types/actionState.js';
+import ScheduledAction from './entities/actions/scheduledAction.js';
+declare function startBot(name: string, tokenFilePath: string, commands: CommandAction<IActionState>[], scheduled: ScheduledAction[], chats: Map<string, number>, storagePath?: string): Promise<BotInstance>;
+declare function stopBots(reason: string): Promise<void>;
+export { startBot, stopBots };
+//# sourceMappingURL=main.d.ts.map

package/dist/main.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../main.ts"],"names":[],"mappings":"AACA,OAAO,WAAW,MAAM,mBAAmB,CAAC;AAG5C,OAAO,aAAa,MAAM,qCAAqC,CAAC;AAChE,OAAO,YAAY,MAAM,wBAAwB,CAAC;AAClD,OAAO,eAAe,MAAM,uCAAuC,CAAC;AAQpE,iBAAe,QAAQ,CACnB,IAAI,EAAE,MAAM,EACZ,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,aAAa,CAAC,YAAY,CAAC,EAAE,EACvC,SAAS,EAAE,eAAe,EAAE,EAC5B,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAC1B,WAAW,CAAC,EAAE,MAAM,wBAcvB;AAED,iBAAe,QAAQ,CAAC,MAAM,EAAE,MAAM,iBASrC;AAED,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC"}

package/dist/main.js

@@ -8,15 +8,21 @@ exports.stopBots = stopBots;
 const promises_1 = require("fs/promises");
 const bot_js_1 = __importDefault(require("./entities/bot.js"));
 const taskScheduler_js_1 = __importDefault(require("./services/taskScheduler.js"));
-const storage_js_1 = __importDefault(require("./services/storage.js"));
 const logger_js_1 = __importDefault(require("./services/logger.js"));
 const bots = [];
 function log(text) {
     logger_js_1.default.logWithTraceId('ALL BOTS', 'System:Bot', 'System', text);
 }
-async function startBot(name, tokenFile, commands, scheduled, chats) {
-    const token = await (0, promises_1.readFile)(tokenFile, 'utf8');
-    const bot = new bot_js_1.default(name, token, commands, scheduled, chats);
+async function startBot(name, tokenFilePath, commands, scheduled, chats, storagePath) {
+    const token = await (0, promises_1.readFile)(tokenFilePath, 'utf8');
+    const bot = new bot_js_1.default({
+        name,
+        token,
+        commands,
+        scheduled,
+        chats,
+        storagePath
+    });
     bots.push(bot);
     return bot;
 }
@@ -24,10 +30,8 @@ async function stopBots(reason) {
     log(`Recieved termination code: ${reason}`);
     taskScheduler_js_1.default.stopAll();
     log('Acquiring storage semaphore...');
-    await storage_js_1.default.semaphoreInstance.acquire();
     log('Stopping bots...');
     for (const bot of bots) {
         bot.stop(reason);
     }
-    process.exit(0);
 }

package/dist/services/jsonFileStorage.d.ts

@@ -0,0 +1,23 @@
+import TransactionResult from '../entities/transactionResult';
+import ActionStateBase from '../entities/states/actionStateBase';
+import IActionState from '../types/actionState';
+import IActionWithState from '../types/actionWithState';
+import { Sema as Semaphore } from 'async-sema';
+import { IStorageClient } from '../types/storage';
+export default class JsonFileStorage implements IStorageClient {
+    semaphore: Semaphore;
+    private cache;
+    private storagePath;
+    private botName;
+    constructor(botName: string, path: string | undefined);
+    private lock;
+    private loadInternal;
+    private save;
+    private buidPathFromKey;
+    load(key: string): Promise<Record<number, ActionStateBase>>;
+    saveMetadata(actions: IActionWithState[], botName: string): Promise<void>;
+    getActionState<TActionState extends IActionState>(entity: IActionWithState, chatId: number): Promise<TActionState>;
+    saveActionExecutionResult(action: IActionWithState, chatId: number, transactionResult: TransactionResult): Promise<void>;
+    close(): Promise<void>;
+}
+//# sourceMappingURL=jsonFileStorage.d.ts.map

package/dist/services/jsonFileStorage.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"jsonFileStorage.d.ts","sourceRoot":"","sources":["../../services/jsonFileStorage.ts"],"names":[],"mappings":"AAEA,OAAO,iBAAiB,MAAM,+BAA+B,CAAC;AAE9D,OAAO,eAAe,MAAM,oCAAoC,CAAC;AACjE,OAAO,YAAY,MAAM,sBAAsB,CAAC;AAChD,OAAO,gBAAgB,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,IAAI,IAAI,SAAS,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,MAAM,CAAC,OAAO,OAAO,eAAgB,YAAW,cAAc;IAC1D,SAAS,YAAoB;IAC7B,OAAO,CAAC,KAAK,CAA+C;IAC5D,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,OAAO,CAAS;gBAEZ,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS;YAMvC,IAAI;YAUJ,YAAY;YAmBZ,IAAI;IAalB,OAAO,CAAC,eAAe;IAOjB,IAAI,CAAC,GAAG,EAAE,MAAM;IAMhB,YAAY,CAAC,OAAO,EAAE,gBAAgB,EAAE,EAAE,OAAO,EAAE,MAAM;IAUzD,cAAc,CAAC,YAAY,SAAS,YAAY,EAClD,MAAM,EAAE,gBAAgB,EACxB,MAAM,EAAE,MAAM;IASZ,yBAAyB,CAC3B,MAAM,EAAE,gBAAgB,EACxB,MAAM,EAAE,MAAM,EACd,iBAAiB,EAAE,iBAAiB;IAYlC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAG/B"}

package/dist/services/{storage.js → jsonFileStorage.js}

@@ -4,20 +4,20 @@ const fs_1 = require("fs");
 const path_1 = require("path");
 const promises_1 = require("fs/promises");
 const async_sema_1 = require("async-sema");
-class Storage {
-    get semaphoreInstance() {
-        return Storage.semaphore;
-    }
-    constructor() {
+class JsonFileStorage {
+    constructor(botName, path) {
+        this.semaphore = new async_sema_1.Sema(1);
         this.cache = new Map();
+        this.botName = botName;
+        this.storagePath = path ?? 'storage';
     }
     async lock(action) {
-        await this.semaphoreInstance.acquire();
+        await this.semaphore.acquire();
         try {
             return await action();
         }
         finally {
-            this.semaphoreInstance.release();
+            this.semaphore.release();
         }
     }
     async loadInternal(key) {
@@ -44,7 +44,7 @@ class Storage {
         await (0, promises_1.writeFile)(targetPath, JSON.stringify(data), { flag: 'w+' });
     }
     buidPathFromKey(key) {
-        return 'storage/' + key.replaceAll(':', '/') + '.json';
+        return `${this.storagePath}/${this.botName}/${key.replaceAll(':', '/')}.json`;
     }
     async load(key) {
         return await this.lock(async () => {
@@ -65,7 +65,7 @@ class Storage {
             return data[chatId] ?? entity.stateConstructor();
         });
     }
-    async commitTransactionForAction(action, chatId, transactionResult) {
+    async saveActionExecutionResult(action, chatId, transactionResult) {
         await this.lock(async () => {
             const data = await this.loadInternal(action.key);
             if (transactionResult.shouldUpdate) {
@@ -74,6 +74,8 @@ class Storage {
             }
         });
     }
+    async close() {
+        await this.semaphore.acquire();
+    }
 }
-Storage.semaphore = new async_sema_1.Sema(1);
-exports.default = new Storage();
+exports.default = JsonFileStorage;

package/dist/services/logger.d.ts

@@ -0,0 +1,7 @@
+declare class Logger {
+    logWithTraceId(botName: string, traceId: string | number, chatName: string, text: string): void;
+    errorWithTraceId<TData>(botName: string, traceId: string | number, chatName: string, errorObj: string | Error, extraData?: TData | undefined): void;
+}
+declare const _default: Logger;
+export default _default;
+//# sourceMappingURL=logger.d.ts.map

package/dist/services/logger.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../services/logger.ts"],"names":[],"mappings":"AAAA,cAAM,MAAM;IACR,cAAc,CACV,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,GAAG,MAAM,EACxB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM;IAKhB,gBAAgB,CAAC,KAAK,EAClB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,GAAG,MAAM,EACxB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,GAAG,KAAK,EACxB,SAAS,CAAC,EAAE,KAAK,GAAG,SAAS;CAYpC;;AAED,wBAA4B"}

package/dist/services/taskScheduler.d.ts

@@ -0,0 +1,11 @@
+import TaskRecord from '../entities/taskRecord';
+import { Milliseconds } from '../types/timeValues';
+declare class TaskScheduler {
+    activeTasks: TaskRecord[];
+    stopAll(): void;
+    createTask(name: string, action: () => void, interval: Milliseconds, executeRightAway: boolean, ownerName: string): void;
+    createOnetimeTask(name: string, action: () => void, delay: Milliseconds, ownerName: string): void;
+}
+declare const _default: TaskScheduler;
+export default _default;
+//# sourceMappingURL=taskScheduler.d.ts.map

package/dist/services/taskScheduler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"taskScheduler.d.ts","sourceRoot":"","sources":["../../services/taskScheduler.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,wBAAwB,CAAC;AAEhD,OAAO,EAAE,YAAY,EAAW,MAAM,qBAAqB,CAAC;AAG5D,cAAM,aAAa;IACf,WAAW,EAAE,UAAU,EAAE,CAAM;IAE/B,OAAO;IAMP,UAAU,CACN,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,IAAI,EAClB,QAAQ,EAAE,YAAY,EACtB,gBAAgB,EAAE,OAAO,EACzB,SAAS,EAAE,MAAM;IAoBrB,iBAAiB,CACb,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,IAAI,EAClB,KAAK,EAAE,YAAY,EACnB,SAAS,EAAE,MAAM;CAoBxB;;AAED,wBAAmC"}

package/dist/services/telegramApi.d.ts

@@ -0,0 +1,27 @@
+import MessageContext from '../entities/context/messageContext';
+import ChatContext from '../entities/context/chatContext';
+import { Telegraf } from 'telegraf';
+import IReplyMessage from '../types/replyMessage';
+import IncomingMessage from '../entities/incomingMessage';
+import Reaction from '../entities/responses/reaction';
+import { IStorageClient } from '../types/storage';
+export default class TelegramApiService {
+    botName: string;
+    telegraf: Telegraf;
+    chats: Map<number, string>;
+    messageQueue: Array<IReplyMessage<unknown> | Reaction>;
+    storage: IStorageClient;
+    constructor(botName: string, telegraf: Telegraf, storage: IStorageClient, chats: Map<string, number>);
+    private dequeueResponse;
+    private processResponse;
+    private enqueueResponse;
+    private enqueueReaction;
+    private getInteractions;
+    createContextForMessage(incomingMessage: IncomingMessage): MessageContext<import("../types/actionState").default>;
+    createContextForChat(chatId: number, scheduledName: string): ChatContext;
+}
+export interface IBotApiInteractions {
+    respond: <TType>(response: IReplyMessage<TType>) => void;
+    react: (reaction: Reaction) => void;
+}
+//# sourceMappingURL=telegramApi.d.ts.map

package/dist/services/telegramApi.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"telegramApi.d.ts","sourceRoot":"","sources":["../../services/telegramApi.ts"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,oCAAoC,CAAC;AAChE,OAAO,WAAW,MAAM,iCAAiC,CAAC;AAM1D,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AACpC,OAAO,aAAa,MAAM,uBAAuB,CAAC;AAClD,OAAO,eAAe,MAAM,6BAA6B,CAAC;AAE1D,OAAO,QAAQ,MAAM,gCAAgC,CAAC;AAGtD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,MAAM,CAAC,OAAO,OAAO,kBAAkB;IACnC,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,QAAQ,CAAC;IACnB,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3B,YAAY,EAAE,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,QAAQ,CAAC,CAAM;IAC5D,OAAO,EAAE,cAAc,CAAC;gBAGpB,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,cAAc,EACvB,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;YAkBhB,eAAe;YAkBf,eAAe;IAgE7B,OAAO,CAAC,eAAe;IAIvB,OAAO,CAAC,eAAe;IAIvB,OAAO,CAAC,eAAe;IAOvB,uBAAuB,CAAC,eAAe,EAAE,eAAe;IAoBxD,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM;CAU7D;AAED,MAAM,WAAW,mBAAmB;IAChC,OAAO,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,aAAa,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC;IACzD,KAAK,EAAE,CAAC,QAAQ,EAAE,QAAQ,KAAK,IAAI,CAAC;CACvC"}

package/dist/services/telegramApi.js

@@ -12,11 +12,12 @@ const taskScheduler_1 = __importDefault(require("./taskScheduler"));
 const logger_1 = __importDefault(require("./logger"));
 const reverseMap_1 = require("../helpers/reverseMap");
 class TelegramApiService {
-    constructor(botName, telegraf, chats) {
+    constructor(botName, telegraf, storage, chats) {
         this.messageQueue = [];
         this.telegraf = telegraf;
         this.botName = botName;
         this.chats = (0, reverseMap_1.reverseMap)(chats);
+        this.storage = storage;
         taskScheduler_1.default.createTask('MessageSending', () => {
             this.dequeueResponse();
         }, 100, false, this.botName);
@@ -85,10 +86,10 @@ class TelegramApiService {
         const lastName = incomingMessage.from?.last_name
             ? ` ${incomingMessage.from?.last_name}`
             : '';
-        return new messageContext_1.default(this.botName, this.getInteractions(), incomingMessage.chat.id, incomingMessage.chatName, incomingMessage.message_id, incomingMessage.text, incomingMessage.from?.id, incomingMessage.traceId, firstName + lastName);
+        return new messageContext_1.default(this.botName, this.getInteractions(), incomingMessage.chat.id, incomingMessage.chatName, incomingMessage.message_id, incomingMessage.text, incomingMessage.from?.id, incomingMessage.traceId, firstName + lastName, this.storage);
     }
     createContextForChat(chatId, scheduledName) {
-        return new chatContext_1.default(this.botName, this.getInteractions(), chatId, this.chats.get(chatId), `Scheduled:${scheduledName}:${chatId}`);
+        return new chatContext_1.default(this.botName, this.getInteractions(), chatId, this.chats.get(chatId), `Scheduled:${scheduledName}:${chatId}`, this.storage);
     }
 }
 exports.default = TelegramApiService;

package/dist/types/actionState.d.ts

@@ -0,0 +1,4 @@
+export default interface IActionState {
+    lastExecutedDate: number;
+}
+//# sourceMappingURL=actionState.d.ts.map

package/dist/types/actionState.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"actionState.d.ts","sourceRoot":"","sources":["../../types/actionState.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,WAAW,YAAY;IACjC,gBAAgB,EAAE,MAAM,CAAC;CAC5B"}

package/dist/types/actionWithState.d.ts

@@ -0,0 +1,6 @@
+import IActionState from './actionState';
+export default interface IActionWithState {
+    key: string;
+    stateConstructor: () => IActionState;
+}
+//# sourceMappingURL=actionWithState.d.ts.map

package/dist/types/actionWithState.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"actionWithState.d.ts","sourceRoot":"","sources":["../../types/actionWithState.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,eAAe,CAAC;AAEzC,MAAM,CAAC,OAAO,WAAW,gBAAgB;IACrC,GAAG,EAAE,MAAM,CAAC;IACZ,gBAAgB,EAAE,MAAM,YAAY,CAAC;CACxC"}

package/dist/types/cachedValueAccessor.d.ts

@@ -0,0 +1,2 @@
+export type CachedValueAccessor = <TResult>(key: string) => Promise<TResult>;
+//# sourceMappingURL=cachedValueAccessor.d.ts.map

package/dist/types/cachedValueAccessor.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cachedValueAccessor.d.ts","sourceRoot":"","sources":["../../types/cachedValueAccessor.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,mBAAmB,GAAG,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC"}

package/dist/types/commandCondition.d.ts

@@ -0,0 +1,4 @@
+import MessageContext from '../entities/context/messageContext';
+import IActionState from './actionState';
+export type CommandCondition<TActionState extends IActionState> = (ctx: MessageContext<TActionState>) => Promise<boolean>;
+//# sourceMappingURL=commandCondition.d.ts.map

package/dist/types/commandCondition.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"commandCondition.d.ts","sourceRoot":"","sources":["../../types/commandCondition.ts"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,oCAAoC,CAAC;AAChE,OAAO,YAAY,MAAM,eAAe,CAAC;AAEzC,MAAM,MAAM,gBAAgB,CAAC,YAAY,SAAS,YAAY,IAAI,CAC9D,GAAG,EAAE,cAAc,CAAC,YAAY,CAAC,KAChC,OAAO,CAAC,OAAO,CAAC,CAAC"}

package/dist/types/daysOfTheWeek.d.ts

@@ -0,0 +1,10 @@
+export declare enum Day {
+    Sunday = 0,
+    Monday = 1,
+    Tuesday = 2,
+    Wednesday = 3,
+    Thursday = 4,
+    Friday = 5,
+    Saturday = 6
+}
+//# sourceMappingURL=daysOfTheWeek.d.ts.map

package/dist/types/daysOfTheWeek.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"daysOfTheWeek.d.ts","sourceRoot":"","sources":["../../types/daysOfTheWeek.ts"],"names":[],"mappings":"AAAA,oBAAY,GAAG;IACX,MAAM,IAAI;IACV,MAAM,IAAI;IACV,OAAO,IAAI;IACX,SAAS,IAAI;IACb,QAAQ,IAAI;IACZ,MAAM,IAAI;IACV,QAAQ,IAAI;CACf"}

package/dist/types/handlers.d.ts

@@ -0,0 +1,7 @@
+import ChatContext from '../entities/context/chatContext';
+import MessageContext from '../entities/context/messageContext';
+import IActionState from './actionState';
+import { CachedValueAccessor } from './cachedValueAccessor';
+export type CommandHandler<TActionState extends IActionState> = (ctx: MessageContext<TActionState>, state: TActionState) => Promise<void>;
+export type ScheduledHandler = (ctx: ChatContext, getCached: CachedValueAccessor) => Promise<void>;
+//# sourceMappingURL=handlers.d.ts.map

package/dist/types/handlers.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"handlers.d.ts","sourceRoot":"","sources":["../../types/handlers.ts"],"names":[],"mappings":"AAAA,OAAO,WAAW,MAAM,iCAAiC,CAAC;AAC1D,OAAO,cAAc,MAAM,oCAAoC,CAAC;AAChE,OAAO,YAAY,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,MAAM,MAAM,cAAc,CAAC,YAAY,SAAS,YAAY,IAAI,CAC5D,GAAG,EAAE,cAAc,CAAC,YAAY,CAAC,EACjC,KAAK,EAAE,YAAY,KAClB,OAAO,CAAC,IAAI,CAAC,CAAC;AAEnB,MAAM,MAAM,gBAAgB,GAAG,CAC3B,GAAG,EAAE,WAAW,EAChB,SAAS,EAAE,mBAAmB,KAC7B,OAAO,CAAC,IAAI,CAAC,CAAC"}

package/dist/types/replyMessage.d.ts

@@ -0,0 +1,7 @@
+export default interface IReplyMessage<TType> {
+    content: TType;
+    chatId: number;
+    replyId: number | undefined;
+    traceId: number | string;
+}
+//# sourceMappingURL=replyMessage.d.ts.map

package/dist/types/replyMessage.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"replyMessage.d.ts","sourceRoot":"","sources":["../../types/replyMessage.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,WAAW,aAAa,CAAC,KAAK;IACxC,OAAO,EAAE,KAAK,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC;CAC5B"}

package/dist/types/storage.d.ts

@@ -0,0 +1,12 @@
+import ActionStateBase from '../entities/states/actionStateBase';
+import TransactionResult from '../entities/transactionResult';
+import IActionState from './actionState';
+import IActionWithState from './actionWithState';
+export interface IStorageClient {
+    close(): Promise<void>;
+    load(key: string): Promise<Record<number, ActionStateBase>>;
+    saveMetadata(actions: IActionWithState[], botName: string): Promise<void>;
+    getActionState<TActionState extends IActionState>(entity: IActionWithState, chatId: number): Promise<TActionState>;
+    saveActionExecutionResult(action: IActionWithState, chatId: number, transactionResult: TransactionResult): Promise<void>;
+}
+//# sourceMappingURL=storage.d.ts.map

package/dist/types/storage.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../types/storage.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,MAAM,oCAAoC,CAAC;AACjE,OAAO,iBAAiB,MAAM,+BAA+B,CAAC;AAC9D,OAAO,YAAY,MAAM,eAAe,CAAC;AACzC,OAAO,gBAAgB,MAAM,mBAAmB,CAAC;AAEjD,MAAM,WAAW,cAAc;IAC3B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC,CAAC;IAC5D,YAAY,CAAC,OAAO,EAAE,gBAAgB,EAAE,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1E,cAAc,CAAC,YAAY,SAAS,YAAY,EAC5C,MAAM,EAAE,gBAAgB,EACxB,MAAM,EAAE,MAAM,GACf,OAAO,CAAC,YAAY,CAAC,CAAC;IACzB,yBAAyB,CACrB,MAAM,EAAE,gBAAgB,EACxB,MAAM,EAAE,MAAM,EACd,iBAAiB,EAAE,iBAAiB,GACrC,OAAO,CAAC,IAAI,CAAC,CAAC;CACpB"}

package/dist/types/timeValues.d.ts

@@ -0,0 +1,11 @@
+export type Milliseconds = number & {
+    __brand: 'ms';
+};
+export type Seconds = number & {
+    __brand: 's';
+};
+export type Hours = number & {
+    __brand: 'h';
+};
+export type HoursOfDay = 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20 | 21 | 22 | 23;
+//# sourceMappingURL=timeValues.d.ts.map

package/dist/types/timeValues.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"timeValues.d.ts","sourceRoot":"","sources":["../../types/timeValues.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG;IAAE,OAAO,EAAE,IAAI,CAAA;CAAE,CAAC;AACtD,MAAM,MAAM,OAAO,GAAG,MAAM,GAAG;IAAE,OAAO,EAAE,GAAG,CAAA;CAAE,CAAC;AAChD,MAAM,MAAM,KAAK,GAAG,MAAM,GAAG;IAAE,OAAO,EAAE,GAAG,CAAA;CAAE,CAAC;AAE9C,MAAM,MAAM,UAAU,GAChB,CAAC,GACD,CAAC,GACD,CAAC,GACD,CAAC,GACD,CAAC,GACD,CAAC,GACD,CAAC,GACD,CAAC,GACD,CAAC,GACD,CAAC,GACD,EAAE,GACF,EAAE,GACF,EAAE,GACF,EAAE,GACF,EAAE,GACF,EAAE,GACF,EAAE,GACF,EAAE,GACF,EAAE,GACF,EAAE,GACF,EAAE,GACF,EAAE,GACF,EAAE,GACF,EAAE,CAAC"}

package/entities/actions/commandAction.ts

@@ -1,5 +1,4 @@
-import storage from '../../services/storage';
-import TransactionResult from '../transactionResult';
+import ActionExecutionResult from '../transactionResult';
 import moment from 'moment';
 import logger from '../../services/logger';
 import MessageContext from '../context/messageContext';
@@ -57,7 +56,7 @@ export default class CommandAction<TActionState extends IActionState>
 
         if (!isConditionMet) return;
 
-        const state = await storage.getActionState<TActionState>(
+        const state = await ctx.storage.getActionState<TActionState>(
             this,
             ctx.chatId
         );
@@ -91,10 +90,10 @@ export default class CommandAction<TActionState extends IActionState>
 
         ctx.updateActions.forEach((action) => action(state));
 
-        await storage.commitTransactionForAction(
+        await ctx.storage.saveActionExecutionResult(
             this,
             ctx.chatId,
-            new TransactionResult(state, ctx.startCooldown && shouldTrigger)
+            new ActionExecutionResult(state, ctx.startCooldown && shouldTrigger)
         );
     }
 

package/entities/actions/scheduledAction.ts

@@ -1,4 +1,3 @@
-import storage from '../../services/storage';
 import TransactionResult from '../transactionResult';
 import moment from 'moment';
 import logger from '../../services/logger';
@@ -47,7 +46,7 @@ export default class ScheduledAction implements IActionWithState {
     async exec(ctx: ChatContext) {
         if (!this.active || !this.chatsWhitelist.includes(ctx.chatId)) return;
 
-        const state = await storage.getActionState(this, ctx.chatId);
+        const state = await ctx.storage.getActionState(this, ctx.chatId);
         const isAllowedToTrigger = this.shouldTrigger(state);
 
         if (isAllowedToTrigger) {
@@ -64,7 +63,7 @@ export default class ScheduledAction implements IActionWithState {
 
             state.lastExecutedDate = moment().valueOf();
 
-            await storage.commitTransactionForAction(
+            await ctx.storage.saveActionExecutionResult(
                 this,
                 ctx.chatId,
                 new TransactionResult(state, isAllowedToTrigger)

package/entities/bot.ts

@@ -11,28 +11,32 @@ import {
     secondsToMilliseconds
 } from '../helpers/timeConvertions';
 import { Hours, Seconds } from '../types/timeValues';
-import storage from '../services/storage';
+import JsonFileStorage from '../services/jsonFileStorage';
+import { IStorageClient } from '../types/storage';
 
 export default class Bot {
     name: string;
-    api: TelegramApiService;
-    telegraf: Telegraf;
-    commands: CommandAction<IActionState>[];
-    scheduled: ScheduledAction[];
-    chats: Map<string, number>;
-    messageQueue: IncomingMessage[] = [];
-
-    constructor(
-        name: string,
-        token: string,
-        commands: CommandAction<IActionState>[],
-        scheduled: ScheduledAction[],
-        chats: Map<string, number>
-    ) {
-        this.name = name;
-        this.commands = commands;
-        this.scheduled = scheduled;
-        this.chats = chats;
+    private api: TelegramApiService;
+    private telegraf: Telegraf;
+    private commands: CommandAction<IActionState>[];
+    private scheduled: ScheduledAction[];
+    private chats: Map<string, number>;
+    private messageQueue: IncomingMessage[] = [];
+    storage: IStorageClient;
+
+    constructor(options: {
+        name: string;
+        token: string;
+        commands: CommandAction<IActionState>[];
+        scheduled: ScheduledAction[];
+        chats: Map<string, number>;
+        storageClient?: IStorageClient;
+        storagePath?: string;
+    }) {
+        this.name = options.name;
+        this.commands = options.commands;
+        this.scheduled = options.scheduled;
+        this.chats = options.chats;
 
         logger.logWithTraceId(
             this.name,
@@ -40,9 +44,16 @@ export default class Bot {
             'System',
             'Starting bot...'
         );
-        this.telegraf = new Telegraf(token);
-
-        this.api = new TelegramApiService(this.name, this.telegraf, this.chats);
+        this.telegraf = new Telegraf(options.token);
+        this.storage =
+            options.storageClient ??
+            new JsonFileStorage(options.name, options.storagePath);
+        this.api = new TelegramApiService(
+            this.name,
+            this.telegraf,
+            this.storage,
+            this.chats
+        );
 
         this.telegraf.on('message', async (ctx) => {
             const msg = new IncomingMessage(ctx.update.message);
@@ -86,10 +97,13 @@ export default class Bot {
             this.name
         );
 
-        storage.saveMetadata([...this.commands, ...this.scheduled], this.name);
+        this.storage.saveMetadata(
+            [...this.commands, ...this.scheduled],
+            this.name
+        );
     }
 
-    stop(code: string) {
+    async stop(code: string) {
         logger.logWithTraceId(
             this.name,
             `System:Bot-${this.name}-Stop`,
@@ -97,6 +111,7 @@ export default class Bot {
             'Stopping bot...'
         );
 
+        await this.storage.close();
         this.telegraf.stop(code);
     }
 

package/entities/context/chatContext.ts

@@ -3,6 +3,7 @@ import TextMessage from '../responses/textMessage';
 import VideoMessage from '../responses/videoMessage';
 import { resolve } from 'path';
 import { IBotApiInteractions } from '../../services/telegramApi';
+import { IStorageClient } from '../../types/storage';
 
 export default class ChatContext {
     botName: string;
@@ -10,19 +11,22 @@ export default class ChatContext {
     chatId: number;
     chatName: string;
     traceId: number | string;
+    storage: IStorageClient;
 
     constructor(
         botName: string,
         interactions: IBotApiInteractions,
         chatId: number,
         chatName: string,
-        traceId: number | string
+        traceId: number | string,
+        storage: IStorageClient
     ) {
         this.botName = botName;
         this.interactions = interactions;
         this.chatId = chatId;
         this.chatName = chatName;
         this.traceId = traceId;
+        this.storage = storage;
     }
 
     sendTextToChat(text: string) {

package/entities/context/messageContext.ts

@@ -3,12 +3,13 @@ import ImageMessage from '../responses/imageMessage';
 import TextMessage from '../responses/textMessage';
 import VideoMessage from '../responses/videoMessage';
 import ChatContext from './chatContext';
-import storage from '../../services/storage';
+import storage from '../../services/jsonFileStorage';
 import { resolve } from 'path';
 import IActionState from '../../types/actionState';
 import { IBotApiInteractions } from '../../services/telegramApi';
 import { TelegramEmoji } from 'telegraf/types';
 import Reaction from '../responses/reaction';
+import { IStorageClient } from '../../types/storage';
 
 export default class MessageContext<
     TActionState extends IActionState
@@ -30,9 +31,10 @@ export default class MessageContext<
         messageText: string,
         fromUserId: number | undefined,
         traceId: number | string,
-        fromUserName: string
+        fromUserName: string,
+        storage: IStorageClient
     ) {
-        super(botName, interactions, chatId, chatName, traceId);
+        super(botName, interactions, chatId, chatName, traceId, storage);
 
         this.messageId = messageId;
         this.messageText = messageText;
@@ -44,9 +46,11 @@ export default class MessageContext<
         commandName: string
     ): Promise<TAnotherActionState> {
         return (
-            ((await storage.load(`command:${commandName.replace('.', '-')}`))[
-                this.chatId
-            ] as TAnotherActionState) ?? new ActionStateBase()
+            ((
+                await this.storage.load(
+                    `command:${commandName.replace('.', '-')}`
+                )
+            )[this.chatId] as TAnotherActionState) ?? new ActionStateBase()
         );
     }
 

package/entities/incomingMessage.ts

@@ -1,5 +1,5 @@
 import { Chat, User } from 'telegraf/types';
-import randomInteger from '../helpers/randomInt';
+import { randomInt } from 'crypto';
 
 export default class IncomingMessage {
     message_id: number;
@@ -7,7 +7,7 @@ export default class IncomingMessage {
     from: User | undefined;
     text: string;
     chatName: string;
-    traceId = randomInteger(10000, 99999);
+    traceId = randomInt(10000, 99999);
 
     constructor(ctxMessage: {
         message_id: number;

package/index.ts

@@ -1,3 +1,28 @@
-export { startBot, stopBots } from './main';
-export * from './helpers/builders/commandActionBuilder';
-export * from './helpers/builders/scheduledActionBuilder';
+import { startBot, stopBots } from './main';
+import { CommandActionBuilder } from './helpers/builders/commandActionBuilder';
+import { CommandActionBuilderWithState } from './helpers/builders/commandActionBuilder';
+import ScheduledActionBuilder from './helpers/builders/scheduledActionBuilder';
+import {
+    hoursToMilliseconds,
+    hoursToSeconds,
+    secondsToMilliseconds
+} from './helpers/timeConvertions';
+import Noop from './helpers/noop';
+import { IStorageClient } from './types/storage';
+
+const helpers = {
+    hoursToMilliseconds,
+    hoursToSeconds,
+    secondsToMilliseconds,
+    Noop
+};
+
+export {
+    startBot,
+    stopBots,
+    CommandActionBuilder,
+    CommandActionBuilderWithState,
+    ScheduledActionBuilder,
+    IStorageClient as IStorage,
+    helpers
+};