u1s1-cli 0.5.3 → 0.6.0

package/dist/login.js

@@ -8,24 +8,100 @@ const VERSION = require("../package.json").version;
 function tryOpenBrowser(url) {
     import("node:child_process")
         .then(({ spawn }) => {
-        const cmd = process.platform === "darwin" ? "open" : process.platform === "win32" ? "start" : "xdg-open";
-        spawn(cmd, [url], { detached: true, stdio: "ignore" }).on("error", () => { }).unref();
+        // Windows 的 start 是 cmd 内置命令,不能直接 spawn;空引号占住"窗口标题"参数位
+        const [cmd, args] = process.platform === "darwin" ? ["open", [url]]
+            : process.platform === "win32" ? ["cmd", ["/c", "start", "", url]]
+                : ["xdg-open", [url]];
+        spawn(cmd, args, { detached: true, stdio: "ignore" }).on("error", () => { }).unref();
     })
         .catch(() => { });
 }
+const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
+/** baseUrl 形如 https://api.u1s1.io/v1;auth 路由挂在同一域名的根路径。 */
+function apiOrigin(cfg) {
+    return cfg.baseUrl.replace(/\/v1\/?$/, "");
+}
+/** 发起浏览器登录;网关太老或连不上时返回 null,退回手动粘贴。 */
+async function startDeviceLogin(origin) {
+    try {
+        const resp = await fetch(`${origin}/auth/device/start`, { method: "POST" });
+        if (!resp.ok)
+            return null;
+        const data = (await resp.json());
+        if (typeof data.verify_url !== "string" || typeof data.poll_secret !== "string")
+            return null;
+        return {
+            verify_url: data.verify_url,
+            poll_secret: data.poll_secret,
+            interval: data.interval || 2,
+            expires_in: data.expires_in || 900,
+        };
+    }
+    catch {
+        return null;
+    }
+}
+/** 轮询等浏览器那边批准;拿到 key 返回,过期返回 null。 */
+async function pollDeviceLogin(origin, start) {
+    const deadline = Date.now() + start.expires_in * 1000;
+    while (Date.now() < deadline) {
+        await sleep(start.interval * 1000);
+        try {
+            const resp = await fetch(`${origin}/auth/device/poll`, {
+                method: "POST",
+                headers: { "content-type": "application/json" },
+                body: JSON.stringify({ poll_secret: start.poll_secret }),
+            });
+            if (!resp.ok)
+                continue;
+            const data = (await resp.json());
+            if (data.status === "ok" && data.api_key)
+                return data.api_key;
+            if (data.status === "expired")
+                return null;
+        }
+        catch {
+            // 网络抖一下,下一轮继续
+        }
+    }
+    return null;
+}
+async function promptForKey() {
+    console.log("  需要一把 API Key(免费):");
+    console.log(`  1. 打开 ${DASHBOARD_URL} 注册/登录(30 秒,送 $10 额度)`);
+    console.log("  2. 复制你的 API Key,粘贴到下面");
+    console.log("");
+    tryOpenBrowser(DASHBOARD_URL);
+    const rl = createInterface({ input: process.stdin, output: process.stdout });
+    const key = (await rl.question("  粘贴 API Key: ")).trim();
+    rl.close();
+    return key;
+}
 export async function login(keyArg) {
     const cfg = loadConfig();
     let key = keyArg?.trim();
     if (!key) {
         printConsoleBanner(VERSION);
-        console.log("  需要一把 API Key(免费):");
-        console.log(`  1. 打开 ${DASHBOARD_URL} 注册/登录(30 秒,送 $10 额度)`);
-        console.log("  2. 复制你的 API Key,粘贴到下面");
-        console.log("");
-        tryOpenBrowser(DASHBOARD_URL);
-        const rl = createInterface({ input: process.stdin, output: process.stdout });
-        key = (await rl.question("  粘贴 API Key: ")).trim();
-        rl.close();
+        const origin = apiOrigin(cfg);
+        const start = await startDeviceLogin(origin);
+        if (start) {
+            console.log("  用浏览器登录(免费,注册送 $10 额度):");
+            console.log("");
+            console.log(`      ${start.verify_url}`);
+            console.log("");
+            console.log("  已经帮你打开浏览器了;如果没打开,把上面这行网址复制到浏览器打开。");
+            console.log("  在浏览器里登录成功后,这里会自动继续,等着就行……");
+            tryOpenBrowser(start.verify_url);
+            key = (await pollDeviceLogin(origin, start)) ?? undefined;
+            if (!key) {
+                console.error("  等了太久没等到浏览器登录。重新运行一次 u1s1,会给你一个新链接。");
+                process.exit(1);
+            }
+            console.log("");
+        }
+        else {
+            key = await promptForKey();
+        }
     }
     if (!key.startsWith("u1s1-")) {
         console.error("  这不像一把 u1s1 的 Key(应该以 u1s1- 开头),再看看?");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "u1s1-cli",
-  "version": "0.5.3",
+  "version": "0.6.0",
   "description": "u1s1 — 有一说一,最省心的 AI 编程搭子。终端里用中文说需求,AI 帮你读文件、改代码、跑命令。",
   "type": "module",
   "bin": {