Preserve step queue during reconnect #5126
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
max-nextcloud
force-pushed
the
fix/preserve-step-queue-during-reconnect
branch
from
830c0d4
to
2db66d5
Compare
max-nextcloud
force-pushed
the
fix/preserve-step-queue-during-reconnect
branch
from
2db66d5
to
caec8f0
Compare
juliushaertl
requested changes
Dec 15, 2023
max-nextcloud
force-pushed
the
fix/preserve-step-queue-during-reconnect
branch
from
caec8f0
to
111c5d1
Compare
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 <max@nextcloud.com>
When yjs does not receive awareness updates it will close and reopen the websocket. Keep the content of the queue, i.e. the outgoing steps so they can be send out once the connection is back. Signed-off-by: Max <max@nextcloud.com>
Change the content of `queue` with `queue.splice` rather than setting `queue` to another array. Signed-off-by: Max <max@nextcloud.com>
Also add a unit test for the websocket polyfill Signed-off-by: Max <max@nextcloud.com>
max-nextcloud
force-pushed
the
fix/preserve-step-queue-during-reconnect
branch
from
111c5d1
to
1911a14
Compare
avoids the old provider leaking error events. Signed-off-by: Max <max@nextcloud.com>
|
/backport to stable28 |
|
/backport to stable27 |
|
/backport to stable26 |
|
The backport to stable26 failed. Please do this backport manually. # Switch to the target branch and update it
git checkout stable26
git pull origin stable26
# Create the new backport branch
git checkout -b fix/foo-stable26
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123
# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable26Error: Unknown error More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport |
|
The backport to stable27 failed. Please do this backport manually. # Switch to the target branch and update it
git checkout stable27
git pull origin stable27
# Create the new backport branch
git checkout -b fix/foo-stable27
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123
# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable27Error: Unknown error More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport |
This was referenced Feb 1, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
馃摑 Summary
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.
馃弫 Checklist
npm run lint/npm run stylelint/composer run cs:check)