@monoedge/jdu-cli 0.6.0 → 0.6.1

package/dist/cli.js

@@ -4091,7 +4091,7 @@ async function browserAuthorize(input) {
 			server.close();
 			fn(value);
 		};
-		const fail = finish((msg) => reject(new CliError(msg, "重新执行 jdu login；不想开浏览器就带 --token")));
+		const fail = finish((msg) => reject(new CliError(msg, input.failHint ?? "重新执行 jdu login；不想开浏览器就带 --token")));
 		const handler = callbackHandler(state, finish(resolve));
 		const server = createServer((req, res) => {
 			if (new URL(req.url ?? "/", "http://localhost").pathname !== "/callback") {
@@ -4237,7 +4237,8 @@ async function runLogin(opts) {
 			server,
 			token: await (opts.authorize ?? browserAuthorize)({
 				server,
-				authorizeUrl
+				authorizeUrl,
+				...cfAccess ? { failHint: `重新执行 jdu login --server ${server}，用 Cloudflare 账号授权` } : {}
 			}),
 			...cfAccess ? { cfAccess: true } : {}
 		});
@@ -4541,10 +4542,15 @@ async function runDeploy(opts) {
 		if (health === null) throw new CliError(`${siteUrl} 起来了但 /healthz 一直不通（等了 ${HEALTH_TIMEOUT_MS / 1e3}s）`, `跑 npx ${WRANGLER} tail --name ${name} 看 Worker 日志；Access 策略已经配好，修完不用重跑 jdu deploy`);
 		if (health.authProvider !== "cloudflare-access") throw new CliError(`${siteUrl} 的 authProvider 是 ${health.authProvider ?? "未知"}，不是 cloudflare-access`, "确认 wrangler 变量写进去了（wrangler deploy 会打印绑定列表）");
 		let loggedIn = false;
-		if (opts.login !== false) loggedIn = (await runLogin({
-			server: siteUrl,
-			browser: true
-		})).loggedIn;
+		let warning;
+		if (opts.login !== false) try {
+			loggedIn = (await (opts.loginFn ?? runLogin)({
+				server: siteUrl,
+				browser: true
+			})).loggedIn;
+		} catch (err) {
+			warning = `自动 jdu login 没走完：${err instanceof Error ? err.message : String(err)}`;
+		}
 		return {
 			name,
 			url: siteUrl,
@@ -4553,7 +4559,8 @@ async function runDeploy(opts) {
 			emails,
 			accessAppId: app.id,
 			upgraded: existed,
-			loggedIn
+			loggedIn,
+			...warning === void 0 ? {} : { warning }
 		};
 	} finally {
 		cleanup();
@@ -6618,7 +6625,7 @@ async function client() {
 function collectTag(value, previous) {
 	return [...previous ?? [], value];
 }
-var VERSION = "0.6.0";
+var VERSION = "0.6.1";
 var program = new Command();
 program.name("jdu").description("jiandu 命令行").version(VERSION).showHelpAfterError();
 program.command("deploy").description("把一台简牍部署到你自己的 Cloudflare 账号（Worker + Durable Object，Free 计划够用）").option("--name <name>", "Worker 名字，决定 workers.dev 的子域名前缀", "jiandu").option("--dist <dir>", "用本地构建的产物代替 npm 包（开发用，指向 server/dist-cf）").option("--cf-token <token>", "带 Access 权限的 Cloudflare API token（不给就走浏览器 OAuth / 本地缓存）").option("--no-login", "部署完不自动 jdu login（之后手动跑一次即可）").option("--dry-run", "只校验配置与产物，不上传、不碰你的账号", false).option("--json", "机器可读输出（agent 联动用）", false).action(async (opts) => {
@@ -6639,6 +6646,7 @@ program.command("deploy").description("把一台简牍部署到你自己的 Clou
 	process.stdout.write(`加人：jdu access allow <邮箱>\n`);
 	if (result.loggedIn) process.stdout.write("\njdu 已经连上它了，可以直接 jdu push\n");
 	else process.stdout.write(`\n下一步：jdu login --server ${result.url}\n`);
+	if (result.warning) process.stderr.write(`jdu: ${result.warning}\n`);
 });
 var access = program.command("access").description("Cloudflare 形态的准入（Access 策略里的邮箱列表）");
 access.command("list").description("列出能登录这台实例的邮箱").option("--server <url>", "目标站点（缺省用 jdu login 时定下的那台）").option("--cf-token <token>", "带 Access 权限的 Cloudflare API token").option("--json", "机器可读输出", false).action(async (opts) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@monoedge/jdu-cli",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "jdu \u2014 \u628a Markdown \u53d1\u5e03\u5230\u7b80\u724d\u670d\u52a1",
   "type": "module",
   "license": "MIT",