@codebam/cf-workers-telegram-bot 11.11.0 → 11.13.0

package/dist/main.d.ts

@@ -27,5 +27,6 @@ import TelegramCallbackQuery from './types/TelegramCallbackQuery.js';
 import TelegramPreCheckoutQuery from './types/TelegramPreCheckoutQuery.js';
 import TelegramDocument from './types/TelegramDocument.js';
 import TelegramSuccessfulPayment from './types/TelegramSuccessfulPayment.js';
+import { markdownToHtml, fetchTool } from './utils.js';
 export default TelegramBot;
-export { TelegramBot, TelegramExecutionContext, Webhook, TelegramApi, TelegramApiBaseParams, SendMessageParams, SendMessageDraftParams, SendPhotoParams, SendVideoParams, SendVoiceParams, SendChatActionParams, AnswerCallbackParams, AnswerInlineParams, AnswerGuestParams, SendInvoiceParams, AnswerPreCheckoutParams, TelegramApiParams, TelegramCommand, TelegramFrom, TelegramChat, TelegramUser, TelegramMessageEntity, TelegramPhotoSize, TelegramMessage, TelegramVoice, TelegramGuestMessage, TelegramInputMessageContent, TelegramInlineQuery, TelegramUpdate, PartialTelegramUpdate, TelegramInlineQueryType, TelegramInlineQueryResult, TelegramInlineQueryResultPhoto, TelegramInlineQueryResultArticle, TelegramInlineQueryResultVideo, TelegramInlineQueryResultVoice, ChatPermissions, TelegramBusinessMessage, TelegramCallbackQuery, TelegramPreCheckoutQuery, TelegramDocument, TelegramSuccessfulPayment, };
+export { TelegramBot, TelegramExecutionContext, Webhook, TelegramApi, TelegramApiBaseParams, SendMessageParams, SendMessageDraftParams, SendPhotoParams, SendVideoParams, SendVoiceParams, SendChatActionParams, AnswerCallbackParams, AnswerInlineParams, AnswerGuestParams, SendInvoiceParams, AnswerPreCheckoutParams, TelegramApiParams, TelegramCommand, TelegramFrom, TelegramChat, TelegramUser, TelegramMessageEntity, TelegramPhotoSize, TelegramMessage, TelegramVoice, TelegramGuestMessage, TelegramInputMessageContent, TelegramInlineQuery, TelegramUpdate, PartialTelegramUpdate, TelegramInlineQueryType, TelegramInlineQueryResult, TelegramInlineQueryResultPhoto, TelegramInlineQueryResultArticle, TelegramInlineQueryResultVideo, TelegramInlineQueryResultVoice, ChatPermissions, TelegramBusinessMessage, TelegramCallbackQuery, TelegramPreCheckoutQuery, TelegramDocument, TelegramSuccessfulPayment, markdownToHtml, fetchTool, };

package/dist/main.js

@@ -8,5 +8,6 @@ import TelegramInlineQueryResultPhoto from './types/TelegramInlineQueryResultPho
 import TelegramInlineQueryResultArticle from './types/TelegramInlineQueryResultArticle.js';
 import TelegramInlineQueryResultVideo from './types/TelegramInlineQueryResultVideo.js';
 import TelegramInlineQueryResultVoice from './types/TelegramInlineQueryResultVoice.js';
+import { markdownToHtml, fetchTool } from './utils.js';
 export default TelegramBot;
-export { TelegramBot, TelegramExecutionContext, Webhook, TelegramApi, TelegramUpdate, TelegramInlineQueryResult, TelegramInlineQueryResultPhoto, TelegramInlineQueryResultArticle, TelegramInlineQueryResultVideo, TelegramInlineQueryResultVoice, };
+export { TelegramBot, TelegramExecutionContext, Webhook, TelegramApi, TelegramUpdate, TelegramInlineQueryResult, TelegramInlineQueryResultPhoto, TelegramInlineQueryResultArticle, TelegramInlineQueryResultVideo, TelegramInlineQueryResultVoice, markdownToHtml, fetchTool, };

package/dist/telegram_bot.js

@@ -116,6 +116,8 @@ export default class TelegramBot {
             case 'guest_message':
                 // For guest messages, we fall through to command detection if it's not a special type
                 break;
+            case 'business_message':
+                return this.defaultCommand;
             case 'pre_checkout_query':
                 return ':pre_checkout_query' in this.commands ? ':pre_checkout_query' : this.defaultCommand;
             case 'successful_payment':
@@ -132,6 +134,9 @@ export default class TelegramBot {
                 return command;
             }
         }
