fix: only one close request when closing viewer

Fixes #3834.

Signed-off-by: Max <[email protected]>

Author: max-nextcloud

cypress/e2e/sync.spec.js

@@ -24,7 +24,7 @@ import { randUser } from '../utils/index.js'
 
 const user = randUser()
 
-describe('yjs document state', () => {
+describe('Save', () => {
 	before(() => {
 		cy.createUser(user)
 	})
@@ -33,31 +33,38 @@ describe('yjs document state', () => {
 		cy.login(user)
 		cy.uploadTestFile('test.md')
 		cy.visit('/apps/files')
-		cy.intercept({ method: 'POST', url: '**/apps/text/session/sync' }).as('sync')
+		cy.intercept({ method: 'POST', url: '**/apps/text/session/sync' }, (req) => {
+			if (req.body.autosaveContent) {
+				req.alias = 'save'
+			}
+		}).as('sync')
 		cy.openTestFile()
 		cy.getContent().find('h2').should('contain', 'Hello world')
-		cy.wait('@sync', { timeout: 7000 })
 		cy.getContent().type('* Saving the doc saves the doc state{enter}')
-		cy.wait('@sync', { timeout: 7000 })
 	})
 
 	it('saves the actual file and document state', () => {
 		cy.getContent().type('{ctrl+s}')
-		cy.wait('@sync').its('request.body')
-			.should('have.property', 'autosaveContent')
+		cy.wait('@save').its('request.body')
+			.should('have.property', 'documentState')
 			.should('not.be.empty')
+		cy.testName()
+			.then(name => cy.downloadFile(`/${name}.md`))
+			.its('data')
+			.should('include', 'saves the doc state')
+		cy.closeFile()
+	})
+
+	it('saves on close', () => {
 		cy.closeFile()
+		cy.wait('@save')
 		cy.testName()
 			.then(name => cy.downloadFile(`/${name}.md`))
 			.its('data')
 			.should('include', 'saves the doc state')
 	})
 
 	it('passes the doc content from one session to the next', () => {
-		cy.getContent().type('{ctrl+s}')
-		cy.wait('@sync').its('request.body')
-			.should('have.property', 'documentState')
-			.should('not.be.empty')
 		cy.closeFile()
 		cy.intercept({ method: 'PUT', url: '**/apps/text/session/create' })
 			.as('create')
@@ -66,10 +73,20 @@ describe('yjs document state', () => {
 			.its('response.body')
 			.should('have.property', 'content')
 			.should('not.be.empty')
-		cy.wait('@sync').its('request.body').should('have.property', 'version')
 		cy.getContent().find('h2').should('contain', 'Hello world')
 		cy.getContent().find('li').should('contain', 'Saving the doc saves the doc state')
 		cy.getContent().type('recovered')
 		cy.closeFile()
 	})
+
+	// regression test #3834
+	it('close triggers one close request', () => {
+		cy.closeFile()
+		// Wait to make sure there is enough time for all close requests to run
+		// eslint-disable-next-line cypress/no-unnecessary-waiting
+		cy.wait(100)
+		// reuse @close intercepted in closeFile()
+		cy.get('@close.all').should('have.length', 1)
+	})
+
 })

src/components/Editor.vue

@@ -333,7 +333,6 @@ export default {
 			window.removeEventListener('afterprint', this.preparePrinting)
 		}
 		this.$providers.forEach(p => p.destroy())
-		this.close()
 	},
 	methods: {
 		...mapActions('text', [

src/services/SyncService.js

@@ -250,25 +250,11 @@ class SyncService {
 		return this.save({ manualSave: false })
 	}
 
-	close() {
+	async close() {
 		this.backend.disconnect()
-		let closed = false
-		return new Promise((resolve, reject) => {
-			this.on('save', () => {
-				this._close().then(() => {
-					closed = true
-					resolve()
-				}).catch(() => resolve())
-			})
-			setTimeout(() => {
-				if (!closed) {
-					this._close().then(() => {
-						resolve()
-					}).catch(() => resolve())
-				}
-			}, 2000)
-			this.save()
-		})
+		const timeout = new Promise((resolve) => setTimeout(resolve, 2000))
+		await Promise.any([timeout, this.save()])
+		return this._close()
 	}
 
 	_close() {