dsh-free-search 0.4.9 → 0.4.10

package/README.md

@@ -36,7 +36,7 @@ dsh 默认的搜索 provider 依赖 DeepSeek 官方 API key（`DEEPSEEK_API_KEY`
 - **统一引擎回退** —— 任何引擎失败（付费/免费，缺 key/401/限流/网络）自动轮流尝试下一个引擎：首选引擎 → 其他引擎（exa/tavily/keenable 无 key 也会尝试，因为它们自带 keyless 免费额度）→ 剩余免费引擎，搜索永不直接失败；结果顶部注明实际生效的引擎（如 `Note: perplexity unavailable or failed, using exa.`）
 - **时间过滤** —— `advanced_search` 工具支持 `timeRange`：固定档、自定义相对值、绝对日期三种形式（详见下方逻辑说明）
 - **系统提示词注入** —— agent 知道当前用哪个引擎、哪些需要 key
-- **版本号 + 检查更新** —— 设置卡片显示当前版本（v0.4.9），"检查更新"按钮直连 npm registry 对比最新版，有新版本时提示并可一键跳转
+- **版本号 + 检查更新** —— 设置卡片显示当前版本（v0.4.10），"检查更新"按钮直连 npm registry 对比最新版，有新版本时提示并可一键跳转
 - **结果缓存** —— 相同查询（含引擎/时间过滤参数）5 分钟内命中缓存（LRU 50 条），防免费引擎限流、省付费额度；时长可在设置页 0-5 分钟自由配置（0 关闭）
 - **免费标注** —— 设置页中免费引擎带绿色 `FREE` 徽章，付费引擎带橙色 `API KEY` 徽章
 - **网页抓取（web_fetch）** —— 让 agent 抓取网页内容（官方 `dsh-web-fetch-http` provider，纯 JS，零额外依赖）
@@ -271,7 +271,7 @@ This plugin provides multiple free search engines with automatic fallback, compl
 - **Unified Engine Fallback** — Any engine failure (paid or free, missing key, 401, rate limit, network error) automatically tries the next engine: the configured engine first, then other engines (exa/tavily/keenable are tried even without a key because they have built-in keyless quota), then the remaining free engines (Bing/AnySearch etc.) — with a note attached to the results naming the engine that actually served them (e.g. `Note: perplexity unavailable or failed, using exa.`). Search never fails outright.
 - **Time Filtering** — The `advanced_search` tool supports `timeRange`: fixed tiers, custom relative values, or an absolute date (details below)
 - **System Prompt Injection** — The agent is aware of the currently active engine and which engines require API keys
-- **Version + Update Check** — The settings card shows the current version (v0.4.9), and a "Check update" button queries the npm registry to compare against the latest release, prompting a one-click jump when a newer version exists
+- **Version + Update Check** — The settings card shows the current version (v0.4.10), and a "Check update" button queries the npm registry to compare against the latest release, prompting a one-click jump when a newer version exists
 - **Result Caching** — Identical queries (same engine / time-filter args) hit an LRU cache (50 entries) for up to 5 minutes, protecting free engines from rate-limiting and saving paid quota; the TTL is configurable from 0-5 minutes in the settings UI (0 disables caching)
 - **Visual Badges** — Free engines feature a green `FREE` badge, while paid engines show an orange `API KEY` badge in the settings UI
 - **Webpage Fetching (`web_fetch`)** — Allows the agent to read full webpage contents (official `dsh-web-fetch-http` provider, pure JS, zero extra dependencies)

package/lib/client.js