+        if (ctx.update_type === 'guest_message' && ':guest_message' in this.commands) {
+            return ':guest_message';
+        }
         return this.defaultCommand;
     }
     /**

package/dist/utils.d.ts

@@ -0,0 +1,34 @@
+export declare function markdownToHtml(s: string): Promise<string>;
+export declare const fetchTool: {
+    name: string;
+    description: string;
+    parameters: {
+        type: string;
+        properties: {
+            url: {
+                type: string;
+                description: string;
+            };
+            method: {
+                type: string;
+                enum: string[];
+                default: string;
+            };
+            headers: {
+                type: string;
+                description: string;
+            };
+            body: {
+                type: string;
+                description: string;
+            };
+        };
+        required: string[];
+    };
+    function: ({ url, method, headers, body }: {
+        url: string;
+        method?: string;
+        headers?: Record<string, string>;
+        body?: string;
+    }) => Promise<string>;
+};

package/dist/utils.js

@@ -0,0 +1,109 @@
+import { marked } from 'marked';
+export async function markdownToHtml(s) {
+    const renderer = new marked.Renderer();
+    // Telegram supports: b, strong, i, em, u, ins, s, strike, del, span, tg-spoiler, a, code, pre, blockquote
+    renderer.heading = ({ tokens, depth }) => {
+        const text = renderer.parser.parseInline(tokens);
+        if (depth === 1) {
+            return `<b>${text}</b>\n\n`;
+        }
+        if (depth === 2) {
+            return `<b>${text}</b>\n\n`;
+        }
+        return `<b>${text}</b>\n\n`;
+    };
+    renderer.paragraph = ({ tokens }) => {
+        const text = renderer.parser.parseInline(tokens);
+        return `${text}\n\n`;
+    };
+    renderer.br = () => '\n';
+    renderer.list = ({ items, ordered, start }) => {
+        let result = '';
+        for (let i = 0; i < items.length; i++) {
+            const item = items[i];
+            const prefix = ordered ? `${(start !== '' && start !== undefined) ? Number(start) + i : i + 1}. ` : '• ';
+            result += `${prefix}${renderer.listitem(item)}\n`;
+        }
+        return result;
+    };
+    renderer.listitem = (item) => {
+        return renderer.parser.parseInline(item.tokens);
+    };
+    renderer.strong = ({ tokens }) => `<b>${renderer.parser.parseInline(tokens)}</b>`;
+    renderer.em = ({ tokens }) => `<i>${renderer.parser.parseInline(tokens)}</i>`;
+    renderer.codespan = ({ text }) => `<code>${text}</code>`;
+    renderer.code = ({ text, lang }) => {
+        if (lang) {
+            return `<pre><code class="language-${lang}">${text}</code></pre>\n`;
+        }
+        return `<pre><code>${text}</code></pre>\n`;
+    };
+    renderer.del = ({ tokens }) => `<s>${renderer.parser.parseInline(tokens)}</s>`;
+    renderer.link = ({ href, tokens }) => `<a href="${href}">${renderer.parser.parseInline(tokens)}</a>`;
+    renderer.image = ({ href, text }) => `<a href="${href}">${text}</a>`;
+    renderer.blockquote = ({ tokens }) => {
+        return `<blockquote>${renderer.parser.parse(tokens)}</blockquote>\n`;
+    };
+    renderer.hr = () => `────────\n\n`;
+    // html tag pass-through for supported tags or escaping
+    renderer.html = ({ text }) => {
+        const allowedTags = [
+            'b', 'strong', 'i', 'em', 'u', 'ins', 's', 'strike', 'del',
+            'span', 'tg-spoiler', 'a', 'code', 'pre', 'blockquote'
+        ];
+        const match = /^<\/?([a-z0-9-]+)(?:\s+[^>]*)?>/i.exec(text);
+        if (match) {
+            const tagName = match[1].toLowerCase();
+            if (allowedTags.includes(tagName)) {
+                return text; // Allow through
+            }
+        }
+        // Escape everything else
+        return text.replace(/</g, '&lt;').replace(/>/g, '&gt;');
+    };
+    renderer.text = (token) => {
+        if ('tokens' in token && token.tokens) {
+            return renderer.parser.parseInline(token.tokens);
+        }
+        // Escape standard HTML entities
+        return token.text.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+    };
+    marked.setOptions({
+        gfm: true,
+        breaks: true,
+    });
+    const parsed = await marked.parse(s, { renderer });
+    // Trim multiple newlines
+    return parsed.replace(/\n{3,}/g, '\n\n').trim();
+}
+export const fetchTool = {
+    name: 'fetch',
+    description: 'Make an HTTP request to fetch a website or API, returning the HTML or JSON. You MUST use this tool when the user asks to fetch a URL, visit a website, or make a GET request, instead of writing code.',
+    parameters: {
+        type: 'object',
+        properties: {
+            url: { type: 'string', description: 'The URL to fetch' },
+            method: { type: 'string', enum: ['GET', 'POST', 'PUT', 'DELETE'], default: 'GET' },
+            headers: { type: 'object', description: 'HTTP headers to include in the request' },
+            body: { type: 'string', description: 'The request body' }
+        },
+        required: ['url']
+    },
+    function: async ({ url, method, headers, body }) => {
+        try {
+            const res = await fetch(url, {
+                method: method || 'GET',
+                headers: {
+                    'User-Agent': 'Mozilla/5.0 (Cloudflare Worker Telegram Bot)',
+                    ...headers
+                },
+                body: body ? (typeof body === 'string' ? body : JSON.stringify(body)) : undefined
+            });
+            const text = await res.text();
+            return text.slice(0, 10000);
+        }
+        catch (e) {
+            return `Error executing fetch: ${String(e)}`;
+        }
+    }
+};

package/package.json

@@ -1,10 +1,10 @@
 {
 	"name": "@codebam/cf-workers-telegram-bot",
-	"version": "11.11.0",
+	"version": "11.13.0",
 	"description": "serverless telegram bot on cf workers",
 	"main": "./dist/main.js",
 	"module": "./dist/main.js",
-	"types": "./dist/types.d.ts",
+	"types": "./dist/main.d.ts",
 	"files": [
 		"dist",
 		"LICENSE",
@@ -53,7 +53,8 @@
 		"wrangler": "^4.90.1"
 	},
 	"dependencies": {
-		"@eslint/eslintrc": "^3.3.5"
+		"@eslint/eslintrc": "^3.3.5",
+		"marked": "^18.0.3"
 	},
 	"typedocOptions": {
 		"entryPoints": [