fix(telegram): handle Grammy HttpError network failures (#3815) (#7195)

* fix(telegram): handle Grammy HttpError network failures (#3815)

Grammy wraps fetch errors in an .error property (not .cause). Added .error
traversal to collectErrorCandidates in network-errors.ts.

Registered scoped unhandled rejection handler in monitorTelegramProvider
to catch network errors that escape the polling loop (e.g., from setMyCommands
during bot setup). Handler is unregistered when the provider stops.

* fix(telegram): address review feedback for Grammy HttpError handling

- Gate .error traversal on HttpError name to avoid widening search graph
- Use runtime logger instead of console.warn for consistency
- Add isGrammyHttpError check to scope unhandled rejection handler
- Consolidate isNetworkRelatedError into isRecoverableTelegramNetworkError
- Add 'timeout' to recoverable message snippets for full coverage
This commit is contained in:
Christian Klotz 2026-02-02 15:25:41 +00:00 committed by GitHub
parent f9fae2c439
commit 99b4f2a24e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 164 additions and 111 deletions

View file

@ -6,6 +6,7 @@ import { loadConfig } from "../config/config.js";
import { computeBackoff, sleepWithAbort } from "../infra/backoff.js";
import { formatErrorMessage } from "../infra/errors.js";
import { formatDurationMs } from "../infra/format-duration.js";
import { registerUnhandledRejectionHandler } from "../infra/unhandled-rejections.js";
import { resolveTelegramAccount } from "./accounts.js";
import { resolveTelegramAllowedUpdates } from "./allowed-updates.js";
import { createTelegramBot } from "./bot.js";
@ -78,28 +79,30 @@ const isGetUpdatesConflict = (err: unknown) => {
return haystack.includes("getupdates");
};
const NETWORK_ERROR_SNIPPETS = [
"fetch failed",
"network",
"timeout",
"socket",
"econnreset",
"econnrefused",
"undici",
];
const isNetworkRelatedError = (err: unknown) => {
if (!err) {
/** Check if error is a Grammy HttpError (used to scope unhandled rejection handling) */
const isGrammyHttpError = (err: unknown): boolean => {
if (!err || typeof err !== "object") {
return false;
}
const message = formatErrorMessage(err).toLowerCase();
if (!message) {
return false;
}
return NETWORK_ERROR_SNIPPETS.some((snippet) => message.includes(snippet));
return (err as { name?: string }).name === "HttpError";
};
export async function monitorTelegramProvider(opts: MonitorTelegramOpts = {}) {
const log = opts.runtime?.error ?? console.error;
// Register handler for Grammy HttpError unhandled rejections.
// This catches network errors that escape the polling loop's try-catch
// (e.g., from setMyCommands during bot setup).
// We gate on isGrammyHttpError to avoid suppressing non-Telegram errors.
const unregisterHandler = registerUnhandledRejectionHandler((err) => {
if (isGrammyHttpError(err) && isRecoverableTelegramNetworkError(err, { context: "polling" })) {
log(`[telegram] Suppressed network error: ${formatErrorMessage(err)}`);
return true; // handled - don't crash
}
return false;
});
try {
const cfg = opts.config ?? loadConfig();
const account = resolveTelegramAccount({
cfg,
@ -184,8 +187,7 @@ export async function monitorTelegramProvider(opts: MonitorTelegramOpts = {}) {
}
const isConflict = isGetUpdatesConflict(err);
const isRecoverable = isRecoverableTelegramNetworkError(err, { context: "polling" });
const isNetworkError = isNetworkRelatedError(err);
if (!isConflict && !isRecoverable && !isNetworkError) {
if (!isConflict && !isRecoverable) {
throw err;
}
restartAttempts += 1;
@ -207,4 +209,7 @@ export async function monitorTelegramProvider(opts: MonitorTelegramOpts = {}) {
opts.abortSignal?.removeEventListener("abort", stopOnAbort);
}
}
} finally {
unregisterHandler();
}
}

View file

@ -39,4 +39,43 @@ describe("isRecoverableTelegramNetworkError", () => {
it("returns false for unrelated errors", () => {
expect(isRecoverableTelegramNetworkError(new Error("invalid token"))).toBe(false);
});
// Grammy HttpError tests (issue #3815)
// Grammy wraps fetch errors in .error property, not .cause
describe("Grammy HttpError", () => {
class MockHttpError extends Error {
constructor(
message: string,
public readonly error: unknown,
) {
super(message);
this.name = "HttpError";
}
}
it("detects network error wrapped in HttpError", () => {
const fetchError = new TypeError("fetch failed");
const httpError = new MockHttpError(
"Network request for 'setMyCommands' failed!",
fetchError,
);
expect(isRecoverableTelegramNetworkError(httpError)).toBe(true);
});
it("detects network error with cause wrapped in HttpError", () => {
const cause = Object.assign(new Error("socket hang up"), { code: "ECONNRESET" });
const fetchError = Object.assign(new TypeError("fetch failed"), { cause });
const httpError = new MockHttpError("Network request for 'getUpdates' failed!", fetchError);
expect(isRecoverableTelegramNetworkError(httpError)).toBe(true);
});
it("returns false for non-network errors wrapped in HttpError", () => {
const authError = new Error("Unauthorized: bot token is invalid");
const httpError = new MockHttpError("Bad Request: invalid token", authError);
expect(isRecoverableTelegramNetworkError(httpError)).toBe(false);
});
});
});

View file

@ -36,6 +36,7 @@ const RECOVERABLE_MESSAGE_SNIPPETS = [
"client network socket disconnected",
"socket hang up",
"getaddrinfo",
"timeout", // catch timeout messages not covered by error codes/names
];
function normalizeCode(code?: string): string {
@ -97,6 +98,14 @@ function collectErrorCandidates(err: unknown): unknown[] {
}
}
}
// Grammy's HttpError wraps the underlying error in .error (not .cause)
// Only follow .error for HttpError to avoid widening the search graph
if (getErrorName(current) === "HttpError") {
const wrappedError = (current as { error?: unknown }).error;
if (wrappedError && !seen.has(wrappedError)) {
queue.push(wrappedError);
}
}
}
}