aiconductor-cli 1.2.1 → 1.2.2

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 };

package/src/commands/md_publish.js

@@ -1,118 +1,87 @@
-const fs = require("fs");
-const path = require("path");
-const { resolveApiKey, publishHtml, publishMdToHtml } = require("../api");
-
-/**
- * 解析输入内容：如果是已存在的文件路径则读取，否则当作原始字符串
- * @param {string} input
- * @returns {{ content: string, filePath: string|null }}
- */
-function resolveInput(input) {
-  const trimmed = input.trim();
-  try {
-    const filePath = path.resolve(trimmed);
-    if (fs.existsSync(filePath) && fs.statSync(filePath).isFile()) {
-      return { content: fs.readFileSync(filePath, "utf-8"), filePath };
-    }
-  } catch (_) {}
-  return { content: trimmed, filePath: null };
-}
-
-/**
- * 自动检测内容类型：Markdown 或 HTML
- * @param {string} content
- * @param {string|null} filePath
- * @returns {"md"|"html"}
- */
-function detectType(content, filePath) {
-  // 优先用文件扩展名判断
-  if (filePath) {
-    const ext = path.extname(filePath).toLowerCase();
-    if (ext === ".md" || ext === ".markdown") return "md";
-    if (ext === ".html" || ext === ".htm") return "html";
-  }
-  // 内容特征判断
-  const trimmed = content.trim();
-  if (trimmed.startsWith("<!DOCTYPE") || trimmed.startsWith("<html") || trimmed.startsWith("<head")) {
-    return "html";
-  }
-  if (trimmed.startsWith("<") && /<\w+[^>]*>/.test(trimmed.substring(0, 200))) {
-    return "html";
-  }
-  // 默认 Markdown
-  return "md";
-}
-
-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`);
-    }
-  }
-}
-
-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`);
-  }
-}
-
-/**
- * webpage publish 命令 — 统一发布 Markdown 或 HTML 为在线网页
- * @param {string} input - Markdown/HTML 代码或文件路径
- * @param {{ apiKey?: string, format?: string, title?: string, copyButton?: boolean, type?: string }} options
- */
-async function publishCommand(input, 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 { content, filePath } = resolveInput(input);
-    // 确定类型：--type 显式指定优先，否则自动检测
-    let type = options.type;
-    if (!type) {
-      type = detectType(content, filePath);
-    } else if (type !== "md" && type !== "html") {
-      outputError({ message: `无效的 --type 值: "${type}"，可选: md 或 html` }, format);
-      process.exit(1);
-    }
-
-    let result;
-    if (type === "html") {
-      result = await publishHtml(resolvedKey, content, options.title);
-    } else {
-      const addCopyButton = options.copyButton === true;
-      result = await publishMdToHtml(resolvedKey, content, options.title, addCopyButton);
-    }
-    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, publishMdToHtml } = require("../api");
+const { outputResult, outputError, resolveKeyOrExit, handleApiError } = require("../lib/cli-utils");
+
+/**
+ * 解析输入内容：如果是已存在的文件路径则读取，否则当作原始字符串
+ * @param {string} input
+ * @returns {{ content: string, filePath: string|null }}
+ */
+function resolveInput(input) {
+  const trimmed = input.trim();
+  try {
+    const filePath = path.resolve(trimmed);
+    if (fs.existsSync(filePath) && fs.statSync(filePath).isFile()) {
+      return { content: fs.readFileSync(filePath, "utf-8"), filePath };
+    }
+  } catch (_) {}
+  return { content: trimmed, filePath: null };
+}
+
+/**
+ * 自动检测内容类型：Markdown 或 HTML
+ * @param {string} content
+ * @param {string|null} filePath
+ * @returns {"md"|"html"}
+ */
+function detectType(content, filePath) {
+  if (filePath) {
+    const ext = path.extname(filePath).toLowerCase();
+    if (ext === ".md" || ext === ".markdown") return "md";
+    if (ext === ".html" || ext === ".htm") return "html";
+  }
+  const trimmed = content.trim();
+  if (trimmed.startsWith("<!DOCTYPE") || trimmed.startsWith("<html") || trimmed.startsWith("<head")) {
+    return "html";
+  }
+  if (trimmed.startsWith("<") && /<\w+[^>]*>/.test(trimmed.substring(0, 200))) {
+    return "html";
+  }
+  return "md";
+}
+
+/** text 模式的自定义格式化 */
+function formatPublishText(data) {
+  let out = "✓ 发布成功\n";
+  out += `  URL: ${data.online_url}\n`;
+  if (data.message) {
+    out += `  信息: ${data.message}\n`;
+  }
+  return out.trimEnd();
+}
+
+/**
+ * webpage publish 命令 — 统一发布 Markdown 或 HTML 为在线网页
+ * @param {string} input - Markdown/HTML 代码或文件路径
+ * @param {{ apiKey?: string, format?: string, title?: string, copyButton?: boolean, type?: string }} options
+ */
+async function publishCommand(input, options = {}) {
+  const format = options.format || "json";
+  const apiKey = resolveKeyOrExit(options.apiKey, format);
+
+  try {
+    const { content, filePath } = resolveInput(input);
+    let type = options.type;
+    if (!type) {
+      type = detectType(content, filePath);
+    } else if (type !== "md" && type !== "html") {
+      outputError({ message: `无效的 --type 值: "${type}"，可选: md 或 html` }, format);
+      process.exit(1);
+    }
+
+    let result;
+    if (type === "html") {
+      result = await publishHtml(apiKey, content, options.title);
+    } else {
+      result = await publishMdToHtml(apiKey, content, options.title, options.copyButton === true);
+    }
+    outputResult(result, format, formatPublishText);
+    process.exit(0);
+  } catch (err) {
+    handleApiError(err, format);
+    process.exit(1);
+  }
+}
+
+module.exports = { publishCommand };