eprolo-cli 1.0.43 → 1.0.45

package/bin/eprolo-cli.js

@@ -4,14 +4,15 @@
 const fs = require("fs");
 const os = require("os");
 const path = require("path");
-const http = require("http");
+const https = require("https");
 
 const LOGIN_API = "https://wixtest.eprolo.com/v1/auth/verify-code";
-const CONFIG_DIR = path.join(os.homedir(), ".dxb-toolkit");
+const REFRESH_API = "https://wixtest.eprolo.com/v1/auth/refresh-code";
+const CONFIG_DIR = path.join(os.homedir(), ".eprolo-toolkit");
 const CONFIG_FILE = path.join(CONFIG_DIR, "config.json");
 
 // ---------------------------------------------------------------------------
-// 凭据文件读写（~/.dxb-toolkit/config.json）
+// 凭据文件读写（~/.eprolo-toolkit/config.json）
 //   框架判定连接成功的唯一依据：凭据文件出现
 //   框架读顶层明文 account 字段做授权卡片标签
 // ---------------------------------------------------------------------------
@@ -32,26 +33,6 @@ function writeConfig(config) {
 // 参数解析
 // ---------------------------------------------------------------------------
 
-function parseArgs(argv) {
-  const args = { _: [] };
-  for (let i = 0; i < argv.length; i += 1) {
-    const token = argv[i];
-    if (!token.startsWith("--")) {
-      args._.push(token);
-      continue;
-    }
-    const key = token.slice(2).replace(/-([a-z])/g, (_, c) => c.toUpperCase());
-    const next = argv[i + 1];
-    if (!next || next.startsWith("--")) {
-      args[key] = true;
-    } else {
-      args[key] = next;
-      i += 1;
-    }
-  }
-  return args;
-}
-
 function readFlag(argv, flag) {
   const idx = argv.indexOf(flag);
   if (idx === -1 || idx + 1 >= argv.length) return undefined;
@@ -59,21 +40,22 @@ function readFlag(argv, flag) {
 }
 
 // ---------------------------------------------------------------------------
-// HTTP POST 请求
+// HTTPS POST 请求
 // ---------------------------------------------------------------------------
 
-function postJson(url, body) {
+function postJson(url, body, headers = {}) {
   return new Promise((resolve, reject) => {
     const target = new URL(url);
     const payload = JSON.stringify(body);
-    const req = http.request({
+    const req = https.request({
       hostname: target.hostname,
-      port: target.port,
+      port: target.port || 443,
       path: `${target.pathname}${target.search}`,
       method: "POST",
       headers: {
         "content-type": "application/json",
-        "content-length": Buffer.byteLength(payload)
+        "content-length": Buffer.byteLength(payload),
+        ...headers
       }
     }, (res) => {
       const chunks = [];
@@ -86,13 +68,7 @@ function postJson(url, body) {
         } 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);
+        resolve({ statusCode: res.statusCode, data });
       });
     });
     req.on("error", reject);
@@ -101,32 +77,79 @@ function postJson(url, body) {
   });
 }
 
+// ---------------------------------------------------------------------------
+// 带 401 自动刷新 token 重试的请求
+//   1. 发起请求
+//   2. 如果返回 401 → 调用 refresh-code 刷新 token → 回写凭据文件 → 重试一次
+//   3. 仍然 401 → 抛错
+// ---------------------------------------------------------------------------
+
+async function postJsonWithRetry(url, body, config) {
+  const headers = {};
+  if (config.accessToken) headers["authorization"] = `Bearer ${config.accessToken}`;
+
+  let result = await postJson(url, body, headers);
+
+  if (result.statusCode === 401) {
+    // 刷新 token
+    const refreshRes = await postJson(REFRESH_API, {
+      accessToken: config.accessToken,
+      accountId: config.accountId,
+      shopId: config.shopId
+    });
+
+    if (refreshRes.statusCode >= 200 && refreshRes.statusCode < 300 && refreshRes.data.accessToken) {
+      // 更新凭据文件
+      config.accessToken = refreshRes.data.accessToken;
+      if (refreshRes.data.account) config.account = refreshRes.data.account;
+      writeConfig(config);
+
+      // 用新 token 重试
+      headers["authorization"] = `Bearer ${config.accessToken}`;
+      result = await postJson(url, body, headers);
+    } else {
+      const err = new Error("Token 刷新失败，请重新登录授权");
+      err.response = refreshRes.data;
+      throw err;
+    }
+  }
+
+  if (result.statusCode < 200 || result.statusCode >= 300) {
+    const err = new Error(`HTTP ${result.statusCode}`);
+    err.response = result.data;
+    throw err;
+  }
+
+  return result.data;
+}
+
 // ---------------------------------------------------------------------------
 // D2 · login 命令
-//   输入契约（框架 → CLI）：
-//     userCode  ← env 通道 process.env.DXB_USER_CODE
-//     defaultShop ← arg 通道 --default-shop
-//   行为契约：
-//     成功 → 写凭据文件 + exit 0
-//     失败 → 非零退出 + stderr 错误信息
-//   ❌ 禁止交互式 prompt
 // ---------------------------------------------------------------------------
 
 async function login(argv) {
   const userCode = process.env.EPROLO_USER_CODE;          // env 通道
   if (!userCode) { console.error("缺少用户密文：请在授权弹窗中填写"); process.exit(2); }
 
-  const defaultShop = readFlag(argv, "--default-shop"); // arg 通道，可能不存在
+  const defaultShop = readFlag(argv, "--default-shop");   // arg 通道，可能不存在
 
-  const res = await fetch(LOGIN_API, {
-    method: "POST", headers: { "Content-Type": "application/json" },
-    body: JSON.stringify({ openApiKey:userCode }),
-  });
-  // if (!res.ok) { console.error("密文无效或已吊销，请到账号设置页重新复制"); process.exit(1); }
+  const res = await postJson(LOGIN_API, { openApiKey: userCode });
+
+  if (res.statusCode < 200 || res.statusCode >= 300) {
+    console.error(JSON.stringify({
+      success: false,
+      errorMessage: "密文验证失败，请到账号设置页重新复制",
+      statusCode: res.statusCode,
+      response: res.data
+    }));
+    process.exit(1);
+  }
+
+  const { account, accessToken, accountId, shopId } = res.data;
+  const config = { account, accessToken, defaultShop, accountId, shopId, version: 1 };
+  writeConfig(config);
 
-  const { account, accessToken,accountId,shopId } = await res.json();
-  writeConfig({ account, accessToken, defaultShop,accountId,shopId }); // → D3
-  console.log("login ok");                              // 不打印任何敏感值
+  console.log("login ok");
   process.exit(0);
 }
 
@@ -160,28 +183,31 @@ function authLogout() {
 // ---------------------------------------------------------------------------
 
 function printHelp() {
-  console.log(`DXB CLI (cli-login 形态)
+  console.log(`EPROLO CLI (cli-login 形态)
 
 Usage:
-  eprolo-cli auth login [--default-shop <shop>]     登录并写凭据文件（框架通过 env 注入 DXB_USER_CODE）
+  eprolo-cli auth login [--default-shop <shop>]     登录并写凭据文件（框架通过 env 注入 EPROLO_USER_CODE）
   eprolo-cli auth status                             查看授权状态
   eprolo-cli auth logout                             退出授权
 
 Authorization:
   框架通过 fieldInjection 把表单值递交给 CLI：
-    userCode  → env 通道 → process.env.DXB_USER_CODE
+    userCode  → env 通道 → process.env.EPROLO_USER_CODE
     defaultShop → arg 通道 → --default-shop
 
-  连接成功的唯一判定：凭据文件 ~/.dxb-toolkit/config.json 出现
+  连接成功的唯一判定：凭据文件 ~/.eprolo-toolkit/config.json 出现
   凭据文件顶层明文 account 字段用于授权卡片标签
 
   登录时调用 ${LOGIN_API} 验证密文
+  401 时自动调用 ${REFRESH_API} 刷新 token 并重试
 
-Credential file (~/.dxb-toolkit/config.json):
+Credential file (~/.eprolo-toolkit/config.json):
   {
-    "account": "user@example.com",  // 顶层明文，框架读
-    "userCode": "...",
+    "account": "user@example.com",
+    "accessToken": "...",
     "defaultShop": "shop-001",
+    "accountId": "...",
+    "shopId": "...",
     "version": 1
   }
 `);

package/package.json

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