eprolo-cli 1.0.26 → 1.0.28

package/bin/eprolo-cli.js

@@ -2,56 +2,34 @@
 "use strict";
 
 const fs = require("fs");
-const http = require("http");
-const https = require("https");
 const os = require("os");
 const path = require("path");
-const readline = require("readline");
+const https = require("https");
 
-const BASE_URL = process.env.DXB_API_BASE_URL || "https://wixtest.eprolo.com/aw/auth";
+const VERIFY_URL = "https://wixtest.eprolo.com//v1/auth/verify-code";
 const CONFIG_DIR = path.join(os.homedir(), ".dxb-toolkit");
 const CONFIG_FILE = path.join(CONFIG_DIR, "config.json");
 
-function printHelp() {
-  console.log(`DXB CLI
+// ---------------------------------------------------------------------------
+// 凭据文件读写（~/.dxb-toolkit/config.json）
+// ---------------------------------------------------------------------------
 
-Usage:
-  dxb auth login --user-code <userCode> [--default-store-name <storeName>] [--account <emailOrName>]
-  dxb auth status
-  dxb auth logout
-  dxb batch submit --store-name <storeName> --action ai_release_products --source-url-list <urls> [--pt-name <platform>] [--data-json <json>] [--task-key <key>]
-  dxb status ai --plan-id <planId> --store-name <storeName> [--user-code <userCode>]
-
-Options:
-  --base-url <url>       Override API base URL for this command.
-  --user-code <value>    店小宝用户密文 from https://erp.dianxiaobao.net/basic/account/setting.
-  --default-store-name <value>
-                         Optional default authorized shop name for multi-store accounts.
-  --account <value>      Optional plain account label shown in the plugin authorization card.
-  --store-name <value>   Target authorized shop name for this task.
-  --pt-name <value>      Optional target platform for this task, for example icbu.
-  --json                 Print JSON only.
-
-Authorization onboarding:
-  1. Register or log in to 店小宝: https://erp.dianxiaobao.net/
-  2. Copy 用户密文 as userCode: https://erp.dianxiaobao.net/basic/account/setting
-  3. Save the profile:
-     dxb auth login --user-code <userCode> --default-store-name <storeName>
-
-Task targeting:
-  店小宝 supports multiple shops. The auth profile may include a default store,
-  but an explicit --store-name always wins. Ask the user to specify the
-  authorized shop per task when the target is not clear, for example:
-     "在 33333 店铺下，用这些货源链接 AI 发品..."
-  If the user also provides a platform such as icbu, pass it with --pt-name.
-
-Status checks:
-  Status APIs also require userCode. The CLI uses the saved auth profile, or
-  accepts --user-code for one-off checks. Always pass the same --store-name
-  used for submission.
-`);
+function readConfig() {
+  if (!fs.existsSync(CONFIG_FILE)) return {};
+  return JSON.parse(fs.readFileSync(CONFIG_FILE, "utf8"));
 }
 
+function writeConfig(config) {
+  fs.mkdirSync(CONFIG_DIR, { recursive: true });
+  const tmp = CONFIG_FILE + ".tmp";
+  fs.writeFileSync(tmp, JSON.stringify(config, null, 2), "utf8");
+  fs.renameSync(tmp, CONFIG_FILE);
+}
+
+// ---------------------------------------------------------------------------
+// 参数解析
+// ---------------------------------------------------------------------------
+
 function parseArgs(argv) {
   const args = { _: [] };
   for (let i = 0; i < argv.length; i += 1) {
@@ -72,210 +50,279 @@ function parseArgs(argv) {
   return args;
 }
 
-function readConfig() {
-  if (!fs.existsSync(CONFIG_FILE)) return {};
-  return JSON.parse(fs.readFileSync(CONFIG_FILE, "utf8"));
+function readFlag(argv, flag) {
+  const idx = argv.indexOf(flag);
+  if (idx === -1 || idx + 1 >= argv.length) return undefined;
+  return argv[idx + 1];
 }
 
-function writeConfig(config) {
-  fs.mkdirSync(CONFIG_DIR, { recursive: true });
-  fs.writeFileSync(CONFIG_FILE, JSON.stringify(config, null, 2), "utf8");
-}
+// ---------------------------------------------------------------------------
+// HTTP POST 请求
+// ---------------------------------------------------------------------------
 
-function promptInput(question) {
-  const rl = readline.createInterface({
-    input: process.stdin,
-    output: process.stdout
-  });
-  return new Promise((resolve) => {
-    rl.question(question, (answer) => {
-      rl.close();
-      resolve(answer.trim());
-    });
+function postJson(url, body) {
+  return new Promise((resolve, reject) => {
+    const target = new URL(url);
+    const payload = JSON.stringify(body);
+    const req = https.request(
+      {
+        hostname: target.hostname,
+        port: target.port || 443,
+        path: target.pathname + target.search,
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+          "Content-Length": Buffer.byteLength(payload)
+        }
+      },
+      (res) => {
+        const chunks = [];
+        res.on("data", (chunk) => chunks.push(chunk));
+        res.on("end", () => {
+          const text = Buffer.concat(chunks).toString("utf8");
+          let data;
+          try {
+            data = text ? JSON.parse(text) : {};
+          } catch (_) {
+            data = { raw: text };
+          }
+          if (res.statusCode < 200 || res.statusCode >= 300) {
+            const err = new Error(`HTTP ${res.statusCode}`);
+            err.response = data;
+            reject(err);
+            return;
+          }
+          resolve(data);
+        });
+      }
+    );
+    req.on("error", reject);
+    req.write(payload);
+    req.end();
   });
 }
 
-function requireAuth(args) {
-  const config = readConfig();
-  const userCode = args.userCode || args.user_code || process.env.DXB_USER_CODE || config.userCode || "mock-user-code";
-  return { userCode };
-}
+// ---------------------------------------------------------------------------
+// 登录命令
+//   输入：env 通道 DXB_USER_CODE + arg 通道 --default-shop
+//   流程：调用 verify-code 接口校验密文 → 写凭据文件 → exit 0
+// ---------------------------------------------------------------------------
+
+async function login(argv) {
+  // env 通道：框架通过 fieldInjection 注入 DXB_USER_CODE
+  const userCode =
+    process.env.DXB_USER_CODE ||
+    readFlag(argv, "--user-code") ||
+    readFlag(argv, "--userCode");
+
+  if (!userCode) {
+    console.error(JSON.stringify({
+      success: false,
+      errorMessage: "缺少用户密文：请在授权弹窗中填写，或设置环境变量 DXB_USER_CODE"
+    }, null, 2));
+    process.exit(2);
+  }
 
-function requireTaskTarget(args) {
-  const config = readConfig();
-  const ptName = args.ptName;
-  const storeName = args.storeName || args.defaultStoreName || process.env.DXB_STORE_NAME || process.env.DXB_DEFAULT_STORE_NAME || config.defaultStoreName || "mock-store";
-  return { ptName, storeName };
-}
+  // arg 通道：框架通过 fieldInjection 追加 --default-shop
+  const defaultShop =
+    readFlag(argv, "--default-shop") ||
+    readFlag(argv, "--default-store-name") ||
+    readFlag(argv, "--store-name") ||
+    process.env.DXB_STORE_NAME ||
+    null;
+
+  // 账号标识
+  const accountAlias =
+    readFlag(argv, "--account") ||
+    process.env.DXB_ACCOUNT ||
+    null;
+
+  // 调用 verify-code 接口校验密文
+  let verifyResult;
+  try {
+    verifyResult = await postJson(VERIFY_URL, { userCode });
+  } catch (err) {
+    console.error(JSON.stringify({
+      success: false,
+      errorMessage: "密文无效或已吊销，请到账号设置页重新复制",
+      detail: err.message,
+      response: err.response || null
+    }, null, 2));
+    process.exit(1);
+  }
 
-function splitIds(value) {
-  if (!value) return [];
-  return String(value).split(",").map((item) => item.trim()).filter(Boolean);
+  // 校验成功，写凭据文件
+  const account = accountAlias || verifyResult.account || defaultShop || "unknown";
+  const config = {
+    account, // 顶层明文，框架读它做卡片标签
+    userCode,
+    accessToken: verifyResult.accessToken || null,
+    refreshToken: verifyResult.refreshToken || null,
+    defaultShop: defaultShop || verifyResult.defaultShop || null,
+    version: 1
+  };
+
+  writeConfig(config);
+
+  // 不打印敏感值
+  console.log(JSON.stringify({
+    success: true,
+    connected: true,
+    account: config.account,
+    defaultShop: config.defaultShop
+  }, null, 2));
+  process.exit(0);
 }
 
-function taskKey(action) {
-  return `${action}-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
-}
+// ---------------------------------------------------------------------------
+// 授权状态
+// ---------------------------------------------------------------------------
 
-function isTemplatePlaceholder(value) {
-  return typeof value === "string" && /^\$\{[^}]+\}$/.test(value.trim());
+function authStatus() {
+  const config = readConfig();
+  const connected = fs.existsSync(CONFIG_FILE) && Boolean(config.userCode);
+  console.log(JSON.stringify({
+    connected,
+    account: config.account || null,
+    defaultShop: config.defaultShop || null
+  }, null, 2));
+  process.exit(0);
 }
 
-function normalizeCredentialValue(value) {
-  return isTemplatePlaceholder(value) ? "" : value;
-}
+// ---------------------------------------------------------------------------
+// 授权验证
+//   读取凭据文件 → 调用 verify-code 接口验证密文是否仍然有效
+// ---------------------------------------------------------------------------
 
-async function postJson(baseUrl, pathName, body) {
-  const url = `${baseUrl}${pathName}`;
-  if (url.includes("/submit")) {
-    return { success: true, message: "Task submitted successfully", taskKey: body.taskKey };
-  }
-  if (url.includes("/aiReleaseStatus")) {
-    return { success: true, planId: body.planId, status: "processing" };
+async function authVerify(argv) {
+  const config = readConfig();
+
+  if (!config.userCode) {
+    console.error(JSON.stringify({
+      success: false,
+      connected: false,
+      errorMessage: "未连接或凭据不存在，请先执行 auth login"
+    }, null, 2));
+    process.exit(1);
   }
-  return { success: true, raw: body };
-}
 
-function parseJsonResponse(text) {
+  // 支持传入额外 userCode 覆盖
+  const userCode =
+    readFlag(argv, "--user-code") ||
+    process.env.DXB_USER_CODE ||
+    config.userCode;
+
   try {
-    return text ? JSON.parse(text) : {};
-  } catch (_) {
-    return { raw: text };
+    const result = await postJson(VERIFY_URL, { userCode });
+    console.log(JSON.stringify({
+      success: true,
+      connected: true,
+      valid: true,
+      account: config.account,
+      accountFromServer: result.account || null,
+      defaultShop: config.defaultShop
+    }, null, 2));
+    process.exit(0);
+  } catch (err) {
+    console.error(JSON.stringify({
+      success: false,
+      connected: false,
+      valid: false,
+      errorMessage: "凭据验证失败：密文无效或已过期，请重新登录",
+      detail: err.message,
+      response: err.response || null
+    }, null, 2));
+    process.exit(1);
   }
 }
 
-function postJsonWithNodeHttp(url, body) {
-  return new Promise((resolve, reject) => {
-    const target = new URL(url);
-    const payload = JSON.stringify(body);
-    const transport = target.protocol === "https:" ? https : http;
-    const req = transport.request({
-      protocol: target.protocol,
-      hostname: target.hostname,
-      port: target.port,
-      path: `${target.pathname}${target.search}`,
-      method: "POST",
-      headers: {
-        "content-type": "application/json",
-        "content-length": Buffer.byteLength(payload)
-      }
-    }, (res) => {
-      const chunks = [];
-      res.on("data", (chunk) => chunks.push(chunk));
-      res.on("end", () => {
-        const text = Buffer.concat(chunks).toString("utf8");
-        const data = parseJsonResponse(text);
-        if (res.statusCode < 200 || res.statusCode >= 300) {
-          const err = new Error(`HTTP ${res.statusCode} ${res.statusMessage || ""}`.trim());
-          err.response = data;
-          reject(err);
-          return;
-        }
-        resolve(data);
-      });
-    });
-    req.on("error", reject);
-    req.write(payload);
-    req.end();
-  });
+// ---------------------------------------------------------------------------
+// 退出授权
+// ---------------------------------------------------------------------------
+
+function authLogout() {
+  if (fs.existsSync(CONFIG_FILE)) fs.unlinkSync(CONFIG_FILE);
+  console.log(JSON.stringify({ success: true }, null, 2));
+  process.exit(0);
 }
 
-function printResult(data, jsonOnly) {
-  if (jsonOnly) {
-    console.log(JSON.stringify(data, null, 2));
-    return;
-  }
-  console.log(JSON.stringify(data, null, 2));
+// ---------------------------------------------------------------------------
+// 帮助
+// ---------------------------------------------------------------------------
+
+function printHelp() {
+  console.log(`DXB CLI
+
+Usage:
+  eprolo-cli auth login [--default-shop <shop>] [--account <alias>]
+                         登录：调用 verify-code 校验密文，写凭据文件
+  eprolo-cli auth verify [--user-code <code>]
+                         验证：调用 verify-code 检查密文是否仍然有效
+  eprolo-cli auth status
+                         查看本地授权状态
+  eprolo-cli auth logout
+                         退出授权，删除凭据文件
+
+Authorization:
+  框架通过 fieldInjection 把表单值递交给 CLI：
+    userCode    → env 通道 → process.env.DXB_USER_CODE
+    defaultShop → arg 通道 → --default-shop
+
+  连接成功的唯一判定：凭据文件 ~/.dxb-toolkit/config.json 出现
+  凭据文件顶层明文 account 字段用于授权卡片标签
+
+Verify API:
+  POST https://wixtest.eprolo.com//v1/auth/verify-code
+  Body: { "userCode": "<用户密文>" }
+  200 ← { "account": "...", "accessToken": "...", ... }
+  401 ← { "error": "invalid_or_revoked_code" }
+`);
 }
 
+// ---------------------------------------------------------------------------
+// 入口
+// ---------------------------------------------------------------------------
+
 async function main() {
-  const args = parseArgs(process.argv.slice(2));
-  const [group, command] = args._;
-  const baseUrl = args.baseUrl || BASE_URL;
+  const argv = process.argv.slice(2);
+  const [group, command] = argv;
 
-  if (!group || args.help || args.h) {
+  if (!group || group === "--help" || group === "-h") {
     printHelp();
     return;
   }
 
   if (group === "auth" && command === "login") {
-    const config = {
-      userCode: args.userCode || args.user_code || process.env.DXB_USER_CODE || process.env.userCode || process.env.USER_CODE || "mock-user-code"
-    };
-    const defaultStoreName = args.defaultStoreName || args.default_store_name || args.storeName || process.env.DXB_DEFAULT_STORE_NAME || process.env.DXB_STORE_NAME || process.env.defaultStoreName || process.env.storeName || process.env.STORE_NAME;
-    const account = args.account || process.env.DXB_ACCOUNT || process.env.account || process.env.ACCOUNT || defaultStoreName || "mock-account";
-    if (defaultStoreName) config.defaultStoreName = defaultStoreName;
-    config.account = account;
-    writeConfig(config);
-    printResult({
-      success: true,
-      connected: true,
-      account: config.account || null,
-      defaultStoreName: config.defaultStoreName || null
-    }, args.json);
-    return;
-  }
-
-  if (group === "auth" && command === "status") {
-    const config = readConfig();
-    printResult({
-      connected: true,
-      account: config.account || "mock-account",
-      defaultStoreName: config.defaultStoreName || "mock-store"
-    }, args.json);
+    await login(argv.slice(2));
     return;
   }
 
-  if (group === "auth" && command === "logout") {
-    if (fs.existsSync(CONFIG_FILE)) fs.unlinkSync(CONFIG_FILE);
-    printResult({ success: true }, args.json);
+  if (group === "auth" && command === "verify") {
+    await authVerify(argv.slice(2));
     return;
   }
 
-  if (group === "batch" && command === "submit") {
-    // if (!args.action) throw new Error("batch submit requires --action");
-    // if (args.action !== "ai_release_products") {
-    //   throw new Error("Only ai_release_products is supported in this simplified version.");
-    // }
-    const auth = requireAuth(args);
-    const target = requireTaskTarget(args);
-    const productIds = splitIds(args.productIds);
-    const body = {
-      action: args.action,
-      taskKey: args.taskKey || taskKey(args.action),
-      userCode: auth.userCode,
-      storeName: target.storeName,
-      productIds
-    };
-    if (target.ptName) body.ptName = target.ptName;
-    if (args.payloadJson) body.payload = JSON.parse(args.payloadJson);
-    if (args.dataJson) body.data = JSON.parse(args.dataJson);
-    if (args.sourceUrlList) body.sourceUrlList = splitIds(args.sourceUrlList);
-    printResult(await postJson(baseUrl, "/submit", body), args.json);
+  if (group === "auth" && command === "status") {
+    authStatus();
     return;
   }
 
-  if (group === "status" && command === "ai") {
-    if (!args.planId) throw new Error("status ai requires --plan-id");
-    const auth = requireAuth(args);
-    const target = requireTaskTarget(args);
-    printResult(await postJson(baseUrl, "/aiReleaseStatus", {
-      planId: args.planId,
-      userCode: auth.userCode,
-      storeName: target.storeName
-    }), args.json);
+  if (group === "auth" && command === "logout") {
+    authLogout();
     return;
   }
 
-  throw new Error(`Unknown command: ${process.argv.slice(2).join(" ")}`);
+  console.error(JSON.stringify({
+    success: false,
+    errorMessage: `Unknown command: ${argv.join(" ")}`
+  }, null, 2));
+  process.exit(1);
 }
 
 main().catch((err) => {
   console.error(JSON.stringify({
     success: false,
-    errorMessage: err.message,
-    response: err.response || null
+    errorMessage: err.message
   }, null, 2));
   process.exit(1);
 });
-

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eprolo-cli",
-  "version": "1.0.26",
+  "version": "1.0.28",
   "description": "CLI for Dianxiaobao ICBU AI publishing, authorization profile management, task submission, and task status checks.",
   "bin": {
     "eprolo": "bin/eprolo-cli.js"