Some checks failed
build-packages / resolve bundled mosh-client (push) Has been cancelled
build-packages / resolve bundled et-client (push) Has been cancelled
build-packages / build-macos (push) Has been cancelled
build-packages / build-windows (push) Has been cancelled
build-packages / build-linux-x64 (push) Has been cancelled
build-packages / build-linux-arm64 (push) Has been cancelled
build-packages / release (push) Has been cancelled
build-packages / update Nix release metadata (push) Has been cancelled
build-packages / bump homebrew tap (push) Has been cancelled
test / lint-and-test (push) Has been cancelled
AI automation / Route event (push) Has been cancelled
AI automation / Hand reopened issue to maintainers (push) Has been cancelled
AI automation / Clean source issue state (push) Has been cancelled
AI automation / Reconcile handoffs (push) Has been cancelled
AI automation / Classify issue (push) Has been cancelled
AI automation / Claude Code smoke (push) Has been cancelled
AI automation / Review issue follow-up (push) Has been cancelled
AI automation / Publish issue follow-up (push) Has been cancelled
AI automation / Implement with Claude Code (push) Has been cancelled
AI automation / Publish implement PR (push) Has been cancelled
AI automation / Continue queued issue comments (push) Has been cancelled
AI automation / Codex review loop (push) Has been cancelled
AI automation / Publish Codex fix (push) Has been cancelled
AI automation / Clear Codex dispatch marker (push) Has been cancelled
AI automation / Own PR re-request Codex (push) Has been cancelled
AI automation / External PR re-request Codex (push) Has been cancelled
AI automation / Poll Codex reaction / retry (push) Has been cancelled
build-et-binaries / build-linux-x64 (push) Has been cancelled
build-et-binaries / build-linux-arm64 (push) Has been cancelled
build-et-binaries / build-macos-universal (push) Has been cancelled
build-et-binaries / build-windows-x64 (push) Has been cancelled
build-et-binaries / release (push) Has been cancelled
70 lines
2.6 KiB
TypeScript
70 lines
2.6 KiB
TypeScript
import test from 'node:test';
|
|
import assert from 'node:assert/strict';
|
|
|
|
import { dotKey } from './clock.ts';
|
|
import {
|
|
isConvergentConflictSecret,
|
|
resolveConvergentFieldConflict,
|
|
} from './conflicts.ts';
|
|
import { createConvergentSyncStateFromPayload } from './payload.ts';
|
|
import { applyLegacySyncPayload } from './legacy.ts';
|
|
import { materializeConvergentSyncState, mergeConvergentSyncStates } from './state.ts';
|
|
import type { SyncPayload } from '../sync.ts';
|
|
|
|
function payload(label: string): SyncPayload {
|
|
return {
|
|
hosts: [{ id: 'h', label, hostname: 'example.com', port: 22, username: 'root', tags: [], os: 'linux' }],
|
|
keys: [], snippets: [], customGroups: [], syncedAt: 0,
|
|
};
|
|
}
|
|
|
|
test('field conflict resolution writes a causal value over every candidate', () => {
|
|
const basePayload = payload('base');
|
|
const base = createConvergentSyncStateFromPayload(basePayload, 'seed', 1);
|
|
const left = applyLegacySyncPayload(base, basePayload, payload('left'), 'left', 2);
|
|
const right = applyLegacySyncPayload(base, basePayload, payload('right'), 'right', 3);
|
|
const merged = mergeConvergentSyncStates(left, right);
|
|
const conflict = materializeConvergentSyncState(merged).conflicts.find(
|
|
(entry) => entry.address.kind === 'entity-field' && entry.address.field === 'label',
|
|
)!;
|
|
const selected = conflict.candidates.find((candidate) => candidate.value === 'left')!;
|
|
|
|
const resolved = resolveConvergentFieldConflict(
|
|
merged,
|
|
conflict,
|
|
dotKey(selected.dot),
|
|
'resolver',
|
|
4,
|
|
);
|
|
|
|
assert.equal(materializeConvergentSyncState(resolved).conflicts.length, 0);
|
|
assert.equal(materializeConvergentSyncState(resolved).collections.hosts[0]?.label, 'left');
|
|
});
|
|
|
|
test('secret conflicts are identified from paths and nested candidate keys', () => {
|
|
assert.equal(isConvergentConflictSecret({
|
|
address: { kind: 'entity-field', collection: 'keys', entityId: 'k', field: 'privateKey' },
|
|
candidates: [],
|
|
}), true);
|
|
assert.equal(isConvergentConflictSecret({
|
|
address: { kind: 'entity-field', collection: 'hosts', entityId: 'h', field: 'proxyConfig' },
|
|
candidates: [{
|
|
dot: { deviceId: 'a', counter: 1 },
|
|
hlc: { wallTime: 1, logical: 0 },
|
|
tombstone: false,
|
|
value: { password: 'do-not-render' },
|
|
selected: true,
|
|
}],
|
|
}), true);
|
|
assert.equal(isConvergentConflictSecret({
|
|
address: { kind: 'setting', path: ['ai', 'providers'] },
|
|
candidates: [{
|
|
dot: { deviceId: 'a', counter: 2 },
|
|
hlc: { wallTime: 2, logical: 0 },
|
|
tombstone: false,
|
|
value: [{ id: 'provider-1', credentials: { apiKey: 'nested-do-not-render' } }],
|
|
selected: true,
|
|
}],
|
|
}), true);
|
|
});
|