qdmp-cli 0.1.27 → 0.1.28

package/actions.js

@@ -7,6 +7,7 @@ import chalk from "chalk";
 import table from "table";
 import { inquirerVersionDescription } from "./utils/interactive.js";
 import { ensureInteractiveAuth, interactiveLogin } from "./utils/authFlow.js";
+import { agentLogin } from "./utils/agentLogin.js";
 import { getDeveloperId, getUserInfo } from "./api.js";
 import fs from "fs";
 import path from "path";
@@ -79,12 +80,21 @@ export const listAction = () => {
 
 export const loginAction = async (option) => {
   try {
+    if (option.agent) {
+      await agentLogin(option.env);
+      return;
+    }
     if (!process.stdin.isTTY || !process.stdout.isTTY) {
-      throw new Error("qdmp login 需要在支持交互输入的终端中执行，或使用 QDMP_TOKEN");
+      throw new Error(`Agent 对话请执行 qdmp login --agent --env ${option.env} 获取登录链接和图片；CI 请设置 QDMP_TOKEN`);
     }
     await interactiveLogin(option.env);
     success("登录成功");
   } catch (e) {
+    if (option.agent) {
+      console.log(JSON.stringify({ type: "error", env: option.env, message: e.message }));
+      process.exitCode = 1;
+      return;
+    }
     error(e.message);
   } finally {
     // Inquirer may leave stdin in a flowing state after the localhost callback

package/api.js

@@ -211,10 +211,10 @@ const unwrapData = (result) => result?.data || result;
 const qrcodeLoginURL = (qrcodeId) =>
   `https://qiandao.com/login/scanning/confirm?qrcodeId=${encodeURIComponent(qrcodeId)}`;
 
-export const generateLoginQrcode = async (env = "prod") => {
+export const generateLoginQrcode = async (env = "prod", { signal } = {}) => {
   const result = await request(
     "/signin/login/scan/qrcode/generate-id",
-    { method: "POST", body: JSON.stringify({}) },
+    { method: "POST", body: JSON.stringify({}), signal },
     env,
     false,
   );
@@ -223,10 +223,10 @@ export const generateLoginQrcode = async (env = "prod") => {
   return { qrcodeId: String(data.qrcodeId), url: qrcodeLoginURL(data.qrcodeId) };
 };
 
-export const getLoginQrcodeStatus = async (qrcodeId, env = "prod") => {
+export const getLoginQrcodeStatus = async (qrcodeId, env = "prod", { signal } = {}) => {
   const result = await request(
     "/signin/login/scan/qrcode/status",
-    { method: "POST", body: JSON.stringify({ qrcodeId }) },
+    { method: "POST", body: JSON.stringify({ qrcodeId }), signal },
     env,
     false,
   );
@@ -259,17 +259,17 @@ export const loginByPlatformURL = async (env = "prod", onUpdate = () => {}) => {
   }
 };
 
-export const getQiandaoUser = async (token, env = "prod") => {
+export const getQiandaoUser = async (token, env = "prod", { signal } = {}) => {
   const result = await request(
     "/user/users/me",
-    { headers: { authorization: `Bearer ${token}` } },
+    { headers: { authorization: `Bearer ${token}` }, signal },
     env,
     false,
   );
   return unwrapData(result);
 };
 
-export const exchangeQiandaoLogin = async (token, user, env = "prod") => {
+export const exchangeQiandaoLogin = async (token, user, env = "prod", { signal, persist = true } = {}) => {
   const userInfo = unwrapData(user) || {};
   const thirdPartyUserId = userInfo.id ?? userInfo.userId ?? userInfo.openId;
   if (thirdPartyUserId == null || String(thirdPartyUserId).trim() === "") {
@@ -279,6 +279,7 @@ export const exchangeQiandaoLogin = async (token, user, env = "prod") => {
     "/mp/v1/user/login/mobile",
     {
       method: "POST",
+      signal,
       body: JSON.stringify({
         thirdPartyUserId: String(thirdPartyUserId),
         nickname: userInfo.nickName || userInfo.nickname || userInfo.name,
@@ -290,7 +291,7 @@ export const exchangeQiandaoLogin = async (token, user, env = "prod") => {
   );
   const platformToken = unwrapData(result)?.token;
   if (!platformToken) throw new Error("扫码登录未获取到开放平台 Token");
-  saveToken(platformToken, env);
+  if (persist) saveToken(platformToken, env);
   return platformToken;
 };
 

package/index.js

@@ -53,6 +53,7 @@ program
   .command("login")
   .description("登录")
   .option("-e, --env <env>", "登录环境：prod 或 dev", "prod")
+  .option("--agent", "输出登录链接和 PNG 图片的 JSON 事件，并等待登录（无需终端输入）")
   .action(loginAction);
 program
   .command("getMe")

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "qdmp-cli",
-    "version": "0.1.27",
+    "version": "0.1.28",
     "description": "qdmp-cli",
     "main": "index.js",
     "type": "module",
@@ -37,6 +37,7 @@
         "is-unicode-supported": "^2.1.0",
         "js-base64": "3.7.8",
         "ora": "^8.2.0",
+        "qrcode": "^1.5.4",
         "qrcode-terminal": "^0.12.0",
         "query-string": "7.1.3",
         "shelljs": "^0.10.0",
@@ -47,7 +48,7 @@
         "node": "^20.19.0 || >=22.12.0"
     },
     "publishConfig": {
-    "registry": "https://registry.npmjs.org/",
-    "access": "public"
-  }
+        "registry": "https://registry.npmjs.org/",
+        "access": "public"
+    }
 }

package/utils/agentLogin.js

@@ -0,0 +1,106 @@
+import { mkdtemp, chmod, rm } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { setTimeout as delay } from "node:timers/promises";
+import QRCode from "qrcode";
+import { generateLoginQrcode, getLoginQrcodeStatus, getQiandaoUser, exchangeQiandaoLogin, request } from "../api.js";
+import { saveToken } from "./authorized.js";
+import { normalizeLoginEnv } from "./loginEnvironment.js";
+import { startLocalhostLogin } from "./localhostLogin.js";
+
+// NDJSON keeps stdout machine-readable. The caller renders ready.markdown while
+// this process keeps the loopback callback and App status polling alive.
+export const agentLogin = async (env = "prod", {
+  emit = event => console.log(JSON.stringify(event)),
+  timeoutMs = 120000,
+  pollIntervalMs = 1500,
+} = {}) => {
+  normalizeLoginEnv(env);
+  const controller = new AbortController();
+  const { signal } = controller;
+  const expiresAt = new Date(Date.now() + timeoutMs).toISOString();
+  const timer = setTimeout(() => controller.abort(new Error("登录超时，请重新执行登录命令")), timeoutMs);
+  const interrupt = () => controller.abort(new Error("已取消登录"));
+  process.once("SIGINT", interrupt);
+  process.once("SIGTERM", interrupt);
+  let browserSession;
+  let imageDirectory;
+  let committed = false;
+  const closeBrowser = () => browserSession?.close();
+  signal.addEventListener("abort", closeBrowser, { once: true });
+  const commit = token => {
+    signal.throwIfAborted();
+    if (committed) throw new Error("登录已完成");
+    saveToken(token, env, { quiet: true });
+    committed = true;
+  };
+  const requestSignal = () => AbortSignal.any([signal, AbortSignal.timeout(10000)]);
+  try {
+    browserSession = await startLocalhostLogin({
+      env, timeoutMs,
+      acceptToken: async (token, isActive) => {
+        const result = await request("/mp/v1/user/me", {
+          headers: { authorization: `Bearer ${token}` }, signal: requestSignal(),
+        }, env, false);
+        if (Number(result?.code || 0) !== 0) throw new Error("验证网页登录态失败");
+        if (!isActive()) throw new Error("网页登录会话已结束");
+        commit(token);
+      },
+    });
+    signal.throwIfAborted();
+    const qr = await generateLoginQrcode(env, { signal: requestSignal() });
+    imageDirectory = await mkdtemp(join(tmpdir(), "qdmp-login-"));
+    const qrImagePath = join(imageDirectory, "qrcode.png");
+    await QRCode.toFile(qrImagePath, qr.url, { type: "png", width: 320, margin: 4 });
+    await chmod(qrImagePath, 0o600);
+    signal.throwIfAborted();
+    const loginUrl = browserSession.url;
+    await emit({
+      type: "ready", env, loginUrl, qrImagePath, expiresAt,
+      message: "点击链接前往浏览器登录，或用千岛 App 扫码登录。",
+      markdown: `[点击链接前往浏览器登录](${loginUrl})，或用千岛 App 扫码登录。\n\n![千岛 App 扫码登录](<${qrImagePath}>)`,
+    });
+    const poll = async () => {
+      let previousStatus;
+      while (!signal.aborted && !committed) {
+        const result = await getLoginQrcodeStatus(qr.qrcodeId, env, { signal: requestSignal() });
+        signal.throwIfAborted();
+        if (result.status === "success") {
+          if (!result.token) throw new Error("扫码登录未返回登录态");
+          const user = await getQiandaoUser(result.token, env, { signal: requestSignal() });
+          const token = await exchangeQiandaoLogin(result.token, user, env, { signal: requestSignal(), persist: false });
+          commit(token);
+          return "qrcode";
+        }
+        if (["expired", "canceled", "cancelled", "error"].includes(result.status)) {
+          throw new Error("二维码已过期或登录已取消，可继续使用浏览器链接");
+        }
+        if (previousStatus !== result.status) {
+          previousStatus = result.status;
+          await emit({ type: "status", env, method: "qrcode", status: result.status });
+        }
+        await delay(pollIntervalMs, undefined, { signal });
+      }
+      throw new Error("扫码登录会话已结束");
+    };
+    const lane = (promise, method) => promise.catch(async () => {
+      if (!signal.aborted && !committed) await emit({ type: "unavailable", env, method });
+      throw new Error(`${method} 登录未完成`);
+    });
+    const method = await Promise.any([
+      lane(browserSession.result.then(() => "browser"), "browser"),
+      lane(poll(), "qrcode"),
+    ]).catch(() => {
+      throw signal.reason || new Error("登录未完成，请重新执行登录命令");
+    });
+    await emit({ type: "success", env, method });
+  } finally {
+    controller.abort();
+    clearTimeout(timer);
+    closeBrowser();
+    process.removeListener("SIGINT", interrupt);
+    process.removeListener("SIGTERM", interrupt);
+    signal.removeEventListener("abort", closeBrowser);
+    if (imageDirectory) await rm(imageDirectory, { recursive: true, force: true });
+  }
+};

package/utils/authFlow.js

@@ -87,7 +87,7 @@ export const ensureInteractiveAuth = async (env = "prod") => {
   } catch (cause) {
     if (!isAuthRequiredError(cause)) throw cause;
     if (!process.stdin.isTTY || !process.stdout.isTTY) {
-      throw new Error("当前命令需要登录，请在支持交互输入的终端中重新执行，或设置 QDMP_TOKEN");
+      throw new Error(`当前命令需要登录。Agent 对话请执行 qdmp login --agent --env ${normalizeLoginEnv(env)} 获取登录链接和图片，登录后重试原命令；CI 请设置 QDMP_TOKEN`);
     }
     await interactiveLogin(env);
     return ensureAuth(env);

package/utils/authorized.js

@@ -20,7 +20,7 @@ const readConfig = () => {
   }
 };
 
-export const saveToken = (token, env = "prod") => {
+export const saveToken = (token, env = "prod", { quiet = false } = {}) => {
   normalizeLoginEnv(env);
   const configPath = getConfigPath();
   const config = readConfig();
@@ -32,7 +32,7 @@ export const saveToken = (token, env = "prod") => {
   try {
     fs.writeFileSync(configPath, JSON.stringify(nextConfig, null, 2), { mode: 0o600 });
     fs.chmodSync(configPath, 0o600);
-    info(`🔑 ${env} 环境认证令牌已安全存储`);
+    if (!quiet) info(`🔑 ${env} 环境认证令牌已安全存储`);
   } catch (err) {
     throw new Error(`保存 ${env} 环境认证令牌失败：${err.message}`);
   }