copilot-api-plus 1.2.4 → 1.2.6

package/dist/main.js

@@ -1,7 +1,6 @@
 #!/usr/bin/env node
-import { n as forwardError, t as HTTPError } from "./error-CvwUkoEo.js";
-import { _ as ensurePaths, a as stopCopilotTokenRefresh, c as accountManager, d as cacheVSCodeVersion, f as findModel, g as PATHS, h as sleep, i as setupGitHubToken, l as getCopilotUsage, m as rootCause, n as refreshCopilotToken, o as pollAccessToken, p as isNullish, r as setupCopilotToken, s as getDeviceCode, t as clearGithubToken, u as cacheModels } from "./token-CMRVLQJZ.js";
-import { a as GITHUB_BASE_URL, c as copilotHeaders, n as state, o as GITHUB_CLIENT_ID, s as copilotBaseUrl, u as standardHeaders } from "./get-user-BT7hEyDN.js";
+import { _ as GITHUB_BASE_URL, a as PATHS, b as copilotHeaders, c as forwardError, d as findModel, f as isNullish, h as state, l as cacheModels, m as sleep, o as ensurePaths, p as rootCause, r as getCopilotUsage, s as HTTPError, t as accountManager, u as cacheVSCodeVersion, v as GITHUB_CLIENT_ID, x as standardHeaders, y as copilotBaseUrl } from "./account-manager-DmXXcFBW.js";
+import { a as stopCopilotTokenRefresh, i as setupGitHubToken, n as refreshCopilotToken, o as pollAccessToken, r as setupCopilotToken, s as getDeviceCode, t as clearGithubToken } from "./token-DUSd-gxE.js";
 import { createRequire } from "node:module";
 import { defineCommand, runMain } from "citty";
 import consola from "consola";
@@ -121,16 +120,18 @@ async function applyProxyConfig() {
 }
 //#endregion
 //#region src/lib/proxy.ts
