pleumrouter 0.5.51 → 0.5.53

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pleumrouter",
-  "version": "0.5.51",
+  "version": "0.5.53",
   "description": "Official PleumRouter terminal CLI — launch any coding agent against PleumRouter.",
   "type": "module",
   "bin": {

package/src/completion.mjs

@@ -46,6 +46,7 @@ _pleum() {
     completion) compadd zsh bash;;
   esac
 }
+compdef _pleum pleum 2>/dev/null || true
 _pleum "$@"`;
 }
 

package/src/login.mjs

@@ -1,7 +1,7 @@
 import { createServer } from "node:http";
 import { randomUUID } from "node:crypto";
 import { spawn } from "node:child_process";
-import { ROOT, SITE_ROOT, V1, readConfig, writeConfig, mergeLoginConfig, clearCredentials, setActiveContext, refreshAccessToken, accessTokenIsStale } from "./config.mjs";
+import { ROOT, SITE_ROOT, V1, readConfig, writeConfig, mergeLoginConfig, clearCredentials, setActiveContext, refreshAccessToken, accessTokenIsStale, readJwtExp } from "./config.mjs";
 import { t } from "./i18n.mjs";
 import { sanitizeTerminalText } from "./ansi.mjs";
 
@@ -30,13 +30,16 @@ function openBrowser(url) {
   }
 }
 
-function saveTokens({ access_token, refresh_token, expires_in }) {
+export function saveTokens({ access_token, refresh_token, expires_in }) {
   const existing = readConfig() || {};
   const { key: _legacy, ...rest } = existing;
+  const exp = readJwtExp(access_token);
   const token_expires_at =
-    typeof expires_in === "number"
-      ? Date.now() + expires_in * 1000
-      : undefined;
+    exp != null
+      ? exp * 1000
+      : typeof expires_in === "number"
+        ? Date.now() + expires_in * 1000
+        : undefined;
   writeConfig(
     mergeLoginConfig(rest, {
       access_token,
@@ -151,10 +154,31 @@ export async function login() {
   console.log(`✓ ${t("Logged in. Saved the session to ~/.pleum/config.json.")}`);
 }
 
+export function retryAfterSeconds(response) {
+  const value = response.headers.get("Retry-After");
+  const seconds = value === null ? NaN : Number(value);
+  return Number.isFinite(seconds) && seconds > 0 ? Math.ceil(seconds) : 60;
+}
+
 // device-code 로그인 — 브라우저 없는 환경(SSH·CI).
 // 1) code 발급 → 2) 사용자가 /device에서 확인 → 3) CLI가 폴링으로 JWT 수신.
 export async function loginDevice() {
-  const res = await fetch(`${V1}/auth/device/code`, { method: "POST" });
+  const codeDeadline = Date.now() + 120_000;
+  let res;
+  while (true) {
+    try {
+      res = await fetch(`${V1}/auth/device/code`, { method: "POST", signal: AbortSignal.timeout(Math.max(1, codeDeadline - Date.now())) });
+    } catch (error) {
+      if (error.name !== "TimeoutError") throw error;
+      console.error(t("Login timed out (2 minutes)"));
+      process.exit(1);
+    }
+    if (res.status !== 429) break;
+    const wait = retryAfterSeconds(res) * 1000;
+    if (Date.now() + wait >= codeDeadline) break;
+    console.error(t("Failed to issue a device code (server responded {status})", { status: res.status }));
+    await new Promise((r) => setTimeout(r, wait));
+  }
   if (!res.ok) {
     console.error(t("Failed to issue a device code (server responded {status})", { status: res.status }));
     process.exit(1);
@@ -170,19 +194,26 @@ export async function loginDevice() {
   const expiresIn = Number(expires_in) || 600;
   const pollInterval = Math.max(1, Number(interval) || 5);
   const deadline = Date.now() + expiresIn * 1000;
-  while (Date.now() < deadline) {
-    await new Promise((r) => setTimeout(r, pollInterval * 1000));
+  let nextWait = pollInterval * 1000;
+  while (Date.now() + nextWait < deadline) {
+    await new Promise((r) => setTimeout(r, nextWait));
+    nextWait = pollInterval * 1000;
     let poll;
     try {
       poll = await fetch(`${V1}/auth/device/token`, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({ device_code }),
+        signal: AbortSignal.timeout(Math.max(1, deadline - Date.now())),
       });
     } catch {
       continue; // Transient network error; retry on next poll tick
     }
     if (poll.status === 202) continue; // authorization_pending
+    if (poll.status === 429) {
+      nextWait = Math.max(pollInterval, retryAfterSeconds(poll)) * 1000;
+      continue;
+    }
     if (!poll.ok) {
       const e = await poll.json().catch(() => ({}));
       if (e.detail === "expired_token") { console.error(t("The code has expired.")); process.exit(1); }