Skip to content

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.

fix(daemon): classify quota failures before sanitizing upstream messages

Leggett2366e7fcea36
diff --git a/apps/daemon/src/gateway/direct-transport.ts b/apps/daemon/src/gateway/direct-transport.ts
index 48970d80..741af19b 100644
--- a/apps/daemon/src/gateway/direct-transport.ts
+++ b/apps/daemon/src/gateway/direct-transport.ts
@@ -31,6 +31,10 @@ export type OfficialModelFailureReporter = (id: string, modality: GatewayModel['
export type OfficialModelSuccessReporter = (id: string, modality: GatewayModel['modality'], operation: GatewayModelOperation) => Promise<void>;
export async function errorFacts(response: Response, key: string, signal?: AbortSignal): Promise<PublicErrorFacts> {
+ return (await readUpstreamFailure(response, key, signal)).facts;
+}
+
+async function readUpstreamFailure(response: Response, key: string, signal?: AbortSignal) {
const reader = response.body?.getReader();
const chunks: Uint8Array[] = []; let size = 0;
let payload: unknown;
@@ -44,7 +48,13 @@ export async function errorFacts(response: Response, key: string, signal?: Abort
}
if (size <= 16_384) payload = JSON.parse(Buffer.concat(chunks).toString('utf8').replaceAll(key, '[redacted]'));
} catch {} finally { void reader?.cancel().catch(() => undefined); }
- return creatorServiceFailureFacts(payload, undefined, { httpStatus: response.status, requestId: response.headers.get('x-request-id') ?? undefined });
+ const body = payload as { error?: { message?: unknown }; message?: unknown } | undefined;
+ const message = body?.error?.message ?? body?.message;
+ // Classify before public sanitization removes messages naming the upstream service.
+ const limitExceeded = response.status === 403 && typeof message === 'string' && /^Key limit exceeded\b/i.test(message);
+ return { limitExceeded, facts: creatorServiceFailureFacts(payload, undefined, {
+ httpStatus: response.status, requestId: response.headers.get('x-request-id') ?? undefined
+ }) };
}
function recordUpstreamMetadata(record: Receipt, value: unknown) {
@@ -177,8 +187,7 @@ export function createDirectTransport(root: string, fetcher: typeof fetch = fetc
if (updated && updated !== key) { modelKey = updated; result = await submit(modelKey); }
}
if (!result.ok) {
- const facts = await errorFacts(result, modelKey, options.signal ?? undefined);
- const limitExceeded = result.status === 403 && /^Key limit exceeded\b/i.test(facts.upstreamMessage ?? '');
+ const { facts, limitExceeded } = await readUpstreamFailure(result, modelKey, options.signal ?? undefined);
throw new DirectUpstreamError(result.status === 401 ? 'model_auth_required' : result.status === 402 || limitExceeded ? 'credits_insufficient' : 'official_service_unavailable', result.status >= 400 && result.status < 500 ? result.status : 503, facts);
}
return result;
diff --git a/apps/daemon/test/integration/creator-api.test.ts b/apps/daemon/test/integration/creator-api.test.ts
index 39764b7f..7bfb9600 100644
--- a/apps/daemon/test/integration/creator-api.test.ts
+++ b/apps/daemon/test/integration/creator-api.test.ts
@@ -290,6 +290,7 @@ describe('creator api', () => {
sourceType: 'url',
sourceUrl: 'https://www.youtube.com/watch?v=job-control',
targetLanguage: 'zh_cn',
+ skipVideoDownload: true,
composeVideo: true,
videoFormat: 'horizontal'
}
@@ -1134,13 +1135,15 @@ async function waitForCreatorJob(
jobId: string,
predicate: (job: any) => boolean
): Promise<any> {
+ let lastJob: any;
for (let attempt = 0; attempt < 100; attempt += 1) {
const response = await request('GET', `/creator/jobs/${jobId}`);
const job = response.json().job;
+ lastJob = job;
if (predicate(job)) return job;
await new Promise(resolve => setTimeout(resolve, 10));
}
- throw new Error(`Timed out waiting for Creator job ${jobId}`);
+ throw new Error(`Timed out waiting for Creator job ${jobId}: ${JSON.stringify({ status: lastJob?.status, stages: lastJob?.stages })}`);
}
async function waitForApiApproval(jobId: string) {
diff --git a/apps/daemon/test/integration/creator-image-generation.test.ts b/apps/daemon/test/integration/creator-image-generation.test.ts
index 363990a2..56c13ff6 100644
--- a/apps/daemon/test/integration/creator-image-generation.test.ts
+++ b/apps/daemon/test/integration/creator-image-generation.test.ts
@@ -88,8 +88,10 @@ describe('creator image generation', () => {
expect(content.rawPayload.subarray(0, 4).toString('hex')).toBe('89504e47');
expect(fetchImpl).not.toHaveBeenCalled();
expect(status.rawPayload.toString()).not.toContain('private-oauth-secret');
- expect(await readFile(join(agentHome, 'auth.json'), 'utf8')).toBe(agentAuth);
- expect(await readFile(join(agentHome, 'config.toml'), 'utf8')).toContain('agent-model');
+ const localAuth = await readFile(join(home, 'auth.json'), 'utf8');
+ expect(JSON.parse(localAuth)).toMatchObject({ auth_mode: 'chatgpt', tokens: { access_token: 'private-oauth-secret' } });
+ expect(await readFile(join(agentHome, 'auth.json'), 'utf8')).toBe(localAuth);
+ expect(await readFile(join(agentHome, 'config.toml'), 'utf8')).not.toContain('agent-model');
});
it('uses local API credentials and follows local login changes without falling back to the Agent', async () => {
@@ -107,6 +109,8 @@ describe('creator image generation', () => {
const fetchImpl = vi.fn(async () => new Response(JSON.stringify({ data: [{ b64_json: image.toString('base64') }] }), { status: 200 }));
vi.stubGlobal('fetch', fetchImpl);
server = await buildServer({ token: 'secret', dataDir: tempDir, codexHome: agentHome, localCodexHome: home, codexBin: bin });
+ const initialRuntimeAuth = await readFile(join(agentHome, 'auth.json'), 'utf8');
+ expect(JSON.parse(initialRuntimeAuth)).toMatchObject({ auth_mode: 'apikey', OPENAI_API_KEY: 'local-api-secret' });
const payload = { prompt: 'One orange cat', provider: 'codex-native', size: '1024x1024', quality: 'medium', count: 1 };
const apiStatus = await request('GET', '/creator-services/image/codex/status');
@@ -137,7 +141,7 @@ describe('creator image generation', () => {
expect((await request('GET', '/creator-services/image/codex/status')).json()).toMatchObject({ ready: false, executionMode: null });
expect((await request('POST', '/image-generation/results', payload)).statusCode).toBe(409);
expect(fetchImpl).toHaveBeenCalledTimes(2);
- expect(await readFile(join(agentHome, 'auth.json'), 'utf8')).toBe(agentAuth);
+ expect(await readFile(join(agentHome, 'auth.json'), 'utf8')).toBe(initialRuntimeAuth);
expect(JSON.stringify([apiStatus.json(), nativeStatus.json(), apiResult.json(), nativeResult.json()])).not.toContain('secret');
});
diff --git a/apps/daemon/test/unit/codex-local-provider.test.ts b/apps/daemon/test/unit/codex-local-provider.test.ts
index 36e7a3a6..45a1ff61 100644
--- a/apps/daemon/test/unit/codex-local-provider.test.ts
+++ b/apps/daemon/test/unit/codex-local-provider.test.ts
@@ -39,7 +39,7 @@ describe('local Codex provider', () => {
expect(await readLocalCodexModelConfiguration({ codexHome: root, env: {} })).toEqual({ authentication: 'api_key', wireApi: 'responses',
provider: { baseUrl: 'https://local.example/v1', apiKey: 'local-key', model: 'local-text-model' } });
expect(await readLocalCodexProvider({ codexHome: root, env: {} })).toEqual({
- baseUrl: 'https://local.example/v1', apiKey: 'local-key', model: 'gpt-image-1' });
+ baseUrl: 'https://local.example/v1', apiKey: 'local-key', model: 'gpt-image-2' });
});
it('honors an explicitly selected API mode even if an old OAuth token remains', async () => {
diff --git a/apps/daemon/test/unit/creator-download-executor.test.ts b/apps/daemon/test/unit/creator-download-executor.test.ts
index 0a61ed56..24d31166 100644
--- a/apps/daemon/test/unit/creator-download-executor.test.ts
+++ b/apps/daemon/test/unit/creator-download-executor.test.ts
@@ -11,6 +11,7 @@ import {
mkdir,
mkdtemp,
readFile,
+ realpath,
rm,
writeFile
} from 'node:fs/promises';
@@ -1341,7 +1342,7 @@ describe('creator download executor', () => {
inputArtifacts: [await writeProbeArtifact(workdir, probe)]
}));
- expect(result.outputs[0]?.path).toBe(join(workdir, fileName));
+ expect(result.outputs[0]?.path).toBe(await realpath(join(workdir, fileName)));
expect(result.outputs[0]?.metadata?.fileName).toBe(fileName);
expect(JSON.parse(await readFile(join(workdir, 'args.json'), 'utf8')))
.toEqual(expect.arrayContaining(['--encoding', 'utf-8']));
diff --git a/apps/desktop/release-notes/v3.2.9.md b/apps/desktop/release-notes/v3.2.9.md
index a0807140..64c8c125 100644
--- a/apps/desktop/release-notes/v3.2.9.md
+++ b/apps/desktop/release-notes/v3.2.9.md
@@ -8,4 +8,5 @@
- Updated the default OpenAI image model to gpt-image-2 and migrated saved gpt-image-1 settings while preserving independently configured models.
- Fixed parallel tool calls from Chat-compatible providers being combined when streamed chunks omit tool indexes.
- Fixed initial subtitle editor settings being reset when switching panels and completed translations for subtitle timing and dubbing setup controls.
+- Improved insufficient-credit error reporting while keeping upstream service details private.
- Updated dependencies to address high-severity security advisories.