fix(sync): reuse open connection

Do not attempt to create a new connection

if there already is one and it is not closed.

If no messages are received for 30 seconds

yjs will open a new websocket.

Since we do not close the connection anymore from the websocket polyfill

we also do not need to open it.

If the network connection has gone down

creating a new connection will fail anyway.

Once it comes back we will know if the session is still valid.

Then we can either continue using it or reconnect.

This is part of #6050.

Signed-off-by: Max <max@nextcloud.com>

[skip ci]

cypress/e2e/sync.spec.js

@@ -111,6 +111,7 @@ describe('Sync', () => {
 
 	it('recovers from a lost and closed connection', () => {
 		let reconnect = false
+		// block all requests until the session is closed and reopened
 		cy.intercept('**/apps/text/session/*/*', (req) => {
 			if (req.url.includes('close') || req.url.includes('create') || reconnect) {
 				req.continue()
@@ -125,6 +126,11 @@ describe('Sync', () => {
 		cy.get('#editor-container .document-status', { timeout: 30000 })
 			.should('contain', 'Document could not be loaded.')
 
+		// Reconnect button works - it closes and reopens the session
+		cy.get('#editor-container .document-status a.button')
+			.contains('Reconnect')
+			.click()
+
 		cy.wait('@syncAfterRecovery', { timeout: 60000 })
 
 		cy.get('#editor-container .document-status', { timeout: 30000 })

src/services/SyncService.js

@@ -116,7 +116,6 @@ class SyncService {
 			? Promise.resolve(new Connection({ data: initialSession }, {}))
 			: this._api.open({ fileId, baseVersionEtag: this.baseVersionEtag })
 				.catch(error => this._emitError(error))
-
 		this.#connection = await connect
 		if (!this.#connection) {
 			this.off('change', onChange)