@dcrays/web-search 0.1.1 → 0.1.3-beta.0

package/README.md

@@ -1,5 +1,5 @@
 # @dcrays/web-search
 
-书灵墨宝的 DSH 联网搜索插件。加载后注册 `web_search` 工具，把模型搜索请求映射到配置的 HTTP API。
+书灵墨宝的 DSH 联网搜索插件。加载后注册 `web_search` 工具，把模型搜索请求映射到搜索网关。
 
-本包对应 `mbh-chat` 环境，端点地址从 Cordis 插件配置读取。
+单一发布包同时适用于生产与测试桌面：运行时从 `mobook.json` 根级 `servers.apiGatewayBaseUrl` 和 `account` 读取搜索网关与签名身份。

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dcrays/web-search",
-  "version": "0.1.1",
-  "description": "DeepSeek Harness web search plugin for Mobook (production)",
+  "version": "0.1.3-beta.0",
+  "description": "DeepSeek Harness web search plugin for Mobook",
   "type": "module",
   "main": "plugin/index.js",
   "types": "plugin/index.d.ts",

package/plugin/index.d.ts

@@ -2,13 +2,10 @@ import type { Context } from '@deepseek-ai/cordis';
 import { Service } from '@deepseek-ai/cordis';
 import z from '@deepseek-ai/schemastery';
 import { type WebSearchRequest, type WebSearchResult } from '../src/index.js';
