yonote/yjs
24
0
Fork 0
Code Pull Requests 1 Releases Activity

send sync step 1 after sync step 2 is processed (for slaves)

Browse Source
This commit is contained in:
Kevin Jahns 2017-08-04 18:06:36 +02:00
parent be3b8b65ce
commit edb5e4f719
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/MessageHandler.js
View File

@ -92,27 +92,30 @@ export function computeMessageSyncStep1 (decoder, encoder, conn, senderConn, sen
conn.y.destroy() conn.y.destroy()
} }
// send sync step 2 return conn.y.db.whenTransactionsFinished().then(() => {
conn.y.db.requestTransaction(function * () { // send sync step 2
encoder.writeVarString('sync step 2') conn.y.db.requestTransaction(function * () {
encoder.writeVarString(conn.authInfo || '') encoder.writeVarString('sync step 2')
encoder.writeVarString(conn.authInfo || '')
if (preferUntransformed) { if (preferUntransformed) {
encoder.writeUint8(1) encoder.writeUint8(1)
yield * this.writeOperationsUntransformed(encoder) yield * this.writeOperationsUntransformed(encoder)
} else { } else {
encoder.writeUint8(0) encoder.writeUint8(0)
yield * this.writeOperations(encoder, decoder) yield * this.writeOperations(encoder, decoder)
} }
yield * this.writeDeleteSet(encoder) yield * this.writeDeleteSet(encoder)
conn.send(senderConn.uid, encoder.createBuffer()) conn.send(senderConn.uid, encoder.createBuffer())
senderConn.receivedSyncStep2 = true senderConn.receivedSyncStep2 = true
})
return conn.y.db.whenTransactionsFinished().then(() => {
if (conn.role === 'slave') {
sendSyncStep1(conn, sender)
}
})
}) })
if (conn.role === 'slave') {
sendSyncStep1(conn, sender)
}
return conn.y.db.whenTransactionsFinished()
} }
export function logSS (decoder, strBuilder) { export function logSS (decoder, strBuilder) {