@@ -142,7 +142,7 @@ window.__ModuleLoader__.load({
     };
     const tt = (lang) => I18N[lang === "en" ? "en" : "zh"];
     // 当前插件版本（与 lib/index.js 的 PLUGIN_VERSION 保持一致）
-    const PLUGIN_VERSION = "0.4.9";
+    const PLUGIN_VERSION = "0.4.10";
     const ENGINES = [
       { id: "ddg", label: "DuckDuckGo · HTML", badge: "FREE", link: "https://duckduckgo.com" },
       { id: "ddg-lite", label: "DuckDuckGo · Lite", badge: "FREE", link: "https://duckduckgo.com" },
@@ -201,7 +201,7 @@ window.__ModuleLoader__.load({
       const [keenableKey, setKeenableKey] = react.useState("");
       const [perplexityKey, setPerplexityKey] = react.useState("");
       const [deepseekKey, setDeepseekKey] = react.useState("");
-      const [platforms, setPlatforms] = react.useState(["github", "v2ex", "bilibili"]);
+      const [platforms, setPlatforms] = react.useState(["github", "v2ex", "bilibili", "reddit"]);
       const [cacheTtl, setCacheTtl] = react.useState(5);
       const [keysConfigured, setKeysConfigured] = react.useState({});
       const [lang, setLang] = react.useState("zh");
@@ -227,7 +227,7 @@ window.__ModuleLoader__.load({
               setKeenableKey(v.keenableApiKey ?? "");
               setPerplexityKey(v.perplexityApiKey ?? "");
               setDeepseekKey(v.deepseekApiKey ?? "");
-              setPlatforms(Array.isArray(v.platforms) && v.platforms.length > 0 ? v.platforms : ["github", "v2ex", "bilibili"]);
+              setPlatforms(Array.isArray(v.platforms) && v.platforms.length > 0 ? v.platforms : ["github", "v2ex", "bilibili", "reddit"]);
               setCacheTtl(v.cacheTtl === undefined ? 5 : Math.min(Math.max(Number(v.cacheTtl) ?? 5, 0), 5));
               // secrets 字段标记哪些 key 已配置（值被脱敏，仅显示"已配置"）
               const configured = {};
@@ -515,7 +515,7 @@ react_jsx_runtime.jsx("div", {
                       react_jsx_runtime.jsx("div", {
                         className: "dshfs-platforms",
                         children: [
-                          ["github", "GitHub"], ["v2ex", "V2EX"], ["bilibili", "Bilibili"],
+                          ["github", "GitHub"], ["v2ex", "V2EX"], ["bilibili", "Bilibili"], ["reddit", "Reddit"],
                         ].map(([id, label]) =>
                           react_jsx_runtime.jsx("label", {
                             className: "dshfs-platform",

package/lib/index.js

@@ -18,7 +18,7 @@ const FREE_ENGINES = ["ddg", "ddg-lite", "bing", "searxng", "anysearch"];
 const ALL_ENGINES = ["ddg", "ddg-lite", "bing", "searxng", "anysearch", "exa", "tavily", "keenable", "perplexity", "deepseek-official"];
 
 // 当前插件版本（发布时与 package.json 同步）
-const PLUGIN_VERSION = "0.4.9";
+const PLUGIN_VERSION = "0.4.10";
 // 检查更新的 npm registry 元数据地址（dsh-free-search 是 npmjs 上的公开包）
 const NPM_REGISTRY_URL = "https://registry.npmjs.org/dsh-free-search/latest";
 const PLUGIN_NPM_URL = "https://www.npmjs.com/package/dsh-free-search";
@@ -115,6 +115,8 @@ function decodeEntities(text) {
 
 //#region 结果缓存（防限流/省额度，LRU 50 条，TTL 可配置 0-5 分钟）
 const CACHE_MAX_ENTRIES = 50;
+// fallback 条目（实际引擎 ≠ 首选引擎时）TTL = 配置 TTL 的 1/5（默认 5 分钟 → 60s）：
+// 首选引擎恢复后最多 1 分钟即可拿到新结果，避免回退结果被完整 TTL 钉死；首选成功条目仍用完整 TTL。
 
 function buildCacheKey(query, maxResults, timeRangeLabel, preferred) {
   return [query ?? "", maxResults ?? 5, timeRangeLabel ?? "", preferred].join("\u0000");
@@ -302,7 +304,8 @@ async function searchSearxng(query, maxResults, options, signal) {
   const instances = options?.searxngInstances?.length
     ? options.searxngInstances
     : SEARXNG_INSTANCES;
-  let lastError = null;
+  // 聚合所有实例的失败原因，避免只显示最后一个实例的错误
+  const errors = [];
   for (const base of instances) {
     try {
       const params = new URLSearchParams({ q: query, format: "json" });
@@ -322,12 +325,12 @@ async function searchSearxng(query, maxResults, options, signal) {
       clearTimeout(timer);
       signal?.removeEventListener("abort", onAbort);
       if (!response.ok) {
-        lastError = new Error(`${base} HTTP ${response.status}`);
+        errors.push(`${base}: HTTP ${response.status}`);
         continue;
       }
       const data = await response.json().catch(() => null);
       if (!data || !Array.isArray(data.results)) {
-        lastError = new Error(`${base} invalid JSON`);
+        errors.push(`${base}: invalid JSON`);
         continue;
       }
       const sources = data.results
@@ -340,12 +343,16 @@ async function searchSearxng(query, maxResults, options, signal) {
       if (sources.length > 0) {
         return { sources: uniqueSources(sources, maxResults ?? 10), truncated: false };
       }
-      lastError = new Error(`${base} 0 results`);
+      errors.push(`${base}: 0 results`);
     } catch (error) {
-      lastError = error;
+      const message = error instanceof Error ? error.message : String(error);
+      errors.push(`${base}: ${message}`);
     }
   }
-  throw lastError ?? new Error("all SearXNG instances failed");
+  // 空实例列表兜底：避免 "all SearXNG instances failed: " 尾巴悬空
+  const detail = errors.length > 0 ? errors.join(", ") : "no instances configured";
+  // Note 会引用这个错误消息，截断避免 6 实例全挂时刷屏
+  throw new Error(`all SearXNG instances failed: ${detail.slice(0, 300)}`);
 }
 //#endregion
 
@@ -450,7 +457,8 @@ async function searchExaMCP(query, maxResults, signal) {
       url,
       ...(title ? { title } : {}),
       ...(highlights ? { snippet: highlights.slice(0, 300) } : {}),
-      ...(published ? { publishedAt: published } : {}),
+      // 只保留日期形态（ISO 或 YYYY-MM-DD），过滤 "N/A" 等占位符
+      ...(published && /^\d{4}-\d{2}-\d{2}/.test(published) ? { publishedAt: published } : {}),
     });
   }
   return { sources, truncated: false };
@@ -462,6 +470,7 @@ const PLATFORMS = {
   github: { name: "GitHub" },
   v2ex: { name: "V2EX" },
   bilibili: { name: "Bilibili" },
+  reddit: { name: "Reddit" },
 };
 
 async function searchGithub(query, maxResults, signal) {
@@ -700,7 +709,8 @@ function extractKeenableSources(text, maxResults) {
       url,
       ...(title ? { title } : {}),
       ...(snippets ? { snippet: snippets.slice(0, 300) } : {}),
-      ...(published ? { publishedAt: published } : {}),
+      // 与 Exa MCP 一致：只保留日期形态，过滤 "N/A" 等占位符
+      ...(published && /^\d{4}-\d{2}-\d{2}/.test(published) ? { publishedAt: published } : {}),
     });
   }
   return uniqueSources(sources, maxResults ?? 10);
@@ -799,6 +809,7 @@ async function searchKeenable(query, maxResults, apiKey, timeRange, signal) {
 
 async function searchPerplexity(query, maxResults, apiKey, signal) {
   if (!apiKey) throw new Error("Perplexity search requires PERPLEXITY_API_KEY");
+  // 内置 20s 超时（与外部 signal 组合）：调用方不传 signal 时也不会永久卡住
   const response = await fetch("https://api.perplexity.ai/chat/completions", {
     method: "POST",
     redirect: "error",
@@ -812,7 +823,7 @@ async function searchPerplexity(query, maxResults, apiKey, signal) {
       max_tokens: 1024,
       messages: [{ role: "user", content: query }],
     }),
-    ...(signal !== undefined ? { signal } : {}),
+    signal: AbortSignal.any([...(signal !== undefined ? [signal] : []), AbortSignal.timeout(20000)]),
   });
   if (!response.ok) {
     const detail = await response.text().catch(() => "");
@@ -834,6 +845,7 @@ async function searchPerplexity(query, maxResults, apiKey, signal) {
 
 async function searchDeepSeekOfficial(query, maxResults, apiKey, signal) {
   if (!apiKey) throw new Error("DeepSeek search requires DEEPSEEK_API_KEY");
+  // 内置 20s 超时（与外部 signal 组合）：调用方不传 signal 时也不会永久卡住
   const response = await fetch("https://api.deepseek.com/anthropic/v1/messages", {
     method: "POST",
     redirect: "error",
@@ -856,7 +868,7 @@ async function searchDeepSeekOfficial(query, maxResults, apiKey, signal) {
       ],
       tools: [{ type: "web_search_20250305", name: "web_search", max_uses: 1 }],
     }),
-    ...(signal !== undefined ? { signal } : {}),
+    signal: AbortSignal.any([...(signal !== undefined ? [signal] : []), AbortSignal.timeout(20000)]),
   });
   if (!response.ok) {
     const detail = await response.text().catch(() => "");
@@ -1140,7 +1152,7 @@ const Config = z.object({
   region: z.string(),
   bingMarket: z.string().default("zh-CN"),
   searxngInstances: z.array(z.string()),
-  platforms: z.array(z.string()).default(["github", "v2ex", "bilibili"]),
+  platforms: z.array(z.string()).default(["github", "v2ex", "bilibili", "reddit"]),
   exaApiKey: z.string().role("secret"),
   tavilyApiKey: z.string().role("secret"),
   keenableApiKey: z.string().role("secret"),
@@ -1182,6 +1194,10 @@ function apply(ctx, config) {
     },
     // 单 query 结果缓存：key=query+maxResults+timeRangeLabel+preferred，Map 天然 LRU
     async search(request, signal) {
+      // 公共咽喉校验：web_search / advanced_search / raw-search 三条路径都经过这里
+      if (request === null || typeof request !== "object" || typeof request.query !== "string" || request.query.trim().length === 0) {
+        throw new Error("query is required");
+      }
       const cfg = current();
       // 首选引擎：free_search 工具显式指定（request.engine）优先于设置（cfg.provider）
       const preferred =
@@ -1205,9 +1221,8 @@ function apply(ctx, config) {
           if (signal?.aborted) throw new Error("search aborted");
           searchCache.delete(cacheKey);
           searchCache.set(cacheKey, hit);
-          // 浅拷贝 + 私有标记：调用方改 sources 数组不影响缓存（数组元素仍共享引用，
-          // 但下游 advanced_search/raw-search 都会重新 map 构造，无污染风险）
-          return { ...hit.value, _cache: "hit" };
+          // 浅拷贝 + 私有标记：sources 数组也复制一层，彻底隔离缓存对象（调用方 push/改元素不影响缓存）
+          return { ...hit.value, sources: hit.value.sources?.slice(), _cache: "hit" };
         }
         if (hit) searchCache.delete(cacheKey);
       }
@@ -1243,35 +1258,44 @@ function apply(ctx, config) {
       let usedEngine = null;
       // 首选引擎若被尝试后失败，记录失败详情（用于 Note）
       let preferredFailure = null;
+      // 总超时预算：串行回退时限制整条引擎链的总时长，防止各引擎超时累加达分钟级
+      const BUDGET_MS = 30000;
+      const deadline = Date.now() + BUDGET_MS;
       for (const engine of chain) {
+        const remaining = deadline - Date.now();
+        if (remaining <= 0) {
+          throw new Error(`search timed out after ${BUDGET_MS / 1000}s`);
+        }
+        // 组合外部取消 signal + 剩余预算超时：官方 web_search 取消、引擎超时、总预算都能触发
+        const effSignal = AbortSignal.any([...(signal !== undefined ? [signal] : []), AbortSignal.timeout(remaining)]);
         try {
           let result;
           if (engine === "ddg") {
-            result = await searchDdgHtml(request.query, request.maxResults, { ...cfg, timeRange }, signal);
+            result = await searchDdgHtml(request.query, request.maxResults, { ...cfg, timeRange }, effSignal);
           } else if (engine === "ddg-lite") {
-            result = await searchDdgLite(request.query, request.maxResults, { ...cfg, timeRange }, signal);
+            result = await searchDdgLite(request.query, request.maxResults, { ...cfg, timeRange }, effSignal);
           } else if (engine === "bing") {
-            result = await searchBing(request.query, request.maxResults, cfg, signal);
+            result = await searchBing(request.query, request.maxResults, cfg, effSignal);
           } else if (engine === "searxng") {
-            result = await searchSearxng(request.query, request.maxResults, { ...cfg, timeRange }, signal);
+            result = await searchSearxng(request.query, request.maxResults, { ...cfg, timeRange }, effSignal);
           } else if (engine === "anysearch") {
-            result = await searchAnysearch(request.query, request.maxResults, signal);
+            result = await searchAnysearch(request.query, request.maxResults, effSignal);
           } else if (engine === "exa") {
             // exa：有 key 走 REST，无 key 走 keyless MCP（免费）
             const key = await resolveApiKey("EXA_API_KEY", "exaApiKey");
             if (key) {
-              result = await searchExa(request.query, request.maxResults, key, timeRange, signal);
+              result = await searchExa(request.query, request.maxResults, key, timeRange, effSignal);
             } else {
-              result = await searchExaMCP(request.query, request.maxResults, signal);
+              result = await searchExaMCP(request.query, request.maxResults, effSignal);
             }
           } else if (engine === "tavily") {
             // tavily：有 key 走账号档，无 key 走 keyless（免费匿名额度）
             const key = await resolveApiKey("TAVILY_API_KEY", "tavilyApiKey");
-            result = await searchTavily(request.query, request.maxResults, key, timeRange, signal);
+            result = await searchTavily(request.query, request.maxResults, key, timeRange, effSignal);
           } else if (engine === "keenable") {
             // keenable：有 key 走 REST，无 key 走 keyless MCP（免费）
             const key = await resolveApiKey("KEENABLE_API_KEY", "keenableApiKey");
-            result = await searchKeenable(request.query, request.maxResults, key, timeRange, signal);
+            result = await searchKeenable(request.query, request.maxResults, key, timeRange, effSignal);
           } else if (engine === "perplexity") {
             const key = await resolveApiKey("PERPLEXITY_API_KEY", "perplexityApiKey");
             if (!key) {
@@ -1280,7 +1304,7 @@ function apply(ctx, config) {
               logger.warn(`free-search: engine "${engine}" skipped (no key), trying next engine`);
               continue; // 无 key 跳过
             }
-            result = await searchPerplexity(request.query, request.maxResults, key, signal);
+            result = await searchPerplexity(request.query, request.maxResults, key, effSignal);
           } else if (engine === "deepseek-official") {
             const key = await resolveApiKey("DEEPSEEK_API_KEY", "deepseekApiKey");
             if (!key) {
@@ -1289,7 +1313,7 @@ function apply(ctx, config) {
               logger.warn(`free-search: engine "${engine}" skipped (no key), trying next engine`);
               continue; // 无 key 跳过
             }
-            result = await searchDeepSeekOfficial(request.query, request.maxResults, key, signal);
+            result = await searchDeepSeekOfficial(request.query, request.maxResults, key, effSignal);
           } else {
             continue;
           }
@@ -1313,9 +1337,11 @@ function apply(ctx, config) {
             // 写入缓存（只缓存成功结果，失败走 throw 天然不缓存）
             const cached = { ...result, provider: engine, engine: engine };
             if (cacheKey !== null) {
+              // fallback 条目（实际引擎≠首选）用配置 TTL 的 1/5，首选成功保持完整 TTL
+              const entryTtlMs = engine !== preferred ? Math.max(cacheTtlMs / 5, 1000) : cacheTtlMs;
               searchCache.set(cacheKey, {
                 value: cached,
-                expiresAt: Date.now() + cacheTtlMs,
+                expiresAt: Date.now() + entryTtlMs,
               });
               if (searchCache.size > CACHE_MAX_ENTRIES) {
                 const oldest = searchCache.keys().next().value;
@@ -1514,18 +1540,18 @@ function apply(ctx, config) {
     }, "free-search: test engines tool");
   });
 
-  // 平台搜索工具：GitHub / V2EX / Bilibili（公开 API，零依赖）
+  // 平台搜索工具：GitHub / V2EX / Bilibili / Reddit（公开 API，零依赖）
   ctx.inject(["tools"], (sctx) => {
     sctx.effect(() => {
       const dispose = sctx.tools.register(
         defineTool({
           name: "platform_search",
           description:
-            "Search a specific platform (GitHub / V2EX / Bilibili) for a query. Returns source URLs with titles and snippets. Use this when the user asks about repos, code, forum threads, or videos.",
+            "Search a specific platform (GitHub / V2EX / Bilibili / Reddit) for a query. Returns source URLs with titles and snippets. Use this when the user asks about repos, code, forum threads, videos, or discussions.",
           parameters: {
             platform: {
               type: "string",
-              description: "Platform to search: github, v2ex, bilibili",
+              description: "Platform to search: github, v2ex, bilibili, reddit",
             },
             query: {
               type: "string",
@@ -1567,7 +1593,7 @@ function apply(ctx, config) {
               throw new Error(`unknown platform "${platform}" - use one of: ${Object.keys(PLATFORMS).join(", ")}`);
             }
             // 平台开关：settings 里禁用某平台时，工具明确告知
-            const enabled = current().platforms ?? ["github", "v2ex", "bilibili"];
+            const enabled = current().platforms ?? ["github", "v2ex", "bilibili", "reddit"];
             if (!enabled.includes(platform)) {
               throw new Error(
                 `platform "${platform}" is disabled in Free Search settings - enable it in Settings > Plugins > Free Search to use it`
@@ -1653,6 +1679,7 @@ function apply(ctx, config) {
             },
           },
           async execute(args) {
+            if (!args.query || !String(args.query).trim()) throw new Error("query is required");
             const request = {
               query: args.query,
               maxResults: Math.min(args.maxResults ?? 5, 10),

package/package.json

@@ -1,6 +1,6 @@
 {
     "name":  "dsh-free-search",
-    "version":  "0.4.9",
+    "version":  "0.4.10",
     "description":  "Free web search for DeepSeek Harness: 10 engines (Bing/DuckDuckGo/AnySearch/SearXNG/Exa/Tavily/Keenable keyless) + time filtering + platform search + web_fetch, with web settings UI.",
     "type":  "module",
     "main":  "lib/index.js",