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(provider-group): split usage reports within the wire byte budget

Lizic92184ebf3bb
diff --git a/apps/desktop/src/main/provider-group/__tests__/remoteHandler.test.ts b/apps/desktop/src/main/provider-group/__tests__/remoteHandler.test.ts
index dfaa1a2f6d..e84b774c5c 100644
--- a/apps/desktop/src/main/provider-group/__tests__/remoteHandler.test.ts
+++ b/apps/desktop/src/main/provider-group/__tests__/remoteHandler.test.ts
@@ -3,6 +3,7 @@
* 目录只给同账号电脑补组摘要。
*/
import { describe, expect, it, vi } from 'vitest';
+import { encodeReliableFrames, MAX_FRAME_BYTES, MAX_TRANSPORT_MESSAGE_BYTES, PROVIDER_GROUP_REMOTE_CHANNEL, type Envelope } from '@cindy/device-link';
import type { ProviderGroupConfig, ProviderGroupMember } from '../../../shared/providerGroup';
import {
@@ -12,7 +13,7 @@ import {
PROVIDER_GROUP_REMOTE_MAX_USAGE_REPORT_ROWS,
type ProviderGroupRemoteUsageRow,
} from '../../../shared/providerGroup';
-import { createProviderGroupRemoteClient, ProviderGroupRemoteUnsupportedError, type ProviderGroupRemoteInvoke } from '../remoteClient';
+import { createProviderGroupRemoteClient, PROVIDER_GROUP_USAGE_REQUEST_MAX_BYTES, ProviderGroupRemoteUnsupportedError, type ProviderGroupRemoteInvoke } from '../remoteClient';
import {
createProviderGroupExternalLoad,
PROVIDER_GROUP_LEASE_TTL_MS,
@@ -315,6 +316,41 @@ describe('完整用量报告分批传输', () => {
expect(d.replaceReportedUsage).toHaveBeenCalledWith('laptop', null, rows);
});
+ it.each([
+ { count: 2000, modelPrefix: '\u0000'.repeat(504), label: '行数未超限但转义后超限' },
+ { count: PROVIDER_GROUP_REMOTE_MAX_USAGE_ROWS + 2, modelPrefix: '模'.repeat(504), label: 'UTF-8 多字节长字段' },
+ ])('$label 按字节切批,真实传输帧合法,收齐后完整替换一次', async ({ count, modelPrefix }) => {
+ const longRows = Array.from({ length: count }, (_, i) => ({
+ ...usageRow(i), day: '2026-10-11', providerId: 'p'.repeat(128),
+ memberKey: `device:${'d'.repeat(164)}:${'p'.repeat(128)}`,
+ model: modelPrefix + String(i).padStart(8, '0'),
+ }));
+ const d = deps();
+ let received = 0;
+ const invoke = vi.fn<ProviderGroupRemoteInvoke>(async (_device, channel, args) => {
+ const request = args[0] as { action: string; offset: number; rows: unknown[] };
+ expect(request.action).toBe('usage-part');
+ expect(request.offset).toBe(received);
+ expect(request.rows.length).toBeLessThanOrEqual(PROVIDER_GROUP_REMOTE_MAX_USAGE_ROWS);
+ expect(Buffer.byteLength(JSON.stringify(request), 'utf8')).toBeLessThanOrEqual(PROVIDER_GROUP_USAGE_REQUEST_MAX_BYTES);
+ const env: Envelope = { v: 1, kind: 'invoke', dst: 'mini', id: 'request-id', payload: { channel, args } };
+ expect(channel).toBe(PROVIDER_GROUP_REMOTE_CHANNEL);
+ expect(Buffer.byteLength(JSON.stringify(env.payload), 'utf8')).toBeLessThan(MAX_TRANSPORT_MESSAGE_BYTES);
+ expect(Buffer.byteLength(JSON.stringify(env), 'utf8')).toBeLessThan(MAX_FRAME_BYTES);
+ for (const frame of encodeReliableFrames(env, 'usage-test', received + 1)) {
+ expect(Buffer.byteLength(JSON.stringify(frame), 'utf8')).toBeLessThan(MAX_FRAME_BYTES);
+ }
+ expect(d.replaceReportedUsage).not.toHaveBeenCalled();
+ received += request.rows.length;
+ return { ok: true, result: await handleProviderGroupRemote(d, 'laptop', request) };
+ });
+ await createProviderGroupRemoteClient(invoke).usage('mini', { seq: 1, sinceDay: '2026-10-10', rows: longRows });
+ expect(invoke.mock.calls.length).toBeGreaterThan(1);
+ expect(received).toBe(count);
+ expect(d.replaceReportedUsage).toHaveBeenCalledTimes(1);
+ expect(d.replaceReportedUsage).toHaveBeenCalledWith('laptop', '2026-10-10', longRows);
+ });
+
it('旧端拒绝新动作,发送方按不支持处理,不回退到部分替换', async () => {
const invoke = vi.fn<ProviderGroupRemoteInvoke>(async () => ({ ok: false, error: { message: '[INVALID_PARAMS] unknown provider group action' } }));
await expect(createProviderGroupRemoteClient(invoke).usage('mini', { seq: 1, sinceDay: null, rows }))
diff --git a/apps/desktop/src/main/provider-group/remoteClient.ts b/apps/desktop/src/main/provider-group/remoteClient.ts
index 5deffb97b2..1bb10f19dc 100644
--- a/apps/desktop/src/main/provider-group/remoteClient.ts
+++ b/apps/desktop/src/main/provider-group/remoteClient.ts
@@ -4,7 +4,7 @@
* 组所在电脑是旧版本(`CHANNEL_NOT_ALLOWED`)或这个供应商已经没有组时,`pick` 返回 `none`,调用方照常
* 直接在组所在电脑上运行;其他失败原样抛出,由调用方决定(分配阶段按连不上组所在电脑处理)。
*/
-import { PROVIDER_GROUP_REMOTE_CHANNEL } from '@cindy/device-link';
+import { MAX_FRAME_BYTES, MAX_TRANSPORT_MESSAGE_BYTES, PROVIDER_GROUP_REMOTE_CHANNEL } from '@cindy/device-link';
import {
parseProviderGroupRemotePick,
@@ -20,6 +20,9 @@ import {
} from '../../shared/providerGroup.js';
import { throwIpcError } from '../utils/ipcValidate.js';
+/** 留出 invoke 路由头的空间,同时适配可靠传输和旧端普通帧;预算按 JSON 的 UTF-8 字节数计。 */
+export const PROVIDER_GROUP_USAGE_REQUEST_MAX_BYTES = Math.min(MAX_FRAME_BYTES, MAX_TRANSPORT_MESSAGE_BYTES) - 64 * 1024;
+
export type ProviderGroupRemoteInvoke = (
deviceId: string,
channel: string,
@@ -106,27 +109,42 @@ export function createProviderGroupRemoteClient(invoke: ProviderGroupRemoteInvok
async usage(ownerDeviceId, report, beforeSend) {
try {
+ if (report.rows.length > PROVIDER_GROUP_REMOTE_MAX_USAGE_REPORT_ROWS) {
+ throwIpcError('INVALID_PARAMS', 'provider group usage report exceeds ledger limit');
+ }
const rows = providerGroupUsageRowsForWire(report.rows);
- if (rows.length <= PROVIDER_GROUP_REMOTE_MAX_USAGE_ROWS) {
+ // 每行只序列化一次,包含转义字符的实际开销;避免按字符数低估,也避免反复序列化整批。
+ const rowBytes = rows.map((row) => Buffer.byteLength(JSON.stringify(row), 'utf8'));
+ const request = { action: 'usage', seq: report.seq, sinceDay: report.sinceDay, rows: [] as unknown[][] };
+ const singleBytes = Buffer.byteLength(JSON.stringify(request), 'utf8')
+ + rowBytes.reduce((total, bytes) => total + bytes, 0) + Math.max(0, rows.length - 1);
+ if (rows.length <= PROVIDER_GROUP_REMOTE_MAX_USAGE_ROWS && singleBytes <= PROVIDER_GROUP_USAGE_REQUEST_MAX_BYTES) {
beforeSend?.();
- await call(ownerDeviceId, { action: 'usage', seq: report.seq, sinceDay: report.sinceDay, rows }, beforeSend);
+ await call(ownerDeviceId, { ...request, rows }, beforeSend);
return;
}
- if (rows.length > PROVIDER_GROUP_REMOTE_MAX_USAGE_REPORT_ROWS) {
- throwIpcError('INVALID_PARAMS', 'provider group usage report exceeds ledger limit');
- }
- for (let offset = 0; offset < rows.length; offset += PROVIDER_GROUP_REMOTE_MAX_USAGE_ROWS) {
+ for (let offset = 0; offset < rows.length;) {
+ const request = {
+ action: 'usage-part', seq: report.seq, sinceDay: report.sinceDay, offset, total: rows.length, rows: [] as unknown[][],
+ };
+ let bytes = Buffer.byteLength(JSON.stringify(request), 'utf8');
+ let end = offset;
+ while (end < rows.length && end - offset < PROVIDER_GROUP_REMOTE_MAX_USAGE_ROWS) {
+ const added = rowBytes[end]! + (end > offset ? 1 : 0);
+ if (bytes + added > PROVIDER_GROUP_USAGE_REQUEST_MAX_BYTES) break;
+ bytes += added;
+ end++;
+ }
+ if (end === offset) throwIpcError('INVALID_PARAMS', 'provider group usage row exceeds transport budget');
beforeSend?.();
- const part = rows.slice(offset, offset + PROVIDER_GROUP_REMOTE_MAX_USAGE_ROWS);
- const raw = await call(ownerDeviceId, {
- action: 'usage-part', seq: report.seq, sinceDay: report.sinceDay, offset, total: rows.length, rows: part,
- }, beforeSend);
+ const raw = await call(ownerDeviceId, { ...request, rows: rows.slice(offset, end) }, beforeSend);
const ack = raw as { seq?: unknown; received?: unknown; committed?: unknown } | null;
- if (!ack || ack.seq !== report.seq || ack.received !== offset + part.length
- || typeof ack.committed !== 'boolean' || (!ack.committed && offset + part.length === rows.length)) {
+ if (!ack || ack.seq !== report.seq || ack.received !== end
+ || typeof ack.committed !== 'boolean' || (!ack.committed && end === rows.length)) {
throwIpcError('PRECONDITION_FAILED', 'provider group usage report part was not acknowledged');
}
if (ack.committed) return;
+ offset = end;
}
} catch (error) {
// 有组、但还不认识用量报告的旧版本:按不支持处理(调用方之后再试)。
diff --git a/docs/dev-rules/protocol-compatibility.md b/docs/dev-rules/protocol-compatibility.md
index 527efec7e9..ab5422b417 100644
--- a/docs/dev-rules/protocol-compatibility.md
+++ b/docs/dev-rules/protocol-compatibility.md
@@ -948,8 +948,9 @@ G 重新打开时换一台。G 与 O 之间新增四项可选内容,O 与 M
- C 侧:任务此刻所在电脑与供应商和绑定那台对得上才算经组(绑定没清掉的空档里不报);每轮记进按账号的账本(`group` 行,
只用来报告,不算进 C 自己的供应商),防抖 5s 报从那天起的一份;启动(账号确定)
后整份报一次补上次没送到的;送不到按 30s 起、最长 10 分钟退避重报,不截断单日或未报告的旧日期。
-- **超出单次 3000 行时用新动作 `usage-part` 分批传完整报告**:
+- **超出单次 3000 行或 UTF-8 字节预算时用新动作 `usage-part` 分批传完整报告**:
- 请求 `{ action: 'usage-part', seq, sinceDay, offset, total, rows }`;每批仍最多 3000 行,整份最多 20000 行,
+ 同时按实际 JSON 序列化后的 UTF-8 字节数切批(包含转义开销),请求预算取可靠消息/普通帧上限的较小值再预留 64 KiB 给 invoke 头;offset 按实际批次行数推进。
与按使用方账本的保留上限一致。回包 `{ seq, received, committed }`,`received` 是本批结束的行偏移。
- O 按账号、报告电脑隔离暂存,每台只留一份;从 offset 0 开始顺序收取,同一份的 seq、sinceDay 和 total 必须一致。
收齐后才整体替换并登记去重序号。缺批、乱序、暂存过期(10 分钟)或 O 重启都要求 C 从头重报,旧账本不变;
@@ -961,7 +962,7 @@ G 重新打开时换一台。G 与 O 之间新增四项可选内容,O 与 M
`CHANNEL_NOT_ALLOWED`:C 都按不支持处理,30 分钟后再试,不影响任务;这部分用量在 O 上缺,直到 O 更新。
- 旧 C 不报:O 上缺这部分,其余照旧。
- 认识 `usage` 但不认识 `usage-part` 的 O 拒绝新动作;C 按不支持处理并保留完整重报意图,30 分钟后再试,
- 不回退成部分 `usage` 报告。3000 行以内继续使用原动作。小报告无需双方同时更新,大报告在 O 更新后补报。
+ 不回退成部分 `usage` 报告。行数和字节数都在预算内才继续使用原动作。小报告无需双方同时更新,大报告在 O 更新后补报。
- `maker:provider:list`、relay、帧限制、服务器与数据库都不变。
- 降级:已发布的受邀者账本(`provider-share-usage.json`)行键与合计不变,各台组内电脑的分布放在行里的 `byMember`,旧版本
照常累计合计并原样写回,降级不丢用量(降级期间记的回来后算没区分电脑)。按使用方的账本(`provider-usage-by-party.json`)