+const agentOptions = {
+	keepAliveTimeout: 3e4,
+	keepAliveMaxTimeout: 6e4,
+	connect: { timeout: 15e3 }
+};
+let direct;
+let proxies = /* @__PURE__ */ new Map();
 function initProxyFromEnv() {
 	if (typeof Bun !== "undefined") return;
 	try {
-		const agentOptions = {
-			keepAliveTimeout: 3e4,
-			keepAliveMaxTimeout: 6e4,
-			connect: { timeout: 15e3 }
-		};
-		const direct = new Agent(agentOptions);
-		const proxies = /* @__PURE__ */ new Map();
+		direct = new Agent(agentOptions);
+		proxies = /* @__PURE__ */ new Map();
 		setGlobalDispatcher({
 			dispatch(options, handler) {
 				try {
@@ -174,6 +175,28 @@ function initProxyFromEnv() {
 		consola.debug("Proxy setup skipped:", err);
 	}
 }
+/**
+* Destroy all pooled connections (direct + proxy agents) and replace them
+* with fresh instances.  The global dispatcher's `dispatch` method captures
+* `direct` and `proxies` by reference, so subsequent requests automatically
+* use the new agents — no need to call `setGlobalDispatcher` again.
+*
+* Call this after a network error to discard stale/half-closed sockets that
+* would otherwise cause every retry to wait ~60 s before timing out.
+*
+* Under the Bun runtime (which doesn't use undici) this is a no-op.
+*/
+function resetConnections() {
+	if (typeof Bun !== "undefined") return;
+	if (!direct) return;
+	const oldDirect = direct;
+	const oldProxies = proxies;
+	direct = new Agent(agentOptions);
+	proxies = /* @__PURE__ */ new Map();
+	oldDirect.close().catch(() => {});
+	for (const agent of oldProxies.values()) agent.close().catch(() => {});
+	consola.debug("Connection pool reset — stale sockets cleared");
+}
 //#endregion
 //#region src/account.ts
 const addAccount = defineCommand({
@@ -1398,7 +1421,8 @@ accountRoutes.get("/", (c) => {
 		const accounts = accountManager.getAccounts().map((a) => sanitiseAccount(a));
 		return c.json({ accounts });
 	} catch (error) {
-		consola.error("Error listing accounts:", error);
+		consola.warn(`Error listing accounts: ${rootCause(error)}`);
+		consola.debug("Error listing accounts:", error);
 		return c.json({ error: "Failed to list accounts" }, 500);
 	}
 });
@@ -1409,7 +1433,8 @@ accountRoutes.post("/", async (c) => {
 		const account = await accountManager.addAccount(body.githubToken, body.label, body.accountType);
 		return c.json({ account: sanitiseAccount(account) }, 201);
 	} catch (error) {
-		consola.error("Error adding account:", error);
+		consola.warn(`Error adding account: ${rootCause(error)}`);
+		consola.debug("Error adding account:", error);
 		return c.json({ error: "Failed to add account" }, 500);
 	}
 });
@@ -1419,7 +1444,8 @@ accountRoutes.delete("/:id", async (c) => {
 		if (!await accountManager.removeAccount(id)) return c.json({ error: "Account not found" }, 404);
 		return c.json({ success: true });
 	} catch (error) {
-		consola.error("Error removing account:", error);
+		consola.warn(`Error removing account: ${rootCause(error)}`);
+		consola.debug("Error removing account:", error);
 		return c.json({ error: "Failed to remove account" }, 500);
 	}
 });
@@ -1439,7 +1465,8 @@ accountRoutes.put("/:id/status", async (c) => {
 		await accountManager.saveAccounts();
 		return c.json({ account: sanitiseAccount(account) });
 	} catch (error) {
-		consola.error("Error updating account status:", error);
+		consola.warn(`Error updating account status: ${rootCause(error)}`);
+		consola.debug("Error updating account status:", error);
 		return c.json({ error: "Failed to update account status" }, 500);
 	}
 });
@@ -1452,7 +1479,8 @@ accountRoutes.post("/:id/refresh", async (c) => {
 		await accountManager.refreshAccountUsage(account);
 		return c.json({ account: sanitiseAccount(account) });
 	} catch (error) {
-		consola.error("Error refreshing account:", error);
+		consola.warn(`Error refreshing account: ${rootCause(error)}`);
+		consola.debug("Error refreshing account:", error);
 		return c.json({ error: "Failed to refresh account" }, 500);
 	}
 });
@@ -1461,7 +1489,8 @@ accountRoutes.post("/auth/start", async (c) => {
 		const deviceCode = await getDeviceCode();
 		return c.json(deviceCode);
 	} catch (error) {
-		consola.error("Error starting device code flow:", error);
+		consola.warn(`Error starting device code flow: ${rootCause(error)}`);
+		consola.debug("Error starting device code flow:", error);
 		return c.json({ error: "Failed to start device code authorization" }, 500);
 	}
 });
@@ -1503,7 +1532,8 @@ accountRoutes.post("/auth/poll", async (c) => {
 		}
 		return c.json({ status: "pending" });
 	} catch (error) {
-		consola.error("Error polling device code:", error);
+		consola.warn(`Error polling device code: ${rootCause(error)}`);
+		consola.debug("Error polling device code:", error);
 		return c.json({ error: "Failed to poll device code authorization" }, 500);
 	}
 });
@@ -1537,7 +1567,8 @@ accountRoutes.get("/usage", (c) => {
 			accounts: accountSummaries
 		});
 	} catch (error) {
-		consola.error("Error fetching aggregated usage:", error);
+		consola.warn(`Error fetching aggregated usage: ${rootCause(error)}`);
+		consola.debug("Error fetching aggregated usage:", error);
 		return c.json({ error: "Failed to fetch aggregated usage" }, 500);
 	}
 });
@@ -1549,7 +1580,8 @@ modelAdminRoutes.get("/available", (c) => {
 		const models = state.models?.data ?? [];
 		return c.json(models);
 	} catch (error) {
-		consola.error("Error fetching available models:", error);
+		consola.warn(`Error fetching available models: ${rootCause(error)}`);
+		consola.debug("Error fetching available models:", error);
 		return c.json({ error: "Failed to fetch available models" }, 500);
 	}
 });
@@ -1557,7 +1589,8 @@ modelAdminRoutes.get("/mapping", (c) => {
 	try {
 		return c.json(modelRouter.getConfig());
 	} catch (error) {
-		consola.error("Error fetching model mapping:", error);
+		consola.warn(`Error fetching model mapping: ${rootCause(error)}`);
+		consola.debug("Error fetching model mapping:", error);
 		return c.json({ error: "Failed to fetch model mapping" }, 500);
 	}
 });