-export { DEFAULT_BUILD_ENV } from '../src/config/env-config.js';
 export declare const name = "mbh-web-search";
 export declare const inject: string[];
 export interface Config {
     enabled: boolean;
-    endpointUrl: string;
-    metadataPath: string;
     timeoutMs: number;
     maxResponseBytes: number;
     defaultCount: number;
@@ -27,5 +24,5 @@ export declare class MbhWebSearchService extends Service {
     isEnabled(): boolean;
     search(request: WebSearchRequest, signal?: AbortSignal): Promise<WebSearchResult>;
 }
-export declare function resolveMetadataPath(configuredPath: string): string;
+export declare function resolveMetadataPath(): string;
 export declare function apply(ctx: Context, config: Config): void;

package/plugin/index.js

@@ -1,12 +1,12 @@
 import { createRequire as __mobookCreateRequire } from 'node:module'; const require = __mobookCreateRequire(import.meta.url);
 
-// dist-npm/plugin/index.js
+// dist/plugin/index.js
 import { resolve } from "node:path";
 import { Service } from "@deepseek-ai/cordis";
 import { resolveDshHome } from "@deepseek-ai/dsh-home-paths";
 import z from "@deepseek-ai/schemastery";
 
-// dist-npm/src/api-client.js
+// dist/src/api-client.js
 import { createHmac, randomUUID } from "node:crypto";
 import { readFile } from "node:fs/promises";
 var WebSearchApiError = class extends Error {
@@ -27,20 +27,26 @@ function record(value) {
 function nonEmptyString(value) {
   return typeof value === "string" && value.trim() ? value.trim() : void 0;
 }
-function resolveSearchCredentials(metadata, channelId, legacyChannelId) {
+function resolveSearchCredentials(metadata) {
   const root = record(metadata);
-  const plugins = record(root?.plugins);
   const hardware = record(root?.hardware);
+  const account = record(root?.account);
   const deviceId = nonEmptyString(hardware?.fingerprint);
-  for (const plugin of [record(plugins?.[channelId]), record(plugins?.[legacyChannelId])]) {
-    const userIdValue = plugin?.userId;
-    const userId = typeof userIdValue === "number" && Number.isSafeInteger(userIdValue) ? String(userIdValue) : nonEmptyString(userIdValue);
-    const botToken = nonEmptyString(plugin?.botToken);
-    if (userId && botToken && deviceId)
-      return { userId, botToken, deviceId };
-  }
+  const userIdValue = account?.userId;
+  const userId = typeof userIdValue === "number" && Number.isSafeInteger(userIdValue) ? String(userIdValue) : nonEmptyString(userIdValue);
+  const botToken = nonEmptyString(account?.botToken);
+  if (userId && botToken && deviceId)
+    return { userId, botToken, deviceId };
   throw new WebSearchApiError("MISSING_CREDENTIALS", "\u641C\u7D22\u670D\u52A1\u5C1A\u672A\u51C6\u5907\u597D\uFF0C\u8BF7\u786E\u8BA4\u5DF2\u767B\u5F55\u58A8\u5B9D\u5E76\u5B8C\u6210\u5BA2\u6237\u7AEF\u521D\u59CB\u5316\u540E\u91CD\u8BD5\u3002");
 }
+function resolveSearchEndpoint(metadata) {
+  const baseUrl = nonEmptyString(record(record(metadata)?.servers)?.apiGatewayBaseUrl);
+  if (!baseUrl) {
+    throw new WebSearchApiError("INVALID_CONFIG", "\u641C\u7D22\u670D\u52A1\u5730\u5740\u5C1A\u672A\u914D\u7F6E\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u68C0\u67E5\u5BA2\u6237\u7AEF\u914D\u7F6E\u3002");
+  }
+  const base = toEndpoint(baseUrl);
+  return new URL("/apikey-manage/api/search", base);
+}
 function requestSignal(signal, timeoutMs) {
   const timeout = AbortSignal.timeout(timeoutMs);
   return signal ? AbortSignal.any([signal, timeout]) : timeout;
@@ -125,23 +131,26 @@ function parseResponse(text, fallbackQuery, service) {
   }
   return result;
 }
+function toEndpoint(endpointUrl) {
+  let endpoint;
+  try {
+    endpoint = new URL(endpointUrl);
+  } catch (error) {
+    throw new WebSearchApiError("INVALID_CONFIG", "\u641C\u7D22\u670D\u52A1\u5730\u5740\u914D\u7F6E\u4E0D\u6B63\u786E\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u68C0\u67E5\u63D2\u4EF6\u914D\u7F6E\u3002", { cause: error });
+  }
+  if (!["http:", "https:"].includes(endpoint.protocol)) {
+    throw new WebSearchApiError("INVALID_CONFIG", "\u641C\u7D22\u670D\u52A1\u5730\u5740\u4EC5\u652F\u6301 HTTP \u6216 HTTPS\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u68C0\u67E5\u63D2\u4EF6\u914D\u7F6E\u3002");
+  }
+  return endpoint;
+}
 var WebSearchApiClient = class {
   config;
-  endpoint;
   fetchImpl;
   readFileImpl;
   nowSeconds;
   nonce;
   constructor(config, dependencies = {}) {
     this.config = config;
-    try {
-      this.endpoint = new URL(config.endpointUrl);
-    } catch (error) {
-      throw new WebSearchApiError("INVALID_CONFIG", "\u641C\u7D22\u670D\u52A1\u5730\u5740\u914D\u7F6E\u4E0D\u6B63\u786E\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u68C0\u67E5\u63D2\u4EF6\u914D\u7F6E\u3002", { cause: error });
-    }
-    if (!["http:", "https:"].includes(this.endpoint.protocol)) {
-      throw new WebSearchApiError("INVALID_CONFIG", "\u641C\u7D22\u670D\u52A1\u5730\u5740\u4EC5\u652F\u6301 HTTP \u6216 HTTPS\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u68C0\u67E5\u63D2\u4EF6\u914D\u7F6E\u3002");
-    }
     for (const [name2, value] of [
       ["timeoutMs", config.timeoutMs],
       ["maxResponseBytes", config.maxResponseBytes],
@@ -176,9 +185,12 @@ var WebSearchApiClient = class {
     try {
       metadata = JSON.parse(await this.readFileImpl(this.config.metadataPath, "utf8"));
     } catch (error) {
-      throw new WebSearchApiError("MISSING_CREDENTIALS", "\u6682\u65F6\u65E0\u6CD5\u8BFB\u53D6\u58A8\u5B9D\u8FD0\u884C\u914D\u7F6E\uFF0C\u8BF7\u786E\u8BA4\u5BA2\u6237\u7AEF\u5DF2\u6B63\u5E38\u521D\u59CB\u5316\u540E\u91CD\u8BD5\u3002", { cause: error });
+      throw new WebSearchApiError("MISSING_CREDENTIALS", "\u6682\u65F6\u65E0\u6CD5\u8BFB\u53D6\u58A8\u5B9D\u8FD0\u884C\u914D\u7F6E\uFF0C\u8BF7\u786E\u8BA4\u5BA2\u6237\u7AEF\u5DF2\u6B63\u5E38\u521D\u59CB\u5316\u540E\u91CD\u8BD5\u3002", {
+        cause: error
+      });
     }
-    const credentials = resolveSearchCredentials(metadata, this.config.channelId, this.config.legacyChannelId);
+    const endpoint = resolveSearchEndpoint(metadata);
+    const credentials = resolveSearchCredentials(metadata);
     const call = async (service) => {
       const timestamp = String(this.nowSeconds());
       const nonce = this.nonce();
@@ -207,7 +219,7 @@ ${nonce}`;
       const effectiveSignal = requestSignal(signal, this.config.timeoutMs);
       let response;
       try {
-        response = await this.fetchImpl(this.endpoint, {
+        response = await this.fetchImpl(endpoint, {
           method: "POST",
           headers: { accept: "application/json", "content-type": "application/json" },
           body: JSON.stringify(body),
@@ -221,7 +233,9 @@ ${nonce}`;
             cause: error
           });
         }
-        throw new WebSearchApiError("NETWORK_ERROR", `\u6682\u65F6\u65E0\u6CD5\u8FDE\u63A5${searchServiceLabel(service)}\uFF0C\u8BF7\u68C0\u67E5\u7F51\u7EDC\u540E\u91CD\u8BD5\u3002`, { cause: error });
+        throw new WebSearchApiError("NETWORK_ERROR", `\u6682\u65F6\u65E0\u6CD5\u8FDE\u63A5 ${searchServiceLabel(service)}\uFF0C\u8BF7\u68C0\u67E5\u7F51\u7EDC\u540E\u91CD\u8BD5\u3002`, {
+          cause: error
+        });
       }
       const text = await responseText(response, this.config.maxResponseBytes);
       if (!response.ok) {
@@ -230,23 +244,23 @@ ${nonce}`;
       return parseResponse(text, query, service);
     };
     try {
-      const tavily = await call("tavily_search");
-      if (tavily.results.length > 0)
-        return tavily;
+      const bocha = await call("bocha_search");
+      if (bocha.results.length > 0)
+        return bocha;
     } catch (error) {
       if (signal?.aborted)
         throw error;
     }
-    return call("bocha_search");
+    return call("tavily_search");
   }
 };
 
-// dist-npm/src/tools.js
+// dist/src/tools.js
 import { defineTool } from "@deepseek-ai/dsh-tools";
 function createWebSearchTool(search) {
   return defineTool({
     name: "web_search",
-    description: "Search the public web with the configured Mobook Bocha search service. Use this for current information, source discovery, fact verification, news, weather, prices, schedules, or any question that requires internet access. Cite result URLs when answering.",
+    description: "Search the public web with Mobook search services. Use Bocha first and fall back to Tavily when Bocha fails or returns no results. Use this for current information, source discovery, fact verification, news, weather, prices, schedules, or any question that requires internet access. In the final answer, summarize first, then present useful sources as a numbered list with Markdown links in the form [title | siteName](url), followed by a concise snippet-based explanation. Never expose the raw JSON or internal provider fields.",
     parameters: {
       query: { type: "string", required: true, description: "A focused web search query." },
       count: { type: "integer", description: "Number of results to return. Defaults to 5; maximum 20." },
@@ -274,34 +288,14 @@ function createWebSearchTool(search) {
   });
 }
 
-// dist-npm/src/index.js
+// dist/src/index.js
 var MBH_WEB_SEARCH_SERVICE_KEY = "mbhWebSearch";
 
-// dist-npm/src/config/env-config.js
-var ENV_CONFIG = {
-  production: {
-    packageName: "@dcrays/web-search",
-    channelId: "mbh-chat",
-    legacyChannelId: "mbhchat",
-    endpointUrl: "https://api-gateway.shuwenda.com/apikey-manage/api/search"
-  },
-  test: {
-    packageName: "@dcrays/web-search-test",
-    channelId: "mbh-chat-test",
-    legacyChannelId: "mbhchat-test",
-    endpointUrl: "https://api-gateway.shuwenda.icu/apikey-manage/api/search"
-  }
-};
-var DEFAULT_BUILD_ENV = "production";
-var ACTIVE_ENV_CONFIG = ENV_CONFIG[DEFAULT_BUILD_ENV];
-
-// dist-npm/plugin/index.js
+// dist/plugin/index.js
 var name = "@dcrays/web-search";
 var inject = ["tools"];
 var Config = z.object({
   enabled: z.boolean().default(true),
-  endpointUrl: z.string().default(""),
-  metadataPath: z.string().default(""),
   timeoutMs: z.natural().min(1).default(3e4),
   maxResponseBytes: z.natural().min(1).default(1024 * 1024),
   defaultCount: z.natural().min(1).default(5),
@@ -316,10 +310,7 @@ var MbhWebSearchService = class extends Service {
     if (!config.enabled)
       return;
     this.operations = new WebSearchApiClient({
-      endpointUrl: config.endpointUrl.trim() || ACTIVE_ENV_CONFIG.endpointUrl,
-      metadataPath: resolveMetadataPath(config.metadataPath),
-      channelId: ACTIVE_ENV_CONFIG.channelId,
-      legacyChannelId: ACTIVE_ENV_CONFIG.legacyChannelId,
+      metadataPath: resolveMetadataPath(),
       timeoutMs: config.timeoutMs,
       maxResponseBytes: config.maxResponseBytes,
       defaultCount: config.defaultCount,
@@ -336,8 +327,8 @@ var MbhWebSearchService = class extends Service {
     return this.operations.search(request, signal);
   }
 };
-function resolveMetadataPath(configuredPath) {
-  return configuredPath.trim() || resolve(resolveDshHome(), "mobook.json");
+function resolveMetadataPath() {
+  return resolve(resolveDshHome(), "mobook.json");
 }
 function apply(ctx, config) {
   const service = new MbhWebSearchService(ctx, config);
@@ -345,13 +336,12 @@ function apply(ctx, config) {
     if (!service.isEnabled())
       return () => void 0;
     const unregister = ctx.tools.register(createWebSearchTool(service));
-    ctx.logger(name).info("%s plugin loaded with web_search tool for %s", name, DEFAULT_BUILD_ENV);
+    ctx.logger(name).info("%s plugin loaded with web_search tool", name);
     return unregister;
   }, `${name} lifecycle`);
 }
 export {
   Config,
-  DEFAULT_BUILD_ENV,
   MbhWebSearchService,
   apply,
   inject,

package/src/api-client.d.ts

@@ -24,10 +24,7 @@ export interface WebSearchOperations {
     search(request: WebSearchRequest, signal?: AbortSignal): Promise<WebSearchResult>;
 }
 export interface WebSearchApiClientConfig {
-    endpointUrl: string;
     metadataPath: string;
-    channelId: string;
-    legacyChannelId: string;
     timeoutMs: number;
     maxResponseBytes: number;
     defaultCount: number;
@@ -50,10 +47,10 @@ interface SearchCredentials {
     botToken: string;
     deviceId: string;
 }
-export declare function resolveSearchCredentials(metadata: unknown, channelId: string, legacyChannelId: string): SearchCredentials;
+export declare function resolveSearchCredentials(metadata: unknown): SearchCredentials;
+export declare function resolveSearchEndpoint(metadata: unknown): URL;
 export declare class WebSearchApiClient implements WebSearchOperations {
     private readonly config;
-    private readonly endpoint;
     private readonly fetchImpl;
     private readonly readFileImpl;
     private readonly nowSeconds;

package/src/api-client.js

@@ -18,20 +18,26 @@ function record(value) {
 function nonEmptyString(value) {
     return typeof value === 'string' && value.trim() ? value.trim() : undefined;
 }
-export function resolveSearchCredentials(metadata, channelId, legacyChannelId) {
+export function resolveSearchCredentials(metadata) {
     const root = record(metadata);
-    const plugins = record(root?.plugins);
     const hardware = record(root?.hardware);
+    const account = record(root?.account);
     const deviceId = nonEmptyString(hardware?.fingerprint);
-    for (const plugin of [record(plugins?.[channelId]), record(plugins?.[legacyChannelId])]) {
-        const userIdValue = plugin?.userId;
-        const userId = typeof userIdValue === 'number' && Number.isSafeInteger(userIdValue) ? String(userIdValue) : nonEmptyString(userIdValue);
-        const botToken = nonEmptyString(plugin?.botToken);
-        if (userId && botToken && deviceId)
-            return { userId, botToken, deviceId };
-    }
+    const userIdValue = account?.userId;
+    const userId = typeof userIdValue === 'number' && Number.isSafeInteger(userIdValue) ? String(userIdValue) : nonEmptyString(userIdValue);
+    const botToken = nonEmptyString(account?.botToken);
+    if (userId && botToken && deviceId)
+        return { userId, botToken, deviceId };
     throw new WebSearchApiError('MISSING_CREDENTIALS', '搜索服务尚未准备好，请确认已登录墨宝并完成客户端初始化后重试。');
 }
+export function resolveSearchEndpoint(metadata) {
+    const baseUrl = nonEmptyString(record(record(metadata)?.servers)?.apiGatewayBaseUrl);
+    if (!baseUrl) {
+        throw new WebSearchApiError('INVALID_CONFIG', '搜索服务地址尚未配置，请联系管理员检查客户端配置。');
+    }
+    const base = toEndpoint(baseUrl);
+    return new URL('/apikey-manage/api/search', base);
+}
 function requestSignal(signal, timeoutMs) {
     const timeout = AbortSignal.timeout(timeoutMs);
     return signal ? AbortSignal.any([signal, timeout]) : timeout;
@@ -118,24 +124,27 @@ function parseResponse(text, fallbackQuery, service) {
     }
     return result;
 }
+function toEndpoint(endpointUrl) {
+    let endpoint;
+    try {
+        endpoint = new URL(endpointUrl);
+    }
+    catch (error) {
+        throw new WebSearchApiError('INVALID_CONFIG', '搜索服务地址配置不正确，请联系管理员检查插件配置。', { cause: error });
+    }
+    if (!['http:', 'https:'].includes(endpoint.protocol)) {
+        throw new WebSearchApiError('INVALID_CONFIG', '搜索服务地址仅支持 HTTP 或 HTTPS，请联系管理员检查插件配置。');
+    }
+    return endpoint;
+}
 export class WebSearchApiClient {
     config;
-    endpoint;
     fetchImpl;
     readFileImpl;
     nowSeconds;
     nonce;
     constructor(config, dependencies = {}) {
         this.config = config;
-        try {
-            this.endpoint = new URL(config.endpointUrl);
-        }
-        catch (error) {
-            throw new WebSearchApiError('INVALID_CONFIG', '搜索服务地址配置不正确，请联系管理员检查插件配置。', { cause: error });
-        }
-        if (!['http:', 'https:'].includes(this.endpoint.protocol)) {
-            throw new WebSearchApiError('INVALID_CONFIG', '搜索服务地址仅支持 HTTP 或 HTTPS，请联系管理员检查插件配置。');
-        }
         for (const [name, value] of [
             ['timeoutMs', config.timeoutMs],
             ['maxResponseBytes', config.maxResponseBytes],
@@ -171,9 +180,12 @@ export class WebSearchApiClient {
             metadata = JSON.parse(await this.readFileImpl(this.config.metadataPath, 'utf8'));
         }
         catch (error) {
-            throw new WebSearchApiError('MISSING_CREDENTIALS', '暂时无法读取墨宝运行配置，请确认客户端已正常初始化后重试。', { cause: error });
+            throw new WebSearchApiError('MISSING_CREDENTIALS', '暂时无法读取墨宝运行配置，请确认客户端已正常初始化后重试。', {
+                cause: error
+            });
         }
-        const credentials = resolveSearchCredentials(metadata, this.config.channelId, this.config.legacyChannelId);
+        const endpoint = resolveSearchEndpoint(metadata);
+        const credentials = resolveSearchCredentials(metadata);
         const call = async (service) => {
             const timestamp = String(this.nowSeconds());
             const nonce = this.nonce();
@@ -199,7 +211,7 @@ export class WebSearchApiClient {
             const effectiveSignal = requestSignal(signal, this.config.timeoutMs);
             let response;
             try {
-                response = await this.fetchImpl(this.endpoint, {
+                response = await this.fetchImpl(endpoint, {
                     method: 'POST',
                     headers: { accept: 'application/json', 'content-type': 'application/json' },
                     body: JSON.stringify(body),
@@ -214,7 +226,9 @@ export class WebSearchApiClient {
                         cause: error
                     });
                 }
-                throw new WebSearchApiError('NETWORK_ERROR', `暂时无法连接${searchServiceLabel(service)}，请检查网络后重试。`, { cause: error });
+                throw new WebSearchApiError('NETWORK_ERROR', `暂时无法连接 ${searchServiceLabel(service)}，请检查网络后重试。`, {
+                    cause: error
+                });
             }
             const text = await responseText(response, this.config.maxResponseBytes);
             if (!response.ok) {
@@ -223,14 +237,14 @@ export class WebSearchApiClient {
             return parseResponse(text, query, service);
         };
         try {
-            const tavily = await call('tavily_search');
-            if (tavily.results.length > 0)
-                return tavily;
+            const bocha = await call('bocha_search');
+            if (bocha.results.length > 0)
+                return bocha;
         }
         catch (error) {
             if (signal?.aborted)
                 throw error;
         }
-        return call('bocha_search');
+        return call('tavily_search');
     }
 }

package/src/config/env-config.d.ts

@@ -1,10 +1 @@
-export type BuildEnv = 'production' | 'test';
-export interface EnvConfig {
-    packageName: string;
-    channelId: string;
-    legacyChannelId: string;
-    endpointUrl: string;
-}
-export declare const ENV_CONFIG: Record<BuildEnv, EnvConfig>;
-export declare const DEFAULT_BUILD_ENV: BuildEnv;
-export declare const ACTIVE_ENV_CONFIG: EnvConfig;
+export declare const PACKAGE_NAME = "@dcrays/web-search";

package/src/config/env-config.js

@@ -1,16 +1 @@
-export const ENV_CONFIG = {
-    production: {
-        packageName: '@dcrays/web-search',
-        channelId: 'mbh-chat',
-        legacyChannelId: 'mbhchat',
-        endpointUrl: 'https://api-gateway.shuwenda.com/apikey-manage/api/search'
-    },
-    test: {
-        packageName: '@dcrays/web-search-test',
-        channelId: 'mbh-chat-test',
-        legacyChannelId: 'mbhchat-test',
-        endpointUrl: 'https://api-gateway.shuwenda.icu/apikey-manage/api/search'
-    }
-};
-export const DEFAULT_BUILD_ENV = 'production';
-export const ACTIVE_ENV_CONFIG = ENV_CONFIG[DEFAULT_BUILD_ENV];
+export const PACKAGE_NAME = '@dcrays/web-search';

package/src/tools.js

@@ -2,7 +2,7 @@ import { defineTool } from '@deepseek-ai/dsh-tools';
 export function createWebSearchTool(search) {
     return defineTool({
         name: 'web_search',
-        description: 'Search the public web with the configured Mobook Bocha search service. Use this for current information, source discovery, fact verification, news, weather, prices, schedules, or any question that requires internet access. Cite result URLs when answering.',
+        description: 'Search the public web with Mobook search services. Use Bocha first and fall back to Tavily when Bocha fails or returns no results. Use this for current information, source discovery, fact verification, news, weather, prices, schedules, or any question that requires internet access. In the final answer, summarize first, then present useful sources as a numbered list with Markdown links in the form [title | siteName](url), followed by a concise snippet-based explanation. Never expose the raw JSON or internal provider fields.',
         parameters: {
             query: { type: 'string', required: true, description: 'A focused web search query.' },
             count: { type: 'integer', description: 'Number of results to return. Defaults to 5; maximum 20.' },