mirror of
https://github.com/kuhyx/diet-guard.git
synced 2026-11-11 15:33:57 +01:00
Krzysztof kuhy Rudnicki
e23f7ac3b4
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
56 lines
2.2 KiB
Dart
56 lines
2.2 KiB
Dart
/// This install's persisted sync device id.
|
|
library;
|
|
|
|
import 'package:diet_guard_app/services/github_client_factory.dart';
|
|
import 'package:shared_preferences/shared_preferences.dart';
|
|
import 'package:uuid/uuid.dart';
|
|
|
|
/// SharedPreferences key holding this install's device id.
|
|
///
|
|
/// The same key the sibling apps (`todo`, `home_inventory`, `wake_alarm`)
|
|
/// use for the same purpose.
|
|
const kSyncDeviceIdKey = 'crdt.nodeId';
|
|
|
|
String? _cached;
|
|
|
|
/// This install's sync device id, for HLC stamping and the pushed path.
|
|
///
|
|
/// Synchronous because [Hlc] stamping is synchronous and threading a future
|
|
/// through every merge adapter would be a large change for no benefit. Call
|
|
/// [initSyncDeviceId] once during startup, before any sync or merge runs;
|
|
/// until then this falls back to the compile-time role constant
|
|
/// ([syncDeviceId]) so a caller that forgets still writes a *valid* id rather
|
|
/// than crashing -- it just writes the pre-migration one.
|
|
String get currentSyncDeviceId => _cached ?? syncDeviceId;
|
|
|
|
/// The id this install pushed under before migrating to a persisted uuid.
|
|
///
|
|
/// Passed to `syncLog` as its legacy id so the log already sitting at
|
|
/// `devices/<legacy>/` is treated as this device's own rather than a peer's;
|
|
/// without it every tick re-downloads and re-merges this device's own
|
|
/// pre-migration history. Set to null once that path has been reclaimed.
|
|
const String legacySyncDeviceId = syncDeviceId;
|
|
|
|
/// Loads (or mints and persists) this install's device id.
|
|
///
|
|
/// A per-install uuid rather than the fixed `phone`/`desktop` role constant:
|
|
/// two installs sharing an id overwrite each other's pushed file on every
|
|
/// tick, and a reinstall would inherit the previous install's CRDT identity.
|
|
///
|
|
/// Idempotent -- safe to call more than once.
|
|
Future<String> initSyncDeviceId({SharedPreferences? prefs}) async {
|
|
final store = prefs ?? await SharedPreferences.getInstance();
|
|
final existing = store.getString(kSyncDeviceIdKey);
|
|
if (existing != null && existing.isNotEmpty) {
|
|
_cached = existing;
|
|
return existing;
|
|
}
|
|
final minted = const Uuid().v4();
|
|
await store.setString(kSyncDeviceIdKey, minted);
|
|
_cached = minted;
|
|
return minted;
|
|
}
|
|
|
|
/// Resets the cached id. Test-only.
|
|
void resetSyncDeviceIdForTest() => _cached = null;
|