Skip to content

[stable29] Send one full update from y-websocket #6696

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 17 commits into from
Nov 27, 2024
Merged

[stable29] Send one full update from y-websocket #6696

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
d5f1afc
fix(sync): inline y-websocket to track received updates there
max-nextcloud Nov 13, 2024
25f37c3
fix(lint): y-websocket
max-nextcloud Nov 13, 2024
f7e9e5b
enh(y-websocket): always send full diff to server state
max-nextcloud Nov 13, 2024
b2245ea
fix(license): add license header and props to y-websocket
max-nextcloud Nov 14, 2024
2c52d80
fix(awareness): only send updates about the local client
max-nextcloud Nov 14, 2024
87038f0
fix(sync): make use of steps in push responses
max-nextcloud Nov 14, 2024
0b83dbb
refactor(sync): rename _receiveSteps to receiveSteps
max-nextcloud Nov 17, 2024
acfd535
refactor(sync): drop superfluous update message
max-nextcloud Nov 17, 2024
20fbcac
fix(sync): Do not resend document state in first push.
max-nextcloud Nov 18, 2024
27f4a2d
fix(sync): reply to queries with steps since last save
max-nextcloud Nov 18, 2024
93235e2
fix(sync): include document state in response to queries
max-nextcloud Nov 18, 2024
568031d
fix(sync): process document state from push response
max-nextcloud Nov 18, 2024
6c51c92
refactor(sync): cache steps in sync service
max-nextcloud Nov 22, 2024
a39864d
refactor(Editor): instantiate api outside sync service
max-nextcloud Nov 5, 2024
ca62b85
test(cypress): Pass SessionApi into the sync service
mejo- Nov 26, 2024
cc6fcbd
fix(SyncService): only log errors for now
max-nextcloud Nov 26, 2024
9874d6f
chore: Fix linter errors and warnings
mejo- Nov 26, 2024
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
refactor(sync): rename _receiveSteps to receiveSteps 
It has always been publicly called from the PollingBackend.

Signed-off-by: Max <[email protected]>
  • Loading branch information
@max-nextcloud @mejo-
max-nextcloud authored and mejo- committed Nov 27, 2024
commit 0b83dbbbe3db8512081e6d86d95696d7cfcfe81e
2 changes: 1 addition & 1 deletion src/services/PollingBackend.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ class PollingBackend {
this.#fetchRetryCounter = 0

this.#syncService.emit('change', { document, sessions })
this.#syncService._receiveSteps(data)
this.#syncService.receiveSteps(data)

if (data.steps.length === 0) {
if (!this.#initialLoadingFinished) {
Expand Down
4 changes: 2 additions & 2 deletions src/services/SyncService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ class SyncService {
this.pushError = 0
this.sending = false
if (steps?.length > 0) {
this._receiveSteps({ steps })
this.receiveSteps({ steps })
}
}).catch(err => {
const { response, code } = err
Expand Down Expand Up @@ -227,7 +227,7 @@ class SyncService {
})
}

_receiveSteps({ steps, document = null, sessions = [] }) {
receiveSteps({ steps, document = null, sessions = [] }) {
const awareness = sessions
.filter(s => s.lastContact > (Math.floor(Date.now() / 1000) - COLLABORATOR_DISCONNECT_TIME))
.filter(s => s.lastAwarenessMessage)
Expand Down