Skip to content

[stable28] Preserve step queue during reconnect #5147

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
juliusknorr merged 5 commits into from
Dec 21, 2023
Merged

[stable28] Preserve step queue during reconnect #5147

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dc3fddc
fix(sync): preserve queue if sendRemainingSteps fails
max-nextcloud Dec 11, 2023
c574149
fix(sync): keep queue around during reconnects
max-nextcloud Dec 11, 2023
199c518
fix(sync): ensure queue stays the same array
max-nextcloud Dec 15, 2023
27836bf
fix(sync): only clear queue after successful send
max-nextcloud Dec 18, 2023
e524f04
fix(sync): clear old providers on reconnect
max-nextcloud Dec 18, 2023
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
Next Next commit
fix(sync): preserve queue if sendRemainingSteps fails 
During a network disconnect
Yjs-websocket notices missing awareness messages and closes the connection.
In this case the remaining steps can also not be send out and the request fails.
Preserve the queue so we can use it once the network is back up.

Signed-off-by: Max <[email protected]>
  • Loading branch information
@max-nextcloud @backportbot-nextcloud
max-nextcloud authored and backportbot-nextcloud[bot] committed Dec 18, 2023
commit dc3fddc5d355b4ebe56380436c580d2446ac9fac
3 changes: 3 additions & 0 deletions src/services/WebSocketPolyfill.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,9 @@ export default function initWebSocketPolyfill(syncService, fileId, initialSessio

#sendRemainingSteps() {
if (this.#queue.length) {
let outbox = []
return syncService.sendStepsNow(() => {
outbox = [...this.#queue]
const data = {
steps: this.#steps,
awareness: this.#awareness,
Expand All @@ -136,6 +138,7 @@ export default function initWebSocketPolyfill(syncService, fileId, initialSessio
return data
})?.catch(err => {
logger.error(err)
this.#queue = [...outbox, ...this.#queue]
})
}
}
Expand Down