copilot-api-plus 1.2.49 → 1.2.51

package/dist/main.js

@@ -2259,9 +2259,14 @@ async function handleMultiAccountHttpError(error, account, retryContext) {
 		case 429:
 			accountManager.markAccountStatus(account.id, "rate_limited", "429 Rate limited");
 			return null;
+		case 408:
+			consola.warn(`Account ${account.label}: 408 request timeout (network issue, not rotating)`);
+			error.__nonAccountError = true;
+			return null;
 		default:
 			if (error.response.status >= 500) {
 				accountManager.markAccountStatus(account.id, "error", `HTTP ${error.response.status}`);
+				recordBreakerFailure(`HTTP ${error.response.status}`);
 				return null;
 			}
 			if (error.response.status === 400) {
@@ -2276,9 +2281,45 @@ async function handleMultiAccountHttpError(error, account, retryContext) {
 			return null;
 	}
 }
+const CB_THRESHOLD = 3;
+const CB_OPEN_MS = 3e4;
+const breaker = {
+	failures: 0,
+	openedAt: 0
+};
+function breakerOpenRemainingMs() {
+	if (breaker.openedAt === 0) return 0;
+	const elapsed = Date.now() - breaker.openedAt;
+	return elapsed >= CB_OPEN_MS ? 0 : CB_OPEN_MS - elapsed;
+}
+function recordBreakerSuccess() {
+	if (breaker.failures !== 0 || breaker.openedAt !== 0) consola.info("Circuit breaker: closing (request succeeded)");
+	breaker.failures = 0;
+	breaker.openedAt = 0;
+}
+function recordBreakerFailure(reason) {
+	breaker.failures += 1;
+	if (breaker.failures >= CB_THRESHOLD && breaker.openedAt === 0) {
+		breaker.openedAt = Date.now();
+		consola.warn(`Circuit breaker OPEN for ${CB_OPEN_MS / 1e3}s after ${breaker.failures} consecutive failures (last: ${reason})`);
+	}
+}
 async function createWithMultiAccount(payload) {
+	const remaining = breakerOpenRemainingMs();
+	if (remaining > 0) throw new HTTPError("Upstream temporarily unavailable", new Response(JSON.stringify({ error: {
+		type: "service_unavailable",
+		message: `Upstream (or proxy) is failing repeatedly. Circuit breaker open; will retry probe in ${Math.ceil(remaining / 1e3)}s.`
+	} }), {
+		status: 503,
+		statusText: "Service Unavailable",
+		headers: {
+			"content-type": "application/json",
+			"retry-after": String(Math.ceil(remaining / 1e3))
+		}
+	}));
 	const triedAccountIds = /* @__PURE__ */ new Set();
 	let lastError;
+	let networkRetried = false;
 	for (let attempt = 0; attempt < 3; attempt++) {
 		const account = accountManager.getActiveAccount();
 		if (!account || triedAccountIds.has(account.id)) break;
@@ -2316,6 +2357,7 @@ async function createWithMultiAccount(payload) {
 			const result = await doFetch(payload, tokenSource, account.id);
 			account.lastRequestAt = Date.now();
 			accountManager.markAccountSuccess(account.id);
+			recordBreakerSuccess();
 			if (Symbol.asyncIterator in result) result.__accountInfo = {
 				accountId: account.id,
 				accountProxy: account.proxy,
@@ -2333,7 +2375,15 @@ async function createWithMultiAccount(payload) {
 				if (error.__nonAccountError) throw error;
 			} else {
 				const errMsg = error.message || String(error);
-				consola.warn(`Account ${account.label}: network error (not rotating): ${errMsg}`);
+				if (!networkRetried) {
+					networkRetried = true;
+					consola.warn(`Account ${account.label}: network error, resetting pool and retrying once: ${errMsg}`);
+					resetAccountConnections(account.id);
+					triedAccountIds.delete(account.id);
+					continue;
+				}
+				consola.warn(`Account ${account.label}: network error after retry (giving up): ${errMsg}`);
+				recordBreakerFailure(`network: ${errMsg.slice(0, 80)}`);
 				throw error;
 			}
 			consola.warn(`Account ${account.label} failed (attempt ${attempt + 1}), trying next...`);