Skip to content

[stable30] fix/out of sync #7380

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
max-nextcloud merged 3 commits into from
Jul 1, 2025
Merged

[stable30] fix/out of sync #7380

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bd7bce8
chore(debug): log pending structs in remote ydoc
max-nextcloud Jun 30, 2025
c71a619
fix(sync): check pending structs and resync if needed
max-nextcloud Jun 30, 2025
e6fce89
fix(sync): send SyncStep1 right after step could not be applied
max-nextcloud Jun 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix(sync): send SyncStep1 right after step could not be applied 
Signed-off-by: Max <[email protected]>
  • Loading branch information
@max-nextcloud @backportbot
max-nextcloud authored and backportbot[bot] committed Jul 1, 2025
commit e6fce89681eec6ee47e6f12c2de62d3190a9de1d
12 changes: 12 additions & 0 deletions src/services/y-websocket.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,24 @@ messageHandlers[messageSync] = (
) => {
encoding.writeVarUint(encoder, messageSync)
const decoderForRemote = decoding.clone(decoder)
const pendingStructsBefore = provider.doc.store.pendingStructs
const syncMessageType = syncProtocol.readSyncMessage(
decoder,
encoder,
provider.doc,
provider,
)
if (
!pendingStructsBefore
&& provider.doc.store.pendingStructs
&& !encoder.hasContent
) {
// The message received left pending structs behind.
// Send SyncStep1 to resync.
console.error('Failed to integrate yjs message. Trying to resync.')
encoding.writeVarUint(encoder, messageSync)
syncProtocol.writeSyncStep1(encoder, provider.doc)
}
// Message came from the broadcast channel
// Do not track in this.remote and do not emit sync.
if (!emitSynced) {
Expand Down
Loading