aiconductor-cli 1.3.5 → 1.5.0

package/src/api.test.js

@@ -4,9 +4,23 @@ const http = require("node:http");
 const https = require("node:https");
 const test = require("node:test");
 
-const { hotList, webSearch } = require("./api");
-const { formatHotListText, parseSourceIds, DEFAULT_HOT_LIST_SOURCES } = require("./commands/content");
+const { hotList, webSearch, xhsHotList } = require("./api");const {
+  buildBriefingResult,
+  formatHotListText,
+  parseLimit,
+  parseSourceIds,
+  DEFAULT_HOT_LIST_SOURCES,
+} = require("./commands/content");
 const { formatSearchText } = require("./commands/web_search");
+const { hotListTextFormatter, notePublishTextFormatter } = require("./commands/xhs");
+const {
+  wxArticleData,
+  wxHistoryArticles,
+} = require("./api");
+const {
+  formatArticleDataText,
+  formatHistoryText,
+} = require("./commands/wx");
 
 function captureRequest(callback, responseBody = { success: true, billing: {} }, transport = https) {
   const originalRequest = transport.request;
@@ -26,7 +40,10 @@ function captureRequest(callback, responseBody = { success: true, billing: {} },
     return request;
   };
 
-  return callback().then(() => captured).finally(() => {
+  return callback().then((result) => {
+    captured.result = result;
+    return captured;
+  }).finally(() => {
     transport.request = originalRequest;
   });
 }
@@ -217,3 +234,248 @@ test("hotList raises API failures", async () => {
     { type: "api_error", message: "没有可用热榜来源" }
   );
 });
+
+test("xhsHotList calls the XHS hot-list endpoint over HTTP", async () => {
+  const responseBody = {
+    success: true,
+    data: {
+      date: "2026-07-29",
+      items: [{ rank: 1, title: "夏日穿搭", hot: "123万", trend: "up", url: "https://example.com/xhs" }],
+    },
+    billing: { service_fee: 0.01 },
+  };
+  const request = await captureRequest(() => xhsHotList("test-key"), responseBody, http);
+
+  assert.equal(request.options.path, "/api/xhs_hot_list");
+  assert.equal(request.options.port, 80);
+  assert.equal(request.options.headers.Authorization, "Bearer test-key");
+  assert.deepEqual(request.body, {});
+  assert.equal(request.result.billing, undefined);
+});
+
+test("xhsHotList raises API failures", async () => {
+  await assert.rejects(
+    captureRequest(
+      () => xhsHotList("test-key"),
+      { success: false, message: "小红书热榜暂不可用" },
+      http
+    ),
+    { type: "api_error", message: "小红书热榜暂不可用" }
+  );
+});
+
+test("buildBriefingResult preserves hot-list fields and adds XHS data", () => {
+  const result = buildBriefingResult(
+    {
+      status: "fulfilled",
+      value: {
+        success: true,
+        data: {
+          sources: [{ source_id: "zhihu", items: [{ title: "AI 应用趋势" }] }],
+          failed_sources: [{ source_id: "weibo", message: "上游暂不可用" }],
+        },
+      },
+    },
+    {
+      status: "fulfilled",
+      value: {
+        success: true,
+        data: { date: "2026-07-29", items: [{ rank: 1, title: "AI 工具" }] },
+      },
+    }
+  );
+
+  assert.equal(result.success, true);
+  assert.equal(result.data.sources[0].source_id, "zhihu");
+  assert.equal(result.data.failed_sources[0].source_id, "weibo");
+  assert.equal(result.data.xhs_hot_list.items[0].title, "AI 工具");
+  assert.deepEqual(result.data.failed_services, []);
+});
+
+test("buildBriefingResult keeps either service when the other one fails", () => {
+  const hotListOnly = buildBriefingResult(
+    { status: "fulfilled", value: { success: true, data: { sources: [], failed_sources: [] } } },
+    { status: "rejected", reason: Object.assign(new Error("小红书超时"), { type: "network_error" }) }
+  );
+  assert.equal(hotListOnly.data.xhs_hot_list, null);
+  assert.deepEqual(hotListOnly.data.failed_services, [{ service: "xhs_hot_list", message: "小红书超时" }]);
+
+  const xhsOnly = buildBriefingResult(
+    { status: "rejected", reason: Object.assign(new Error("热榜超时"), { type: "network_error" }) },
+    { status: "fulfilled", value: { success: true, data: { date: "2026-07-29", items: [] } } }
+  );
+  assert.deepEqual(xhsOnly.data.sources, []);
+  assert.equal(xhsOnly.data.xhs_hot_list.date, "2026-07-29");
+  assert.deepEqual(xhsOnly.data.failed_services, [{ service: "hot_list", message: "热榜超时" }]);
+});
+
+test("buildBriefingResult fails only when both services fail", () => {
+  assert.throws(
+    () => buildBriefingResult(
+      { status: "rejected", reason: new Error("热榜超时") },
+      { status: "rejected", reason: new Error("小红书超时") }
+    ),
+    { type: "api_error", message: /均获取失败/ }
+  );
+});
+
+test("hot-list formatters render XHS trends and service failures", () => {
+  const briefingText = formatHotListText({
+    data: {
+      sources: [],
+      xhs_hot_list: {
+        date: "2026-07-29",
+        items: [{ rank: 1, title: "夏日穿搭", hot: "123万", trend: "up", url: "https://example.com/xhs" }],
+      },
+      failed_services: [{ service: "hot_list", message: "上游暂不可用" }],
+    },
+  });
+  assert.match(briefingText, /【小红书热榜】2026-07-29/);
+  assert.match(briefingText, /\[1\] 夏日穿搭 up/);
+  assert.match(briefingText, /服务失败:/);
+
+  const xhsText = hotListTextFormatter({
+    data: { date: "2026-07-29", items: [{ rank: 2, title: "露营", hot_value: 88, trend: "new" }] },
+  });
+  assert.match(xhsText, /小红书热榜/);
+  assert.match(xhsText, /\[2\] 露营 new/);
+  assert.match(xhsText, /热度: 88/);
+});
+
+test("note-publish formatter surfaces the shareable qrcode image URL", () => {
+  const text = notePublishTextFormatter({
+    message: "发布页生成成功",
+    data: {
+      id: "note-1",
+      url: "https://oss.aiconductor.fun/temporary_7/xhs_note_publish/note-1/index.html",
+      qrcode: "data:image/png;base64,AAAA",
+      qrcode_url: "https://oss.aiconductor.fun/temporary_7/xhs_note_publish/note-1/qrcode.png",
+    },
+  });
+  assert.match(text, /H5 地址:/);
+  assert.match(text, /二维码图: https:\/\/oss\.aiconductor\.fun\/temporary_7\/xhs_note_publish\/note-1\/qrcode\.png/);
+});
+
+test("note-publish formatter tolerates responses without qrcode_url", () => {
+  // 旧版后端只返回 base64 二维码，formatter 不能因此报错
+  const text = notePublishTextFormatter({
+    data: { id: "note-2", url: "https://example.com/index.html" },
+  });
+  assert.match(text, /H5 地址:/);
+  assert.doesNotMatch(text, /二维码图/);
+});
+
+test("parseLimit accepts the documented range", () => {
+  assert.equal(parseLimit(), 30);
+  assert.equal(parseLimit("1"), 1);
+  assert.equal(parseLimit(30), 30);
+  assert.throws(() => parseLimit("0"), { type: "validation_error" });
+  assert.throws(() => parseLimit("31"), { type: "validation_error" });
+  assert.throws(() => parseLimit("invalid"), { type: "validation_error" });
+});
+
+test("wxArticleData posts the article url with a Bearer header and strips billing", async () => {
+  const request = await captureRequest(() => wxArticleData("test-key", " https://mp.weixin.qq.com/s?__biz=M1 "), {
+    success: true,
+    message: "微信公众号文章互动数据获取成功。",
+    billing: { service_fee: 0.02, transaction_ids: [7] },
+    data: { read_num: 1200, zan_num: 8 },
+  });
+
+  assert.equal(request.options.path, "/api/wx_article_data");
+  assert.equal(request.options.port, 443);
+  assert.equal(request.options.headers.Authorization, "Bearer test-key");
+  assert.deepEqual(request.body, { url: "https://mp.weixin.qq.com/s?__biz=M1" });
+  assert.equal(request.result.billing, undefined);
+  assert.equal(request.result.data.read_num, 1200);
+});
+
+test("wxArticleData rejects a blank url without calling the endpoint", async () => {
+  await assert.rejects(() => wxArticleData("test-key", "  "), { type: "validation_error" });
+});
+
+test("wxHistoryArticles maps pagination fields from the api docs", async () => {
+  const request = await captureRequest(() => wxHistoryArticles("test-key", {
+    name: " 人民日报 ",
+    maxPages: "3",
+    maxSeconds: "50",
+  }), { success: true, data: { data: [] } });
+
+  assert.equal(request.options.path, "/api/wx_history_articles");
+  assert.equal(request.options.headers.Authorization, "Bearer test-key");
+  assert.deepEqual(request.body, { name: "人民日报", max_pages: 3, max_seconds: 50 });
+});
+
+test("wxHistoryArticles accepts a url instead of a name and rejects missing locators", async () => {
+  const request = await captureRequest(
+    () => wxHistoryArticles("test-key", { url: "https://mp.weixin.qq.com/s/abc" }),
+    { success: true, data: { data: [] } }
+  );
+  assert.deepEqual(request.body, { url: "https://mp.weixin.qq.com/s/abc" });
+
+  await assert.rejects(() => wxHistoryArticles("test-key", {}), { type: "validation_error" });
+  await assert.rejects(
+    () => wxHistoryArticles("test-key", { name: "人民日报", maxSeconds: 171 }),
+    { type: "validation_error" }
+  );
+});
+
+test("wx endpoints turn HTTP 200 business failures into api_error", async () => {
+  const failure = { success: false, message: "账户余额不足，当前余额：0.01，需要：0.02", billing: {} };
+
+  await assert.rejects(
+    () => captureRequest(() => wxArticleData("test-key", "https://mp.weixin.qq.com/s/abc"), failure),
+    (err) => err.type === "api_error" && err.message === failure.message
+  );
+  await assert.rejects(
+    () => captureRequest(() => wxHistoryArticles("test-key", { name: "人民日报" }), failure),
+    { type: "api_error" }
+  );
+});
+
+test("wx history formatter lists documented article fields", () => {
+  const text = formatHistoryText({
+    data: {
+      mp_nickname: "人民日报",
+      mp_ghid: "gh_363b924965e9",
+      now_page: 1,
+      data: [{
+        title: "今日要闻",
+        post_time_str: "2026-08-27 16:32:59",
+        read: 12345,
+        zan: 67,
+        original: 1,
+        digest: "摘要内容",
+        url: "https://mp.weixin.qq.com/s/abc",
+      }],
+    },
+  });
+  assert.match(text, /公众号: 人民日报（gh_363b924965e9）/);
+  assert.match(text, /篇数: +1/);
+  assert.match(text, /\[1\] 今日要闻/);
+  assert.match(text, /时间: 2026-08-27 16:32:59/);
+  assert.match(text, /阅读 12345 \| 点赞 67 \| 原创/);
+  assert.match(text, /URL: +https:\/\/mp\.weixin\.qq\.com\/s\/abc/);
+});
+
+test("wx article-data formatter labels the fields the live endpoint returns", () => {
+  // 字段取自 2026-11-04 线上真实响应
+  const articleText = formatArticleDataText({
+    message: "微信公众号文章互动数据获取成功。",
+    data: { read: 100001, zan: 5685, looking: 3202, share_num: 21013, collect_num: 3129, comment_count: 12 },
+  });
+  assert.match(articleText, /阅读: 100001/);
+  assert.match(articleText, /点赞: 5685/);
+  assert.match(articleText, /在看: 3202/);
+  assert.match(articleText, /分享: 21013/);
+  assert.match(articleText, /收藏: 3129/);
+  assert.match(articleText, /评论: 12/);
+
+  // 上游新增字段时不能被吞掉
+  const withUnknown = formatArticleDataText({ data: { read: 1, new_metric: 7 } });
+  assert.match(withUnknown, /阅读: 1/);
+  assert.match(withUnknown, /new_metric: 7/);
+
+  const emptyText = formatArticleDataText({ data: {} });
+  assert.match(emptyText, /上游未返回字段/);
+});

package/src/commands/content.js

@@ -1,4 +1,4 @@
-const { hotList } = require("../api");
+const { hotList, xhsHotList } = require("../api");
 const { outputResult, outputError, resolveKeyOrExit, handleApiError } = require("../lib/cli-utils");
 
 const DEFAULT_HOT_LIST_SOURCES = ["zhihu", "weibo", "douyin", "aihot"];
@@ -20,11 +20,71 @@ function parseSourceIds(value) {
   return sourceIds;
 }
 
+/**
+ * 解析每个热榜来源的返回条数。
+ * @param {string|number|undefined} value
+ * @returns {number}
+ */
+function parseLimit(value) {
+  const limit = Number(value === undefined ? 30 : value);
+  if (!Number.isInteger(limit) || limit < 1 || limit > 30) {
+    throw Object.assign(new Error(`--limit 须为 1 到 30 的整数，收到: ${value}`), {
+      type: "validation_error",
+    });
+  }
+  return limit;
+}
+
 function formatTimestamp(value) {
   if (typeof value !== "number" || !Number.isFinite(value)) return value || "";
   return new Date(value).toISOString();
 }
 
+function errorMessage(reason) {
+  if (reason?.body?.message) return reason.body.message;
+  return reason?.message || String(reason || "未知错误");
+}
+
+/**
+ * 将热榜和小红书热榜的并行结果组合为兼容既有字段的简报响应。
+ * @param {PromiseSettledResult<object>} hotListResult
+ * @param {PromiseSettledResult<object>} xhsHotListResult
+ * @returns {object}
+ */
+function buildBriefingResult(hotListResult, xhsHotListResult) {
+  const hotListSucceeded = hotListResult.status === "fulfilled";
+  const xhsHotListSucceeded = xhsHotListResult.status === "fulfilled";
+
+  if (!hotListSucceeded && !xhsHotListSucceeded) {
+    throw Object.assign(
+      new Error(`热点与小红书热榜均获取失败: ${errorMessage(hotListResult.reason)}; ${errorMessage(xhsHotListResult.reason)}`),
+      { type: "api_error" }
+    );
+  }
+
+  const failedServices = [];
+  if (!hotListSucceeded) {
+    failedServices.push({ service: "hot_list", message: errorMessage(hotListResult.reason) });
+  }
+  if (!xhsHotListSucceeded) {
+    failedServices.push({ service: "xhs_hot_list", message: errorMessage(xhsHotListResult.reason) });
+  }
+
+  const hotListData = hotListSucceeded
+    ? hotListResult.value.data || {}
+    : { sources: [], failed_sources: [] };
+  const xhsHotListData = xhsHotListSucceeded ? xhsHotListResult.value.data || {} : null;
+  return {
+    success: true,
+    message: failedServices.length ? "热点简报已生成，部分服务不可用" : "热点简报已生成",
+    data: {
+      ...hotListData,
+      xhs_hot_list: xhsHotListData,
+      failed_services: failedServices,
+    },
+  };
+}
+
 /**
  * text 模式的热点简报格式化。
  * @param {object} result
@@ -58,6 +118,28 @@ function formatHotListText(result = {}) {
     });
   }
 
+  const xhsHotList = data.xhs_hot_list;
+  if (xhsHotList) {
+    lines.push(`\n【小红书热榜】${xhsHotList.date || ""}`.trimEnd());
+    (xhsHotList.items || []).forEach((item) => {
+      const rank = item.rank === undefined ? "-" : item.rank;
+      const trend = item.trend ? ` ${item.trend}` : "";
+      lines.push(`[${rank}] ${item.title || "未命名话题"}${trend}`);
+      if (item.hot || item.hot_value !== undefined) {
+        lines.push(`  热度: ${item.hot || item.hot_value}`);
+      }
+      if (item.url) lines.push(`  URL: ${item.url}`);
+    });
+  }
+
+  const failedServices = data.failed_services || [];
+  if (failedServices.length) {
+    lines.push("\n服务失败:");
+    failedServices.forEach((service) => {
+      lines.push(`- ${service.service || "未知服务"}: ${service.message || "未知错误"}`);
+    });
+  }
+
   return lines.join("\n").trimEnd();
 }
 
@@ -71,10 +153,15 @@ async function briefingCommand(options = {}) {
   const apiKey = resolveKeyOrExit(options.apiKey, format);
 
   try {
-    const result = await hotList(apiKey, {
+    const hotListParams = {
       sourceIds: parseSourceIds(options.sources),
-      limit: options.limit === undefined ? 30 : options.limit,
-    });
+      limit: parseLimit(options.limit),
+    };
+    const [hotListResult, xhsHotListResult] = await Promise.allSettled([
+      hotList(apiKey, hotListParams),
+      xhsHotList(apiKey),
+    ]);
+    const result = buildBriefingResult(hotListResult, xhsHotListResult);
     outputResult(result, format, formatHotListText);
     process.exit(0);
   } catch (err) {
@@ -87,4 +174,11 @@ async function briefingCommand(options = {}) {
   }
 }
 
-module.exports = { briefingCommand, formatHotListText, parseSourceIds, DEFAULT_HOT_LIST_SOURCES };
+module.exports = {
+  briefingCommand,
+  buildBriefingResult,
+  formatHotListText,
+  parseLimit,
+  parseSourceIds,
+  DEFAULT_HOT_LIST_SOURCES,
+};

package/src/commands/wx.js

@@ -0,0 +1,116 @@
+const { wxArticleData, wxHistoryArticles } = require("../api");
+const { outputResult, resolveKeyOrExit, handleApiError } = require("../lib/cli-utils");
+
+// wx_article_data 的真实返回字段（2026-11-04 线上实测）；上游改名时未知键仍原样输出
+const ARTICLE_DATA_LABELS = [
+  ["read", "阅读"],
+  ["zan", "点赞"],
+  ["looking", "在看"],
+  ["share_num", "分享"],
+  ["collect_num", "收藏"],
+  ["comment_count", "评论"],
+];
+
+/**
+ * 获取公众号文章互动数据
+ * @param {string} url 微信文章链接
+ * @param {object} options
+ */
+async function articleDataCommand(url, options = {}) {
+  const format = options.format || "json";
+  const apiKey = resolveKeyOrExit(options.apiKey, format);
+  try {
+    const result = await wxArticleData(apiKey, url);
+    outputResult(result, format, formatArticleDataText);
+    process.exit(0);
+  } catch (err) { handleApiError(err, format); process.exit(1); }
+}
+
+/**
+ * 获取公众号历史文章列表
+ * @param {string|undefined} url 微信文章链接（用于定位公众号）
+ * @param {object} options
+ */
+async function historyCommand(url, options = {}) {
+  const format = options.format || "json";
+  const apiKey = resolveKeyOrExit(options.apiKey, format);
+  try {
+    const result = await wxHistoryArticles(apiKey, {
+      url,
+      name: options.name,
+      maxPages: options.maxPages,
+      maxSeconds: options.maxSeconds,
+    });
+    outputResult(result, format, formatHistoryText);
+    process.exit(0);
+  } catch (err) { handleApiError(err, format); process.exit(1); }
+}
+
+/**
+ * text 输出：公众号文章互动数据（已知字段给中文标签，未知字段原样输出）
+ * @param {object} resp
+ * @returns {string}
+ */
+function formatArticleDataText(resp = {}) {
+  const data = resp.data || {};
+  const lines = ["✓ 公众号文章互动数据"];
+  if (resp.message) lines.push(`  消息: ${resp.message}`);
+
+  const printed = new Set();
+  const known = [];
+  ARTICLE_DATA_LABELS.forEach(([key, label]) => {
+    if (data[key] === undefined) return;
+    printed.add(key);
+    known.push(`  ${label}: ${data[key]}`);
+  });
+  const extras = Object.keys(data)
+    .filter((key) => !printed.has(key))
+    .map((key) => {
+      const value = data[key];
+      return `  ${key}: ${value !== null && typeof value === "object" ? JSON.stringify(value) : String(value)}`;
+    });
+
+  if (known.length === 0 && extras.length === 0) {
+    lines.push("  上游未返回字段（用 -f json 查看原始响应）");
+    return lines.join("\n");
+  }
+  return lines.concat(known, extras).join("\n");
+}
+
+/**
+ * text 输出：公众号历史文章列表
+ * @param {object} resp
+ * @returns {string}
+ */
+function formatHistoryText(resp = {}) {
+  const data = resp.data || {};
+  const articles = Array.isArray(data.data) ? data.data : [];
+  const lines = ["✓ 公众号历史文章"];
+  const nickname = data.mp_nickname || data.nickname;
+  // 实测用 name 定位时只有 mp_ghid，api_docs 里的 mp_wxid / head_img 并不返回
+  const accountId = data.mp_wxid || data.wxid || data.mp_ghid;
+  if (nickname) lines.push(`  公众号: ${nickname}${accountId ? `（${accountId}）` : ""}`);
+  lines.push(`  篇数:   ${articles.length}`);
+  if (data.now_page !== undefined) lines.push(`  翻页:   ${data.now_page}`);
+
+  articles.forEach((item, index) => {
+    lines.push(`\n[${index + 1}] ${item.title || "未命名文章"}`);
+    if (item.post_time_str) lines.push(`    时间: ${item.post_time_str}`);
+    const stats = [];
+    if (item.read !== undefined) stats.push(`阅读 ${item.read}`);
+    if (item.zan !== undefined) stats.push(`点赞 ${item.zan}`);
+    if (item.original) stats.push("原创");
+    if (stats.length > 0) lines.push(`    数据: ${stats.join(" | ")}`);
+    if (item.digest) lines.push(`    摘要: ${item.digest}`);
+    if (item.url) lines.push(`    URL:  ${item.url}`);
+  });
+
+  return lines.join("\n");
+}
+
+module.exports = {
+  articleDataCommand,
+  historyCommand,
+  formatArticleDataText,
+  formatHistoryText,
+};