@a1hvdy/cc-openclaw 0.24.0 → 0.25.1

package/dist/src/lib/telegram-bot-api.d.ts

@@ -0,0 +1,100 @@
+/**
+ * src/lib/telegram-bot-api.ts — v0.25.0 M16 extracted HTTP layer.
+ *
+ * Pre-M16 the Telegram Bot API helpers lived inside the legacy live-card +
+ * card-renderer modules. M16 deletes those modules, but a handful of lib/
+ * utilities (error-renderer.ts, perf/speculative-bubble.ts) still need to
+ * dispatch Telegram messages. This file is the migrated, slim HTTP layer:
+ *   • telegramApi(method, params)  — generic POST to api.telegram.org
+ *   • sendTg(chatId, text, ...)    — sendMessage with MarkdownV2 + plain
+ *                                    text fallback (preserves v0.20.1
+ *                                    content-punctuation fix).
+ *   • editTg(chatId, msgId, text…) — editMessageText with same fallback +
+ *                                    429 retry handling.
+ *   • BOT_TOKEN exported as a mutable getter (mutated via setBotToken /
+ *     initBotTokenFromConfig at boot).
+ *
+ * Token sourcing on boot (initBotTokenFromConfig):
+ *   1. api.config.channels.telegram.accounts[defaultAccount].botToken
+ *   2. ~/.openclaw/openclaw.json → same JSON path
+ *   3. fallthrough: BOT_TOKEN stays '' and renderer/sendTg return false.
+ *
+ * The mirror channel's register() (M0..M14 + M15-cutover-default) calls
+ * initBotTokenFromConfig(api) at boot — the same shape the legacy live-card
+ * used to do.
+ */
+export declare const OPENCLAW_CONFIG_PATH: string;
+/**
+ * Mutable getter for the current bot token. Callers should treat it as
+ * read-only at runtime; use setBotToken / initBotTokenFromConfig to mutate.
+ */
+export declare function getBotToken(): string;
+/**
+ * Imperative setter — for tests + explicit init paths. Returns the
+ * previous value so test cleanup can restore.
+ */
+export declare function setBotToken(token: string): string;
+/**
+ * Back-compat alias — legacy code did `import { BOT_TOKEN } from ...`. We
+ * preserve the binding via a frozen wrapper that always reflects the
+ * current token. Existing read-sites get the current value; existing
+ * write-sites (none expected — legacy only wrote via setBotToken under
+ * a different name) would need migration.
+ *
+ * Using a getter-backed object also lets `if (!BOT_TOKEN)` work
+ * idiomatically; the property is read on every access.
+ */
+export declare const BOT_TOKEN: {
+    readonly value: string;
+};
+/**
+ * Boot-time initialiser. Reads the configured Telegram bot token from
+ * either api.config.channels.telegram.accounts or ~/.openclaw/openclaw.json.
+ * Returns true when a token was loaded.
+ */
+export interface BotConfigSource {
+    config?: {
+        channels?: {
+            telegram?: {
+                defaultAccount?: string;
+                accounts?: Record<string, {
+                    botToken?: string;
+                }>;
+            };
+        };
+    };
+    logger?: {
+        info: (msg: string) => void;
+        warn: (msg: string) => void;
+    };
+}
+export declare function initBotTokenFromConfig(api?: BotConfigSource): boolean;
+export interface TelegramApiResponse {
+    ok: boolean;
+    result?: {
+        message_id?: number;
+    };
+    error_code?: number;
+    description?: string;
+    parameters?: {
+        retry_after?: number;
+    };
+}
+/**
+ * Low-level POST to api.telegram.org. Resolves with the parsed JSON
+ * response, or {ok:false} on JSON parse failure / network error
+ * (rejection is the caller's signal for a truly unreachable endpoint).
+ */
+export declare function telegramApi(method: string, params: Record<string, unknown>): Promise<TelegramApiResponse>;
+/**
+ * sendMessage with MarkdownV2 first + plain-text fallback. The fallback
+ * is the v0.20.1 fix: prior implementation stripped punctuation on
+ * MarkdownV2 parse errors; current behaviour retries with parse_mode
+ * omitted so all content survives.
+ */
+export declare function sendTg(chatId: string | number, text: string, threadId?: string | number, replyMarkup?: unknown, replyToMessageId?: number | null): Promise<TelegramApiResponse>;
+/**
+ * editMessageText with MarkdownV2-first + 429 retry-after handling +
+ * plain-text fallback.
+ */
+export declare function editTg(chatId: string | number, messageId: number, text: string, replyMarkup?: unknown): Promise<TelegramApiResponse>;

