mirror of
https://github.com/johannesjo/super-productivity.git
synced 2026-07-17 16:37:43 +00:00
* fix(op-log): lock snapshot save to prevent lost-update window saveCurrentStateAsSnapshot() read NgRx state then lastSeq without holding OPERATION_LOG lock. An op appended between the two reads would get seq <= lastAppliedOpSeq but its effect would be absent from the snapshot. On next hydration the tail replay would start after that seq, silently skipping the op forever. Fix: wrap in lockService.request(LOCK_NAMES.OPERATION_LOG, ...) and read lastSeq BEFORE state snapshot so the worst interleaving degrades to harmless re-replay (idempotent) rather than a missed op. Fixes #8308 * fix(op-log): address review feedback on snapshot lock PR - Amend JSDoc idempotency claim: syncTimeSpent is additive on re-replay - Add inline note about compaction's opposite read order and worse failure mode - Add lock regression tests (#8308): lock acquired, read order, error handling Co-Authored-By: Claude <noreply@anthropic.com> * refactor(sync): remove unused error classes, dialog, and constructor-time logging Phase 1 of #8325: clean up orphaned sync error types and their UI. Removed error classes that are no longer thrown anywhere: - NoEtagAPIError, FileExistsAPIError (unused API errors) - RevMismatchForModelError, SyncInvalidTimeValuesError (superseded by file-based flow) - RevMapModelMismatchErrorOnDownload/Upload, NoRemoteModelFile, NoRemoteMetaFile - LockPresentError, LockFromLocalClientPresentError, MetaNotReadyError, InvalidRevMapError Removed DialogSyncErrorComponent and all references in SyncWrapperService (_forceDownload, _handleIncoherentTimestampsDialog, _handleIncompleteSyncDialog, _openSyncErrorDialog, _extractModelIdFromError). Removed constructor-time logging from JsonParseError, ModelValidationError, DataValidationFailedError — these errors are logged at the catch site; redundant construction-time logs risk leaking user data. Cleaned up dead translation keys (D_INCOMPLETE_SYNC block, DIALOG_RESULT_ERROR, ERROR_DATA_IS_CURRENTLY_WRITTEN) from en.json and t.const.ts. Updated file-based-sync-flowchart.md to reflect the removed error types. --------- Co-authored-by: Claude <noreply@anthropic.com>
10 KiB
10 KiB
File-Based Sync Flow — Mermaid Chart
Visual overview of the sync decision tree for file-based providers (Dropbox, WebDAV, LocalFile). For the SuperSync equivalent see supersync-scenarios-flowchart.md.
Both share the same op-log infrastructure (OperationLogSyncService, RemoteOpsProcessingService, conflict detection) but differ in the transport/adapter layer.
flowchart TD
START([Sync Triggered]) --> DL[Download sync-data.json<br/>gap detection handled internally]
%% ── SERVER MIGRATION (file-based specific) ──────────────────
DL --> MIG_CHK{Server migration?<br/>gap + empty server}
MIG_CHK -->|Yes| MIGRATION[Server migration:<br/>handleServerMigration<br/>creates SYNC_IMPORT]
MIG_CHK -->|No| DECRYPT
%% ── DECRYPTION (shared with SuperSync) ────────────────────────
DECRYPT{Encrypted?}
DECRYPT -->|Yes| DECRYPT_OK{Decryption succeeds?}
DECRYPT -->|No| SNAPSHOT_CHK
DECRYPT_OK -->|Yes| SNAPSHOT_CHK
DECRYPT_OK -->|No password configured| NO_PWD_DLG[Enter Password dialog:<br/>Save & Sync / Force Overwrite / Cancel]
DECRYPT_OK -->|Wrong password| WRONG_PWD_DLG[Decrypt Error dialog:<br/>Save & Sync / Use Local / Cancel]
NO_PWD_DLG -->|Save & Sync| START
NO_PWD_DLG -->|Force Overwrite| FORCE_UP[Force upload local state<br/>SYNC_IMPORT]
WRONG_PWD_DLG -->|Save & Sync| START
WRONG_PWD_DLG -->|Use Local| FORCE_UP
%% ── SNAPSHOT vs INCREMENTAL BRANCH (file-based specific) ────
SNAPSHOT_CHK{snapshotState<br/>received?<br/>seq 0 download only}
SNAPSHOT_CHK -->|Yes| SS_OPS
SNAPSHOT_CHK -->|No| HAS_OPS
%% ── SNAPSHOT PATH (file-based specific) ─────────────────────
SS_OPS{Has meaningful<br/>unsynced ops?}
SS_OPS -->|Yes| SS_CONFLICT[SyncConflictDialog:<br/>USE_LOCAL / USE_REMOTE / CANCEL]
SS_OPS -->|No| SS_FRESH{Fresh client?}
SS_FRESH -->|Yes + meaningful<br/>store data| SS_CONFLICT
SS_FRESH -->|Yes + no local data| SS_CONFIRM[Confirm dialog:<br/>Download remote?]
SS_FRESH -->|Not fresh| HYDRATE
SS_CONFLICT -->|Use Local| FORCE_UP
SS_CONFLICT -->|Use Remote| FORCE_DL[Force download<br/>from seq 0]
SS_CONFLICT -->|Cancel| CANCELLED([Sync Cancelled])
SS_CONFIRM -->|OK| HYDRATE[Hydrate from<br/>snapshotState]
SS_CONFIRM -->|Cancel| CANCELLED
HYDRATE --> UPLOAD
%% ── INCREMENTAL OPS PATH (shared logic) ────────────────────
HAS_OPS{Remote ops found?}
%% No remote ops
HAS_OPS -->|No| EMPTY_SVR{Empty server<br/>+ fresh client<br/>+ has local data?}
EMPTY_SVR -->|Yes| SILENT_MIG[Silent server migration<br/>creates SYNC_IMPORT]
EMPTY_SVR -->|No| UPLOAD
SILENT_MIG --> UPLOAD
%% Has remote ops
HAS_OPS -->|Yes| IS_FRESH{Fresh client?}
IS_FRESH -->|No| IS_IMPORT
IS_FRESH -->|Yes + has local data| CONFLICT_DLG[SyncConflictDialog:<br/>USE_LOCAL / USE_REMOTE / CANCEL]
IS_FRESH -->|Yes + no local data| CONFIRM[Confirm dialog:<br/>Download remote?]
CONFIRM -->|OK| APPLY
CONFIRM -->|Cancel| CANCELLED
CONFLICT_DLG -->|Use Local| FORCE_UP
CONFLICT_DLG -->|Use Remote| FORCE_DL
CONFLICT_DLG -->|Cancel| CANCELLED
%% SYNC_IMPORT handling (shared logic)
IS_IMPORT{Contains SYNC_IMPORT?}
IS_IMPORT -->|No| CONFLICT_CHK
IS_IMPORT -->|Yes| ENC_ONLY{Encryption-only change<br/>+ no pending ops?}
ENC_ONLY -->|Yes| APPLY
ENC_ONLY -->|No| IMPORT_HAS{Has pending ops<br/>or meaningful<br/>local data?}
IMPORT_HAS -->|Yes| IMPORT_DLG[ImportConflictDialog:<br/>import reason shown,<br/>Use Server Data recommended]
IMPORT_HAS -->|No| APPLY_IMPORT[Apply full state replacement]
IMPORT_DLG -->|Use Server| FORCE_DL
IMPORT_DLG -->|Use Local| FORCE_UP
IMPORT_DLG -->|Cancel| CANCELLED
%% Conflict detection (shared logic)
CONFLICT_CHK{Vector clock conflict?} -->|CONCURRENT| LWW[Auto-resolve LWW<br/>later timestamp wins<br/>ties → remote wins<br/>archive ops always win]
CONFLICT_CHK -->|No conflict| APPLY
LWW --> APPLY[Apply ops to NgRx store]
APPLY_IMPORT --> UPLOAD
%% ── UPLOAD PHASE (file-based specific) ─────────────────────
APPLY --> UPLOAD[Upload: merge state<br/>into sync-data.json]
UPLOAD --> REV{Rev match<br/>on upload?}
REV -->|OK| IN_SYNC([IN_SYNC ✓])
REV -->|Mismatch| RETRY[Exponential backoff:<br/>re-download, rebuild,<br/>re-upload]
RETRY --> RETRY_CHK{Max retries?}
RETRY_CHK -->|Not exceeded| REV
RETRY_CHK -->|Exceeded| ERROR
FORCE_UP --> IN_SYNC
FORCE_DL --> IN_SYNC
MIGRATION --> IN_SYNC
ERROR([ERROR])
%% Styling
classDef success fill:#2d6,stroke:#1a4,color:#fff
classDef error fill:#d33,stroke:#a11,color:#fff
classDef cancel fill:#888,stroke:#555,color:#fff
classDef dialog fill:#48f,stroke:#26d,color:#fff
classDef action fill:#e90,stroke:#b60,color:#fff,stroke-width:3px
class IN_SYNC success
class ERROR error
class CANCELLED cancel
class SS_CONFIRM,CONFIRM,SS_CONFLICT,CONFLICT_DLG,IMPORT_DLG,NO_PWD_DLG,WRONG_PWD_DLG dialog
class APPLY,APPLY_IMPORT,FORCE_UP,FORCE_DL,MIGRATION,UPLOAD,SILENT_MIG,HYDRATE,RETRY action
Error Handling (SyncWrapperService)
Errors thrown during sync are caught by SyncWrapperService._sync(). File-based providers surface additional error types not seen with SuperSync:
flowchart LR
ERR([Error thrown<br/>during sync]) --> TYPE{Error type?}
TYPE -->|DecryptNoPasswordError| PWD_DLG[Enter Password dialog]
TYPE -->|DecryptError| DEC_DLG[Decrypt Error dialog]
TYPE -->|LocalDataConflictError| CONF_DLG[SyncConflictDialog]
TYPE -->|PotentialCorsError| CORS[CORS error snackbar]
TYPE -->|AuthFail / MissingCredentials| AUTH[Auth error snackbar<br/>+ Configure action]
TYPE -->|WebCryptoNotAvailable| CRYPTO[WebCrypto snackbar]
TYPE -->|Timeout| TIMEOUT[Timeout error snackbar]
TYPE -->|Permission error| PERM[Permission error snackbar]
TYPE -->|Other| GENERIC[Generic error snackbar]
classDef dialog fill:#48f,stroke:#26d,color:#fff
classDef snack fill:#f90,stroke:#b60,color:#fff
class PWD_DLG,DEC_DLG,CONF_DLG dialog
class LOCK,CORS,AUTH,CRYPTO,TIMEOUT,PERM,GENERIC snack
Legend:
- 🟢 Green = success states
- 🔴 Red = error states
- 🔵 Blue = user-facing dialogs
- 🟠 Orange = key actions (state changes, uploads, downloads)
- ⚫ Gray = cancelled/disabled
Key Differences from SuperSync
| Aspect | File-Based (Dropbox, WebDAV, LocalFile) | SuperSync |
|---|---|---|
| Transport | Downloads/uploads a single sync-data.json file |
Paginated API (server-side op log) |
| Snapshot path | Full snapshotState on seq 0 download, with its own conflict-checking flow |
No snapshot concept — all ops are incremental |
| Gap detection | Adapter detects syncVersion reset / snapshot replacement / partial trimming → re-download from seq 0 | Server handles gap detection internally |
| Server migration | Gap on empty server → needsFullStateUpload → handleServerMigration() |
Same concept but detected via different mechanism |
| Upload retry | Rev matching (ETag) + exponential backoff with jitter | Server rejection codes (CONFLICT_CONCURRENT) |
| Piggybacking | Not applicable — no server to piggyback. Concurrent changes are discovered on re-download during retry. | Server returns piggybacked ops in upload response |
| Post-sync encryption prompt | Not applicable | Prompts user to set password or disable sync |
| File-based error types | PotentialCorsError, LegacySyncFormatDetectedError, SyncDataCorruptedError |
Not applicable |
Notes
- The
Enter PasswordandDecrypt Errordialogs correspond toDecryptNoPasswordErrorandDecryptErrorrespectively — they are shared with SuperSync and are distinct components with different options. Encryption-only changebypass: when an incoming SYNC_IMPORT hassyncImportReason === 'PASSWORD_CHANGED'and there are no meaningful pending ops, the dialog is skipped (data is identical, only encryption changed).- LWW tie-breaking: on equal timestamps, remote wins (server-authoritative).
moveToArchiveoperations always win regardless of timestamp. - Gap detection triggers: (1) syncVersion reset — another client uploaded a snapshot resetting the counter; (2) snapshot replacement —
recentOpsis empty butstateexists andclientIddiffers; (3) partial trimming —oldestOpSyncVersion > sinceSeqand buffer is full. - Upload retry uses exponential backoff:
base × 2^(attempt-1) + random(0..50%)with max retries defined byFILE_BASED_SYNC_CONSTANTS.MAX_UPLOAD_RETRIES.
Key Source Files
| File | Role |
|---|---|
src/app/imex/sync/sync-wrapper.service.ts |
Top-level orchestration + error handling |
src/app/op-log/sync/operation-log-sync.service.ts |
Download/upload orchestration, fresh client checks, SYNC_IMPORT handling |
src/app/op-log/sync/operation-log-download.service.ts |
Download + internal gap detection |
src/app/op-log/sync-providers/file-based/file-based-sync-adapter.service.ts |
File adapter (rev matching, gap detection, snapshot upload) |