@codebam/cf-workers-telegram-bot 12.6.18 → 12.6.19

package/dist/ai.js

@@ -79,7 +79,7 @@ input, config) {
             return `- Name: ${t.name}\n  Description: ${t.description}\n  Parameters: ${JSON.stringify(t.parameters)}`;
         })
             .join('\n');
-        const promptInstruction = `\n\n[SYSTEM INSTRUCTION] You have access to the following tools:\n${toolInstructions}\n\nTo use a tool, you MUST output a tool call wrapped in XML format, like so:\n<tool_call>{"name": "search", "arguments": {"query": "query" }}</tool_call>\nor\n<tool_call>{"name": "fetch", "arguments": {"url": "https://example.com" }}</tool_call>\n\nMake sure the tool call is outputted EXACTLY as shown. The system will intercept this call, execute the tool, and return the output to you. Do not write code or direct the user to run code; call the tools yourself.`;
+        const promptInstruction = `\n\n[SYSTEM INSTRUCTION] You have access to the following tools:\n${toolInstructions}\n\nTo use a tool, you MUST output a tool call wrapped in XML format, like so:\n<tool_call>{"name": "wikipedia", "arguments": {"query": "query" }}</tool_call>\nor\n<tool_call>{"name": "fetch", "arguments": {"url": "https://example.com" }}</tool_call>\n\nMake sure the tool call is outputted EXACTLY as shown. The system will intercept this call, execute the tool, and return the output to you. Do not write code or direct the user to run code; call the tools yourself.`;
         systemMsg.content = systemMsg.content + promptInstruction;
     }
     // eslint-disable-next-line @typescript-eslint/no-explicit-any

package/dist/main.d.ts

@@ -7,8 +7,8 @@ import TelegramCommand from './types/TelegramCommand.js';
 import TelegramGuestMessage from './types/TelegramGuestMessage.js';
 import PartialTelegramUpdate from './types/PartialTelegramUpdate.js';
 import TelegramInlineQueryType from './types/TelegramInlineQueryType.js';
-import { markdownToHtml, fetchTool, searchTool } from './utils.js';
+import { markdownToHtml, fetchTool, wikipediaTool } from './utils.js';
 import { HistoryManager, getBalance } from './history_manager.js';
 export { extractText, customRunWithTools, streamAiResponseToTelegram, createMockTelegramExecutionContext } from './ai.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, markdownToHtml, fetchTool, searchTool, HistoryManager, getBalance, };
+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, wikipediaTool, HistoryManager, getBalance, };

package/dist/main.js

@@ -2,8 +2,8 @@ import TelegramBot from './telegram_bot.js';
 import TelegramExecutionContext from './telegram_execution_context.js';
 import Webhook from './webhook.js';
 import TelegramApi from './telegram_api.js';
-import { markdownToHtml, fetchTool, searchTool } from './utils.js';
+import { markdownToHtml, fetchTool, wikipediaTool } from './utils.js';
 import { HistoryManager, getBalance } from './history_manager.js';
 export { extractText, customRunWithTools, streamAiResponseToTelegram, createMockTelegramExecutionContext } from './ai.js';
 export default TelegramBot;
-export { TelegramBot, TelegramExecutionContext, Webhook, TelegramApi, markdownToHtml, fetchTool, searchTool, HistoryManager, getBalance, };
+export { TelegramBot, TelegramExecutionContext, Webhook, TelegramApi, markdownToHtml, fetchTool, wikipediaTool, HistoryManager, getBalance, };

package/dist/utils.d.ts

@@ -32,7 +32,7 @@ export declare const fetchTool: {
         body?: string;
     }) => Promise<string>;
 };
