chz-telegram-bot 0.0.14 → 0.0.16

package/main.ts

@@ -1,16 +1,16 @@
 import { readFile } from 'fs/promises';
-import BotInstance from './entities/bot.js';
-import taskScheduler from './services/taskScheduler.js';
-import logger from './services/logger.js';
-import CommandAction from './entities/actions/commandAction.js';
-import IActionState from './types/actionState.js';
-import ScheduledAction from './entities/actions/scheduledAction.js';
-import { IStorageClient } from './types/storage.js';
+import { IStorageClient } from './types/storage';
+import { Logger } from './services/logger';
+import { CommandAction } from './entities/actions/commandAction';
+import { ScheduledAction } from './entities/actions/scheduledAction';
+import { IActionState } from './types/actionState';
+import { Scheduler } from './services/taskScheduler';
+import { BotInstance } from './entities/botInstance';
 
 const bots: BotInstance[] = [];
 
 function log(text: string) {
-    logger.logWithTraceId('ALL BOTS', 'System:Bot', 'System', text);
+    Logger.logWithTraceId('ALL BOTS', 'System:Bot', 'System', text);
 }
 
 async function startBot(options: {
@@ -39,7 +39,7 @@ async function startBot(options: {
 
 async function stopBots(reason: string) {
     log(`Recieved termination code: ${reason}`);
-    taskScheduler.stopAll();
+    Scheduler.stopAll();
     log('Acquiring storage semaphore...');
 
     log('Stopping bots...');

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "chz-telegram-bot",
-    "version": "0.0.14",
+    "version": "0.0.16",
     "type": "module",
     "dependencies": {
         "async-sema": "^3.1.1",

package/services/jsonFileStorage.ts

@@ -1,14 +1,14 @@
 import { existsSync, mkdirSync } from 'fs';
 import { dirname } from 'path';
-import TransactionResult from '../entities/transactionResult';
 import { mkdir, readFile, writeFile } from 'fs/promises';
-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';
+import { ActionStateBase } from '../entities/states/actionStateBase';
+import { ActionExecutionResult } from '../entities/actionExecutionResult';
+import { IActionState } from '../types/actionState';
+import { IActionWithState } from '../types/actionWithState';
 
-export default class JsonFileStorage implements IStorageClient {
+export class JsonFileStorage implements IStorageClient {
     semaphore = new Semaphore(1);
     private cache: Map<string, Record<number, IActionState>>;
     private storagePath: string;
@@ -105,7 +105,7 @@ export default class JsonFileStorage implements IStorageClient {
     async saveActionExecutionResult(
         action: IActionWithState,
         chatId: number,
-        transactionResult: TransactionResult
+        transactionResult: ActionExecutionResult
     ) {
         await this.lock(async () => {
             const data = await this.loadInternal(action.key);

package/services/logger.ts

@@ -1,4 +1,4 @@
-class Logger {
+class JsonLogger {
     logWithTraceId(
         botName: string,
         traceId: string | number,
@@ -27,4 +27,4 @@ class Logger {
     }
 }
 
-export default new Logger();
+export const Logger = new JsonLogger();

package/services/taskScheduler.ts

@@ -1,7 +1,7 @@
-import TaskRecord from '../entities/taskRecord';
+import { TaskRecord } from '../entities/taskRecord';
 import { secondsToMilliseconds } from '../helpers/timeConvertions';
 import { Milliseconds, Seconds } from '../types/timeValues';
-import logger from './logger';
+import { Logger } from './logger';
 
 class TaskScheduler {
     activeTasks: TaskRecord[] = [];
@@ -27,7 +27,7 @@ class TaskScheduler {
             setTimeout(action, secondsToMilliseconds(1 as Seconds));
         }
 
-        logger.logWithTraceId(
+        Logger.logWithTraceId(
             ownerName,
             `System:TaskScheduler-${ownerName}-${name}`,
             'System',
@@ -44,7 +44,7 @@ class TaskScheduler {
         ownerName: string
     ) {
         const actionWrapper = () => {
-            logger.logWithTraceId(
+            Logger.logWithTraceId(
                 ownerName,
                 `System:TaskScheduler-${ownerName}-${name}`,
                 'System',
@@ -54,7 +54,7 @@ class TaskScheduler {
         };
         const taskId = setTimeout(actionWrapper, delay);
 
-        logger.logWithTraceId(
+        Logger.logWithTraceId(
             ownerName,
             `System:TaskScheduler-${ownerName}-${name}`,
             'System',
@@ -63,4 +63,4 @@ class TaskScheduler {
     }
 }
 
-export default new TaskScheduler();
+export const Scheduler = new TaskScheduler();

package/services/telegramApi.ts

@@ -1,20 +1,20 @@
-import MessageContext from '../entities/context/messageContext';
-import ChatContext from '../entities/context/chatContext';
-import ImageMessage from '../entities/responses/imageMessage';
-import TextMessage from '../entities/responses/textMessage';
-import VideoMessage from '../entities/responses/videoMessage';
-import taskScheduler from './taskScheduler';
-import logger from './logger';
 import { Telegraf } from 'telegraf';
-import IReplyMessage from '../types/replyMessage';
-import IncomingMessage from '../entities/incomingMessage';
-import { Milliseconds } from '../types/timeValues';
-import Reaction from '../entities/responses/reaction';
 import { InputFile } from 'telegraf/types';
+import { ChatContext } from '../entities/context/chatContext';
+import { MessageContext } from '../entities/context/messageContext';
+import { ImageMessage } from '../entities/responses/imageMessage';
+import { TextMessage } from '../entities/responses/textMessage';
+import { VideoMessage } from '../entities/responses/videoMessage';
 import { reverseMap } from '../helpers/reverseMap';
+import { IReplyMessage } from '../types/replyMessage';
 import { IStorageClient } from '../types/storage';
+import { Milliseconds } from '../types/timeValues';
+import { Scheduler } from './taskScheduler';
+import { Logger } from './logger';
+import { Reaction } from '../entities/responses/reaction';
+import { IncomingMessage } from '../entities/incomingMessage';
 
-export default class TelegramApiService {
+export class TelegramApiService {
     botName: string;
     telegraf: Telegraf;
     chats: Map<number, string>;
@@ -32,7 +32,7 @@ export default class TelegramApiService {
         this.chats = reverseMap(chats);
         this.storage = storage;
 
-        taskScheduler.createTask(
+        Scheduler.createTask(
             'MessageSending',
             () => {
                 this.dequeueResponse();
@@ -51,7 +51,7 @@ export default class TelegramApiService {
         try {
             await this.processResponse(message);
         } catch (error) {
-            logger.errorWithTraceId(
+            Logger.errorWithTraceId(
                 this.botName,
                 message.traceId,
                 this.chats.get(message.chatId)!,
@@ -114,7 +114,7 @@ export default class TelegramApiService {
                 );
                 break;
             default:
-                logger.errorWithTraceId(
+                Logger.errorWithTraceId(
                     this.botName,
                     response.traceId,
                     this.chats.get(response.chatId)!,

package/types/actionState.ts

@@ -1,3 +1,3 @@
-export default interface IActionState {
+export interface IActionState {
     lastExecutedDate: number;
 }

package/types/actionWithState.ts

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

package/types/commandCondition.ts

@@ -1,5 +1,5 @@
-import MessageContext from '../entities/context/messageContext';
-import IActionState from './actionState';
+import { MessageContext } from '../entities/context/messageContext';
+import { IActionState } from './actionState';
 
 export type CommandCondition<TActionState extends IActionState> = (
     ctx: MessageContext<TActionState>

package/types/handlers.ts

@@ -1,6 +1,6 @@
-import ChatContext from '../entities/context/chatContext';
-import MessageContext from '../entities/context/messageContext';
-import IActionState from './actionState';
+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> = (

package/types/replyMessage.ts

@@ -1,4 +1,4 @@
-export default interface IReplyMessage<TType> {
+export interface IReplyMessage<TType> {
     content: TType;
     chatId: number;
     replyId: number | undefined;

package/types/storage.ts

@@ -1,7 +1,6 @@
-import ActionStateBase from '../entities/states/actionStateBase';
-import TransactionResult from '../entities/transactionResult';
-import IActionState from './actionState';
-import IActionWithState from './actionWithState';
+import { ActionExecutionResult } from '../entities/actionExecutionResult';
+import { IActionState } from './actionState';
+import { IActionWithState } from './actionWithState';
 
 export interface IStorageClient {
     close(): Promise<void>;
@@ -16,6 +15,6 @@ export interface IStorageClient {
     saveActionExecutionResult(
         action: IActionWithState,
         chatId: number,
-        transactionResult: TransactionResult
+        transactionResult: ActionExecutionResult
     ): Promise<void>;
 }

package/dist/entities/bot.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"bot.d.ts","sourceRoot":"","sources":["../../entities/bot.ts"],"names":[],"mappings":"AAKA,OAAO,aAAa,MAAM,yBAAyB,CAAC;AACpD,OAAO,eAAe,MAAM,2BAA2B,CAAC;AACxD,OAAO,YAAY,MAAM,sBAAsB,CAAC;AAOhD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,MAAM,CAAC,OAAO,OAAO,GAAG;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,GAAG,CAAqB;IAChC,OAAO,CAAC,QAAQ,CAAW;IAC3B,OAAO,CAAC,QAAQ,CAAgC;IAChD,OAAO,CAAC,SAAS,CAAoB;IACrC,OAAO,CAAC,KAAK,CAAsB;IACnC,OAAO,CAAC,YAAY,CAAyB;IAC7C,OAAO,EAAE,cAAc,CAAC;gBAEZ,OAAO,EAAE;QACjB,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;QACd,QAAQ,EAAE,aAAa,CAAC,YAAY,CAAC,EAAE,CAAC;QACxC,SAAS,EAAE,eAAe,EAAE,CAAC;QAC7B,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC3B,aAAa,CAAC,EAAE,cAAc,CAAC;QAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;KACxB;IAuEK,IAAI,CAAC,IAAI,EAAE,MAAM;YAYT,YAAY;YAqBZ,eAAe;CAmBhC"}

package/dist/entities/transactionResult.d.ts

@@ -1,7 +0,0 @@
-import IActionState from '../types/actionState';
-export default class TransactionResult {
-    data: IActionState;
-    shouldUpdate: boolean;
-    constructor(data: IActionState, shouldUpdate: boolean);
-}
-//# sourceMappingURL=transactionResult.d.ts.map

package/dist/entities/transactionResult.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"transactionResult.d.ts","sourceRoot":"","sources":["../../entities/transactionResult.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,sBAAsB,CAAC;AAEhD,MAAM,CAAC,OAAO,OAAO,iBAAiB;IAClC,IAAI,EAAE,YAAY,CAAC;IACnB,YAAY,EAAE,OAAO,CAAC;gBAEV,IAAI,EAAE,YAAY,EAAE,YAAY,EAAE,OAAO;CAIxD"}