v13.0.0-11 -- distribution files

package.json

@@ -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",

src/MessageHandler.js

@@ -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
-    // send sync step 2
+  conn.y.db.requestTransaction(function * () {
-    conn.y.db.requestTransaction(function * () {
+    encoder.writeVarString('sync step 2')
-      encoder.writeVarString('sync step 2')
+    encoder.writeVarString(conn.authInfo || '')
-      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) {

y.node.js

@@ -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
-    // send sync step 2
+  conn.y.db.requestTransaction(function * () {
-    conn.y.db.requestTransaction(function * () {
+    encoder.writeVarString('sync step 2');
-      encoder.writeVarString('sync step 2');
+    encoder.writeVarString(conn.authInfo || '');
-      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') {
-      if (conn.role === 'slave') {
+    sendSyncStep1(conn, sender);
-        sendSyncStep1(conn, sender);
+  }
-      }
+  return conn.y.db.whenTransactionsFinished()
-    })
-  })
 }
 
 function logSS (decoder, strBuilder) {