v13.0.0-8 -- distribution files

examples/quill/index.html

@@ -4,8 +4,8 @@
   <!-- quill does not include dist files! We are using the hosted version instead -->
   <!--link rel="stylesheet" href="../bower_components/quill/dist/quill.snow.css" /-->
   <link href="https://cdn.quilljs.com/1.0.4/quill.snow.css" rel="stylesheet">
-  <link href="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.5.1/katex.min.css" rel="stylesheet">
-  <link href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.2.0/styles/monokai-sublime.min.css" rel="stylesheet">
+  <link href="//cdnjs.cloudflare.com/ajax/libs/KaTeX/0.5.1/katex.min.css" rel="stylesheet">
+  <link href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.2.0/styles/monokai-sublime.min.css" rel="stylesheet">
   <style>
     #quill-container {
       border: 1px solid gray;
@@ -19,17 +19,13 @@
     </div>
   </div>
 
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.5.1/katex.min.js" type="text/javascript"></script>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.2.0/highlight.min.js" type="text/javascript"></script>
+  <script src="//cdnjs.cloudflare.com/ajax/libs/KaTeX/0.5.1/katex.min.js" type="text/javascript"></script>
+  <script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.2.0/highlight.min.js" type="text/javascript"></script>
   <script src="https://cdn.quilljs.com/1.0.4/quill.js"></script>
   <!-- quill does not include dist files! We are using the hosted version instead (see above)
   <script src="../bower_components/quill/dist/quill.js"></script>
   -->
-  <script src="../../y.js"></script>
-  <script src="../../../y-array/y-array.js"></script>
-  <script src="../../../y-richtext/dist/y-richtext.js"></script>
-  <script src="../../../y-memory/y-memory.js"></script>
-  <script src="../../../y-websockets-client/y-websockets-client.js"></script>
+  <script src="../bower_components/yjs/y.js"></script>
   <script src="./index.js"></script>
 </body>
 </html>

examples/quill/index.js

