dsh-free-search 0.9.2 → 0.9.4

package/README.md

@@ -436,7 +436,7 @@ Search engine test:
 
 #### 离线自检断言（tools/）
 
-仓库自带 **16 个**零依赖断言脚本（合计 **495 项**），**不需要 API key、不联网、不需要测试框架**，Node ≥ 20 即可跑：
+仓库自带 **17 个**零依赖断言脚本（合计 **503 项**），**不需要 API key、不联网、不需要测试框架**，Node ≥ 20 即可跑：
 
 | 脚本 | 覆盖 | 运行（项数） |
 |---|---|---|
@@ -456,6 +456,7 @@ Search engine test:
 | `assert-killtree-win32.mjs` | Windows 子进程树终止（#74）：不再依赖 `taskkill` | `node tools/assert-killtree-win32.mjs`（8） |
 | `assert-killtree-portable.mjs` | 跨平台 `killTree` 便携版契约 | `node tools/assert-killtree-portable.mjs`（5） |
 | `assert-parallel-mcp.mjs` | Parallel MCP 引擎：25 s 超时/调用方取消覆盖**响应体读取**、共享 SSE 解析器（通知/多行帧）、6 类错误路径、REST 精确时间过滤 | `node tools/assert-parallel-mcp.mjs`（15） |
+| `assert-provider-takeover.mjs` | provider 接管：旧属性 API 与 rc.2 的 `config.*` ref 两套兼容、`settings.mutate(web)` 单批写入、显式指定的 provider 不被抢占，以及 apply 重入/重复注册不再中断 | `node tools/assert-provider-takeover.mjs`（8） |
 
 任何一个失败会以非 0 退出码结束并列出失败项；把某个旧版本文件路径作为参数传进去，可以看到修复前必红（用来证明断言不是空转）。改动发布相关逻辑后建议先跑一遍再发版。
 
@@ -912,7 +913,7 @@ Restart `dsh web` after switching to apply changes.
 
 #### Offline self-check assertions (`tools/`)
 
-**Sixteen** zero-dependency assertion scripts ship with the repo (**495 assertions** total): **no API keys, no network, no test framework**, Node ≥ 20:
+**Seventeen** zero-dependency assertion scripts ship with the repo (**503 assertions** total): **no API keys, no network, no test framework**, Node ≥ 20:
 
 | Script | Covers | Run (count) |
 |---|---|---|
