v13.0.0-10 -- distribution files

package.json

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

src/Connector.js

@@ -43,12 +43,10 @@ export default function extendConnector (Y/* :any */) {
         this.setUserId(Y.utils.generateUserId())
       }
     }
-
     reconnect () {
       this.log('reconnecting..')
       return this.y.db.startGarbageCollector()
     }
-
     disconnect () {
       this.log('discronnecting..')
       this.connections = new Map()
@@ -58,16 +56,13 @@ export default function extendConnector (Y/* :any */) {
       this.y.db.stopGarbageCollector()
       return this.y.db.whenTransactionsFinished()
     }
-
     repair () {
       this.log('Repairing the state of Yjs. This can happen if messages get lost, and Yjs detects that something is wrong. If this happens often, please report an issue here: https://github.com/y-js/yjs/issues')
+      this.connections.forEach(user => { user.isSynced = false })
       this.isSynced = false
-      this.connections.forEach((user, userId) => {
-        user.isSynced = false
-        this._syncWithUser(userId)
-      })
+      this.currentSyncTarget = null
+      this.findNextSyncTarget()
     }
-
     setUserId (userId) {
       if (this.userId == null) {
         if (!Number.isInteger(userId)) {
@@ -82,21 +77,20 @@ export default function extendConnector (Y/* :any */) {
         return null
       }
     }
-
     onUserEvent (f) {
       this.userEventListeners.push(f)
     }
-
     removeUserEventListener (f) {
       this.userEventListeners = this.userEventListeners.filter(g => f !== g)
     }
-
     userLeft (user) {
       if (this.connections.has(user)) {
         this.log('%s: User left %s', this.userId, user)
         this.connections.delete(user)
-        // check if isSynced event can be sent now
-        this._setSyncedWith(null)
+        if (user === this.currentSyncTarget) {
+          this.currentSyncTarget = null
+          this.findNextSyncTarget()
+        }
         for (var f of this.userEventListeners) {
           f({
             action: 'userLeft',
@@ -105,7 +99,7 @@ export default function extendConnector (Y/* :any */) {
         }
       }
     }
-    userJoined (user, role, auth) {
+    userJoined (user, role) {
       if (role == null) {
         throw new Error('You must specify the role of the joined user!')
       }
@@ -118,7 +112,7 @@ export default function extendConnector (Y/* :any */) {
         isSynced: false,
         role: role,
         processAfterAuth: [],
-        auth: auth || null,
+        auth: null,
         receivedSyncStep2: false
       })
       let defer = {}
@@ -131,7 +125,9 @@ export default function extendConnector (Y/* :any */) {
           role: role
         })
       }
-      this._syncWithUser(user)
+      if (this.currentSyncTarget == null) {
+        this.findNextSyncTarget()
+      }
     }
     // Execute a function _when_ we are connected.
     // If not connected, wait until connected
@@ -142,11 +138,27 @@ export default function extendConnector (Y/* :any */) {
         this.whenSyncedListeners.push(f)
       }
     }
-    _syncWithUser (userid) {
-      if (this.role === 'slave') {
+    findNextSyncTarget () {
+      if (this.currentSyncTarget != null || this.role === 'slave') {
         return // "The current sync has not finished or this is controlled by a master!"
       }
-      sendSyncStep1(this, userid)
+
+      var syncUser = null
+      for (var [uid, user] of this.connections) {
+        if (!user.isSynced) {
+          syncUser = uid
+          break
+        }
+      }
+      var conn = this
+      if (syncUser != null) {
+        this.currentSyncTarget = syncUser
+        sendSyncStep1(this, syncUser)
+      } else {
+        if (!conn.isSynced) {
+          conn._fireIsSyncedListeners()
+        }
+      }
     }
     _fireIsSyncedListeners () {
       this.y.db.whenTransactionsFinished().then(() => {
@@ -259,7 +271,6 @@ export default function extendConnector (Y/* :any */) {
         senderConn.processAfterAuth.push([messageType, senderConn, decoder, encoder, sender])
       }
     }
-
     computeMessage (messageType, senderConn, decoder, encoder, sender) {
       if (messageType === 'sync step 1' && (senderConn.auth === 'write' || senderConn.auth === 'read')) {
         // cannot wait for sync step 1 to finish, because we may wait for sync step 2 in sync step 1 (->lock)
@@ -273,17 +284,19 @@ export default function extendConnector (Y/* :any */) {
         return Promise.reject(new Error('Unable to receive message'))
       }
     }
-
     _setSyncedWith (user) {
-      if (user != null) {
-        this.connections.get(user).isSynced = true
+      var conn = this.connections.get(user)
+      if (conn != null) {
+        conn.isSynced = true
       }
-      let conns = Array.from(this.connections.values())
-      if (conns.length > 0 && conns.every(u => u.isSynced)) {
+      if (user === this.currentSyncTarget) {
+        this.currentSyncTarget = null
+        this.findNextSyncTarget()
+      }
+      if (this.role === 'slave' && conn.role === 'master') {
         this._fireIsSyncedListeners()
       }
     }
-
     /*
       Currently, the HB encodes operations as JSON. For the moment I want to keep it
       that way. Maybe we support encoding in the HB as XML in the future, but for now I don't want

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
-    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) {

tests-lib/helper.js

@@ -141,7 +141,7 @@ export async function initArrays (t, opts) {
     let connOpts
     if (i === 0) {
       // Only one instance can gc!
-      dbOpts = Object.assign({ gc: false }, opts.db)
+      dbOpts = Object.assign({ gc: true }, opts.db)
       connOpts = Object.assign({ role: 'master' }, connector)
     } else {
       dbOpts = Object.assign({ gc: false }, opts.db)

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-10
  * @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) {
@@ -643,12 +640,10 @@ function extendConnector (Y/* :any */) {
         this.setUserId(Y.utils.generateUserId());
       }
     }
-
     reconnect () {
       this.log('reconnecting..');
       return this.y.db.startGarbageCollector()
     }
-
     disconnect () {
       this.log('discronnecting..');
       this.connections = new Map();
@@ -658,16 +653,13 @@ function extendConnector (Y/* :any */) {
       this.y.db.stopGarbageCollector();
       return this.y.db.whenTransactionsFinished()
     }
-
     repair () {
       this.log('Repairing the state of Yjs. This can happen if messages get lost, and Yjs detects that something is wrong. If this happens often, please report an issue here: https://github.com/y-js/yjs/issues');
+      this.connections.forEach(user => { user.isSynced = false; });
       this.isSynced = false;
-      this.connections.forEach((user, userId) => {
-        user.isSynced = false;
-        this._syncWithUser(userId);
-      });
+      this.currentSyncTarget = null;
+      this.findNextSyncTarget();
     }
-
     setUserId (userId) {
       if (this.userId == null) {
         if (!Number.isInteger(userId)) {
@@ -682,21 +674,20 @@ function extendConnector (Y/* :any */) {
         return null
       }
     }
-
     onUserEvent (f) {
       this.userEventListeners.push(f);
     }
-
     removeUserEventListener (f) {
       this.userEventListeners = this.userEventListeners.filter(g => f !== g);
     }
-
     userLeft (user) {
       if (this.connections.has(user)) {
         this.log('%s: User left %s', this.userId, user);
         this.connections.delete(user);
-        // check if isSynced event can be sent now
-        this._setSyncedWith(null);
+        if (user === this.currentSyncTarget) {
+          this.currentSyncTarget = null;
+          this.findNextSyncTarget();
+        }
         for (var f of this.userEventListeners) {
           f({
             action: 'userLeft',
@@ -705,7 +696,7 @@ function extendConnector (Y/* :any */) {
         }
       }
     }
-    userJoined (user, role, auth) {
+    userJoined (user, role) {
       if (role == null) {
         throw new Error('You must specify the role of the joined user!')
       }
@@ -718,7 +709,7 @@ function extendConnector (Y/* :any */) {
         isSynced: false,
         role: role,
         processAfterAuth: [],
-        auth: auth || null,
+        auth: null,
         receivedSyncStep2: false
       });
       let defer = {};
@@ -731,7 +722,9 @@ function extendConnector (Y/* :any */) {
           role: role
         });
       }
-      this._syncWithUser(user);
+      if (this.currentSyncTarget == null) {
+        this.findNextSyncTarget();
+      }
     }
     // Execute a function _when_ we are connected.
     // If not connected, wait until connected
@@ -742,11 +735,27 @@ function extendConnector (Y/* :any */) {
         this.whenSyncedListeners.push(f);
       }
     }
-    _syncWithUser (userid) {
-      if (this.role === 'slave') {
+    findNextSyncTarget () {
+      if (this.currentSyncTarget != null || this.role === 'slave') {
         return // "The current sync has not finished or this is controlled by a master!"
       }
-      sendSyncStep1(this, userid);
+
+      var syncUser = null;
+      for (var [uid, user] of this.connections) {
+        if (!user.isSynced) {
+          syncUser = uid;
+          break
+        }
+      }
+      var conn = this;
+      if (syncUser != null) {
+        this.currentSyncTarget = syncUser;
+        sendSyncStep1(this, syncUser);
+      } else {
+        if (!conn.isSynced) {
+          conn._fireIsSyncedListeners();
+        }
+      }
     }
     _fireIsSyncedListeners () {
       this.y.db.whenTransactionsFinished().then(() => {
@@ -859,7 +868,6 @@ function extendConnector (Y/* :any */) {
         senderConn.processAfterAuth.push([messageType, senderConn, decoder, encoder, sender]);
       }
     }
-
     computeMessage (messageType, senderConn, decoder, encoder, sender) {
       if (messageType === 'sync step 1' && (senderConn.auth === 'write' || senderConn.auth === 'read')) {
         // cannot wait for sync step 1 to finish, because we may wait for sync step 2 in sync step 1 (->lock)
@@ -873,17 +881,19 @@ function extendConnector (Y/* :any */) {
         return Promise.reject(new Error('Unable to receive message'))
       }
     }
-
     _setSyncedWith (user) {
-      if (user != null) {
-        this.connections.get(user).isSynced = true;
+      var conn = this.connections.get(user);
+      if (conn != null) {
+        conn.isSynced = true;
       }
-      let conns = Array.from(this.connections.values());
-      if (conns.length > 0 && conns.every(u => u.isSynced)) {
+      if (user === this.currentSyncTarget) {
+        this.currentSyncTarget = null;
+        this.findNextSyncTarget();
+      }
+      if (this.role === 'slave' && conn.role === 'master') {
         this._fireIsSyncedListeners();
       }
     }
-
     /*
       Currently, the HB encodes operations as JSON. For the moment I want to keep it
       that way. Maybe we support encoding in the HB as XML in the future, but for now I don't want