Skip to content

fix/out of sync #7377

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
+19 −2
Merged

fix/out of sync #7377

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
07ebe8b
chore(debug): log pending structs in remote ydoc
max-nextcloud Jun 30, 2025
bb7bde0
fix(sync): check pending structs and resync if needed
max-nextcloud Jun 30, 2025
842f861
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
Next Next commit
fix(sync): check pending structs and resync if needed 
This check will happen every 30 seconds by default.
So on average it will take 15 seconds after missing a message.

This is also in "sync" with new autosaved versions
becoming available roughly every 30 seconds.

Signed-off-by: Max <[email protected]>
  • Loading branch information
@max-nextcloud
max-nextcloud committed Jul 1, 2025
commit bb7bde0fd47325fa6e6fb0590994a18296336e7f
8 changes: 6 additions & 2 deletions src/services/y-websocket.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ export class WebsocketProvider extends Observable {
params = {},
protocols = [],
WebSocketPolyfill = WebSocket,
resyncInterval = -1,
resyncInterval = 30_000,
maxBackoffTime = 2500,
disableBc = false,
} = {},
Expand Down Expand Up @@ -345,7 +345,11 @@ export class WebsocketProvider extends Observable {
if (resyncInterval > 0) {
this._resyncInterval = /** @type {any} */ (
setInterval(() => {
if (this.ws && this.ws.readyState === WebSocket.OPEN) {
if (
this.ws
&& this.ws.readyState === WebSocket.OPEN
&& doc.store.pendingStructs
) {
// resend sync step 1
const encoder = encoding.createEncoder()
encoding.writeVarUint(encoder, messageSync)
Expand Down