@bytesbrains/pi-telegram-bridge 1.1.3 → 1.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bytesbrains/pi-telegram-bridge",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "Telegram bot bridge for pi agents — send messages, ask questions, and listen for human replies via Telegram.",
   "keywords": [
     "pi-package",
@@ -49,6 +49,7 @@
     "test:watch": "vitest"
   },
   "devDependencies": {
+    "@types/node": "^25.8.0",
     "typescript": "^6.0.3",
     "vitest": "^2.1.9"
   }

package/src/helpers.ts

@@ -6,247 +6,241 @@ const BASE_URL = "https://api.telegram.org/bot";
 // ── Config ──────────────────────────────────────────────────────────
 
 export function getToken(): string {
-  const tok = process.env.TELEGRAM_BOT_TOKEN;
-  if (!tok) throw new Error("TELEGRAM_BOT_TOKEN not set");
-  return tok;
+	const tok = process.env.TELEGRAM_BOT_TOKEN;
+	if (!tok) throw new Error("TELEGRAM_BOT_TOKEN not set");
+	return tok;
 }
 
 export function getChatId(): string {
-  const id = process.env.TELEGRAM_CHAT_ID;
-  if (!id) throw new Error("TELEGRAM_CHAT_ID not set");
-  return id;
+	const id = process.env.TELEGRAM_CHAT_ID;
+	if (!id) throw new Error("TELEGRAM_CHAT_ID not set");
+	return id;
 }
 
 // ── API ─────────────────────────────────────────────────────────────
 
 export async function telegramApi(
-  method: string,
-  body: Record<string, unknown>,
+	method: string,
+	body: Record<string, unknown>,
 ): Promise<unknown> {
-  const url = `${BASE_URL}${getToken()}/${method}`;
-  const res = await fetch(url, {
-    method: "POST",
-    headers: { "Content-Type": "application/json" },
-    body: JSON.stringify(body),
-  });
-  if (!res.ok) {
-    throw new Error(`Telegram API ${res.status}: ${await res.text()}`);
-  }
-  return res.json();
+	const url = `${BASE_URL}${getToken()}/${method}`;
+	const res = await fetch(url, {
+		method: "POST",
+		headers: { "Content-Type": "application/json" },
+		body: JSON.stringify(body),
+	});
+	if (!res.ok) {
+		throw new Error(`Telegram API ${res.status}: ${await res.text()}`);
+	}
+	return res.json();
 }
 
 // ── Messaging ───────────────────────────────────────────────────────
 
 export async function sendMsg(
-  text: string,
-  replyMarkup?: object,
-  parseMode: "Markdown" | "HTML" = "Markdown",
+	text: string,
+	replyMarkup?: object,
+	parseMode: "Markdown" | "HTML" | undefined = undefined,
 ): Promise<number> {
-  const body: Record<string, unknown> = {
-    chat_id: getChatId(),
-    text,
-    parse_mode: parseMode,
-  };
-  if (replyMarkup) body.reply_markup = JSON.stringify(replyMarkup);
-  const r = (await telegramApi("sendMessage", body)) as {
-    ok: boolean;
-    result: { message_id: number };
-  };
-  return r.result.message_id;
+	const body: Record<string, unknown> = {
+		chat_id: getChatId(),
+		text,
+		parse_mode: parseMode,
+	};
+	if (replyMarkup) body.reply_markup = JSON.stringify(replyMarkup);
+	const r = (await telegramApi("sendMessage", body)) as {
+		ok: boolean;
+		result: { message_id: number };
+	};
+	return r.result.message_id;
 }
 
 // ── Polling ─────────────────────────────────────────────────────────
 
 export async function pollReply(
-  sentId: number,
-  chatId: string,
-  timeoutMs: number,
+	sentId: number,
+	chatId: string,
+	timeoutMs: number,
 ): Promise<string | null> {
-  const token = getToken();
-  const deadline = Date.now() + timeoutMs;
+	const token = getToken();
+	const deadline = Date.now() + timeoutMs;
 
-  // Drain pending updates to start fresh
-  let lastId = 0;
-  try {
-    const drain = await fetch(`${BASE_URL}${token}/getUpdates`, {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ timeout: 0 }),
-    });
-    if (drain.ok) {
-      const d = (await drain.json()) as {
-        ok: boolean;
-        result: Array<{ update_id: number }>;
-      };
-      if (d.ok && d.result.length > 0) {
-        lastId = d.result[d.result.length - 1].update_id;
-      }
-    }
-  } catch {
-    /* ignore drain errors */
-  }
+	// Drain pending updates to start fresh
+	let lastId = 0;
+	try {
+		const drain = await fetch(`${BASE_URL}${token}/getUpdates`, {
+			method: "POST",
+			headers: { "Content-Type": "application/json" },
+			body: JSON.stringify({ timeout: 0 }),
+		});
+		if (drain.ok) {
+			const d = (await drain.json()) as {
+				ok: boolean;
+				result: Array<{ update_id: number }>;
+			};
+			if (d.ok && d.result.length > 0) {
+				lastId = d.result[d.result.length - 1].update_id;
+			}
+		}
+	} catch {
+		/* ignore drain errors */
+	}
 
