dsh-free-search 0.4.38 → 0.4.39

package/lib/client.js

@@ -96,6 +96,7 @@ window.__ModuleLoader__.load({
         getKey: "获取 API Key →",
         engineHint: "Bing 是最稳定的免费引擎。DuckDuckGo 在共享 IP 上可能限流。API KEY 引擎需在下方填写凭据。",
         apiKeys: "API 密钥（可选）",
+        anysearchPh: (c) => c ? "AnySearch API 密钥（已配置）" : "AnySearch API 密钥（可选，不填免费匿名，填了提额）",
         exaPh: (c) => c ? "Exa API 密钥（已配置）" : "Exa API 密钥（可选，不填也可免费使用）",
         tavilyPh: (c) => c ? "Tavily API 密钥（已配置）" : "Tavily API 密钥（可选，不填也可免费使用）",
         keenablePh: (c) => c ? "Keenable API 密钥（已配置）" : "Keenable API 密钥（可选，不填也可免费使用）",
@@ -108,7 +109,7 @@ window.__ModuleLoader__.load({
         keyStorage: "Key 存储位置",
         keyStorageCred: "凭据中心（推荐）",
         keyStorageSettings: "设置页（兼容）",
-        keyStorageCredHint: (c) => `保存后写入 ~/.dsh/.credentials.yaml（最高优先级）。当前已配置：${["exa", "tavily", "keenable", "firecrawl", "parallel", "perplexity", "serpbase", "deepseek"].filter((k) => c[k]).map((k) => k.toUpperCase()).join(", ") || "无"}`,
+        keyStorageCredHint: (c) => `保存后写入 ~/.dsh/.credentials.yaml（最高优先级）。当前已配置：${["anysearch", "exa", "tavily", "keenable", "firecrawl", "parallel", "perplexity", "serpbase", "deepseek"].filter((k) => c[k]).map((k) => k.toUpperCase()).join(", ") || "无"}`,
         keyStorageSettingsHint: "保存后写入当前 profile 的插件条目 config（cordis.patch.yml，优先级低于凭据中心）。",
         platformSearch: "平台搜索（platform_search 工具）",
         platformHint: "为 agent 的 platform_search 工具启用平台。禁用的平台会被跳过。",
@@ -164,6 +165,7 @@ window.__ModuleLoader__.load({
         getKey: "Get API Key →",
         engineHint: "Bing is the most stable FREE engine. DuckDuckGo may rate-limit on shared IPs. API KEY engines need credentials below.",
         apiKeys: "API keys (optional)",
+        anysearchPh: (c) => c ? "AnySearch API key (configured)" : "AnySearch API key (optional, free anonymous without; key raises quota)",
         exaPh: (c) => c ? "Exa API key (configured)" : "Exa API key (optional, free without)",
         tavilyPh: (c) => c ? "Tavily API key (configured)" : "Tavily API key (optional, free without)",
         keenablePh: (c) => c ? "Keenable API key (configured)" : "Keenable API key (optional, free without)",
@@ -176,7 +178,7 @@ window.__ModuleLoader__.load({
         keyStorage: "Key storage",
         keyStorageCred: "Credential center (recommended)",
         keyStorageSettings: "Settings page (legacy)",
-        keyStorageCredHint: (c) => `Saved to ~/.dsh/.credentials.yaml (highest priority). Currently configured: ${["exa", "tavily", "keenable", "firecrawl", "parallel", "perplexity", "serpbase", "deepseek"].filter((k) => c[k]).map((k) => k.toUpperCase()).join(", ") || "none"}`,
+        keyStorageCredHint: (c) => `Saved to ~/.dsh/.credentials.yaml (highest priority). Currently configured: ${["anysearch", "exa", "tavily", "keenable", "firecrawl", "parallel", "perplexity", "serpbase", "deepseek"].filter((k) => c[k]).map((k) => k.toUpperCase()).join(", ") || "none"}`,
         keyStorageSettingsHint: "Saved to the active profile plugin entry config (cordis.patch.yml; lower priority than the credential center).",
         platformSearch: "Platform search (platform_search tool)",
         platformHint: "Enable platforms for the agent's platform_search tool. Disabled platforms are skipped.",
@@ -227,7 +229,7 @@ window.__ModuleLoader__.load({
     };
     const tt = (lang) => I18N[lang === "en" ? "en" : "zh"];
     // 当前插件版本（与 lib/index.js 的 PLUGIN_VERSION 保持一致）
-    const PLUGIN_VERSION = "0.4.38";
+    const PLUGIN_VERSION = "0.4.39";
     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" },
@@ -344,6 +346,7 @@ window.__ModuleLoader__.load({
       const [provider, setProvider] = react.useState("bing");
       const [safeSearch, setSafeSearch] = react.useState("off");
       const [bingMarket, setBingMarket] = react.useState("zh-CN");
+      const [anysearchKey, setAnysearchKey] = react.useState("");
       const [exaKey, setExaKey] = react.useState("");
       const [tavilyKey, setTavilyKey] = react.useState("");
       const [keenableKey, setKeenableKey] = react.useState("");
@@ -382,6 +385,7 @@ window.__ModuleLoader__.load({
               setSafeSearch(v.safeSearch === "strict" || v.safeSearch === "moderate" ? v.safeSearch : "off");
               setBingMarket(v.bingMarket === undefined ? "zh-CN" : v.bingMarket);
               setLang(v.lang === "en" ? "en" : "zh");
+              setAnysearchKey(v.anysearchApiKey ?? "");
               setExaKey(v.exaApiKey ?? "");
               setTavilyKey(v.tavilyApiKey ?? "");
               setKeenableKey(v.keenableApiKey ?? "");
@@ -397,6 +401,7 @@ window.__ModuleLoader__.load({
               for (const secret of view.secrets ?? []) {
                 if (secret.set) {
                   const path = secret.path.join(".");
+                  if (path === "anysearchApiKey") configured.anysearch = true;
                   if (path === "exaApiKey") configured.exa = true;
                   if (path === "tavilyApiKey") configured.tavily = true;
                   if (path === "keenableApiKey") configured.keenable = true;
@@ -416,7 +421,7 @@ window.__ModuleLoader__.load({
                 const cred = await bridgeCredentialsStatus();
                 if (cred.ok) {
                   const cc = {};
-                  const map = { exaApiKey: "exa", tavilyApiKey: "tavily", keenableApiKey: "keenable", firecrawlApiKey: "firecrawl", parallelApiKey: "parallel", perplexityApiKey: "perplexity", deepseekApiKey: "deepseek", serpbaseApiKey: "serpbase" };
+                  const map = { anysearchApiKey: "anysearch", exaApiKey: "exa", tavilyApiKey: "tavily", keenableApiKey: "keenable", firecrawlApiKey: "firecrawl", parallelApiKey: "parallel", perplexityApiKey: "perplexity", deepseekApiKey: "deepseek", serpbaseApiKey: "serpbase" };
                   for (const [k, v] of Object.entries(cred.value.configured ?? {})) {
                     if (map[k]) cc[map[k]] = v;
                   }
@@ -453,6 +458,7 @@ window.__ModuleLoader__.load({
         try {
           // key 存储分流：凭据中心（默认）走 credentials-set；设置页走 settings mutate（兼容）
           const keyFields = [
+            ["anysearchApiKey", anysearchKey],
             ["exaApiKey", exaKey],
             ["tavilyApiKey", tavilyKey],
             ["keenableApiKey", keenableKey],
@@ -746,6 +752,19 @@ react_jsx_runtime.jsx("div", {
                         className: "dshfs-label",
                         children: t.apiKeys,
                       }),
+                      react_jsx_runtime.jsx("input", {
+                        className: "dshfs-input",
+                        type: "password",
+                        placeholder: t.anysearchPh(keysConfigured.anysearch),
+                        value: anysearchKey,
+                        disabled: !ready || saving,
+                        onChange: (e) => {
+                          setAnysearchKey(e.target.value);
+                          setDirty(true);
+                          setFailed(false);
+                          setSaveError("");
+                        },
+                      }),
                       react_jsx_runtime.jsx("input", {
                         className: "dshfs-input",
                         type: "password",

package/lib/index.js

@@ -55,7 +55,7 @@ const FREE_ENGINES = ["ddg", "ddg-lite", "bing", "searxng", "anysearch"];
 const ALL_ENGINES = ["ddg", "ddg-lite", "bing", "searxng", "anysearch", "exa", "tavily", "keenable", "firecrawl", "parallel", "perplexity", "serpbase", "deepseek-official"];
 
 // 当前插件版本（发布时与 package.json 同步）
-const PLUGIN_VERSION = "0.4.38";
+const PLUGIN_VERSION = "0.4.39";
 // 检查更新的 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";
@@ -479,20 +479,39 @@ async function searchSearxng(query, maxResults, options, signal) {
 const ANYSEARCH_URL = "https://api.anysearch.com/v1/search";
 const EXA_MCP_URL = "https://mcp.exa.ai/mcp";
 
-// AnySearch: 免费匿名额度（无 key），结构化 JSON 结果
-async function searchAnysearch(query, maxResults, signal) {
+// AnySearch: 免费匿名额度（无 key），可选 Bearer key 提额；结构化 JSON 结果
+// 401/403：本进程忽略该 key 值（不删除存储），改回匿名免费；不自动清空用户配置
+let ignoredAnysearchKey = "";
+const ANYSEARCH_KEY_INVALID_NOTE = "AnySearch key 无效，本次已忽略该 key，改回免费匿名";
+
+async function searchAnysearch(query, maxResults, signal, apiKey) {
+  const trimmedKey = typeof apiKey === "string" ? apiKey.trim() : "";
+  // 本进程已判定无效的 key 不再发送；若配置里仍有该值，结果仍带忽略提示
+  const keyIgnoredSticky = Boolean(trimmedKey) && trimmedKey === ignoredAnysearchKey;
+  const sendKey = trimmedKey && !keyIgnoredSticky ? trimmedKey : "";
   const controller = new AbortController();
   const timer = setTimeout(() => controller.abort(), 12000);
   const onAbort = () => controller.abort();
   signal?.addEventListener("abort", onAbort);
-  let response;
-  try {
-    response = await fetch(ANYSEARCH_URL, {
+  const doFetch = async (key) => {
+    const headers = { "content-type": "application/json" };
+    if (key) headers.authorization = `Bearer ${key}`;
+    return await fetch(ANYSEARCH_URL, {
       method: "POST",
-      headers: { "content-type": "application/json" },
+      headers,
       body: JSON.stringify({ query, max_results: maxResults ?? 5 }),
       signal: controller.signal,
     });
+  };
+  let response;
+  let keyRejected = false;
+  try {
+    response = await doFetch(sendKey);
+    if ((response.status === 401 || response.status === 403) && sendKey) {
+      ignoredAnysearchKey = sendKey;
+      keyRejected = true;
+      response = await doFetch("");
+    }
   } catch (error) {
     if (signal?.aborted) throw error;
     throw new Error(`AnySearch request failed: ${error?.message ?? String(error)}`);
@@ -500,6 +519,9 @@ async function searchAnysearch(query, maxResults, signal) {
     clearTimeout(timer);
     signal?.removeEventListener("abort", onAbort);
   }
+  if (response.status === 401 || response.status === 403) {
+    throw new Error(keyRejected ? `${ANYSEARCH_KEY_INVALID_NOTE} (HTTP ${response.status})` : `AnySearch API error (HTTP ${response.status})`);
+  }
   if (!response.ok) throw new Error(`AnySearch API error (HTTP ${response.status})`);
   const data = await response.json();
   if (data.code !== 0) throw new Error(`AnySearch API error: ${data.message ?? data.code}`);
@@ -513,6 +535,7 @@ async function searchAnysearch(query, maxResults, signal) {
         ...(r.snippet ? { snippet: String(r.snippet).slice(0, 300) } : {}),
       })),
     truncated: false,
+    ...(keyRejected || keyIgnoredSticky ? { content: ANYSEARCH_KEY_INVALID_NOTE } : {}),
   };
 }
 
@@ -1611,6 +1634,10 @@ function makeBridgeRoutes(settings, search, testEngine, getCredentials) {
       const expectedRevision = typeof body.expectedRevision === "number" ? body.expectedRevision : undefined;
       try {
         await settings.mutate(ns, body.ops, expectedRevision);
+        // 设置页保存了 AnySearch key：允许下次再试（不删除存储，仅解除本进程忽略）
+        if (body.ops.some((op) => op && op.op === "set" && Array.isArray(op.path) && op.path[0] === "anysearchApiKey")) {
+          ignoredAnysearchKey = "";
+        }
       } catch (error) {
         if (error instanceof SettingsConflictError) {
           return { ok: false, code: "settings-conflict", message: error.message };
@@ -1651,6 +1678,8 @@ function makeBridgeRoutes(settings, search, testEngine, getCredentials) {
       }
       try {
         await credentials.set(ref, value.trim());
+        // 用户写入新 AnySearch key：允许下次请求再试（仅忽略同值坏 key，不删除存储）
+        if (key === "anysearchApiKey") ignoredAnysearchKey = "";
         return { ok: true, value: { ref, set: true } };
       } catch (error) {
         return { ok: false, code: "credentials-write-failed", message: error instanceof Error ? error.message : String(error) };
@@ -1778,6 +1807,7 @@ const inject = ["web"];
 
 // 引擎 key 与凭据中心 ref 的映射（白名单：只允许这些 ref 被 UI 读写凭据中心）
 const KEY_REF_MAP = {
+  anysearchApiKey: "ANYSEARCH_API_KEY",
   exaApiKey: "EXA_API_KEY",
   tavilyApiKey: "TAVILY_API_KEY",
   keenableApiKey: "KEENABLE_API_KEY",
@@ -1803,6 +1833,7 @@ const Config = z.object({
   safeSearch: z.string().default("off").volatile(),
   searxngInstances: z.array(z.string()).volatile(),
   platforms: z.array(z.string()).default(["github", "v2ex", "bilibili", "reddit", "hn", "stackoverflow", "wikipedia", "npm"]).volatile(),
+  anysearchApiKey: z.string().role("secret").volatile(),
   exaApiKey: z.string().role("secret").volatile(),
   tavilyApiKey: z.string().role("secret").volatile(),
   keenableApiKey: z.string().role("secret").volatile(),
@@ -1945,7 +1976,8 @@ function apply(ctx, config) {
           } else if (engine === "searxng") {
             result = await searchSearxng(request.query, request.maxResults, { ...cfg, timeRange }, effSignal);
           } else if (engine === "anysearch") {
-            result = await searchAnysearch(request.query, request.maxResults, effSignal);
+            const key = await resolveApiKey("ANYSEARCH_API_KEY", "anysearchApiKey");
+            result = await searchAnysearch(request.query, request.maxResults, effSignal, key);
           } else if (engine === "exa") {
             // exa：有 key 走 REST，无 key 走 keyless MCP（免费）
             const key = await resolveApiKey("EXA_API_KEY", "exaApiKey");
@@ -2105,8 +2137,10 @@ function apply(ctx, config) {
           return await searchBing(q, 2, cfg);
         case "searxng":
           return await searchSearxng(q, 2, { ...cfg, timeRange: tr });
-        case "anysearch":
-          return await searchAnysearch(q, 2);
+        case "anysearch": {
+          const key = await resolveApiKey("ANYSEARCH_API_KEY", "anysearchApiKey");
+          return await searchAnysearch(q, 2, undefined, key);
+        }
         case "exa": {
           const key = await resolveApiKey("EXA_API_KEY", "exaApiKey");
           if (key) return await searchExa(q, 2, key, tr);
@@ -2163,6 +2197,7 @@ function apply(ctx, config) {
           s.snippet ? { ...s, snippet: cleanSnippet(s.snippet) } : s
         ),
         truncated: result.truncated ?? false,
+        ...(typeof result.content === "string" && result.content ? { content: result.content } : {}),
       };
     } catch (error) {
       return { ok: false, error: error instanceof Error ? error.message : String(error) };
@@ -2459,7 +2494,7 @@ function apply(ctx, config) {
           "- ddg-lite (DuckDuckGo Lite) - FREE, no key (may be rate-limited)",
           "- bing (Bing) - FREE, no key (most stable)",
           "- searxng (meta-search, multi-instance) - FREE, no key",
-          "- anysearch (AI search) - FREE, no key",
+          "- anysearch (AI search) - FREE no key, or optional ANYSEARCH_API_KEY for higher limits",
           "- exa - FREE keyless (MCP) or EXA_API_KEY for higher limits",
           "- tavily - FREE keyless or TAVILY_API_KEY for higher limits",
           "- keenable - FREE keyless (MCP) or KEENABLE_API_KEY for higher limits",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-free-search",
-  "version": "0.4.38",
-  "description": "Free web search for DeepSeek Harness: 13 engines (Bing/DuckDuckGo/AnySearch/SearXNG/Exa/Tavily/Keenable/Firecrawl/Parallel keyless; Perplexity/SerpBase/DeepSeek with key) + time filtering + platform search + web_fetch, with web settings UI.",
+  "version": "0.4.39",
+  "description": "Free web search for DeepSeek Harness: 13 engines (Bing/DuckDuckGo/AnySearch/SearXNG/Exa/Tavily/Keenable/Firecrawl/Parallel keyless; Perplexity/SerpBase/DeepSeek with key) + optional AnySearch key for higher quota + time filtering + platform search + web_fetch, with web settings UI.",
   "type": "module",
   "main": "lib/index.js",
   "exports": {