dsh-free-search 0.4.16 → 0.4.18

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.16），"检查更新"按钮直连 npm registry 对比最新版，有新版本时提示并可一键跳转
+- **版本号 + 检查更新** —— 设置卡片显示当前版本（v0.4.17），"检查更新"按钮直连 npm registry 对比最新版，有新版本时提示并可一键跳转
 - **结果缓存** —— 相同查询（含引擎/时间过滤参数）5 分钟内命中缓存（LRU 50 条），防免费引擎限流、省付费额度；时长可在设置页 0-5 分钟自由配置（0 关闭）
 - **免费标注** —— 设置页中免费引擎带绿色 `FREE` 徽章，付费引擎带橙色 `API KEY` 徽章
 - **网页抓取（web_fetch）** —— 让 agent 抓取网页内容（官方 `dsh-web-fetch-http` provider，纯 JS，零额外依赖）
@@ -277,7 +277,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.16), 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.17), 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)
@@ -488,4 +488,10 @@ Windows users: The desktop shortcut already includes this configuration (`set NO
 
 ### License
 
-MIT
+MIT
+
+## safeSearch 安全搜索过滤
+
+- 全新配置项 `safeSearch`：`off`（引擎默认，不加参数）/ `moderate` / `strict`
+- 作用于 Bing（adlt）、DuckDuckGo HTML（adlt）、DuckDuckGo Lite（adlt）
+- 默认 `off`：不额外过滤，保持引擎自身默认行为；需要时在「设置 > 插件 > Free Search」切换

package/cordis.patch.yml

@@ -16,6 +16,9 @@
         provider: bing
         bingMarket: zh-CN
 # 自动接管默认搜索：让 harness 的 web_search 直接用本插件的 provider（内部含全部引擎）
+# 注意 patch 语义是"整行替换 config"（DSH 0.1.2+）：必须保留 fetchProvider，否则
+# web-fetch-http 会被另一层重新注册，与 base bundle 的注册造成 duplicate loader entry。
 - id: web
   config:
     searchProvider: ddg
+    fetchProvider: http

package/lib/client.js

@@ -172,7 +172,7 @@ window.__ModuleLoader__.load({
     };
     const tt = (lang) => I18N[lang === "en" ? "en" : "zh"];
     // 当前插件版本（与 lib/index.js 的 PLUGIN_VERSION 保持一致）
-    const PLUGIN_VERSION = "0.4.16";
+    const PLUGIN_VERSION = "0.4.17";
     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" },
@@ -273,6 +273,7 @@ window.__ModuleLoader__.load({
       const [open, setOpen] = react.useState(false);
       const [state, setState] = react.useState({ status: "loading" });
       const [provider, setProvider] = react.useState("bing");
+      const [safeSearch, setSafeSearch] = react.useState("off");
       const [exaKey, setExaKey] = react.useState("");
       const [tavilyKey, setTavilyKey] = react.useState("");
       const [keenableKey, setKeenableKey] = react.useState("");
@@ -303,6 +304,7 @@ window.__ModuleLoader__.load({
             if (view) {
               const v = view.value ?? {};
               setProvider(v.provider ?? "ddg");
+              setSafeSearch(v.safeSearch === "strict" || v.safeSearch === "moderate" ? v.safeSearch : "off");
               setLang(v.lang === "en" ? "en" : "zh");
               setExaKey(v.exaApiKey ?? "");
               setTavilyKey(v.tavilyApiKey ?? "");
@@ -383,6 +385,7 @@ window.__ModuleLoader__.load({
           const ops = [{ op: "set", path: ["provider"], value: provider }];
           ops.push({ op: "set", path: ["lang"], value: lang });
           ops.push({ op: "set", path: ["keyStorage"], value: keyStorage });
+          ops.push({ op: "set", path: ["safeSearch"], value: safeSearch });
           if (keyStorage !== "credentials") {
             // settings 模式：key 仍写 settings.yaml（旧行为）
             for (const [field, value] of keyFields) {
@@ -570,6 +573,31 @@ react_jsx_runtime.jsx("div", {
                       }),
                     ],
                   }),
+                  react_jsx_runtime.jsx("div", {
+                    className: "dshfs-field",
+                    children: [
+                      react_jsx_runtime.jsx("div", {
+                        className: "dshfs-label",
+                        children: "Safe search filter (adlt)",
+                      }),
+                      react_jsx_runtime.jsx("select", {
+                        className: "dshfs-select",
+                        value: safeSearch,
+                        style: { colorScheme: selectColorScheme },
+                        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("p", {
+                        className: "dshfs-hint",
+                        children: "Applies to bing (adlt), ddg, ddg-lite (adlt degree). If you see the engine's own filtering, adjust here.",
+                      }),
+                    ],
+                  }),
                   react_jsx_runtime.jsx("div", {
                     className: "dshfs-field",
                     children: [

package/lib/index.js

@@ -21,7 +21,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.16";
+const PLUGIN_VERSION = "0.4.17";
 // 检查更新的 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";
@@ -241,6 +241,9 @@ async function fetchHtmlWithRetry(url, signal) {
 async function searchDdgHtml(query, maxResults, options, signal) {
   const params = new URLSearchParams({ q: query });
   if (options?.region) params.set("kl", options.region);
+  // DDG 安全搜索：off(adlt=-1) / moderate(adlt=0) / strict(adlt=1)
+  const adlt = options?.safeSearch ?? "off";
+  params.set("adlt", adlt === "strict" ? "1" : adlt === "moderate" ? "0" : "-1");
   // DDG 时间过滤：df=d/w/m/y（只支持固定档，自定义取近似档）
   if (options?.timeRange) {
     const df = { day: "d", week: "w", month: "m", year: "y" }[approximateTimeRange(options.timeRange.days ?? 7)];
@@ -268,6 +271,8 @@ async function searchDdgHtml(query, maxResults, options, signal) {
 
 async function searchDdgLite(query, maxResults, options, signal) {
   const params = new URLSearchParams({ q: query });
+  const adlt = options?.safeSearch ?? "off";
+  params.set("adlt", adlt === "strict" ? "1" : adlt === "moderate" ? "0" : "-1");
   // DDG Lite 同样支持 df 时间过滤
   if (options?.timeRange) {
     const df = { day: "d", week: "w", month: "m", year: "y" }[approximateTimeRange(options.timeRange.days ?? 7)];
@@ -296,6 +301,10 @@ 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" });
+  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 blocks = html.match(/<li class="b_algo"[\s\S]*?<\/li>/g) ?? [];
   const sources = [];
@@ -1417,6 +1426,7 @@ const Config = z.object({
   lang: z.string().default("zh"),
   region: z.string(),
   bingMarket: z.string().default("zh-CN"),
+  safeSearch: z.string().default("off"),
   searxngInstances: z.array(z.string()),
   platforms: z.array(z.string()).default(["github", "v2ex", "bilibili", "reddit", "hn", "stackoverflow", "wikipedia", "npm"]),
   exaApiKey: z.string().role("secret"),
@@ -2011,6 +2021,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.",
           "",
           "Available engines and their requirements:",
           "- ddg (DuckDuckGo HTML) - FREE, no key (may be rate-limited)",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name":  "dsh-free-search",
-    "version":  "0.4.16",
+    "version": "0.4.18",
     "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",