-  while (Date.now() < deadline) {
-    const res = await fetch(
-      `${BASE_URL}${token}/getUpdates`,
-      {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ offset: lastId + 1, timeout: 5 }),
-      },
-    );
-    if (!res.ok) {
-      await new Promise((r) => setTimeout(r, 3000));
-      continue;
-    }
-    const data = (await res.json()) as {
-      ok: boolean;
-      result: Array<{
-        update_id: number;
-        message?: {
-          message_id: number;
-          chat: { id: number };
-          text?: string;
-        };
-        callback_query?: {
-          id: string;
-          message: { message_id: number; chat: { id: number } };
-          data: string;
-        };
-      }>;
-    };
-    if (!data.ok) {
-      await new Promise((r) => setTimeout(r, 2000));
-      continue;
-    }
-    for (const u of data.result) {
-      lastId = u.update_id;
-      // Check for text reply
-      if (
-        u.message &&
-        u.message.chat.id === Number(chatId) &&
-        u.message.message_id > sentId &&
-        u.message.text
-      ) {
-        return u.message.text;
-      }
-      // Check for callback query (inline button)
-      if (
-        u.callback_query &&
-        u.callback_query.message.chat.id === Number(chatId)
-      ) {
-        await telegramApi("answerCallbackQuery", {
-          callback_query_id: u.callback_query.id,
-        });
-        return u.callback_query.data;
-      }
-    }
-    await new Promise((r) => setTimeout(r, 2000));
-  }
-  return null; // timeout
+	while (Date.now() < deadline) {
+		const res = await fetch(`${BASE_URL}${token}/getUpdates`, {
+			method: "POST",
+			headers: { "Content-Type": "application/json" },
+			body: JSON.stringify({ offset: lastId + 1, timeout: 5 }),
+		});
+		if (!res.ok) {
+			await new Promise((r) => setTimeout(r, 3000));
+			continue;
+		}
+		const data = (await res.json()) as {
+			ok: boolean;
+			result: Array<{
+				update_id: number;
+				message?: {
+					message_id: number;
+					chat: { id: number };
+					text?: string;
+				};
+				callback_query?: {
+					id: string;
+					message: { message_id: number; chat: { id: number } };
+					data: string;
+				};
+			}>;
+		};
+		if (!data.ok) {
+			await new Promise((r) => setTimeout(r, 2000));
+			continue;
+		}
+		for (const u of data.result) {
+			lastId = u.update_id;
+			// Check for text reply
+			if (
+				u.message &&
+				u.message.chat.id === Number(chatId) &&
+				u.message.message_id > sentId &&
+				u.message.text
+			) {
+				return u.message.text;
+			}
+			// Check for callback query (inline button)
+			if (
+				u.callback_query &&
+				u.callback_query.message.chat.id === Number(chatId)
+			) {
+				await telegramApi("answerCallbackQuery", {
+					callback_query_id: u.callback_query.id,
+				});
+				return u.callback_query.data;
+			}
+		}
+		await new Promise((r) => setTimeout(r, 2000));
+	}
+	return null; // timeout
 }
 
 // ── Listener State ──────────────────────────────────────────────────
 
 export async function getBotId(): Promise<number | null> {
-  try {
-    const r = (await telegramApi("getMe", {})) as { result: { id: number } };
-    return r.result.id;
-  } catch {
-    return null;
-  }
+	try {
+		const r = (await telegramApi("getMe", {})) as { result: { id: number } };
+		return r.result.id;
+	} catch {
+		return null;
+	}
 }
 
 export async function seedLastUpdateId(
-  lastUpdateId: number,
-  signal?: AbortSignal,
+	lastUpdateId: number,
+	signal?: AbortSignal,
 ): Promise<number> {
-  if (lastUpdateId !== 0) return lastUpdateId;
-  const token = getToken();
-  try {
-    const res = await fetch(`${BASE_URL}${token}/getUpdates`, {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ timeout: 0 }),
-      signal,
-    });
-    if (res.ok) {
-      const d = (await res.json()) as {
-        ok: boolean;
-        result: Array<{ update_id: number }>;
-      };
-      if (d.ok && d.result.length > 0) {
-        return d.result[d.result.length - 1].update_id;
-      }
-    }
-  } catch {
-    /* ignore */
-  }
-  return lastUpdateId;
+	if (lastUpdateId !== 0) return lastUpdateId;
+	const token = getToken();
+	try {
+		const res = await fetch(`${BASE_URL}${token}/getUpdates`, {
+			method: "POST",
+			headers: { "Content-Type": "application/json" },
+			body: JSON.stringify({ timeout: 0 }),
+			signal,
+		});
+		if (res.ok) {
+			const d = (await res.json()) as {
+				ok: boolean;
+				result: Array<{ update_id: number }>;
+			};
+			if (d.ok && d.result.length > 0) {
+				return d.result[d.result.length - 1].update_id;
+			}
+		}
+	} catch {
+		/* ignore */
+	}
+	return lastUpdateId;
 }
 
 export async function pollUpdates(
-  token: string,
-  chatId: string,
-  botId: number | null,
-  lastUpdateId: number,
-  signal: AbortSignal,
-  onMessage: (text: string) => void,
-  onUpdateId: (id: number) => void,
+	token: string,
+	chatId: string,
+	botId: number | null,
+	lastUpdateId: number,
+	signal: AbortSignal,
+	onMessage: (text: string) => void,
+	onUpdateId: (id: number) => void,
 ): Promise<void> {
-  while (!signal.aborted) {
-    try {
-      const res = await fetch(
-        `${BASE_URL}${token}/getUpdates`,
-        {
-          method: "POST",
-          headers: { "Content-Type": "application/json" },
-          body: JSON.stringify({ offset: lastUpdateId + 1, timeout: 10 }),
-          signal,
-        },
-      );
-      if (!res.ok) {
-        await new Promise((r) => setTimeout(r, 3000));
-        continue;
-      }
-      const data = (await res.json()) as {
-        ok: boolean;
-        result: Array<{
-          update_id: number;
-          message?: {
-            message_id: number;
-            chat: { id: number };
-            from?: { id: number; is_bot?: boolean };
-            text?: string;
-          };
-          callback_query?: unknown;
-        }>;
-      };
-      if (!data.ok) {
-        await new Promise((r) => setTimeout(r, 2000));
-        continue;
-      }
-      for (const u of data.result) {
-        lastUpdateId = u.update_id;
-        onUpdateId(lastUpdateId);
-        // Skip callback queries (handled by telegram_ask)
-        if (u.callback_query) continue;
-        // Only process text messages from the configured chat, not from our bot
-        if (
-          u.message &&
-          u.message.text &&
-          String(u.message.chat.id) === chatId
-        ) {
-          if (u.message.from?.is_bot || u.message.from?.id === botId) {
-            continue;
-          }
-          onMessage(u.message.text);
-        }
-      }
-    } catch (e: unknown) {
-      if (e instanceof Error && e.name === "AbortError") break;
-      await new Promise((r) => setTimeout(r, 3000));
-    }
-    await new Promise((r) => setTimeout(r, 5000));
-  }
+	while (!signal.aborted) {
+		try {
+			const res = await fetch(`${BASE_URL}${token}/getUpdates`, {
+				method: "POST",
+				headers: { "Content-Type": "application/json" },
+				body: JSON.stringify({ offset: lastUpdateId + 1, timeout: 10 }),
+				signal,
+			});
+			if (!res.ok) {
+				await new Promise((r) => setTimeout(r, 3000));
+				continue;
+			}
+			const data = (await res.json()) as {
+				ok: boolean;
+				result: Array<{
+					update_id: number;
+					message?: {
+						message_id: number;
+						chat: { id: number };
+						from?: { id: number; is_bot?: boolean };
+						text?: string;
+					};
+					callback_query?: unknown;
+				}>;
+			};
+			if (!data.ok) {
+				await new Promise((r) => setTimeout(r, 2000));
+				continue;
+			}
+			for (const u of data.result) {
+				lastUpdateId = u.update_id;
+				onUpdateId(lastUpdateId);
+				// Skip callback queries (handled by telegram_ask)
+				if (u.callback_query) continue;
+				// Only process text messages from the configured chat, not from our bot
+				if (
+					u.message &&
+					u.message.text &&
+					String(u.message.chat.id) === chatId
+				) {
+					if (u.message.from?.is_bot || u.message.from?.id === botId) {
+						continue;
+					}
+					onMessage(u.message.text);
+				}
+			}
+		} catch (e: unknown) {
+			if (e instanceof Error && e.name === "AbortError") break;
+			await new Promise((r) => setTimeout(r, 3000));
+		}
+		await new Promise((r) => setTimeout(r, 5000));
+	}
 }

