chz-telegram-bot 0.3.30 → 0.4.0

package/services/jsonLogger.ts

@@ -1,39 +1,42 @@
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable @typescript-eslint/no-explicit-any */
 import { ILogger, IScopedLogger } from '../types/logger';
 import { TraceId } from '../types/trace';
 
 export class JsonLogger implements ILogger {
-    private serializeError(error: any) {
-        const plainObject: Record<string, unknown> = {};
-        Object.getOwnPropertyNames(error).forEach(function (key) {
-            plainObject[key] = error[key];
-        });
-        return JSON.stringify(plainObject);
+    private serializeError(error: unknown): string {
+        if (error instanceof Error) {
+            const plainObject: Record<string, unknown> = {
+                name: error.name,
+                message: error.message,
+                stack: error.stack
+            };
+
+            for (const [key, value] of Object.entries(error)) {
+                plainObject[key] = value;
+            }
+
+            return JSON.stringify(plainObject);
+        }
+
+        return JSON.stringify({ error });
     }
 
     private getCircularReplacer() {
-        const ancestors: unknown[] = [];
-        return function <V>(this: V, _: unknown, value: V) {
-            if (typeof value !== 'object' || value === null) {
-                return value;
-            }
-            // `this` is the object that value is contained in,
-            // i.e., its direct parent.
-            while (ancestors.length > 0 && ancestors.at(-1) !== this) {
-                ancestors.pop();
-            }
-            if (ancestors.includes(value)) {
-                return '[Circular]';
+        const cache = new Set();
+        return <T>(_: string, value: T) => {
+            if (typeof value === 'object' && value !== null) {
+                if (cache.has(value)) {
+                    return;
+                }
+
+                cache.add(value);
             }
-            ancestors.push(value);
             return value;
         };
     }
 
     createScope(botName: string, traceId: TraceId, chatName: string) {
         return {
-            logObjectWithTraceId: (data: any) => {
+            logObjectWithTraceId: (data: unknown) => {
                 this.logObjectWithTraceId(botName, traceId, chatName, data);
             },
             logWithTraceId: (text: string) => {
@@ -55,12 +58,24 @@ export class JsonLogger implements ILogger {
         botName: string,
         traceId: TraceId,
         chatName: string,
-        data: any
+        data: unknown
     ) {
-        data.botName = botName;
-        data.traceId = traceId;
-        data.chatName = chatName;
-        console.log(data);
+        const enrichedData =
+            typeof data == 'object'
+                ? {
+                      ...data,
+                      botName,
+                      traceId,
+                      chatName
+                  }
+                : {
+                      botName,
+                      traceId,
+                      chatName,
+                      data
+                  };
+
+        console.log(enrichedData);
     }
 
     logWithTraceId(

package/services/telegramApi.ts

@@ -1,7 +1,5 @@
-import { Message } from 'telegraf/types';
 import { IStorageClient } from '../types/storage';
 import { BotResponse, IReplyResponse } from '../types/response';
-import { Telegram } from 'telegraf/typings/telegram';
 import { ILogger } from '../types/logger';
 import { QueueItem, ResponseProcessingQueue } from './responseProcessingQueue';
 import { IReplyCapture } from '../types/capture';
@@ -9,13 +7,14 @@ import { IActionWithState } from '../types/action';
 import { IActionState } from '../types/actionState';
 import { TraceId } from '../types/trace';
 import { ChatInfo } from '../dtos/chatInfo';
-import { TelegramError } from 'telegraf';
+import TelegramBot, { Message } from 'node-telegram-bot-api';
+import { createReadStream } from 'fs';
 
 export const TELEGRAM_ERROR_QUOTE_INVALID = 'QUOTE_TEXT_INVALID';
 
 export class TelegramApiService {
     private readonly queue = new ResponseProcessingQueue();
-    private readonly telegram: Telegram;
+    private readonly telegram: TelegramBot;
     private readonly storage: IStorageClient;
     private readonly logger: ILogger;
     private readonly captureRegistrationCallback: (
@@ -29,7 +28,7 @@ export class TelegramApiService {
 
     constructor(
         botName: string,
-        telegram: Telegram,
+        telegram: TelegramBot,
         storage: IStorageClient,
         logger: ILogger,
         captureRegistrationCallback: (
@@ -67,8 +66,10 @@ export class TelegramApiService {
                     try {
                         await this.processResponse(response);
                     } catch (error) {
-                        if ('message' in (error as TelegramError)) {
-                            const telegramResponse = error as TelegramError;
+                        if ('message' in (error as { message?: string })) {
+                            const telegramResponse = error as {
+                                message: string;
+                            };
 
                             if (
                                 telegramResponse.message.includes(
@@ -104,11 +105,11 @@ export class TelegramApiService {
         void this.queue.flushReadyItems();
     }
 
-    private async pinIfShould(response: IReplyResponse, sentMessage: Message) {
+    private async pinIfShould(response: IReplyResponse, message: Message) {
         if (response.shouldPin) {
             await this.telegram.pinChatMessage(
                 response.chatInfo.id,
-                sentMessage.message_id,
+                message.message_id,
                 { disable_notification: true }
             );
 
@@ -116,7 +117,7 @@ export class TelegramApiService {
                 response.action as IActionWithState<IActionState>,
                 response.chatInfo.id,
                 (state) => {
-                    state.pinnedMessages.push(sentMessage.message_id);
+                    state.pinnedMessages.push(message.message_id);
                 }
             );
         }
@@ -149,24 +150,22 @@ export class TelegramApiService {
             case 'image':
                 sentMessage = await this.telegram.sendPhoto(
                     response.chatInfo.id,
-                    response.content,
-                    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+                    createReadStream(response.content.source),
                     response.replyInfo?.id
-                        ? ({
-                              reply_to_message_id: response.replyInfo.id // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                          } as any)
+                        ? {
+                              reply_to_message_id: response.replyInfo.id
+                          }
                         : undefined
                 );
                 break;
             case 'video':
                 sentMessage = await this.telegram.sendVideo(
                     response.chatInfo.id,
-                    response.content,
-                    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+                    createReadStream(response.content.source),
                     response.replyInfo?.id
-                        ? ({
-                              reply_to_message_id: response.replyInfo.id // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                          } as any)
+                        ? {
+                              reply_to_message_id: response.replyInfo.id
+                          }
                         : undefined
                 );
                 break;
@@ -174,21 +173,21 @@ export class TelegramApiService {
                 await this.telegram.setMessageReaction(
                     response.chatInfo.id,
                     response.messageId,
-                    [
-                        {
-                            type: 'emoji',
-                            emoji: response.emoji
-                        }
-                    ],
-                    true
+                    {
+                        reaction: [
+                            {
+                                type: 'emoji',
+                                emoji: response.emoji
+                            }
+                        ]
+                    }
                 );
 
                 return;
             case 'unpin':
-                await this.telegram.unpinChatMessage(
-                    response.chatInfo.id,
-                    response.messageId
-                );
+                await this.telegram.unpinChatMessage(response.chatInfo.id, {
+                    message_id: response.messageId
+                });
 
                 await this.storage.updateStateFor(
                     response.action,

package/types/inputFile.ts

@@ -0,0 +1,4 @@
+export interface InputFile {
+    source: string;
+    filename?: string;
+}

package/types/logger.ts

@@ -1,10 +1,7 @@
 import { TraceId } from './trace';
 
 export interface IScopedLogger {
-    logObjectWithTraceId(
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        data: any
-    ): void;
+    logObjectWithTraceId(data: unknown): void;
 
     logWithTraceId(text: string): void;
 
@@ -22,8 +19,7 @@ export interface ILogger {
         botName: string,
         traceId: TraceId,
         chatName: string,
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        data: any
+        data: unknown
     ): void;
 
     logWithTraceId(

package/types/messageTypes.ts

@@ -1,5 +1,3 @@
-import { Message, Update } from 'telegraf/types';
-
 export const INTERNAL_MESSAGE_TYPE_PREFIX = `__msg:`;
 
 export const MessageType = {
@@ -21,5 +19,3 @@ export const MessageType = {
 } as const;
 
 export type MessageTypeValue = (typeof MessageType)[keyof typeof MessageType];
-
-export type TelegrafContextMessage = Update.New & (Update.NonChannel & Message);