eprolo-cli 1.0.31 → 1.0.33

package/bin/eprolo-cli.js

@@ -4,14 +4,16 @@
 const fs = require("fs");
 const os = require("os");
 const path = require("path");
-const https = require("https");
+const http = require("http");
 
-const VERIFY_URL = "https://wixtest.eprolo.com/v1/auth/verify-code";
+const LOGIN_API = "http://43.153.35.208:8081/aaa";
 const CONFIG_DIR = path.join(os.homedir(), ".dxb-toolkit");
 const CONFIG_FILE = path.join(CONFIG_DIR, "config.json");
 
 // ---------------------------------------------------------------------------
 // 凭据文件读写（~/.dxb-toolkit/config.json）
+//   框架判定连接成功的唯一依据：凭据文件出现
+//   框架读顶层明文 account 字段做授权卡片标签
 // ---------------------------------------------------------------------------
 
 function readConfig() {
@@ -64,38 +66,35 @@ 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);
-        });
+    const req = http.request({
+      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");
+        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} ${res.statusMessage || ""}`.trim());
+          err.response = data;
+          reject(err);
+          return;
+        }
+        resolve(data);
+      });
+    });
     req.on("error", reject);
     req.write(payload);
     req.end();
@@ -103,25 +102,19 @@ function postJson(url, body) {
 }
 
 // ---------------------------------------------------------------------------
-// 登录命令
-//   输入：env 通道 DXB_USER_CODE + arg 通道 --default-shop
-//   流程：调用 verify-code 接口校验密文 → 写凭据文件 → exit 0
+// D2 · login 命令
+//   输入契约（框架 → CLI）：
+//     userCode  ← env 通道 process.env.DXB_USER_CODE
+//     defaultShop ← arg 通道 --default-shop
+//   行为契约：
+//     成功 → 写凭据文件 + exit 0
+//     失败 → 非零退出 + stderr 错误信息
+//   ❌ 禁止交互式 prompt
 // ---------------------------------------------------------------------------
 
 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);
-  }
+  const userCode = process.env.DXB_USER_CODE || readFlag(argv, "--user-code") || readFlag(argv, "--user-code");
 
   // arg 通道：框架通过 fieldInjection 追加 --default-shop
   const defaultShop =
@@ -132,55 +125,62 @@ async function login(argv) {
     null;
 
   // 账号标识
-  const accountAlias =
+  const account =
     readFlag(argv, "--account") ||
     process.env.DXB_ACCOUNT ||
+    defaultShop ||
     null;
 
-  // 调用 verify-code 接口校验密文
-  let verifyResult;
+  if (!userCode) {
+    console.error(JSON.stringify({
+      success: false,
+      errorMessage: "缺少用户密文：请在授权弹窗中填写"
+    }));
+    process.exit(2);
+  }
+
+  // 调用登录接口验证密文
+  let loginResult;
   try {
-    verifyResult = await postJson(VERIFY_URL, { 'openApiKey':userCode });
+    loginResult = await postJson(LOGIN_API, { userCode, defaultShop });
   } catch (err) {
     console.error(JSON.stringify({
       success: false,
-      errorMessage: "密文无效或已吊销请到账号设置页重新复制",
+      errorMessage: "密文验证失败，请到账号设置页重新复制",
       detail: err.message,
       response: err.response || null
-    }, null, 2));
+    }));
     process.exit(1);
   }
 
-  // 校验成功，写凭据文件
-  const account = accountAlias || verifyResult.accessToken || defaultShop || "unknown";
+  // 写凭据文件（D3 契约：顶层明文 account + version）
+  const finalAccount = account || loginResult.account || "unknown";
   const config = {
-    account, // 顶层明文，框架读它做卡片标签
+    account: finalAccount,
     userCode,
-    accessToken: verifyResult.accessToken || null,
-    refreshToken: verifyResult.refreshToken || null,
-    defaultShop: defaultShop || verifyResult.defaultShop || null,
     version: 1
   };
+  if (defaultShop) config.defaultShop = defaultShop;
+  if (loginResult.accessToken) config.accessToken = loginResult.accessToken;
 
   writeConfig(config);
 
-  // 不打印敏感值
   console.log(JSON.stringify({
     success: true,
     connected: true,
     account: config.account,
-    defaultShop: config.defaultShop
+    defaultShop: config.defaultShop || null
   }, null, 2));
   process.exit(0);
 }
 
 // ---------------------------------------------------------------------------
-// 授权状态
+// auth status — 查看授权状态（凭据文件是否存在）
 // ---------------------------------------------------------------------------
 
 function authStatus() {
   const config = readConfig();
-  const connected = fs.existsSync(CONFIG_FILE) && Boolean(config.userCode);
+  const connected = fs.existsSync(CONFIG_FILE);
   console.log(JSON.stringify({
     connected,
     account: config.account || null,
@@ -190,54 +190,7 @@ function authStatus() {
 }
 
 // ---------------------------------------------------------------------------
-// 授权验证
-//   读取凭据文件 → 调用 verify-code 接口验证密文是否仍然有效
-// ---------------------------------------------------------------------------
-
-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);
-  }
-
-  // 支持传入额外 userCode 覆盖
-  const userCode =
-    readFlag(argv, "--user-code") ||
-    process.env.DXB_USER_CODE ||
-    config.userCode;
-
-  try {
-    const result = await postJson(VERIFY_URL, { 'openApiKey':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);
-  }
-}
-
-// ---------------------------------------------------------------------------
-// 退出授权
+// auth logout — 退出授权（删除凭据文件）
 // ---------------------------------------------------------------------------
 
 function authLogout() {
@@ -247,82 +200,67 @@ function authLogout() {
 }
 
 // ---------------------------------------------------------------------------
-// 帮助
+// help
 // ---------------------------------------------------------------------------
 
 function printHelp() {
-  console.log(`DXB CLI
+  console.log(`DXB CLI (cli-login 形态)
 
 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
-                         退出授权，删除凭据文件
+  eprolo-cli auth login [--default-shop <shop>]     登录并写凭据文件（框架通过 env 注入 DXB_USER_CODE）
+  eprolo-cli auth status                             查看授权状态
+  eprolo-cli auth logout                             退出授权
 
 Authorization:
   框架通过 fieldInjection 把表单值递交给 CLI：
-    userCode    → env 通道 → process.env.DXB_USER_CODE
+    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" }
+  登录时调用 ${LOGIN_API} 验证密文
+
+Credential file (~/.dxb-toolkit/config.json):
+  {
+    "account": "user@example.com",  // 顶层明文，框架读
+    "userCode": "...",
+    "defaultShop": "shop-001",
+    "version": 1
+  }
 `);
 }
 
 // ---------------------------------------------------------------------------
