dsh-free-search 0.4.17 → 0.4.19

package/README.md

@@ -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/lib/client.js

@@ -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

@@ -1,4 +1,4 @@
-import { SettingsConflictError, installSettingsSection, settingsNamespace } from "@deepseek-ai/dsh-settings";
+import { SettingsConflictError, SettingsProvider } from "@deepseek-ai/dsh-settings";
 import { defineTool } from "@deepseek-ai/dsh-tools";
 import z from "@deepseek-ai/schemastery";
 import fs from "node:fs";
@@ -15,7 +15,7 @@ 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";
 
-const FREE_SEARCH_NS = settingsNamespace("free-search");
+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"];
@@ -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 = [];
@@ -1234,7 +1243,7 @@ function makeBridgeRoutes(settings, search, testEngine, getCredentials) {
       }
       const expectedRevision = typeof body.expectedRevision === "number" ? body.expectedRevision : undefined;
       try {
-        await settings.mutate(settingsNamespace(ns), body.ops, expectedRevision);
+        await settings.mutate(ns, body.ops, expectedRevision);
       } catch (error) {
         if (error instanceof SettingsConflictError) {
           return { ok: false, code: "settings-conflict", message: error.message };
@@ -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"),
@@ -1632,14 +1642,16 @@ function apply(ctx, config) {
     },
   };
 
-  installSettingsSection(ctx, FREE_SEARCH_NS, Config, config ?? {}, {
-    setSource: (source) => {
-      current = source;
-    },
-    onChange: () => {
-      // settings 变更时刷新系统提示词（显示最新引擎）
-      if (typeof refreshPrompt === "function") refreshPrompt();
-    },
+  ctx.inject(["settings"], (sctx) => {
+    sctx.settings.installSection(ctx, FREE_SEARCH_NS, Config, config ?? {}, {
+      setSource: (source) => {
+        current = source;
+      },
+      onChange: () => {
+        // settings 变更时刷新系统提示词（显示最新引擎）
+        if (typeof refreshPrompt === "function") refreshPrompt();
+      },
+    });
   });
 
   ctx.inject(["webServer", "settings"], (sctx) => {
@@ -2011,6 +2023,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.17",
+    "version": "0.4.19",
     "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",