Strip serverOnlyFields from push conflict responses#391
Merged
Conversation
When a push results in a conflict, the response now strips serverOnlyFields from conflict documents before returning them, consistent with pull and pullStream responses. Fixes pubkey/rxdb#8291 Agent-Logs-Url: https://github.com/pubkey/rxdb-server/sessions/e57bb436-7043-4f8a-9fc2-006bd5c5c5e2 Co-authored-by: pubkey <8926560+pubkey@users.noreply.github.com>
Copilot created this pull request from a session on behalf of
pubkey
April 7, 2026 11:15
View session
Owner
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.
Push conflict responses return raw master documents including
serverOnlyFields, causing schema validation failures on clients withadditionalProperties: false. Pull and pullStream handlers already strip these fields; push was the only omission.Changes
src/plugins/server/endpoint-replication.ts: Map conflicts throughremoveServerOnlyFieldsbefore returning, consistent with pull/pullStream handlers:test/unit/endpoint-replication.test.ts: Add test that triggers a push conflict via staleassumedMasterStateand asserts the response excludesserverOnlyFields,_rev, and_meta.