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(desktop): restore revoked favorites without cross-region access

DavidShen04ce8f7892e0
diff --git a/apps/desktop/src/main/device-link/__tests__/providerShareCrossRegion.test.ts b/apps/desktop/src/main/device-link/__tests__/providerShareCrossRegion.test.ts
index 991f4772da..d63b309747 100644
--- a/apps/desktop/src/main/device-link/__tests__/providerShareCrossRegion.test.ts
+++ b/apps/desktop/src/main/device-link/__tests__/providerShareCrossRegion.test.ts
@@ -133,38 +133,69 @@ describe('cross-region provider share', () => {
await probe();
state.responses.set('/requests', { requestId: 'r1', status: 'pending', pairingCode: '0042', expiresAt: new Date().toISOString(), requestToken: TOKEN });
await crossRegionSendRequest('global', TOKEN);
+ const oldHistory = __testing.readMarkers();
+ fs.writeFileSync(path.join(dir, 'remote-agent', 'provider-share-regions.json'), JSON.stringify({ version: 1, accounts: {}, knownAccounts: oldHistory }));
+ state.calls = [];
+ state.identityCards = [];
+ await probe(); // 历史往来不能作为联网资格,也不能被当作服务端空名单。
state.userId = 'user-2';
state.calls = [];
state.identityCards = [];
await probe();
});
- it('recovers a revoked region from favorite hints after its marker is removed and the runtime restarts', async () => {
+ it('restores confirmed empty membership locally after restart without granting favorite hints network access', async () => {
state.responses.set('/requests', { requestId: 'r1', status: 'pending', pairingCode: '0042', expiresAt: new Date().toISOString(), requestToken: TOKEN });
await crossRegionSendRequest('global', TOKEN);
- // 旧版没有历史字段:删除活动标记前必须保留它的 Main 往来证据。
+ // 兼容旧版活动标记;服务端空名单与撤销联网资格在同一次写入中保存。
fs.writeFileSync(path.join(dir, 'remote-agent', 'provider-share-regions.json'), JSON.stringify({ version: 1, accounts: __testing.readMarkers() }));
state.responses.set('/session', { credential: null, expiresAt: null, shares: [] });
startProviderShareGuest({ changed: vi.fn(), settled: vi.fn() }, { userDataDir: dir });
await refreshReceivedShares('test');
await refreshProviderShareCrossRegion('global');
expect(__testing.readMarkers()).toEqual({});
- stopProviderShareGuest();
+ const saved = JSON.parse(fs.readFileSync(path.join(dir, 'remote-agent', 'provider-share-regions.json'), 'utf8'));
+ expect(Object.values(saved.emptyAccounts)).toEqual([['global']]);
+ expect(saved.knownAccounts).toBeUndefined();
state.calls = [];
+ state.identityCards = [];
+ const recovery = { ownerStamp: { dataOwnerId: 'user-1', ownerGeneration: 1 }, regions: ['global'] as const };
+ for (let restart = 0; restart < 3; restart += 1) {
+ stopProviderShareGuest();
+ startProviderShareGuest({ changed: vi.fn(), settled: vi.fn() }, { userDataDir: dir });
+ await refreshReceivedShares('test');
+ // 首次读取即可清理失败残留;之后伪造收藏、多窗口查询和再重启也不会发身份名片。
+ expect(getReceivedSharesSnapshot().confirmedRegions).toEqual(['cn', 'global']);
+ expect(getReceivedSharesSnapshot(recovery).confirmedRegions).toEqual(['cn', 'global']);
+ getReceivedSharesSnapshot(recovery);
+ await new Promise((resolve) => setTimeout(resolve, 0));
+ expect(state.calls).toEqual([]);
+ expect(state.identityCards).toEqual([]);
+ expect(state.clients).toEqual([]);
+ }
+ state.userId = 'user-2';
startProviderShareGuest({ changed: vi.fn(), settled: vi.fn() }, { userDataDir: dir });
await refreshReceivedShares('test');
expect(getReceivedSharesSnapshot().confirmedRegions).toEqual(['cn']);
- getReceivedSharesSnapshot({ ownerStamp: { dataOwnerId: 'other', ownerGeneration: 1 }, regions: ['global'] });
- getReceivedSharesSnapshot({ ownerStamp: { dataOwnerId: 'user-1', ownerGeneration: 0 }, regions: ['global'] });
- await Promise.resolve();
- expect(state.calls).toEqual([]);
- const recovery = { ownerStamp: { dataOwnerId: 'user-1', ownerGeneration: 1 }, regions: ['global'] as const };
- // 立即返回本区域快照;多个窗口同时恢复只发一次对方区域请求。
- expect(getReceivedSharesSnapshot(recovery).confirmedRegions).toEqual(['cn']);
- getReceivedSharesSnapshot(recovery);
+ });
+
+ it('invalidates a saved empty list on a new application and never infers revocation from missing credentials', async () => {
+ state.responses.set('/requests', { requestId: 'r1', status: 'pending', pairingCode: '0042', expiresAt: new Date().toISOString(), requestToken: TOKEN });
+ await crossRegionSendRequest('global', TOKEN);
+ state.responses.set('/session', { credential: null, expiresAt: null, shares: [] });
+ startProviderShareGuest({ changed: vi.fn(), settled: vi.fn() }, { userDataDir: dir });
await refreshProviderShareCrossRegion('global');
- expect(getReceivedSharesSnapshot(recovery).confirmedRegions).toEqual(['cn', 'global']);
- expect(state.calls.filter((call) => call.path.endsWith('/session'))).toHaveLength(1);
+ await crossRegionSendRequest('global', TOKEN);
+ state.responses.delete('/session');
+ startProviderShareGuest({ changed: vi.fn(), settled: vi.fn() }, { userDataDir: dir });
+ await refreshReceivedShares('test');
+ await refreshProviderShareCrossRegion('global');
+ expect(getReceivedSharesSnapshot().confirmedRegions).toEqual(['cn']);
+ state.responses.set('/session', { credential: null, expiresAt: null, shares: [share] });
+ await refreshProviderShareCrossRegion('global');
+ startProviderShareGuest({ changed: vi.fn(), settled: vi.fn() }, { userDataDir: dir });
+ await refreshReceivedShares('test');
+ expect(getReceivedSharesSnapshot().confirmedRegions).toEqual(['cn']);
});
it('keeps network backoff when favorite recovery is requested repeatedly', async () => {
diff --git a/apps/desktop/src/main/device-link/providerShareCrossRegion.ts b/apps/desktop/src/main/device-link/providerShareCrossRegion.ts
index 3da76f3153..88f2091fb6 100644
--- a/apps/desktop/src/main/device-link/providerShareCrossRegion.ts
+++ b/apps/desktop/src/main/device-link/providerShareCrossRegion.ts
@@ -101,11 +101,11 @@ function markerPath(): string | null {
return userDataDir ? path.join(userDataDir, 'remote-agent', MARKER_FILE) : null;
}
-function readMarkers(field: 'accounts' | 'knownAccounts' = 'accounts'): Record<string, Region[]> {
+function readMarkers(field: 'accounts' | 'emptyAccounts' = 'accounts'): Record<string, Region[]> {
const file = markerPath();
if (!file) return {};
try {
- const parsed = JSON.parse(fs.readFileSync(file, 'utf8')) as { version?: unknown; accounts?: unknown; knownAccounts?: unknown };
+ const parsed = JSON.parse(fs.readFileSync(file, 'utf8')) as { version?: unknown; accounts?: unknown; emptyAccounts?: unknown };
const records = parsed[field];
if (parsed.version !== 1 || !records || typeof records !== 'object') return {};
const out: Record<string, Region[]> = {};
@@ -119,16 +119,17 @@ function readMarkers(field: 'accounts' | 'knownAccounts' = 'accounts'): Record<s
}
}
-async function writeMarker(account: string, region: Region, present: boolean): Promise<void> {
+async function writeMarker(account: string, region: Region, present: boolean, confirmedEmpty = false): Promise<void> {
const file = markerPath();
if (!file) return;
const markers = readMarkers();
- const knownAccounts = readMarkers('knownAccounts');
- // 保留 Main 已确认的跨区往来,不含凭证。旧版活动标记同时是合法的历史证据。
- for (const [key, active] of Object.entries(markers)) {
- knownAccounts[key] = [...new Set([...(knownAccounts[key] ?? []), ...active])];
- }
- if (present) knownAccounts[account] = [...new Set([...(knownAccounts[account] ?? []), region])];
+ // 服务端确认的空名单只供本地收藏清理,绝不授予跨区联网能力。新申请使旧结论失效。
+ const emptyAccounts = readMarkers('emptyAccounts');
+ const emptyRegions = new Set(emptyAccounts[account] ?? []);
+ if (confirmedEmpty && !present) emptyRegions.add(region);
+ else emptyRegions.delete(region);
+ if (emptyRegions.size > 0) emptyAccounts[account] = [...emptyRegions];
+ else delete emptyAccounts[account];
const regions = new Set(markers[account] ?? []);
if (present) regions.add(region);
else regions.delete(region);
@@ -137,7 +138,7 @@ async function writeMarker(account: string, region: Region, present: boolean): P
const tmp = `${file}.${process.pid}.${Date.now()}.tmp`;
await fsp.mkdir(path.dirname(file), { recursive: true });
try {
- await fsp.writeFile(tmp, JSON.stringify({ version: 1, accounts: markers, knownAccounts }), { encoding: 'utf8', mode: 0o600 });
+ await fsp.writeFile(tmp, JSON.stringify({ version: 1, accounts: markers, emptyAccounts }), { encoding: 'utf8', mode: 0o600 });
await fsp.rename(tmp, file);
} finally {
await fsp.rm(tmp, { force: true }).catch(() => undefined);
@@ -279,12 +280,16 @@ function scheduleRefresh(rt: Runtime, state: RegionState): void {
(state.timer as { unref?: () => void }).unref?.();
}
+function initialRegionState(region: Region, loaded = false): RegionState {
+ return { region, apiBase: '', credential: null, expiresAt: 0, shares: [], client: null, refreshing: null, timer: null, failures: 0, loaded };
+}
+
/** 用新名片换取这台电脑在对方区域的分享列表与连接凭证。 */
function refreshRegion(rt: Runtime, region: Region): Promise<void> {
let state = rt.regions.get(region);
if (state?.refreshing) return state.refreshing;
if (!state) {
- state = { region, apiBase: '', credential: null, expiresAt: 0, shares: [], client: null, refreshing: null, timer: null, failures: 0, loaded: false };
+ state = initialRegionState(region);
rt.regions.set(region, state);
}
const target = state;
@@ -314,8 +319,11 @@ function refreshRegion(rt: Runtime, region: Region): Promise<void> {
if (shares.length === 0 || !credential) {
state.client?.stop();
state.client = null;
- await writeMarker(rt.account, region, false).catch(() => undefined);
- } else if (!state.client) {
+ }
+ await writeMarker(rt.account, region, shares.length > 0 && !!credential, shares.length === 0).catch((error) =>
+ log.warn('cross-region marker write failed', { error: String(error) }));
+ if (!current(rt)) return;
+ if (shares.length > 0 && credential && !state.client) {
state.client = createClient(rt, state);
}
scheduleRefresh(rt, state);
@@ -344,8 +352,13 @@ export function startProviderShareCrossRegion(events: CrossRegionEvents, options
if (!account) return;
const rt: Runtime = { events, account, regions: new Map(), stopped: false };
runtime = rt;
+ const activeRegions = readMarkers()[account] ?? [];
+ // 清理失败或未完成就退出时,下次只恢复本地空名单,不向对方区域发送身份。
+ for (const region of readMarkers('emptyAccounts')[account] ?? []) {
+ if (region === peerRegion() && !activeRegions.includes(region)) rt.regions.set(region, initialRegionState(region, true));
+ }
// 只联系标记过的区域(本账号在那里发过申请或加入过分享)。
- for (const region of readMarkers()[account] ?? []) {
+ for (const region of activeRegions) {
if (region !== peerRegion()) continue;
void refreshRegion(rt, region);
}
@@ -374,12 +387,12 @@ export function getCrossRegionReceived(): ProviderShareReceived[] {
return runtime ? [...runtime.regions.values()].flatMap((state) => state.shares) : [];
}
-/** 空名单会移除活动标记;收藏只提示核对 Main 曾确认有往来的区域,不能授权新的跨区请求。 */
+/** 收藏不能恢复已撤销的跨区联网资格;已确认空名单由启动路径在本地恢复。 */
export function ensureCrossRegionReceivedForFavorites(regions: readonly Region[]): void {
const rt = runtime;
const region = peerRegion();
if (!rt || !current(rt) || !regions.includes(region)) return;
- if (!readMarkers()[rt.account]?.includes(region) && !readMarkers('knownAccounts')[rt.account]?.includes(region)) return;
+ if (!readMarkers()[rt.account]?.includes(region)) return;
const state = rt.regions.get(region);
if (!state?.loaded && !state?.refreshing && !state?.timer) void refreshRegion(rt, region);
}