chz-telegram-bot 0.0.15 → 0.0.16

package/dist/types/actionWithState.d.ts

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

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

@@ -1 +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"}
+{"version":3,"file":"actionWithState.d.ts","sourceRoot":"","sources":["../../types/actionWithState.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE7C,MAAM,WAAW,gBAAgB;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ,gBAAgB,EAAE,MAAM,YAAY,CAAC;CACxC"}

package/dist/types/commandCondition.d.ts

@@ -1,4 +1,4 @@
-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>) => Promise<boolean>;
 //# sourceMappingURL=commandCondition.d.ts.map

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

@@ -1 +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"}
+{"version":3,"file":"commandCondition.d.ts","sourceRoot":"","sources":["../../types/commandCondition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE7C,MAAM,MAAM,gBAAgB,CAAC,YAAY,SAAS,YAAY,IAAI,CAC9D,GAAG,EAAE,cAAc,CAAC,YAAY,CAAC,KAChC,OAAO,CAAC,OAAO,CAAC,CAAC"}

package/dist/types/handlers.d.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> = (ctx: MessageContext<TActionState>, state: TActionState) => Promise<void>;
 export type ScheduledHandler = (ctx: ChatContext, getCached: CachedValueAccessor) => Promise<void>;

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

@@ -1 +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"}
+{"version":3,"file":"handlers.d.ts","sourceRoot":"","sources":["../../types/handlers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,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

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

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

@@ -1 +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;IACzB,iBAAiB,EAAE,OAAO,CAAC;CAC9B"}
+{"version":3,"file":"replyMessage.d.ts","sourceRoot":"","sources":["../../types/replyMessage.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,aAAa,CAAC,KAAK;IAChC,OAAO,EAAE,KAAK,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,iBAAiB,EAAE,OAAO,CAAC;CAC9B"}

package/dist/types/storage.d.ts

@@ -1,11 +1,11 @@
-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>;
     load<TActionState extends IActionState>(key: string): Promise<Record<number, TActionState>>;
     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>;
+    saveActionExecutionResult(action: IActionWithState, chatId: number, transactionResult: ActionExecutionResult): Promise<void>;
 }
 //# sourceMappingURL=storage.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../types/storage.ts"],"names":[],"mappings":"AACA,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,YAAY,SAAS,YAAY,EAClC,GAAG,EAAE,MAAM,GACZ,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC;IACzC,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"}
+{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../types/storage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAErD,MAAM,WAAW,cAAc;IAC3B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,IAAI,CAAC,YAAY,SAAS,YAAY,EAClC,GAAG,EAAE,MAAM,GACZ,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC;IACzC,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,qBAAqB,GACzC,OAAO,CAAC,IAAI,CAAC,CAAC;CACpB"}

package/entities/{transactionResult.ts → actionExecutionResult.ts}

@@ -1,6 +1,6 @@
-import IActionState from '../types/actionState';
+import { IActionState } from '../types/actionState';
 
-export default class TransactionResult {
+export class ActionExecutionResult {
     data: IActionState;
     shouldUpdate: boolean;
 

package/entities/actions/commandAction.ts

@@ -1,17 +1,17 @@
-import ActionExecutionResult from '../transactionResult';
 import moment from 'moment';
-import logger from '../../services/logger';
-import MessageContext from '../context/messageContext';
-import IActionWithState from '../../types/actionWithState';
-import toArray from '../../helpers/toArray';
-import IActionState from '../../types/actionState';
-import CommandTriggerCheckResult from '../commandTriggerCheckResult';
 import { CommandHandler } from '../../types/handlers';
 import { CommandCondition } from '../../types/commandCondition';
 import { Seconds } from '../../types/timeValues';
 import { secondsToMilliseconds } from '../../helpers/timeConvertions';
-
-export default class CommandAction<TActionState extends IActionState>
+import { toArray } from '../../helpers/toArray';
+import { IActionState } from '../../types/actionState';
+import { IActionWithState } from '../../types/actionWithState';
+import { CommandTriggerCheckResult } from '../commandTriggerCheckResult';
+import { MessageContext } from '../context/messageContext';
+import { Logger } from '../../services/logger';
+import { ActionExecutionResult } from '../actionExecutionResult';
+
+export class CommandAction<TActionState extends IActionState>
     implements IActionWithState
 {
     triggers: (string | RegExp)[];
@@ -70,7 +70,7 @@ export default class CommandAction<TActionState extends IActionState>
 
         if (!shouldTrigger) return;
 
-        logger.logWithTraceId(
+        Logger.logWithTraceId(
             ctx.botName,
             ctx.traceId,
             ctx.chatName,

package/entities/actions/scheduledAction.ts

@@ -1,18 +1,18 @@
-import TransactionResult from '../transactionResult';
 import moment from 'moment';
-import logger from '../../services/logger';
-import taskScheduler from '../../services/taskScheduler';
 import { Sema as Semaphore } from 'async-sema';
-import ChatContext from '../context/chatContext';
-import IActionWithState from '../../types/actionWithState';
-import ActionStateBase from '../states/actionStateBase';
-import IActionState from '../../types/actionState';
 import { ScheduledHandler } from '../../types/handlers';
-import CachedStateFactory from '../cachedStateFactory';
 import { hoursToMilliseconds } from '../../helpers/timeConvertions';
 import { HoursOfDay } from '../../types/timeValues';
-
-export default class ScheduledAction implements IActionWithState {
+import { IActionState } from '../../types/actionState';
+import { IActionWithState } from '../../types/actionWithState';
+import { CachedStateFactory } from '../cachedStateFactory';
+import { ChatContext } from '../context/chatContext';
+import { ActionStateBase } from '../states/actionStateBase';
+import { ActionExecutionResult } from '../actionExecutionResult';
+import { Logger } from '../../services/logger';
+import { Scheduler } from '../../services/taskScheduler';
+
+export class ScheduledAction implements IActionWithState {
     static semaphore = new Semaphore(1);
 
     name: string;
@@ -50,7 +50,7 @@ export default class ScheduledAction implements IActionWithState {
         const isAllowedToTrigger = this.shouldTrigger(state);
 
         if (isAllowedToTrigger) {
-            logger.logWithTraceId(
+            Logger.logWithTraceId(
                 ctx.botName,
                 ctx.traceId,
                 ctx.chatName,
@@ -66,7 +66,7 @@ export default class ScheduledAction implements IActionWithState {
             await ctx.storage.saveActionExecutionResult(
                 this,
                 ctx.chatId,
-                new TransactionResult(state, isAllowedToTrigger)
+                new ActionExecutionResult(state, isAllowedToTrigger)
             );
         }
     }
@@ -93,7 +93,7 @@ export default class ScheduledAction implements IActionWithState {
 
             this.cachedState.set(key, value);
 
-            taskScheduler.createOnetimeTask(
+            Scheduler.createOnetimeTask(
                 `Drop cached value [${this.name} : ${key}]`,
                 () => this.cachedState.delete(key),
                 hoursToMilliseconds(

package/entities/{bot.ts → botInstance.ts}

@@ -1,20 +1,20 @@
 import { Telegraf } from 'telegraf';
-import TelegramApiService from '../services/telegramApi';
-import IncomingMessage from './incomingMessage';
-import taskScheduler from '../services/taskScheduler';
-import logger from '../services/logger';
-import CommandAction from './actions/commandAction';
-import ScheduledAction from './actions/scheduledAction';
-import IActionState from '../types/actionState';
 import {
     hoursToMilliseconds,
     secondsToMilliseconds
 } from '../helpers/timeConvertions';
 import { Hours, Seconds } from '../types/timeValues';
-import JsonFileStorage from '../services/jsonFileStorage';
 import { IStorageClient } from '../types/storage';
-
-export default class Bot {
+import { JsonFileStorage } from '../services/jsonFileStorage';
+import { TelegramApiService } from '../services/telegramApi';
+import { IActionState } from '../types/actionState';
+import { CommandAction } from './actions/commandAction';
+import { ScheduledAction } from './actions/scheduledAction';
+import { Logger } from '../services/logger';
+import { Scheduler } from '../services/taskScheduler';
+import { IncomingMessage } from './incomingMessage';
+
+export class BotInstance {
     name: string;
     private api: TelegramApiService;
     private telegraf: Telegraf;
@@ -38,7 +38,7 @@ export default class Bot {
         this.scheduled = options.scheduled;
         this.chats = options.chats;
 
-        logger.logWithTraceId(
+        Logger.logWithTraceId(
             this.name,
             `System:Bot-${this.name}-Start`,
             'System',
@@ -61,7 +61,7 @@ export default class Bot {
 
             const messageFromName = msg.from?.first_name ?? 'Unknown';
             const messageFromId = msg.from?.id ?? 'Unknown';
-            logger.logWithTraceId(
+            Logger.logWithTraceId(
                 this.name,
                 msg.traceId,
                 msg.chatName,
@@ -75,7 +75,7 @@ export default class Bot {
 
         this.telegraf.launch();
 
-        taskScheduler.createTask(
+        Scheduler.createTask(
             'MessageProcessing',
             async () => {
                 while (this.messageQueue.length > 0) {
@@ -87,7 +87,7 @@ export default class Bot {
             this.name
         );
 
-        taskScheduler.createTask(
+        Scheduler.createTask(
             'ScheduledProcessing',
             async () => {
                 await this.runScheduled();
@@ -104,7 +104,7 @@ export default class Bot {
     }
 
     async stop(code: string) {
-        logger.logWithTraceId(
+        Logger.logWithTraceId(
             this.name,
             `System:Bot-${this.name}-Stop`,
             'System',
@@ -124,7 +124,7 @@ export default class Bot {
                     await trig.exec(ctx);
                 } catch (error) {
                     console.dir(error);
-                    logger.errorWithTraceId(
+                    Logger.errorWithTraceId(
                         ctx.botName,
                         ctx.traceId,
                         chatName,
@@ -145,7 +145,7 @@ export default class Bot {
             try {
                 await cmd.exec(ctx);
             } catch (error) {
-                logger.errorWithTraceId(
+                Logger.errorWithTraceId(
                     ctx.botName,
                     ctx.traceId,
                     ctx.chatName,

package/entities/cachedStateFactory.ts

@@ -1,6 +1,6 @@
 import { Hours } from '../types/timeValues';
 
-export default class CachedStateFactory {
+export class CachedStateFactory {
     getValue: () => Promise<unknown>;
     invalidationTimeoutInHours: Hours;
 

package/entities/commandTriggerCheckResult.ts

@@ -1,4 +1,4 @@
-export default class CommandTriggerCheckResult {
+export class CommandTriggerCheckResult {
     static get DontTriggerAndSkipCooldown() {
         return new CommandTriggerCheckResult(false, [], true);
     }

package/entities/context/chatContext.ts

@@ -1,11 +1,11 @@
-import ImageMessage from '../responses/imageMessage';
-import TextMessage from '../responses/textMessage';
-import VideoMessage from '../responses/videoMessage';
 import { resolve } from 'path';
 import { IBotApiInteractions } from '../../services/telegramApi';
 import { IStorageClient } from '../../types/storage';
+import { ImageMessage } from '../responses/imageMessage';
+import { TextMessage } from '../responses/textMessage';
+import { VideoMessage } from '../responses/videoMessage';
 
-export default class ChatContext {
+export class ChatContext {
     botName: string;
     interactions: IBotApiInteractions;
     chatId: number;

package/entities/context/messageContext.ts

@@ -1,16 +1,16 @@
-import ActionStateBase from '../states/actionStateBase';
-import ImageMessage from '../responses/imageMessage';
-import TextMessage from '../responses/textMessage';
-import VideoMessage from '../responses/videoMessage';
-import ChatContext from './chatContext';
 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';
+import { IActionState } from '../../types/actionState';
+import { ImageMessage } from '../responses/imageMessage';
+import { Reaction } from '../responses/reaction';
+import { TextMessage } from '../responses/textMessage';
+import { VideoMessage } from '../responses/videoMessage';
+import { ActionStateBase } from '../states/actionStateBase';
+import { ChatContext } from './chatContext';
 
-export default class MessageContext<
+export class MessageContext<
     TActionState extends IActionState
 > extends ChatContext {
     messageId: number;

package/entities/incomingMessage.ts

@@ -1,7 +1,7 @@
 import { Chat, User } from 'telegraf/types';
 import { randomInt } from 'crypto';
 
-export default class IncomingMessage {
+export class IncomingMessage {
     message_id: number;
     chat: Chat;
     from: User | undefined;

package/entities/responses/imageMessage.ts

@@ -1,7 +1,7 @@
 import { InputFile } from 'telegraf/types';
-import IReplyMessage from '../../types/replyMessage';
+import { IReplyMessage } from '../../types/replyMessage';
 
-export default class ImageMessage implements IReplyMessage<InputFile> {
+export class ImageMessage implements IReplyMessage<InputFile> {
     content: InputFile;
     chatId: number;
     replyId: number | undefined;

package/entities/responses/reaction.ts

@@ -1,6 +1,6 @@
 import { TelegramEmoji } from 'telegraf/types';
 
-export default class Reaction {
+export class Reaction {
     chatId: number;
     messageId: number;
     traceId: number | string;

package/entities/responses/textMessage.ts

@@ -1,6 +1,6 @@
-import IReplyMessage from '../../types/replyMessage';
+import { IReplyMessage } from '../../types/replyMessage';
 
-export default class TextMessage implements IReplyMessage<string> {
+export class TextMessage implements IReplyMessage<string> {
     content: string;
     chatId: number;
     replyId: number | undefined;

package/entities/responses/videoMessage.ts

@@ -1,7 +1,7 @@
 import { InputFile } from 'telegraf/types';
-import IReplyMessage from '../../types/replyMessage';
+import { IReplyMessage } from '../../types/replyMessage';
 
-export default class VideoMessage implements IReplyMessage<InputFile> {
+export class VideoMessage implements IReplyMessage<InputFile> {
     content: InputFile;
     chatId: number;
     replyId: number | undefined;

package/entities/states/actionStateBase.ts

@@ -1,5 +1,5 @@
-import IActionState from '../../types/actionState';
+import { IActionState } from '../../types/actionState';
 
-export default class ActionStateBase implements IActionState {
+export class ActionStateBase implements IActionState {
     lastExecutedDate = 0;
 }

package/entities/taskRecord.ts

@@ -1,6 +1,6 @@
 import { Milliseconds } from '../types/timeValues';
 
-export default class TaskRecord {
+export class TaskRecord {
     name: string;
     taskId: NodeJS.Timeout;
     interval: Milliseconds;

package/helpers/builders/commandActionBuilder.ts

@@ -1,11 +1,11 @@
-import CommandAction from '../../entities/actions/commandAction';
-import ActionStateBase from '../../entities/states/actionStateBase';
-import toArray from '../toArray';
-import IActionState from '../../types/actionState';
 import { CommandHandler } from '../../types/handlers';
 import { CommandCondition } from '../../types/commandCondition';
 import { Seconds } from '../../types/timeValues';
-import Noop from '../noop';
+import { CommandAction } from '../../entities/actions/commandAction';
+import { ActionStateBase } from '../../entities/states/actionStateBase';
+import { IActionState } from '../../types/actionState';
+import { toArray } from '../toArray';
+import { Noop } from '../noop';
 
 export class CommandActionBuilderWithState<TActionState extends IActionState> {
     name: string;

package/helpers/builders/scheduledActionBuilder.ts

@@ -1,10 +1,10 @@
-import ScheduledAction from '../../entities/actions/scheduledAction';
-import CachedStateFactory from '../../entities/cachedStateFactory';
+import { ScheduledAction } from '../../entities/actions/scheduledAction';
+import { CachedStateFactory } from '../../entities/cachedStateFactory';
 import { ScheduledHandler } from '../../types/handlers';
 import { Hours, HoursOfDay } from '../../types/timeValues';
-import Noop from '../noop';
+import { Noop } from '../noop';
 
-export default class ScheduledActionBuilder {
+export class ScheduledActionBuilder {
     active = true;
     time: HoursOfDay = 0;
     cachedStateFactories = new Map<string, CachedStateFactory>();

package/helpers/noop.ts

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
-class Noop {
+export class Noop {
     static async true<T1>(arg1: T1) {
         return true;
     }
@@ -9,5 +9,3 @@ class Noop {
     static async call<T1, T2>(arg1: T1, arg2: T2): Promise<void>;
     static async call<T1>(arg1: T1) {}
 }
-
-export default Noop;

package/helpers/toArray.ts

@@ -1,3 +1,3 @@
-export default function toArray<TType>(value: TType | TType[]) {
+export function toArray<TType>(value: TType | TType[]) {
     return Array.isArray(value) ? value : [value];
 }

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.15",
+    "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();