aiconductor-cli 1.2.1 → 1.2.3

package/src/api.js

@@ -1,4 +1,4 @@
-const http = require("http");
+const https = require("https");
 const fs = require("fs");
 const path = require("path");
 
@@ -13,6 +13,7 @@ const DOUYIN_USER_DETAIL_PATH = "/api/douyin_user_detail";
 const DOUYIN_USER_SEARCH_PATH = "/api/douyin_user_search";
 const DOUYIN_VIDEO_SEARCH_PATH = "/api/douyin_video_search";
 const DOUYIN_LINK_TO_TEXT_PATH = "/api/douyin_link_to_text_v2";
+const XHS_NOTE_PUBLISH_PATH = "/api/xhs_note_publish";
 
 /**
  * 解析 API Key，三级优先级：命令行参数 > 系统环境变量 > .env 文件
@@ -40,6 +41,31 @@ function resolveApiKey(optionKey) {
   return null;
 }
 
+/**
+ * 过滤响应中的计费信息
+ * @param {object} resp
+ * @returns {object}
+ */
+function stripBilling(resp) {
+  if (!resp || typeof resp !== "object") return resp;
+  const result = { ...resp };
+  delete result.billing;
+  return result;
+}
+
+/**
+ * 校验整数参数，非有效正整数时报错
+ * @param {*} value
+ * @param {string} name
+ */
+function validateInt(value, name) {
+  if (value === undefined || value === null) return;
+  const n = Number(value);
+  if (!Number.isInteger(n) || n < 0) {
+    throw Object.assign(new Error(`${name} 须为非负整数，收到: ${value}`), { type: "validation_error" });
+  }
+}
+
 /**
  * HTTP POST 请求封装
  * @param {string} host
@@ -53,7 +79,7 @@ function httpPost(host, path, body, headers = {}) {
 
     const options = {
       hostname: host,
-      port: 80,
+      port: 443,
       path: path,
       method: "POST",
       headers: {
@@ -63,7 +89,7 @@ function httpPost(host, path, body, headers = {}) {
       },
     };
 
-    const req = http.request(options, (res) => {
+    const req = https.request(options, (res) => {
       let chunks = [];
       res.on("data", (chunk) => chunks.push(chunk));
       res.on("end", () => {
@@ -112,10 +138,7 @@ async function publishHtml(apiKey, htmlCode, title) {
   if (title) reqBody.title = title;
 
   const resp = await httpPost(API_HOST, API_PATH, reqBody);
-
-  // 过滤计费信息
-  const { billing, ...safe } = resp;
-  return safe;
+  return stripBilling(resp);
 }
 
 /**
@@ -125,6 +148,10 @@ async function publishHtml(apiKey, htmlCode, title) {
  * @returns {Promise<object>}
  */
 async function webSearch(apiKey, params) {
+  // 输入校验
+  validateInt(params.count, "count");
+  validateInt(params.authLevel, "authLevel");
+
   const reqBody = {
     query: params.query,
     search_type: params.searchType,
@@ -140,9 +167,7 @@ async function webSearch(apiKey, params) {
     Authorization: `Bearer ${apiKey}`,
   });
 
-  // 过滤计费信息
-  const { billing, ...safe } = resp;
-  return safe;
+  return stripBilling(resp);
 }
 
 /**
@@ -163,8 +188,7 @@ async function publishMdToHtml(apiKey, mdText, filename, addCopyButton = false)
 
   const resp = await httpPost(API_HOST, MD_TO_HTML_API_PATH, reqBody);
 
-  const { billing, ...safe } = resp;
-  return safe;
+  return stripBilling(resp);
 }
 
 /**
@@ -178,8 +202,7 @@ async function douyinVideoInfo(apiKey, shareUrl) {
     api_key: apiKey,
     share_url: shareUrl,
   });
-  const { billing, ...safe } = resp;
-  return safe;
+  return stripBilling(resp);
 }
 
 /**
@@ -193,8 +216,7 @@ async function douyinVideoComments(apiKey, videoUrl, maxCount) {
   const body = { api_key: apiKey, video_url: videoUrl };
   if (maxCount !== undefined && maxCount !== null) body.max_count = maxCount;
   const resp = await httpPost(API_HOST, DOUYIN_VIDEO_COMMENTS_PATH, body);
-  const { billing, ...safe } = resp;
-  return safe;
+  return stripBilling(resp);
 }
 
 /**
@@ -210,8 +232,7 @@ async function douyinUserVideos(apiKey, homePage, maxSeconds, maxPages) {
   if (maxSeconds !== undefined && maxSeconds !== null) body.max_seconds = maxSeconds;
   if (maxPages !== undefined && maxPages !== null) body.max_pages = maxPages;
   const resp = await httpPost(API_HOST, DOUYIN_USER_VIDEOS_PATH, body);
-  const { billing, ...safe } = resp;
-  return safe;
+  return stripBilling(resp);
 }
 
 /**
@@ -225,8 +246,7 @@ async function douyinUserDetail(apiKey, homePage) {
     api_key: apiKey,
     home_page: homePage,
   });
-  const { billing, ...safe } = resp;
-  return safe;
+  return stripBilling(resp);
 }
 
 /**
@@ -243,8 +263,7 @@ async function douyinUserSearch(apiKey, keyword, opts = {}) {
   if (opts.fansRange) body.douyin_user_fans = opts.fansRange;
   if (opts.userType) body.douyin_user_type = opts.userType;
   const resp = await httpPost(API_HOST, DOUYIN_USER_SEARCH_PATH, body);
-  const { billing, ...safe } = resp;
-  return safe;
+  return stripBilling(resp);
 }
 
 /**
@@ -265,8 +284,7 @@ async function douyinVideoSearch(apiKey, keyword, opts = {}) {
   const resp = await httpPost(API_HOST, DOUYIN_VIDEO_SEARCH_PATH, body, {
     Authorization: `Bearer ${apiKey}`,
   });
-  const { billing, ...safe } = resp;
-  return safe;
+  return stripBilling(resp);
 }
 
 /**
@@ -280,8 +298,28 @@ async function douyinLinkToText(apiKey, videoUrl) {
     api_key: apiKey,
     video_url: videoUrl,
   });
-  const { billing, ...safe } = resp;
-  return safe;
+  return stripBilling(resp);
+}
+
+/**
+ * 小红书笔记发布 — 生成扫码发布 H5 页面与二维码
+ * @param {string} apiKey
+ * @param {{ type: string, title?: string, content?: string, images?: string[], video?: string, cover?: string, transferToOss?: boolean }} params
+ * @returns {Promise<object>}
+ */
+async function xhsNotePublish(apiKey, params) {
+  const body = { type: params.type };
+  if (params.title) body.title = params.title;
+  if (params.content) body.content = params.content;
+  if (params.images && params.images.length > 0) body.images = params.images;
+  if (params.video) body.video = params.video;
+  if (params.cover) body.cover = params.cover;
+  if (params.transferToOss !== undefined) body.transfer_to_oss = params.transferToOss;
+
+  const resp = await httpPost(API_HOST, XHS_NOTE_PUBLISH_PATH, body, {
+    Authorization: `Bearer ${apiKey}`,
+  });
+  return stripBilling(resp);
 }
 
 module.exports = {
@@ -296,4 +334,5 @@ module.exports = {
   douyinUserSearch,
   douyinVideoSearch,
   douyinLinkToText,
+  xhsNotePublish,
 };

package/src/commands/douyin.js

@@ -1,151 +1,109 @@
-const {
-  resolveApiKey,
-  douyinVideoInfo,
-  douyinVideoComments,
-  douyinUserVideos,
-  douyinUserDetail,
-  douyinUserSearch,
-  douyinVideoSearch,
-  douyinLinkToText,
-} = require("../api");
-
-function outputResult(data, format) {
-  if (format === "json") {
-    process.stdout.write(JSON.stringify({ success: true, data }, null, 2) + "\n");
-  } else {
-    process.stdout.write("\u2713 \u64cd\u4f5c\u6210\u529f\n");
-    process.stdout.write(JSON.stringify(data, null, 2) + "\n");
-  }
-}
-
-function outputError(err, format) {
-  if (format === "json") {
-    process.stderr.write(JSON.stringify({ success: false, error: err.message || String(err) }, null, 2) + "\n");
-  } else {
-    process.stderr.write("\u2717 \u9519\u8bef: " + (err.message || err) + "\n");
-  }
-}
-
-function resolveKey(optionKey, format) {
-  const key = resolveApiKey(optionKey);
-  if (!key) {
-    outputError(
-      { message: "\u7f3a\u5c11 API Key\u3002\u8bf7\u901a\u8fc7 -k \u53c2\u6570\u3001AICONDUCTOR_API_KEY \u73af\u5883\u53d8\u91cf\u6216 .env \u6587\u4ef6\u63d0\u4f9b\u3002" },
-      format
-    );
-    process.exit(1);
-  }
-  return key;
-}
-
-function handleError(err, format) {
-  if (err.type === "http_error") {
-    outputError(
-      { message: "API \u8fd4\u56de\u9519\u8bef (HTTP " + err.statusCode + "): " + (err.body?.message || JSON.stringify(err.body)) },
-      format
-    );
-  } else if (err.type === "network_error") {
-    outputError({ message: "\u7f51\u7edc\u9519\u8bef: " + err.message }, format);
-  } else {
-    outputError({ message: "\u672a\u77e5\u9519\u8bef: " + (err.message || err) }, format);
-  }
-}
-
-async function videoInfoCommand(shareUrl, options = {}) {
-  const format = options.format || "json";
-  const key = resolveKey(options.apiKey, format);
-  try {
-    const result = await douyinVideoInfo(key, shareUrl);
-    outputResult(result, format);
-    process.exit(0);
-  } catch (err) { handleError(err, format); process.exit(1); }
-}
-
-async function videoCommentsCommand(videoUrl, options = {}) {
-  const format = options.format || "json";
-  const key = resolveKey(options.apiKey, format);
-  try {
-    const maxCount = options.maxCount ? parseInt(options.maxCount, 10) : undefined;
-    const result = await douyinVideoComments(key, videoUrl, maxCount);
-    outputResult(result, format);
-    process.exit(0);
-  } catch (err) { handleError(err, format); process.exit(1); }
-}
-
-async function userVideosCommand(homePage, options = {}) {
-  const format = options.format || "json";
-  const key = resolveKey(options.apiKey, format);
-  try {
-    const maxSeconds = options.maxSeconds ? parseInt(options.maxSeconds, 10) : undefined;
-    const maxPages = options.maxPages ? parseInt(options.maxPages, 10) : undefined;
-    const result = await douyinUserVideos(key, homePage, maxSeconds, maxPages);
-    outputResult(result, format);
-    process.exit(0);
-  } catch (err) { handleError(err, format); process.exit(1); }
-}
-
-async function userDetailCommand(homePage, options = {}) {
-  const format = options.format || "json";
-  const key = resolveKey(options.apiKey, format);
-  try {
-    const result = await douyinUserDetail(key, homePage);
-    outputResult(result, format);
-    process.exit(0);
-  } catch (err) { handleError(err, format); process.exit(1); }
-}
-
-async function userSearchCommand(keyword, options = {}) {
-  const format = options.format || "json";
-  const key = resolveKey(options.apiKey, format);
-  try {
-    const maxPages = options.maxPages ? parseInt(options.maxPages, 10) : undefined;
-    const maxSeconds = options.maxSeconds ? parseInt(options.maxSeconds, 10) : undefined;
-    const result = await douyinUserSearch(key, keyword, {
-      maxPages,
-      maxSeconds,
-      fansRange: options.fansRange,
-      userType: options.userType,
-    });
-    outputResult(result, format);
-    process.exit(0);
-  } catch (err) { handleError(err, format); process.exit(1); }
-}
-
-async function videoSearchCommand(keyword, options = {}) {
-  const format = options.format || "json";
-  const key = resolveKey(options.apiKey, format);
-  try {
-    const maxPages = options.maxPages ? parseInt(options.maxPages, 10) : undefined;
-    const maxSeconds = options.maxSeconds ? parseInt(options.maxSeconds, 10) : undefined;
-    const result = await douyinVideoSearch(key, keyword, {
-      maxPages,
-      maxSeconds,
-      sortType: options.sortType,
-      publishTime: options.publishTime,
-      filterDuration: options.filterDuration,
-      contentType: options.contentType,
-    });
-    outputResult(result, format);
-    process.exit(0);
-  } catch (err) { handleError(err, format); process.exit(1); }
-}
-
-async function linkToTextCommand(videoUrl, options = {}) {
-  const format = options.format || "json";
-  const key = resolveKey(options.apiKey, format);
-  try {
-    const result = await douyinLinkToText(key, videoUrl);
-    outputResult(result, format);
-    process.exit(0);
-  } catch (err) { handleError(err, format); process.exit(1); }
-}
-
-module.exports = {
-  videoInfoCommand,
-  videoCommentsCommand,
-  userVideosCommand,
-  userDetailCommand,
-  userSearchCommand,
-  videoSearchCommand,
-  linkToTextCommand,
-};
+const {
+  douyinVideoInfo,
+  douyinVideoComments,
+  douyinUserVideos,
+  douyinUserDetail,
+  douyinUserSearch,
+  douyinVideoSearch,
+  douyinLinkToText,
+} = require("../api");
+const { outputResult, resolveKeyOrExit, handleApiError, safeParseInt } = require("../lib/cli-utils");
+
+async function videoInfoCommand(shareUrl, options = {}) {
+  const format = options.format || "json";
+  const apiKey = resolveKeyOrExit(options.apiKey, format);
+  try {
+    const result = await douyinVideoInfo(apiKey, shareUrl);
+    outputResult(result, format);
+    process.exit(0);
+  } catch (err) { handleApiError(err, format); process.exit(1); }
+}
+
+async function videoCommentsCommand(videoUrl, options = {}) {
+  const format = options.format || "json";
+  const apiKey = resolveKeyOrExit(options.apiKey, format);
+  try {
+    const maxCount = safeParseInt(options.maxCount, undefined);
+    const result = await douyinVideoComments(apiKey, videoUrl, maxCount);
+    outputResult(result, format);
+    process.exit(0);
+  } catch (err) { handleApiError(err, format); process.exit(1); }
+}
+
+async function userVideosCommand(homePage, options = {}) {
+  const format = options.format || "json";
+  const apiKey = resolveKeyOrExit(options.apiKey, format);
+  try {
+    const maxSeconds = safeParseInt(options.maxSeconds, undefined);
+    const maxPages = safeParseInt(options.maxPages, undefined);
+    const result = await douyinUserVideos(apiKey, homePage, maxSeconds, maxPages);
+    outputResult(result, format);
+    process.exit(0);
+  } catch (err) { handleApiError(err, format); process.exit(1); }
+}
+
+async function userDetailCommand(homePage, options = {}) {
+  const format = options.format || "json";
+  const apiKey = resolveKeyOrExit(options.apiKey, format);
+  try {
+    const result = await douyinUserDetail(apiKey, homePage);
+    outputResult(result, format);
+    process.exit(0);
+  } catch (err) { handleApiError(err, format); process.exit(1); }
+}
+
+async function userSearchCommand(keyword, options = {}) {
+  const format = options.format || "json";
+  const apiKey = resolveKeyOrExit(options.apiKey, format);
+  try {
+    const maxPages = safeParseInt(options.maxPages, undefined);
+    const maxSeconds = safeParseInt(options.maxSeconds, undefined);
+    const result = await douyinUserSearch(apiKey, keyword, {
+      maxPages,
+      maxSeconds,
+      fansRange: options.fansRange,
+      userType: options.userType,
+    });
+    outputResult(result, format);
+    process.exit(0);
+  } catch (err) { handleApiError(err, format); process.exit(1); }
+}
+
+async function videoSearchCommand(keyword, options = {}) {
+  const format = options.format || "json";
+  const apiKey = resolveKeyOrExit(options.apiKey, format);
+  try {
+    const maxPages = safeParseInt(options.maxPages, undefined);
+    const maxSeconds = safeParseInt(options.maxSeconds, undefined);
+    const result = await douyinVideoSearch(apiKey, keyword, {
+      maxPages,
+      maxSeconds,
+      sortType: options.sortType,
+      publishTime: options.publishTime,
+      filterDuration: options.filterDuration,
+      contentType: options.contentType,
+    });
+    outputResult(result, format);
+    process.exit(0);
+  } catch (err) { handleApiError(err, format); process.exit(1); }
+}
+
+async function linkToTextCommand(videoUrl, options = {}) {
+  const format = options.format || "json";
+  const apiKey = resolveKeyOrExit(options.apiKey, format);
+  try {
+    const result = await douyinLinkToText(apiKey, videoUrl);
+    outputResult(result, format);
+    process.exit(0);
+  } catch (err) { handleApiError(err, format); process.exit(1); }
+}
+
+module.exports = {
+  videoInfoCommand,
+  videoCommentsCommand,
+  userVideosCommand,
+  userDetailCommand,
+  userSearchCommand,
+  videoSearchCommand,
+  linkToTextCommand,
+};

package/src/commands/html_publish.js

@@ -1,91 +1,54 @@
-const fs = require("fs");
-const path = require("path");
-const { resolveApiKey, publishHtml } = require("../api");
-
-/**
- * 智能解析输入：如果是已存在的文件路径则读取，否则当作原始 HTML 字符串
- * @param {string} input
- * @returns {string}
- */
-function resolveHtmlInput(input) {
-  const trimmed = input.trim();
-  // 尝试作为文件路径
-  try {
-    const filePath = path.resolve(trimmed);
-    if (fs.existsSync(filePath) && fs.statSync(filePath).isFile()) {
-      return fs.readFileSync(filePath, "utf-8");
-    }
-  } catch (_) {
-    // 不是文件路径，按原始字符串处理
-  }
-  return trimmed;
-}
-
-/**
- * 输出成功结果
- * @param {object} data
- * @param {"json"|"text"} format
- */
-function outputResult(data, format) {
-  if (format === "json") {
-    process.stdout.write(JSON.stringify({ success: true, data }, null, 2) + "\n");
-  } else {
-    process.stdout.write(`✓ 发布成功\n`);
-    process.stdout.write(`  URL: ${data.online_url}\n`);
-    if (data.message) {
-      process.stdout.write(`  信息: ${data.message}\n`);
-    }
-  }
-}
-
-/**
- * 输出错误
- * @param {object} err
- * @param {"json"|"text"} format
- */
-function outputError(err, format) {
-  if (format === "json") {
-    process.stderr.write(JSON.stringify({ success: false, error: err.message || String(err) }, null, 2) + "\n");
-  } else {
-    process.stderr.write(`✗ 错误: ${err.message || err}\n`);
-  }
-}
-
-/**
- * publish 命令（子命令模式）
- * @param {string} htmlCode - HTML 代码或文件路径
- * @param {{ apiKey?: string, format?: string, title?: string }} options
- */
-async function publishCommand(htmlCode, options = {}) {
-  const format = options.format || "json";
-  const resolvedKey = resolveApiKey(options.apiKey);
-
-  if (!resolvedKey) {
-    outputError(
-      { message: "缺少 API Key。请通过 -k 参数、AICONDUCTOR_API_KEY 环境变量或 .env 文件提供。" },
-      format
-    );
-    process.exit(1);
-  }
-
-  try {
-    const code = resolveHtmlInput(htmlCode);
-    const result = await publishHtml(resolvedKey, code, options.title);
-    outputResult(result, format);
-    process.exit(0);
-  } catch (err) {
-    if (err.type === "http_error") {
-      outputError(
-        { message: `API 返回错误 (HTTP ${err.statusCode}): ${err.body?.message || JSON.stringify(err.body)}` },
-        format
-      );
-    } else if (err.type === "network_error") {
-      outputError({ message: `网络错误: ${err.message}` }, format);
-    } else {
-      outputError({ message: `未知错误: ${err.message || err}` }, format);
-    }
-    process.exit(1);
-  }
-}
-
-module.exports = { publishCommand };
+const fs = require("fs");
+const path = require("path");
+const { publishHtml } = require("../api");
+const { outputResult, outputError, resolveKeyOrExit, handleApiError } = require("../lib/cli-utils");
+
+/**
+ * 智能解析输入：如果是已存在的文件路径则读取，否则当作原始 HTML 字符串
+ * @param {string} input
+ * @returns {string}
+ */
+function resolveHtmlInput(input) {
+  const trimmed = input.trim();
+  try {
+    const filePath = path.resolve(trimmed);
+    if (fs.existsSync(filePath) && fs.statSync(filePath).isFile()) {
+      return fs.readFileSync(filePath, "utf-8");
+    }
+  } catch (_) {
+    // 不是文件路径，按原始字符串处理
+  }
+  return trimmed;
+}
+
+/** text 模式的自定义格式化 */
+function formatPublishText(data) {
+  let out = "✓ 发布成功\n";
+  out += `  URL: ${data.online_url}\n`;
+  if (data.message) {
+    out += `  信息: ${data.message}\n`;
+  }
+  return out.trimEnd();
+}
+
+/**
+ * publish 命令（子命令模式）
+ * @param {string} htmlCode - HTML 代码或文件路径
+ * @param {{ apiKey?: string, format?: string, title?: string }} options
+ */
+async function publishCommand(htmlCode, options = {}) {
+  const format = options.format || "json";
+  const apiKey = resolveKeyOrExit(options.apiKey, format);
+
+  try {
+    const code = resolveHtmlInput(htmlCode);
+    const result = await publishHtml(apiKey, code, options.title);
+    outputResult(result, format, formatPublishText);
+    process.exit(0);
+  } catch (err) {
+    handleApiError(err, format);
+    process.exit(1);
+  }
+}
+
+module.exports = { publishCommand };