@dreamor/atlas-cli 0.7.3 → 0.7.5

package/dist/adapters/atlas/auth/login.js

@@ -1,6 +1,9 @@
+import { execSync } from 'child_process';
+import { createRequire } from 'module';
 import { writeCookies, readCookies, fetchCookiesFromDaemon } from './session.js';
 import { isJsonMode, jsonOk, log } from '../util/output.js';
 import { AtlasError } from '../util/errors.js';
+const _require = createRequire(import.meta.url);
 const BANMA_HOST = 'banma-yuntu.alibaba-inc.com';
 // 白名单：只保存 getBanmaIdentity 真正需要的 cookies，避免整域 cookies 落盘
 const WANT_COOKIES = new Set(['access_token', 'buc_username', 'buc_userinfo']);
@@ -16,23 +19,67 @@ async function loadFirefox() {
         return pw.firefox;
     }
     catch {
-        throw new Error("未安装 playwright。运行时需要：设 ATLAS_AUTO_BOOTSTRAP=1 自动安装，或执行 `npm install playwright && npx playwright install`");
+        throw new Error("未安装 playwright。请执行: npm i -g playwright && npx playwright install");
+    }
+}
+/**
+ * 检测 launch 错误是否为"浏览器二进制未安装"，自动用内置 playwright 下载。
+ */
+async function ensureBrowserInstalled() {
+    const pwPath = _require.resolve('playwright/package.json');
+    const cliJs = pwPath.replace(/package\.json$/, 'cli.js');
+    log('首次运行，正在自动安装 Firefox 浏览器...');
+    try {
+        execSync(`node "${cliJs}" install firefox`, {
+            stdio: 'inherit',
+            timeout: 300_000,
+        });
+    }
+    catch {
+        throw new Error('Firefox 浏览器自动安装失败。请手动执行: npx playwright install firefox');
     }
 }
 export async function login(_port) {
     log('正在打开浏览器进行 Banma SSO 登录...');
     const firefox = await loadFirefox();
-    const browser = await firefox.launch({
-        headless: false,
-    });
+    let browser;
+    try {
+        browser = await firefox.launch({
+            headless: false,
+        });
+    }
+    catch (e) {
+        if (e instanceof Error && e.message.includes('Executable doesn\'t exist')) {
+            await ensureBrowserInstalled();
+            browser = await firefox.launch({ headless: false });
+        }
+        else {
+            throw e;
+        }
+    }
     const page = await browser.newPage();
     log('请在浏览器中完成 SSO 登录...');
     log('登录成功后页面会自动跳转，CLI 会自动捕获 cookies');
     await page.goto(`https://${BANMA_HOST}/`, { waitUntil: 'domcontentloaded', timeout: 60000 });
-    // 等待 access_token cookie 出现（最多 120s），比脆弱的 url 判断 + 固定 timeout 更可靠
-    await page.waitForFunction(() => document.cookie.includes('access_token'), { timeout: 120_000 });
+    // 等待 access_token cookie 出现（最多 120s）。
+    // 注意 access_token 是 HttpOnly cookie，不能用 document.cookie 检测，
+    // 必须走 page.context().cookies() 才能读到。
+    const MAX_WAIT = 120_000;
+    const POLL_INTERVAL = 500;
+    let foundToken = false;
+    for (let elapsed = 0; elapsed < MAX_WAIT; elapsed += POLL_INTERVAL) {
+        const allCookies = await page.context().cookies();
+        if (allCookies.some((c) => c.name === 'access_token' && c.value)) {
+            foundToken = true;
+            break;
+        }
+        await page.waitForTimeout(POLL_INTERVAL);
+    }
+    if (!foundToken) {
+        log('SSO 登录检测超时。如果您已完成登录，请按 Ctrl+C 重试或确认账号权限。');
+    }
     // 额外等待确保残留 cookie 写入完毕
-    await page.waitForTimeout(1000);
+    await page.waitForTimeout(500);
     // Extract cookies — 精确白名单，避免整域 cookies 落盘
     const cookies = await page.context().cookies();
     const atlasCookies = cookies

package/dist/adapters/atlas/commands/update.js

@@ -74,8 +74,6 @@ export async function updateCmd(opts) {
         log(`当前版本 ${ATLAS_VERSION}`);
         log('通过 npm 安装的 atlas 由 npm registry 管理升级，请运行:');
         log(`  ${npmCmd}`);
-        log('');
-        log('指定的 NPM_TOKEN 拥有 Publish 权限时，npm 会从 registry 自动拉取最新版。');
         if (opts.json || isJsonMode()) {
             jsonOk({
                 mode: 'npm',

package/dist/adapters/atlas/util/version.js

@@ -1 +1 @@
-export const ATLAS_VERSION = '0.7.3';
+export const ATLAS_VERSION = '0.7.5';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dreamor/atlas-cli",
-  "version": "0.7.3",
+  "version": "0.7.5",
   "description": "Atlas CLI - 斑马云图人力基线管理工具",
   "type": "module",
   "bin": {