fix: offline sync conflict resolution and double-submission race conditions (#674)#682
Open
knoxiboy wants to merge 1 commit into
Open
fix: offline sync conflict resolution and double-submission race conditions (#674)#682knoxiboy wants to merge 1 commit into
knoxiboy wants to merge 1 commit into
Conversation
Author
|
@Shruti070107 Please review this pr and merge it |
1 similar comment
Author
|
@Shruti070107 Please review this pr and merge it |
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
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.
Resolves #674
Description
This PR refactors the offline sync logic to use a serialized first-in-first-out (FIFO) queue and introduces a conflict-resolution system with three strategies: Server Wins, Client Wins, and Merge. It prevents database ID conflicts and double-submission race conditions when syncing offline actions back to the Appwrite server.
What changed
syncPendingActionsinsrc/offline-sync.jsto run tasks sequentially./api/records/${id}prior to applying updates.src/conflict-resolver.jsto implementresolveConflictsupportingserver-wins,client-wins, andmergestrategies.window.confirmfor manual selection on critical conflicts under the merge strategy.Why
When internet connection recovers, rapid parallel uploads of offline actions can overwrite each other or create duplicate database entries, causing race conditions. Serializing writes and checking server timestamps solves this issue.
How to test
npm run testto verify structure health.Checklist
Files Affected
src/offline-sync.jssrc/conflict-resolver.js