Merge pull request #4990 from nextcloud/fix/stable26-docStateVersion

[stable26] fix(SyncService): handle failing connection gracefully
nextcloud · Nov 14, 2023 · 83c4bb6 · 83c4bb6
2 parents 87db04b + 62b6712
commit 83c4bb6
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 21 deletions.
diff --git a/js/editor.js b/js/editor.js
diff --git a/js/editor.js.map b/js/editor.js.map
diff --git a/js/text-editors.js b/js/text-editors.js
diff --git a/js/text-editors.js.map b/js/text-editors.js.map
diff --git a/js/text-files.js b/js/text-files.js
diff --git a/js/text-files.js.map b/js/text-files.js.map
diff --git a/js/text-public.js b/js/text-public.js
diff --git a/js/text-public.js.map b/js/text-public.js.map
diff --git a/js/text-text.js b/js/text-text.js
diff --git a/js/text-text.js.map b/js/text-text.js.map
diff --git a/js/text-viewer.js b/js/text-viewer.js
diff --git a/js/text-viewer.js.map b/js/text-viewer.js.map
diff --git a/src/services/SyncService.js b/src/services/SyncService.js
@@ -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', {