forked from boos/BoosAPI
feat(proxy): wrap platform adapter calls with account proxy override
Use withAccountProxyOverride to propagate account-level proxy URL through AsyncLocalStorage for checkin, balance refresh, model discovery, token sync, rebind-session verify, and token CRUD operations. Also accept proxyUrl field in PUT /api/accounts/:id with validation via parseSiteProxyUrlInput.
This commit is contained in:
@@ -12,8 +12,9 @@ import {
|
||||
syncTokensFromUpstream,
|
||||
} from '../../services/accountTokenService.js';
|
||||
import { getAdapter } from '../../services/platforms/index.js';
|
||||
import { getCredentialModeFromExtraConfig, resolvePlatformUserId } from '../../services/accountExtraConfig.js';
|
||||
import { getCredentialModeFromExtraConfig, getProxyUrlFromExtraConfig, resolvePlatformUserId } from '../../services/accountExtraConfig.js';
|
||||
import { startBackgroundTask } from '../../services/backgroundTaskService.js';
|
||||
import { withAccountProxyOverride } from '../../services/siteProxy.js';
|
||||
|
||||
type AccountWithSiteRow = {
|
||||
accounts: typeof schema.accounts.$inferSelect;
|
||||
@@ -231,15 +232,18 @@ async function executeAccountTokenSync(row: AccountWithSiteRow): Promise<SyncExe
|
||||
|
||||
try {
|
||||
const platformUserId = resolvePlatformUserId(row.accounts.extraConfig, row.accounts.username);
|
||||
const accountProxyUrl = getProxyUrlFromExtraConfig(row.accounts.extraConfig);
|
||||
let tokens = await withTimeout(
|
||||
() => adapter.getApiTokens(row.sites.url, row.accounts.accessToken, platformUserId),
|
||||
() => withAccountProxyOverride(accountProxyUrl,
|
||||
() => adapter.getApiTokens(row.sites.url, row.accounts.accessToken, platformUserId)),
|
||||
TOKEN_SYNC_TIMEOUT_MS,
|
||||
`token sync timeout (${Math.round(TOKEN_SYNC_TIMEOUT_MS / 1000)}s)`,
|
||||
);
|
||||
|
||||
if (tokens.length === 0) {
|
||||
const fallback = await withTimeout(
|
||||
() => adapter.getApiToken(row.sites.url, row.accounts.accessToken, platformUserId),
|
||||
() => withAccountProxyOverride(accountProxyUrl,
|
||||
() => adapter.getApiToken(row.sites.url, row.accounts.accessToken, platformUserId)),
|
||||
TOKEN_SYNC_TIMEOUT_MS,
|
||||
`token sync timeout (${Math.round(TOKEN_SYNC_TIMEOUT_MS / 1000)}s)`,
|
||||
);
|
||||
@@ -468,20 +472,23 @@ export async function accountTokensRoutes(app: FastifyInstance) {
|
||||
}
|
||||
|
||||
const platformUserId = resolvePlatformUserId(account.extraConfig, account.username);
|
||||
const createdViaUpstream = await adapter.createApiToken(
|
||||
site.url,
|
||||
account.accessToken,
|
||||
platformUserId,
|
||||
{
|
||||
name: asTrimmedString(body.name),
|
||||
group: asTrimmedString(body.group),
|
||||
unlimitedQuota,
|
||||
remainQuota,
|
||||
expiredTime,
|
||||
allowIps: asTrimmedString(body.allowIps),
|
||||
modelLimitsEnabled,
|
||||
modelLimits: asTrimmedString(body.modelLimits),
|
||||
},
|
||||
const createdViaUpstream = await withAccountProxyOverride(
|
||||
getProxyUrlFromExtraConfig(account.extraConfig),
|
||||
() => adapter.createApiToken(
|
||||
site.url,
|
||||
account.accessToken,
|
||||
platformUserId,
|
||||
{
|
||||
name: asTrimmedString(body.name),
|
||||
group: asTrimmedString(body.group),
|
||||
unlimitedQuota,
|
||||
remainQuota,
|
||||
expiredTime,
|
||||
allowIps: asTrimmedString(body.allowIps),
|
||||
modelLimitsEnabled,
|
||||
modelLimits: asTrimmedString(body.modelLimits),
|
||||
},
|
||||
),
|
||||
);
|
||||
if (!createdViaUpstream) {
|
||||
return reply.code(502).send({ success: false, message: '站点创建令牌失败' });
|
||||
@@ -536,11 +543,14 @@ export async function accountTokensRoutes(app: FastifyInstance) {
|
||||
|
||||
if (shouldDeleteUpstream) {
|
||||
const platformUserId = resolvePlatformUserId(account.extraConfig, account.username);
|
||||
const upstreamDeleted = await adapter!.deleteApiToken(
|
||||
site.url,
|
||||
account.accessToken,
|
||||
existing.token,
|
||||
platformUserId,
|
||||
const upstreamDeleted = await withAccountProxyOverride(
|
||||
getProxyUrlFromExtraConfig(account.extraConfig),
|
||||
() => adapter!.deleteApiToken(
|
||||
site.url,
|
||||
account.accessToken,
|
||||
existing.token,
|
||||
platformUserId,
|
||||
),
|
||||
);
|
||||
if (!upstreamDeleted) {
|
||||
return { success: false, message: '站点删除令牌失败,本地未删除' };
|
||||
@@ -771,7 +781,10 @@ export async function accountTokensRoutes(app: FastifyInstance) {
|
||||
|
||||
try {
|
||||
const platformUserId = resolvePlatformUserId(account.extraConfig, account.username);
|
||||
const groups = await adapter.getUserGroups(site.url, account.accessToken, platformUserId);
|
||||
const groups = await withAccountProxyOverride(
|
||||
getProxyUrlFromExtraConfig(account.extraConfig),
|
||||
() => adapter.getUserGroups(site.url, account.accessToken, platformUserId),
|
||||
);
|
||||
const normalized = Array.from(new Set((groups || []).map((item) => String(item || '').trim()).filter(Boolean)));
|
||||
return { success: true, groups: normalized.length > 0 ? normalized : ['default'] };
|
||||
} catch (error: any) {
|
||||
|
||||
@@ -7,6 +7,7 @@ import { refreshModelsForAccount, rebuildTokenRoutesFromAvailability } from '../
|
||||
import { ensureDefaultTokenForAccount, syncTokensFromUpstream } from '../../services/accountTokenService.js';
|
||||
import {
|
||||
getCredentialModeFromExtraConfig,
|
||||
getProxyUrlFromExtraConfig,
|
||||
guessPlatformUserIdFromUsername,
|
||||
getSub2ApiAuthFromExtraConfig,
|
||||
mergeAccountExtraConfig,
|
||||
@@ -25,7 +26,7 @@ import {
|
||||
type RuntimeHealthState,
|
||||
} from '../../services/accountHealthService.js';
|
||||
import { appendSessionTokenRebindHint } from '../../services/alertRules.js';
|
||||
import { withSiteRecordProxyRequestInit } from '../../services/siteProxy.js';
|
||||
import { parseSiteProxyUrlInput, withAccountProxyOverride, withSiteRecordProxyRequestInit } from '../../services/siteProxy.js';
|
||||
import { createRateLimitGuard } from '../../middleware/requestRateLimit.js';
|
||||
|
||||
type AccountWithSiteRow = {
|
||||
@@ -890,7 +891,10 @@ export async function accountsRoutes(app: FastifyInstance) {
|
||||
|
||||
let verifyResult: any;
|
||||
try {
|
||||
verifyResult = await adapter.verifyToken(site.url, nextAccessToken, candidatePlatformUserId);
|
||||
verifyResult = await withAccountProxyOverride(
|
||||
getProxyUrlFromExtraConfig(account.extraConfig),
|
||||
() => adapter.verifyToken(site.url, nextAccessToken, candidatePlatformUserId),
|
||||
);
|
||||
} catch (err: any) {
|
||||
return reply.code(400).send({
|
||||
success: false,
|
||||
@@ -1210,6 +1214,18 @@ export async function accountsRoutes(app: FastifyInstance) {
|
||||
updates.sortOrder = normalizedSortOrder;
|
||||
}
|
||||
|
||||
if (Object.prototype.hasOwnProperty.call(body, 'proxyUrl')) {
|
||||
const baseExtraConfig = typeof updates.extraConfig === 'string'
|
||||
? updates.extraConfig : account.extraConfig;
|
||||
const { present, valid, proxyUrl: normalizedProxy } = parseSiteProxyUrlInput(body.proxyUrl);
|
||||
if (present && !valid) {
|
||||
return reply.code(400).send({ message: 'Invalid proxy URL format' });
|
||||
}
|
||||
updates.extraConfig = mergeAccountExtraConfig(baseExtraConfig, {
|
||||
proxyUrl: normalizedProxy ?? undefined,
|
||||
});
|
||||
}
|
||||
|
||||
updates.updatedAt = new Date().toISOString();
|
||||
await db.update(schema.accounts).set(updates).where(eq(schema.accounts.id, id)).run();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user