Deploy 9.0.3

.gitignore

@@ -1,8 +1 @@
-node_modules
 bower_components
-.directory
-.codio
-.settings
-.jshintignore
-.jshintrc
-.validate.json

Examples/bower.json

@@ -9,15 +9,15 @@
   "license": "MIT",
   "ignore": [],
   "dependencies": {
-    "yjs": "~0.7.6",
+    "yjs": "latest",
-    "y-array": "~0.7.5",
+    "y-array": "latest",
-    "y-map": "~0.7.2",
+    "y-map": "latest",
-    "y-memory": "~0.7.0",
+    "y-memory": "latest",
-    "y-richtext": "~0.7.5",
+    "y-richtext": "latest",
-    "y-webrtc": "~0.7.1",
+    "y-webrtc": "latest",
-    "y-websockets-client": "~0.7.10",
+    "y-websockets-client": "latest",
-    "y-text": "~0.7.1",
+    "y-text": "latest",
-    "y-indexeddb": "~0.7.1",
+    "y-indexeddb": "latest",
     "quill": "~0.20.1",
     "ace": "~1.2.3",
     "ace-builds": "~1.2.3"

README.md

@@ -49,7 +49,7 @@ Install yjs and its modules with [bower](http://bower.io/), or with [npm](https:
 
 ### Bower
 ```
-bower install yjs
+bower install yjs --save
 ```
 Then you include the libraries directly from the installation folder.
 ```

bower.json

@@ -1,19 +1,21 @@
 {
   "name": "yjs",
-  "version": "0.8.21",
+  "version": "9.0.3",
   "homepage": "y-js.org",
   "authors": [
     "Kevin Jahns <kevin.jahns@rwth-aachen.de>"
   ],
-  "description": "A Framework that enables Real-Time collaboration on arbitrary data structures.",
+  "description": "A Framework for shared editing on any data",
-  "main": "y.js",
+  "main": "./y.js",
   "keywords": [
+    "Yjs",
     "OT",
-    "collaboration",
+    "Collaboration",
-    "synchronization",
+    "Synchronization",
-    "sharejs",
+    "ShareJS",
-    "coweb",
+    "Coweb",
-    "concurrency"
+    "Concurrency"
   ],
-  "license": "MIT"
+  "license": "MIT",
+  "ignore": []
 }

y.es6

@@ -52,6 +52,7 @@ module.exports = function (Y/* :any */) {
       this.broadcastedHB = false
       this.syncStep2 = Promise.resolve()
       this.broadcastOpBuffer = []
+      this.protocolVersion = 8
     }
     reconnect () {
     }
@@ -208,6 +209,18 @@ module.exports = function (Y/* :any */) {
       if (this.debug) {
         console.log(`receive ${sender} -> ${this.userId}: ${message.type}`, JSON.parse(JSON.stringify(message))) // eslint-disable-line
       }
+      if (message.protocolVersion != null && message.protocolVersion !== this.protocolVersion) {
+        console.error(
+          `You tried to sync with a yjs instance that has a different protocol version
+          (You: ${this.protocolVersion}, Client: ${message.protocolVersion}).
+          The sync was stopped. You need to upgrade your dependencies (especially Yjs & the Connector)!
+          `)
+        this.send(sender, {
+          type: 'sync stop',
+          protocolVersion: this.protocolVersion
+        })
+        return
+      }
       if (message.type === 'sync step 1') {
         // TODO: make transaction, stream the ops
         let conn = this
@@ -783,8 +796,8 @@ module.exports = function (Y /* :any */) {
           missing: ids.length
         }
 
-        for (let key in ids) {
+        for (let i = 0; i < ids.length; i++) {
-          let id = ids[key]
+          let id = ids[i]
           let sid = JSON.stringify(id)
           let l = this.listenersById[sid]
           if (l == null) {
@@ -827,8 +840,8 @@ module.exports = function (Y /* :any */) {
           if (op == null) {
             store.listenersById[sid] = l
           } else {
-            for (let key in l) {
+            for (let i = 0; i < l.length; i++) {
-              let listener = l[key]
+              let listener = l[i]
               let o = listener.op
               if (--listener.missing === 0) {
                 yield* store.tryExecute.call(this, o)