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

package/README.md

@@ -2,4 +2,4 @@
 
 书灵墨宝的 DSH 联网搜索插件。加载后注册 `web_search` 工具，把模型搜索请求映射到搜索网关。
 
-单一发布包同时适用于生产与测试桌面：运行时根据 `mobook.json` 中记录的环境选择搜索网关与 MBHChat 凭据通道；`endpointUrl` 可在 Cordis 插件配置中覆盖。
+单一发布包同时适用于生产与测试桌面：运行时从 `mobook.json` 根级 `servers.apiGatewayBaseUrl` 和 `account` 读取搜索网关与签名身份。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcrays/web-search",
-  "version": "0.1.2",
+  "version": "0.1.3-beta.0",
   "description": "DeepSeek Harness web search plugin for Mobook",
   "type": "module",
   "main": "plugin/index.js",

package/plugin/index.d.ts

@@ -6,8 +6,6 @@ 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;
@@ -26,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,33 +1,14 @@
 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";
-
-// dist-npm/src/config/env-config.js
-var ENV_CONFIG = {
-  production: {
-    channelId: "mbh-chat",
-    legacyChannelId: "mbhchat",
-    endpointUrl: "https://api-gateway.shuwenda.com/apikey-manage/api/search"
-  },
-  test: {
-    channelId: "mbh-chat-test",
-    legacyChannelId: "mbhchat-test",
-    endpointUrl: "https://api-gateway.shuwenda.icu/apikey-manage/api/search"
-  }
-};
-function resolveWebSearchEnvironment(value) {
-  return value === "production" ? "production" : "test";
-}
-
-// dist-npm/src/api-client.js
 var WebSearchApiError = class extends Error {
   code;
   constructor(code, message, options) {
@@ -46,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;
@@ -158,27 +145,12 @@ function toEndpoint(endpointUrl) {
 }
 var WebSearchApiClient = class {
   config;
-  environments;
   fetchImpl;
   readFileImpl;
   nowSeconds;
   nonce;
   constructor(config, dependencies = {}) {
     this.config = config;
-    const environments = config.environments ?? ENV_CONFIG;
-    const override = config.endpointOverride?.trim();
-    this.environments = {
-      production: {
-        endpoint: toEndpoint(override || environments.production.endpointUrl),
-        channelId: environments.production.channelId,
-        legacyChannelId: environments.production.legacyChannelId
-      },
-      test: {
-        endpoint: toEndpoint(override || environments.test.endpointUrl),
-        channelId: environments.test.channelId,
-        legacyChannelId: environments.test.legacyChannelId
-      }
-    };
     for (const [name2, value] of [
       ["timeoutMs", config.timeoutMs],
       ["maxResponseBytes", config.maxResponseBytes],
@@ -213,11 +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 environment = resolveWebSearchEnvironment(record(metadata)?.environment);
-    const resolved = this.environments[environment];
-    const credentials = resolveSearchCredentials(metadata, resolved.channelId, resolved.legacyChannelId);
+    const endpoint = resolveSearchEndpoint(metadata);
+    const credentials = resolveSearchCredentials(metadata);
     const call = async (service) => {
       const timestamp = String(this.nowSeconds());
       const nonce = this.nonce();
@@ -246,7 +219,7 @@ ${nonce}`;
       const effectiveSignal = requestSignal(signal, this.config.timeoutMs);
       let response;
       try {
-        response = await this.fetchImpl(resolved.endpoint, {
+        response = await this.fetchImpl(endpoint, {
           method: "POST",
           headers: { accept: "application/json", "content-type": "application/json" },
           body: JSON.stringify(body),
@@ -260,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) {
@@ -269,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." },
@@ -313,16 +288,14 @@ function createWebSearchTool(search) {
   });
 }
 
-// dist-npm/src/index.js
+// dist/src/index.js
 var MBH_WEB_SEARCH_SERVICE_KEY = "mbhWebSearch";
 
-// 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),
@@ -337,8 +310,7 @@ var MbhWebSearchService = class extends Service {
     if (!config.enabled)
       return;
     this.operations = new WebSearchApiClient({
-      metadataPath: resolveMetadataPath(config.metadataPath),
-      ...config.endpointUrl.trim() ? { endpointOverride: config.endpointUrl.trim() } : {},
+      metadataPath: resolveMetadataPath(),
       timeoutMs: config.timeoutMs,
       maxResponseBytes: config.maxResponseBytes,
       defaultCount: config.defaultCount,
@@ -355,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);

package/src/api-client.d.ts

@@ -1,4 +1,3 @@
-import { type EnvConfig, type WebSearchEnvironment } from './config/env-config.js';
 export interface WebSearchRequest {
     query: string;
     count?: number;
@@ -26,8 +25,6 @@ export interface WebSearchOperations {
 }
 export interface WebSearchApiClientConfig {
     metadataPath: string;
-    endpointOverride?: string;
-    environments?: Record<WebSearchEnvironment, EnvConfig>;
     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 environments;
     private readonly fetchImpl;
     private readonly readFileImpl;
     private readonly nowSeconds;

package/src/api-client.js

@@ -1,6 +1,5 @@
 import { createHmac, randomUUID } from 'node:crypto';
 import { readFile } from 'node:fs/promises';
-import { ENV_CONFIG, resolveWebSearchEnvironment } from './config/env-config.js';
 export class WebSearchApiError extends Error {
     code;
     constructor(code, message, options) {
@@ -19,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;
@@ -134,27 +139,12 @@ function toEndpoint(endpointUrl) {
 }
 export class WebSearchApiClient {
     config;
-    environments;
     fetchImpl;
     readFileImpl;
     nowSeconds;
     nonce;
     constructor(config, dependencies = {}) {
         this.config = config;
-        const environments = config.environments ?? ENV_CONFIG;
-        const override = config.endpointOverride?.trim();
-        this.environments = {
-            production: {
-                endpoint: toEndpoint(override || environments.production.endpointUrl),
-                channelId: environments.production.channelId,
-                legacyChannelId: environments.production.legacyChannelId
-            },
-            test: {
-                endpoint: toEndpoint(override || environments.test.endpointUrl),
-                channelId: environments.test.channelId,
-                legacyChannelId: environments.test.legacyChannelId
-            }
-        };
         for (const [name, value] of [
             ['timeoutMs', config.timeoutMs],
             ['maxResponseBytes', config.maxResponseBytes],
@@ -190,11 +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 environment = resolveWebSearchEnvironment(record(metadata)?.environment);
-        const resolved = this.environments[environment];
-        const credentials = resolveSearchCredentials(metadata, resolved.channelId, resolved.legacyChannelId);
+        const endpoint = resolveSearchEndpoint(metadata);
+        const credentials = resolveSearchCredentials(metadata);
         const call = async (service) => {
             const timestamp = String(this.nowSeconds());
             const nonce = this.nonce();
@@ -220,7 +211,7 @@ export class WebSearchApiClient {
             const effectiveSignal = requestSignal(signal, this.config.timeoutMs);
             let response;
             try {
-                response = await this.fetchImpl(resolved.endpoint, {
+                response = await this.fetchImpl(endpoint, {
                     method: 'POST',
                     headers: { accept: 'application/json', 'content-type': 'application/json' },
                     body: JSON.stringify(body),
@@ -235,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) {
@@ -244,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,15 +1 @@
-export type WebSearchEnvironment = 'production' | 'test';
-export interface EnvConfig {
-    channelId: string;
-    legacyChannelId: string;
-    endpointUrl: string;
-}
 export declare const PACKAGE_NAME = "@dcrays/web-search";
-export declare const ENV_CONFIG: Record<WebSearchEnvironment, EnvConfig>;
-/**
- * Map the desktop runtime environment recorded in mobook.json to the search
- * environment. Development desktops share the test gateway and MBHChat channel.
- * Missing/unknown values fall back to test so a misconfigured desktop never
- * silently reaches the production gateway with test credentials.
- */
-export declare function resolveWebSearchEnvironment(value: unknown): WebSearchEnvironment;

package/src/config/env-config.js

@@ -1,22 +1 @@
 export const PACKAGE_NAME = '@dcrays/web-search';
-export const ENV_CONFIG = {
-    production: {
-        channelId: 'mbh-chat',
-        legacyChannelId: 'mbhchat',
-        endpointUrl: 'https://api-gateway.shuwenda.com/apikey-manage/api/search'
-    },
-    test: {
-        channelId: 'mbh-chat-test',
-        legacyChannelId: 'mbhchat-test',
-        endpointUrl: 'https://api-gateway.shuwenda.icu/apikey-manage/api/search'
-    }
-};
-/**
- * Map the desktop runtime environment recorded in mobook.json to the search
- * environment. Development desktops share the test gateway and MBHChat channel.
- * Missing/unknown values fall back to test so a misconfigured desktop never
- * silently reaches the production gateway with test credentials.
- */
-export function resolveWebSearchEnvironment(value) {
-    return value === 'production' ? 'production' : 'test';
-}

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.' },