dsh-free-search 0.4.21 → 0.4.23

package/README.md

@@ -43,6 +43,8 @@ dsh 默认的搜索 provider 依赖 DeepSeek 官方 API key（`DEEPSEEK_API_KEY`
 - **平台搜索（platform_search）** —— 搜 GitHub / V2EX / B站 / Reddit / Hacker News / Stack Overflow / 维基百科 / npm（公开 API，零依赖）
 - **干净集成** —— 实现官方 `WebSearchProvider` seam 接口，与官方插件共存
 
+如果这个插件帮到了你，欢迎给仓库点个 ⭐（[GitHub](https://github.com/DDDMUC/dsh-free-search)）——星标是开发者继续维护的最大动力，感谢支持！
+
 ### 引擎列表
 
 | id | 引擎 | 费用 | 说明 |
@@ -87,6 +89,16 @@ dsh plugin --profile web add /path/to/dsh-free-search
 dsh web
 ```
 
+#### 姊妹插件：dsh-preset-workbench（预设工作台）
+
+同作者的**姊妹插件**：在设置页里可视化创建/编辑 Agent 预设——分段提示词、15 项能力开关、内置「鲸鱼娘 / 梁神模式」模板，不用手写 YAML。两者搭配：**free-search 解决"AI 联网搜索"、preset-workbench 解决"AI 人设能力编排"**，都是纯免费、开箱即用。
+
+- 仓库：<https://github.com/DDDMUC/dsh-preset-workbench>
+- 安装：`dsh plugin --profile web add github:DDDMUC/dsh-preset-workbench`
+- 用法：设置 → 预设工作台
+
+如果你觉得 preset-workbench 也有用，同样欢迎给它的仓库点个 ⭐。🙏
+
 #### 依赖说明
 
 插件对 `@deepseek-ai/dsh-settings` 和 `@deepseek-ai/dsh-tools` 使用 `peerDependencies`，这是刻意的：DSH 运行时必须使用安装树中的唯一实例。请通过 `dsh plugin --profile <profile> add ...` 安装插件，不要把 DSH 核心包复制进 profile 的本地 `node_modules`；重复副本会导致工具调度器失效。
@@ -284,6 +296,8 @@ This plugin provides multiple free search engines with automatic fallback, compl
 - **Platform Search (`platform_search`)** — Search GitHub / V2EX / Bilibili / Reddit / Hacker News / Stack Overflow / Wikipedia / npm (public APIs, zero extra dependencies)
 - **Clean Integration** — Implements the official `WebSearchProvider` seam interface, coexisting seamlessly with official plugins
 
+If this plugin has been helpful, a ⭐ on [GitHub](https://github.com/DDDMUC/dsh-free-search) would mean a lot — it's the biggest motivation for the developer to keep maintaining it. Thank you!
+
 ### Supported Engines
 
 | id | Engine | Cost | Description |
@@ -328,6 +342,16 @@ Then restart:
 dsh web
 ```
 
+#### Sister Plugin: dsh-preset-workbench
+
+A **sister plugin** by the same author: a **visual workbench for creating/editing agent presets** right inside Settings — sectioned prompts, 15 capability toggles, and built-in "Whale Girl / Liangshen Mode" templates, no YAML needed. Pair them up: **free-search gives your AI web search, preset-workbench shapes its persona & capabilities** — both free and zero-config.
+
+- Repo: <https://github.com/DDDMUC/dsh-preset-workbench>
+- Install: `dsh plugin --profile web add github:DDDMUC/dsh-preset-workbench`
+- Usage: Settings → Preset Workbench
+
+If preset-workbench is useful to you too, a ⭐ on its repo is always welcome. 🙏
+
 #### Dependency Note
 
 This plugin intentionally specifies `@deepseek-ai/dsh-settings` and `@deepseek-ai/dsh-tools` as `peerDependencies`: the DSH runtime must use a single instance from the installation tree. Always install the plugin using `dsh plugin --profile <profile> add ...`. Do **not** copy DSH core packages into a profile-local `node_modules`, as duplicate copies can break the tool scheduler.

package/lib/client.js

@@ -122,6 +122,23 @@ window.__ModuleLoader__.load({
         upgradeLinkMode: "（本地开发模式，升级请用 git pull）",
         upgradeDone: (l) => `升级到 v${l} 完成，重启 dsh 后生效`,
         upgradeFailed: (m) => `升级失败：${m}`,
+        safeSearchLabel: "安全搜索过滤 (adlt)",
+        safeSearchOff: "关闭 —— 引擎默认（不加参数）",
+        safeSearchModerate: "中等 —— Bing 默认",
+        safeSearchStrict: "严格",
+        safeSearchHint: "作用于 Bing（adlt）、DuckDuckGo HTML / Lite（adlt 等级）。如遇引擎自带过滤可在此调整。",
+        bingMarketLabel: "Bing 市场（本地化结果）",
+        bingMarketHint: "Bing 的 mkt + Accept-Language 跟随此设置。例如 ru-RU 会让西里尔查询返回俄语结果。",
+        marketZhCN: "zh-CN —— 中国大陆（默认）",
+        marketZhTW: "zh-TW —— 台湾",
+        marketEnUS: "en-US —— 美国",
+        marketEnGB: "en-GB —— 英国",
+        marketRuRU: "ru-RU —— 俄罗斯",
+        marketJaJP: "ja-JP —— 日本",
+        marketDeDE: "de-DE —— 德国",
+        marketFrFR: "fr-FR —— 法国",
+        marketEsES: "es-ES —— 西班牙",
+        marketKoKR: "ko-KR —— 韩国",
       },
       en: {
         description: "Free web search — no API key needed (Bing / DuckDuckGo / AnySearch / Exa / Tavily / Keenable)",
@@ -168,11 +185,28 @@ window.__ModuleLoader__.load({
         upgradeLinkMode: "(local dev install - use git pull to update)",
         upgradeDone: (l) => `Upgraded to v${l} - restart dsh to apply`,
         upgradeFailed: (m) => `Upgrade failed: ${m}`,
+        safeSearchLabel: "Safe search filter (adlt)",
+        safeSearchOff: "Off - engine default (no filtering)",
+        safeSearchModerate: "Moderate - Bing default",
+        safeSearchStrict: "Strict",
+        safeSearchHint: "Applies to bing (adlt), ddg, ddg-lite (adlt degree). If you see the engine's own filtering, adjust here.",
+        bingMarketLabel: "Bing market (localized results)",
+        bingMarketHint: "Bing's mkt + Accept-Language follow this. e.g. ru-RU returns Russian results for Cyrillic queries.",
+        marketZhCN: "zh-CN - China (default)",
+        marketZhTW: "zh-TW - Taiwan",
+        marketEnUS: "en-US - United States",
+        marketEnGB: "en-GB - United Kingdom",
+        marketRuRU: "ru-RU - Russia",
+        marketJaJP: "ja-JP - Japan",
+        marketDeDE: "de-DE - Germany",
+        marketFrFR: "fr-FR - France",
+        marketEsES: "es-ES - Spain",
+        marketKoKR: "ko-KR - Korea",
       },
     };
     const tt = (lang) => I18N[lang === "en" ? "en" : "zh"];
     // 当前插件版本（与 lib/index.js 的 PLUGIN_VERSION 保持一致）
-    const PLUGIN_VERSION = "0.4.20";
+    const PLUGIN_VERSION = "0.4.23";
     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" },
@@ -274,6 +308,7 @@ window.__ModuleLoader__.load({
       const [state, setState] = react.useState({ status: "loading" });
       const [provider, setProvider] = react.useState("bing");
       const [safeSearch, setSafeSearch] = react.useState("off");
+      const [bingMarket, setBingMarket] = react.useState("zh-CN");
       const [exaKey, setExaKey] = react.useState("");
       const [tavilyKey, setTavilyKey] = react.useState("");
       const [keenableKey, setKeenableKey] = react.useState("");
@@ -305,6 +340,7 @@ window.__ModuleLoader__.load({
               const v = view.value ?? {};
               setProvider(v.provider ?? "ddg");
               setSafeSearch(v.safeSearch === "strict" || v.safeSearch === "moderate" ? v.safeSearch : "off");
+              setBingMarket(v.bingMarket === undefined ? "zh-CN" : v.bingMarket);
               setLang(v.lang === "en" ? "en" : "zh");
               setExaKey(v.exaApiKey ?? "");
               setTavilyKey(v.tavilyApiKey ?? "");
@@ -386,6 +422,7 @@ window.__ModuleLoader__.load({
           ops.push({ op: "set", path: ["lang"], value: lang });
           ops.push({ op: "set", path: ["keyStorage"], value: keyStorage });
           ops.push({ op: "set", path: ["safeSearch"], value: safeSearch });
+          ops.push({ op: "set", path: ["bingMarket"], value: bingMarket });
           if (keyStorage !== "credentials") {
             // settings 模式：key 仍写 settings.yaml（旧行为）
             for (const [field, value] of keyFields) {
@@ -578,7 +615,7 @@ react_jsx_runtime.jsx("div", {
                     children: [
                       react_jsx_runtime.jsx("div", {
                         className: "dshfs-label",
-                        children: "Safe search filter (adlt)",
+                        children: t.safeSearchLabel,
                       }),
                       react_jsx_runtime.jsx("select", {
                         className: "dshfs-select",
@@ -587,14 +624,46 @@ react_jsx_runtime.jsx("div", {
                         disabled: !ready || saving,
                         onChange: (e) => setSafeSearch(e.target.value),
                         children: [
-                          react_jsx_runtime.jsx("option", { value: "off", children: "Off - engine default (no filtering)" }, "off"),
-                          react_jsx_runtime.jsx("option", { value: "moderate", children: "Moderate - Bing default" }, "moderate"),
-                          react_jsx_runtime.jsx("option", { value: "strict", children: "Strict" }, "strict"),
+                          react_jsx_runtime.jsx("option", { value: "off", children: t.safeSearchOff }, "off"),
+                          react_jsx_runtime.jsx("option", { value: "moderate", children: t.safeSearchModerate }, "moderate"),
+                          react_jsx_runtime.jsx("option", { value: "strict", children: t.safeSearchStrict }, "strict"),
                         ],
                       }),
                       react_jsx_runtime.jsx("p", {
                         className: "dshfs-hint",
-                        children: "Applies to bing (adlt), ddg, ddg-lite (adlt degree). If you see the engine's own filtering, adjust here.",
+                        children: t.safeSearchHint,
+                      }),
+                    ],
+                  }),
+                  react_jsx_runtime.jsx("div", {
+                    className: "dshfs-field",
+                    children: [
+                      react_jsx_runtime.jsx("div", {
+                        className: "dshfs-label",
+                        children: t.bingMarketLabel,
+                      }),
+                      react_jsx_runtime.jsx("select", {
+                        className: "dshfs-select",
+                        value: bingMarket,
+                        style: { colorScheme: selectColorScheme },
+                        disabled: !ready || saving,
+                        onChange: (e) => setBingMarket(e.target.value),
+                        children: [
+                          react_jsx_runtime.jsx("option", { value: "zh-CN", children: t.marketZhCN }, "zh-CN"),
+                          react_jsx_runtime.jsx("option", { value: "zh-TW", children: t.marketZhTW }, "zh-TW"),
+                          react_jsx_runtime.jsx("option", { value: "en-US", children: t.marketEnUS }, "en-US"),
+                          react_jsx_runtime.jsx("option", { value: "en-GB", children: t.marketEnGB }, "en-GB"),
+                          react_jsx_runtime.jsx("option", { value: "ru-RU", children: t.marketRuRU }, "ru-RU"),
+                          react_jsx_runtime.jsx("option", { value: "ja-JP", children: t.marketJaJP }, "ja-JP"),
+                          react_jsx_runtime.jsx("option", { value: "de-DE", children: t.marketDeDE }, "de-DE"),
+                          react_jsx_runtime.jsx("option", { value: "fr-FR", children: t.marketFrFR }, "fr-FR"),
+                          react_jsx_runtime.jsx("option", { value: "es-ES", children: t.marketEsES }, "es-ES"),
+                          react_jsx_runtime.jsx("option", { value: "ko-KR", children: t.marketKoKR }, "ko-KR"),
+                        ],
+                      }),
+                      react_jsx_runtime.jsx("p", {
+                        className: "dshfs-hint",
+                        children: t.bingMarketHint,
                       }),
                     ],
                   }),

package/lib/index.js

@@ -15,13 +15,40 @@ const USER_AGENT =
   "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0 Safari/537.36";
 const ACCEPT_LANG = "zh-CN,zh;q=0.9,en;q=0.8";
 
+// 语言 → Bing 本地化档案：{ market, acceptLang }。
+// lang 字段（设置页可切换）驱动 Bing 的 mkt + Accept-Language，让非中文用户
+// 也能拿到本地化结果（俄语搜俄文等）。bingMarket 显式设置时优先于映射。
+const LANG_PROFILES = {
+  zh: { market: "zh-CN", acceptLang: "zh-CN,zh;q=0.9,en;q=0.8" },
+  en: { market: "en-US", acceptLang: "en-US,en;q=0.9" },
+  ru: { market: "ru-RU", acceptLang: "ru-RU,ru;q=0.9,en;q=0.8" },
+  ja: { market: "ja-JP", acceptLang: "ja-JP,ja;q=0.9,en;q=0.8" },
+  de: { market: "de-DE", acceptLang: "de-DE,de;q=0.9,en;q=0.8" },
+  fr: { market: "fr-FR", acceptLang: "fr-FR,fr;q=0.9,en;q=0.8" },
+  es: { market: "es-ES", acceptLang: "es-ES,es;q=0.9,en;q=0.8" },
+  ko: { market: "ko-KR", acceptLang: "ko-KR,ko;q=0.9,en;q=0.8" },
+};
+// market → 语言（bingMarket 显式设置时反推 accept-language，避免中文优先 header 污染）
+const MARKET_TO_LANG = {
+  "zh-CN": "zh-CN,zh;q=0.9,en;q=0.8",
+  "zh-TW": "zh-TW,zh;q=0.9,en;q=0.8",
+  "en-US": "en-US,en;q=0.9",
+  "en-GB": "en-GB,en;q=0.9",
+  "ru-RU": "ru-RU,ru;q=0.9,en;q=0.8",
+  "ja-JP": "ja-JP,ja;q=0.9,en;q=0.8",
+  "de-DE": "de-DE,de;q=0.9,en;q=0.8",
+  "fr-FR": "fr-FR,fr;q=0.9,en;q=0.8",
+  "es-ES": "es-ES,es;q=0.9,en;q=0.8",
+  "ko-KR": "ko-KR,ko;q=0.9,en;q=0.8",
+};
+
 const FREE_SEARCH_NS = "free-search";
 const BRIDGE_PREFIX = "/api/dsh-free-search-settings";
 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.20";
+const PLUGIN_VERSION = "0.4.23";
 // 检查更新的 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";
@@ -192,7 +219,7 @@ function uniqueSources(sources, limit) {
   return out;
 }
 
-async function fetchHtml(url, signal) {
+async function fetchHtml(url, signal, acceptLang) {
   // 单次请求超时 12s，避免挂起被当成 Connection error
   let response;
   try {
@@ -201,7 +228,7 @@ async function fetchHtml(url, signal) {
     const onAbort = () => controller.abort();
     signal?.addEventListener("abort", onAbort);
     response = await fetch(url, {
-      headers: { "user-agent": USER_AGENT, "accept-language": ACCEPT_LANG },
+      headers: { "user-agent": USER_AGENT, "accept-language": acceptLang ?? ACCEPT_LANG },
       signal: controller.signal,
       redirect: "follow",
     });
@@ -223,11 +250,11 @@ async function fetchHtml(url, signal) {
 }
 
 // 带重试的抓取：网络错误/空结果时重试，间隔 1.5s，最多 3 次
-async function fetchHtmlWithRetry(url, signal) {
+async function fetchHtmlWithRetry(url, signal, acceptLang) {
   let lastError;
   for (let attempt = 1; attempt <= 3; attempt++) {
     try {
-      const html = await fetchHtml(url, signal);
+      const html = await fetchHtml(url, signal, acceptLang);
       if (html.length > 500) return html;
       lastError = new Error(`empty response (${html.length} bytes)`);
     } catch (error) {
@@ -300,12 +327,19 @@ async function searchDdgLite(query, maxResults, options, signal) {
 }
 
 async function searchBing(query, maxResults, options, signal) {
-  const params = new URLSearchParams({ q: query, mkt: options?.bingMarket ?? "zh-CN" });
+  // mkt：显式 bingMarket 优先；否则按 lang 映射（zh→zh-CN, ru→ru-RU ...）
+  const profile = LANG_PROFILES[options?.lang] ?? LANG_PROFILES.zh;
+  const market = options?.bingMarket ?? profile.market;
+  const params = new URLSearchParams({ q: query, mkt: market });
+  // Accept-Language：显式 bingMarket 时按 market 反推（避免中文 header 污染），否则用 lang 档案
+  const acceptLang = options?.bingMarket
+    ? (MARKET_TO_LANG[market] ?? ACCEPT_LANG)
+    : (profile.acceptLang ?? ACCEPT_LANG);
   const adlt = options?.safeSearch ?? "off";
   if (adlt === "off") params.set("adlt", "off");
   else if (adlt === "moderate") params.set("adlt", "moderate");
   else if (adlt === "strict") params.set("adlt", "strict");
-  const html = await fetchHtmlWithRetry(`${BING_URL}?${params}`, signal);
+  const html = await fetchHtmlWithRetry(`${BING_URL}?${params}`, signal, acceptLang);
   const blocks = html.match(/<li class="b_algo"[\s\S]*?<\/li>/g) ?? [];
   const sources = [];
   for (const block of blocks) {
@@ -2024,6 +2058,7 @@ function apply(ctx, config) {
           "You have the web_search tool. Its backend engine is chosen in Settings > Plugins > Free Search.",
           "Current engine: " + (current().provider ?? "bing"),
           "Safe search filter (Settings > Plugins > Free Search): " + (current().safeSearch ?? "off") + " (off|moderate|strict). Engine default off; applies to bing/ddg/ddg-lite.",
+          "Bing market: " + (current().bingMarket ?? "zh-CN") + " (mkt + Accept-Language; e.g. ru-RU returns Russian results for Cyrillic queries).",
           "",
           "Available engines and their requirements:",
           "- ddg (DuckDuckGo HTML) - FREE, no key (may be rate-limited)",

package/package.json

@@ -1,67 +1,67 @@
-{
-    "name":  "dsh-free-search",
-    "version": "0.4.21",
-    "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",
-    "exports":  {
-                    ".":  "./lib/index.js",
-                    "./client":  "./lib/client.js",
-                    "./package.json":  "./package.json"
-                },
-    "files":  [
-                  "lib/index.js",
-                  "lib/client.js",
-                  "cordis.patch.yml"
-              ],
-    "keywords":  [
-                     "deepseek-harness",
-                     "dsh",
-                     "dsh-plugin",
-                     "web-search",
-                     "duckduckgo",
-                     "bing",
-                     "tavily",
-                     "exa",
-                     "keenable",
-                     "perplexity",
-                     "search",
-                     "free"
-                 ],
-    "license":  "MIT",
-    "publishConfig":  {
-                          "access":  "public"
-                      },
-    "repository":  {
-                       "type":  "git",
-                       "url":  "https://github.com/DDDMUC/dsh-free-search.git"
-                   },
-    "engines":  {
-                    "node":  "\u003e=20"
-                },
-    "dependencies":  {
-                         "@deepseek-ai/schemastery":  "^3.18.1"
-                     },
-    "peerDependencies":  {
-                             "@deepseek-ai/dsh-settings":  "\u003e=0.1.0-rc.6",
-                             "@deepseek-ai/dsh-tools":  "\u003e=0.1.0-rc.6"
-                         },
-    "devDependencies":  {
-                            "@deepseek-ai/dsh-settings":  "0.1.0-rc.7",
-                            "@deepseek-ai/dsh-tools":  "0.1.0-rc.7"
-                        },
-    "dsh":  {
-                "bundle":  {
-                               "patch":  "cordis.patch.yml"
-                           },
-                "client":  {
-                               "inject":  [
-                                              "@deepseek-ai/dsh-client-runtime"
-                                          ],
-                               "platform":  "web"
-                           },
-                "engines":  {
-                                "dsh":  "\u003e=0.1.1-rc.1"
-                            }
-            }
-}
+{
+  "name": "dsh-free-search",
+  "version": "0.4.23",
+  "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",
+  "exports": {
+    ".": "./lib/index.js",
+    "./client": "./lib/client.js",
+    "./package.json": "./package.json"
+  },
+  "files": [
+    "lib/index.js",
+    "lib/client.js",
+    "cordis.patch.yml"
+  ],
+  "keywords": [
+    "deepseek-harness",
+    "dsh",
+    "dsh-plugin",
+    "web-search",
+    "duckduckgo",
+    "bing",
+    "tavily",
+    "exa",
+    "keenable",
+    "perplexity",
+    "search",
+    "free"
+  ],
+  "license": "MIT",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/DDDMUC/dsh-free-search.git"
+  },
+  "engines": {
+    "node": ">=20"
+  },
+  "dependencies": {
+    "@deepseek-ai/schemastery": "^3.18.1"
+  },
+  "peerDependencies": {
+    "@deepseek-ai/dsh-settings": ">=0.1.0-rc.6",
+    "@deepseek-ai/dsh-tools": ">=0.1.0-rc.6"
+  },
+  "devDependencies": {
+    "@deepseek-ai/dsh-settings": "0.1.0-rc.7",
+    "@deepseek-ai/dsh-tools": "0.1.0-rc.7"
+  },
+  "dsh": {
+    "bundle": {
+      "patch": "cordis.patch.yml"
+    },
+    "client": {
+      "inject": [
+        "@deepseek-ai/dsh-client-runtime"
+      ],
+      "platform": "web"
+    },
+    "engines": {
+      "dsh": ">=0.1.1-rc.1"
+    }
+  }
+}