eprolo-cli 1.0.32 → 1.0.33

package/bin/eprolo-cli.js

@@ -4,12 +4,14 @@
 const fs = require("fs");
 const os = require("os");
 const path = require("path");
+const http = require("http");
 
+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");
 
 // ---------------------------------------------------------------------------
-// D3 · 凭据文件读写（~/.dxb-toolkit/config.json）
+// 凭据文件读写（~/.dxb-toolkit/config.json）
 //   框架判定连接成功的唯一依据：凭据文件出现
 //   框架读顶层明文 account 字段做授权卡片标签
 // ---------------------------------------------------------------------------
@@ -21,7 +23,6 @@ function readConfig() {
 
 function writeConfig(config) {
   fs.mkdirSync(CONFIG_DIR, { recursive: true });
-  // 原子写：临时文件 + rename，避免 MCP 进程读到半截 JSON
   const tmp = CONFIG_FILE + ".tmp";
   fs.writeFileSync(tmp, JSON.stringify(config, null, 2), "utf8");
   fs.renameSync(tmp, CONFIG_FILE);
@@ -57,29 +58,63 @@ function readFlag(argv, flag) {
   return argv[idx + 1];
 }
 
-function splitIds(value) {
-  if (!value) return [];
-  return String(value).split(",").map((item) => item.trim()).filter(Boolean);
-}
+// ---------------------------------------------------------------------------
+// HTTP POST 请求
+// ---------------------------------------------------------------------------
 
-function taskKey(action) {
-  return `${action}-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
+function postJson(url, body) {
+  return new Promise((resolve, reject) => {
+    const target = new URL(url);
+    const payload = JSON.stringify(body);
+    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();
+  });
 }
 
 // ---------------------------------------------------------------------------
 // D2 · login 命令
 //   输入契约（框架 → CLI）：
 //     userCode  ← env 通道 process.env.DXB_USER_CODE
-//     defaultShop ← arg 通道 --default-shop（或 --default-store-name 兼容旧版）
+//     defaultShop ← arg 通道 --default-shop
 //   行为契约：
 //     成功 → 写凭据文件 + exit 0
 //     失败 → 非零退出 + stderr 错误信息
-//   ❌ 禁止交互式 prompt（CLI 跑在非交互终端）
+//   ❌ 禁止交互式 prompt
 // ---------------------------------------------------------------------------
 
-function login(argv) {
+async function login(argv) {
   // env 通道：框架通过 fieldInjection 注入 DXB_USER_CODE
-  const userCode = process.env.DXB_USER_CODE || readFlag(argv, "--user-code") || "mock-user-code";
+  const userCode = process.env.DXB_USER_CODE || readFlag(argv, "--user-code") || readFlag(argv, "--user-code");
 
   // arg 通道：框架通过 fieldInjection 追加 --default-shop
   const defaultShop =
@@ -87,27 +122,49 @@ function login(argv) {
     readFlag(argv, "--default-store-name") ||
     readFlag(argv, "--store-name") ||
     process.env.DXB_STORE_NAME ||
-    process.env.DXB_DEFAULT_STORE_NAME ||
     null;
 
-  // 账号标识：用户在弹窗可填 accountAlias，或用 defaultShop 兜底
+  // 账号标识
   const account =
     readFlag(argv, "--account") ||
     process.env.DXB_ACCOUNT ||
     defaultShop ||
-    "mock-account";
+    null;
+
+  if (!userCode) {
+    console.error(JSON.stringify({
+      success: false,
+      errorMessage: "缺少用户密文：请在授权弹窗中填写"
+    }));
+    process.exit(2);
+  }
+
+  // 调用登录接口验证密文
+  let loginResult;
+  try {
+    loginResult = await postJson(LOGIN_API, { userCode, defaultShop });
+  } catch (err) {
+    console.error(JSON.stringify({
+      success: false,
+      errorMessage: "密文验证失败，请到账号设置页重新复制",
+      detail: err.message,
+      response: err.response || null
+    }));
+    process.exit(1);
+  }
 
   // 写凭据文件（D3 契约：顶层明文 account + version）
+  const finalAccount = account || loginResult.account || "unknown";
   const config = {
-    account, // ← 顶层明文，框架读它做卡片标签（稳定契约，不可改名/挪位）
+    account: finalAccount,
     userCode,
     version: 1
   };
   if (defaultShop) config.defaultShop = defaultShop;
+  if (loginResult.accessToken) config.accessToken = loginResult.accessToken;
 
   writeConfig(config);
 
-  // 不打印任何敏感值
   console.log(JSON.stringify({
     success: true,
     connected: true,
@@ -118,19 +175,24 @@ function login(argv) {
 }
 
 // ---------------------------------------------------------------------------
-// auth status / auth logout
+// auth status — 查看授权状态（凭据文件是否存在）
 // ---------------------------------------------------------------------------
 
 function authStatus() {
   const config = readConfig();
+  const connected = fs.existsSync(CONFIG_FILE);
   console.log(JSON.stringify({
-    connected: fs.existsSync(CONFIG_FILE),
+    connected,
     account: config.account || null,
     defaultShop: config.defaultShop || null
   }, null, 2));
   process.exit(0);
 }
 
+// ---------------------------------------------------------------------------
+// auth logout — 退出授权（删除凭据文件）
+// ---------------------------------------------------------------------------
+
 function authLogout() {
   if (fs.existsSync(CONFIG_FILE)) fs.unlinkSync(CONFIG_FILE);
   console.log(JSON.stringify({ success: true }, null, 2));
@@ -138,174 +200,46 @@ function authLogout() {
 }
 
 // ---------------------------------------------------------------------------
-// 业务命令（mock，不调用真实 API）
-// ---------------------------------------------------------------------------
-
-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 };
-}
-
-function requireTaskTarget(args) {
-  const config = readConfig();
-  const ptName = args.ptName;
-  const storeName =
-    args.storeName ||
-    args.defaultShop ||
-    args.defaultStoreName ||
-    process.env.DXB_STORE_NAME ||
-    config.defaultShop ||
-    config.defaultStoreName ||
-    "mock-store";
-  return { ptName, storeName };
-}
-
-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" };
-  }
-  return { success: true, raw: body };
-}
-
-function printResult(data) {
-  console.log(JSON.stringify(data, null, 2));
-}
-
-// ---------------------------------------------------------------------------
-// D4 · stdio MCP server stub
-//   连接成功后框架会执行 npx -y @eprolo/eprolo-cli（无子命令）拉起 MCP
-//   stdout 只能输出 MCP 协议帧，调试日志走 stderr
+// help
 // ---------------------------------------------------------------------------
 
-function startMcpServer() {
-  // MCP stub：读凭据文件，通过 stdio 协议响应 tools/list 和 tools/call
-  const config = readConfig();
-  if (!config.userCode) {
-    console.error("未连接或凭据失效，请在 Accio Work 中重新连接");
-    process.exit(1);
-  }
-
-  let inputBuffer = "";
-  process.stdin.setEncoding("utf8");
-  process.stdin.on("data", (chunk) => {
-    inputBuffer += chunk;
-    // MCP stdio 协议：消息以换行分隔的 JSON-RPC
-    let newlineIdx;
-    while ((newlineIdx = inputBuffer.indexOf("\n")) !== -1) {
-      const line = inputBuffer.slice(0, newlineIdx).trim();
-      inputBuffer = inputBuffer.slice(newlineIdx + 1);
-      if (line) handleMcpMessage(line);
-    }
-  });
-  process.stdin.on("end", () => process.exit(0));
-}
+function printHelp() {
+  console.log(`DXB CLI (cli-login 形态)
 
-function handleMcpMessage(line) {
-  let msg;
-  try {
-    msg = JSON.parse(line);
-  } catch (_) {
-    return;
-  }
+Usage:
+  eprolo-cli auth login [--default-shop <shop>]     登录并写凭据文件（框架通过 env 注入 DXB_USER_CODE）
+  eprolo-cli auth status                             查看授权状态
+  eprolo-cli auth logout                             退出授权
 
-  const { id, method, params } = msg;
+Authorization:
+  框架通过 fieldInjection 把表单值递交给 CLI：
+    userCode  → env 通道 → process.env.DXB_USER_CODE
+    defaultShop → arg 通道 → --default-shop
 
-  if (method === "initialize") {
-    sendMcpResult(id, {
-      protocolVersion: "2024-11-05",
-      serverInfo: { name: "dxb-mcp", version: "1.0.0" },
-      capabilities: { tools: {} }
-    });
-    return;
-  }
+  连接成功的唯一判定：凭据文件 ~/.dxb-toolkit/config.json 出现
+  凭据文件顶层明文 account 字段用于授权卡片标签
 
-  if (method === "tools/list") {
-    sendMcpResult(id, {
-      tools: [
-        {
-          name: "ai_release_products",
-          description: "AI 发品：用货源链接在指定店铺下自动发布商品",
-          inputSchema: {
-            type: "object",
-            properties: {
-              sourceUrlList: { type: "array", items: { type: "string" }, description: "货源链接列表" },
-              storeName: { type: "string", description: "目标授权店铺名（缺省用凭据里的默认店铺）" },
-              ptName: { type: "string", description: "目标平台，如 icbu" }
-            },
-            required: ["sourceUrlList"]
-          }
-        },
-        {
-          name: "ai_release_status",
-          description: "查询 AI 发品计划状态",
-          inputSchema: {
-            type: "object",
-            properties: {
-              planId: { type: "string", description: "发品计划 ID" },
-              storeName: { type: "string", description: "目标授权店铺名" }
-            },
-            required: ["planId"]
-          }
-        }
-      ]
-    });
-    return;
-  }
+  登录时调用 ${LOGIN_API} 验证密文
 
-  if (method === "tools/call") {
-    const { name, arguments: args } = params;
-    if (name === "ai_release_products") {
-      sendMcpResult(id, {
-        content: [{ type: "text", text: JSON.stringify({
-          success: true,
-          message: "Task submitted successfully",
-          taskKey: taskKey("ai_release_products")
-        }) }]
-      });
-      return;
-    }
-    if (name === "ai_release_status") {
-      sendMcpResult(id, {
-        content: [{ type: "text", text: JSON.stringify({
-          success: true,
-          planId: args.planId,
-          status: "processing"
-        }) }]
-      });
-      return;
-    }
-    sendMcpError(id, -32601, `Unknown tool: ${name}`);
-    return;
+Credential file (~/.dxb-toolkit/config.json):
+  {
+    "account": "user@example.com",  // 顶层明文，框架读
+    "userCode": "...",
+    "defaultShop": "shop-001",
+    "version": 1
   }
-
-  sendMcpError(id, -32601, `Unknown method: ${method}`);
-}
-
-function sendMcpResult(id, result) {
-  process.stdout.write(JSON.stringify({ jsonrpc: "2.0", id, result }) + "\n");
-}
-
-function sendMcpError(id, code, message) {
-  process.stdout.write(JSON.stringify({ jsonrpc: "2.0", id, error: { code, message } }) + "\n");
+`);
 }
 
 // ---------------------------------------------------------------------------
-// 入口分发（D2 + D4）
-//   argv 有 "auth login" → 走 D2 登录
-//   否则默认起 stdio MCP（D4）
+// 入口分发
 // ---------------------------------------------------------------------------
 
 async function main() {
   const argv = process.argv.slice(2);
 
-  // D2 · login
   if (argv[0] === "auth" && argv[1] === "login") {
-    login(argv.slice(2));
+    await login(argv.slice(2));
     return;
   }
 
@@ -319,84 +253,14 @@ async function main() {
     return;
   }
 
-  // 兼容旧版 CLI 命令（batch submit / status ai）
-  if (argv[0] === "batch" && argv[1] === "submit") {
-    const args = parseArgs(argv.slice(2));
-    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.");
-    }
-    const auth = requireAuth(args);
-    const target = requireTaskTarget(args);
-    const body = {
-      action: args.action,
-      taskKey: args.taskKey || taskKey(args.action),
-      userCode: auth.userCode,
-      storeName: target.storeName,
-      productIds: splitIds(args.productIds)
-    };
-    if (target.ptName) body.ptName = target.ptName;
-    if (args.dataJson) body.data = JSON.parse(args.dataJson);
-    if (args.sourceUrlList) body.sourceUrlList = splitIds(args.sourceUrlList);
-    printResult(await postJson("", "/submit", body));
-    return;
-  }
-
-  if (argv[0] === "status" && argv[1] === "ai") {
-    const args = parseArgs(argv.slice(2));
-    if (!args.planId) throw new Error("status ai requires --plan-id");
-    const auth = requireAuth(args);
-    const target = requireTaskTarget(args);
-    printResult(await postJson("", "/aiReleaseStatus", {
-      planId: args.planId,
-      userCode: auth.userCode,
-      storeName: target.storeName
-    }));
-    return;
-  }
-
-  if (argv[0] === "--help" || argv[0] === "-h" || argv.length === 0) {
-    printHelp();
-    return;
-  }
-
-  // D4 · 默认起 stdio MCP server
-  startMcpServer();
-}
-
-function printHelp() {
-  console.log(`DXB CLI (cli-login 形态)
-
-Usage:
-  eprolo-cli auth login [--default-shop <shop>]     登录并写凭据文件（框架通过 env 注入 DXB_USER_CODE）
-  eprolo-cli auth status                             查看授权状态
-  eprolo-cli auth logout                             退出授权
-  eprolo-cli batch submit --action ai_release_products --source-url-list <urls> [--store-name <shop>]
-  eprolo-cli status ai --plan-id <planId> [--store-name <shop>]
-  eprolo-cli                                          启动 stdio MCP server（框架连接成功后自动拉起）
-
-Authorization:
-  框架通过 fieldInjection 把表单值递交给 CLI：
-    userCode  → env 通道 → process.env.DXB_USER_CODE
-    defaultShop → arg 通道 → --default-shop
-
-  连接成功的唯一判定：凭据文件 ~/.dxb-toolkit/config.json 出现
-  凭据文件顶层明文 account 字段用于授权卡片标签
-
-Credential file (~/.dxb-toolkit/config.json):
-  {
-    "account": "user@example.com",  // 顶层明文，框架读
-    "userCode": "...",
-    "defaultShop": "shop-001",
-    "version": 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.32",
+  "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"