Fix #705: Implement Distributed Vector-Clock & Field-Level Conflict R…#709
Merged
Renu-code123 merged 2 commits intoRenu-code123:mainfrom Feb 19, 2026
Merged
Conversation
…l Conflict Resolution Engine
|
@SatyamPandey-07 is attempting to deploy a commit to the Renu's projects Team on Vercel. A member of the Team first needs to authorize it. |
🎉 Thanks for the PR, @SatyamPandey-07!We really appreciate you taking the time to contribute to ExpenseFlow! 💙 ⭐ Love this project?Please give us a star! It helps the project grow and reach more developers! 🌟 🔗 https://github.com/Renu-code123/ExpenseFlow ✅ PR ChecklistBefore we review, please ensure:
🙌 Thank You for Contributing!We truly appreciate your interest in contributing to this project.
We'll review your PR as soon as possible. Keep up the great work! ✨ |
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Key Features Implemented:
Vector Clock Logical Time: Built
utils/vectorClockMath.js
, providing the mathematical foundation for partial ordering. This allows the system to distinguish between "strictly newer" updates and "concurrent" (conflicting) edits without relying on vulnerable device timestamps.
Field-Level Semantic Merge: Developed
services/consensusService.js
, which implements smart reconciliation. If two devices edit different fields (e.g., one edits the 'notes' and the other edits the 'amount'), the engine automatically merges them into a single consistent state.
Conflict Store & Forking: Created
models/SyncConflict.js
to handle data forks. When non-mergeable concurrent edits occur, the system preserves both versions in a conflict log, preventing silent data loss.
Consistency Guard Middleware: Implemented
middleware/consistencyGuard.js
, a global interceptor that rejects stale or out-of-order updates with a 409 Conflict status, forcing clients to re-sync or resolve.
Sync Management API: Created
routes/syncManager.js
, providing endpoints for users to view unresolved conflicts and manually choose a "winner" state to restore consensus.
Background Maintenance: Built
jobs/conflictCleaner.js
, a worker that periodically purges old resolution logs and flags stale conflicts to maintain database performance.
Technical Specification: Documented the causal relationship logic and merge strategies in
SYNC_CONSENSUS_SPEC.md
closes #705