package/dist/src/lib/telegram-bot-api.js

@@ -0,0 +1,204 @@
+/**
+ * src/lib/telegram-bot-api.ts — v0.25.0 M16 extracted HTTP layer.
+ *
+ * Pre-M16 the Telegram Bot API helpers lived inside the legacy live-card +
+ * card-renderer modules. M16 deletes those modules, but a handful of lib/
+ * utilities (error-renderer.ts, perf/speculative-bubble.ts) still need to
+ * dispatch Telegram messages. This file is the migrated, slim HTTP layer:
+ *   • telegramApi(method, params)  — generic POST to api.telegram.org
+ *   • sendTg(chatId, text, ...)    — sendMessage with MarkdownV2 + plain
+ *                                    text fallback (preserves v0.20.1
+ *                                    content-punctuation fix).
+ *   • editTg(chatId, msgId, text…) — editMessageText with same fallback +
+ *                                    429 retry handling.
+ *   • BOT_TOKEN exported as a mutable getter (mutated via setBotToken /
+ *     initBotTokenFromConfig at boot).
+ *
+ * Token sourcing on boot (initBotTokenFromConfig):
+ *   1. api.config.channels.telegram.accounts[defaultAccount].botToken
+ *   2. ~/.openclaw/openclaw.json → same JSON path
+ *   3. fallthrough: BOT_TOKEN stays '' and renderer/sendTg return false.
+ *
+ * The mirror channel's register() (M0..M14 + M15-cutover-default) calls
+ * initBotTokenFromConfig(api) at boot — the same shape the legacy live-card
+ * used to do.
+ */
+import { request as httpsRequest } from 'node:https';
+import { readFileSync } from 'node:fs';
+import { homedir } from 'node:os';
+import { join } from 'node:path';
+export const OPENCLAW_CONFIG_PATH = join(homedir(), '.openclaw', 'openclaw.json');
+const PLUGIN_TAG = '[cc-openclaw/telegram-bot-api]';
+// ─── Bot token state ───────────────────────────────────────────────────────
+let _botToken = '';
+/**
+ * Mutable getter for the current bot token. Callers should treat it as
+ * read-only at runtime; use setBotToken / initBotTokenFromConfig to mutate.
+ */
+export function getBotToken() {
+    return _botToken;
+}
+/**
+ * Imperative setter — for tests + explicit init paths. Returns the
+ * previous value so test cleanup can restore.
+ */
+export function setBotToken(token) {
+    const prev = _botToken;
+    _botToken = token;
+    return prev;
+}
+/**
+ * Back-compat alias — legacy code did `import { BOT_TOKEN } from ...`. We
+ * preserve the binding via a frozen wrapper that always reflects the
+ * current token. Existing read-sites get the current value; existing
+ * write-sites (none expected — legacy only wrote via setBotToken under
+ * a different name) would need migration.
+ *
+ * Using a getter-backed object also lets `if (!BOT_TOKEN)` work
+ * idiomatically; the property is read on every access.
+ */
+export const BOT_TOKEN = Object.freeze({
+    get value() {
+        return _botToken;
+    },
+});
+export function initBotTokenFromConfig(api) {
+    const logger = api?.logger;
+    // 1. api.config.channels.telegram path
+    try {
+        const tg = api?.config?.channels?.telegram;
+        if (tg?.accounts) {
+            const key = tg.defaultAccount ?? 'default';
+            const token = tg.accounts[key]?.botToken;
+            if (token) {
+                _botToken = token;
+                logger?.info(`${PLUGIN_TAG} bot token loaded from api.config`);
+                return true;
+            }
+        }
+    }
+    catch {
+        /* fall through to file path */
+    }
+    // 2. ~/.openclaw/openclaw.json
+    try {
+        const raw = readFileSync(OPENCLAW_CONFIG_PATH, 'utf8');
+        const parsed = JSON.parse(raw);
+        const tg = parsed.channels?.telegram;
+        if (tg?.accounts) {
+            const key = tg.defaultAccount ?? 'default';
+            const token = tg.accounts[key]?.botToken;
+            if (token) {
+                _botToken = token;
+                logger?.info(`${PLUGIN_TAG} bot token loaded from ${OPENCLAW_CONFIG_PATH}`);
+                return true;
+            }
+        }
+    }
+    catch (err) {
+        logger?.warn(`${PLUGIN_TAG} config-file fallback failed: ${err instanceof Error ? err.message : String(err)}`);
+    }
+    return false;
+}
+/**
+ * Low-level POST to api.telegram.org. Resolves with the parsed JSON
+ * response, or {ok:false} on JSON parse failure / network error
+ * (rejection is the caller's signal for a truly unreachable endpoint).
+ */
+export function telegramApi(method, params) {
+    return new Promise((resolve, reject) => {
+        const body = JSON.stringify(params);
+        const options = {
+            hostname: 'api.telegram.org',
+            path: `/bot${_botToken}/${method}`,
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+                'Content-Length': Buffer.byteLength(body),
+            },
+        };
+        const req = httpsRequest(options, (res) => {
+            let data = '';
+            res.on('data', (chunk) => (data += chunk));
+            res.on('end', () => {
+                try {
+                    resolve(JSON.parse(data));
+                }
+                catch {
+                    resolve({ ok: false, description: 'JSON parse error' });
+                }
+            });
+        });
+        req.on('error', (err) => reject(err));
+        req.setTimeout(10_000, () => {
+            req.destroy(new Error('Telegram API timeout'));
+        });
+        req.write(body);
+        req.end();
+    });
+}
+/**
+ * sendMessage with MarkdownV2 first + plain-text fallback. The fallback
+ * is the v0.20.1 fix: prior implementation stripped punctuation on
+ * MarkdownV2 parse errors; current behaviour retries with parse_mode
+ * omitted so all content survives.
+ */
+export async function sendTg(chatId, text, threadId, replyMarkup, replyToMessageId) {
+    try {
+        const base = { chat_id: chatId, disable_web_page_preview: true };
+        if (threadId)
+            base.message_thread_id = Number(threadId);
+        if (replyMarkup)
+            base.reply_markup = replyMarkup;
+        if (replyToMessageId)
+            base.reply_to_message_id = Number(replyToMessageId);
+        const res = await telegramApi('sendMessage', { ...base, text, parse_mode: 'MarkdownV2' });
+        if (res.ok)
+            return res;
+        return telegramApi('sendMessage', { ...base, text: text || 'Session update' });
+    }
+    catch {
+        return { ok: false };
+    }
+}
+/**
+ * editMessageText with MarkdownV2-first + 429 retry-after handling +
+ * plain-text fallback.
+ */
+export async function editTg(chatId, messageId, text, replyMarkup) {
+    try {
+        const params = {
+            chat_id: chatId,
+            message_id: messageId,
+            text,
+            parse_mode: 'MarkdownV2',
+            disable_web_page_preview: true,
+        };
+        if (replyMarkup)
+            params.reply_markup = replyMarkup;
+        const res = await telegramApi('editMessageText', params);
+        if (!res.ok && (res.error_code === 429 || res.description?.includes('Too Many Requests'))) {
+            const retryAfterSec = res.parameters?.retry_after || 5;
+            const waitMs = Math.min(retryAfterSec * 1000, 30_000);
+            await new Promise((r) => setTimeout(r, waitMs));
+            const retry = await telegramApi('editMessageText', params);
+            if (retry.ok)
+                return retry;
+        }
+        if (res.ok)
+            return res;
+        const fallback = {
+            chat_id: chatId,
+            message_id: messageId,
+            text: text || 'Session update',
+            disable_web_page_preview: true,
+        };
+        if (replyMarkup)
+            fallback.reply_markup = replyMarkup;
+        return telegramApi('editMessageText', fallback);
+    }
+    catch {
+        return { ok: false };
+    }
+}
+//# sourceMappingURL=telegram-bot-api.js.map

