From 89b0f0badf28b2e03f1c1750778b90ec04d5cc77 Mon Sep 17 00:00:00 2001 From: vchikalkin Date: Thu, 21 Aug 2025 18:24:30 +0300 Subject: [PATCH] feat(bot): integrate Redis and update bot configuration - Added Redis service to both docker-compose files for local development and production environments. - Updated bot configuration to utilize the Grammy framework, replacing Telegraf. - Implemented graceful shutdown for the bot, ensuring proper resource management. - Refactored bot commands and removed deprecated message handling logic. - Enhanced environment variable management for Redis connection settings. - Updated dependencies in package.json to include new Grammy-related packages. --- .github/workflows/deploy.yml | 2 + apps/bot/eslint.config.js | 5 + apps/bot/locales/ru.ftl | 97 ++++ apps/bot/package.json | 15 +- apps/bot/src/bot/context.ts | 21 + apps/bot/src/bot/features/add-contact.ts | 101 ++++ apps/bot/src/bot/features/become-master.ts | 42 ++ apps/bot/src/bot/features/help.ts | 14 + apps/bot/src/bot/features/index.ts | 6 + apps/bot/src/bot/features/registration.ts | 81 +++ apps/bot/src/bot/features/share-bot.ts | 15 + apps/bot/src/bot/features/welcome.ts | 33 ++ apps/bot/src/bot/handlers/errors.ts | 12 + apps/bot/src/bot/helpers/logging.ts | 21 + apps/bot/src/bot/i18n.ts | 14 + apps/bot/src/bot/index.ts | 72 +++ apps/bot/src/bot/middlewares/index.ts | 2 + apps/bot/src/bot/middlewares/session.ts | 20 + apps/bot/src/bot/middlewares/update-logger.ts | 34 ++ apps/bot/src/bot/settings/commands.ts | 39 ++ apps/bot/src/bot/settings/index.ts | 2 + apps/bot/src/bot/settings/info.ts | 10 + apps/bot/src/config/env.ts | 15 +- apps/bot/src/config/keyboards.ts | 38 ++ apps/bot/src/config/redis.ts | 1 + apps/bot/src/index.ts | 288 +---------- apps/bot/src/message.ts | 83 --- apps/bot/src/utils/logger.ts | 13 + apps/bot/src/utils/messages.ts | 3 + apps/bot/src/utils/redis.ts | 23 + apps/bot/src/utils/session.ts | 5 + apps/bot/src/utils/urls.ts | 5 + apps/bot/tsconfig.json | 2 +- docker-compose.dev.yml | 25 +- docker-compose.yml | 27 +- pnpm-lock.yaml | 476 +++++++++++++++--- pnpm-workspace.yaml | 1 - 37 files changed, 1233 insertions(+), 430 deletions(-) create mode 100644 apps/bot/locales/ru.ftl create mode 100644 apps/bot/src/bot/context.ts create mode 100644 apps/bot/src/bot/features/add-contact.ts create mode 100644 apps/bot/src/bot/features/become-master.ts create mode 100644 apps/bot/src/bot/features/help.ts create mode 100644 apps/bot/src/bot/features/index.ts create mode 100644 apps/bot/src/bot/features/registration.ts create mode 100644 apps/bot/src/bot/features/share-bot.ts create mode 100644 apps/bot/src/bot/features/welcome.ts create mode 100644 apps/bot/src/bot/handlers/errors.ts create mode 100644 apps/bot/src/bot/helpers/logging.ts create mode 100644 apps/bot/src/bot/i18n.ts create mode 100644 apps/bot/src/bot/index.ts create mode 100644 apps/bot/src/bot/middlewares/index.ts create mode 100644 apps/bot/src/bot/middlewares/session.ts create mode 100644 apps/bot/src/bot/middlewares/update-logger.ts create mode 100644 apps/bot/src/bot/settings/commands.ts create mode 100644 apps/bot/src/bot/settings/index.ts create mode 100644 apps/bot/src/bot/settings/info.ts create mode 100644 apps/bot/src/config/keyboards.ts create mode 100644 apps/bot/src/config/redis.ts delete mode 100644 apps/bot/src/message.ts create mode 100644 apps/bot/src/utils/logger.ts create mode 100644 apps/bot/src/utils/messages.ts create mode 100644 apps/bot/src/utils/redis.ts create mode 100644 apps/bot/src/utils/session.ts create mode 100644 apps/bot/src/utils/urls.ts diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 22b8f61..8e79ff7 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -25,6 +25,7 @@ jobs: echo "EMAIL_GRAPHQL=fake@example.com" >> .env echo "NEXTAUTH_SECRET=fakesecret" >> .env echo "BOT_URL=http://localhost:3000" >> .env + echo "REDIS_PASSWORD=fake" > .env - name: Set image tags id: vars @@ -83,6 +84,7 @@ jobs: echo "WEB_IMAGE_TAG=${{ needs.build-and-push.outputs.web_tag }}" >> .env echo "BOT_IMAGE_TAG=${{ needs.build-and-push.outputs.bot_tag }}" >> .env echo "DOCKERHUB_USERNAME=${{ secrets.DOCKERHUB_USERNAME }}" >> .env + echo "REDIS_PASSWORD=${{ secrets.REDIS_PASSWORD }}" >> .env - name: Copy .env to VPS via SCP uses: appleboy/scp-action@master diff --git a/apps/bot/eslint.config.js b/apps/bot/eslint.config.js index fe052f3..f19765f 100644 --- a/apps/bot/eslint.config.js +++ b/apps/bot/eslint.config.js @@ -5,5 +5,10 @@ export default [ ...typescript, { ignores: ['**/types/**', '*.config.*'], + rules: { + '@typescript-eslint/naming-convention': 'off', + 'unicorn/prevent-abbreviations': 'off', + 'canonical/id-match': 'off', + }, }, ]; diff --git a/apps/bot/locales/ru.ftl b/apps/bot/locales/ru.ftl new file mode 100644 index 0000000..df3895d --- /dev/null +++ b/apps/bot/locales/ru.ftl @@ -0,0 +1,97 @@ +# Описание бота +short-description = Запись к мастерам, тренерам и репетиторам на вашем смартфоне 📱📅 + +description = + 📲 Запишись.онлайн — это бесплатное Telegram-приложение для мастеров и тренеров в вашем смартфоне. + + Возможности: + • 📅 Ведение графика и запись клиентов + • 👥 Клиентская база в одном месте + • 🔔 Уведомления о новых и предстоящих записях + • 🧑‍ Работа мастером или тренером прямо в Telegram + • 🚀 Создание записи на услугу в пару кликов + + ✨ Всё, что нужно — ваш смартфон. + + + ℹ️ По всем вопросам и обратной связи: @vchikalkin + +# Команды +start = + .description = Запуск бота +addcontact = + .description = Добавить контакт клиента +becomemaster = + .description = Стать мастером +sharebot = + .description = Поделиться ботом +help = + .description = Список команд + +commands-list = + 📋 Доступные команды: + • /addcontact — добавить контакт клиента + • /becomemaster — стать мастером + • /sharebot — поделиться ботом + • /help — список команд + + Откройте приложение кнопкой "Открыть", чтобы отредактировать свой профиль или создать запись + + +# Приветственные сообщения +msg-welcome = + 👋 Добро пожаловать! + Пожалуйста, поделитесь своим номером телефона для регистрации + +msg-welcome-back = 👋 С возвращением, { $name }! + +# Сообщения о статусе мастера +msg-not-master = + ⛔️ Только мастер может добавлять контакты + Стать мастером можно на странице профиля в приложении или с помощью команды /becomemaster + +msg-already-master = 🎉 Вы уже являетесь мастером! + +msg-become-master = 🥳 Поздравляем! Теперь вы мастер + +# Сообщения о телефоне +msg-need-phone = 📱 Чтобы добавить контакт, сначала поделитесь своим номером телефона + +msg-phone-saved = + ✅ Спасибо! Мы сохранили ваш номер телефона + Теперь вы можете открыть приложение или воспользоваться командами бота + +msg-already-registered = + ✅ Вы уже зарегистрированы в системе + + Для смены номера телефона обратитесь в поддержку (Контакты в профиле бота) + +msg-invalid-phone = ❌ Некорректный номер телефона + +# Сообщения о контактах +msg-send-client-contact = + 👤 Отправьте контакт клиента, которого вы хотите добавить. + Для отмены операции используйте команду /cancel + +msg-send-contact = Пожалуйста, отправьте контакт клиента через кнопку Telegram + +msg-contact-added = + ✅ Добавили { $name } в список ваших клиентов + + Пригласите клиента в приложение, чтобы вы могли добавлять с ним записи + +msg-contact-forward = Перешлите пользователю следующее сообщение, чтобы он мог начать пользоваться ботом ⬇️ + +# Сообщения для шаринга +msg-share-bot = + 📅 Воспользуйтесь этим ботом для записи к вашему мастеру! + Нажмите кнопку ниже, чтобы начать + +# Системные сообщения +msg-cancel = ❌ Операция отменена + +# Ошибки +err-generic = ⚠️ Что-то пошло не так. Попробуйте еще раз через несколько секунд +err-with-details = ❌ Произошла ошибка +{ $error } +err-limit-exceeded = 🚫 Слишком много запросов! Подождите немного \ No newline at end of file diff --git a/apps/bot/package.json b/apps/bot/package.json index 1e1bc96..723aa97 100644 --- a/apps/bot/package.json +++ b/apps/bot/package.json @@ -12,10 +12,23 @@ "lint-staged": "lint-staged" }, "dependencies": { + "@grammyjs/auto-chat-action": "^0.1.1", + "@grammyjs/commands": "^1.2.0", + "@grammyjs/conversations": "^2.1.0", + "@grammyjs/hydrate": "^1.6.0", + "@grammyjs/i18n": "^1.1.2", + "@grammyjs/parse-mode": "^2.2.0", + "@grammyjs/ratelimiter": "^1.2.1", + "@grammyjs/runner": "^2.0.3", + "@grammyjs/storage-redis": "^2.5.1", + "@grammyjs/types": "^3.22.1", "@repo/graphql": "workspace:*", "@repo/typescript-config": "workspace:*", "@types/node": "catalog:", - "telegraf": "catalog:", + "grammy": "^1.38.1", + "ioredis": "^5.7.0", + "pino": "^9.9.0", + "pino-pretty": "^13.1.1", "tsup": "^8.5.0", "typescript": "catalog:", "zod": "catalog:" diff --git a/apps/bot/src/bot/context.ts b/apps/bot/src/bot/context.ts new file mode 100644 index 0000000..47816b0 --- /dev/null +++ b/apps/bot/src/bot/context.ts @@ -0,0 +1,21 @@ +import { type logger } from '@/utils/logger'; +import { type AutoChatActionFlavor } from '@grammyjs/auto-chat-action'; +import { type CommandsFlavor } from '@grammyjs/commands'; +import { type ConversationFlavor } from '@grammyjs/conversations'; +import { type HydrateFlavor } from '@grammyjs/hydrate'; +import { type I18nFlavor } from '@grammyjs/i18n'; +import { type Context as DefaultContext, type SessionFlavor } from 'grammy'; + +export type Context = ConversationFlavor< + HydrateFlavor< + AutoChatActionFlavor & + CommandsFlavor & + DefaultContext & + I18nFlavor & + SessionFlavor & { + logger: typeof logger; + } + > +>; + +export type SessionData = {}; diff --git a/apps/bot/src/bot/features/add-contact.ts b/apps/bot/src/bot/features/add-contact.ts new file mode 100644 index 0000000..1c1111b --- /dev/null +++ b/apps/bot/src/bot/features/add-contact.ts @@ -0,0 +1,101 @@ +/* eslint-disable id-length */ +import { type Context } from '@/bot/context'; +import { logHandle } from '@/bot/helpers/logging'; +import { KEYBOARD_REMOVE, KEYBOARD_SHARE_BOT, KEYBOARD_SHARE_PHONE } from '@/config/keyboards'; +import { isCustomerMaster } from '@/utils/customer'; +import { isValidPhoneNumber, normalizePhoneNumber } from '@/utils/phone'; +import { type Conversation, createConversation } from '@grammyjs/conversations'; +import { CustomersService } from '@repo/graphql/api/customers'; +import { RegistrationService } from '@repo/graphql/api/registration'; +import { Composer } from 'grammy'; + +const composer = new Composer(); + +const feature = composer.chatType('private'); + +async function addContact(conversation: Conversation, ctx: Context) { + // Проверяем, что пользователь является мастером + const telegramId = ctx.from?.id; + if (!telegramId) { + return ctx.reply(await conversation.external(({ t }) => t('err-generic'))); + } + + const customerService = new CustomersService({ telegramId }); + const { customer } = await customerService.getCustomer({ telegramId }); + + if (!customer) { + return ctx.reply( + await conversation.external(({ t }) => t('msg-need-phone')), + KEYBOARD_SHARE_PHONE, + ); + } + + if (!isCustomerMaster(customer)) { + return ctx.reply(await conversation.external(({ t }) => t('msg-not-master'))); + } + + // Просим отправить контакт клиента + await ctx.reply(await conversation.external(({ t }) => t('msg-send-client-contact'))); + + // Ждем любое сообщение от пользователя + const waitCtx = await conversation.wait(); + + // Проверяем команду отмены + if (waitCtx.message?.text === '/cancel') { + return ctx.reply(await conversation.external(({ t }) => t('msg-cancel'))); + } + + // Проверяем, что отправлен контакт + if (!waitCtx.message?.contact) { + return ctx.reply(await conversation.external(({ t }) => t('msg-send-contact'))); + } + + const { contact } = waitCtx.message; + const name = `${contact.first_name || ''} ${contact.last_name || ''}`.trim(); + const phone = normalizePhoneNumber(contact.phone_number); + + // Проверяем валидность номера телефона + if (!isValidPhoneNumber(phone)) { + return ctx.reply(await conversation.external(({ t }) => t('msg-invalid-phone'))); + } + + try { + // Проверяем, есть ли клиент с таким номером + const { customer: existingCustomer } = await customerService.getCustomer({ phone }); + let documentId = existingCustomer?.documentId; + + // Если клиента нет, создаём нового + if (!documentId) { + const registrationService = new RegistrationService(); + const createCustomerResult = await registrationService.createCustomer({ name, phone }); + + documentId = createCustomerResult?.createCustomer?.documentId; + if (!documentId) throw new Error('Клиент не создан'); + } + + // Добавляем текущего мастера к клиенту + const masters = [customer.documentId]; + await customerService.addMasters({ data: { masters }, documentId }); + + // Отправляем подтверждения и инструкции + await ctx.reply(await conversation.external(({ t }) => t('msg-contact-added', { name }))); + await ctx.reply(await conversation.external(({ t }) => t('msg-contact-forward'))); + await ctx.reply(await conversation.external(({ t }) => t('msg-share-bot')), KEYBOARD_SHARE_BOT); + } catch (error) { + await ctx.reply( + await conversation.external(({ t }) => t('err-with-details', { error: String(error) })), + ); + } finally { + await ctx.reply(await conversation.external(({ t }) => t('commands-list')), KEYBOARD_REMOVE); + } + + return ctx.reply(await conversation.external(({ t }) => t('err-generic')), KEYBOARD_REMOVE); +} + +feature.use(createConversation(addContact)); + +feature.command('addcontact', logHandle('command-add-contact'), async (ctx) => { + await ctx.conversation.enter('addContact'); +}); + +export { composer as addContact }; diff --git a/apps/bot/src/bot/features/become-master.ts b/apps/bot/src/bot/features/become-master.ts new file mode 100644 index 0000000..1dbca9d --- /dev/null +++ b/apps/bot/src/bot/features/become-master.ts @@ -0,0 +1,42 @@ +import { type Context } from '@/bot/context'; +import { logHandle } from '@/bot/helpers/logging'; +import { KEYBOARD_SHARE_PHONE } from '@/config/keyboards'; +import { isCustomerMaster } from '@/utils/customer'; +import { CustomersService } from '@repo/graphql/api/customers'; +import { Enum_Customer_Role } from '@repo/graphql/types'; +import { Composer } from 'grammy'; + +const composer = new Composer(); + +const feature = composer.chatType('private'); + +feature.command('becomemaster', logHandle('command-become-master'), async (ctx) => { + const telegramId = ctx.from.id; + const customerService = new CustomersService({ telegramId }); + const { customer } = await customerService.getCustomer({ telegramId }); + + if (!customer) { + return ctx.reply(ctx.t('msg-need-phone'), { ...KEYBOARD_SHARE_PHONE, parse_mode: 'HTML' }); + } + + if (isCustomerMaster(customer)) { + return ctx.reply(ctx.t('msg-already-master'), { parse_mode: 'HTML' }); + } + + // Обновляем роль клиента на мастер + const response = await customerService + .updateCustomer({ + data: { role: Enum_Customer_Role.Master }, + }) + .catch((error) => { + ctx.reply(ctx.t('err-with-details', { error: String(error) }), { parse_mode: 'HTML' }); + }); + + if (response) { + return ctx.reply(ctx.t('msg-become-master'), { parse_mode: 'HTML' }); + } + + return ctx.reply(ctx.t('err-generic'), { parse_mode: 'HTML' }); +}); + +export { composer as becomeMaster }; diff --git a/apps/bot/src/bot/features/help.ts b/apps/bot/src/bot/features/help.ts new file mode 100644 index 0000000..9f55e37 --- /dev/null +++ b/apps/bot/src/bot/features/help.ts @@ -0,0 +1,14 @@ +import { type Context } from '@/bot/context'; +import { logHandle } from '@/bot/helpers/logging'; +import { KEYBOARD_REMOVE } from '@/config/keyboards'; +import { Composer } from 'grammy'; + +const composer = new Composer(); + +const feature = composer.chatType('private'); + +feature.command('help', logHandle('command-help'), async (ctx) => { + return ctx.reply(ctx.t('commands-list'), { ...KEYBOARD_REMOVE, parse_mode: 'HTML' }); +}); + +export { composer as help }; diff --git a/apps/bot/src/bot/features/index.ts b/apps/bot/src/bot/features/index.ts new file mode 100644 index 0000000..6caad36 --- /dev/null +++ b/apps/bot/src/bot/features/index.ts @@ -0,0 +1,6 @@ +export * from './add-contact'; +export * from './become-master'; +export * from './help'; +export * from './registration'; +export * from './share-bot'; +export * from './welcome'; diff --git a/apps/bot/src/bot/features/registration.ts b/apps/bot/src/bot/features/registration.ts new file mode 100644 index 0000000..3e2bf5e --- /dev/null +++ b/apps/bot/src/bot/features/registration.ts @@ -0,0 +1,81 @@ +import { type Context } from '@/bot/context'; +import { logHandle } from '@/bot/helpers/logging'; +import { KEYBOARD_REMOVE } from '@/config/keyboards'; +import { isValidPhoneNumber, normalizePhoneNumber } from '@/utils/phone'; +import { CustomersService } from '@repo/graphql/api/customers'; +import { RegistrationService } from '@repo/graphql/api/registration'; +import { Composer } from 'grammy'; + +const composer = new Composer(); + +const feature = composer.chatType('private'); + +// Обработка получения контакта от пользователя (регистрация или обновление) +feature.on(':contact', logHandle('contact-registration'), async (ctx) => { + const telegramId = ctx.from.id; + const { contact } = ctx.message; + const name = `${contact.first_name || ''} ${contact.last_name || ''}`.trim(); + + // Проверяем, не зарегистрирован ли уже пользователь + const customerService = new CustomersService({ telegramId }); + const { customer: existingCustomer } = await customerService.getCustomer({ telegramId }); + + if (existingCustomer) { + return ctx.reply(ctx.t('msg-already-registered'), { + ...KEYBOARD_REMOVE, + parse_mode: 'HTML', + }); + } + + // Проверка наличия номера телефона + if (!contact.phone_number) { + return ctx.reply(ctx.t('msg-invalid-phone')); + } + + // Нормализация и валидация номера + const phone = normalizePhoneNumber(contact.phone_number); + if (!isValidPhoneNumber(phone)) { + return ctx.reply(ctx.t('msg-invalid-phone')); + } + + const registrationService = new RegistrationService(); + + try { + const { customer } = await registrationService.getCustomer({ phone }); + + if (customer && !customer.telegramId) { + // Пользователь добавлен ранее мастером — обновляем данные + await registrationService.updateCustomer({ + data: { active: true, name, telegramId }, + documentId: customer.documentId, + }); + + return ctx.reply(ctx.t('msg-phone-saved') + '\n\n' + ctx.t('commands-list'), { + ...KEYBOARD_REMOVE, + parse_mode: 'HTML', + }); + } + + // Новый пользователь — создаём и активируем + const response = await registrationService.createCustomer({ name, phone, telegramId }); + + const documentId = response?.createCustomer?.documentId; + if (!documentId) { + throw new Error('Не удалось создать клиента: отсутствует documentId'); + } + + await registrationService.updateCustomer({ + data: { active: true }, + documentId, + }); + + return ctx.reply(ctx.t('msg-phone-saved') + '\n\n' + ctx.t('commands-list'), { + ...KEYBOARD_REMOVE, + parse_mode: 'HTML', + }); + } catch (error) { + return ctx.reply(ctx.t('err-with-details', { error: String(error) })); + } +}); + +export { composer as registration }; diff --git a/apps/bot/src/bot/features/share-bot.ts b/apps/bot/src/bot/features/share-bot.ts new file mode 100644 index 0000000..d867ce5 --- /dev/null +++ b/apps/bot/src/bot/features/share-bot.ts @@ -0,0 +1,15 @@ +import { type Context } from '@/bot/context'; +import { logHandle } from '@/bot/helpers/logging'; +import { KEYBOARD_SHARE_BOT } from '@/config/keyboards'; +import { Composer } from 'grammy'; + +const composer = new Composer(); + +const feature = composer.chatType('private'); + +feature.command('sharebot', logHandle('command-share-bot'), async (ctx) => { + await ctx.reply(ctx.t('msg-contact-forward'), { parse_mode: 'HTML' }); + await ctx.reply(ctx.t('msg-share-bot'), { ...KEYBOARD_SHARE_BOT, parse_mode: 'HTML' }); +}); + +export { composer as shareBot }; diff --git a/apps/bot/src/bot/features/welcome.ts b/apps/bot/src/bot/features/welcome.ts new file mode 100644 index 0000000..da98597 --- /dev/null +++ b/apps/bot/src/bot/features/welcome.ts @@ -0,0 +1,33 @@ +import { type Context } from '@/bot/context'; +import { logHandle } from '@/bot/helpers/logging'; +import { KEYBOARD_REMOVE, KEYBOARD_SHARE_PHONE } from '@/config/keyboards'; +import { combine } from '@/utils/messages'; +import { CustomersService } from '@repo/graphql/api/customers'; +import { Composer } from 'grammy'; + +const composer = new Composer(); + +const feature = composer.chatType('private'); + +feature.command('start', logHandle('command-start'), async (ctx) => { + const telegramId = ctx.from.id; + + const customerService = new CustomersService({ telegramId }); + const { customer } = await customerService.getCustomer({ telegramId }); + + if (customer) { + // Пользователь уже зарегистрирован — приветствуем + return ctx.reply( + combine(ctx.t('msg-welcome-back', { name: customer.name }), ctx.t('commands-list')), + { + ...KEYBOARD_REMOVE, + parse_mode: 'HTML', + }, + ); + } + + // Новый пользователь — просим поделиться номером + return ctx.reply(ctx.t('msg-welcome'), { ...KEYBOARD_SHARE_PHONE, parse_mode: 'HTML' }); +}); + +export { composer as welcome }; diff --git a/apps/bot/src/bot/handlers/errors.ts b/apps/bot/src/bot/handlers/errors.ts new file mode 100644 index 0000000..5545275 --- /dev/null +++ b/apps/bot/src/bot/handlers/errors.ts @@ -0,0 +1,12 @@ +import { type Context } from '../context'; +import { getUpdateInfo } from '../helpers/logging'; +import { type ErrorHandler } from 'grammy'; + +export const errorHandler: ErrorHandler = (error) => { + const { ctx } = error; + + ctx.logger.error({ + err: error.error, + update: getUpdateInfo(ctx), + }); +}; diff --git a/apps/bot/src/bot/helpers/logging.ts b/apps/bot/src/bot/helpers/logging.ts new file mode 100644 index 0000000..dd7a651 --- /dev/null +++ b/apps/bot/src/bot/helpers/logging.ts @@ -0,0 +1,21 @@ +/* eslint-disable @typescript-eslint/no-unused-vars */ +import { type Context } from '../context'; +import { type Update } from '@grammyjs/types'; +import { type Middleware } from 'grammy'; + +export function getUpdateInfo(context: Context): Omit { + const { update_id, ...update } = context.update; + + return update; +} + +export function logHandle(id: string): Middleware { + return (context, next) => { + context.logger.info({ + msg: `Handle "${id}"`, + ...(id.startsWith('unhandled') ? { update: getUpdateInfo(context) } : {}), + }); + + return next(); + }; +} diff --git a/apps/bot/src/bot/i18n.ts b/apps/bot/src/bot/i18n.ts new file mode 100644 index 0000000..d33ca01 --- /dev/null +++ b/apps/bot/src/bot/i18n.ts @@ -0,0 +1,14 @@ +import { type Context } from './context'; +import { I18n } from '@grammyjs/i18n'; +import path from 'node:path'; + +export const i18n = new I18n({ + defaultLocale: 'en', + directory: path.resolve(process.cwd(), 'locales'), + fluentBundleOptions: { + useIsolating: false, + }, + useSession: true, +}); + +export const isMultipleLocales = i18n.locales.length > 1; diff --git a/apps/bot/src/bot/index.ts b/apps/bot/src/bot/index.ts new file mode 100644 index 0000000..7eb3b79 --- /dev/null +++ b/apps/bot/src/bot/index.ts @@ -0,0 +1,72 @@ +import { type Context } from './context'; +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 { conversations } from '@grammyjs/conversations'; +import { hydrate } from '@grammyjs/hydrate'; +import { limit } from '@grammyjs/ratelimiter'; +import { sequentialize } from '@grammyjs/runner'; +import { Bot } from 'grammy'; + +type Parameters_ = { + token: string; +}; + +const redis = getRedisInstance(); + +export function createBot({ token }: Parameters_) { + const bot = new Bot(token); + + bot.use(i18n); + + bot.use( + limit({ + keyGenerator: (ctx) => { + return ctx.from?.id.toString(); + }, + limit: env.RATE_LIMIT, + onLimitExceeded: async (ctx) => { + await ctx.reply(ctx.t('err-limit-exceeded')); + }, + storageClient: redis, + timeFrame: env.RATE_LIMIT_TIME, + }), + ); + + bot.use(async (context, next) => { + context.logger = logger.child({ + update_id: context.update.update_id, + }); + + await next(); + }); + + bot.use(conversations()); + + setInfo(bot); + setCommands(bot); + + const protectedBot = bot.errorBoundary(errorHandler); + + protectedBot.use(sequentialize(getSessionKey)); + protectedBot.use(session()); + + protectedBot.use(middlewares.updateLogger()); + protectedBot.use(autoChatAction(bot.api)); + protectedBot.use(hydrate()); + + for (const feature of Object.values(features)) { + protectedBot.use(feature); + } + + return bot; +} diff --git a/apps/bot/src/bot/middlewares/index.ts b/apps/bot/src/bot/middlewares/index.ts new file mode 100644 index 0000000..524b5f7 --- /dev/null +++ b/apps/bot/src/bot/middlewares/index.ts @@ -0,0 +1,2 @@ +export * from './session'; +export * from './update-logger'; diff --git a/apps/bot/src/bot/middlewares/session.ts b/apps/bot/src/bot/middlewares/session.ts new file mode 100644 index 0000000..209e6f6 --- /dev/null +++ b/apps/bot/src/bot/middlewares/session.ts @@ -0,0 +1,20 @@ +import { type Context } from '@/bot/context'; +import { TTL_SESSION } from '@/config/redis'; +import { getRedisInstance } from '@/utils/redis'; +import { getSessionKey } from '@/utils/session'; +import { RedisAdapter } from '@grammyjs/storage-redis'; +import { session as createSession, type Middleware } from 'grammy'; + +const storage = new RedisAdapter({ + autoParseDates: true, + instance: getRedisInstance(), + ttl: TTL_SESSION, +}); + +export function session(): Middleware { + return createSession({ + getSessionKey, + initial: () => ({}), + storage, + }); +} diff --git a/apps/bot/src/bot/middlewares/update-logger.ts b/apps/bot/src/bot/middlewares/update-logger.ts new file mode 100644 index 0000000..c3c6922 --- /dev/null +++ b/apps/bot/src/bot/middlewares/update-logger.ts @@ -0,0 +1,34 @@ +import { type Context } from '@/bot/context'; +import { getUpdateInfo } from '@/bot/helpers/logging'; +import { type Middleware } from 'grammy'; +import { performance } from 'node:perf_hooks'; + +export function updateLogger(): Middleware { + return async (ctx, next) => { + ctx.api.config.use((previous, method, payload, signal) => { + ctx.logger.debug({ + method, + msg: 'Bot API call', + payload, + }); + + return previous(method, payload, signal); + }); + + ctx.logger.debug({ + msg: 'Update received', + update: getUpdateInfo(ctx), + }); + + const startTime = performance.now(); + try { + return next(); + } finally { + const endTime = performance.now(); + ctx.logger.debug({ + elapsed: endTime - startTime, + msg: 'Update processed', + }); + } + }; +} diff --git a/apps/bot/src/bot/settings/commands.ts b/apps/bot/src/bot/settings/commands.ts new file mode 100644 index 0000000..dbd78ca --- /dev/null +++ b/apps/bot/src/bot/settings/commands.ts @@ -0,0 +1,39 @@ +import { type Context } from '@/bot/context'; +import { i18n } from '@/bot/i18n'; +import { Command, CommandGroup } from '@grammyjs/commands'; +import { type LanguageCode } from '@grammyjs/types'; +import { type Api, type Bot, type RawApi } from 'grammy'; + +export async function setCommands({ api }: Bot>) { + const commands = createCommands(['start', 'addcontact', 'becomemaster', 'sharebot', 'help']); + + for (const command of commands) { + addLocalizations(command); + } + + const commandsGroup = new CommandGroup().add(commands); + + await commandsGroup.setCommands({ api }); +} + +function addLocalizations(command: Command) { + for (const locale of i18n.locales) { + command.localize( + locale as LanguageCode, + command.name, + i18n.t(locale, `${command.name}.description`), + ); + } + + return command; +} + +function createCommand(name: string) { + return new Command(name, i18n.t('en', `${name}.description`)).addToScope({ + type: 'all_private_chats', + }); +} + +function createCommands(names: string[]) { + return names.map((name) => createCommand(name)); +} diff --git a/apps/bot/src/bot/settings/index.ts b/apps/bot/src/bot/settings/index.ts new file mode 100644 index 0000000..39fbc6b --- /dev/null +++ b/apps/bot/src/bot/settings/index.ts @@ -0,0 +1,2 @@ +export * from './commands'; +export * from './info'; diff --git a/apps/bot/src/bot/settings/info.ts b/apps/bot/src/bot/settings/info.ts new file mode 100644 index 0000000..0820b6d --- /dev/null +++ b/apps/bot/src/bot/settings/info.ts @@ -0,0 +1,10 @@ +import { type Context } from '../context'; +import { i18n } from '../i18n'; +import { type Api, type Bot, type RawApi } from 'grammy'; + +export async function setInfo({ api }: Bot>) { + for (const locale of i18n.locales) { + await api.setMyDescription(i18n.t(locale, 'description')); + await api.setMyShortDescription(i18n.t(locale, 'short-description')); + } +} diff --git a/apps/bot/src/config/env.ts b/apps/bot/src/config/env.ts index 62a53d6..7f1bb32 100644 --- a/apps/bot/src/config/env.ts +++ b/apps/bot/src/config/env.ts @@ -1,9 +1,22 @@ -/* eslint-disable unicorn/prevent-abbreviations */ import { z } from 'zod'; export const envSchema = z.object({ BOT_TOKEN: z.string(), BOT_URL: z.string(), + RATE_LIMIT: z + .string() + .transform((value) => Number.parseInt(value, 10)) + .default('2'), + RATE_LIMIT_TIME: z + .string() + .transform((value) => Number.parseInt(value, 10)) + .default('3000'), + REDIS_HOST: z.string().default('redis'), + REDIS_PASSWORD: z.string(), + REDIS_PORT: z + .string() + .transform((value) => Number.parseInt(value, 10)) + .default('6379'), }); export const env = envSchema.parse(process.env); diff --git a/apps/bot/src/config/keyboards.ts b/apps/bot/src/config/keyboards.ts new file mode 100644 index 0000000..bbde0a1 --- /dev/null +++ b/apps/bot/src/config/keyboards.ts @@ -0,0 +1,38 @@ +import { + type InlineKeyboardMarkup, + type ReplyKeyboardMarkup, + type ReplyKeyboardRemove, +} from '@grammyjs/types'; + +export const KEYBOARD_SHARE_PHONE = { + reply_markup: { + keyboard: [ + [ + { + request_contact: true, + text: ' Отправить номер телефона', + }, + ], + ], + one_time_keyboard: true, + } as ReplyKeyboardMarkup, +}; + +export const KEYBOARD_REMOVE = { + reply_markup: { + remove_keyboard: true, + } as ReplyKeyboardRemove, +}; + +export const KEYBOARD_SHARE_BOT = { + reply_markup: { + inline_keyboard: [ + [ + { + text: ' Воспользоваться ботом', + url: process.env.BOT_URL as string, + }, + ], + ], + } as InlineKeyboardMarkup, +}; diff --git a/apps/bot/src/config/redis.ts b/apps/bot/src/config/redis.ts new file mode 100644 index 0000000..844d847 --- /dev/null +++ b/apps/bot/src/config/redis.ts @@ -0,0 +1 @@ +export const TTL_SESSION = 5 * 60; // 5 minutes in seconds diff --git a/apps/bot/src/index.ts b/apps/bot/src/index.ts index 65c8079..3f3efb3 100644 --- a/apps/bot/src/index.ts +++ b/apps/bot/src/index.ts @@ -1,276 +1,38 @@ -/* eslint-disable canonical/id-match */ -/* eslint-disable consistent-return */ +import { createBot } from './bot'; import { env as environment } from './config/env'; -import { - commandsList, - KEYBOARD_REMOVE, - KEYBOARD_SHARE_BOT, - KEYBOARD_SHARE_PHONE, - MESSAGE_CANCEL, - MESSAGE_INVALID_PHONE, - MESSAGE_NOT_MASTER, - MESSAGE_SHARE_BOT, - MSG_ALREADY_MASTER, - MSG_BECOME_MASTER, - MSG_CONTACT_ADDED, - MSG_CONTACT_FORWARD, - MSG_ERROR, - MSG_NEED_PHONE, - MSG_PHONE_SAVED, - MSG_SEND_CLIENT_CONTACT, - MSG_WELCOME, - MSG_WELCOME_BACK, -} from './message'; -import { isCustomerMaster } from './utils/customer'; -import { isValidPhoneNumber, normalizePhoneNumber } from './utils/phone'; -import { CustomersService } from '@repo/graphql/api/customers'; -import { RegistrationService } from '@repo/graphql/api/registration'; -import { Enum_Customer_Role } from '@repo/graphql/types'; -import { Scenes, session, Telegraf, type Context as TelegrafContext } from 'telegraf'; -import { message } from 'telegraf/filters'; -import { - type SceneContextScene, - type SceneSession, - type WizardContextWizard, - type WizardSessionData, -} from 'telegraf/typings/scenes'; +import { logger } from './utils/logger'; +import { getRedisInstance } from './utils/redis'; +import { run } from '@grammyjs/runner'; -// Расширяем контекст бота для работы с сценами и сессиями -type BotContext = TelegrafContext & { - scene: SceneContextScene; - session: SceneSession; - wizard: WizardContextWizard; -}; - -// Создаём экземпляр бота с токеном -const bot = new Telegraf(environment.BOT_TOKEN); - -// Создаём менеджер сцен и подключаем сессию -const stage = new Scenes.Stage(); -bot.use(session({ defaultSession: () => ({ __scenes: { cursor: 0, state: {} } }) })); -bot.use(stage.middleware()); - -// Сцена добавления контакта клиента мастером -const addContactScene = new Scenes.WizardScene( - 'add-contact', - - // Шаг 1: Просим отправить контакт клиента - async (context) => { - await context.reply(MSG_SEND_CLIENT_CONTACT, { parse_mode: 'HTML' }); - return context.wizard.next(); - }, - - // Шаг 2: Обрабатываем полученный контакт - async (context) => { - if (!context.from) { - await context.reply('Ошибка: не удалось определить пользователя'); - return context.scene.leave(); - } - - // Команда отмены — выход из сцены - if (context.message && 'text' in context.message && context.message.text === '/cancel') { - await context.reply(MESSAGE_CANCEL + commandsList, { parse_mode: 'HTML' }); - return context.scene.leave(); - } - - // Проверяем, что отправлен контакт (через кнопку Telegram) - if (!context.message || !('contact' in context.message)) { - await context.reply('Пожалуйста, отправьте контакт клиента через кнопку Telegram'); - return; // остаёмся в сцене, ждем корректный контакт - } - - const telegramId = context.from.id; - const customerService = new CustomersService({ telegramId }); - - // Проверяем, что текущий пользователь — мастер - const { customer } = await customerService.getCustomer({ telegramId }); - if (!customer || !isCustomerMaster(customer)) { - await context.reply(MESSAGE_NOT_MASTER, { parse_mode: 'HTML' }); - return context.scene.leave(); - } - - const { contact } = context.message; - const name = `${contact.first_name || ''} ${contact.last_name || ''}`.trim(); - const phone = normalizePhoneNumber(contact.phone_number); - - // Проверяем валидность номера телефона - if (!isValidPhoneNumber(phone)) { - await context.reply(MESSAGE_INVALID_PHONE, { parse_mode: 'HTML' }); - return; // остаёмся в сцене, ждем правильный номер - } - - try { - // Проверяем, есть ли клиент с таким номером - const { customer: existingCustomer } = await customerService.getCustomer({ phone }); - let documentId = existingCustomer?.documentId; - - // Если клиента нет, создаём нового - if (!documentId) { - const registrationService = new RegistrationService(); - const createCustomerResult = await registrationService.createCustomer({ name, phone }); - - documentId = createCustomerResult?.createCustomer?.documentId; - if (!documentId) throw new Error('Клиент не создан'); - } - - // Добавляем текущего мастера к клиенту - const masters = [customer.documentId]; - await customerService.addMasters({ data: { masters }, documentId }); - - // Отправляем подтверждения и инструкции - await context.reply(MSG_CONTACT_ADDED(name), { parse_mode: 'HTML' }); - await context.reply(MSG_CONTACT_FORWARD, { parse_mode: 'HTML' }); - await context.reply(MESSAGE_SHARE_BOT, { ...KEYBOARD_SHARE_BOT, parse_mode: 'HTML' }); - } catch (error) { - await context.reply(MSG_ERROR(error), { parse_mode: 'HTML' }); - } finally { - await context.reply(commandsList, { ...KEYBOARD_REMOVE, parse_mode: 'HTML' }); - context.scene.leave(); - } - }, -); - -// Регистрируем сцену -stage.register(addContactScene); - -// Команда /start — приветствие и запрос номера, если пользователь новый -bot.start(async (context) => { - const telegramId = context.from.id; - - const customerService = new CustomersService({ telegramId }); - const { customer } = await customerService.getCustomer({ telegramId }); - - if (customer) { - // Пользователь уже зарегистрирован — приветствуем - return context.reply(MSG_WELCOME_BACK(customer.name) + commandsList, { - ...KEYBOARD_REMOVE, - parse_mode: 'HTML', - }); - } - - // Новый пользователь — просим поделиться номером - return context.reply(MSG_WELCOME, { ...KEYBOARD_SHARE_PHONE, parse_mode: 'HTML' }); +const bot = createBot({ + token: environment.BOT_TOKEN, }); -// Команда /help — список команд -bot.command('help', async (context) => { - return context.reply(commandsList, { ...KEYBOARD_REMOVE, parse_mode: 'HTML' }); -}); +const runner = run(bot); -// Команда /addcontact — начать сцену добавления контакта -bot.command('addcontact', async (context) => { - const telegramId = context.from.id; - const customerService = new CustomersService({ telegramId }); - const { customer } = await customerService.getCustomer({ telegramId }); +const redis = getRedisInstance(); - if (!customer) { - // Нет номера — просим поделиться - return context.reply(MSG_NEED_PHONE, { ...KEYBOARD_SHARE_PHONE, parse_mode: 'HTML' }); - } - - if (!isCustomerMaster(customer)) { - // Нет прав мастера - return context.reply(MESSAGE_NOT_MASTER, { parse_mode: 'HTML' }); - } - - // Входим в сцену - return context.scene.enter('add-contact'); -}); - -// Команда /becomemaster — запрос статуса мастера -bot.command('becomemaster', async (context) => { - const telegramId = context.from.id; - const customerService = new CustomersService({ telegramId }); - const { customer } = await customerService.getCustomer({ telegramId }); - - if (!customer) { - return context.reply(MSG_NEED_PHONE, { ...KEYBOARD_SHARE_PHONE, parse_mode: 'HTML' }); - } - - if (isCustomerMaster(customer)) { - return context.reply(MSG_ALREADY_MASTER, { parse_mode: 'HTML' }); - } - - // Обновляем роль клиента на мастер - const response = await customerService - .updateCustomer({ - data: { role: Enum_Customer_Role.Master }, - }) - .catch((error) => { - context.reply(MSG_ERROR(error), { parse_mode: 'HTML' }); - }); - - if (response) { - return context.reply(MSG_BECOME_MASTER, { parse_mode: 'HTML' }); - } -}); - -// Команда /sharebot — прислать ссылку на бота -bot.command('sharebot', async (context) => { - await context.reply(MSG_CONTACT_FORWARD, { parse_mode: 'HTML' }); - await context.reply(MESSAGE_SHARE_BOT, { ...KEYBOARD_SHARE_BOT, parse_mode: 'HTML' }); -}); - -// Обработка получения контакта от пользователя (регистрация или обновление) -bot.on(message('contact'), async (context) => { - const telegramId = context.from.id; - const { contact } = context.message; - const name = `${contact.first_name || ''} ${contact.last_name || ''}`.trim(); - - // Проверка наличия номера телефона - if (!contact.phone_number) { - return context.reply(MESSAGE_INVALID_PHONE, { parse_mode: 'HTML' }); - } - - // Нормализация и валидация номера - const phone = normalizePhoneNumber(contact.phone_number); - if (!isValidPhoneNumber(phone)) { - return context.reply(MESSAGE_INVALID_PHONE, { parse_mode: 'HTML' }); - } - - const registrationService = new RegistrationService(); +// Graceful shutdown function +async function gracefulShutdown(signal: string) { + logger.info(`Received ${signal}, starting graceful shutdown...`); try { - const { customer } = await registrationService.getCustomer({ phone }); + // Stop the bot + await runner.stop(); + logger.info('Bot stopped'); - if (customer && !customer.telegramId) { - // Пользователь добавлен ранее мастером — обновляем данные - await registrationService.updateCustomer({ - data: { active: true, name, telegramId }, - documentId: customer.documentId, - }); - - return context.reply(MSG_PHONE_SAVED + commandsList, { - ...KEYBOARD_REMOVE, - parse_mode: 'HTML', - }); - } - - // Новый пользователь — создаём и активируем - const response = await registrationService.createCustomer({ name, phone, telegramId }); - - const documentId = response?.createCustomer?.documentId; - if (!documentId) { - throw new Error('Не удалось создать клиента: отсутствует documentId'); - } - - await registrationService.updateCustomer({ - data: { active: true }, - documentId, - }); - - return context.reply(MSG_PHONE_SAVED + commandsList, { - ...KEYBOARD_REMOVE, - parse_mode: 'HTML', - }); + // Disconnect Redis + redis.disconnect(); + logger.info('Redis disconnected'); } catch (error) { - return context.reply(MSG_ERROR(error), { parse_mode: 'HTML' }); + const err_ = error as Error; + logger.error('Error during graceful shutdown:' + err_.message || ''); } -}); +} -// Запуск бота -bot.launch(); +// Stopping the bot when the Node.js process +// is about to be terminated +process.once('SIGINT', () => gracefulShutdown('SIGINT')); +process.once('SIGTERM', () => gracefulShutdown('SIGTERM')); -// Корректное завершение работы -process.once('SIGINT', () => bot.stop('SIGINT')); -process.once('SIGTERM', () => bot.stop('SIGTERM')); +logger.info('Bot started'); diff --git a/apps/bot/src/message.ts b/apps/bot/src/message.ts deleted file mode 100644 index 8f7dedc..0000000 --- a/apps/bot/src/message.ts +++ /dev/null @@ -1,83 +0,0 @@ -import { env as environment } from './config/env'; -import { type ReplyKeyboardRemove } from 'telegraf/types'; - -export const commandsList = ` -\n📋 Доступные команды: -• /addcontact — добавить контакт клиента -• /becomemaster — стать мастером -• /sharebot — поделиться ботом -• /help — список команд -\n -Откройте приложение кнопкой "Открыть", чтобы отредактировать свой профиль или создать запись -`; - -export const KEYBOARD_SHARE_PHONE = { - reply_markup: { - keyboard: [ - [ - { - request_contact: true, - text: '📱 Отправить номер телефона', - }, - ], - ], - one_time_keyboard: true, - }, -}; - -export const KEYBOARD_REMOVE = { - reply_markup: { - remove_keyboard: true, - } as ReplyKeyboardRemove, -}; - -export const KEYBOARD_SHARE_BOT = { - reply_markup: { - inline_keyboard: [ - [ - { - text: '🤖Воспользоваться ботом', - url: environment.BOT_URL, - }, - ], - ], - }, -}; - -export const MESSAGE_NOT_MASTER = - '⛔️ Только мастер может добавлять контакты\nСтать мастером можно на странице профиля в приложении или с помощью команды /becomemaster'; - -export const MSG_WELCOME = - '👋 Добро пожаловать!\nПожалуйста, поделитесь своим номером телефона для регистрации'; - -export const MSG_WELCOME_BACK = (name: string) => - `👋 С возвращением, ${name}!`; - -export const MSG_NEED_PHONE = - '📱 Чтобы добавить контакт, сначала поделитесь своим номером телефона'; - -export const MSG_SEND_CLIENT_CONTACT = - '👤 Отправьте контакт клиента, которого вы хотите добавить. \nДля отмены операции используйте команду /cancel'; - -export const MSG_ALREADY_MASTER = '🎉 Вы уже являетесь мастером!'; - -export const MSG_BECOME_MASTER = '🥳 Поздравляем! Теперь вы мастер'; - -export const MSG_ERROR = (error?: unknown) => - `❌ Произошла ошибка\n${error ? String(error) : ''}`; - -export const MSG_PHONE_SAVED = - '✅ Спасибо! Мы сохранили ваш номер телефона\nТеперь вы можете открыть приложение или воспользоваться командами бота'; - -export const MSG_CONTACT_ADDED = (name: string) => - `✅ Добавили ${name} в список ваших клиентов\n\nПригласите клиента в приложение, чтобы вы могли добавлять с ним записи`; - -export const MSG_CONTACT_FORWARD = - 'Перешлите пользователю следующее сообщение, чтобы он мог начать пользоваться ботом ⬇️'; - -export const MESSAGE_SHARE_BOT = - '📅 Воспользуйтесь этим ботом для записи к вашему мастеру!\nНажмите кнопку ниже, чтобы начать'; - -export const MESSAGE_CANCEL = '❌ Отменена операции'; - -export const MESSAGE_INVALID_PHONE = '❌ Некорректный номер телефона'; diff --git a/apps/bot/src/utils/logger.ts b/apps/bot/src/utils/logger.ts new file mode 100644 index 0000000..c440158 --- /dev/null +++ b/apps/bot/src/utils/logger.ts @@ -0,0 +1,13 @@ +/* eslint-disable turbo/no-undeclared-env-vars */ +import pino from 'pino'; + +export const logger = pino({ + transport: { + level: process.env.NODE_ENV === 'production' ? 'info' : 'debug', + options: { + colorize: true, + translateTime: true, + }, + target: 'pino-pretty', + }, +}); diff --git a/apps/bot/src/utils/messages.ts b/apps/bot/src/utils/messages.ts new file mode 100644 index 0000000..35f578d --- /dev/null +++ b/apps/bot/src/utils/messages.ts @@ -0,0 +1,3 @@ +export function combine(...messages: string[]) { + return messages.join('\n\n'); +} diff --git a/apps/bot/src/utils/redis.ts b/apps/bot/src/utils/redis.ts new file mode 100644 index 0000000..499b08d --- /dev/null +++ b/apps/bot/src/utils/redis.ts @@ -0,0 +1,23 @@ +import { env } from '@/config/env'; +import { logger } from '@/utils/logger'; +import Redis from 'ioredis'; + +const instance: Redis = createRedisInstance(); + +export function getRedisInstance() { + if (!instance) return createRedisInstance(); + + return instance; +} + +function createRedisInstance() { + const redis = new Redis({ + host: env.REDIS_HOST, + password: env.REDIS_PASSWORD, + port: env.REDIS_PORT, + }); + + redis.on('error', logger.error); + + return redis; +} diff --git a/apps/bot/src/utils/session.ts b/apps/bot/src/utils/session.ts new file mode 100644 index 0000000..6ac5fb4 --- /dev/null +++ b/apps/bot/src/utils/session.ts @@ -0,0 +1,5 @@ +import { type Context } from '@/bot/context'; + +export function getSessionKey(ctx: Omit) { + return ctx.chat?.id.toString(); +} diff --git a/apps/bot/src/utils/urls.ts b/apps/bot/src/utils/urls.ts new file mode 100644 index 0000000..f96e42a --- /dev/null +++ b/apps/bot/src/utils/urls.ts @@ -0,0 +1,5 @@ +import { TIKTOK_URL_REGEX } from '@/constants/regex'; + +export function validateTikTokUrl(url: string) { + return TIKTOK_URL_REGEX.test(url); +} diff --git a/apps/bot/tsconfig.json b/apps/bot/tsconfig.json index 38cb443..b151a7f 100644 --- a/apps/bot/tsconfig.json +++ b/apps/bot/tsconfig.json @@ -8,7 +8,7 @@ "moduleResolution": "Node", "module": "CommonJS", "paths": { - "@/*": ["./*"] + "@/*": ["./src/*"] } }, "include": ["."], diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index b759d24..362754a 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -1,6 +1,5 @@ services: web: - container_name: web env_file: - .env build: @@ -10,10 +9,28 @@ services: ports: - 3000:3000 bot: - container_name: bot - env_file: - - .env build: context: . dockerfile: ./apps/bot/Dockerfile + env_file: + - .env + depends_on: + - redis restart: always + + redis: + image: redis:8-alpine + restart: always + env_file: + - .env + command: ['redis-server', '--requirepass', '${REDIS_PASSWORD}'] + ports: + - '127.0.0.1:6379:6379' + volumes: + - redis-data:/data + healthcheck: + test: ['CMD', 'redis-cli', 'ping'] + interval: 30s + timeout: 10s + retries: 3 + start_period: 30s diff --git a/docker-compose.yml b/docker-compose.yml index d46d2b7..827dfb7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,11 +15,36 @@ services: bot: image: ${DOCKERHUB_USERNAME}/zapishis-bot:${BOT_IMAGE_TAG} + restart: always env_file: - .env - restart: always + depends_on: + - redis networks: - app + + redis: + image: redis:8-alpine + restart: always + env_file: + - .env + command: ['redis-server', '--requirepass', '${REDIS_PASSWORD}'] + volumes: + - redis-data:/data + deploy: + resources: + limits: + cpus: '0.50' + memory: 512M + reservations: + cpus: '0.25' + memory: 256M + healthcheck: + test: ['CMD', 'redis-cli', 'ping'] + interval: 30s + timeout: 10s + retries: 3 + start_period: 30s networks: app: diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a0a03f4..83499e0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -69,9 +69,6 @@ catalogs: tailwindcss: specifier: ^3.4.15 version: 3.4.15 - telegraf: - specifier: ^4.16.3 - version: 4.16.3 typescript: specifier: ^5.7 version: 5.7.2 @@ -105,6 +102,36 @@ importers: apps/bot: dependencies: + '@grammyjs/auto-chat-action': + specifier: ^0.1.1 + version: 0.1.1(grammy@1.38.1) + '@grammyjs/commands': + specifier: ^1.2.0 + version: 1.2.0(grammy@1.38.1) + '@grammyjs/conversations': + specifier: ^2.1.0 + version: 2.1.0(grammy@1.38.1) + '@grammyjs/hydrate': + specifier: ^1.6.0 + version: 1.6.0(grammy@1.38.1) + '@grammyjs/i18n': + specifier: ^1.1.2 + version: 1.1.2(grammy@1.38.1) + '@grammyjs/parse-mode': + specifier: ^2.2.0 + version: 2.2.0(grammy@1.38.1) + '@grammyjs/ratelimiter': + specifier: ^1.2.1 + version: 1.2.1 + '@grammyjs/runner': + specifier: ^2.0.3 + version: 2.0.3(grammy@1.38.1) + '@grammyjs/storage-redis': + specifier: ^2.5.1 + version: 2.5.1 + '@grammyjs/types': + specifier: ^3.22.1 + version: 3.22.1 '@repo/graphql': specifier: workspace:* version: link:../../packages/graphql @@ -114,9 +141,18 @@ importers: '@types/node': specifier: 'catalog:' version: 20.19.4 - telegraf: - specifier: 'catalog:' - version: 4.16.3 + grammy: + specifier: ^1.38.1 + version: 1.38.1 + ioredis: + specifier: ^5.7.0 + version: 5.7.0 + pino: + specifier: ^9.9.0 + version: 9.9.0 + pino-pretty: + specifier: ^13.1.1 + version: 13.1.1 tsup: specifier: ^8.5.0 version: 8.5.0(jiti@2.4.1)(postcss@8.5.6)(tsx@4.19.2)(typescript@5.8.3)(yaml@2.8.0) @@ -781,6 +817,12 @@ packages: '@bundled-es-modules/tough-cookie@0.1.6': resolution: {integrity: sha512-dvMHbL464C0zI+Yqxbz6kZ5TOEp7GLW+pry/RWndAR8MJQAXZ2rPmIs8tziTZjeIyhSNZgZbCePtfSbdWqStJw==} + '@deno/shim-deno-test@0.5.0': + resolution: {integrity: sha512-4nMhecpGlPi0cSzT67L+Tm+GOJqvuk8gqHBziqcUQOarnuIax1z96/gJHCSIz2Z0zhxE6Rzwb3IZXPtFh51j+w==} + + '@deno/shim-deno@0.18.2': + resolution: {integrity: sha512-oQ0CVmOio63wlhwQF75zA4ioolPvOwAoK0yuzcS5bDC1JUvH3y1GS8xPh8EOpcoDQRU4FTG8OQfxhpR+c6DrzA==} + '@emnapi/core@1.4.3': resolution: {integrity: sha512-4m62DuCE07lw01soJwPiBGC0nAww0Q+RY70VZ+n49yDIO13yyinhbWCeNnaob0lakDtWQzSdtNWzJeOJt2ma+g==} @@ -1275,6 +1317,14 @@ packages: '@floating-ui/utils@0.2.9': resolution: {integrity: sha512-MDWhGtE+eHw5JW7lq4qhc5yRLS11ERl1c7Z6Xd0a58DozHES6EnNNwUWbMiG4J9Cgj053Bhk8zvlhFYKVhULwg==} + '@fluent/bundle@0.17.1': + resolution: {integrity: sha512-CRFNT9QcSFAeFDneTF59eyv3JXFGhIIN4boUO2y22YmsuuKLyDk+N1I/NQUYz9Ab63e6V7T6vItoZIG/2oOOuw==} + engines: {node: '>=12.0.0', npm: '>=7.0.0'} + + '@fluent/langneg@0.6.2': + resolution: {integrity: sha512-YF4gZ4sLYRQfctpUR2uhb5UyPUYY5n/bi3OaED/Q4awKjPjlaF8tInO3uja7pnLQcmLTURkZL7L9zxv2Z5NDwg==} + engines: {node: '>=12.0.0', npm: '>=7.0.0'} + '@formatjs/ecma402-abstract@2.3.1': resolution: {integrity: sha512-Ip9uV+/MpLXWRk03U/GzeJMuPeOXpJBSB5V1tjA6kJhvqssye5J5LoYLc7Z5IAHb7nR62sRoguzrFiVCP/hnzw==} @@ -1290,6 +1340,55 @@ packages: '@formatjs/intl-localematcher@0.5.9': resolution: {integrity: sha512-8zkGu/sv5euxbjfZ/xmklqLyDGQSxsLqg8XOq88JW3cmJtzhCP8EtSJXlaKZnVO4beEaoiT9wj4eIoCQ9smwxA==} + '@grammyjs/auto-chat-action@0.1.1': + resolution: {integrity: sha512-70Jdy+keIri4452tluaZpKtHag5gD8pNczoXqajsnsx7pJC5wg3DAQ5unpt0xJb8KsVBAGWuJb298SBl3TVecg==} + peerDependencies: + grammy: ^1.0.0 + + '@grammyjs/commands@1.2.0': + resolution: {integrity: sha512-np3uZElWtVIQk8w73szBXcubuKFOEGnp+4dHyhw+KeVsN/yVwuaEAxt+kyEhfTUQdNH0zU7ffuCM2l7lVUDBWw==} + peerDependencies: + grammy: ^1.17.1 + + '@grammyjs/conversations@2.1.0': + resolution: {integrity: sha512-nYoHwFyXcQ2lkQejKReoINknkgFjeIZhyJNMBwHng5UHO/ewHKs1dV2XVaLrKkHTZ1gCZ+dKkjEp26wwHyQeGg==} + engines: {node: ^12.20.0 || >=14.13.1} + peerDependencies: + grammy: ^1.20.1 + + '@grammyjs/hydrate@1.6.0': + resolution: {integrity: sha512-dpszYCuzrYhhSJNjwV+zhG9SpwfFkO6nk+IHa56cd8ZCLO//aVVHOO5vKeobq4chhDu+MYjn7KaQMp0sn4Lb/g==} + engines: {node: ^12.20.0 || >=14.13.1} + peerDependencies: + grammy: ^1.38.0 + + '@grammyjs/i18n@1.1.2': + resolution: {integrity: sha512-PcK06mxuDDZjxdZ5HywBhr+erEITsR816KP4DNIDDds1jpA45pfz/nS9FdZmzF8H6lMyPix3mV5WL1rT4q+BuA==} + engines: {node: '>=12'} + peerDependencies: + grammy: ^1.10.0 + + '@grammyjs/parse-mode@2.2.0': + resolution: {integrity: sha512-sI5xjXYn1ihEEf1bJx4ew2KPsX1O3jsd2V/MpA1CX2tCYlxquidr7agk4IOR5bGEK38pyNVxVBdyCiy/eMxEfQ==} + engines: {node: '>=14.13.1'} + peerDependencies: + grammy: ^1.36.1 + + '@grammyjs/ratelimiter@1.2.1': + resolution: {integrity: sha512-4bmVUBCBnIb2epbDiBLCvvnVjaYg7kDCPR1Ptt6gqoxm5vlD8BjainYv+yjF6221hu2KUv8QAckumDI+6xyGsQ==} + + '@grammyjs/runner@2.0.3': + resolution: {integrity: sha512-nckmTs1dPWfVQteK9cxqxzE+0m1VRvluLWB8UgFzsjg62w3qthPJt0TYtJBEdG7OedvfQq4vnFAyE6iaMkR42A==} + engines: {node: '>=12.20.0 || >=14.13.1'} + peerDependencies: + grammy: ^1.13.1 + + '@grammyjs/storage-redis@2.5.1': + resolution: {integrity: sha512-Rz7bnrtDz8NOjgSRR4n/rBciHKSvmkrgIUc+8Yb96tSsecBlA91MGOmcgmQXKxb7gTmwliF37VgmMT85bsCZtA==} + + '@grammyjs/types@3.22.1': + resolution: {integrity: sha512-QJX0Y8lpjE+/nuTKGmxybKmvdrLHV7gqbhI/UXoWlJLWtowbwk+oW+ngfHKwegD+ewL2SX8+tQo/1E14Ma0qlw==} + '@graphql-codegen/add@5.0.3': resolution: {integrity: sha512-SxXPmramkth8XtBlAHu4H4jYcYXM/o3p01+psU+0NADQowA8jtYkK6MW5rV6T+CxkEaNZItfSmZRPgIuypcqnA==} peerDependencies: @@ -1759,6 +1858,9 @@ packages: '@types/node': optional: true + '@ioredis/commands@1.3.0': + resolution: {integrity: sha512-M/T6Zewn7sDaBQEqIZ8Rb+i9y8qfGmq+5SDFSf9sA2lUZTmdDLVdOiQaeDp+Q4wElZ9HG1GAX5KhDaidp6LQsQ==} + '@isaacs/balanced-match@4.0.1': resolution: {integrity: sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==} engines: {node: 20 || >=22} @@ -2381,9 +2483,6 @@ packages: peerDependencies: react: ^18 || ^19 - '@telegraf/types@7.1.0': - resolution: {integrity: sha512-kGevOIbpMcIlCDeorKGpwZmdH7kHbqlk/Yj6dEpJMKEQw5lk0KVQY0OLXaCswy8GqlIVLd5625OB+rAntP9xVw==} - '@telegram-apps/bridge@1.7.1': resolution: {integrity: sha512-oRbznpIC4UibMVygQ+tcS0ZSKx7DaI07MXQF42VETQ/VOCKeaWZeQFUifo4A+CzT6XMGo2hyse/CQP9ziX0H7g==} @@ -2951,6 +3050,10 @@ packages: asynckit@0.4.0: resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==} + atomic-sleep@1.0.0: + resolution: {integrity: sha512-kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ==} + engines: {node: '>=8.0.0'} + auto-bind@4.0.0: resolution: {integrity: sha512-Hdw8qdNiqdJ8LqT0iK0sVzkFbzg6fhnQqqfWhBDxcHZvU75+B+ayzTy8x+k5Ix0Y92XOhOUlx74ps+bA6BeYMQ==} engines: {node: '>=8'} @@ -3029,18 +3132,9 @@ packages: bser@2.1.1: resolution: {integrity: sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==} - buffer-alloc-unsafe@1.1.0: - resolution: {integrity: sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==} - - buffer-alloc@1.2.0: - resolution: {integrity: sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==} - buffer-equal-constant-time@1.0.1: resolution: {integrity: sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==} - buffer-fill@1.0.0: - resolution: {integrity: sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ==} - buffer@5.7.1: resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==} @@ -3208,6 +3302,10 @@ packages: resolution: {integrity: sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==} engines: {node: '>=6'} + cluster-key-slot@1.1.2: + resolution: {integrity: sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==} + engines: {node: '>=0.10.0'} + color-convert@2.0.1: resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==} engines: {node: '>=7.0.0'} @@ -3349,6 +3447,9 @@ packages: date-fns@4.1.0: resolution: {integrity: sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==} + dateformat@4.6.3: + resolution: {integrity: sha512-2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA==} + dayjs@1.11.13: resolution: {integrity: sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==} @@ -3419,6 +3520,10 @@ packages: resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==} engines: {node: '>=0.4.0'} + denque@2.1.0: + resolution: {integrity: sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==} + engines: {node: '>=0.10'} + dependency-graph@0.11.0: resolution: {integrity: sha512-JeMq7fEshyepOWDfcfHK06N3MhyPhz++vtqWhMT5O9A3K42rdsEDpfdVqjaqaAhsw6a+ZqeDvQVtD0hFHQWrzg==} engines: {node: '>= 0.6.0'} @@ -3507,6 +3612,9 @@ packages: emoji-regex@9.2.2: resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==} + end-of-stream@1.4.5: + resolution: {integrity: sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==} + enhance-visitors@1.0.0: resolution: {integrity: sha512-+29eJLiUixTEDRaZ35Vu8jP3gPLNcQQkQkOQjLp2X+6cZGGPDD/uasbFzvLsJKnGZnvmyZ0srxudwOtskHeIDA==} engines: {node: '>=4.0.0'} @@ -3969,6 +4077,9 @@ packages: resolution: {integrity: sha512-FuoE1qtbJ4bBVvv94CC7s0oTnKUGvQs+Rjf1L2SJFfS+HTVVjhPFtehPdQ0JiGPqVNfSSZvL5yzHHQq2Z4WNhQ==} engines: {node: ^12.20 || >= 14.13} + fast-copy@3.0.2: + resolution: {integrity: sha512-dl0O9Vhju8IrcLndv2eU4ldt1ftXMqqfgN4H1cpmGV7P6jeB9FwpN9a2c8DPGE1Ys88rNUJVYDHq73CGAGOPfQ==} + fast-decode-uri-component@1.0.1: resolution: {integrity: sha512-WKgKWg5eUxvRZGwW8FvfbaH7AXSh2cL+3j5fMGzUMCxWBJ3dV3a7Wz8y2f/uQ0e3B6WmodD3oS54jTQ9HVTIIg==} @@ -4003,6 +4114,13 @@ packages: fast-querystring@1.1.2: resolution: {integrity: sha512-g6KuKWmFXc0fID8WWH0jit4g0AGBoJhCkJMb1RmbsSEUNvQ+ZC8D6CUZ+GtF8nMzSPXnhiePyyqqipzNNEnHjg==} + fast-redact@3.5.0: + resolution: {integrity: sha512-dwsoQlS7h9hMeYUq1W++23NDcBLV4KqONnITDV9DjfS3q1SgDGVrBdvvTLUotWtPSD7asWDV9/CmsZPy8Hf70A==} + engines: {node: '>=6'} + + fast-safe-stringify@2.1.1: + resolution: {integrity: sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==} + fast-url-parser@1.1.3: resolution: {integrity: sha512-5jOCVXADYNuRkKFzNJ0dCCewsZiYo0dz8QNYljkOpFC6r2U4OBmKtvm/Tsuh4w1YYdDqDb31a8TVhBJ2OJKdqQ==} @@ -4204,6 +4322,10 @@ packages: graceful-fs@4.2.11: resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==} + grammy@1.38.1: + resolution: {integrity: sha512-aVBMeyYUjZ+rUEI+aV0T4himboXGs8Uf57c+vhtmHplPfgaRT04dyT9pG8R/GAmKeTUPh84GKO0u9IvaEGN6RA==} + engines: {node: ^12.20.0 || >=14.13.1} + graphemer@1.4.0: resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==} @@ -4304,6 +4426,9 @@ packages: headers-polyfill@4.0.3: resolution: {integrity: sha512-IScLbePpkvO846sIwOtOTDjutRMWdXdJmXdMvk6gCBHxFO8d+QKOQedyZSxFTTFYRSmlgSTDtXqqq4pcenBXLQ==} + help-me@5.0.0: + resolution: {integrity: sha512-7xgomUX6ADmcYzFik0HzAxh/73YlKR9bmFzf51CZwR+b6YtzU2m0u49hQCqV6SvlqIqsaxovfwdvbnsw3b/zpg==} + hoist-non-react-statics@3.3.2: resolution: {integrity: sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==} @@ -4395,6 +4520,10 @@ packages: invariant@2.2.4: resolution: {integrity: sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==} + ioredis@5.7.0: + resolution: {integrity: sha512-NUcA93i1lukyXU+riqEyPtSEkyFq8tX90uL659J+qpCZ3rEdViB/APC58oAhIh3+bJln2hzdlZbBZsGNrlsR8g==} + engines: {node: '>=12.22.0'} + is-absolute@1.0.0: resolution: {integrity: sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==} engines: {node: '>=0.10.0'} @@ -4628,6 +4757,10 @@ packages: isexe@2.0.0: resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==} + isexe@3.1.1: + resolution: {integrity: sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==} + engines: {node: '>=16'} + isomorphic-ws@5.0.0: resolution: {integrity: sha512-muId7Zzn9ywDsyXgTIafTry2sV3nySZeUDe6YedVd1Hvuuep5AsIlqK+XefWpYTyJG5e503F2xIuT2lcU6rCSw==} peerDependencies: @@ -4803,6 +4936,9 @@ packages: resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==} engines: {node: '>=10'} + lodash.defaults@4.2.0: + resolution: {integrity: sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==} + lodash.get@4.4.2: resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==} deprecated: This package is deprecated. Use the optional chaining (?.) operator instead. @@ -4810,6 +4946,9 @@ packages: lodash.includes@4.3.0: resolution: {integrity: sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==} + lodash.isarguments@3.1.0: + resolution: {integrity: sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==} + lodash.isboolean@3.0.3: resolution: {integrity: sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==} @@ -4977,10 +5116,6 @@ packages: mlly@1.7.4: resolution: {integrity: sha512-qmdSIPC4bDJXgZTCR7XosJiNKySV7O215tsPtDN9iEO/7q/76b/ijtgRu/+epFXSJhijtTCCGp3DWS549P3xKw==} - mri@1.2.0: - resolution: {integrity: sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==} - engines: {node: '>=4'} - ms@2.1.3: resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} @@ -5178,6 +5313,10 @@ packages: resolution: {integrity: sha512-IF4PcGgzAr6XXSff26Sk/+P4KZFJVuHAJZj3wgO3vX2bMdNVp/QXTP3P7CEm9V1IdG8lDLY3HhiqpsE/nOwpPw==} engines: {node: ^10.13.0 || >=12.0.0} + on-exit-leak-free@2.1.2: + resolution: {integrity: sha512-0eJJY6hXLGf1udHwfNftBqH+g73EU4B504nZeKpz1sYRKafAghwxEJunB2O7rDZkL4PGfsMVnTXZ2EjibbqcsA==} + engines: {node: '>=14.0.0'} + once@1.4.0: resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==} @@ -5238,10 +5377,6 @@ packages: resolution: {integrity: sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==} engines: {node: '>=10'} - p-timeout@4.1.0: - resolution: {integrity: sha512-+/wmHtzJuWii1sXn3HCuH/FTwGhrp4tmJTxSKJbfS+vkipci6osxXM5mY0jUiRzWKMTgUT8l7HFbeSwZAynqHw==} - engines: {node: '>=10'} - p-try@2.2.0: resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==} engines: {node: '>=6'} @@ -5346,6 +5481,20 @@ packages: resolution: {integrity: sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==} engines: {node: '>=0.10.0'} + pino-abstract-transport@2.0.0: + resolution: {integrity: sha512-F63x5tizV6WCh4R6RHyi2Ml+M70DNRXt/+HANowMflpgGFMAym/VKm6G7ZOQRjqN7XbGxK1Lg9t6ZrtzOaivMw==} + + pino-pretty@13.1.1: + resolution: {integrity: sha512-TNNEOg0eA0u+/WuqH0MH0Xui7uqVk9D74ESOpjtebSQYbNWJk/dIxCXIxFsNfeN53JmtWqYHP2OrIZjT/CBEnA==} + hasBin: true + + pino-std-serializers@7.0.0: + resolution: {integrity: sha512-e906FRY0+tV27iq4juKzSYPbUj2do2X2JX4EzSca1631EB2QJQUqGbDuERal7LCtOpxl6x3+nvo9NPZcmjkiFA==} + + pino@9.9.0: + resolution: {integrity: sha512-zxsRIQG9HzG+jEljmvmZupOMDUQ0Jpj0yAgE28jQvvrdYTlEaiGwelJpdndMl/MBuRr70heIj83QyqJUWaU8mQ==} + hasBin: true + pirates@4.0.6: resolution: {integrity: sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==} engines: {node: '>= 6'} @@ -5470,6 +5619,9 @@ packages: pretty-format@3.8.0: resolution: {integrity: sha512-WuxUnVtlWL1OfZFQFuqvnvs6MiAGk9UNsBostyBOB0Is9wb5uRESevA6rnl/rkksXaGX3GzZhPup5d6Vp1nFew==} + process-warning@5.0.0: + resolution: {integrity: sha512-a39t9ApHNx2L4+HBnQKqxxHNs1r7KF+Intd8Q/g1bUh6q0WIp9voPXJ/x0j+ZL45KF1pJd9+q2jLIRMfvEshkA==} + promise@7.3.1: resolution: {integrity: sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==} @@ -5483,6 +5635,9 @@ packages: psl@1.15.0: resolution: {integrity: sha512-JZd3gMVBAVQkSs6HdNZo9Sdo0LNcQeMNP3CozBJb3JYC/QUYZTnKxP+f8oWRX4rHP5EurWxqAHTSwUCjlNKa1w==} + pump@3.0.3: + resolution: {integrity: sha512-todwxLMY7/heScKmntwQG8CXVkWUOdYxIvY2s0VWAAMh/nd8SoYiRaKjlr7+iCs984f2P8zvrfWcDDYVb73NfA==} + punycode@1.4.1: resolution: {integrity: sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==} @@ -5503,6 +5658,9 @@ packages: queue-microtask@1.2.3: resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==} + quick-format-unescaped@4.0.4: + resolution: {integrity: sha512-tYC1Q1hgyRuHgloV/YXs2w15unPVh8qfu/qCTfhTYamaw7fyhumKa2yGpdSo87vY32rIclj+4fWYQXUMs9EHvg==} + radashi@12.5.1: resolution: {integrity: sha512-gcznSPJe2SCIuWf6QTqSHZRyMQU6hnUk4NpR7LmmNmdK1BGOXdnHuNIO4VzNw+feu0Wsnv/AYmxqwUYDBatPMA==} engines: {node: '>=16.0.0'} @@ -5595,10 +5753,22 @@ packages: resolution: {integrity: sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==} engines: {node: '>= 14.18.0'} + real-require@0.2.0: + resolution: {integrity: sha512-57frrGM/OCTLqLOAh0mhVA9VBMHd+9U7Zb2THMGdBUoZVOtGbJzjxsYGDJ3A9AYYCP4hn6y1TVbaOfzWtm5GFg==} + engines: {node: '>= 12.13.0'} + recast@0.23.9: resolution: {integrity: sha512-Hx/BGIbwj+Des3+xy5uAtAbdCyqK9y9wbBcDFDYanLS9JnMqf7OeF87HQwUimE87OEc72mr6tkKUKMBBL+hF9Q==} engines: {node: '>= 4'} + redis-errors@1.2.0: + resolution: {integrity: sha512-1qny3OExCf0UvUV/5wpYKf2YwPcOqXzkwKKSmKHiE6ZMQs5heeE/c8eXK+PNllPvmjgAbfnsbpkGZWy8cBpn9w==} + engines: {node: '>=4'} + + redis-parser@3.0.0: + resolution: {integrity: sha512-DJnGAeenTdpMEH6uAJRK/uiyEIH9WVsUmoLwzudwGJUwZPp80PDBWPHXSAGNPwNvIXAbe7MSUB1zQFugFml66A==} + engines: {node: '>=4'} + refa@0.12.1: resolution: {integrity: sha512-J8rn6v4DBb2nnFqkqwy6/NnTYMcgLA+sLr0iIO41qpv0n+ngb7ksag2tMRl0inb1bbO/esUwzW1vbJi7K0sI0g==} engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} @@ -5739,9 +5909,6 @@ packages: safe-buffer@5.2.1: resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==} - safe-compare@1.1.4: - resolution: {integrity: sha512-b9wZ986HHCo/HbKrRpBJb2kqXMK9CEWIE1egeEvZsYn69ay3kdfl9nG3RyOcR+jInTDf7a86WQ1d4VJX7goSSQ==} - safe-push-apply@1.0.0: resolution: {integrity: sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==} engines: {node: '>= 0.4'} @@ -5761,10 +5928,6 @@ packages: safer-buffer@2.1.2: resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==} - sandwich-stream@2.0.2: - resolution: {integrity: sha512-jLYV0DORrzY3xaz/S9ydJL6Iz7essZeAfnAavsJ+zsJGZ1MOnsS52yRjU3uF3pJa/lla7+wisp//fxOwOH8SKQ==} - engines: {node: '>= 0.10'} - saxes@6.0.0: resolution: {integrity: sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==} engines: {node: '>=v12.22.7'} @@ -5779,6 +5942,9 @@ packages: scuid@1.1.0: resolution: {integrity: sha512-MuCAyrGZcTLfQoH2XoBlQ8C6bzwN88XT/0slOGz0pn8+gIP85BOAfYa44ZXQUTOwRwPU0QvgU+V+OSajl/59Xg==} + secure-json-parse@4.0.0: + resolution: {integrity: sha512-dxtLJO6sc35jWidmLxo7ij+Eg48PM/kleBsxpC8QJE0qJICe+KawkDQmvCMZUr9u7WKVHgMW6vy3fQ7zMiFZMA==} + semver-compare@1.0.0: resolution: {integrity: sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==} @@ -5899,6 +6065,9 @@ packages: snake-case@3.0.4: resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==} + sonic-boom@4.2.0: + resolution: {integrity: sha512-INb7TM37/mAcsGmc9hyyI6+QR3rR1zVRu36B0NeGXKnOOLiZOfER5SA+N7X7k3yUYRzLWafduTDvJAfDswwEww==} + sonner@1.7.4: resolution: {integrity: sha512-DIS8z4PfJRbIyfVFDVnK9rO3eYDtse4Omcm6bt0oEr5/jtLgysmjuBl1frJ9E/EQZrFmKx2A8m/s5s9CRXIzhw==} peerDependencies: @@ -5916,6 +6085,7 @@ packages: source-map@0.8.0-beta.0: resolution: {integrity: sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==} engines: {node: '>= 8'} + deprecated: The work that was done in this beta branch won't be included in future versions spdx-correct@3.2.0: resolution: {integrity: sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==} @@ -5932,6 +6102,10 @@ packages: spdx-license-ids@3.0.20: resolution: {integrity: sha512-jg25NiDV/1fLtSgEgyvVyDunvaNHbuwF9lfNV17gSmPFAlYzdfNBlLtLzXTevwkPj7DhGbmN9VnmJIgLnhvaBw==} + split2@4.2.0: + resolution: {integrity: sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==} + engines: {node: '>= 10.x'} + sponge-case@1.0.1: resolution: {integrity: sha512-dblb9Et4DAtiZ5YSUZHLl4XhH4uK80GhAZrVXdN4O2P4gQ40Wa5UIOPUHlA/nFd2PLblBZWUioLMMAVrgpoYcA==} @@ -5945,6 +6119,9 @@ packages: stackback@0.0.2: resolution: {integrity: sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==} + standard-as-callback@2.1.0: + resolution: {integrity: sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==} + statuses@2.0.2: resolution: {integrity: sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==} engines: {node: '>= 0.8'} @@ -6038,6 +6215,10 @@ packages: resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==} engines: {node: '>=8'} + strip-json-comments@5.0.3: + resolution: {integrity: sha512-1tB5mhVo7U+ETBKNf92xT4hrQa3pm0MZ0PQvuDnWgAAGHDsfp4lPSpiS6psrSiet87wyGPh9ft6wmhOMQ0hDiw==} + engines: {node: '>=14.16'} + styled-jsx@5.1.6: resolution: {integrity: sha512-qSVyDTeMotdvQYoHWLNGwRFJHC+i+ZvdBRYosOFgC+Wg1vx4frN2/RG/NA7SYqqvKNLf39P2LSRA2pu6n0XYZA==} engines: {node: '>= 12.0.0'} @@ -6104,11 +6285,6 @@ packages: resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==} engines: {node: '>=6'} - telegraf@4.16.3: - resolution: {integrity: sha512-yjEu2NwkHlXu0OARWoNhJlIjX09dRktiMQFsM678BAH/PEPVwctzL67+tvXqLCRQQvm3SDtki2saGO9hLlz68w==} - engines: {node: ^12.20.0 || >=14.13.1} - hasBin: true - thenify-all@1.6.0: resolution: {integrity: sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==} engines: {node: '>=0.8'} @@ -6116,6 +6292,9 @@ packages: thenify@3.3.1: resolution: {integrity: sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==} + thread-stream@3.1.0: + resolution: {integrity: sha512-OqyPZ9u96VohAyMfJykzmivOrY2wfMSf3C5TtFJVgN+Hm6aj+voFhlK+kZEIv2FBh1X6Xp3DlnCOfEQ3B2J86A==} + through@2.3.8: resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==} @@ -6639,6 +6818,11 @@ packages: engines: {node: '>= 8'} hasBin: true + which@4.0.0: + resolution: {integrity: sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==} + engines: {node: ^16.13.0 || >=18.0.0} + hasBin: true + why-is-node-running@2.3.0: resolution: {integrity: sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==} engines: {node: '>=8'} @@ -7214,6 +7398,13 @@ snapshots: tough-cookie: 4.1.4 optional: true + '@deno/shim-deno-test@0.5.0': {} + + '@deno/shim-deno@0.18.2': + dependencies: + '@deno/shim-deno-test': 0.5.0 + which: 4.0.0 + '@emnapi/core@1.4.3': dependencies: '@emnapi/wasi-threads': 1.0.2 @@ -7462,7 +7653,7 @@ snapshots: '@eslint/config-array@0.19.2': dependencies: '@eslint/object-schema': 2.1.6 - debug: 4.4.0 + debug: 4.4.1 minimatch: 3.1.2 transitivePeerDependencies: - supports-color @@ -7474,7 +7665,7 @@ snapshots: '@eslint/eslintrc@3.3.0': dependencies: ajv: 6.12.6 - debug: 4.4.0 + debug: 4.4.1 espree: 10.3.0 globals: 14.0.0 ignore: 5.3.2 @@ -7511,6 +7702,10 @@ snapshots: '@floating-ui/utils@0.2.9': {} + '@fluent/bundle@0.17.1': {} + + '@fluent/langneg@0.6.2': {} + '@formatjs/ecma402-abstract@2.3.1': dependencies: '@formatjs/fast-memoize': 2.2.5 @@ -7537,6 +7732,45 @@ snapshots: dependencies: tslib: 2.8.1 + '@grammyjs/auto-chat-action@0.1.1(grammy@1.38.1)': + dependencies: + grammy: 1.38.1 + + '@grammyjs/commands@1.2.0(grammy@1.38.1)': + dependencies: + grammy: 1.38.1 + + '@grammyjs/conversations@2.1.0(grammy@1.38.1)': + dependencies: + grammy: 1.38.1 + + '@grammyjs/hydrate@1.6.0(grammy@1.38.1)': + dependencies: + abort-controller: 3.0.0 + grammy: 1.38.1 + + '@grammyjs/i18n@1.1.2(grammy@1.38.1)': + dependencies: + '@deno/shim-deno': 0.18.2 + '@fluent/bundle': 0.17.1 + '@fluent/langneg': 0.6.2 + grammy: 1.38.1 + + '@grammyjs/parse-mode@2.2.0(grammy@1.38.1)': + dependencies: + grammy: 1.38.1 + + '@grammyjs/ratelimiter@1.2.1': {} + + '@grammyjs/runner@2.0.3(grammy@1.38.1)': + dependencies: + abort-controller: 3.0.0 + grammy: 1.38.1 + + '@grammyjs/storage-redis@2.5.1': {} + + '@grammyjs/types@3.22.1': {} + '@graphql-codegen/add@5.0.3(graphql@16.11.0)': dependencies: '@graphql-codegen/plugin-helpers': 5.1.0(graphql@16.11.0) @@ -8310,6 +8544,8 @@ snapshots: '@types/node': 24.0.10 optional: true + '@ioredis/commands@1.3.0': {} + '@isaacs/balanced-match@4.0.1': {} '@isaacs/brace-expansion@5.0.0': @@ -8871,8 +9107,6 @@ snapshots: '@tanstack/query-core': 5.64.1 react: 19.1.0 - '@telegraf/types@7.1.0': {} - '@telegram-apps/bridge@1.7.1': dependencies: '@telegram-apps/signals': 1.1.0 @@ -9541,6 +9775,8 @@ snapshots: asynckit@0.4.0: {} + atomic-sleep@1.0.0: {} + auto-bind@4.0.0: {} autoprefixer@10.4.20(postcss@8.4.49): @@ -9651,17 +9887,8 @@ snapshots: dependencies: node-int64: 0.4.0 - buffer-alloc-unsafe@1.1.0: {} - - buffer-alloc@1.2.0: - dependencies: - buffer-alloc-unsafe: 1.1.0 - buffer-fill: 1.0.0 - buffer-equal-constant-time@1.0.1: {} - buffer-fill@1.0.0: {} - buffer@5.7.1: dependencies: base64-js: 1.5.1 @@ -9856,6 +10083,8 @@ snapshots: clsx@2.1.1: {} + cluster-key-slot@1.1.2: {} + color-convert@2.0.1: dependencies: color-name: 1.1.4 @@ -10001,6 +10230,8 @@ snapshots: date-fns@4.1.0: {} + dateformat@4.6.3: {} + dayjs@1.11.13: {} debounce@1.2.1: {} @@ -10047,6 +10278,8 @@ snapshots: delayed-stream@1.0.0: {} + denque@2.1.0: {} + dependency-graph@0.11.0: {} dequal@2.0.3: {} @@ -10118,6 +10351,10 @@ snapshots: emoji-regex@9.2.2: {} + end-of-stream@1.4.5: + dependencies: + once: 1.4.0 + enhance-visitors@1.0.0: dependencies: lodash: 4.17.21 @@ -10928,6 +11165,8 @@ snapshots: extract-files@11.0.0: {} + fast-copy@3.0.2: {} + fast-decode-uri-component@1.0.1: {} fast-deep-equal@3.1.3: {} @@ -10970,6 +11209,10 @@ snapshots: dependencies: fast-decode-uri-component: 1.0.1 + fast-redact@3.5.0: {} + + fast-safe-stringify@2.1.1: {} + fast-url-parser@1.1.3: dependencies: punycode: 1.4.1 @@ -11199,6 +11442,16 @@ snapshots: graceful-fs@4.2.11: {} + grammy@1.38.1: + dependencies: + '@grammyjs/types': 3.22.1 + abort-controller: 3.0.0 + debug: 4.4.1 + node-fetch: 2.7.0 + transitivePeerDependencies: + - encoding + - supports-color + graphemer@1.4.0: {} graphql-config@4.5.0(@types/node@24.0.10)(graphql@16.11.0): @@ -11306,6 +11559,8 @@ snapshots: headers-polyfill@4.0.3: optional: true + help-me@5.0.0: {} + hoist-non-react-statics@3.3.2: dependencies: react-is: 16.13.1 @@ -11409,6 +11664,20 @@ snapshots: dependencies: loose-envify: 1.4.0 + ioredis@5.7.0: + dependencies: + '@ioredis/commands': 1.3.0 + cluster-key-slot: 1.1.2 + debug: 4.4.1 + denque: 2.1.0 + lodash.defaults: 4.2.0 + lodash.isarguments: 3.1.0 + redis-errors: 1.2.0 + redis-parser: 3.0.0 + standard-as-callback: 2.1.0 + transitivePeerDependencies: + - supports-color + is-absolute@1.0.0: dependencies: is-relative: 1.0.0 @@ -11642,6 +11911,8 @@ snapshots: isexe@2.0.0: {} + isexe@3.1.1: {} + isomorphic-ws@5.0.0(ws@8.13.0): dependencies: ws: 8.13.0 @@ -11864,10 +12135,14 @@ snapshots: dependencies: p-locate: 5.0.0 + lodash.defaults@4.2.0: {} + lodash.get@4.4.2: {} lodash.includes@4.3.0: {} + lodash.isarguments@3.1.0: {} + lodash.isboolean@3.0.3: {} lodash.isinteger@4.0.4: {} @@ -12008,8 +12283,6 @@ snapshots: pkg-types: 1.3.1 ufo: 1.6.1 - mri@1.2.0: {} - ms@2.1.3: {} msw@2.7.0(@types/node@20.17.8)(typescript@5.7.2): @@ -12237,6 +12510,8 @@ snapshots: oidc-token-hash@5.0.3: {} + on-exit-leak-free@2.1.2: {} + once@1.4.0: dependencies: wrappy: 1.0.2 @@ -12319,8 +12594,6 @@ snapshots: dependencies: aggregate-error: 3.1.0 - p-timeout@4.1.0: {} - p-try@2.2.0: {} param-case@3.0.4: @@ -12408,6 +12681,42 @@ snapshots: pify@2.3.0: {} + pino-abstract-transport@2.0.0: + dependencies: + split2: 4.2.0 + + pino-pretty@13.1.1: + dependencies: + colorette: 2.0.20 + dateformat: 4.6.3 + fast-copy: 3.0.2 + fast-safe-stringify: 2.1.1 + help-me: 5.0.0 + joycon: 3.1.1 + minimist: 1.2.8 + on-exit-leak-free: 2.1.2 + pino-abstract-transport: 2.0.0 + pump: 3.0.3 + secure-json-parse: 4.0.0 + sonic-boom: 4.2.0 + strip-json-comments: 5.0.3 + + pino-std-serializers@7.0.0: {} + + pino@9.9.0: + dependencies: + atomic-sleep: 1.0.0 + fast-redact: 3.5.0 + on-exit-leak-free: 2.1.2 + pino-abstract-transport: 2.0.0 + pino-std-serializers: 7.0.0 + process-warning: 5.0.0 + quick-format-unescaped: 4.0.4 + real-require: 0.2.0 + safe-stable-stringify: 2.5.0 + sonic-boom: 4.2.0 + thread-stream: 3.1.0 + pirates@4.0.6: {} pkg-dir@5.0.0: @@ -12537,6 +12846,8 @@ snapshots: pretty-format@3.8.0: {} + process-warning@5.0.0: {} + promise@7.3.1: dependencies: asap: 2.0.6 @@ -12554,6 +12865,11 @@ snapshots: punycode: 2.3.1 optional: true + pump@3.0.3: + dependencies: + end-of-stream: 1.4.5 + once: 1.4.0 + punycode@1.4.1: {} punycode@2.3.1: {} @@ -12569,6 +12885,8 @@ snapshots: queue-microtask@1.2.3: {} + quick-format-unescaped@4.0.4: {} + radashi@12.5.1: {} radashi@12.6.0: {} @@ -12651,6 +12969,8 @@ snapshots: readdirp@4.1.2: {} + real-require@0.2.0: {} + recast@0.23.9: dependencies: ast-types: 0.16.1 @@ -12659,6 +12979,12 @@ snapshots: tiny-invariant: 1.3.3 tslib: 2.8.1 + redis-errors@1.2.0: {} + + redis-parser@3.0.0: + dependencies: + redis-errors: 1.2.0 + refa@0.12.1: dependencies: '@eslint-community/regexpp': 4.12.1 @@ -12827,10 +13153,6 @@ snapshots: safe-buffer@5.2.1: {} - safe-compare@1.1.4: - dependencies: - buffer-alloc: 1.2.0 - safe-push-apply@1.0.0: dependencies: es-errors: 1.3.0 @@ -12852,8 +13174,6 @@ snapshots: safer-buffer@2.1.2: {} - sandwich-stream@2.0.2: {} - saxes@6.0.0: dependencies: xmlchars: 2.2.0 @@ -12868,6 +13188,8 @@ snapshots: scuid@1.1.0: {} + secure-json-parse@4.0.0: {} + semver-compare@1.0.0: {} semver@5.7.2: {} @@ -13025,6 +13347,10 @@ snapshots: dot-case: 3.0.4 tslib: 2.6.3 + sonic-boom@4.2.0: + dependencies: + atomic-sleep: 1.0.0 + sonner@1.7.4(react-dom@19.1.0(react@19.1.0))(react@19.1.0): dependencies: react: 19.1.0 @@ -13057,6 +13383,8 @@ snapshots: spdx-license-ids@3.0.20: {} + split2@4.2.0: {} + sponge-case@1.0.1: dependencies: tslib: 2.6.3 @@ -13067,6 +13395,8 @@ snapshots: stackback@0.0.2: {} + standard-as-callback@2.1.0: {} + statuses@2.0.2: optional: true @@ -13186,6 +13516,8 @@ snapshots: strip-json-comments@3.1.1: {} + strip-json-comments@5.0.3: {} + styled-jsx@5.1.6(@babel/core@7.26.0)(react@19.1.0): dependencies: client-only: 0.0.1 @@ -13288,20 +13620,6 @@ snapshots: tapable@2.2.1: {} - telegraf@4.16.3: - dependencies: - '@telegraf/types': 7.1.0 - abort-controller: 3.0.0 - debug: 4.4.1 - mri: 1.2.0 - node-fetch: 2.7.0 - p-timeout: 4.1.0 - safe-compare: 1.1.4 - sandwich-stream: 2.0.2 - transitivePeerDependencies: - - encoding - - supports-color - thenify-all@1.6.0: dependencies: thenify: 3.3.1 @@ -13310,6 +13628,10 @@ snapshots: dependencies: any-promise: 1.3.0 + thread-stream@3.1.0: + dependencies: + real-require: 0.2.0 + through@2.3.8: {} tiny-invariant@1.3.3: {} @@ -13944,6 +14266,10 @@ snapshots: dependencies: isexe: 2.0.0 + which@4.0.0: + dependencies: + isexe: 3.1.1 + why-is-node-running@2.3.0: dependencies: siginfo: 2.0.0 diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 5a37920..6992ab8 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -24,7 +24,6 @@ catalog: radashi: ^12.5.1 rimraf: ^6.0.1 tailwindcss: ^3.4.15 - telegraf: ^4.16.3 typescript: ^5.7 vite-tsconfig-paths: ^5.1.4 vitest: ^2.1.8