romtuck/openclaw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

telegram-user: harden login and monitor lifecycle

Browse Source
This commit is contained in:
Muhammed Mukhthar CM 2026-01-30 12:16:39 +00:00
parent c434e49907
commit a12e96b3d3
3 changed files with 87 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
extensions/telegram-user/src/login.ts
View File

@ -46,6 +46,10 @@ export async function loginTelegramUser(params: {
let phoneEnv = process.env.TELEGRAM_USER_PHONE?.trim() || undefined; let phoneEnv = process.env.TELEGRAM_USER_PHONE?.trim() || undefined;
const codeEnv = process.env.TELEGRAM_USER_CODE?.trim() || undefined; const codeEnv = process.env.TELEGRAM_USER_CODE?.trim() || undefined;
const passwordPrompt = passwordEnv
? passwordEnv
: async () => await promptText("2FA password: ");
try { try {
if (!phoneEnv) { if (!phoneEnv) {
const mode = await promptLoginMode(); const mode = await promptLoginMode();
@ -58,7 +62,7 @@ export async function loginTelegramUser(params: {
? { ? {
phone: phoneEnv, phone: phoneEnv,
code: codeEnv ? codeEnv : async () => await promptText("Telegram code: "), code: codeEnv ? codeEnv : async () => await promptText("Telegram code: "),
password: passwordEnv ? passwordEnv : async () => await promptText("2FA password: "), password: passwordPrompt,
codeSentCallback: (code) => { codeSentCallback: (code) => {
runtime.log( runtime.log(
`Telegram code sent via ${code.type}. Check your device and enter it here.`, `Telegram code sent via ${code.type}. Check your device and enter it here.`,
@ -84,11 +88,13 @@ export async function loginTelegramUser(params: {
runtime.log(`Scan this QR in Telegram (expires ${expires.toLocaleTimeString()}):`); runtime.log(`Scan this QR in Telegram (expires ${expires.toLocaleTimeString()}):`);
qrcode.generate(url, { small: true }); qrcode.generate(url, { small: true });
}, },
...(passwordEnv ? { password: passwordEnv } : {}), password: passwordPrompt,
invalidCodeCallback: async (type) => { invalidCodeCallback: async (type) => {
if (type === "password") { if (type === "password") {
runtime.error?.( runtime.error?.(
"Telegram 2FA password rejected. Set TELEGRAM_USER_PASSWORD and rerun.", passwordEnv
? "Telegram 2FA password rejected. Update TELEGRAM_USER_PASSWORD and rerun."
: "Telegram 2FA password rejected. Try again.",
); );
} }
}, },

6
extensions/telegram-user/src/monitor/handler.ts
View File

@ -361,8 +361,9 @@ export function createTelegramUserMessageHandler(params: TelegramUserHandlerPara
const combinedAllowFrom = [...allowFrom, ...storeAllowFrom]; const combinedAllowFrom = [...allowFrom, ...storeAllowFrom];
const chatId = msg.chat.type === "chat" ? msg.chat.id : undefined; const chatId = msg.chat.type === "chat" ? msg.chat.id : undefined;
const isForum = msg.chat.type === "chat" && msg.chat.isForum === true; const isForum = msg.chat.type === "chat" && msg.chat.isForum === true;
const isTopicMessage = msg.isTopicMessage === true;
const threadId = const threadId =
isGroup && isForum ? msg.replyToMessage?.threadId ?? undefined : undefined; isGroup && isForum && isTopicMessage ? msg.replyToMessage?.threadId ?? undefined : undefined;
const { groupConfig, topicConfig } = const { groupConfig, topicConfig } =
isGroup && chatId != null isGroup && chatId != null
? resolveTelegramUserGroupConfig(accountConfig, chatId, threadId) ? resolveTelegramUserGroupConfig(accountConfig, chatId, threadId)
@ -499,7 +500,8 @@ export function createTelegramUserMessageHandler(params: TelegramUserHandlerPara
...core.channel.mentions.buildMentionRegexes(cfg, route.agentId), ...core.channel.mentions.buildMentionRegexes(cfg, route.agentId),
...buildTelegramUserSelfMentionRegexes({ username: self?.username, name: self?.name }), ...buildTelegramUserSelfMentionRegexes({ username: self?.username, name: self?.name }),
]; ];
const hasAnyMention = msg.entities.some( const entities = msg.entities ?? [];
const hasAnyMention = entities.some(
(ent) => ent.kind === "mention" || ent.kind === "text_mention", (ent) => ent.kind === "mention" || ent.kind === "text_mention",
); );
const hasControlCommandInMessage = core.channel.text.hasControlCommand(text, cfg, { const hasControlCommandInMessage = core.channel.text.hasControlCommand(text, cfg, {

9
extensions/telegram-user/src/monitor/index.ts
View File

@ -64,9 +64,11 @@ export async function monitorTelegramUserProvider(opts: MonitorTelegramUserOpts
); );
} }
const client = await createTelegramUserClient({ apiId, apiHash, storagePath }); const client = await createTelegramUserClient({ apiId, apiHash, storagePath });
setActiveTelegramUserClient(account.accountId, client); let stopped = false;
const stop = async () => { const stop = async () => {
if (stopped) return;
stopped = true;
shuttingDown = true; shuttingDown = true;
setActiveTelegramUserClient(account.accountId, null); setActiveTelegramUserClient(account.accountId, null);
await client.destroy().catch(() => undefined); await client.destroy().catch(() => undefined);
@ -81,7 +83,9 @@ export async function monitorTelegramUserProvider(opts: MonitorTelegramUserOpts
{ once: true }, { once: true },
); );
try {
await client.start(); await client.start();
setActiveTelegramUserClient(account.accountId, client);
const { Dispatcher, filters } = await loadMtcuteDispatcher(); const { Dispatcher, filters } = await loadMtcuteDispatcher();
const dispatcher = Dispatcher.for(client); const dispatcher = Dispatcher.for(client);
@ -152,6 +156,7 @@ export async function monitorTelegramUserProvider(opts: MonitorTelegramUserOpts
} }
opts.abortSignal?.addEventListener("abort", () => settleResolve(), { once: true }); opts.abortSignal?.addEventListener("abort", () => settleResolve(), { once: true });
}); });
} finally {
await stop(); await stop();
} }
}