package/dist/src/lib/telegram-bot-api.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"telegram-bot-api.js","sourceRoot":"","sources":["../../../src/lib/telegram-bot-api.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAEH,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,YAAY,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,MAAM,CAAC,MAAM,oBAAoB,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,eAAe,CAAC,CAAC;AAElF,MAAM,UAAU,GAAG,gCAAgC,CAAC;AAEpD,8EAA8E;AAE9E,IAAI,SAAS,GAAG,EAAE,CAAC;AAEnB;;;GAGG;AACH,MAAM,UAAU,WAAW;IACzB,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,WAAW,CAAC,KAAa;IACvC,MAAM,IAAI,GAAG,SAAS,CAAC;IACvB,SAAS,GAAG,KAAK,CAAC;IAClB,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,SAAS,GAA+B,MAAM,CAAC,MAAM,CAAC;IACjE,IAAI,KAAK;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;CACF,CAAC,CAAC;AAmBH,MAAM,UAAU,sBAAsB,CAAC,GAAqB;IAC1D,MAAM,MAAM,GAAG,GAAG,EAAE,MAAM,CAAC;IAE3B,uCAAuC;IACvC,IAAI,CAAC;QACH,MAAM,EAAE,GAAG,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,CAAC;QAC3C,IAAI,EAAE,EAAE,QAAQ,EAAE,CAAC;YACjB,MAAM,GAAG,GAAG,EAAE,CAAC,cAAc,IAAI,SAAS,CAAC;YAC3C,MAAM,KAAK,GAAG,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,QAAQ,CAAC;YACzC,IAAI,KAAK,EAAE,CAAC;gBACV,SAAS,GAAG,KAAK,CAAC;gBAClB,MAAM,EAAE,IAAI,CAAC,GAAG,UAAU,mCAAmC,CAAC,CAAC;gBAC/D,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,+BAA+B;IACjC,CAAC;IAED,+BAA+B;IAC/B,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,YAAY,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC;QACvD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAO5B,CAAC;QACF,MAAM,EAAE,GAAG,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC;QACrC,IAAI,EAAE,EAAE,QAAQ,EAAE,CAAC;YACjB,MAAM,GAAG,GAAG,EAAE,CAAC,cAAc,IAAI,SAAS,CAAC;YAC3C,MAAM,KAAK,GAAG,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,QAAQ,CAAC;YACzC,IAAI,KAAK,EAAE,CAAC;gBACV,SAAS,GAAG,KAAK,CAAC;gBAClB,MAAM,EAAE,IAAI,CAAC,GAAG,UAAU,0BAA0B,oBAAoB,EAAE,CAAC,CAAC;gBAC5E,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;IACH,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,EAAE,IAAI,CACV,GAAG,UAAU,iCAAiC,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CACjG,CAAC;IACJ,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAYD;;;;GAIG;AACH,MAAM,UAAU,WAAW,CACzB,MAAc,EACd,MAA+B;IAE/B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACpC,MAAM,OAAO,GAAG;YACd,QAAQ,EAAE,kBAAkB;YAC5B,IAAI,EAAE,OAAO,SAAS,IAAI,MAAM,EAAE;YAClC,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;gBAClC,gBAAgB,EAAE,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC;aAC1C;SACF,CAAC;QACF,MAAM,GAAG,GAAG,YAAY,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;YACxC,IAAI,IAAI,GAAG,EAAE,CAAC;YACd,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,IAAI,IAAI,KAAK,CAAC,CAAC,CAAC;YAC3C,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;gBACjB,IAAI,CAAC;oBACH,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;gBAC5B,CAAC;gBAAC,MAAM,CAAC;oBACP,OAAO,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,kBAAkB,EAAE,CAAC,CAAC;gBAC1D,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;QACtC,GAAG,CAAC,UAAU,CAAC,MAAM,EAAE,GAAG,EAAE;YAC1B,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;QACH,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAChB,GAAG,CAAC,GAAG,EAAE,CAAC;IACZ,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,MAAM,CAC1B,MAAuB,EACvB,IAAY,EACZ,QAA0B,EAC1B,WAAqB,EACrB,gBAAgC;IAEhC,IAAI,CAAC;QACH,MAAM,IAAI,GAA4B,EAAE,OAAO,EAAE,MAAM,EAAE,wBAAwB,EAAE,IAAI,EAAE,CAAC;QAC1F,IAAI,QAAQ;YAAE,IAAI,CAAC,iBAAiB,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;QACxD,IAAI,WAAW;YAAE,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC;QACjD,IAAI,gBAAgB;YAAE,IAAI,CAAC,mBAAmB,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAC;QAC1E,MAAM,GAAG,GAAG,MAAM,WAAW,CAAC,aAAa,EAAE,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,YAAY,EAAE,CAAC,CAAC;QAC1F,IAAI,GAAG,CAAC,EAAE;YAAE,OAAO,GAAG,CAAC;QACvB,OAAO,WAAW,CAAC,aAAa,EAAE,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,IAAI,IAAI,gBAAgB,EAAE,CAAC,CAAC;IACjF,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC;IACvB,CAAC;AACH,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,MAAM,CAC1B,MAAuB,EACvB,SAAiB,EACjB,IAAY,EACZ,WAAqB;IAErB,IAAI,CAAC;QACH,MAAM,MAAM,GAA4B;YACtC,OAAO,EAAE,MAAM;YACf,UAAU,EAAE,SAAS;YACrB,IAAI;YACJ,UAAU,EAAE,YAAY;YACxB,wBAAwB,EAAE,IAAI;SAC/B,CAAC;QACF,IAAI,WAAW;YAAE,MAAM,CAAC,YAAY,GAAG,WAAW,CAAC;QACnD,MAAM,GAAG,GAAG,MAAM,WAAW,CAAC,iBAAiB,EAAE,MAAM,CAAC,CAAC;QACzD,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,UAAU,KAAK,GAAG,IAAI,GAAG,CAAC,WAAW,EAAE,QAAQ,CAAC,mBAAmB,CAAC,CAAC,EAAE,CAAC;YAC1F,MAAM,aAAa,GAAG,GAAG,CAAC,UAAU,EAAE,WAAW,IAAI,CAAC,CAAC;YACvD,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,aAAa,GAAG,IAAI,EAAE,MAAM,CAAC,CAAC;YACtD,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;YAChD,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,iBAAiB,EAAE,MAAM,CAAC,CAAC;YAC3D,IAAI,KAAK,CAAC,EAAE;gBAAE,OAAO,KAAK,CAAC;QAC7B,CAAC;QACD,IAAI,GAAG,CAAC,EAAE;YAAE,OAAO,GAAG,CAAC;QACvB,MAAM,QAAQ,GAA4B;YACxC,OAAO,EAAE,MAAM;YACf,UAAU,EAAE,SAAS;YACrB,IAAI,EAAE,IAAI,IAAI,gBAAgB;YAC9B,wBAAwB,EAAE,IAAI;SAC/B,CAAC;QACF,IAAI,WAAW;YAAE,QAAQ,CAAC,YAAY,GAAG,WAAW,CAAC;QACrD,OAAO,WAAW,CAAC,iBAAiB,EAAE,QAAQ,CAAC,CAAC;IAClD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC;IACvB,CAAC;AACH,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@a1hvdy/cc-openclaw",
-  "version": "0.24.0",
+  "version": "0.25.1",
   "description": "A1xAI's Anthropic CLI bridge plugin for OpenClaw",
   "author": "@a1cy",
   "license": "MIT",