Nvidia/BossAI
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(proxy): propagate account-level proxy across all surfaces

Browse Source 
- chatSurface/openAiResponsesSurface: extract channelProxyUrl once and pass to withSiteRecordProxyRequestInit
- geminiSurface: switch from withSiteProxyRequestInit to withSiteRecordProxyRequestInit with channelProxyUrl
- balanceService: pass accountProxyUrl to sub2api token refresh requests
- siteProxy: fix isAccountOverride to only be true when account proxy differs from site proxy
- Accounts.tsx: use parseAccountExtraConfig helper for proxy badge display
This commit is contained in:
Hureru
2026-03-21 11:44:57 +08:00
parent 8df3b1431f
commit 4d0c4b8129
6 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/proxy-core/surfaces/chatSurface.ts
+2 -2
View File
@@ -204,6 +204,7 @@ export async function handleChatSurfaceRequest(
runtime: endpointRequest.runtime,
};
};
const channelProxyUrl = resolveChannelProxyUrl(selected.site, selected.account.extraConfig);
const dispatchRequest = (
compatibilityRequest: BuiltEndpointRequest,
targetUrl?: string,
@@ -216,7 +217,7 @@ export async function handleChatSurfaceRequest(
method: 'POST',
headers: requestForFetch.headers,
body: JSON.stringify(requestForFetch.body),
}),
}, channelProxyUrl),
})
);
const endpointStrategy = downstreamTransformer.compatibility.createEndpointStrategy({
@@ -265,7 +266,6 @@ export async function handleChatSurfaceRequest(
try {
const endpointResult = await executeEndpointFlow({
siteUrl: selected.site.url,
proxyUrl: resolveChannelProxyUrl(selected.site, selected.account.extraConfig),
endpointCandidates,
buildRequest: (endpoint) => buildEndpointRequest(endpoint),
dispatchRequest,
src/server/proxy-core/surfaces/geminiSurface.ts
+7 -5
View File
@@ -9,7 +9,7 @@ import { isModelAllowedByPolicyOrAllowedRoutes } from '../../services/downstream
import { tokenRouter } from '../../services/tokenRouter.js';
import { buildOauthProviderHeaders } from '../../services/oauth/service.js';
import { getOauthInfoFromExtraConfig } from '../../services/oauth/oauthAccount.js';
import { withSiteProxyRequestInit } from '../../services/siteProxy.js';
import { resolveChannelProxyUrl, withSiteRecordProxyRequestInit } from '../../services/siteProxy.js';
import { refreshModelsAndRebuildRoutes } from '../../services/modelService.js';
import { getDownstreamRoutingPolicy } from '../../routes/proxy/downstreamPolicy.js';
import { executeEndpointFlow, type BuiltEndpointRequest } from '../../routes/proxy/endpointFlow.js';
@@ -470,6 +470,7 @@ export async function geminiProxyRoute(app: FastifyInstance) {
selected.tokenValue,
query,
);
const channelProxyUrl = resolveChannelProxyUrl(selected.site, selected.account.extraConfig);
const upstream = isInternalGemini
? await dispatchRuntimeRequest({
siteUrl: selected.site.url,
@@ -489,11 +490,11 @@ export async function geminiProxyRoute(app: FastifyInstance) {
: (isStreamAction ? 'streamGenerateContent' : 'generateContent'),
},
},
buildInit: async (requestUrl, requestForFetch) => withSiteProxyRequestInit(requestUrl, {
buildInit: async (_requestUrl, requestForFetch) => withSiteRecordProxyRequestInit(selected.site, {
method: 'POST',
headers: requestForFetch.headers,
body: JSON.stringify(requestForFetch.body),
}),
}, channelProxyUrl),
})
: await fetch(targetUrl, {
method: 'POST',
@@ -741,16 +742,17 @@ export async function geminiProxyRoute(app: FastifyInstance) {
runtime: endpointRequest.runtime,
};
};
const channelProxyUrl = resolveChannelProxyUrl(selected.site, selected.account.extraConfig);
const dispatchRequest = (compatibilityRequest: BuiltEndpointRequest, targetUrl?: string) => (
dispatchRuntimeRequest({
siteUrl: selected.site.url,
targetUrl,
request: compatibilityRequest,
buildInit: async (requestUrl, requestForFetch) => withSiteProxyRequestInit(requestUrl, {
buildInit: async (_requestUrl, requestForFetch) => withSiteRecordProxyRequestInit(selected.site, {
method: 'POST',
headers: requestForFetch.headers,
body: JSON.stringify(requestForFetch.body),
}),
}, channelProxyUrl),
})
);
const endpointStrategy = createChatEndpointStrategy({
src/server/proxy-core/surfaces/openAiResponsesSurface.ts
+2 -2
View File
@@ -304,6 +304,7 @@ export async function handleOpenAiResponsesSurfaceRequest(
runtime: endpointRequest.runtime,
};
};
const channelProxyUrl = resolveChannelProxyUrl(selected.site, selected.account.extraConfig);
const dispatchRequest = (compatibilityRequest: BuiltEndpointRequest, targetUrl?: string) => (
dispatchRuntimeRequest({
siteUrl: selected.site.url,
@@ -313,7 +314,7 @@ export async function handleOpenAiResponsesSurfaceRequest(
method: 'POST',
headers: requestForFetch.headers,
body: JSON.stringify(requestForFetch.body),
}),
}, channelProxyUrl),
})
);
const endpointStrategy = openAiResponsesTransformer.compatibility.createEndpointStrategy({
@@ -355,7 +356,6 @@ export async function handleOpenAiResponsesSurfaceRequest(
try {
const endpointResult = await executeEndpointFlow({
siteUrl: selected.site.url,
proxyUrl: resolveChannelProxyUrl(selected.site, selected.account.extraConfig),
endpointCandidates,
buildRequest: (endpoint) => buildEndpointRequest(endpoint),
dispatchRequest,
src/server/services/balanceService.ts
+5 -5
View File
@@ -201,7 +201,7 @@ async function refreshSub2ApiManagedSession(params: {
method: 'POST',
headers,
body: JSON.stringify({ refresh_token: refreshToken }),
}));
}, getProxyUrlFromExtraConfig(params.account.extraConfig)));
payload = await response.json().catch(() => null);
} catch (err: any) {
throw new Error(err?.message || 'sub2api token refresh request failed');
@@ -382,23 +382,23 @@ export async function refreshBalance(accountId: number) {
let activeExtraConfig = account.extraConfig;
let balanceInfo: BalanceInfo | null = null;
const accountProxyUrl = getProxyUrlFromExtraConfig(account.extraConfig);
if (isSub2ApiPlatform(site.platform)) {
const managedAuth = getSub2ApiAuthFromExtraConfig(activeExtraConfig);
if (managedAuth?.refreshToken && isNearTokenExpiry(managedAuth.tokenExpiresAt)) {
try {
const refreshed = await refreshSub2ApiManagedSession({
const refreshed = await withAccountProxyOverride(accountProxyUrl, () => refreshSub2ApiManagedSession({
account,
site,
currentAccessToken: activeAccessToken,
currentExtraConfig: activeExtraConfig,
});
}));
activeAccessToken = refreshed.accessToken;
activeExtraConfig = refreshed.extraConfig;
} catch {}
}
}
const accountProxyUrl = getProxyUrlFromExtraConfig(account.extraConfig);
const readBalance = async (token: string) => withAccountProxyOverride(accountProxyUrl,
() => adapter.getBalance(site.url, token, platformUserId));
const handleBalanceError = async (err: any) => {
src/server/services/siteProxy.ts
+4 -2
View File
@@ -470,8 +470,10 @@ export function withSiteRecordProxyRequestInit(
nextOptions.headers = mergedHeaders;
}
const accountNormalized = normalizeSiteProxyUrl(accountProxyUrl);
const proxyUrl = accountNormalized || resolveProxyUrlForSite(site);
return withExplicitProxyRequestInit(proxyUrl, nextOptions, !!accountNormalized);
const siteProxyUrl = resolveProxyUrlForSite(site);
const proxyUrl = accountNormalized || siteProxyUrl;
const isAccountOverride = !!accountNormalized && accountNormalized !== siteProxyUrl;
return withExplicitProxyRequestInit(proxyUrl, nextOptions, isAccountOverride);
}
export function resolveChannelProxyUrl(
src/web/pages/Accounts.tsx
+10 -14
View File
@@ -653,25 +653,23 @@ export default function Accounts() {
}
};
const parseAccountExtraConfig = (account: any): Record<string, any> => {
try { return JSON.parse(account?.extraConfig || '{}') || {}; }
catch { return {}; }
};
const extractManagedSub2ApiAuth = (account: any) => {
try {
const parsed = JSON.parse(account?.extraConfig || '{}');
const parsed = parseAccountExtraConfig(account);
const auth = parsed?.sub2apiAuth || {};
return {
refreshToken: typeof auth.refreshToken === 'string' ? auth.refreshToken : '',
tokenExpiresAt: auth.tokenExpiresAt ? String(auth.tokenExpiresAt) : '',
};
} catch {
return { refreshToken: '', tokenExpiresAt: '' };
}
};
const openEditPanel = (account: any) => {
const managedAuth = extractManagedSub2ApiAuth(account);
const proxyUrl = (() => {
try { return JSON.parse(account?.extraConfig || '{}')?.proxyUrl || ''; }
catch { return ''; }
})();
const proxyUrl = parseAccountExtraConfig(account)?.proxyUrl || '';
closeAddPanel();
setRebindTarget(null);
setEditingAccount(account);
@@ -793,12 +791,10 @@ export default function Accounts() {
};
const extractPlatformUserId = (account: any): string => {
try {
const parsed = JSON.parse(account?.extraConfig || '{}');
const parsed = parseAccountExtraConfig(account);
const raw = parsed?.platformUserId;
const value = Number.parseInt(String(raw ?? ''), 10);
if (Number.isFinite(value) && value > 0) return String(value);
} catch { }
const guessed = Number.parseInt(String(account?.username || '').match(/(\d{3,8})$/)?.[1] || '', 10);
return Number.isFinite(guessed) && guessed > 0 ? String(guessed) : '';
};
@@ -1605,7 +1601,7 @@ export default function Accounts() {
<span className={`badge ${connectionMode === 'apikey' ? 'badge-warning' : 'badge-info'}`} style={{ fontSize: 10 }}>
{connectionMode === 'apikey' ? 'API Key' : 'Session'}
</span>
{(() => { try { return JSON.parse(a.extraConfig || '{}')?.proxyUrl; } catch { return null; } })() && (
{parseAccountExtraConfig(a)?.proxyUrl && (
<span className="badge badge-purple" style={{ fontSize: 10 }}>代理</span>
)}
</div>
@@ -1818,7 +1814,7 @@ export default function Accounts() {
<span className={`badge ${connectionMode === 'apikey' ? 'badge-warning' : 'badge-info'}`} style={{ fontSize: 10 }}>
{connectionMode === 'apikey' ? 'API Key' : 'Session'}
</span>
{(() => { try { return JSON.parse(a.extraConfig || '{}')?.proxyUrl; } catch { return null; } })() && (
{parseAccountExtraConfig(a)?.proxyUrl && (
<span className="badge badge-purple" style={{ fontSize: 10 }}>代理</span>
)}
</div>