package/src/index.ts

@@ -77,7 +77,11 @@ export default function telegramBridge(pi: ExtensionAPI) {
 			// onMessage: forward to pi as user message
 			async (text: string) => {
 				pi.sendUserMessage(text);
-				await sendMsg(`👂 Got it! Working on: _${text.slice(0, 100)}_`);
+				await sendMsg(
+					`👂 Got it! Working on: _${text.slice(0, 100)}_`,
+					undefined,
+					"Markdown",
+				);
 			},
 			// onUpdateId: persist offset
 			(id: number) => {
@@ -226,9 +230,13 @@ export default function telegramBridge(pi: ExtensionAPI) {
 				const opts = params.options ?? ["Yes", "No", "Explain"];
 				const kb = opts.map((o: string) => [{ text: o, callback_data: o }]);
 				const timeoutMs = (params.timeoutMinutes ?? 30) * 60000;
-				const mid = await sendMsg(`❓ *${params.question}*`, {
-					inline_keyboard: kb,
-				});
+				const mid = await sendMsg(
+					`❓ *${params.question}*`,
+					{
+						inline_keyboard: kb,
+					},
+					"Markdown",
+				);
 				const reply = await pollReply(mid, chatId, timeoutMs);
 				if (!reply) {
 					await sendMsg("⏰ No reply. Proceeding autonomously.");
@@ -296,7 +304,7 @@ export default function telegramBridge(pi: ExtensionAPI) {
 				message += `\n_What should I do?_`;
 
 				const kb = opts.map((o: string) => [{ text: o, callback_data: o }]);
-				const mid = await sendMsg(message, { inline_keyboard: kb });
+				const mid = await sendMsg(message, { inline_keyboard: kb }, "Markdown");
 				const reply = await pollReply(mid, chatId, timeoutMs);
 
 				if (!reply) {
@@ -328,7 +336,7 @@ export default function telegramBridge(pi: ExtensionAPI) {
 					action = "explain";
 				}
 
-				await sendMsg(`✅ Choice received: _${choice}_`);
+				await sendMsg(`✅ Choice received: _${choice}_`, undefined, "Markdown");
 
 				return {
 					content: [