chz-telegram-bot 0.0.49 → 0.0.51

package/entities/context/messageContext.ts

@@ -2,13 +2,13 @@ import { resolve } from 'path';
 import { TelegramEmoji } from 'telegraf/types';
 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 { ImageMessage } from '../../dtos/responses/imageMessage';
+import { Reaction } from '../../dtos/responses/reaction';
+import { TextMessage } from '../../dtos/responses/textMessage';
+import { VideoMessage } from '../../dtos/responses/videoMessage';
 import { ActionStateBase } from '../states/actionStateBase';
 import { ChatContext } from './chatContext';
-import { IncomingMessage } from '../incomingMessage';
+import { IncomingMessage } from '../../dtos/incomingMessage';
 import {
     MessageSendingOptions,
     TextMessageSendingOptions
@@ -60,8 +60,7 @@ export class MessageContext<
         return this.initializeChatContext(
             botName,
             action,
-            message.chat.id,
-            message.chatName,
+            message.chatInfo,
             message.traceId,
             storage
         );
@@ -80,7 +79,7 @@ export class MessageContext<
             '-'
         )}` as ActionKey;
         const allStates = await this.storage.load(storageKey);
-        const stateForChat = allStates[this.chatId];
+        const stateForChat = allStates[this.chatInfo.id];
 
         if (!stateForChat) {
             return new ActionStateBase() as TAnotherActionState;
@@ -99,7 +98,7 @@ export class MessageContext<
         this.responses.push(
             new TextMessage(
                 text,
-                this.chatId,
+                this.chatInfo,
                 this.messageId,
                 this.traceId,
                 this.action,
@@ -119,7 +118,7 @@ export class MessageContext<
         this.responses.push(
             new ImageMessage(
                 { source: resolve(filePath) },
-                this.chatId,
+                this.chatInfo,
                 this.messageId,
                 this.traceId,
                 this.action,
@@ -139,7 +138,7 @@ export class MessageContext<
         this.responses.push(
             new VideoMessage(
                 { source: resolve(filePath) },
-                this.chatId,
+                this.chatInfo,
                 this.messageId,
                 this.traceId,
                 this.action,
@@ -157,7 +156,7 @@ export class MessageContext<
         this.responses.push(
             new Reaction(
                 this.traceId,
-                this.chatId,
+                this.chatInfo,
                 this.messageId,
                 emoji,
                 this.action

package/entities/taskRecord.ts

@@ -1,9 +1,9 @@
 import { Milliseconds } from '../types/timeValues';
 
 export class TaskRecord {
-    name: string;
-    taskId: NodeJS.Timeout;
-    interval: Milliseconds;
+    readonly name: string;
+    readonly taskId: NodeJS.Timeout;
+    readonly interval: Milliseconds;
 
     constructor(name: string, taskId: NodeJS.Timeout, interval: Milliseconds) {
         this.name = name;

package/package.json

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

package/services/jsonFileStorage.ts

@@ -3,15 +3,15 @@ import { dirname } from 'path';
 import { mkdir, readFile, writeFile } from 'fs/promises';
 import { Sema as Semaphore } from 'async-sema';
 import { IStorageClient } from '../types/storage';
-import { ActionExecutionResult } from '../entities/actionExecutionResult';
+import { ActionExecutionResult } from '../dtos/actionExecutionResult';
 import { IActionState } from '../types/actionState';
 import { IActionWithState, ActionKey } from '../types/actionWithState';
 
 export class JsonFileStorage implements IStorageClient {
-    private locks = new Map<ActionKey, Semaphore>();
-    private cache: Map<string, Record<number, IActionState>>;
-    private storagePath: string;
-    private botName: string;
+    private readonly locks = new Map<ActionKey, Semaphore>();
+    private readonly cache: Map<string, Record<number, IActionState>>;
+    private readonly storagePath: string;
+    private readonly botName: string;
 
     constructor(
         botName: string,

package/services/taskScheduler.ts

@@ -3,7 +3,7 @@ import { Milliseconds } from '../types/timeValues';
 import { Logger } from './logger';
 
 class TaskScheduler {
-    activeTasks: TaskRecord[] = [];
+    readonly activeTasks: TaskRecord[] = [];
 
     stopAll() {
         this.activeTasks.forEach((task) => {

package/services/telegramApi.ts

@@ -1,38 +1,24 @@
 import { Message } from 'telegraf/types';
-import { ChatContext } from '../entities/context/chatContext';
-import { MessageContext } from '../entities/context/messageContext';
-import { inverseRecord as inverseRecord } from '../helpers/inverseRecord';
 import { IStorageClient } from '../types/storage';
 import { Logger } from './logger';
-import { IncomingMessage } from '../entities/incomingMessage';
 import { BotResponse, IReplyMessage } from '../types/response';
 import { Telegram } from 'telegraf/typings/telegram';
 import { setTimeout } from 'timers/promises';
 import { Milliseconds } from '../types/timeValues';
-import { ScheduledAction } from '../entities/actions/scheduledAction';
-import { IActionState } from '../types/actionState';
-import { CommandAction } from '../entities/actions/commandAction';
 
 const TELEGRAM_RATELIMIT_DELAY = 35 as Milliseconds;
 
 export class TelegramApiService {
     isFlushing = false;
-    messageQueue: BotResponse[] = [];
-
-    botName: string;
-    telegram: Telegram;
-    chats: Record<number, string>;
-    storage: IStorageClient;
-
-    constructor(
-        botName: string,
-        telegram: Telegram,
-        storage: IStorageClient,
-        chats: Record<string, number>
-    ) {
+    readonly messageQueue: BotResponse[] = [];
+
+    readonly botName: string;
+    readonly telegram: Telegram;
+    readonly storage: IStorageClient;
+
+    constructor(botName: string, telegram: Telegram, storage: IStorageClient) {
         this.telegram = telegram;
         this.botName = botName;
-        this.chats = inverseRecord(chats);
         this.storage = storage;
     }
 
@@ -47,25 +33,19 @@ export class TelegramApiService {
 
         this.isFlushing = true;
 
-        console.log(
-            `Flushing ${this.messageQueue.length} messages for ${this.botName}`
-        );
         while (this.messageQueue.length) {
-            const message = this.messageQueue.pop();
+            const message = this.messageQueue.shift();
 
             if (!message) break;
 
             try {
-                console.log(
-                    `Sending message ${message.kind} to ${message.chatId} for ${this.botName}`
-                );
                 await this.processResponse(message);
                 await setTimeout(TELEGRAM_RATELIMIT_DELAY);
             } catch (error) {
                 Logger.errorWithTraceId(
                     this.botName,
                     message.traceId,
-                    this.chats[message.chatId],
+                    message.chatInfo.name,
                     error,
                     message
                 );
@@ -81,14 +61,14 @@ export class TelegramApiService {
     ) {
         if (response.shouldPin) {
             await this.telegram.pinChatMessage(
-                response.chatId,
+                response.chatInfo.id,
                 sentMessage.message_id,
                 { disable_notification: true }
             );
 
             await this.storage.updateStateFor(
                 response.action,
-                response.chatId,
+                response.chatInfo.id,
                 async (state) => {
                     state.pinnedMessages.push(sentMessage.message_id);
                 }
@@ -102,7 +82,7 @@ export class TelegramApiService {
         switch (response.kind) {
             case 'text':
                 sentMessage = await this.telegram.sendMessage(
-                    response.chatId,
+                    response.chatInfo.id,
                     response.content,
                     {
                         reply_to_message_id: response.replyId,
@@ -116,7 +96,7 @@ export class TelegramApiService {
                 break;
             case 'image':
                 sentMessage = await this.telegram.sendPhoto(
-                    response.chatId,
+                    response.chatInfo.id,
                     response.content,
                     response.replyId
                         ? // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -128,7 +108,7 @@ export class TelegramApiService {
                 break;
             case 'video':
                 sentMessage = await this.telegram.sendVideo(
-                    response.chatId,
+                    response.chatInfo.id,
                     response.content,
                     response.replyId
                         ? // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -140,7 +120,7 @@ export class TelegramApiService {
                 break;
             case 'react':
                 await this.telegram.setMessageReaction(
-                    response.chatId,
+                    response.chatInfo.id,
                     response.messageId,
                     [
                         {
@@ -154,13 +134,13 @@ export class TelegramApiService {
                 return;
             case 'unpin':
                 await this.telegram.unpinChatMessage(
-                    response.chatId,
+                    response.chatInfo.id,
                     response.messageId
                 );
 
                 await this.storage.updateStateFor(
                     response.action,
-                    response.chatId,
+                    response.chatInfo.id,
                     async (state) => {
                         state.pinnedMessages = state.pinnedMessages.filter(
                             (x) => x != response.messageId
@@ -174,32 +154,4 @@ export class TelegramApiService {
                 }
         }
     }
-
-    initializeContextForMessage<TActionState extends IActionState>(
-        ctx: MessageContext<TActionState>,
-        incomingMessage: IncomingMessage,
-        command: CommandAction<TActionState>
-    ) {
-        return ctx.initializeMessageContext(
-            this.botName,
-            command,
-            incomingMessage,
-            this.storage
-        );
-    }
-
-    initializeContextForChat<TActionState extends IActionState>(
-        ctx: ChatContext<TActionState>,
-        chatId: number,
-        scheduledAction: ScheduledAction<TActionState>
-    ) {
-        return ctx.initializeChatContext(
-            this.botName,
-            scheduledAction,
-            chatId,
-            this.chats[chatId],
-            `Scheduled:${scheduledAction.key}:${chatId}`,
-            this.storage
-        );
-    }
 }

package/types/actionWithState.ts

@@ -3,6 +3,6 @@ import { IActionState } from './actionState';
 export type ActionKey = string & { __brand: 'actionKey' };
 
 export interface IActionWithState<TActionState extends IActionState> {
-    key: ActionKey;
-    stateConstructor: () => TActionState;
+    readonly key: ActionKey;
+    readonly stateConstructor: () => TActionState;
 }

package/types/response.ts

@@ -1,9 +1,10 @@
-import { DelayResponse } from '../entities/responses/delay';
-import { ImageMessage } from '../entities/responses/imageMessage';
-import { Reaction } from '../entities/responses/reaction';
-import { TextMessage } from '../entities/responses/textMessage';
-import { UnpinResponse } from '../entities/responses/unpin';
-import { VideoMessage } from '../entities/responses/videoMessage';
+import { ChatInfo } from '../dtos/chatInfo';
+import { DelayResponse } from '../dtos/responses/delay';
+import { ImageMessage } from '../dtos/responses/imageMessage';
+import { Reaction } from '../dtos/responses/reaction';
+import { TextMessage } from '../dtos/responses/textMessage';
+import { UnpinResponse } from '../dtos/responses/unpin';
+import { VideoMessage } from '../dtos/responses/videoMessage';
 import { IActionState } from './actionState';
 import { IActionWithState } from './actionWithState';
 
@@ -25,16 +26,16 @@ export type BotResponse =
     | ImageMessage;
 
 export interface IChatResponse {
-    kind: keyof typeof BotResponseTypes;
-    chatId: number;
-    traceId: number | string;
+    readonly kind: keyof typeof BotResponseTypes;
+    readonly chatInfo: ChatInfo;
+    readonly traceId: number | string;
 
-    action: IActionWithState<IActionState>;
+    readonly action: IActionWithState<IActionState>;
 }
 
 export interface IReplyMessage<TType> extends IChatResponse {
-    content: TType;
-    replyId: number | undefined;
-    disableWebPreview: boolean;
-    shouldPin: boolean;
+    readonly content: TType;
+    readonly replyId: number | undefined;
+    readonly disableWebPreview: boolean;
+    readonly shouldPin: boolean;
 }

package/types/storage.ts

@@ -1,4 +1,4 @@
-import { ActionExecutionResult } from '../entities/actionExecutionResult';
+import { ActionExecutionResult } from '../dtos/actionExecutionResult';
 import { IActionState } from './actionState';
 import { ActionKey, IActionWithState } from './actionWithState';
 

package/helpers/inverseRecord.ts

@@ -1,7 +0,0 @@
-export function inverseRecord<T extends PropertyKey, U extends PropertyKey>(
-    input: Record<T, U>
-) {
-    return Object.fromEntries(
-        Object.entries(input).map(([key, value]) => [value, key])
-    ) as Record<U, T>;
-}