Skip to content

backport sync fixes to stable31 #7779

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
mejo- merged 8 commits into from
Oct 13, 2025
Merged

backport sync fixes to stable31 #7779

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5d03e24
chore(type): sync service bus and events
max-nextcloud Oct 4, 2025
2e47554
chore(refactor): include version in steps for WebsocketPolyfill
max-nextcloud Oct 4, 2025
5cfc1d6
fix(sync): increase versions step by step
max-nextcloud Oct 4, 2025
5ce484c
fix(sync): process steps one version at a time
max-nextcloud Oct 8, 2025
24ab61a
enh(syn): log recovery attempts in the server
max-nextcloud Oct 8, 2025
282f262
fix(sync): Only send recovery step in case of SyncStep1
mejo- Oct 8, 2025
d9fe6eb
fix(sync): Apply document state from create request
mejo- Oct 10, 2025
1cf97fc
chore(cleanup): outdated filename .js suffixes
max-nextcloud Oct 13, 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
Next Next commit
fix(sync): Apply document state from create request 
Prevents possible race condition when steps from first sync request got
applied before documentState from first push request (answer to
SyncStep1) arrived.

Signed-off-by: Jonas <[email protected]>
  • Loading branch information
@mejo- @max-nextcloud
mejo- authored and max-nextcloud committed Oct 13, 2025
commit d9fe6ebbb64be7eb7f86f95228b2133a6226404f
6 changes: 4 additions & 2 deletions src/components/Editor.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ import {
import ReadonlyBar from './Menu/ReadonlyBar.vue'

import { logger } from '../helpers/logger.js'
import { getDocumentState } from '../helpers/yjs.ts'
import { applyDocumentState, getDocumentState } from '../helpers/yjs.ts'
import { SyncService, ERROR_TYPE, IDLE_TIMEOUT } from './../services/SyncService.ts'
import SessionApi from '../services/SessionApi.js'
import createSyncServiceProvider from './../services/SyncServiceProvider.js'
Expand Down Expand Up @@ -556,7 +556,9 @@ export default {
},

onLoaded({ document, documentSource, documentState }) {
if (!documentState) {
if (documentState) {
applyDocumentState(this.$ydoc, documentState, this.$providers[0])
} else {
this.setInitialYjsState(documentSource, { isRichEditor: this.isRichEditor })
}

Expand Down
5 changes: 0 additions & 5 deletions src/services/y-websocket.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,11 +224,6 @@ const setupWS = (provider) => {
provider.emit('status', [{
status: 'connected',
}])
// always send sync step 1 when connected
const encoder = encoding.createEncoder()
encoding.writeVarUint(encoder, messageSync)
syncProtocol.writeSyncStep1(encoder, provider.doc)
websocket.send(encoding.toUint8Array(encoder))
// broadcast local awareness state
if (provider.awareness.getLocalState() !== null) {
const encoderAwarenessState = encoding.createEncoder()
Expand Down
Loading