Compare commits

..

3 Commits

Author SHA1 Message Date
Kevin Jahns
fbfd377622 v13.0.0-12 -- distribution files 2017-08-04 18:08:20 +02:00
Kevin Jahns
3ca260e0da 13.0.0-12 2017-08-04 18:07:44 +02:00
Kevin Jahns
edb5e4f719 send sync step 1 after sync step 2 is processed (for slaves) 2017-08-04 18:06:36 +02:00
6 changed files with 52 additions and 46 deletions

View File

@@ -1,6 +1,6 @@
{ {
"name": "yjs", "name": "yjs",
"version": "13.0.0-11", "version": "13.0.0-12",
"description": "A framework for real-time p2p shared editing on any data", "description": "A framework for real-time p2p shared editing on any data",
"main": "./y.node.js", "main": "./y.node.js",
"browser": "./y.js", "browser": "./y.js",

View File

@@ -92,6 +92,7 @@ export function computeMessageSyncStep1 (decoder, encoder, conn, senderConn, sen
conn.y.destroy() conn.y.destroy()
} }
return conn.y.db.whenTransactionsFinished().then(() => {
// send sync step 2 // send sync step 2
conn.y.db.requestTransaction(function * () { conn.y.db.requestTransaction(function * () {
encoder.writeVarString('sync step 2') encoder.writeVarString('sync step 2')
@@ -109,10 +110,12 @@ export function computeMessageSyncStep1 (decoder, encoder, conn, senderConn, sen
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') { if (conn.role === 'slave') {
sendSyncStep1(conn, sender) sendSyncStep1(conn, sender)
} }
return conn.y.db.whenTransactionsFinished() })
})
} }
export function logSS (decoder, strBuilder) { export function logSS (decoder, strBuilder) {

10
y.js

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -1,7 +1,7 @@
/** /**
* yjs - A framework for real-time p2p shared editing on any data * yjs - A framework for real-time p2p shared editing on any data
* @version v13.0.0-11 * @version v13.0.0-12
* @license MIT * @license MIT
*/ */
@@ -506,6 +506,7 @@ function computeMessageSyncStep1 (decoder, encoder, conn, senderConn, sender) {
conn.y.destroy(); conn.y.destroy();
} }
return conn.y.db.whenTransactionsFinished().then(() => {
// send sync step 2 // send sync step 2
conn.y.db.requestTransaction(function * () { conn.y.db.requestTransaction(function * () {
encoder.writeVarString('sync step 2'); encoder.writeVarString('sync step 2');
@@ -523,10 +524,12 @@ function computeMessageSyncStep1 (decoder, encoder, conn, senderConn, sender) {
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') { if (conn.role === 'slave') {
sendSyncStep1(conn, sender); sendSyncStep1(conn, sender);
} }
return conn.y.db.whenTransactionsFinished() })
})
} }
function logSS (decoder, strBuilder) { function logSS (decoder, strBuilder) {

File diff suppressed because one or more lines are too long