diff --git a/package.json b/package.json index d669de56e..b21ad573b 100644 --- a/package.json +++ b/package.json @@ -85,6 +85,7 @@ "dependencies": { "@buape/carbon": "0.0.0-beta-20260107085330", "@clack/prompts": "^0.11.0", + "@grammyjs/runner": "^2.0.3", "@grammyjs/transformer-throttler": "^1.2.1", "@homebridge/ciao": "^1.3.4", "@mariozechner/pi-agent-core": "^0.37.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 53505f5f1..14f509a45 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -28,6 +28,9 @@ importers: '@clack/prompts': specifier: ^0.11.0 version: 0.11.0 + '@grammyjs/runner': + specifier: ^2.0.3 + version: 2.0.3(grammy@1.39.2) '@grammyjs/transformer-throttler': specifier: ^1.2.1 version: 1.2.1(grammy@1.39.2) @@ -591,6 +594,12 @@ packages: '@modelcontextprotocol/sdk': optional: true + '@grammyjs/runner@2.0.3': + resolution: {integrity: sha512-nckmTs1dPWfVQteK9cxqxzE+0m1VRvluLWB8UgFzsjg62w3qthPJt0TYtJBEdG7OedvfQq4vnFAyE6iaMkR42A==} + engines: {node: '>=12.20.0 || >=14.13.1'} + peerDependencies: + grammy: ^1.13.1 + '@grammyjs/transformer-throttler@1.2.1': resolution: {integrity: sha512-CpWB0F3rJdUiKsq7826QhQsxbZi4wqfz1ccKX+fr+AOC+o8K7ZvS+wqX0suSu1QCsyUq2MDpNiKhyL2ZOJUS4w==} engines: {node: ^12.20.0 || >=14.13.1} @@ -3411,6 +3420,11 @@ snapshots: - supports-color - utf-8-validate + '@grammyjs/runner@2.0.3(grammy@1.39.2)': + dependencies: + abort-controller: 3.0.0 + grammy: 1.39.2 + '@grammyjs/transformer-throttler@1.2.1(grammy@1.39.2)': dependencies: bottleneck: 2.19.5 diff --git a/src/telegram/monitor.ts b/src/telegram/monitor.ts index 9f8328f8b..45fd56254 100644 --- a/src/telegram/monitor.ts +++ b/src/telegram/monitor.ts @@ -1,3 +1,4 @@ +import { run } from "@grammyjs/runner"; import { loadConfig } from "../config/config.js"; import type { RuntimeEnv } from "../runtime.js"; import { createTelegramBot } from "./bot.js"; @@ -53,13 +54,26 @@ export async function monitorTelegramProvider(opts: MonitorTelegramOpts = {}) { return; } - // Long polling + // Use grammyjs/runner for concurrent update processing + const runner = run(bot, { + runner: { + fetch: { + // Match grammY defaults + timeout: 30, + }, + }, + }); + const stopOnAbort = () => { - if (opts.abortSignal?.aborted) void bot.stop(); + if (opts.abortSignal?.aborted) { + runner.stop(); + } }; opts.abortSignal?.addEventListener("abort", stopOnAbort, { once: true }); + try { - await bot.start(); + // runner.task() returns a promise that resolves when the runner stops + await runner.task(); } finally { opts.abortSignal?.removeEventListener("abort", stopOnAbort); }