chz-telegram-bot 0.0.2 → 0.0.3

package/main.ts

@@ -1,7 +1,6 @@
 import { readFile } from 'fs/promises';
 import BotInstance from './entities/bot.js';
 import taskScheduler from './services/taskScheduler.js';
-import storage from './services/storage.js';
 import logger from './services/logger.js';
 import CommandAction from './entities/actions/commandAction.js';
 import IActionState from './types/actionState.js';
@@ -15,13 +14,21 @@ function log(text: string) {
 
 async function startBot(
     name: string,
-    tokenFile: string,
+    tokenFilePath: string,
     commands: CommandAction<IActionState>[],
     scheduled: ScheduledAction[],
-    chats: Map<string, number>
+    chats: Map<string, number>,
+    storagePath?: string
 ) {
-    const token = await readFile(tokenFile, 'utf8');
-    const bot = new BotInstance(name, token, commands, scheduled, chats);
+    const token = await readFile(tokenFilePath, 'utf8');
+    const bot = new BotInstance({
+        name,
+        token,
+        commands,
+        scheduled,
+        chats,
+        storagePath
+    });
     bots.push(bot);
 
     return bot;
@@ -31,14 +38,11 @@ async function stopBots(reason: string) {
     log(`Recieved termination code: ${reason}`);
     taskScheduler.stopAll();
     log('Acquiring storage semaphore...');
-    await storage.semaphoreInstance.acquire();
 
     log('Stopping bots...');
     for (const bot of bots) {
         bot.stop(reason);
     }
-
-    process.exit(0);
 }
 
 export { startBot, stopBots };

package/package.json

@@ -1,10 +1,9 @@
 {
     "name": "chz-telegram-bot",
-    "version": "0.0.2",
+    "version": "0.0.3",
     "type": "module",
     "dependencies": {
         "async-sema": "^3.1.1",
-        "markdown-escape": "^2.0.0",
         "moment": "^2.29.4",
         "telegraf": "^4.16.3"
     },

package/services/{storage.ts → jsonFileStorage.ts}

@@ -6,26 +6,27 @@ 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';
 
-class Storage {
-    static semaphore = new Semaphore(1);
-    cache: Map<string, Record<number, ActionStateBase>>;
+export default class JsonFileStorage implements IStorageClient {
+    semaphore = new Semaphore(1);
+    private cache: Map<string, Record<number, ActionStateBase>>;
+    private storagePath: string;
+    private botName: string;
 
-    get semaphoreInstance() {
-        return Storage.semaphore;
-    }
-
-    constructor() {
+    constructor(botName: string, path: string | undefined) {
         this.cache = new Map<string, Record<number, ActionStateBase>>();
+        this.botName = botName;
+        this.storagePath = path ?? 'storage';
     }
 
     private async lock<TType>(action: () => Promise<TType>) {
-        await this.semaphoreInstance.acquire();
+        await this.semaphore.acquire();
 
         try {
             return await action();
         } finally {
-            this.semaphoreInstance.release();
+            this.semaphore.release();
         }
     }
 
@@ -62,7 +63,10 @@ class Storage {
     }
 
     private buidPathFromKey(key: string) {
-        return 'storage/' + key.replaceAll(':', '/') + '.json';
+        return `${this.storagePath}/${this.botName}/${key.replaceAll(
+            ':',
+            '/'
+        )}.json`;
     }
 
     async load(key: string) {
@@ -92,7 +96,7 @@ class Storage {
         });
     }
 
-    async commitTransactionForAction(
+    async saveActionExecutionResult(
         action: IActionWithState,
         chatId: number,
         transactionResult: TransactionResult
@@ -106,6 +110,8 @@ class Storage {
             }
         });
     }
-}
 
-export default new Storage();
+    async close(): Promise<void> {
+        await this.semaphore.acquire();
+    }
+}

package/services/telegramApi.ts

@@ -12,21 +12,25 @@ import { Milliseconds } from '../types/timeValues';
 import Reaction from '../entities/responses/reaction';
 import { InputFile } from 'telegraf/types';
 import { reverseMap } from '../helpers/reverseMap';
+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>
     ) {
         this.telegraf = telegraf;
         this.botName = botName;
         this.chats = reverseMap(chats);
+        this.storage = storage;
 
         taskScheduler.createTask(
             'MessageSending',
@@ -151,7 +155,8 @@ export default class TelegramApiService {
             incomingMessage.text,
             incomingMessage.from?.id,
             incomingMessage.traceId,
-            firstName + lastName
+            firstName + lastName,
+            this.storage
         );
     }
 
@@ -161,7 +166,8 @@ export default class TelegramApiService {
             this.getInteractions(),
             chatId,
             this.chats.get(chatId)!,
-            `Scheduled:${scheduledName}:${chatId}`
+            `Scheduled:${scheduledName}:${chatId}`,
+            this.storage
         );
     }
 }