@@ -8,8 +8,7 @@ Y({
   },
   connector: {
     name: 'websockets-client',
-    room: 'richtext-example-quill-1.0-test',
-    url: 'http://localhost:1234'
+    room: 'richtext-example-quill-1.0-test'
   },
   sourceDir: '/bower_components',
   share: {

package.json

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

src/Connector.js

@@ -156,24 +156,22 @@ export default function extendConnector (Y/* :any */) {
         sendSyncStep1(this, syncUser)
       } else {
         if (!conn.isSynced) {
-          conn._fireIsSyncedListeners()
+          this.y.db.requestTransaction(function * () {
+            if (!conn.isSynced) {
+              // it is crucial that isSynced is set at the time garbageCollectAfterSync is called
+              conn.isSynced = true
+              // It is safer to remove this!
+              // TODO: remove: yield * this.garbageCollectAfterSync()
+              // call whensynced listeners
+              for (var f of conn.whenSyncedListeners) {
+                f()
+              }
+              conn.whenSyncedListeners = []
+            }
+          })
         }
       }
     }
-    _fireIsSyncedListeners () {
-      this.y.db.whenTransactionsFinished().then(() => {
-        if (!this.isSynced) {
-          this.isSynced = true
-          // It is safer to remove this!
-          // TODO: remove: yield * this.garbageCollectAfterSync()
-          // call whensynced listeners
-          for (var f of this.whenSyncedListeners) {
-            f()
-          }
-          this.whenSyncedListeners = []
-        }
-      })
-    }
     send (uid, buffer) {
       if (!(buffer instanceof ArrayBuffer || buffer instanceof Uint8Array)) {
         throw new Error('Expected Message to be an ArrayBuffer or Uint8Array - please don\'t use this method to send custom messages')
@@ -222,12 +220,12 @@ export default function extendConnector (Y/* :any */) {
     /*
       You received a raw message, and you know that it is intended for Yjs. Then call this function.
     */
-    receiveMessage (sender, buffer) {
+    async receiveMessage (sender, buffer) {
       if (!(buffer instanceof ArrayBuffer || buffer instanceof Uint8Array)) {
-        return Promise.reject(new Error('Expected Message to be an ArrayBuffer or Uint8Array!'))
+        throw new Error('Expected Message to be an ArrayBuffer or Uint8Array!')
       }
       if (sender === this.userId) {
-        return Promise.resolve()
+        return
       }
       let decoder = new BinaryDecoder(buffer)
       let encoder = new BinaryEncoder()
@@ -246,32 +244,31 @@ export default function extendConnector (Y/* :any */) {
       if (messageType === 'sync step 1' || messageType === 'sync step 2') {
         let auth = decoder.readVarUint()
         if (senderConn.auth == null) {
-          senderConn.processAfterAuth.push([messageType, senderConn, decoder, encoder, sender])
           // check auth
-          return this.checkAuth(auth, this.y, sender).then(authPermissions => {
-            if (senderConn.auth == null) {
-              senderConn.auth = authPermissions
-              this.y.emit('userAuthenticated', {
-                user: senderConn.uid,
-                auth: authPermissions
-              })
+          let authPermissions = await this.checkAuth(auth, this.y, sender)
+          senderConn.auth = authPermissions
+          this.y.emit('userAuthenticated', {
+            user: senderConn.uid,
+            auth: authPermissions
+          })
+          senderConn.syncStep2.promise.then(() => {
+            if (senderConn.processAfterAuth == null) {
+              return
             }
-            let messages = senderConn.processAfterAuth
-            senderConn.processAfterAuth = []
-
-            return messages.reduce((p, m) =>
-              p.then(() => this.computeMessage(m[0], m[1], m[2], m[3], m[4]))
-            , Promise.resolve())
+            for (let i = 0; i < senderConn.processAfterAuth.length; i++) {
+              let m = senderConn.processAfterAuth[i]
+              this.receiveMessage(m[0], m[1])
+            }
+            senderConn.processAfterAuth = null
           })
         }
       }
-      if (senderConn.auth != null) {
-        return this.computeMessage(messageType, senderConn, decoder, encoder, sender)
-      } else {
-        senderConn.processAfterAuth.push([messageType, senderConn, decoder, encoder, sender])
+
+      if (senderConn.auth == null) {
+        senderConn.processAfterAuth.push([sender, buffer])
+        return
       }
-    }
-    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)
         computeMessageSyncStep1(decoder, encoder, this, senderConn, sender)
@@ -281,7 +278,7 @@ export default function extendConnector (Y/* :any */) {
       } else if (messageType === 'update' && senderConn.auth === 'write') {
         return computeMessageUpdate(decoder, encoder, this, senderConn, sender)
       } else {
-        return Promise.reject(new Error('Unable to receive message'))
+        console.error('Unable to receive message')
       }
     }
     _setSyncedWith (user) {
@@ -293,9 +290,6 @@ export default function extendConnector (Y/* :any */) {
         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

src/MessageHandler.js

@@ -26,14 +26,14 @@ export function formatYjsMessageType (buffer) {
   return decoder.readVarString()
 }
 
-export function logMessageUpdate (decoder, strBuilder) {
+export async function logMessageUpdate (decoder, strBuilder) {
   let len = decoder.readUint32()
   for (let i = 0; i < len; i++) {
     strBuilder.push(JSON.stringify(Y.Struct.binaryDecodeOperation(decoder)) + '\n')
   }
 }
 
-export function computeMessageUpdate (decoder, encoder, conn) {
+export async function computeMessageUpdate (decoder, encoder, conn) {
   if (conn.y.db.forwardAppliedOperations) {
     let messagePosition = decoder.pos
     let len = decoder.readUint32()
@@ -78,7 +78,7 @@ export function logMessageSyncStep1 (decoder, strBuilder) {
   logSS(decoder, strBuilder)
 }
 
-export function computeMessageSyncStep1 (decoder, encoder, conn, senderConn, sender) {
+export async function computeMessageSyncStep1 (decoder, encoder, conn, senderConn, sender) {
   let protocolVersion = decoder.readVarUint()
   let preferUntransformed = decoder.readUint8() === 1
 
@@ -112,7 +112,7 @@ export function computeMessageSyncStep1 (decoder, encoder, conn, senderConn, sen
   if (conn.role === 'slave') {
     sendSyncStep1(conn, sender)
   }
-  return conn.y.db.whenTransactionsFinished()
+  await conn.y.db.whenTransactionsFinished()
 }
 
 export function logSS (decoder, strBuilder) {
@@ -161,7 +161,7 @@ export function logMessageSyncStep2 (decoder, strBuilder) {
   logDS(decoder, strBuilder)
 }
 
-export function computeMessageSyncStep2 (decoder, encoder, conn, senderConn, sender) {
+export async function computeMessageSyncStep2 (decoder, encoder, conn, senderConn, sender) {
   var db = conn.y.db
   let defer = senderConn.syncStep2
 
@@ -178,8 +178,7 @@ export function computeMessageSyncStep2 (decoder, encoder, conn, senderConn, sen
   db.requestTransaction(function * () {
     yield * this.applyDeleteSet(decoder)
   })
-  return db.whenTransactionsFinished().then(() => {
-    conn._setSyncedWith(sender)
-    defer.resolve()
-  })
+  await db.whenTransactionsFinished()
+  conn._setSyncedWith(sender)
+  defer.resolve()
 }

y.node.js

@@ -1,7 +1,7 @@
 
 /**
  * yjs - A framework for real-time p2p shared editing on any data
- * @version v13.0.0-10
+ * @version v13.0.0-8
  * @license MIT
  */
 
@@ -440,14 +440,14 @@ function formatYjsMessageType (buffer) {
   return decoder.readVarString()
 }
 
-function logMessageUpdate (decoder, strBuilder) {
+async function logMessageUpdate (decoder, strBuilder) {
   let len = decoder.readUint32();
   for (let i = 0; i < len; i++) {
     strBuilder.push(JSON.stringify(Y.Struct.binaryDecodeOperation(decoder)) + '\n');
   }
 }
 
-function computeMessageUpdate (decoder, encoder, conn) {
+async function computeMessageUpdate (decoder, encoder, conn) {
   if (conn.y.db.forwardAppliedOperations) {
     let messagePosition = decoder.pos;
     let len = decoder.readUint32();
@@ -492,7 +492,7 @@ function logMessageSyncStep1 (decoder, strBuilder) {
   logSS(decoder, strBuilder);
 }
 
-function computeMessageSyncStep1 (decoder, encoder, conn, senderConn, sender) {
+async function computeMessageSyncStep1 (decoder, encoder, conn, senderConn, sender) {
   let protocolVersion = decoder.readVarUint();
   let preferUntransformed = decoder.readUint8() === 1;
 
@@ -526,7 +526,7 @@ function computeMessageSyncStep1 (decoder, encoder, conn, senderConn, sender) {
   if (conn.role === 'slave') {
     sendSyncStep1(conn, sender);
   }
-  return conn.y.db.whenTransactionsFinished()
+  await conn.y.db.whenTransactionsFinished();
 }
 
 function logSS (decoder, strBuilder) {
@@ -575,7 +575,7 @@ function logMessageSyncStep2 (decoder, strBuilder) {
   logDS(decoder, strBuilder);
 }
 
-function computeMessageSyncStep2 (decoder, encoder, conn, senderConn, sender) {
+async function computeMessageSyncStep2 (decoder, encoder, conn, senderConn, sender) {
   var db = conn.y.db;
   let defer = senderConn.syncStep2;
 
@@ -592,10 +592,9 @@ function computeMessageSyncStep2 (decoder, encoder, conn, senderConn, sender) {
   db.requestTransaction(function * () {
     yield * this.applyDeleteSet(decoder);
   });
-  return db.whenTransactionsFinished().then(() => {
-    conn._setSyncedWith(sender);
-    defer.resolve();
-  })
+  await db.whenTransactionsFinished();
+  conn._setSyncedWith(sender);
+  defer.resolve();
 }
 
 function extendConnector (Y/* :any */) {
@@ -753,24 +752,22 @@ function extendConnector (Y/* :any */) {
         sendSyncStep1(this, syncUser);
       } else {
         if (!conn.isSynced) {
-          conn._fireIsSyncedListeners();
+          this.y.db.requestTransaction(function * () {
+            if (!conn.isSynced) {
+              // it is crucial that isSynced is set at the time garbageCollectAfterSync is called
+              conn.isSynced = true;
+              // It is safer to remove this!
+              // TODO: remove: yield * this.garbageCollectAfterSync()
+              // call whensynced listeners
+              for (var f of conn.whenSyncedListeners) {
+                f();
+              }
+              conn.whenSyncedListeners = [];
+            }
+          });
         }
       }
     }
-    _fireIsSyncedListeners () {
-      this.y.db.whenTransactionsFinished().then(() => {
-        if (!this.isSynced) {
-          this.isSynced = true;
-          // It is safer to remove this!
-          // TODO: remove: yield * this.garbageCollectAfterSync()
-          // call whensynced listeners
-          for (var f of this.whenSyncedListeners) {
-            f();
-          }
-          this.whenSyncedListeners = [];
-        }
-      });
-    }
     send (uid, buffer) {
       if (!(buffer instanceof ArrayBuffer || buffer instanceof Uint8Array)) {
         throw new Error('Expected Message to be an ArrayBuffer or Uint8Array - please don\'t use this method to send custom messages')
@@ -819,12 +816,12 @@ function extendConnector (Y/* :any */) {
     /*
       You received a raw message, and you know that it is intended for Yjs. Then call this function.
     */
-    receiveMessage (sender, buffer) {
+    async receiveMessage (sender, buffer) {
       if (!(buffer instanceof ArrayBuffer || buffer instanceof Uint8Array)) {
-        return Promise.reject(new Error('Expected Message to be an ArrayBuffer or Uint8Array!'))
+        throw new Error('Expected Message to be an ArrayBuffer or Uint8Array!')
       }
       if (sender === this.userId) {
-        return Promise.resolve()
+        return
       }
       let decoder = new BinaryDecoder(buffer);
       let encoder = new BinaryEncoder();
@@ -843,32 +840,31 @@ function extendConnector (Y/* :any */) {
       if (messageType === 'sync step 1' || messageType === 'sync step 2') {
         let auth = decoder.readVarUint();
         if (senderConn.auth == null) {
-          senderConn.processAfterAuth.push([messageType, senderConn, decoder, encoder, sender]);
           // check auth
-          return this.checkAuth(auth, this.y, sender).then(authPermissions => {
-            if (senderConn.auth == null) {
-              senderConn.auth = authPermissions;
-              this.y.emit('userAuthenticated', {
-                user: senderConn.uid,
-                auth: authPermissions
-              });
+          let authPermissions = await this.checkAuth(auth, this.y, sender);
+          senderConn.auth = authPermissions;
+          this.y.emit('userAuthenticated', {
+            user: senderConn.uid,
+            auth: authPermissions
+          });
+          senderConn.syncStep2.promise.then(() => {
+            if (senderConn.processAfterAuth == null) {
+              return
             }
-            let messages = senderConn.processAfterAuth;
-            senderConn.processAfterAuth = [];
-
-            return messages.reduce((p, m) =>
-              p.then(() => this.computeMessage(m[0], m[1], m[2], m[3], m[4]))
-            , Promise.resolve())
-          })
+            for (let i = 0; i < senderConn.processAfterAuth.length; i++) {
+              let m = senderConn.processAfterAuth[i];
+              this.receiveMessage(m[0], m[1]);
+            }
+            senderConn.processAfterAuth = null;
+          });
         }
       }
-      if (senderConn.auth != null) {
-        return this.computeMessage(messageType, senderConn, decoder, encoder, sender)
-      } else {
-        senderConn.processAfterAuth.push([messageType, senderConn, decoder, encoder, sender]);
+
+      if (senderConn.auth == null) {
+        senderConn.processAfterAuth.push([sender, buffer]);
+        return
       }
-    }
-    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)
         computeMessageSyncStep1(decoder, encoder, this, senderConn, sender);
@@ -878,7 +874,7 @@ function extendConnector (Y/* :any */) {
       } else if (messageType === 'update' && senderConn.auth === 'write') {
         return computeMessageUpdate(decoder, encoder, this, senderConn, sender)
       } else {
-        return Promise.reject(new Error('Unable to receive message'))
+        console.error('Unable to receive message');
       }
     }
     _setSyncedWith (user) {
@@ -890,9 +886,6 @@ function extendConnector (Y/* :any */) {
         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