Skip to content

[stable26] fix(SyncService): handle failing connection gracefully #4990

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 2 commits into from
Nov 14, 2023
Merged

[stable26] fix(SyncService): handle failing connection gracefully #4990

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6164fb6
fix(SyncService): handle failing connection gracefully
max-nextcloud May 2, 2023
62b6712
chore(assets): Recompile assets
nextcloud-command Nov 14, 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(SyncService): handle failing connection gracefully 
Also fixes the share cypress test.

Signed-off-by: Max <[email protected]>
  • Loading branch information
@max-nextcloud @mejo-
max-nextcloud authored and mejo- committed Nov 14, 2023
commit 6164fb6b91dd1538f1e36bb928a944e2d5becaed
11 changes: 8 additions & 3 deletions src/services/SyncService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,17 +94,22 @@ class SyncService {
}

async open({ fileId, initialSession }) {
this.on('change', ({ sessions }) => {
const onChange = ({ sessions }) => {
this.sessions = sessions
})
}
this.on('change', onChange)

const connect = initialSession
? Promise.resolve(new Connection({ data: initialSession }, {}))
: this._api.open({ fileId })
.catch(error => this._emitError(error))

// TODO: Only continue if a connection was made
this.connection = await connect
if (!this.connection) {
this.off('change', onChange)
// Error was already emitted in connect
return
}
this.backend = new PollingBackend(this, this.connection)
this.version = this.connection.docStateVersion
this.emit('opened', {
Expand Down