From eb4fb3a225b19523db30f1c48b28abb08ce2ba6b Mon Sep 17 00:00:00 2001
From: Kevin Jahns <kevin.jahns@rwth-aachen.de>
Date: Mon, 24 Jul 2017 15:37:04 +0200
Subject: [PATCH] binary encoding bugfixes & export BinaryEncoder +
 BinaryDecoder

---
 src/Connector.js      |  5 +++++
 src/MessageHandler.js |  3 ++-
 src/Transaction.js    |  6 +++---
 src/Utils.js          | 14 +++++++++-----
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/Connector.js b/src/Connector.js
index 8c0c05c8..c2c58994 100644
--- a/src/Connector.js
+++ b/src/Connector.js
@@ -12,6 +12,7 @@ export default function extendConnector (Y/* :any */) {
       if (opts == null) {
         opts = {}
       }
+      this.opts = opts
       // Prefer to receive untransformed operations. This does only work if
       // this client receives operations from only one other client.
       // In particular, this does not work with y-webrtc.
@@ -152,6 +153,7 @@ export default function extendConnector (Y/* :any */) {
         this.currentSyncTarget = syncUser
         this.y.db.requestTransaction(function * () {
           let encoder = new BinaryEncoder()
+          encoder.writeVarString(conn.opts.room || '')
           encoder.writeVarString('sync step 1')
           encoder.writeVarString(conn.authInfo || '')
           encoder.writeVarUint(conn.protocolVersion)
@@ -197,6 +199,7 @@ export default function extendConnector (Y/* :any */) {
       function broadcastOperations () {
         if (self.broadcastOpBuffer.length > 0) {
           let encoder = new BinaryEncoder()
+          encoder.writeVarString(self.opts.room)
           encoder.writeVarString('update')
           let ops = self.broadcastOpBuffer
           self.broadcastOpBuffer = []
@@ -225,6 +228,8 @@ export default function extendConnector (Y/* :any */) {
       }
       let decoder = new BinaryDecoder(buffer)
       let encoder = new BinaryEncoder()
+      let roomname = decoder.readVarString() // read room name
+      encoder.writeVarString(roomname)
       let messageType = decoder.readVarString()
       let senderConn = this.connections.get(sender)
 
diff --git a/src/MessageHandler.js b/src/MessageHandler.js
index 161f1985..0e9105fc 100644
--- a/src/MessageHandler.js
+++ b/src/MessageHandler.js
@@ -4,6 +4,7 @@ import { BinaryDecoder } from './Encoding.js'
 
 export function formatYjsMessage (buffer) {
   let decoder = new BinaryDecoder(buffer)
+  decoder.readVarString() // read roomname
   let type = decoder.readVarString()
   let strBuilder = []
   strBuilder.push('\n === ' + type + ' ===\n')
@@ -108,7 +109,7 @@ export function logSS (decoder, strBuilder) {
   for (let i = 0; i < len; i++) {
     let user = decoder.readVarUint()
     let clock = decoder.readVarUint()
-    strBuilder.push(`     - ${user}: ${clock}`)
+    strBuilder.push(`     ${user}: ${clock}\n`)
   }
 }
 
diff --git a/src/Transaction.js b/src/Transaction.js
index 37b13ecd..6e9dd66c 100644
--- a/src/Transaction.js
+++ b/src/Transaction.js
@@ -1061,8 +1061,8 @@ export default function extendTransaction (Y) {
       let ss = new Map()
       let ssLength = decoder.readUint32()
       for (let i = 0; i < ssLength; i++) {
-        let user = decoder.readUint32()
-        let clock = decoder.readUint32()
+        let user = decoder.readVarUint()
+        let clock = decoder.readVarUint()
         ss.set(user, clock)
       }
       let ops = yield * this.getOperations(ss)
@@ -1093,7 +1093,7 @@ export default function extendTransaction (Y) {
     * applyOperationsUntransformed (decoder) {
       let len = decoder.readUint32()
       for (let i = 0; i < len; i++) {
-        let op = decoder.readOperation()
+        let op = Y.Struct.binaryDecodeOperation(decoder)
         yield * this.os.put(op)
       }
       yield * this.os.iterate(this, null, null, function * (op) {
diff --git a/src/Utils.js b/src/Utils.js
index ab588dae..736d1272 100644
--- a/src/Utils.js
+++ b/src/Utils.js
@@ -1,4 +1,5 @@
-/* global crypto */
+
+import { BinaryDecoder, BinaryEncoder } from './Encoding.js'
 
 /*
   EventHandler is an helper class for constructing custom types.
@@ -24,7 +25,10 @@
 */
 
 export default function Utils (Y) {
-  Y.utils = {}
+  Y.utils = {
+    BinaryDecoder: BinaryDecoder,
+    BinaryEncoder: BinaryEncoder
+  }
 
   Y.utils.bubbleEvent = function (type, event) {
     type.eventHandler.callEventListeners(event)
@@ -821,17 +825,17 @@ export default function Utils (Y) {
   Y.utils.createSmallLookupBuffer = createSmallLookupBuffer
 
   function generateUserId () {
-    if (crypto.getRandomValue != null) {
+    if (typeof crypto !== 'undefined' && crypto.getRandomValue != null) {
       // browser
       let arr = new Uint32Array(1)
       crypto.getRandomValues(arr)
       return arr[0]
-    } else if (crypto.randomBytes != null) {
+    } else if (typeof crypto !== 'undefined' && crypto.randomBytes != null) {
       // node
       let buf = crypto.randomBytes(4)
       return new Uint32Array(buf.buffer)[0]
     } else {
-      Math.ceil(Math.random() * 0xFFFFFFFF)
+      return Math.ceil(Math.random() * 0xFFFFFFFF)
     }
   }
   Y.utils.generateUserId = generateUserId