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

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": {"q": "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": "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.`;
         systemMsg.content = systemMsg.content + promptInstruction;
     }
     // eslint-disable-next-line @typescript-eslint/no-explicit-any

package/dist/utils.d.ts

@@ -45,7 +45,8 @@ export declare const searchTool: {
         };
         required: string[];
     };
-    function: ({ query }: {
-        query: string;
+    function: (args: {
+        query?: string;
+        q?: string;
     }) => Promise<string>;
 };

package/dist/utils.js

@@ -132,7 +132,8 @@ export const searchTool = {
         },
         required: ['query'],
     },
-    function: async ({ query }) => {
+    function: async (args) => {
+        const query = args.query || args.q || '';
         const instances = [
             'https://searxng.site/',
             'https://priv.au/',
@@ -164,7 +165,50 @@ export const searchTool = {
                 // Continue to next fallback
             }
         }
-        // Fallback to Wikipedia Search if all SearXNG instances fail/are rate-limited
+        // 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, {

package/package.json

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