@dcrays/web-search 0.1.3 → 0.1.4-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcrays/web-search",
-  "version": "0.1.3",
+  "version": "0.1.4-beta.2",
   "description": "DeepSeek Harness web search plugin for Mobook",
   "type": "module",
   "main": "plugin/index.js",
@@ -38,4 +38,4 @@
   "publishConfig": {
     "access": "public"
   }
-}
+}

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 {
@@ -24,35 +24,19 @@ function searchServiceLabel(service) {
 function record(value) {
   return value && typeof value === "object" && !Array.isArray(value) ? value : void 0;
 }
-var LEGACY_ACCOUNT_PLUGIN_KEYS = [
-  "mbh-chat",
-  "mbh-chat-test",
-  "mbhchat",
-  "mbhchat-test",
-  "mbh-chat-uat",
-  "mbhchat-uat"
-];
 function nonEmptyString(value) {
   return typeof value === "string" && value.trim() ? value.trim() : void 0;
 }
-function credentialUserId(value) {
-  return typeof value === "number" && Number.isSafeInteger(value) ? String(value) : nonEmptyString(value);
-}
-function credentialsFrom(source, deviceId) {
-  const userId = credentialUserId(source?.userId);
-  const botToken = nonEmptyString(source?.botToken);
-  if (userId && botToken && deviceId)
-    return { userId, botToken, deviceId };
-  return void 0;
-}
 function resolveSearchCredentials(metadata) {
   const root = record(metadata);
   const hardware = record(root?.hardware);
-  const plugins = record(root?.plugins);
+  const account = record(root?.account);
   const deviceId = nonEmptyString(hardware?.fingerprint);
-  const credentials = credentialsFrom(record(root?.account), deviceId) ?? LEGACY_ACCOUNT_PLUGIN_KEYS.map((key) => credentialsFrom(record(plugins?.[key]), deviceId)).find(Boolean);
-  if (credentials)
-    return credentials;
+  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) {
@@ -249,7 +233,7 @@ ${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`, {
+        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
         });
       }
@@ -260,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." },
@@ -304,10 +288,10 @@ 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({

package/src/api-client.js

@@ -15,36 +15,19 @@ function searchServiceLabel(service) {
 function record(value) {
     return value && typeof value === 'object' && !Array.isArray(value) ? value : undefined;
 }
-const LEGACY_ACCOUNT_PLUGIN_KEYS = [
-    'mbh-chat',
-    'mbh-chat-test',
-    'mbhchat',
-    'mbhchat-test',
-    'mbh-chat-uat',
-    'mbhchat-uat'
-];
 function nonEmptyString(value) {
     return typeof value === 'string' && value.trim() ? value.trim() : undefined;
 }
-function credentialUserId(value) {
-    return typeof value === 'number' && Number.isSafeInteger(value) ? String(value) : nonEmptyString(value);
-}
-function credentialsFrom(source, deviceId) {
-    const userId = credentialUserId(source?.userId);
-    const botToken = nonEmptyString(source?.botToken);
-    if (userId && botToken && deviceId)
-        return { userId, botToken, deviceId };
-    return undefined;
-}
 export function resolveSearchCredentials(metadata) {
     const root = record(metadata);
     const hardware = record(root?.hardware);
-    const plugins = record(root?.plugins);
+    const account = record(root?.account);
     const deviceId = nonEmptyString(hardware?.fingerprint);
-    const credentials = credentialsFrom(record(root?.account), deviceId) ??
-        LEGACY_ACCOUNT_PLUGIN_KEYS.map((key) => credentialsFrom(record(plugins?.[key]), deviceId)).find(Boolean);
-    if (credentials)
-        return credentials;
+    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) {
@@ -243,7 +226,7 @@ export class WebSearchApiClient {
                         cause: error
                     });
                 }
-                throw new WebSearchApiError('NETWORK_ERROR', `暂时无法连接${searchServiceLabel(service)}，请检查网络后重试。`, {
+                throw new WebSearchApiError('NETWORK_ERROR', `暂时无法连接 ${searchServiceLabel(service)}，请检查网络后重试。`, {
                     cause: error
                 });
             }
@@ -254,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/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.' },