@@ -932,6 +933,7 @@ Restart `dsh web` after switching to apply changes.
 | `assert-killtree-win32.mjs` | Windows process-tree termination (#74): no longer relies on `taskkill` | `node tools/assert-killtree-win32.mjs` (8) |
 | `assert-killtree-portable.mjs` | portable `killTree` contract | `node tools/assert-killtree-portable.mjs` (5) |
 | `assert-parallel-mcp.mjs` | Parallel MCP engine: the 25 s timeout / caller abort covers the **body read**, shared SSE parser (notifications, multiline frames), six error paths, REST precise time filtering | `node tools/assert-parallel-mcp.mjs` (15) |
+| `assert-provider-takeover.mjs` | provider takeover: both the legacy property API and the rc.2 `config.*` refs, a single batched `settings.mutate(web)`, and explicit foreign providers left untouched | `node tools/assert-provider-takeover.mjs` (8) |
 
 Any failure exits non-zero with the failing items listed. Passing the path of an older file shows the pre-fix failures (proving the assertions are not vacuous). Worth running before a release.
 

package/lib/client.js

@@ -388,7 +388,7 @@ window.__ModuleLoader__.load({
     };
     const tt = (lang) => I18N[lang === "en" ? "en" : "zh"];
     // 当前插件版本（与 lib/index.js 的 PLUGIN_VERSION 保持一致；跟随上游 v0.7.5）
-    const PLUGIN_VERSION = "0.9.2";
+    const PLUGIN_VERSION = "0.9.4";
     const ENGINES = [
       { id: "auto", label: "Auto · 智能路由", badge: "AUTO", link: null },
       { id: "multi", label: "Multi Search · 多引擎", badge: "MULTI", link: null },

package/lib/index.js

@@ -88,6 +88,8 @@ const MARKET_TO_LANG = {
 // declares), not the old `$DSH_HOME/settings.yaml` section name.
 const FREE_SEARCH_NS = "web-search-free";
 const BRIDGE_PREFIX = "/api/dsh-free-search-settings";
+// apply() 重入保护：见 apply 顶部的注释。
+const appliedContexts = new WeakSet();
 // 意见 A：zhihu_global / zhihu_site 需要 ZHIHU_API_KEY，不属于免 key 引擎（不得进入 FREE_ENGINES）
 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", "serply", "deepseek-official", "deepseek-tools", "you", "baidu", "kimi", "aliyun", "doubao", "tinyfish", "jina", "zhihu_global", "zhihu_site", "openai", "gemini", "claude"];
@@ -245,7 +247,7 @@ function routeEngines(query, { timeRange, disabledEngines = [], fallbackOrder =
 }
 
 // 当前插件版本（发布时与 package.json 同步；跟随上游 v0.7.5，不在 PR 里 bump）
-const PLUGIN_VERSION = "0.9.2";
+const PLUGIN_VERSION = "0.9.4";
 // 检查更新的 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";
@@ -3420,6 +3422,26 @@ function resolveConfig(config) {
 }
 
 function apply(ctx, config) {
+  // 重入保护：同一个 ctx 上 apply 只跑一次。rc.2 的 boot 里出现过未 dispose 的重入，
+  // 会撞上下面的重复注册（provider / route），导致 entry 反复失败把 boot 拖死。
+  if (appliedContexts.has(ctx)) {
+    ctx.logger?.warn?.("free-search: apply() already ran on this context — skipping the re-entry");
+    return;
+  }
+  appliedContexts.add(ctx);
+  // 注册类调用统一做幂等：已存在 / 重复就跳过并记日志，而不是抛错中断 apply。
+  const registerOnce = (call, provider, label) => {
+    try {
+      return call();
+    } catch (error) {
+      const message = String(error?.message ?? error);
+      if (error?.code === "WEB_DUPLICATE_PROVIDER" || /already registered|duplicate/i.test(message)) {
+        ctx.logger?.warn?.(`free-search: ${label} "${provider.id}" is already registered — reusing it`);
+        return () => {};
+      }
+      throw error;
+    }
+  };
   const current = () => resolveConfig(config);
   const logger = ctx.logger;
   // credentials 服务可能晚于本插件挂载（跨 bundle 顺序），运行期动态获取而不是 apply 时缓存
@@ -3932,7 +3954,7 @@ function apply(ctx, config) {
           return runEngineTest(engine, query, timeRange);
         },
         getCredentials
-      ).map((route) => sctx.webServer.register(route));
+      ).map((route) => registerOnce(() => sctx.webServer.register(route), { id: route.path }, "bridge route"));
       return () => {
         for (const dispose of disposers) dispose();
       };
@@ -3943,50 +3965,87 @@ function apply(ctx, config) {
   // dsh-base bundle 会在 `- id: web` 里把它设为搜索的出厂默认值。
   const OFFICIAL_SEARCH_PROVIDER_ID = "deepseek-official";
 
-  ctx.web.registerSearchProvider(provider);
+  // provider 选择的读取与接管。DSH 0.2.1-rc.2 起，web 的 provider 选择收进了
+  // config 的 volatile ref（config.searchProvider / config.fetchProvider），
+  // 只能通过 settings.mutate 写；更早的版本是 searchProviderId / fetchProviderId 属性。
+  // 两套都兼容，否则接管会写到一个没人读的属性上，搜索静默回退官方 provider。
+  const providerSelection = (web, key) => {
+    const ref = web.config?.[key];
+    if (ref !== undefined && ref !== null && typeof ref.get === "function") return { ref, current: ref.get() };
+    return { ref: null, current: web[key === "searchProvider" ? "searchProviderId" : "fetchProviderId"] };
+  };
+  // ref 形态（rc.2+）把写入攒进 ops；属性形态（旧版）就地写。
+  const takeOverOps = (web, key, id, ops) => {
+    const { ref } = providerSelection(web, key);
+    if (ref !== null) {
+      ops.push({ op: "set", path: [key], value: id });
+      return;
+    }
+    if (key === "searchProvider") web.searchProviderId = id;
+    else web.fetchProviderId = id;
+  };
+
+  registerOnce(() => ctx.web.registerSearchProvider(provider), provider, "search provider");
 
   // web_fetch 质量链接管：注册 fs-quality-fetch（直连 → exa contents → firecrawl → crawl4ai），
   // 未设置 fetchProviderId、或仍是出厂默认 http 时接管；已被显式指向其他 provider 时不抢占。
   // 与 web_search 的接管规则同构：运行时兜底，不依赖 bundle patch 是否落地。
   const fetchProvider = createFetchProvider({ resolveApiKey, logger });
-  ctx.web.registerFetchProvider(fetchProvider);
-  if (!ctx.web.fetchProviderId || ctx.web.fetchProviderId === "http") {
-    const prevFetch = ctx.web.fetchProviderId;
-    ctx.web.fetchProviderId = fetchProvider.id;
-    logger.info(
-      prevFetch === undefined || prevFetch === null
-        ? `free-search: web.fetchProvider was unset, taking over as "${fetchProvider.id}" (direct → exa → firecrawl → crawl4ai)`
-        : `free-search: taking over from the default fetch provider "${prevFetch}" as "${fetchProvider.id}" (direct → exa → firecrawl → crawl4ai)`
-    );
-  } else if (ctx.web.fetchProviderId !== fetchProvider.id) {
-    logger.warn(
-      `free-search: fetch is served by provider "${ctx.web.fetchProviderId}", not "${fetchProvider.id}" — web_fetch keeps its current provider. ` +
-        `To use this plugin's fetch chain, set this in the profile's cordis.patch.yml:\n` +
-        `- id: web\n  config:\n    fetchProvider: ${fetchProvider.id}`
-    );
-  }
+  registerOnce(() => ctx.web.registerFetchProvider(fetchProvider), fetchProvider, "fetch provider");
 
-  // 接管规则（运行时兜底，不依赖 bundle patch 是否落地）：
-  //  - 未设置 searchProvider：接管；
-  //  - 仍是出厂默认的官方搜索 deepseek-official：接管（安装本插件就是为了替掉它）；
-  //  - 已被显式指向其他 provider：不抢占，只警告并给出切换用的 YAML。
-  // 这样即使用户把插件当普通依赖手工安装（bundle patch 未生效）、或 profile patch
-  // 整体覆盖 config 抹掉了 searchProvider，搜索也不会静默退回官方导致"余额不足"。
-  if (!ctx.web.searchProviderId || ctx.web.searchProviderId === OFFICIAL_SEARCH_PROVIDER_ID) {
-    const previous = ctx.web.searchProviderId;
-    ctx.web.searchProviderId = provider.id;
-    logger.info(
-      previous === undefined || previous === null
-        ? `free-search: web.searchProvider was unset, taking over as "${provider.id}"`
-        : `free-search: taking over from the default provider "${previous}" as "${provider.id}"`
-    );
-  } else if (ctx.web.searchProviderId !== provider.id) {
-    logger.warn(
-      `free-search: search is served by provider "${ctx.web.searchProviderId}", not "${provider.id}" — web_search will NOT use this plugin. ` +
-        `Add this to the profile's cordis.patch.yml (patch replaces the whole entry config, so keep any other web.* fields):\n` +
-        `- id: web\n  config:\n    searchProvider: ${provider.id}\n    fetchProvider: http`
-    );
-  }
+  // 接管必须先等 settings 服务就绪：rc.2 起 provider 选择是 config 的 volatile ref,
+  // 只能通过 settings.mutate 写；apply 期间 settings 尚未挂载，直接取会永远拿不到。
+  // 两处接管合并成一次 mutate —— 同一 tick 里连发两次，第二次会被设置文档的版本号顶掉。
+  ctx.inject(["settings"], (sctx) => {
+    const ops = [];
+
+    const fetchSelection = providerSelection(ctx.web, "fetchProvider");
+    if (!fetchSelection.current || fetchSelection.current === "http") {
+      takeOverOps(ctx.web, "fetchProvider", fetchProvider.id, ops);
+      logger.info(
+        fetchSelection.current === undefined || fetchSelection.current === null
+          ? `free-search: web.fetchProvider was unset, taking over as "${fetchProvider.id}" (direct → exa → firecrawl → crawl4ai)`
+          : `free-search: taking over from the default fetch provider "${fetchSelection.current}" as "${fetchProvider.id}" (direct → exa → firecrawl → crawl4ai)`
+      );
+    } else if (fetchSelection.current !== fetchProvider.id) {
+      logger.warn(
+        `free-search: fetch is served by provider "${fetchSelection.current}", not "${fetchProvider.id}" — web_fetch keeps its current provider. ` +
+          `To use this plugin's fetch chain, set this in the profile's cordis.patch.yml:\n` +
+          `- id: web\n  config:\n    fetchProvider: ${fetchProvider.id}`
+      );
+    }
+
+    // 接管规则（运行时兜底，不依赖 bundle patch 是否落地）：
+    //  - 未设置 searchProvider：接管；
+    //  - 仍是出厂默认的官方搜索 deepseek-official：接管（安装本插件就是为了替掉它）；
+    //  - 已被显式指向其他 provider：不抢占，只警告并给出切换用的 YAML。
+    // 这样即使用户把插件当普通依赖手工安装（bundle patch 未生效）、或 profile patch
+    // 整体覆盖 config 抹掉了 searchProvider，搜索也不会静默退回官方导致"余额不足"。
+    const searchSelection = providerSelection(ctx.web, "searchProvider");
+    if (!searchSelection.current || searchSelection.current === OFFICIAL_SEARCH_PROVIDER_ID) {
+      takeOverOps(ctx.web, "searchProvider", provider.id, ops);
+      logger.info(
+        searchSelection.current === undefined || searchSelection.current === null
+          ? `free-search: web.searchProvider was unset, taking over as "${provider.id}"`
+          : `free-search: taking over from the default provider "${searchSelection.current}" as "${provider.id}"`
+      );
+    } else if (searchSelection.current !== provider.id) {
+      logger.warn(
+        `free-search: search is served by provider "${searchSelection.current}", not "${provider.id}" — web_search will NOT use this plugin. ` +
+          `Add this to the profile's cordis.patch.yml (patch replaces the whole entry config, so keep any other web.* fields):\n` +
+          `- id: web\n  config:\n    searchProvider: ${provider.id}\n    fetchProvider: http`
+      );
+    }
+
+    if (ops.length === 0) return;
+    if (typeof sctx.settings?.mutate !== "function") {
+      logger.warn("free-search: cannot take over the web providers — the settings service is unavailable");
+      return;
+    }
+    void Promise.resolve(sctx.settings.mutate("web", ops)).catch((error) => {
+      logger.warn(`free-search: failed to take over the web providers (${error?.message ?? error})`);
+    });
+  });
 
   // 测试工具：让 agent 逐个测试所有搜索引擎，报告可用性
   const runEngineTest = async (engine, query, timeRange, maxResults = 2) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-free-search",
-  "version": "0.9.2",
+  "version": "0.9.4",
   "description": "Free web search for DeepSeek Harness: 27 engines (Bing/DuckDuckGo/AnySearch/SearXNG/Exa/Tavily/Keenable/Firecrawl/Parallel keyless; Zhihu global/site via MCP and Perplexity/SerpBase/DeepSeek (official + native tools/search)/You.com/Baidu/Kimi/Aliyun/Doubao with key; OpenAI/Gemini/Claude model built-in search, explicit-only) + auto smart routing + global engine enable/disable & fallback priority + editable zh/en language pools + multi mode (parallel full language-pool merge) + multi_search cross-source tool + failure-aware fallback (quota/auth cooldown, transient retry, fallbackOn) + time filtering + platform search + domain blocklist (blockedDomains) + web_fetch, with web settings UI.",
   "type": "module",
   "main": "lib/index.js",