admin/next-downloader-bot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: improve message handling with enhanced caching and error management

Browse Source
This commit is contained in:
vchikalkin 2026-01-14 17:52:09 +03:00
parent 6e9d2e9b9e
commit 58dc5f5ae3
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
apps/bot/src/bot/features/download.ts
View File

@ -14,9 +14,9 @@ import { cluster } from 'radashi';
const composer = new Composer<Context>();
const feature = composer.chatType('private');
const redis = getRedisInstance();
// Форматирование подписи как expandable blockquote
function formatCaption(caption: string) {
return fmt`${expandableBlockquote} ${caption} ${expandableBlockquote}`;
}
@ -24,6 +24,7 @@ function formatCaption(caption: string) {
feature.on('message:text', logHandle('download-message'), async (context) => {
const url = context.message.text.trim();
// Проверка поддерживаемых сервисов
const isTikTok = validateTikTokUrl(url);
const isInstagram = validateInstagramUrl(url);
const isYoutube = validateYoutubeUrl(url);
@ -34,11 +35,13 @@ feature.on('message:text', logHandle('download-message'), async (context) => {
return context.reply(context.t('err-invalid-url'));
}
// Проверка кеша
const cachedFileId = await redis.get(url);
let cachedMessageId: number | undefined;
let contentMessageId: number | undefined;
if (cachedFileId) {
const cachedMessage = await context.replyWithVideo(cachedFileId);
cachedMessageId = cachedMessage.message_id;
contentMessageId = cachedMessage.message_id;
}
const cachedCaption = await redis.get(`caption:${url}`);
@ -46,10 +49,11 @@ feature.on('message:text', logHandle('download-message'), async (context) => {
const { entities, text } = formatCaption(cachedCaption);
return context.reply(text, {
entities,
reply_parameters: cachedMessageId ? { message_id: cachedMessageId } : undefined,
reply_parameters: contentMessageId ? { message_id: contentMessageId } : undefined,
});
}
// Загрузка данных с сервисов
let imagesUrls: string[] | undefined;
let videoUrl: string | undefined;
let caption: string | undefined;
@ -69,9 +73,8 @@ feature.on('message:text', logHandle('download-message'), async (context) => {
const result = await getYoutubeDownloadUrl(url);
videoUrl = result.play;
}
} catch (error_: unknown) {
const error = error_ as Error;
const message = error?.message ?? String(error);
} catch (error: unknown) {
const message = (error as Error)?.message ?? String(error);
if (typeof message === 'string' && message.startsWith('err-')) {
return context.reply(context.t(message));
}
@ -83,8 +86,7 @@ feature.on('message:text', logHandle('download-message'), async (context) => {
return context.reply(context.t('err-invalid-download-urls'));
}
let contentMessageId: number | undefined;
// Отправка изображений
if (imagesUrls?.length) {
const chunks = cluster(imagesUrls, 10);
for (const chunk of chunks) {
@ -98,17 +100,21 @@ feature.on('message:text', logHandle('download-message'), async (context) => {
}
}
if (videoUrl) {
// Отправка видео
if (videoUrl && !contentMessageId) {
const { video, ...videoMessage } = await context.replyWithVideo(
new InputFile({ url: videoUrl }),
);
contentMessageId = videoMessage.message_id;
await redis.set(url, video.file_id, 'EX', TTL_URLS);
}
// Отправка описания
if (caption) {
const { entities, text } = formatCaption(caption);
await redis.set(`caption:${url}`, caption, 'EX', TTL_URLS);
await context.reply(text, {
entities,
reply_parameters: contentMessageId ? { message_id: contentMessageId } : undefined,