fix some tests, implement event classes for types, and re-implement logging

src/MessageHandler/integrateRemoteStructs.js

@@ -28,9 +28,7 @@ function _integrateRemoteStructHelper (y, struct) {
             missingDef.missing--
             if (missingDef.missing === 0) {
               let missing = missingDef.struct._fromBinary(y, missingDef.decoder)
-              if (missing.length > 0) {
-                console.error('Missing should be empty!')
-              } else {
+              if (missing.length === 0) {
                 y._readyToIntegrate.push(missingDef.struct)
               }
             }
@@ -42,6 +40,21 @@ function _integrateRemoteStructHelper (y, struct) {
   }
 }
 
+export function stringifyStructs (y, decoder, strBuilder) {
+  while (decoder.length !== decoder.pos) {
+    let reference = decoder.readVarUint()
+    let Constr = getStruct(reference)
+    let struct = new Constr()
+    let missing = struct._fromBinary(y, decoder)
+    let logMessage = struct._logString()
+    if (missing.length > 0) {
+      logMessage += missing.map(id => `ID (user: ${id.user}, clock: ${id.clock})`).join(', ')
+    }
+    logMessage += '\n'
+    strBuilder.push(logMessage)
+  }
+}
+
 export function integrateRemoteStructs (decoder, encoder, y) {
   while (decoder.length !== decoder.pos) {
     let decoderPos = decoder.pos

src/MessageHandler/messageToString.js

@@ -1,16 +1,16 @@
 import BinaryDecoder from '../Binary/Decoder.js'
-import { stringifyUpdate } from './update.js'
+import { stringifyStructs } from './integrateRemoteStructs.js'
 import { stringifySyncStep1 } from './syncStep1.js'
 import { stringifySyncStep2 } from './syncStep2.js'
 
-export function messageToString (y, buffer) {
+export function messageToString ([y, buffer]) {
   let decoder = new BinaryDecoder(buffer)
   decoder.readVarString() // read roomname
   let type = decoder.readVarString()
   let strBuilder = []
   strBuilder.push('\n === ' + type + ' ===\n')
   if (type === 'update') {
-    stringifyUpdate(y, decoder, strBuilder)
+    stringifyStructs(y, decoder, strBuilder)
   } else if (type === 'sync step 1') {
     stringifySyncStep1(y, decoder, strBuilder)
   } else if (type === 'sync step 2') {

src/MessageHandler/syncStep2.js

@@ -1,11 +1,9 @@
-import { integrateRemoteStructs } from './integrateRemoteStructs.js'
-import { stringifyUpdate } from './update.js'
+import { stringifyStructs, integrateRemoteStructs } from './integrateRemoteStructs.js'
 import { readDeleteSet } from './deleteSet.js'
 
 export function stringifySyncStep2 (y, decoder, strBuilder) {
   strBuilder.push('     - auth: ' + decoder.readVarString() + '\n')
   strBuilder.push('  == OS: \n')
-  stringifyUpdate(y, decoder, strBuilder)
   // write DS to string
   strBuilder.push('  == DS: \n')
   let len = decoder.readUint32()
@@ -20,6 +18,7 @@ export function stringifySyncStep2 (y, decoder, strBuilder) {
       strBuilder.push(`[${from}, ${to}, ${gc}]`)
     }
   }
+  stringifyStructs(y, decoder, strBuilder)
 }
 
 export function readSyncStep2 (decoder, encoder, y, senderConn, sender) {

src/MessageHandler/update.js

@@ -1,19 +0,0 @@
-
-import { getStruct } from '../Util/structReferences.js'
-
-export function stringifyUpdate (y, decoder, strBuilder) {
-  while (decoder.length !== decoder.pos) {
-    let reference = decoder.readVarUint()
-    let Constr = getStruct(reference)
-    let struct = new Constr()
-    let missing = struct._fromBinary(y, decoder)
-    let logMessage = struct._logString()
-    if (missing.length > 0) {
-      logMessage += missing.map(m => m._logString()).join(', ')
-    }
-    logMessage += '\n'
-    strBuilder.push(logMessage)
-  }
-}
-
-export { integrateRemoteStructs as readUpdate } from './integrateRemoteStructs.js'