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(download): 分离连接时限并容忍续传检查点失败

Dashf0ab8ec2c520
diff --git a/apps/desktop/src/main/downloader/__tests__/download.test.ts b/apps/desktop/src/main/downloader/__tests__/download.test.ts
index 73c3f1ae20..1bd755cdd4 100644
--- a/apps/desktop/src/main/downloader/__tests__/download.test.ts
+++ b/apps/desktop/src/main/downloader/__tests__/download.test.ts
@@ -8,6 +8,8 @@ vi.mock('../http', () => ({ requestResponse: fetchMock }));
vi.mock('../../logger', () => ({ createLogger: () => ({ warn: vi.fn(), debug: vi.fn() }) }));
import { download, getActive } from '../index';
import { writeMeta } from '../resume';
+import * as resume from '../resume';
+import * as integrity from '../integrity';
const roots: string[] = [];
const hash = (body: string) => createHash('sha256').update(body).digest('hex');
@@ -36,11 +38,46 @@ function partial(opts: ReturnType<typeof options>, body = 'abc') {
});
}
afterEach(() => {
+ vi.restoreAllMocks();
vi.useRealTimers();
fetchMock.mockReset();
for (const root of roots.splice(0)) fs.rmSync(root, { recursive: true, force: true });
});
describe('shared verified downloads', () => {
+ it('stops the connection deadline before slow resume hashing begins', async () => {
+ vi.useFakeTimers();
+ const opts = options();
+ partial(opts);
+ const create = integrity.createStreamingHasher;
+ vi.spyOn(integrity, 'createStreamingHasher').mockImplementation((file) => {
+ const hasher = create(file);
+ return {
+ ...hasher,
+ update: async (data) => {
+ if (data.length === 0) await vi.advanceTimersByTimeAsync(20_000);
+ return hasher.update(data);
+ },
+ };
+ });
+ fetchMock.mockResolvedValue(
+ new Response('def', {
+ status: 206,
+ headers: { 'content-range': 'bytes 3-5/6', 'content-length': '3' },
+ }),
+ );
+ await expect(download(opts)).resolves.toMatchObject({ resumedFromBytes: 3, size: 6 });
+ expect(fs.readFileSync(opts.targetPath, 'utf8')).toBe('abcdef');
+ });
+ it('finishes a verified download when checkpoint writes fail', async () => {
+ const opts = options();
+ const checkpoint = vi.spyOn(resume, 'writeMeta').mockImplementation(() => {
+ throw new Error('sidecar locked');
+ });
+ fetchMock.mockResolvedValue(new Response('abcdef'));
+ await expect(download(opts)).resolves.toMatchObject({ size: 6, sha256: opts.sha256 });
+ expect(checkpoint).toHaveBeenCalled();
+ expect(fs.readFileSync(opts.targetPath, 'utf8')).toBe('abcdef');
+ });
it('resumes and hashes the prior bytes exactly once', async () => {
const opts = options();
partial(opts);
diff --git a/apps/desktop/src/main/downloader/transport.ts b/apps/desktop/src/main/downloader/transport.ts
index 3e7954ad10..41b59bef16 100644
--- a/apps/desktop/src/main/downloader/transport.ts
+++ b/apps/desktop/src/main/downloader/transport.ts
@@ -113,10 +113,10 @@ export async function executeOnce(ctx: TransportContext): Promise<TransportResul
if (prior?.etag) headers['If-Range'] = prior.etag;
else if (prior?.lastModified) headers['If-Range'] = prior.lastModified;
}
- armTimer(opts.timeout?.connectMs ?? 10_000);
let url = opts.url;
for (let hops = 0; ; hops++) {
assertDownloadUrl(url, opts);
+ armTimer(opts.timeout?.connectMs ?? 10_000);
response = await network(
requestResponse(url, {
method: 'GET',
@@ -126,6 +126,7 @@ export async function executeOnce(ctx: TransportContext): Promise<TransportResul
signal: controller.signal,
}),
);
+ clearTimeout(timer);
checkAbort();
if (![301, 302, 303, 307, 308].includes(response.status)) break;
const location = response.headers.get('location');
@@ -228,11 +229,15 @@ export async function executeOnce(ctx: TransportContext): Promise<TransportResul
loaded += value.byteLength;
tracker.advance(value.byteLength);
if (Date.now() - lastMetaWriteAt >= 2000) {
- writeMeta(opts.targetPath, {
- ...meta,
- downloadedBytes: loaded,
- updatedAt: new Date().toISOString(),
- });
+ try {
+ writeMeta(opts.targetPath, {
+ ...meta,
+ downloadedBytes: loaded,
+ updatedAt: new Date().toISOString(),
+ });
+ } catch {
+ /* A failed checkpoint only disables resume, not the active transfer. */
+ }
lastMetaWriteAt = Date.now();
}
}
diff --git a/docs/dev-rules/verified-downloads.md b/docs/dev-rules/verified-downloads.md
index d14b948a4f..603c696001 100644
--- a/docs/dev-rules/verified-downloads.md
+++ b/docs/dev-rules/verified-downloads.md
@@ -12,7 +12,7 @@ Agent runtime、Cindy Make 工具、Ollama runtime、插件包、Skill 包及更
- `isUrlAllowed` 检查初始 URL 和每次重定向。插件包继续 `redirect: 'error'`;
Ollama 使用其官方发行资产白名单。统一下载不得放宽调用方已有来源限制。
- `signal` 取消排队、请求和重试等待;连接/闲置超时可重试,`timeout.totalMs`
- 限制含排队的整体时长。业务取消与超时分别返回 `ABORTED` 和 `TIMEOUT`。
+ 限制取得下载槽位后的活动时长(含校验和重试等待,不含排队)。业务取消与超时分别返回 `ABORTED` 和 `TIMEOUT`。
- 默认保留部分文件以续传;一次性安装暂存目录可用 `resume: false`。
调用方只有在下载 Promise 结束后才可 `cleanup()` 或删除暂存目录。
- 默认校验成功后替换目标,下载失败保留原目标;`existingTarget: 'error'`