aiconductor-cli 1.3.3 → 1.3.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aiconductor-cli",
-  "version": "1.3.3",
+  "version": "1.3.4",
   "description": "AIConductor CLI 工具箱",
   "keywords": [
     "aiconductor",

package/src/api.js

@@ -330,12 +330,19 @@ async function webSearch(apiKey, params) {
     if (params.imageShapes !== undefined) reqBody.image_shapes = params.imageShapes;
   }
 
-  const resp = await httpPost(API_HOST, SEARCH_API_PATH, reqBody, {
-    Authorization: `Bearer ${apiKey}`,
-  });
-
-  return stripBilling(resp);
-}
+  const resp = await httpPost(API_HOST, SEARCH_API_PATH, reqBody, {
+    Authorization: `Bearer ${apiKey}`,
+  });
+
+  const result = stripBilling(resp);
+  if (result?.success === false || result?.data?.success === false) {
+    throw Object.assign(new Error(result?.data?.message || result?.message || "搜索接口返回失败"), {
+      type: "api_error",
+    });
+  }
+
+  return result;
+}
 
 /**
  * Markdown 转 HTML 并发布

package/src/api.test.js

@@ -4,8 +4,9 @@ const https = require("node:https");
 const test = require("node:test");
 
 const { webSearch } = require("./api");
+const { formatSearchText } = require("./commands/web_search");
 
-function captureRequest(callback) {
+function captureRequest(callback, responseBody = { success: true, billing: {} }) {
   const originalRequest = https.request;
   let captured;
   https.request = (options, responseCallback) => {
@@ -17,7 +18,7 @@ function captureRequest(callback) {
       const response = new EventEmitter();
       response.statusCode = 200;
       responseCallback(response);
-      response.emit("data", Buffer.from(JSON.stringify({ success: true, billing: {} })));
+      response.emit("data", Buffer.from(JSON.stringify(responseBody)));
       response.emit("end");
     };
     return request;
@@ -96,3 +97,61 @@ test("webSearch maps current image filters and rejects invalid count", async ()
     { type: "validation_error" }
   );
 });
+
+test("formatSearchText renders top-level web search results", () => {
+  const text = formatSearchText({
+    data: {
+      Result: {
+        ResultCount: 1,
+        TimeCost: 42,
+        WebResults: [{
+          SortId: 1,
+          Title: "北京游玩攻略",
+          SiteName: "示例站点",
+          Url: "https://example.com/guide",
+          Snippet: "推荐路线",
+          PublishTime: "2026-07-28",
+        }],
+      },
+    },
+  });
+
+  assert.match(text, /结果数: 1/);
+  assert.match(text, /耗时: 42ms/);
+  assert.match(text, /\[1\] 北京游玩攻略/);
+  assert.match(text, /URL: https:\/\/example\.com\/guide/);
+});
+
+test("formatSearchText renders top-level image search results", () => {
+  const text = formatSearchText({
+    data: {
+      Result: {
+        ResultCount: 1,
+        TimeCost: 18,
+        ImageResults: [{
+          SortId: 1,
+          Title: "长城风景",
+          SiteName: "示例图片站",
+          Image: { Url: "https://example.com/great-wall.jpg", Width: 1920, Height: 1080 },
+          Url: "https://example.com/great-wall",
+        }],
+      },
+    },
+  });
+
+  assert.match(text, /结果数: 1/);
+  assert.match(text, /耗时: 18ms/);
+  assert.match(text, /\[1\] 长城风景/);
+  assert.match(text, /尺寸: 1920x1080/);
+  assert.match(text, /图片: https:\/\/example\.com\/great-wall\.jpg/);
+});
+
+test("webSearch raises nested API failures", async () => {
+  await assert.rejects(
+    captureRequest(
+      () => webSearch("test-key", { query: "长城", searchType: "image", count: 1 }),
+      { success: true, data: { success: false, message: "image 搜索的 count 必须为 1~5" } }
+    ),
+    { type: "api_error", message: "image 搜索的 count 必须为 1~5" }
+  );
+});

package/src/commands/web_search.js

@@ -2,8 +2,8 @@ const { webSearch } = require("../api");
 const { outputResult, outputError, resolveKeyOrExit, handleApiError } = require("../lib/cli-utils");
 
 /** text 模式的自定义格式化 */
-function formatSearchText(data) {
-  const inner = data.data || {};
+function formatSearchText(data = {}) {
+  const inner = data.data?.Result || {};
   let out = "✓ 搜索成功\n";
   out += `  结果数: ${inner.ResultCount}\n`;
   out += `  耗时: ${inner.TimeCost}ms\n\n`;
@@ -96,4 +96,4 @@ async function searchCommand(query, searchType, options = {}) {
   }
 }
 
-module.exports = { searchCommand };
+module.exports = { searchCommand, formatSearchText };