@dcrays/web-search 0.1.1 → 0.1.2

package/README.md

@@ -1,5 +1,5 @@
 # @dcrays/web-search
 
-书灵墨宝的 DSH 联网搜索插件。加载后注册 `web_search` 工具，把模型搜索请求映射到配置的 HTTP API。
+书灵墨宝的 DSH 联网搜索插件。加载后注册 `web_search` 工具，把模型搜索请求映射到搜索网关。
 
-本包对应 `mbh-chat` 环境，端点地址从 Cordis 插件配置读取。
+单一发布包同时适用于生产与测试桌面：运行时根据 `mobook.json` 中记录的环境选择搜索网关与 MBHChat 凭据通道；`endpointUrl` 可在 Cordis 插件配置中覆盖。

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.2",
+  "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,7 +2,6 @@ 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 {

package/plugin/index.js

@@ -9,6 +9,25 @@ import z from "@deepseek-ai/schemastery";
 // dist-npm/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) {
@@ -125,23 +144,41 @@ 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;
+  environments;
   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");
-    }
+    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],
@@ -178,7 +215,9 @@ var WebSearchApiClient = class {
     } 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 });
     }
-    const credentials = resolveSearchCredentials(metadata, this.config.channelId, this.config.legacyChannelId);
+    const environment = resolveWebSearchEnvironment(record(metadata)?.environment);
+    const resolved = this.environments[environment];
+    const credentials = resolveSearchCredentials(metadata, resolved.channelId, resolved.legacyChannelId);
     const call = async (service) => {
       const timestamp = String(this.nowSeconds());
       const nonce = this.nonce();
@@ -207,7 +246,7 @@ ${nonce}`;
       const effectiveSignal = requestSignal(signal, this.config.timeoutMs);
       let response;
       try {
-        response = await this.fetchImpl(this.endpoint, {
+        response = await this.fetchImpl(resolved.endpoint, {
           method: "POST",
           headers: { accept: "application/json", "content-type": "application/json" },
           body: JSON.stringify(body),
@@ -277,24 +316,6 @@ function createWebSearchTool(search) {
 // dist-npm/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
 var name = "@dcrays/web-search";
 var inject = ["tools"];
@@ -316,10 +337,8 @@ 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,
+      ...config.endpointUrl.trim() ? { endpointOverride: config.endpointUrl.trim() } : {},
       timeoutMs: config.timeoutMs,
       maxResponseBytes: config.maxResponseBytes,
       defaultCount: config.defaultCount,
@@ -345,13 +364,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

@@ -1,3 +1,4 @@
+import { type EnvConfig, type WebSearchEnvironment } from './config/env-config.js';
 export interface WebSearchRequest {
     query: string;
     count?: number;
@@ -24,10 +25,9 @@ export interface WebSearchOperations {
     search(request: WebSearchRequest, signal?: AbortSignal): Promise<WebSearchResult>;
 }
 export interface WebSearchApiClientConfig {
-    endpointUrl: string;
     metadataPath: string;
-    channelId: string;
-    legacyChannelId: string;
+    endpointOverride?: string;
+    environments?: Record<WebSearchEnvironment, EnvConfig>;
     timeoutMs: number;
     maxResponseBytes: number;
     defaultCount: number;
@@ -53,7 +53,7 @@ interface SearchCredentials {
 export declare function resolveSearchCredentials(metadata: unknown, channelId: string, legacyChannelId: string): SearchCredentials;
 export declare class WebSearchApiClient implements WebSearchOperations {
     private readonly config;
-    private readonly endpoint;
+    private readonly environments;
     private readonly fetchImpl;
     private readonly readFileImpl;
     private readonly nowSeconds;

package/src/api-client.js

@@ -1,5 +1,6 @@
 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) {
@@ -118,24 +119,42 @@ 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;
+    environments;
     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，请联系管理员检查插件配置。');
-        }
+        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],
@@ -173,7 +192,9 @@ export class WebSearchApiClient {
         catch (error) {
             throw new WebSearchApiError('MISSING_CREDENTIALS', '暂时无法读取墨宝运行配置，请确认客户端已正常初始化后重试。', { cause: error });
         }
-        const credentials = resolveSearchCredentials(metadata, this.config.channelId, this.config.legacyChannelId);
+        const environment = resolveWebSearchEnvironment(record(metadata)?.environment);
+        const resolved = this.environments[environment];
+        const credentials = resolveSearchCredentials(metadata, resolved.channelId, resolved.legacyChannelId);
         const call = async (service) => {
             const timestamp = String(this.nowSeconds());
             const nonce = this.nonce();
@@ -199,7 +220,7 @@ export class WebSearchApiClient {
             const effectiveSignal = requestSignal(signal, this.config.timeoutMs);
             let response;
             try {
-                response = await this.fetchImpl(this.endpoint, {
+                response = await this.fetchImpl(resolved.endpoint, {
                     method: 'POST',
                     headers: { accept: 'application/json', 'content-type': 'application/json' },
                     body: JSON.stringify(body),

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

@@ -1,10 +1,15 @@
-export type BuildEnv = 'production' | 'test';
+export type WebSearchEnvironment = '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";
+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,16 +1,22 @@
+export const PACKAGE_NAME = '@dcrays/web-search';
 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];
+/**
+ * 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';
+}