Elgato_dark/orca
1
0
Fork 0
mirror of https://github.com/stablyai/orca synced 2026-04-21 14:17:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix(rate-limits): route Claude OAuth usage fetch through HTTP proxy (#803)

Browse source 
Co-authored-by: Jinwoo-H <jinwoo0825@gmail.com>
This commit is contained in:
Qi Neng 2026-04-19 13:54:37 +08:00 committed by GitHub
parent d0ef5fe4ec
commit 613c5abf1c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 51 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
src/main/rate-limits/claude-fetcher.ts
View file

@ -2,6 +2,7 @@ import { readFile } from 'node:fs/promises'
import { execFile } from 'node:child_process'
import { homedir } from 'node:os'
import path from 'node:path'
import { net, session } from 'electron'
import type { ProviderRateLimits, RateLimitWindow } from '../../shared/rate-limit-types'
import { fetchViaPty } from './claude-pty'
@ -9,6 +10,51 @@ const OAUTH_USAGE_URL = 'https://api.anthropic.com/api/oauth/usage'
const OAUTH_BETA_HEADER = 'oauth-2025-04-20'
const API_TIMEOUT_MS = 10_000
let proxyConfigured = false
/**
* Bridge standard HTTP proxy env vars into Electron's session proxy config.
*
* Why: Electron's net.fetch uses Chromium's networking stack which respects
* OS-level proxy settings but ignores HTTP_PROXY / HTTPS_PROXY env vars.
* Users in regions where api.anthropic.com is only reachable via proxy (see
* #521, #800) often set these env vars rather than configuring system proxy.
* Without this bridge, the usage indicator silently fails and the app may hit
* Anthropic from an unexpected IP, risking rate-limit signals on the account.
*/
async function ensureProxyFromEnv(): Promise<void> {
if (proxyConfigured) {
return
}
proxyConfigured = true
// Why: app.resolveProxy does NOT reflect session-level proxy config —
// only session.defaultSession.resolveProxy does.
const resolved = await session.defaultSession.resolveProxy(OAUTH_USAGE_URL)
if (resolved !== 'DIRECT') {
return
}
const proxyUrl =
process.env.HTTPS_PROXY ??
process.env.https_proxy ??
process.env.ALL_PROXY ??
process.env.all_proxy ??
process.env.HTTP_PROXY ??
process.env.http_proxy
if (!proxyUrl) {
return
}
try {
new URL(proxyUrl)
await session.defaultSession.setProxy({ proxyRules: proxyUrl })
} catch {
// Invalid proxy URL — degrade to direct connection rather than crashing.
// The usage bar is cosmetic; a typo'd envvar should not break polling.
}
}
// ---------------------------------------------------------------------------
// Credential reading — tries multiple sources for an OAuth bearer token
// ---------------------------------------------------------------------------
@ -181,11 +227,15 @@ function mapWindow(
}
async function fetchViaOAuth(token: string): Promise<ProviderRateLimits> {
await ensureProxyFromEnv()
const controller = new AbortController()
const timeout = setTimeout(() => controller.abort(), API_TIMEOUT_MS)
try {
const res = await fetch(OAUTH_USAGE_URL, {
// Why: net.fetch uses Chromium's networking stack which respects OS proxy
// settings and certificates. Env var proxies are bridged by ensureProxyFromEnv.
const res = await net.fetch(OAUTH_USAGE_URL, {
headers: {
Authorization: `Bearer ${token}`,
'anthropic-beta': OAUTH_BETA_HEADER