fixed ds syncing bug

src/MessageHandler/integrateRemoteStructs.js

@@ -47,7 +47,8 @@ function _integrateRemoteStructHelper (y, struct) {
 }
 
 export function stringifyStructs (y, decoder, strBuilder) {
-  while (decoder.length !== decoder.pos) {
+  const len = decoder.readUint32()
+  for (let i = 0; i < len; i++) {
     let reference = decoder.readVarUint()
     let Constr = getStruct(reference)
     let struct = new Constr()
@@ -61,7 +62,8 @@ export function stringifyStructs (y, decoder, strBuilder) {
 }
 
 export function integrateRemoteStructs (decoder, encoder, y) {
-  while (decoder.length !== decoder.pos) {
+  const len = decoder.readUint32()
+  for (let i = 0; i < len; i++) {
     let reference = decoder.readVarUint()
     let Constr = getStruct(reference)
     let struct = new Constr()

src/MessageHandler/syncStep1.js

@@ -31,14 +31,19 @@ export function sendSyncStep1 (connector, syncUser) {
 }
 
 export default function writeStructs (encoder, decoder, y, ss) {
+  const lenPos = encoder.pos
+  encoder.writeUint32(0)
+  let len = 0
   for (let user of y.ss.state.keys()) {
     let clock = ss.get(user) || 0
     if (user !== RootFakeUserID) {
       y.os.iterate(new ID(user, clock), new ID(user, Number.MAX_VALUE), function (struct) {
         struct._toBinary(encoder)
+        len++
       })
     }
   }
+  encoder.setUint32(lenPos, len)
 }
 
 export function readSyncStep1 (decoder, encoder, y, senderConn, sender) {
@@ -54,9 +59,9 @@ export function readSyncStep1 (decoder, encoder, y, senderConn, sender) {
   // write sync step 2
   encoder.writeVarString('sync step 2')
   encoder.writeVarString(y.connector.authInfo || '')
-  writeDeleteSet(y, encoder)
   const ss = readStateSet(decoder)
   writeStructs(encoder, decoder, y, ss)
+  writeDeleteSet(y, encoder)
   y.connector.send(senderConn.uid, encoder.createBuffer())
   senderConn.receivedSyncStep2 = true
   if (y.connector.role === 'slave') {

src/MessageHandler/syncStep2.js

@@ -3,6 +3,8 @@ import { readDeleteSet } from './deleteSet.js'
 
 export function stringifySyncStep2 (y, decoder, strBuilder) {
   strBuilder.push('     - auth: ' + decoder.readVarString())
+  strBuilder.push('  == OS:')
+  stringifyStructs(y, decoder, strBuilder)
   // write DS to string
   strBuilder.push('  == DS:')
   let len = decoder.readUint32()
@@ -17,12 +19,10 @@ export function stringifySyncStep2 (y, decoder, strBuilder) {
       strBuilder.push(`[${from}, ${to}, ${gc}]`)
     }
   }
-  strBuilder.push('  == OS:')
-  stringifyStructs(y, decoder, strBuilder)
 }
 
 export function readSyncStep2 (decoder, encoder, y, senderConn, sender) {
-  readDeleteSet(y, decoder)
   integrateRemoteStructs(decoder, encoder, y)
+  readDeleteSet(y, decoder)
   y.connector._setSyncedWith(sender)
 }