Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

fix(downloads): checkpoint partial streams before retry

Dash9a10b0767e16
diff --git a/apps/desktop/src/main/downloader/__tests__/streaming.test.ts b/apps/desktop/src/main/downloader/__tests__/streaming.test.ts
index e952a0503a..3667745ee5 100644
--- a/apps/desktop/src/main/downloader/__tests__/streaming.test.ts
+++ b/apps/desktop/src/main/downloader/__tests__/streaming.test.ts
@@ -6,7 +6,7 @@ import { afterEach, expect, it, vi } from 'vitest';
const mocks = vi.hoisted(() => ({ fetch: vi.fn() }));
vi.mock('electron', () => ({ net: { fetch: mocks.fetch } }));
import { executeStreaming } from '../streaming';
-import { writeMeta } from '../resume';
+import { readMeta, writeMeta } from '../resume';
import { withRetry } from '../retry';
afterEach(() => vi.restoreAllMocks());
@@ -50,6 +50,54 @@ async function fixture(run: (root: string, opts: any) => Promise<void>) {
}
const execute = (opts: any) => executeStreaming({ opts, logger: {}, resumedFromBytes: 0 });
+it.each(['network', 'cancel', 'timeout'])(
+ 'retains the completed prefix after %s between checkpoints',
+ async (failure) =>
+ fixture(async (_, opts) => {
+ const abort = new AbortController();
+ let pulls = 0;
+ mocks.fetch.mockReset().mockImplementationOnce(
+ async (_url, init) =>
+ new Response(
+ new ReadableStream(
+ {
+ pull(c) {
+ if (++pulls === 1) {
+ c.enqueue(Buffer.from('abc'));
+ return;
+ }
+ if (failure === 'network') c.error(new Error('connection reset'));
+ else {
+ init.signal.addEventListener('abort', () => c.error(new Error('aborted')), {
+ once: true,
+ });
+ if (failure === 'cancel') abort.abort();
+ }
+ },
+ },
+ { highWaterMark: 0 },
+ ),
+ { headers: { etag: 'v1' } },
+ ),
+ );
+ await expect(
+ execute({ ...opts, signal: abort.signal, timeout: { idleMs: 20 } }),
+ ).rejects.toMatchObject({ code: failure === 'cancel' ? 'ABORTED' : 'NETWORK' });
+ expect(await fs.readFile(opts.targetPath + '.part', 'utf8')).toBe('abc');
+ expect(readMeta(opts.targetPath)?.downloadedBytes).toBe(3);
+ mocks.fetch.mockResolvedValueOnce(
+ new Response('def', {
+ status: 206,
+ headers: { 'content-range': 'bytes 3-5/6', 'content-length': '3' },
+ }),
+ );
+ await expect(execute(opts)).resolves.toMatchObject({ size: 6 });
+ expect(mocks.fetch.mock.calls[1][1].headers).toEqual({ Range: 'bytes=3-', 'If-Range': 'v1' });
+ expect(await fs.readFile(opts.targetPath, 'utf8')).toBe('abcdef');
+ expect(readMeta(opts.targetPath)).toBeNull();
+ }),
+);
+
it('validates each redirect and never sends credentials', async () =>
fixture(async (_, opts) => {
mocks.fetch
diff --git a/apps/desktop/src/main/downloader/streaming.ts b/apps/desktop/src/main/downloader/streaming.ts
index fa9a3ff0b0..b2af74ff6b 100644
--- a/apps/desktop/src/main/downloader/streaming.ts
+++ b/apps/desktop/src/main/downloader/streaming.ts
@@ -145,23 +145,29 @@ export async function executeStreaming(ctx: TransportContext): Promise<Transport
};
writeMeta(opts.targetPath, meta);
let lastMeta = Date.now();
- for (;;) {
- arm(opts.timeout?.idleMs ?? 30_000);
- const { done, value } = await reader.read();
- clearTimeout(timer);
- if (controller.signal.aborted) throw new DownloadError('ABORTED', 'Download cancelled');
- if (done) break;
- if (opts.maxBytes !== undefined && tracker.getLoaded() + value.length > opts.maxBytes) {
- throw new DownloadError('CHECKSUM', 'Download exceeds declared size');
- }
- await file.writeFile(value);
- await hasher.update(Buffer.from(value.buffer, value.byteOffset, value.byteLength));
- tracker.advance(value.length);
- meta.downloadedBytes = tracker.getLoaded();
- if (Date.now() - lastMeta > 2000) {
- writeMeta(opts.targetPath, meta);
- lastMeta = Date.now();
+ try {
+ for (;;) {
+ arm(opts.timeout?.idleMs ?? 30_000);
+ const { done, value } = await reader.read();
+ clearTimeout(timer);
+ if (controller.signal.aborted) throw new DownloadError('ABORTED', 'Download cancelled');
+ if (done) break;
+ if (opts.maxBytes !== undefined && tracker.getLoaded() + value.length > opts.maxBytes) {
+ throw new DownloadError('CHECKSUM', 'Download exceeds declared size');
+ }
+ await file.writeFile(value);
+ await hasher.update(Buffer.from(value.buffer, value.byteOffset, value.byteLength));
+ tracker.advance(value.length);
+ meta.downloadedBytes = tracker.getLoaded();
+ if (Date.now() - lastMeta > 2000) {
+ writeMeta(opts.targetPath, meta);
+ lastMeta = Date.now();
+ }
}
+ } finally {
+ // Persist the completed prefix before retry/cancel can observe the partial file.
+ // A failed partial write still mismatches disk size and is conservatively discarded.
+ writeMeta(opts.targetPath, meta);
}
opts.onVerifying?.();
const sha256 = await hasher.digest();