@oevortex/ddg_search 1.1.4 → 1.1.6

package/CHANGELOG.md

@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file.
 
-## [1.1.3] - 2025-11-30
+## [1.1.5] - 2025-11-30
 ### Changed
 - Replaced Felo AI tool with IAsk AI tool for advanced AI-powered search
 - Added `src/utils/search_iask.js` implementing IAsk API client

package/bin/cli.js

@@ -12,14 +12,14 @@ async function startServer() {
   try {
     // Dynamically import the modules
     const { searchToolDefinition, searchToolHandler } = await import(`${modulePath}/tools/searchTool.js`);
-    const { feloToolDefinition, feloToolHandler } = await import(`${modulePath}/tools/feloTool.js`);
+    const { iaskToolDefinition, iaskToolHandler } = await import(`${modulePath}/tools/iaskTool.js`);
 
     // Create the MCP server
     const server = new Server({
       id: 'ddg-search-mcp',
-      name: 'DuckDuckGo & Felo AI Search MCP',
-      description: 'A Model Context Protocol server for web search using DuckDuckGo and Felo AI',
-      version: '1.1.2'
+      name: 'DuckDuckGo & IAsk AI Search MCP',
+      description: 'A Model Context Protocol server for web search using DuckDuckGo and IAsk AI',
+      version: '1.1.4'
     }, {
       capabilities: {
         tools: {
@@ -31,7 +31,7 @@ async function startServer() {
     // Global variable to track available tools
     let availableTools = [
       searchToolDefinition,
-      feloToolDefinition
+      iaskToolDefinition
     ];
 
     // Define available tools
@@ -54,7 +54,7 @@ async function startServer() {
         const { name, arguments: args } = request.params;
         
         // Validate tool name
-        const validTools = ['web-search', 'felo-search'];
+        const validTools = ['web-search', 'iask-search'];
         if (!validTools.includes(name)) {
           throw new Error(`Unknown tool: ${name}`);
         }
@@ -64,8 +64,8 @@ async function startServer() {
           case 'web-search':
             return await searchToolHandler(args);
 
-          case 'felo-search':
-            return await feloToolHandler(args);
+          case 'iask-search':
+            return await iaskToolHandler(args);
 
           default:
             throw new Error(`Tool not found: ${name}`);
@@ -87,7 +87,7 @@ async function startServer() {
     });    // Display promotional message
     console.error('\n\x1b[36m╔════════════════════════════════════════════════════════════╗');
     console.error('║                                                            ║');
-    console.error('║  \x1b[1m\x1b[31mDuckDuckGo & Felo AI Search MCP\x1b[0m\x1b[36m by \x1b[1m\x1b[33m@OEvortex\x1b[0m\x1b[36m       ║');
+    console.error('║  \x1b[1m\x1b[31mDuckDuckGo & IAsk AI Search MCP\x1b[0m\x1b[36m by \x1b[1m\x1b[33m@OEvortex\x1b[0m\x1b[36m       ║');
     console.error('║                                                            ║');
     console.error('║  \x1b[0m👉 Subscribe to \x1b[1m\x1b[37myoutube.com/@OEvortex\x1b[0m\x1b[36m for more tools!  ║');
     console.error('║                                                            ║');
@@ -96,7 +96,7 @@ async function startServer() {
     // Start the server with stdio transport
     const transport = new StdioServerTransport();
     await server.connect(transport);
-    console.error('DuckDuckGo & Felo AI Search MCP server started and listening on stdio');
+    console.error('DuckDuckGo & IAsk AI Search MCP server started and listening on stdio');
   } catch (error) {
     console.error('Failed to start server:', error);
     process.exit(1);
@@ -110,7 +110,7 @@ const versionFlag = args.includes('--version') || args.includes('-v');
 
 if (helpFlag) {
   console.log(`
-DuckDuckGo & Felo AI Search MCP - A Model Context Protocol server for web search
+DuckDuckGo & IAsk AI Search MCP - A Model Context Protocol server for web search
 
 Usage:
   npx -y @oevortex/ddg_search@latest [options]
@@ -121,7 +121,7 @@ Options:
 
 This MCP server provides the following tools:
   - web-search: Search the web using DuckDuckGo
-  - felo-search: Search using Felo AI for AI-generated responses
+  - iask-search: Search using IAsk AI for AI-generated responses
 
 Created by @OEvortex
 Subscribe to youtube.com/@OEvortex for more tools and tutorials!
@@ -139,7 +139,7 @@ if (versionFlag) {
         const packageJson = JSON.parse(
           await readFile(new URL('../package.json', import.meta.url), 'utf8')
         );
-        console.log(`DuckDuckGo & Felo AI Search MCP v${packageJson.version}\nCreated by @OEvortex - Subscribe to youtube.com/@OEvortex!`);
+        console.log(`DuckDuckGo & IAsk AI Search MCP v${packageJson.version}\nCreated by @OEvortex - Subscribe to youtube.com/@OEvortex!`);
         process.exit(0);
       } catch (err) {
         console.error('Error reading version information:', err);

package/package.json

@@ -1 +1,58 @@
-{"name":"@oevortex/ddg_search","version":"1.1.4","description":"A Model Context Protocol server for web search using DuckDuckGo and IAsk AI","main":"src/index.js","module":"src/index.ts","exports":{".":{"import":"./src/index.js","default":"./src/index.js"}},"bin":{"ddg-search-mcp":"bin/cli.js","oevortex-ddg-search":"bin/cli.js"},"scripts":{"test":"echo \"Error: no test specified\" && exit 1","start":"node bin/cli.js","prepublishOnly":"npm run lint","lint":"echo \"No linting configured\"","build":"npx @smithery/cli build","dev":"npx @smithery/cli dev"},"publishConfig":{"access":"public"},"keywords":["mcp","model-context-protocol","duckduckgo","iask","search","web-search","ai-search","claude","ai","llm"],"author":"OEvortex","license":"Apache-2.0","type":"module","dependencies":{"@modelcontextprotocol/sdk":"^1.17.4","axios":"^1.8.4","cheerio":"^1.0.0","jsdom":"^26.1.0","smithery":"^0.5.2","turndown":"^7.2.2","uuid":"^9.0.1","ws":"^8.18.3"},"devDependencies":{"@types/node":"^24.3.0","tsx":"^4.20.4","typescript":"^5.9.2"}}
+{
+  "name": "@oevortex/ddg_search",
+  "version": "1.1.6",
+  "description": "A Model Context Protocol server for web search using DuckDuckGo and IAsk AI",
+  "main": "src/index.js",
+  "module": "src/index.ts",
+  "exports": {
+    ".": {
+      "import": "./src/index.js",
+      "default": "./src/index.js"
+    }
+  },
+  "bin": {
+    "ddg-search-mcp": "bin/cli.js",
+    "oevortex-ddg-search": "bin/cli.js"
+  },
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "start": "node bin/cli.js",
+    "prepublishOnly": "npm run lint",
+    "lint": "echo \"No linting configured\"",
+    "build": "npx @smithery/cli build",
+    "dev": "npx @smithery/cli dev"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "keywords": [
+    "mcp",
+    "model-context-protocol",
+    "duckduckgo",
+    "iask",
+    "search",
+    "web-search",
+    "ai-search",
+    "claude",
+    "ai",
+    "llm"
+  ],
+  "author": "OEvortex",
+  "license": "Apache-2.0",
+  "type": "module",
+  "dependencies": {
+    "@modelcontextprotocol/sdk": "^1.17.4",
+    "axios": "^1.8.4",
+    "axios-cookiejar-support": "^6.0.5",
+    "cheerio": "^1.0.0",
+    "smithery": "^0.5.2",
+    "tough-cookie": "^6.0.0",
+    "turndown": "^7.2.2",
+    "ws": "^8.18.3"
+  },
+  "devDependencies": {
+    "@types/node": "^24.3.0",
+    "tsx": "^4.20.4",
+    "typescript": "^5.9.2"
+  }
+}

package/src/index.js

@@ -3,7 +3,7 @@ import { CallToolRequestSchema, ListToolsRequestSchema } from '@modelcontextprot
 
 // Import tool definitions and handlers
 import { searchToolDefinition, searchToolHandler } from './tools/searchTool.js';
-import { feloToolDefinition, feloToolHandler } from './tools/feloTool.js';
+import { iaskToolDefinition, iaskToolHandler } from './tools/iaskTool.js';
 
 // Required: Export default createServer function for Smithery
 export default function createServer({ config } = {}) {
@@ -12,7 +12,7 @@ export default function createServer({ config } = {}) {
   // Global variable to track available tools
   const availableTools = [
     searchToolDefinition,
-    feloToolDefinition
+    iaskToolDefinition
   ];
   
   console.log('Available tools:', availableTools.map(t => t.name));
@@ -48,8 +48,8 @@ export default function createServer({ config } = {}) {
         case 'web-search':
           return await searchToolHandler(args);
 
-        case 'felo-search':
-          return await feloToolHandler(args);
+        case 'iask-search':
+          return await iaskToolHandler(args);
 
         default:
           throw new Error(`Tool not found: ${name}`);

package/src/utils/search.js

@@ -219,183 +219,9 @@ async function searchDuckDuckGo(query, page = 1, numResults = 10) {
   }
 }
 
-/**
- * Fetches the content of a URL and returns it as text
- * @param {string} url - The URL to fetch
- * @param {Object} options - Options for content extraction
- * @param {boolean} options.extractMainContent - Whether to attempt to extract main content (default: true)
- * @param {boolean} options.includeLinks - Whether to include link text (default: true)
- * @param {boolean} options.includeImages - Whether to include image alt text (default: true)
- * @param {string[]} options.excludeTags - Tags to exclude from extraction
- * @returns {Promise<string>} - The content of the URL
- */
-async function fetchUrlContent(url, options = {}) {
-  try {
-    // Default options
-    const {
-      extractMainContent = true,
-      includeLinks = true,
-      includeImages = true,
-      excludeTags = ['script', 'style', 'noscript', 'iframe', 'svg', 'nav', 'footer', 'header', 'aside']
-    } = options;
-
-    // Get a random user agent
-    const userAgent = getRandomUserAgent();
-
-    const response = await axios.get(url, {
-      headers: {
-        'User-Agent': userAgent
-      },
-      timeout: 10000, // 10 second timeout
-      httpsAgent: httpsAgent
-    });
-
-    if (response.status !== 200) {
-      throw new Error(`Failed to fetch URL: ${url}`);
-    }
-
-    // If the content is HTML, extract the text content
-    const contentType = response.headers['content-type'] || '';
-    if (contentType.includes('text/html')) {
-      const $ = cheerio.load(response.data);
-
-      // Remove unwanted elements
-      excludeTags.forEach(tag => {
-        $(tag).remove();
-      });
-
-      // Remove ads and other common unwanted elements
-      const unwantedSelectors = [
-        '[id*="ad"]', '[class*="ad"]', '[id*="banner"]', '[class*="banner"]',
-        '[id*="popup"]', '[class*="popup"]', '[class*="cookie"]',
-        '[id*="cookie"]', '[class*="newsletter"]', '[id*="newsletter"]',
-        '[class*="social"]', '[id*="social"]', '[class*="share"]', '[id*="share"]'
-      ];
-
-      unwantedSelectors.forEach(selector => {
-        try {
-          $(selector).remove();
-        } catch (e) {
-          // Ignore invalid selectors
-        }
-      });
-
-      // Handle links and images
-      if (!includeLinks) {
-        $('a').each((i, link) => {
-          $(link).replaceWith($(link).text());
-        });
-      }
-
-      if (!includeImages) {
-        $('img').remove();
-      } else {
-        // Replace images with their alt text
-        $('img').each((i, img) => {
-          const alt = $(img).attr('alt');
-          if (alt) {
-            $(img).replaceWith(`[Image: ${alt}]`);
-          } else {
-            $(img).remove();
-          }
-        });
-      }
-
-      // Try to extract main content if requested
-      if (extractMainContent) {
-        // Common content selectors in order of priority
-        const contentSelectors = [
-          'article', 'main', '[role="main"]', '.post-content', '.article-content',
-          '.content', '#content', '.post', '.article', '.entry-content',
-          '.page-content', '.post-body', '.post-text', '.story-body'
-        ];
-
-        for (const selector of contentSelectors) {
-          const mainContent = $(selector).first();
-          if (mainContent.length > 0) {
-            // Clean up the content
-            return cleanText(mainContent.text());
-          }
-        }
-      }
-
-      // If no main content found or not requested, use the body
-      return cleanText($('body').text());
-    }
-
-    // For non-HTML content, return as is
-    return response.data.toString();
-  } catch (error) {
-    console.error('Error fetching URL content:', error.message);
-    throw error;
-  }
-}
-
-/**
- * Cleans up text by removing excessive whitespace and normalizing line breaks
- * @param {string} text - The text to clean
- * @returns {string} - The cleaned text
- */
-function cleanText(text) {
-  return text
-    .replace(/\s+/g, ' ')  // Replace multiple whitespace with single space
-    .replace(/\n\s*\n/g, '\n\n')  // Normalize multiple line breaks
-    .replace(/^\s+|\s+$/g, '')  // Trim start and end
-    .trim();
-}
-
-/**
- * Extracts metadata from a URL (title, description, etc.)
- * @param {string} url - The URL to extract metadata from
- * @returns {Promise<Object>} - The metadata
- */
-async function extractUrlMetadata(url) {
-  try {
-    // Get a random user agent
-    const userAgent = getRandomUserAgent();
-
-    const response = await axios.get(url, {
-      headers: {
-        'User-Agent': userAgent
-      },
-      httpsAgent: httpsAgent
-    });
-
-    if (response.status !== 200) {
-      throw new Error(`Failed to fetch URL: ${url}`);
-    }
-
-    const $ = cheerio.load(response.data);
-
-    // Extract metadata
-    const title = $('title').text() || '';
-    const description = $('meta[name="description"]').attr('content') ||
-                       $('meta[property="og:description"]').attr('content') || '';
-    const ogImage = $('meta[property="og:image"]').attr('content') || '';
-    const favicon = $('link[rel="icon"]').attr('href') ||
-                  $('link[rel="shortcut icon"]').attr('href') || '';
-
-    // Resolve relative URLs
-    const resolvedFavicon = favicon ? new URL(favicon, url).href : getFaviconUrl(url);
-    const resolvedOgImage = ogImage ? new URL(ogImage, url).href : '';
-
-    return {
-      title,
-      description,
-      ogImage: resolvedOgImage,
-      favicon: resolvedFavicon,
-      url
-    };
-  } catch (error) {
-    console.error('Error extracting URL metadata:', error.message);
-    throw error;
-  }
-}
 
 export {
   searchDuckDuckGo,
-  fetchUrlContent,
-  extractUrlMetadata,
   extractDirectUrl,
   getFaviconUrl
 };

package/src/utils/search_iask.js

@@ -1,52 +1,22 @@
 import axios from 'axios';
+import WebSocket from 'ws';
 import * as cheerio from 'cheerio';
 import TurndownService from 'turndown';
+import * as tough from 'tough-cookie';
+import { wrapper } from 'axios-cookiejar-support';
 
-// Rotating User Agents
-const USER_AGENTS = [
-  'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36',
-  'Mozilla/5.0 (Windows NT 10.0; Win64; x64) Edge/120.0.0.0',
-  'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.2.1 Safari/605.1.15',
-  'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:122.0) Gecko/20100101 Firefox/122.0',
-  'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36'
-];
-
-// Cache results to avoid repeated requests
-const resultsCache = new Map();
-const CACHE_DURATION = 5 * 60 * 1000; // 5 minutes
+const { CookieJar } = tough;
 
 // Valid modes and detail levels
 const VALID_MODES = ['question', 'academic', 'forums', 'wiki', 'thinking'];
 const VALID_DETAIL_LEVELS = ['concise', 'detailed', 'comprehensive'];
 
-/**
- * Response class for IAsk API responses
- */
-class Response {
-  /**
-   * Create a new Response
-   * @param {string} text - The text content of the response
-   */
-  constructor(text) {
-    this.text = text;
-  }
-
-  /**
-   * String representation of the response
-   * @returns {string} The text content
-   */
-  toString() {
-    return this.text;
-  }
-}
+// Cache results to avoid repeated requests
+const resultsCache = new Map();
+const CACHE_DURATION = 5 * 60 * 1000; // 5 minutes
 
-/**
- * Get a random user agent from the list
- * @returns {string} A random user agent string
- */
-function getRandomUserAgent() {
-  return USER_AGENTS[Math.floor(Math.random() * USER_AGENTS.length)];
-}
+const DEFAULT_TIMEOUT = 30000;
+const API_ENDPOINT = 'https://iask.ai/';
 
 /**
  * Generate a cache key for a search query
@@ -72,23 +42,25 @@ function clearOldCache() {
 }
 
 /**
- * Find HTML content in a nested structure
- * @param {Object|Array} diff - The nested structure to search
- * @returns {string|null} The found HTML content or null
+ * Recursively search for cached HTML content in diff object
+ * @param {any} diff - The diff object to search
+ * @returns {string|null} The found content or null
  */
 function cacheFind(diff) {
   const values = Array.isArray(diff) ? diff : Object.values(diff);
-  const turndown = new TurndownService();
   
   for (const value of values) {
-    if (typeof value === 'object' && value !== null) {
+    if (Array.isArray(value) || (typeof value === 'object' && value !== null)) {
       const cache = cacheFind(value);
       if (cache) return cache;
     }
+    
     if (typeof value === 'string' && /<p>.+?<\/p>/.test(value)) {
-      return turndown.turndown(value).trim();
+      const turndownService = new TurndownService();
+      return turndownService.turndown(value).trim();
     }
   }
+  
   return null;
 }
 
@@ -98,6 +70,8 @@ function cacheFind(diff) {
  * @returns {string} Formatted text
  */
 function formatHtml(htmlContent) {
+  if (!htmlContent) return '';
+  
   const $ = cheerio.load(htmlContent);
   const outputLines = [];
 
@@ -133,37 +107,10 @@ function formatHtml(htmlContent) {
 }
 
 /**
- * Create an axios session with proper headers
- * @returns {Object} Axios instance
- */
-function createSession() {
-  return axios.create({
-    timeout: 30000,
-    headers: {
-      'accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8',
-      'accept-encoding': 'gzip, deflate, br',
-      'accept-language': 'en-US,en;q=0.9',
-      'cache-control': 'no-cache',
-      'dnt': '1',
-      'pragma': 'no-cache',
-      'sec-ch-ua': '"Not)A;Brand";v="99", "Microsoft Edge";v="127", "Chromium";v="127"',
-      'sec-ch-ua-mobile': '?0',
-      'sec-ch-ua-platform': '"Windows"',
-      'sec-fetch-dest': 'document',
-      'sec-fetch-mode': 'navigate',
-      'sec-fetch-site': 'none',
-      'sec-fetch-user': '?1',
-      'upgrade-insecure-requests': '1',
-      'user-agent': getRandomUserAgent()
-    }
-  });
-}
-
-/**
- * Search using the IAsk AI API
+ * Search using IAsk AI via WebSocket (Phoenix LiveView)
  * @param {string} prompt - The search query or prompt
- * @param {boolean} stream - If true, yields response chunks as they arrive
- * @param {boolean} raw - If true, returns raw response dictionaries
+ * @param {boolean} stream - If true, returns async generator for streaming
+ * @param {boolean} raw - If true, returns raw response (not used currently)
  * @param {string} mode - Search mode: 'question', 'academic', 'forums', 'wiki', 'thinking'
  * @param {string|null} detailLevel - Detail level: 'concise', 'detailed', 'comprehensive'
  * @returns {Promise<string|AsyncGenerator<string>>} The search results
@@ -182,200 +129,173 @@ async function searchIAsk(prompt, stream = false, raw = false, mode = 'question'
   // Clear old cache entries
   clearOldCache();
 
-  // Check cache first if not streaming
-  if (!stream) {
-    const cacheKey = getCacheKey(prompt, mode, detailLevel);
-    const cachedResults = resultsCache.get(cacheKey);
+  const cacheKey = getCacheKey(prompt, mode, detailLevel);
+  const cachedResults = resultsCache.get(cacheKey);
 
-    if (cachedResults && Date.now() - cachedResults.timestamp < CACHE_DURATION) {
-      return cachedResults.results;
+  if (cachedResults && Date.now() - cachedResults.timestamp < CACHE_DURATION) {
+    const result = cachedResults.results;
+    if (stream) {
+      return (async function*() { yield result; })();
     }
+    return result;
   }
 
-  const session = createSession();
-  const apiEndpoint = 'https://iask.ai/';
-
-  // Build URL with parameters
-  const params = new URLSearchParams({
-    mode: mode,
-    q: prompt
-  });
+  // Build URL parameters
+  const params = new URLSearchParams({ mode, q: prompt });
   if (detailLevel) {
     params.append('options[detail_level]', detailLevel);
   }
 
-  // Define the streaming function
-  async function* streamFunction() {
-    try {
-      // First, get the initial page to extract tokens
-      const initialUrl = `${apiEndpoint}?${params.toString()}`;
-      const initialResponse = await session.get(initialUrl);
+  // Create a cookie jar for session management
+  const jar = new CookieJar();
+  const client = wrapper(axios.create({ jar }));
 
-      if (initialResponse.status !== 200) {
-        throw new Error(`Failed to get initial page - (${initialResponse.status}, ${initialResponse.statusText})`);
-      }
+  // Get initial page and extract tokens
+  const response = await client.get(API_ENDPOINT, {
+    params: Object.fromEntries(params),
+    timeout: DEFAULT_TIMEOUT,
+    headers: {
+      'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36'
+    }
+  });
 
-      const $ = cheerio.load(initialResponse.data);
-      
-      // Extract Phoenix LiveView tokens
-      const phxNode = $('[id^="phx-"]').last();
-      const phxId = phxNode.attr('id');
-      const phxSession = phxNode.attr('data-phx-session');
-      const csrfToken = $('meta[name="csrf-token"]').attr('content');
-
-      if (!phxId || !csrfToken) {
-        throw new Error('Failed to extract required tokens from IAsk page');
-      }
+  const $ = cheerio.load(response.data);
+  
+  const phxNode = $('[id^="phx-"]').first();
+  const csrfToken = $('[name="csrf-token"]').attr('content');
+  const phxId = phxNode.attr('id');
+  const phxSession = phxNode.attr('data-phx-session');
 
-      // Connect to WebSocket
-      const WebSocket = (await import('ws')).default;
-      const wsUrl = `wss://iask.ai/live/websocket?_csrf_token=${encodeURIComponent(csrfToken)}&vsn=2.0.0`;
-      
-      const ws = new WebSocket(wsUrl, {
-        headers: {
-          'Origin': 'https://iask.ai',
-          'User-Agent': getRandomUserAgent()
+  if (!phxId || !csrfToken) {
+    throw new Error('Failed to extract required tokens from page');
+  }
+
+  // Get the actual response URL (after any redirects)
+  const responseUrl = response.request.res?.responseUrl || response.config.url;
+  
+  // Get cookies from the jar for WebSocket connection
+  const cookies = await jar.getCookies(API_ENDPOINT);
+  const cookieString = cookies.map(c => `${c.key}=${c.value}`).join('; ');
+  
+  // Build WebSocket URL
+  const wsParams = new URLSearchParams({
+    '_csrf_token': csrfToken,
+    'vsn': '2.0.0'
+  });
+  const wsUrl = `wss://iask.ai/live/websocket?${wsParams.toString()}`;
+
+  return new Promise((resolve, reject) => {
+    const ws = new WebSocket(wsUrl, {
+      headers: {
+        'Cookie': cookieString,
+        'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36',
+        'Origin': 'https://iask.ai'
+      }
+    });
+    
+    let buffer = '';
+    const chunks = [];
+    let timeoutId;
+
+    ws.on('open', () => {
+      // Send phx_join message
+      ws.send(JSON.stringify([
+        null,
+        null,
+        `lv:${phxId}`,
+        'phx_join',
+        {
+          params: { _csrf_token: csrfToken },
+          url: responseUrl,
+          session: phxSession
         }
-      });
+      ]));
+    });
 
-      let streamingText = '';
-      let resolveWs;
-      let rejectWs;
-      const wsPromise = new Promise((resolve, reject) => {
-        resolveWs = resolve;
-        rejectWs = reject;
-      });
+    ws.on('message', (data) => {
+      try {
+        const msg = JSON.parse(data.toString());
+        if (!msg) return;
 
-      const chunks = [];
-      let isComplete = false;
-
-      ws.on('open', () => {
-        // Send join message
-        const joinMessage = [
-          null,
-          null,
-          `lv:${phxId}`,
-          'phx_join',
-          {
-            params: { _csrf_token: csrfToken },
-            url: initialUrl,
-            session: phxSession
-          }
-        ];
-        ws.send(JSON.stringify(joinMessage));
-      });
+        const diff = msg[4];
+        if (!diff) return;
+
+        let chunk = null;
 
-      ws.on('message', (data) => {
         try {
-          const jsonData = JSON.parse(data.toString());
-          if (!jsonData || !jsonData[4]) return;
-
-          const diff = jsonData[4];
-          
-          try {
-            // Try to extract streaming data
-            if (diff.e && diff.e[0] && diff.e[0][1] && diff.e[0][1].data) {
-              let chunk = diff.e[0][1].data;
-              // Check if chunk contains HTML
+          // Try to get chunk from diff.e[0][1].data
+          // Use non-optional chaining to trigger exception if path doesn't exist
+          if (diff.e) {
+            chunk = diff.e[0][1].data;
+            
+            if (chunk) {
+              let formatted;
               if (/<[^>]+>/.test(chunk)) {
-                chunk = formatHtml(chunk);
+                formatted = formatHtml(chunk);
               } else {
-                chunk = chunk.replace(/<br\/>/g, '\n');
+                formatted = chunk.replace(/<br\/>/g, '\n');
               }
-              chunks.push(chunk);
+              
+              buffer += formatted;
+              chunks.push(formatted);
             }
-          } catch {
-            // Try cache find for final response
-            const cache = cacheFind(diff);
-            if (cache) {
-              if (diff.response !== undefined) {
-                // Format if it contains HTML
-                let formattedCache = cache;
-                if (/<[^>]+>/.test(cache)) {
-                  formattedCache = formatHtml(cache);
-                }
-                chunks.push(formattedCache);
-                isComplete = true;
-                ws.close();
-              }
+          } else {
+            throw new Error('No diff.e');
+          }
+        } catch {
+          // Fallback to cacheFind
+          const cache = cacheFind(diff);
+          if (cache) {
+            let formatted;
+            if (/<[^>]+>/.test(cache)) {
+              formatted = formatHtml(cache);
+            } else {
+              formatted = cache;
             }
+            buffer += formatted;
+            chunks.push(formatted);
+            // Close after cache find
+            ws.close();
+            return;
           }
-        } catch (error) {
-          console.debug('WebSocket message parse error:', error.message);
         }
-      });
-
-      ws.on('close', () => {
-        resolveWs();
-      });
-
-      ws.on('error', (error) => {
-        rejectWs(error);
-      });
-
-      // Set timeout
-      const timeout = setTimeout(() => {
+      } catch (err) {
+        reject(new Error(`IAsk API error: ${err.message}`));
         ws.close();
-        rejectWs(new Error('WebSocket connection timed out'));
-      }, 30000);
-
-      // Wait for WebSocket to complete
-      await wsPromise;
-      clearTimeout(timeout);
-
-      // Yield all collected chunks
-      for (const chunk of chunks) {
-        streamingText += chunk;
-        if (raw) {
-          yield { text: chunk };
-        } else {
-          yield new Response(chunk).toString();
-        }
       }
+    });
 
-      // Cache the complete response
-      if (streamingText) {
-        resultsCache.set(getCacheKey(prompt, mode, detailLevel), {
-          results: streamingText,
+    ws.on('close', () => {
+      clearTimeout(timeoutId);
+      
+      // Cache the result
+      if (buffer) {
+        resultsCache.set(cacheKey, {
+          results: buffer,
           timestamp: Date.now()
         });
       }
-
-    } catch (error) {
-      console.error('Error searching IAsk:', error.message);
-      
-      if (error.response) {
-        const status = error.response.status;
-        const statusText = error.response.statusText;
-        throw new Error(`IAsk API error: ${status} ${statusText}`);
-      }
       
-      throw new Error(`Failed to search IAsk: ${error.message}`);
-    }
-  }
-
-  // If streaming is requested, return the generator
-  if (stream) {
-    return streamFunction();
-  }
-  
-  // For non-streaming, collect all chunks and return as a single string
-  let fullResponse = '';
-  
-  try {
-    for await (const chunk of streamFunction()) {
-      if (raw) {
-        fullResponse += chunk.text;
+      if (stream) {
+        resolve((async function*() {
+          for (const chunk of chunks) {
+            yield chunk;
+          }
+        })());
       } else {
-        fullResponse += chunk;
+        resolve(buffer || 'No results found.');
       }
-    }
-    
-    return fullResponse;
-  } catch (error) {
-    console.error('Error in non-streaming IAsk search:', error.message);
-    throw error;
-  }
+    });
+
+    ws.on('error', (err) => {
+      clearTimeout(timeoutId);
+      reject(new Error(`WebSocket error: ${err.message}`));
+    });
+
+    timeoutId = setTimeout(() => {
+      ws.close();
+    }, DEFAULT_TIMEOUT);
+  });
 }
 
 export { searchIAsk, VALID_MODES, VALID_DETAIL_LEVELS };