Emit sync event after successful push to pick up syncing again #4297

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

juliusknorr merged 3 commits into main from bugfix/noid/sync-after-push-reconnect

Jun 21, 2023

cypress/e2e/sync.spec.js

-Original file line number
+Diff line change
@@ Expand Up / @@ -66,26 +66,26 @@ describe('Sync', () => { @@
     	it('recovers from a lost connection', () => {
     		let count = 0
-    		cy.intercept({ method: 'POST', url: '**/apps/text/session/push' }, (req) => {
-    			if (count < 5) {
-    				count++
+    		cy.intercept({ method: 'POST', url: '**/apps/text/session/*' }, (req) => {
+    			if (count < 4) {
     				req.destroy()
     				req.alias = 'dead'
+    			} else {
+    				req.alias = 'alive'
     			}
-    		}).as('push')
-    		cy.intercept({ method: 'POST', url: '**/apps/text/session/sync' }, (req) => {
-    			if (count < 5) {
-    				count++
-    				req.destroy()
-    				req.alias = 'deadSync'
-    			}
-    		})
-    		cy.get('#editor-container .document-status')
-    			.should('contain', 'File could not be loaded', { timeout: 10000 })
-    		cy.get('#editor-container .document-status', { timeout: 30000 })
-    			.should('not.contain', 'File could not be loaded')
+    		}).as('sessionRequests')
+    		cy.wait('@dead', { timeout: 30000 })
+    		cy.get('#editor-container .document-status', { timeout: 10000 })
+    			.should('contain', 'File could not be loaded')
+    			.then(() => {
+    				count = 4
+    			})
+    		cy.wait('@alive', { timeout: 30000 })
     		cy.intercept({ method: 'POST', url: '**/apps/text/session/sync' })
     			.as('syncAfterRecovery')
+    		cy.wait('@syncAfterRecovery', { timeout: 30000 })
+    		cy.get('#editor-container .document-status', { timeout: 30000 })
+    			.should('not.contain', 'File could not be loaded')
     		cy.getContent().type('* more content added after the lost connection{enter}')
     		cy.wait('@syncAfterRecovery')
     		cy.closeFile()
@@ Expand Down @@

js/editor.js

Large diffs are not rendered by default.

js/editor.js.map

Large diffs are not rendered by default.

js/text-editors.js

Large diffs are not rendered by default.

js/text-editors.js.map

Large diffs are not rendered by default.

js/text-files.js

Large diffs are not rendered by default.

js/text-files.js.map

Large diffs are not rendered by default.

js/text-public.js

Large diffs are not rendered by default.

js/text-public.js.map

Large diffs are not rendered by default.

js/text-text.js

Large diffs are not rendered by default.

js/text-text.js.map

Large diffs are not rendered by default.

js/text-viewer.js

Large diffs are not rendered by default.

js/text-viewer.js.map

Large diffs are not rendered by default.

src/services/SyncService.js

-Original file line number
+Diff line change
@@ Expand Up / @@ -161,6 +161,11 @@ class SyncService { @@
     		return this.connection.push(data)
     			.then((response) => {
     				this.sending = false
+    				this.emit('sync', {
+    					steps: [],
+    					document: this.connection.document,
+    					version: this.version,
+    				})
     			}).catch(({ response, code }) => {
     				logger.error('failed to apply steps due to collission, retrying')
     				this.sending = false
@@ Expand Down @@