-// 入口
+// 入口分发
 // ---------------------------------------------------------------------------
 
 async function main() {
   const argv = process.argv.slice(2);
-  const [group, command] = argv;
-
-  if (!group || group === "--help" || group === "-h") {
-    printHelp();
-    return;
-  }
 
-  if (group === "auth" && command === "login") {
+  if (argv[0] === "auth" && argv[1] === "login") {
     await login(argv.slice(2));
     return;
   }
 
-  if (group === "auth" && command === "verify") {
-    await authVerify(argv.slice(2));
-    return;
-  }
-
-  if (group === "auth" && command === "status") {
+  if (argv[0] === "auth" && argv[1] === "status") {
     authStatus();
     return;
   }
 
-  if (group === "auth" && command === "logout") {
+  if (argv[0] === "auth" && argv[1] === "logout") {
     authLogout();
     return;
   }
 
-  console.error(JSON.stringify({
-    success: false,
-    errorMessage: `Unknown command: ${argv.join(" ")}`
-  }, null, 2));
-  process.exit(1);
+  printHelp();
 }
 
 main().catch((err) => {
   console.error(JSON.stringify({
     success: false,
-    errorMessage: err.message
+    errorMessage: err.message,
+    response: err.response || null
   }, null, 2));
   process.exit(1);
 });

package/package.json

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