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): abort file hashing and bound tool archives

Dash9a34009c187b
diff --git a/apps/desktop/src/main/downloader/__tests__/download.test.ts b/apps/desktop/src/main/downloader/__tests__/download.test.ts
index 1bd755cdd4..633464e71a 100644
--- a/apps/desktop/src/main/downloader/__tests__/download.test.ts
+++ b/apps/desktop/src/main/downloader/__tests__/download.test.ts
@@ -2,6 +2,7 @@ import fs from 'node:fs';
import os from 'node:os';
import path from 'node:path';
import { createHash } from 'node:crypto';
+import { Readable, addAbortSignal } from 'node:stream';
import { afterEach, describe, expect, it, vi } from 'vitest';
const fetchMock = vi.hoisted(() => vi.fn());
vi.mock('../http', () => ({ requestResponse: fetchMock }));
@@ -44,6 +45,54 @@ afterEach(() => {
for (const root of roots.splice(0)) fs.rmSync(root, { recursive: true, force: true });
});
describe('shared verified downloads', () => {
+ it.each([
+ ['resume', false],
+ ['cache', false],
+ ['resume', true],
+ ['cache', true],
+ ] as const)(
+ 'interrupts stalled %s hashing (timeout=%s) and releases the slot',
+ async (mode, timeout) => {
+ const opts = options();
+ if (mode === 'resume') partial(opts);
+ else fs.writeFileSync(opts.targetPath, 'abcdef');
+ const controller = new AbortController();
+ let started!: () => void;
+ const reading = new Promise<void>((resolve) => {
+ started = resolve;
+ });
+ const stalled = new Readable({ read() {} });
+ vi.spyOn(fs, 'createReadStream').mockImplementationOnce((_file, config) => {
+ const signal = (config as { signal?: AbortSignal })?.signal;
+ if (signal) addAbortSignal(signal, stalled);
+ started();
+ return stalled as fs.ReadStream;
+ });
+ fetchMock.mockResolvedValueOnce(
+ new Response('def', {
+ status: 206,
+ headers: { 'content-range': 'bytes 3-5/6', 'content-length': '3' },
+ }),
+ );
+ if (mode === 'cache') fetchMock.mockReset();
+ const active = download({
+ ...opts,
+ signal: controller.signal,
+ timeout: timeout ? { totalMs: 50 } : undefined,
+ });
+ const rejected = expect(active).rejects.toMatchObject({
+ code: timeout ? 'TIMEOUT' : 'ABORTED',
+ });
+ await reading;
+ const next = options('next');
+ fetchMock.mockResolvedValueOnce(new Response('next'));
+ const queued = download(next);
+ if (!timeout) controller.abort();
+ await rejected;
+ expect(stalled.destroyed).toBe(true);
+ await expect(queued).resolves.toMatchObject({ size: 4 });
+ },
+ );
it('stops the connection deadline before slow resume hashing begins', async () => {
vi.useFakeTimers();
const opts = options();
diff --git a/apps/desktop/src/main/downloader/integrity.ts b/apps/desktop/src/main/downloader/integrity.ts
index 8e19c08d49..76661ffd67 100644
--- a/apps/desktop/src/main/downloader/integrity.ts
+++ b/apps/desktop/src/main/downloader/integrity.ts
@@ -15,10 +15,10 @@
import crypto from 'node:crypto';
import fs from 'node:fs';
-export function computeHash(filePath: string): Promise<string> {
+export function computeHash(filePath: string, signal?: AbortSignal): Promise<string> {
return new Promise((resolve, reject) => {
const hash = crypto.createHash('sha256');
- const stream = fs.createReadStream(filePath);
+ const stream = fs.createReadStream(filePath, { signal });
stream.on('data', (chunk: string | Buffer) => {
hash.update(typeof chunk === 'string' ? Buffer.from(chunk) : chunk);
});
@@ -51,7 +51,10 @@ export interface StreamingHasher {
* prime, once via update()), producing a guaranteed CHECKSUM mismatch on every
* resume — and CHECKSUM is non-retryable, so the whole download dies.
*/
-export function createStreamingHasher(existingPartPath: string | null): StreamingHasher {
+export function createStreamingHasher(
+ existingPartPath: string | null,
+ signal?: AbortSignal,
+): StreamingHasher {
const hash = crypto.createHash('sha256');
let primed: Promise<void>;
@@ -73,6 +76,7 @@ export function createStreamingHasher(existingPartPath: string | null): Streamin
return;
}
const stream = fs.createReadStream(existingPartPath, {
+ signal,
start: 0,
end: priorSize - 1, // inclusive — pins the read to original EOF
});
diff --git a/apps/desktop/src/main/downloader/scheduler.ts b/apps/desktop/src/main/downloader/scheduler.ts
index fba52a5e38..82510fa512 100644
--- a/apps/desktop/src/main/downloader/scheduler.ts
+++ b/apps/desktop/src/main/downloader/scheduler.ts
@@ -179,7 +179,7 @@ export class Scheduler {
}
try {
if (fs.existsSync(task.opts.targetPath)) {
- const hash = await computeHash(task.opts.targetPath);
+ const hash = await computeHash(task.opts.targetPath, controller.signal);
const size = fs.statSync(task.opts.targetPath).size;
if (controller.signal.aborted) throw new DownloadError('ABORTED', 'Download aborted');
if (
@@ -199,6 +199,7 @@ export class Scheduler {
}
}
} catch (err) {
+ if (controller.signal.aborted) throw new DownloadError('ABORTED', 'Download aborted');
if (err instanceof DownloadError) throw err;
logger.debug?.('[downloader] fromCache check failed; falling through', {
err: (err as Error).message,
diff --git a/apps/desktop/src/main/downloader/transport.ts b/apps/desktop/src/main/downloader/transport.ts
index 41b59bef16..c855a0769f 100644
--- a/apps/desktop/src/main/downloader/transport.ts
+++ b/apps/desktop/src/main/downloader/transport.ts
@@ -191,7 +191,10 @@ export async function executeOnce(ctx: TransportContext): Promise<TransportResul
}
if (!response.body) throw new DownloadError('NETWORK', 'Download response body is empty');
reader = response.body.getReader();
- const hasher = createStreamingHasher(offset === null ? null : partPath(opts.targetPath));
+ const hasher = createStreamingHasher(
+ offset === null ? null : partPath(opts.targetPath),
+ controller.signal,
+ );
await hasher.update(Buffer.alloc(0));
file = await fs.promises.open(partPath(opts.targetPath), offset === null ? 'w' : 'a', 0o600);
const tracker = new ProgressTracker({
@@ -261,6 +264,7 @@ export async function executeOnce(ctx: TransportContext): Promise<TransportResul
tracker.flush();
return { size: loaded, sha256 };
} catch (error) {
+ checkAbort();
const failure =
error instanceof DownloadError
? error
diff --git a/apps/desktop/src/main/managed-tools/__tests__/installer.test.ts b/apps/desktop/src/main/managed-tools/__tests__/installer.test.ts
index f055586298..62206db807 100644
--- a/apps/desktop/src/main/managed-tools/__tests__/installer.test.ts
+++ b/apps/desktop/src/main/managed-tools/__tests__/installer.test.ts
@@ -38,6 +38,7 @@ describe('shared tool installer', () => {
.generateAsync({ type: 'nodebuffer' });
const executable = await installTool(input, {
download: async (opts) => {
+ expect(opts.maxBytes).toBe(160 * 1024 ** 2);
await writeFile(opts.targetPath, archive);
},
});
diff --git a/apps/desktop/src/main/managed-tools/archive.ts b/apps/desktop/src/main/managed-tools/archive.ts
index 01c8ba71bb..099843dfcb 100644
--- a/apps/desktop/src/main/managed-tools/archive.ts
+++ b/apps/desktop/src/main/managed-tools/archive.ts
@@ -7,7 +7,7 @@ import JSZip from 'jszip';
import * as tar from 'tar';
import type { ToolArtifact } from './types.js';
-const MAX_ARCHIVE_BYTES = 160 * 1024 ** 2;
+export const MAX_ARCHIVE_BYTES = 160 * 1024 ** 2;
const MAX_FILE_BYTES = 256 * 1024 ** 2;
const MAX_EXPANDED_BYTES = 1024 ** 3;
const MAX_ENTRIES = 30_000;
diff --git a/apps/desktop/src/main/managed-tools/installer.ts b/apps/desktop/src/main/managed-tools/installer.ts
index 9719e6865a..b285664d7a 100644
--- a/apps/desktop/src/main/managed-tools/installer.ts
+++ b/apps/desktop/src/main/managed-tools/installer.ts
@@ -4,7 +4,7 @@ import path from 'node:path';
import { download, type DownloadOptions } from '../downloader/index.js';
import { createLogger } from '../logger.js';
import type { ToolArtifact, ToolInstallProgress } from './types.js';
-import { extractToolArchive, safeArchivePath } from './archive.js';
+import { extractToolArchive, safeArchivePath, MAX_ARCHIVE_BYTES } from './archive.js';
const log = createLogger('managed-tools');
const key = (artifact: ToolArtifact) => {
@@ -79,6 +79,7 @@ export async function installTool(
await (deps.download ?? download)({
url: artifact.url,
sha256: artifact.sha256,
+ maxBytes: MAX_ARCHIVE_BYTES,
targetPath: path.join(staging, 'archive'),
signal,
logger: log,
diff --git a/docs/dev-rules/verified-downloads.md b/docs/dev-rules/verified-downloads.md
index d77266c73b..010c7c1422 100644
--- a/docs/dev-rules/verified-downloads.md
+++ b/docs/dev-rules/verified-downloads.md
@@ -11,7 +11,7 @@ Agent runtime、Cindy Make 工具、Ollama runtime、插件包、Skill 包及更
- `sha256` 必填。`expectedSize` 同时检查响应头与实际字节;`maxBytes` 在写盘前限制流大小。
- `isUrlAllowed` 检查初始 URL 和每次重定向。插件包继续 `redirect: 'error'`;
Ollama 使用其官方发行资产白名单。统一下载不得放宽调用方已有来源限制。
-- `signal` 取消排队、请求和重试等待;连接/闲置超时可重试,`timeout.totalMs`
+- `signal` 取消排队、请求、缓存/续传哈希和重试等待;连接/闲置超时可重试,`timeout.totalMs`
限制取得下载槽位后的活动时长(含校验和重试等待,不含排队)。业务取消与超时分别返回 `ABORTED` 和 `TIMEOUT`。
- 默认保留部分文件以续传;一次性安装暂存目录可用 `resume: false`。
调用方只有在下载 Promise 结束后才可 `cleanup()` 或删除暂存目录。
@@ -31,6 +31,7 @@ Agent runtime、Cindy Make 工具、Ollama runtime、插件包、Skill 包及更
`main/managed-tools/installer.ts` 和 `archive.ts` 提供通用的发行包解压、版本检查、
完整代次发布及安装路径发现。调用方传入可信的 `ToolArtifact` 与用户数据根目录,
成功取得绝对执行路径,直接用它启动工具,不依赖系统 PATH 或 Homebrew。
+下载与解压共用 160 MiB 归档上限;下载时在写盘前截停超限内容。
Cindy Make 保留旧导出和安装目录,旧 `current.json` 不需迁移。GitHub CLI 使用
`git-context/ghArtifact.ts` 中固定版本的官方发行包和摘要,安装到