Skip to content

Commit

Permalink
fix(sync): yjs messages are Uint8Arrays in the queue
Browse files Browse the repository at this point in the history
Remove duplicate encoding for updateMessage

Signed-off-by: Max <[email protected]>
Signed-off-by: Jonas <[email protected]>
  • Loading branch information
max-nextcloud authored and mejo- committed Jan 29, 2024
1 parent 66e5128 commit b4947f8
Showing 2 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion cypress/component/helpers/yjs.cy.js
Original file line number Diff line number Diff line change
@@ -70,7 +70,7 @@ describe('Yjs base64 wrapped with our helpers', function() {
const stateA = getDocumentState(source)
const update0A = getUpdateMessage(source, state0)
const updateAA = getUpdateMessage(source, stateA)
expect(update0A.length).to.be.eq(40)
expect(update0A.length).to.be.eq(29)
expect(updateAA).to.be.eq(undefined)
})

10 changes: 4 additions & 6 deletions src/helpers/yjs.js
Original file line number Diff line number Diff line change
@@ -51,7 +51,7 @@ export function applyDocumentState(ydoc, documentState, origin) {
*
* @param {Y.Doc} ydoc - encode state of this doc
* @param {string} encodedBaseUpdate - base64 encoded doc update to build upon
* @return {string|undefined}
* @return {Uint8Array|undefined}
*/
export function getUpdateMessage(ydoc, encodedBaseUpdate) {
const baseUpdate = decodeArrayBuffer(encodedBaseUpdate)
@@ -65,21 +65,19 @@ export function getUpdateMessage(ydoc, encodedBaseUpdate) {
encoding.writeVarUint(encoder, messageSync)
const update = Y.encodeStateAsUpdate(ydoc, baseStateVector)
syncProtocol.writeUpdate(encoder, update)
const buf = encoding.toUint8Array(encoder)
return encodeArrayBuffer(buf)
return encoding.toUint8Array(encoder)
}

/**
* Apply an updated message to the ydoc.
*
* Only used in tests right now.
* @param {Y.Doc} ydoc - encode state of this doc
* @param {string} updateMessage - base64 encoded y-websocket sync message with update
* @param {Uint8Array} updateMessage - y-websocket sync message with update
* @param {object} origin - initiator object e.g. WebsocketProvider
*/
export function applyUpdateMessage(ydoc, updateMessage, origin = 'origin') {
const updateBuffer = decodeArrayBuffer(updateMessage)
const decoder = decoding.createDecoder(updateBuffer)
const decoder = decoding.createDecoder(updateMessage)
const messageType = decoding.readVarUint(decoder)
if (messageType !== messageSync) {
console.error('y.js update message with invalid type', messageType)

0 comments on commit b4947f8

Please sign in to comment.