@@ -1570,7 +1603,8 @@ modelAdminRoutes.put("/mapping", async (c) => {
 		await saveModelMappingConfig(modelRouter.getConfig());
 		return c.json(modelRouter.getConfig());
 	} catch (error) {
-		consola.error("Error updating model mapping:", error);
+		consola.warn(`Error updating model mapping: ${rootCause(error)}`);
+		consola.debug("Error updating model mapping:", error);
 		return c.json({ error: "Failed to update model mapping" }, 500);
 	}
 });
@@ -1578,7 +1612,8 @@ modelAdminRoutes.get("/concurrency", (c) => {
 	try {
 		return c.json({ concurrency: modelRouter.getConfig().concurrency });
 	} catch (error) {
-		consola.error("Error fetching concurrency config:", error);
+		consola.warn(`Error fetching concurrency config: ${rootCause(error)}`);
+		consola.debug("Error fetching concurrency config:", error);
 		return c.json({ error: "Failed to fetch concurrency config" }, 500);
 	}
 });
@@ -1591,7 +1626,8 @@ modelAdminRoutes.put("/concurrency", async (c) => {
 		await saveModelMappingConfig(modelRouter.getConfig());
 		return c.json({ concurrency: modelRouter.getConfig().concurrency });
 	} catch (error) {
-		consola.error("Error updating concurrency config:", error);
+		consola.warn(`Error updating concurrency config: ${rootCause(error)}`);
+		consola.debug("Error updating concurrency config:", error);
 		return c.json({ error: "Failed to update concurrency config" }, 500);
 	}
 });
@@ -1715,6 +1751,7 @@ async function fetchWithRetry(url, buildInit) {
 		return await fetchWithTimeout(url, buildInit());
 	} catch (error) {
 		lastError = error;
+		if (attempt === 0) resetConnections();
 		if (attempt < maxAttempts - 1) {
 			const delay = RETRY_DELAYS[attempt];
 			consola.warn(`Network error on attempt ${attempt + 1}/${maxAttempts}, retrying in ${delay}ms:`, error instanceof Error ? error.message : error);
@@ -2583,7 +2620,8 @@ async function handleCountTokens(c) {
 		console.log("Token count:", finalTokenCount);
 		return c.json({ input_tokens: finalTokenCount });
 	} catch (error) {
-		consola.error("Error counting tokens:", error);
+		consola.warn(`Error counting tokens: ${rootCause(error)}`);
+		consola.debug("Error counting tokens:", error);
 		return c.json({ input_tokens: 1 });
 	}
 }
@@ -2871,7 +2909,8 @@ tokenRoute.get("/", (c) => {
 	try {
 		return c.json({ token: state.copilotToken });
 	} catch (error) {
-		consola.error("Error fetching token:", error);
+		consola.warn(`Error fetching token: ${rootCause(error)}`);
+		consola.debug("Error fetching token:", error);
 		return c.json({
 			error: "Failed to fetch token",
 			token: null
@@ -2893,7 +2932,8 @@ usageRoute.get("/", async (c) => {
 		const usage = await getCopilotUsage();
 		return c.json(usage);
 	} catch (error) {
-		consola.error("Error fetching usage:", error);
+		consola.warn(`Error fetching usage: ${rootCause(error)}`);
+		consola.debug("Error fetching usage:", error);
 		return c.json({ error: "Failed to fetch Copilot usage" }, 500);
 	}
 });
@@ -3010,7 +3050,7 @@ async function validateGitHubToken(token) {
 	state.githubToken = token;
 	consola.info("Using provided GitHub token");
 	try {
-		const { getGitHubUser } = await import("./get-user-BTN_-eOk.js");
+		const { getGitHubUser } = await import("./get-user-DHr540ak.js");
 		const user = await getGitHubUser();
 		consola.info(`Logged in as ${user.login}`);
 	} catch (error) {
@@ -3056,10 +3096,10 @@ async function runServer(options) {
 	try {
 		await setupCopilotToken();
 	} catch (error) {
-		const { HTTPError } = await import("./error-DLqcVQL_.js");
+		const { HTTPError } = await import("./error-Cc8bY0ph.js");
 		if (error instanceof HTTPError && error.response.status === 401) {
 			consola.error("Failed to get Copilot token - GitHub token may be invalid or Copilot access revoked");
-			const { clearGithubToken } = await import("./token-CHJ7rYg0.js");
+			const { clearGithubToken } = await import("./token-B_m1icXz.js");
 			await clearGithubToken();
 			consola.info("Please restart to re-authenticate");
 		}