-export declare const searchTool: {
+export declare const wikipediaTool: {
     name: string;
     description: string;
     parameters: {

package/dist/utils.js

@@ -122,9 +122,9 @@ export const fetchTool = {
         }
     },
 };
-export const searchTool = {
-    name: 'search',
-    description: 'Perform a web search using the SearXNG search engine to look up answers, facts, news, and find information from different websites.',
+export const wikipediaTool = {
+    name: 'wikipedia',
+    description: 'Perform a search on Wikipedia to look up answers, facts, and find information.',
     parameters: {
         type: 'object',
         properties: {
@@ -134,81 +134,7 @@ export const searchTool = {
     },
     function: async (args) => {
         const query = args.query || args.q || '';
-        const instances = [
-            'https://searxng.site/',
-            'https://priv.au/',
-            'https://search.mdosch.de/',
-            'https://ooglester.com/',
-            'https://copp.gg/',
-            'https://baresearch.org/',
-        ];
         const userAgent = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36';
-        for (const instance of instances) {
-            try {
-                const url = `${instance}search?q=${encodeURIComponent(query)}&format=json`;
-                const res = await fetch(url, {
-                    method: 'GET',
-                    headers: {
-                        'User-Agent': userAgent,
-                        Accept: 'application/json',
-                    },
-                });
-                if (res.status === 200) {
-                    const text = await res.text();
-                    const parsed = JSON.parse(text);
-                    if (parsed && Array.isArray(parsed.results) && parsed.results.length > 0) {
-                        return text.slice(0, 15000);
-                    }
-                }
-            }
-            catch {
-                // Continue to next fallback
-            }
-        }
-        // Fallback to DuckDuckGo Lite Search
-        try {
-            const ddgUrl = 'https://lite.duckduckgo.com/lite/';
-            const ddgRes = await fetch(ddgUrl, {
-                method: 'POST',
-                headers: {
-                    'User-Agent': userAgent,
-                    'Content-Type': 'application/x-www-form-urlencoded',
-                    Accept: 'text/html',
-                },
-                body: `q=${encodeURIComponent(query)}`,
-            });
-            if (ddgRes.status === 200 || ddgRes.status === 202) {
-                const html = await ddgRes.text();
-                const cleanHtml = (str) => str
-                    .replace(/<[^>]*>/g, '')
-                    .replace(/&nbsp;/g, ' ')
-                    .replace(/\s+/g, ' ')
-                    .trim();
-                const links = [];
-                const linkRegex = /<a[^>]*class='result-link'[^>]*href="([^"]+)"[^>]*>([\s\S]*?)<\/a>/g;
-                let match;
-                while ((match = linkRegex.exec(html)) !== null) {
-                    links.push({ url: match[1], title: cleanHtml(match[2]) });
-                }
-                const snippets = [];
-                const snippetRegex = /<td[^>]*class='result-snippet'[^>]*>([\s\S]*?)<\/td>/g;
-                while ((match = snippetRegex.exec(html)) !== null) {
-                    snippets.push(cleanHtml(match[1]));
-                }
-                if (links.length > 0) {
-                    const results = links.map((link, i) => ({
-                        title: link.title,
-                        url: link.url,
-                        snippet: snippets[i] || '',
-                    }));
-                    return JSON.stringify({ results });
-                }
-            }
-        }
-        catch {
-            // Continue to next fallback
-        }
-        // Fallback to Wikipedia Search if DuckDuckGo Lite is blocked/rate-limited
         try {
             const wikiUrl = `https://en.wikipedia.org/w/api.php?action=query&list=search&srsearch=${encodeURIComponent(query)}&utf8=&format=json`;
             const res = await fetch(wikiUrl, {
@@ -228,40 +154,9 @@ export const searchTool = {
                 }
             }
         }
-        catch {
-            // Continue to next fallback
-        }
-        // Final fallback to Google News RSS search for recent general web/news results
-        try {
-            const googleNewsUrl = `https://news.google.com/rss/search?q=${encodeURIComponent(query)}&hl=en-US&gl=US&ceid=US:en`;
-            const res = await fetch(googleNewsUrl, {
-                headers: { 'User-Agent': userAgent },
-            });
-            if (res.status === 200) {
-                const xml = await res.text();
-                const items = [];
-                const itemRegex = /<item>([\s\S]*?)<\/item>/g;
-                let match;
-                while ((match = itemRegex.exec(xml)) !== null && items.length < 5) {
-                    const content = match[1];
-                    const titleMatch = /<title>([\s\S]*?)<\/title>/.exec(content);
-                    const linkMatch = /<link>([\s\S]*?)<\/link>/.exec(content);
-                    const descMatch = /<description>([\s\S]*?)<\/description>/.exec(content);
-                    const title = titleMatch ? titleMatch[1].replace(/<!\[CDATA\[([\s\S]*?)\]\]>/g, '$1') : '';
-                    const link = linkMatch ? linkMatch[1] : '';
-                    const desc = descMatch ? descMatch[1].replace(/<[^>]*>/g, '').replace(/<!\[CDATA\[([\s\S]*?)\]\]>/g, '$1') : '';
-                    if (title && link) {
-                        items.push({ title, url: link, snippet: desc });
-                    }
-                }
-                if (items.length > 0) {
-                    return JSON.stringify({ results: items });
-                }
-            }
-        }
-        catch {
-            // Continue
+        catch (e) {
+            return `Error executing Wikipedia search: ${String(e)}`;
         }
-        return 'Error executing search: All public search instances, Wikipedia fallback, and Google News fallback returned no results.';
+        return 'Error executing Wikipedia search: No results found.';
     },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@codebam/cf-workers-telegram-bot",
-	"version": "12.6.18",
+	"version": "12.6.19",
 	"description": "serverless telegram bot on cf workers",
 	"main": "./dist/main.js",
 	"module": "./dist/main.js",