package/tsconfig.json

@@ -50,8 +50,8 @@
     // "maxNodeModuleJsDepth": 1,                        /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */
 
     /* Emit */
-    // "declaration": true,                              /* Generate .d.ts files from TypeScript and JavaScript files in your project. */
-    // "declarationMap": true,                           /* Create sourcemaps for d.ts files. */
+    "declaration": true,                              /* Generate .d.ts files from TypeScript and JavaScript files in your project. */
+    "declarationMap": true,                           /* Create sourcemaps for d.ts files. */
     // "emitDeclarationOnly": true,                      /* Only output d.ts files and not JavaScript files. */
     // "sourceMap": true,                                /* Create source map files for emitted JavaScript files. */
     // "inlineSourceMap": true,                          /* Include sourcemap files inside the emitted JavaScript. */

package/types/storage.ts

@@ -0,0 +1,19 @@
+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>;
+}

package/dist/entities/states/potuzhnoState.js

@@ -1,13 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const actionStateBase_1 = __importDefault(require("./actionStateBase"));
-class PotuzhnoState extends actionStateBase_1.default {
-    constructor() {
-        super(...arguments);
-        this.scoreBoard = {};
-    }
-}
-exports.default = PotuzhnoState;

package/dist/helpers/escapeMarkdown.js

@@ -1,17 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = escapeMarkdown;
-const markdown_escape_1 = __importDefault(require("markdown-escape"));
-function escapeMarkdown(text) {
-    return (0, markdown_escape_1.default)(text)
-        .replaceAll(/\./g, '\\.')
-        .replaceAll(/-/g, '\\-')
-        .replaceAll(/\+/g, '\\+')
-        .replaceAll(/\{/g, '\\{')
-        .replaceAll(/!/g, '\\!')
-        .replaceAll(/\|/g, '\\|')
-        .replaceAll(/\}/g, '\\}');
-}

package/dist/helpers/getWeek.js

@@ -1,12 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = getCurrentWeek;
-const moment_1 = __importDefault(require("moment"));
-function getCurrentWeek() {
-    const firstDay = (0, moment_1.default)().startOf('isoWeek').format('YYYY-MM-DD');
-    const lastDay = (0, moment_1.default)().endOf('isoWeek').format('YYYY-MM-DD');
-    return { firstDay, lastDay };
-}

package/dist/helpers/randomInt.js

@@ -1,8 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = randomInteger;
-function randomInteger(x1, x2) {
-    const range = x2 - x1 + 1;
-    const random = Math.floor(Math.random() * range);
-    return random + x1;
-}

package/entities/states/potuzhnoState.ts

@@ -1,5 +0,0 @@
-import ActionStateBase from './actionStateBase';
-
-export default class PotuzhnoState extends ActionStateBase {
-    scoreBoard: Record<string, number> = {};
-}

package/helpers/escapeMarkdown.ts

@@ -1,12 +0,0 @@
-import escape from 'markdown-escape';
-
-export default function escapeMarkdown(text: string) {
-    return escape(text)
-        .replaceAll(/\./g, '\\.')
-        .replaceAll(/-/g, '\\-')
-        .replaceAll(/\+/g, '\\+')
-        .replaceAll(/\{/g, '\\{')
-        .replaceAll(/!/g, '\\!')
-        .replaceAll(/\|/g, '\\|')
-        .replaceAll(/\}/g, '\\}');
-}

package/helpers/getWeek.ts

@@ -1,8 +0,0 @@
-import moment from 'moment';
-
-export default function getCurrentWeek() {
-    const firstDay = moment().startOf('isoWeek').format('YYYY-MM-DD');
-    const lastDay = moment().endOf('isoWeek').format('YYYY-MM-DD');
-
-    return { firstDay, lastDay };
-}

package/helpers/randomInt.ts

@@ -1,7 +0,0 @@
-export default function randomInteger(x1: number, x2: number): number {
-    const range = x2 - x1 + 1;
-
-    const random = Math.floor(Math.random() * range);
-
-    return random + x1;
-}

package/types/scheduledItem.ts

@@ -1,6 +0,0 @@
-export interface IScheduledItem {
-    name: string;
-    time: string;
-    type: string;
-    link: string | undefined;
-}