Formerly KrillinAI, VideoTranslation and Dubbing Tool for 120+ Languages. Open-source AI workspace for creators, powered by Codex. Video downloader, video translation, create videos, images, audios, and edits with Agents in one place. For your Social Media like YouTube, TikTok, Instagram, etc.
TypeScript agent-skillscodex-clideskop-appdubbingimage-generationlocalizationskillsttsvideo-editingvideo-generationvideo-transcriptionvideo-translation
Fix route selector visibility during gateway account restore
Leggett3753ce283d29
diff --git a/apps/daemon/src/gateway/account-service.ts b/apps/daemon/src/gateway/account-service.tsindex 91b0b651..584b03f2 100644--- a/apps/daemon/src/gateway/account-service.ts+++ b/apps/daemon/src/gateway/account-service.ts@@ -216,6 +216,7 @@ export function createGatewayAccountService(input: {await saveConfiguration();if (!credentials) return;state.supplier = credentials.supplier;+ state.transport = credentials.transport;state.account = credentials.account ?? null; state.authState = 'signed_in'; state.models = credentials.models ?? [];if (credentials.modelAccessError) { restoreModelAccessError(credentials.modelAccessError); return; }if (input.deferStartupActivation) {diff --git a/apps/daemon/test/integration/gateway-startup.test.ts b/apps/daemon/test/integration/gateway-startup.test.tsindex d23aa7b9..1700e6fa 100644--- a/apps/daemon/test/integration/gateway-startup.test.ts+++ b/apps/daemon/test/integration/gateway-startup.test.ts@@ -7,7 +7,7 @@ import { buildServer } from '../../src/api/server.js';import { createGatewayConfigStore } from '../../src/gateway/config-store.js';import type { SchedulerService } from '../../src/scheduler/service.js';-it.each([true, false])('网关请求未完成时本地服务已可用,调度等待恢复且关闭会取消恢复(提前关闭=%s)', async closeWhileRestoring => {+it.each([[true, undefined], [false, undefined], [true, 'gateway'], [false, 'gateway']] as const)('网关请求未完成时本地服务已可用,调度等待恢复且关闭会取消恢复(提前关闭=%s,传输=%s)', async (closeWhileRestoring, transport) => {const root = await mkdtemp(join(tmpdir(), 'oc-gateway-startup-'));let release!: () => void;const waiting = new Promise<void>(resolve => { release = resolve; });@@ -25,10 +25,11 @@ it.each([true, false])('网关请求未完成时本地服务已可用,调度const origin = `http://127.0.0.1:${address.port}`;const dataDir = join(root, 'data');await createGatewayConfigStore(dataDir).writeCredentials({- schemaVersion: 1, account: { id: 'a', email: '[email protected]', verified: true },+ ...(transport === 'gateway' ? { schemaVersion: 3 as const, transport, supplier: 'chatanywhere' as const, keyRotation: false } : { schemaVersion: 1 as const, modelKey: 'private-model-key' }),+ account: { id: 'a', email: '[email protected]', verified: true },accessToken: 'private-access-token', refreshToken: 'private-refresh-token',expiresIn: 900, accessExpiresAt: new Date(Date.now() + 900_000).toISOString(),- modelKey: 'private-model-key', keyVersion: '1', bindingVersion: 'a:1', baseUrl: `${origin}/v1`,+ keyVersion: '1', bindingVersion: 'a:1', baseUrl: `${origin}/v1`,models: [{ id: 'official-model', modality: 'text', capabilities: ['responses'] }], defaults: { text: 'official-model' }});let server: Awaited<ReturnType<typeof buildServer>> | undefined;@@ -48,13 +49,15 @@ it.each([true, false])('网关请求未完成时本地服务已可用,调度expect((await server.inject('/healthz')).json()).toEqual({ ok: true });const state = await server.inject({ method: 'GET', url: '/gateway/account', headers: { authorization: 'Bearer local-runtime-token' } });expect(state.json()).toMatchObject({ source: 'gateway', authState: 'signed_in', activationState: 'loading', account: { id: 'a' } });+ expect(state.json().transport).toBe(transport);expect(state.body).not.toContain('private-');expect(start).not.toHaveBeenCalled();if (!closeWhileRestoring) {release();await expect.poll(() => start.mock.calls.length).toBe(1);- expect((await server.inject({ url: '/gateway/account', headers: { authorization: 'Bearer local-runtime-token' } })).json())- .toMatchObject({ authState: 'signed_in', activationState: 'blocked' });+ const blocked = (await server.inject({ url: '/gateway/account', headers: { authorization: 'Bearer local-runtime-token' } })).json();+ expect(blocked).toMatchObject({ authState: 'signed_in', activationState: 'blocked' });+ expect(blocked.transport).toBe(transport);}await server.close();await expect.poll(() => bootstrapCanceled).toBe(true);diff --git a/apps/web/src/features/account/PersonalCenterPage.test.tsx b/apps/web/src/features/account/PersonalCenterPage.test.tsxindex ce21dfca..263a0966 100644--- a/apps/web/src/features/account/PersonalCenterPage.test.tsx+++ b/apps/web/src/features/account/PersonalCenterPage.test.tsx@@ -56,6 +56,22 @@ it('shows account and credits and returns to the previous view', async () => {await userEvent.setup().click(screen.getByRole('button', { name: '返回' }));expect(back).toHaveBeenCalledOnce();});+it.each([undefined, 'gateway'] as const)('keeps route selection hidden while restoring a gateway account (transport=%s)', async transport => {+ const restoring: GatewayAccountState = { ...signedIn, transport, supplier: 'chatanywhere', activationState: 'loading' };+ const ready: GatewayAccountState = { ...restoring, transport: 'gateway', activationState: 'ready' };+ const service = createService(ready);+ let complete!: (state: GatewayAccountState) => void;+ vi.mocked(service.getState).mockImplementationOnce(() => new Promise(resolve => { complete = resolve; }));+ service.setRegion = vi.fn();+ render(page(service, restoring));+ expect(screen.getByText('官方模型服务正在连接')).toBeInTheDocument();+ expect(screen.queryByRole('combobox', { name: '连接区域' })).not.toBeInTheDocument();+ await act(async () => complete(ready));+ await waitFor(() => expect(screen.queryByText('官方模型服务正在连接')).not.toBeInTheDocument());+ expect(screen.getByText('已登录', { exact: true })).toBeInTheDocument();+ expect(screen.queryByRole('combobox', { name: '连接区域' })).not.toBeInTheDocument();+ expect(service.setRegion).not.toHaveBeenCalled();+});it('forwards active task state to the credit estimate and hides it when work ends', async () => {const service = createService();vi.mocked(service.getSummary).mockResolvedValue({ ...summary, balance: { ...summary.balance, reservedUnits: '1000000' } });diff --git a/apps/web/src/features/settings/GatewayAccountSettingsView.test.tsx b/apps/web/src/features/settings/GatewayAccountSettingsView.test.tsxindex 84d79994..d9d2b38c 100644--- a/apps/web/src/features/settings/GatewayAccountSettingsView.test.tsx+++ b/apps/web/src/features/settings/GatewayAccountSettingsView.test.tsx@@ -16,7 +16,7 @@ function service(): GatewayAccountSettingsService {}it('changes the ChatAnywhere region without offering supplier self-selection', async () => {const value = service();- const initial = { ...state, supplier: 'chatanywhere' as const, supplierRegion: 'auto' as const };+ const initial = { ...state, transport: 'supplier-direct' as const, supplier: 'chatanywhere' as const, supplierRegion: 'auto' as const };vi.mocked(value.getState).mockResolvedValue(initial);value.setRegion = vi.fn(async region => ({ ...initial, supplierRegion: region }));render(<LanguageProvider initialPreference="zh-CN"><GatewayAccountSettingsView service={value}/></LanguageProvider>);diff --git a/apps/web/src/features/settings/GatewayAccountSettingsView.tsx b/apps/web/src/features/settings/GatewayAccountSettingsView.tsxindex faede874..6a4608e7 100644--- a/apps/web/src/features/settings/GatewayAccountSettingsView.tsx+++ b/apps/web/src/features/settings/GatewayAccountSettingsView.tsx@@ -118,7 +118,7 @@ export function GatewayAccountSettingsView(props: {<button type="button" className="gateway-account__icon" title={l('刷新账户', 'Refresh account')} aria-label={l('刷新账户', 'Refresh account')} disabled={busy || !service} onClick={() => void action(() => refresh(false, true))}><RefreshCw size={16}/></button></div> : null}{state?.account && !profile ? <p className="gateway-account__email">{state.account.email}</p> : null}- {signedIn && !compact && state.transport !== 'gateway' && state.supplier === 'chatanywhere' && service?.setRegion ? <label>{l('连接区域', 'Connection Region')}<select aria-label={l('连接区域', 'Connection Region')} value={state.supplierRegion ?? 'auto'} disabled={busy} onChange={event => { const next = event.target.value as 'auto' | 'domestic' | 'overseas'; void action(async () => update(await service.setRegion!(next))); }}>+ {signedIn && !compact && state.transport === 'supplier-direct' && state.supplier === 'chatanywhere' && service?.setRegion ? <label>{l('连接区域', 'Connection Region')}<select aria-label={l('连接区域', 'Connection Region')} value={state.supplierRegion ?? 'auto'} disabled={busy} onChange={event => { const next = event.target.value as 'auto' | 'domestic' | 'overseas'; void action(async () => update(await service.setRegion!(next))); }}><option value="auto">{l('默认(国内线路)', 'Default (Mainland route)')}</option><option value="domestic">{l('国内', 'Mainland China')}</option><option value="overseas">{l('海外', 'Overseas')}</option></select></label> : null}{profile ? <div className="gateway-account__identity"><h2>{signedIn ? state.account?.email ?? l('OpenCreator 账户', 'OpenCreator Account') : l('OpenCreator 账户', 'OpenCreator Account')}</h2>{status}</div> : status}