Skip to content

fix/out of sync - #7377

Merged
max-nextcloud merged 3 commits into
mainfrom
fix/out-of-sync
Jul 1, 2025
Merged

fix/out of sync#7377
max-nextcloud merged 3 commits into
mainfrom
fix/out-of-sync

Conversation

@max-nextcloud

Copy link
Copy Markdown
Collaborator
  • chore(debug): log pending structs in remote ydoc
  • fix(sync): check pending structs and resync if needed
  • fix(sync): send SyncStep1 right after step could not be applied

@codecov

codecovBot commented Jun 30, 2025

Copy link
Copy Markdown

Codecov Report

Attention: Patch coverage is 5.26316% with 18 lines in your changes missing coverage. Please review.

Project coverage is 52.67%. Comparing base (32751b2) to head (842f861).
Report is 4 commits behind head on main.

Files with missing linesPatch %Lines
src/services/y-websocket.js0.00%18 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #7377 +/- ##
==========================================
- Coverage 52.68% 52.67% -0.02% 
==========================================
Files 487 487 Lines 42217 42237 +20 Branches 1098 1098 ==========================================
+ Hits 22243 22247 +4 - Misses 19867 19883 +16 
Partials 107 107 

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@max-nextcloud
max-nextcloudforce-pushed the fix/out-of-sync branch 2 times, most recently from cfe813f to 10337a2CompareJune 30, 2025 17:10

@mejo-mejo- left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have two comments/questions. Otherwise code changes look good to me 🎉

Comment threadsrc/services/y-websocket.js
Comment threadsrc/components/Editor.vue Outdated
@max-nextcloud

Copy link
Copy Markdown
CollaboratorAuthor

/backport! to stable31

@backportbotbackportbotBot mentioned this pull request Jul 1, 2025
3 tasks
@max-nextcloud
max-nextcloudforce-pushed the fix/out-of-sync branch 2 times, most recently from 3294a63 to 7433473CompareJuly 1, 2025 09:46
This ydoc tracks the messages already received from the server.
So missing messages will also lead to pendingStructs there.
Signed-off-by: Max <max@nextcloud.com>
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 <max@nextcloud.com>
@max-nextcloud
max-nextcloud merged commit 56abdf5 into mainJul 1, 2025
64 of 66 checks passed
@max-nextcloud
max-nextcloud deleted the fix/out-of-sync branch July 1, 2025 11:35
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@max-nextcloud@mejo-