mirror of
https://github.com/kuhyx/diet-guard.git
synced 2026-11-11 18:33:56 +01:00
diet_guard pushed as "pc" (Python), "phone" (Android) and "desktop" (web). A role constant collides the moment a second machine takes the same role, and after a reinstall the new install inherits the previous one's CRDT identity -- the same reasoning home_inventory already records for choosing a uuid. Both halves now mint a uuid once and persist it: the PC in ~/.local/share/diet_guard/.device_id, the app under SharedPreferences 'crdt.nodeId' (the key todo and home_inventory already use). The old constant survives as the legacy id and is passed to sync_log / syncLog, so devices/<legacy>/ is skipped as this device's own. Without that every tick would re-download and re-merge this device's own pre-migration log as though a peer had written it -- idempotent under LWW, but hundreds of KB, 96 times a day. It drops to None once that path is reclaimed; a test covers both states, including a negative control proving the skip is the legacy id's doing. All four documents move together (food_log, food_bank, food_bank_manual, budget), and the hist:<date> fields riding on the budget record are untouched -- merge_record unions field names, so they relay through unchanged. The resolver lives in its own module (_device.py / sync_device_id.dart) because _sync_merge needs it for HLC stamping too and importing _sync there would be a cycle. Dart resolves it asynchronously at startup, before LogStorageService.init(); currentSyncDeviceId falls back to the compile-time role constant until then, so a too-early Hlc stamp gets a valid id rather than crashing. conftest redirects the new id file in the same change that introduces it -- without that a test mints a uuid into the real state dir and this machine's live sync identity is decided by whichever test ran first. Verified by checking ~/.local/share/diet_guard/ before and after: untouched. Verified live, not just against mocks: the sync timer ran mid-change and migrated this machine to f8f46da6. All 358 food_log records and all 100 food_bank records are present under the new path (0 missing vs devices/pc/), and the new log's HLCs carry only its own id -- confirming it did not re-merge the old path as a peer. Python: 687 tests, 100% branch coverage. App: 518 tests, analyzer clean. Pins bumped to crdt-sync-v0.6.0 / crdt_sync_dart-v0.7.0 (pyproject, requirements.txt, .pre-commit-config.yaml, pubspec), and the new library is installed into /usr/bin/python's user site-packages so the production timer does not ImportError on its next tick. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01GZH89WEqAjuJT8WZdqc7AP
74 lines
2.3 KiB
Dart
74 lines
2.3 KiB
Dart
import 'package:diet_guard_app/services/github_client_factory.dart';
|
|
import 'package:diet_guard_app/services/sync_device_id.dart';
|
|
import 'package:flutter_test/flutter_test.dart';
|
|
import 'package:shared_preferences/shared_preferences.dart';
|
|
import 'package:uuid/uuid.dart';
|
|
|
|
void main() {
|
|
setUp(() {
|
|
SharedPreferences.setMockInitialValues({});
|
|
resetSyncDeviceIdForTest();
|
|
});
|
|
|
|
group('initSyncDeviceId', () {
|
|
test('mints and persists a uuid on first run', () async {
|
|
final minted = await initSyncDeviceId();
|
|
|
|
expect(Uuid.isValidUUID(fromString: minted), isTrue);
|
|
final prefs = await SharedPreferences.getInstance();
|
|
expect(prefs.getString(kSyncDeviceIdKey), minted);
|
|
});
|
|
|
|
test('returns the same id on every later run', () async {
|
|
final first = await initSyncDeviceId();
|
|
resetSyncDeviceIdForTest();
|
|
|
|
expect(await initSyncDeviceId(), first);
|
|
});
|
|
|
|
test('adopts an id already stored under the shared key', () async {
|
|
SharedPreferences.setMockInitialValues({
|
|
kSyncDeviceIdKey: 'pre-existing-id',
|
|
});
|
|
|
|
expect(await initSyncDeviceId(), 'pre-existing-id');
|
|
});
|
|
|
|
test('treats a blank stored id as absent', () async {
|
|
SharedPreferences.setMockInitialValues({kSyncDeviceIdKey: ''});
|
|
|
|
expect(await initSyncDeviceId(), isNotEmpty);
|
|
});
|
|
|
|
test('is idempotent', () async {
|
|
final first = await initSyncDeviceId();
|
|
|
|
expect(await initSyncDeviceId(), first);
|
|
});
|
|
});
|
|
|
|
group('currentSyncDeviceId', () {
|
|
test('falls back to the role constant before init runs', () {
|
|
// A caller that stamps an Hlc before startup finishes must still get a
|
|
// valid id -- the pre-migration one -- rather than crash.
|
|
expect(currentSyncDeviceId, syncDeviceId);
|
|
});
|
|
|
|
test('returns the persisted uuid once init has run', () async {
|
|
final minted = await initSyncDeviceId();
|
|
|
|
expect(currentSyncDeviceId, minted);
|
|
expect(currentSyncDeviceId, isNot(syncDeviceId));
|
|
});
|
|
});
|
|
|
|
group('legacySyncDeviceId', () {
|
|
test('is the role constant this build shipped with', () {
|
|
// Passed to syncLog so devices/<legacy>/ is skipped as this device's
|
|
// own; if it ever drifted from the pre-migration value, the old log
|
|
// would be re-merged as a peer's on every tick.
|
|
expect(legacySyncDeviceId, syncDeviceId);
|
|
});
|
|
});
|
|
}
|