Compare commits

..

1 Commits

Author SHA1 Message Date
Kevin Jahns
88c71b9c1e v13.0.0-11 -- distribution files 2017-08-04 16:31:45 +02:00
6 changed files with 46 additions and 52 deletions

View File

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

View File

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

File diff suppressed because one or more lines are too long