From 7a08f968f44eb5d5da5ccee410f7c8a8800e7589 Mon Sep 17 00:00:00 2001 From: vchikalkin Date: Mon, 25 Aug 2025 11:07:51 +0300 Subject: [PATCH] refactor: disable sequentialize & session --- apps/bot/src/bot/index.ts | 11 +---------- apps/bot/src/index.ts | 8 +------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/apps/bot/src/bot/index.ts b/apps/bot/src/bot/index.ts index 8f02276..ca9711f 100644 --- a/apps/bot/src/bot/index.ts +++ b/apps/bot/src/bot/index.ts @@ -4,17 +4,14 @@ import * as features from './features'; import { errorHandler } from './handlers/errors'; import { i18n } from './i18n'; import * as middlewares from './middlewares'; -import { session } from './middlewares'; import { setCommands } from './settings/commands'; import { setInfo } from './settings/info'; import { env } from '@/config/env'; import { logger } from '@/utils/logger'; import { getRedisInstance } from '@/utils/redis'; -import { getSessionKey } from '@/utils/session'; import { autoChatAction } from '@grammyjs/auto-chat-action'; import { hydrate } from '@grammyjs/hydrate'; import { limit } from '@grammyjs/ratelimiter'; -import { sequentialize } from '@grammyjs/runner'; import { Bot } from 'grammy'; type Parameters_ = { @@ -35,9 +32,7 @@ export function createBot({ apiRoot, token }: Parameters_) { bot.use( limit({ - keyGenerator: (ctx) => { - return ctx.from?.id.toString(); - }, + keyGenerator: (ctx) => ctx.from?.id.toString(), limit: env.RATE_LIMIT, onLimitExceeded: async (ctx) => { await ctx.reply(ctx.t('err-limit-exceeded')); @@ -51,7 +46,6 @@ export function createBot({ apiRoot, token }: Parameters_) { context.logger = logger.child({ update_id: context.update.update_id, }); - await next(); }); @@ -60,9 +54,6 @@ export function createBot({ apiRoot, token }: Parameters_) { const protectedBot = bot.errorBoundary(errorHandler); - protectedBot.use(sequentialize(getSessionKey)); - protectedBot.use(session()); - protectedBot.use(middlewares.updateLogger()); protectedBot.use(autoChatAction(bot.api)); protectedBot.use(hydrate()); diff --git a/apps/bot/src/index.ts b/apps/bot/src/index.ts index 94a5335..28890e3 100644 --- a/apps/bot/src/index.ts +++ b/apps/bot/src/index.ts @@ -12,23 +12,19 @@ const bot = createBot({ bot.catch((error) => { logger.error('Grammy bot error:'); logger.error(`Message: ${error?.message}`); - logger.error(error.error); // собственно, ошибка + logger.error(error.error); }); const runner = run(bot); - const redis = getRedisInstance(); -// Graceful shutdown function async function gracefulShutdown(signal: string) { logger.info(`Received ${signal}, starting graceful shutdown...`); try { - // Stop the bot await runner.stop(); logger.info('Bot stopped'); - // Disconnect Redis redis.disconnect(); logger.info('Redis disconnected'); } catch (error) { @@ -37,8 +33,6 @@ async function gracefulShutdown(signal: string) { } } -// Stopping the bot when the Node.js process -// is about to be terminated process.once('SIGINT', () => gracefulShutdown('SIGINT')); process.once('SIGTERM', () => gracefulShutdown('SIGTERM'));