copilot-api-plus 1.2.31 → 1.2.33

package/dist/main.js

@@ -1321,6 +1321,7 @@ function modelLogger() {
 const accountRoutes = new Hono();
 let cachedDeviceCode;
 let cachedDeviceCodeExpiresAt = 0;
+let pollNotBefore = 0;
 function maskToken(token) {
 	if (token.length <= 8) return "****";
 	return `${token.slice(0, 4)}...${token.slice(-4)}`;
@@ -1455,6 +1456,7 @@ accountRoutes.post("/auth/start", async (c) => {
 		const deviceCode = await getDeviceCode();
 		cachedDeviceCode = deviceCode;
 		cachedDeviceCodeExpiresAt = Date.now() + deviceCode.expires_in * 1e3;
+		pollNotBefore = 0;
 		return c.json(deviceCode);
 	} catch (error) {
 		consola.warn(`Error starting device code flow: ${rootCause(error)}`);
@@ -1462,10 +1464,53 @@ accountRoutes.post("/auth/start", async (c) => {
 		return c.json({ error: "Failed to start device code authorization" }, 500);
 	}
 });
+/** Reset all auth flow state (device code cache + rate limit). */
+function clearAuthFlowState() {
+	cachedDeviceCode = void 0;
+	cachedDeviceCodeExpiresAt = 0;
+	pollNotBefore = 0;
+}
+/** Handle GitHub error responses during device code polling. */
+function handlePollError(json) {
+	if (!("error" in json)) return void 0;
+	switch (json.error) {
+		case "authorization_pending":
+			pollNotBefore = Date.now() + 5e3;
+			return { status: "pending" };
+		case "slow_down": {
+			const interval = typeof json.interval === "number" ? json.interval : 10;
+			pollNotBefore = Date.now() + interval * 1e3;
+			consola.info(`Device code poll: GitHub says slow down, waiting ${interval}s`);
+			return {
+				status: "pending",
+				interval
+			};
+		}
+		case "expired_token":
+			clearAuthFlowState();
+			return { status: "expired" };
+		case "access_denied":
+			clearAuthFlowState();
+			return { status: "denied" };
+		default: return {
+			status: "error",
+			message: json.error_description || json.error
+		};
+	}
+}
 accountRoutes.post("/auth/poll", async (c) => {
 	try {
 		const { device_code, label, account_type } = await c.req.json();
 		if (!device_code) return c.json({ error: "device_code is required" }, 400);
+		const now = Date.now();
+		if (now < pollNotBefore) {
+			const waitSec = Math.ceil((pollNotBefore - now) / 1e3);
+			consola.debug(`Device code poll: throttled, ${waitSec}s remaining`);
+			return c.json({
+				status: "pending",
+				interval: waitSec
+			});
+		}
 		const response = await fetch(`${GITHUB_BASE_URL}/login/oauth/access_token`, {
 			method: "POST",
 			headers: standardHeaders(),
@@ -1489,28 +1534,10 @@ accountRoutes.post("/auth/poll", async (c) => {
 			consola.warn(`Device code poll: GitHub returned non-JSON: ${rawText}`);
 			return c.json({ status: "pending" });
 		}
-		if ("error" in json) switch (json.error) {
-			case "authorization_pending": return c.json({ status: "pending" });
-			case "slow_down": return c.json({
-				status: "pending",
-				interval: 10
-			});
-			case "expired_token":
-				cachedDeviceCode = void 0;
-				cachedDeviceCodeExpiresAt = 0;
-				return c.json({ status: "expired" });
-			case "access_denied":
-				cachedDeviceCode = void 0;
-				cachedDeviceCodeExpiresAt = 0;
-				return c.json({ status: "denied" });
-			default: return c.json({
-				status: "error",
-				message: json.error_description || json.error
-			});
-		}
+		const errorResult = handlePollError(json);
+		if (errorResult) return c.json(errorResult);
 		if ("access_token" in json && json.access_token) {
-			cachedDeviceCode = void 0;
-			cachedDeviceCodeExpiresAt = 0;
+			clearAuthFlowState();
 			const accountLabel = label || `Account ${accountManager.accountCount + 1}`;
 			const account = await accountManager.addAccount(json.access_token, accountLabel, account_type || "individual");
 			return c.json({
@@ -2006,6 +2033,7 @@ async function handleMultiAccountHttpError(error, account, retryContext) {
 				accountManager.markAccountStatus(account.id, "error", `HTTP ${error.response.status}`);
 				return null;
 			}
+			if (error.response.status === 400) return null;
 			accountManager.markAccountStatus(account.id, "error", `HTTP ${error.response.status}`);
 			return null;
 	}