Skip to content

Fix sync errors after network issues #4474

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 12 commits into from
Jul 11, 2023
Merged

Fix sync errors after network issues #4474

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
6454257
test(sync): yjs sync via sync service
max-nextcloud Jul 3, 2023
c012aac
wip: test yjs chattiness
max-nextcloud Jul 5, 2023
2a666d1
fix(sync): keep queue content on failed requests
max-nextcloud Jul 10, 2023
6a4489e
test(syncservice): Apply Yjs steps in wrong order
mejo- Jul 5, 2023
155bbb5
test(sync): improve cypress tests for missing messages
max-nextcloud Jul 10, 2023
0329f46
fix(sync): sending steps with interval in wrapper function
max-nextcloud Jul 10, 2023
58fc762
fix(editor): Don't reconnect Editor on connection issues
mejo- Jul 10, 2023
fa5d293
test(cypress): Fix code syntax to please eslint
mejo- Jul 10, 2023
d196ae0
fix(test): wait longer for file could not be found message
max-nextcloud Jul 11, 2023
f039692
fix(sync): Allow to pass `disableBc` to `createSyncServiceProvider()`
mejo- Jul 11, 2023
236b07e
test(sync): cleanup Cypress tests
mejo- Jul 11, 2023
ce2b903
chore(assets): Recompile assets
nextcloud-command Jul 11, 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
Prev Previous commit
Next Next commit
fix(sync): Allow to pass disableBc to createSyncServiceProvider() 
This is required for Cypress tests where we want the broadcast channel
synchronization to be disabled.

If not passed, default to `true` in debug mode and `false` otherwise.

Signed-off-by: Jonas <[email protected]>
  • Loading branch information
@mejo-
mejo- committed Jul 11, 2023
commit f0396923a4ed15ec104d7e9533ac3a053cea725b
1 change: 1 addition & 0 deletions cypress/e2e/api/SyncServiceProvider.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ describe('Sync service provider', function() {
syncService,
fileId,
initialSession: null,
disableBc: true,
})
}

Expand Down
6 changes: 4 additions & 2 deletions src/services/SyncServiceProvider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,20 @@ import { logger } from '../helpers/logger.js'
* @param {object} options.syncService - sync service to build upon
* @param {number} options.fileId - file id of the file to open
* @param {object} options.initialSession - initialSession to start from
* @param {boolean} options.disableBc - disable broadcast channel synchronization (default: disabled in debug mode, enabled otherwise)
*/
export default function createSyncServiceProvider({ ydoc, syncService, fileId, initialSession }) {
export default function createSyncServiceProvider({ ydoc, syncService, fileId, initialSession, disableBc }) {
if (!fileId) {
// We need a file id as a unique identifier for y.js as otherwise state might leak between different files
throw new Error('fileId is required')
}
const WebSocketPolyfill = initWebSocketPolyfill(syncService, fileId, initialSession)
disableBc = disableBc ?? !!window?._oc_debug
const websocketProvider = new WebsocketProvider(
'ws://localhost:1234',
'file:' + fileId,
ydoc,
{ WebSocketPolyfill, disableBc: true },
{ WebSocketPolyfill, disableBc },
)
websocketProvider.on('status', event => logger.debug('status', event))
return websocketProvider
Expand Down