yonote/yjs
14
0
Fork 0
Code Pull Requests 1 Releases Activity

decode items before they are decoded. fixes lots of y-array tests

Browse Source
This commit is contained in:
Kevin Jahns
2019-03-07 18:57:39 +01:00
parent 76b7d0b651
commit 0a5753c191
4 changed files with 34 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/utils/integrateRemoteStructs.js
View File

@@ -5,7 +5,6 @@
import { getStruct } from 'y-protocols/sync.js'
import * as decoding from 'funlib/decoding.js'
import { GC } from '../structs/GC.js'
import { Delete } from '../structs/Delete.js'
import { Y } from '../utils/Y.js' // eslint-disable-line
import { Item } from '../structs/Item.js' // eslint-disable-line
@@ -51,18 +50,7 @@ function _integrateRemoteStructHelper (y, struct) {
missingStructs.forEach(missingDef => {
missingDef.missing--
if (missingDef.missing === 0) {
const decoder = missingDef.decoder
let oldPos = decoder.pos
let missing = missingDef.struct._fromBinary(y, decoder)
decoder.pos = oldPos
if (missing.length === 0) {
y._readyToIntegrate.push(missingDef.struct)
// TODO: sorting should be optimized
// Sorting because deletes may change the origin of ops
y._readyToIntegrate.sort((a, b) => a.constructor === b.constructor ? 0 : (a.constructor === Delete ? 1 : -1))
} else {
// TODO: throw error here
}
y._readyToIntegrate.push(missingDef)
}
})
msu.delete(clock)
@@ -88,10 +76,21 @@ export const integrateRemoteStructs = (decoder, y) => {
let decoderPos = decoder.pos
let missing = struct._fromBinary(y, decoder)
if (missing.length === 0) {
y._readyToIntegrate.sort((a, b) => a.constructor === b.constructor ? 0 : (a.constructor === Delete ? 1 : -1))
while (struct != null) {
while (struct !== null) {
_integrateRemoteStructHelper(y, struct)
struct = y._readyToIntegrate.shift()
struct = null
if (y._readyToIntegrate.length > 0) {
const missingDef = y._readyToIntegrate.shift()
const decoder = missingDef.decoder
let oldPos = decoder.pos
let missing = missingDef.struct._fromBinary(y, decoder)
decoder.pos = oldPos
if (missing.length === 0) {
struct = missingDef.struct
} else {
throw new Error('Missing should be empty')
}
}
}
} else {
let _decoder = decoding.createDecoder(decoder.arr.buffer)
@@ -126,10 +125,21 @@ export const integrateRemoteStruct = (decoder, y) => {
let decoderPos = decoder.pos
let missing = struct._fromBinary(y, decoder)
if (missing.length === 0) {
y._readyToIntegrate.sort((a, b) => a.constructor === b.constructor ? 0 : (a.constructor === Delete ? 1 : -1))
while (struct != null) {
_integrateRemoteStructHelper(y, struct)
struct = y._readyToIntegrate.shift()
struct = null
if (y._readyToIntegrate.length > 0) {
const missingDef = y._readyToIntegrate.shift()
const decoder = missingDef.decoder
let oldPos = decoder.pos
let missing = missingDef.struct._fromBinary(y, decoder)
decoder.pos = oldPos
if (missing.length === 0) {
struct = missingDef.struct
} else {
throw new Error('Missing should be empty')
}
}
}
} else {
let _decoder = decoding.createDecoder(decoder.arr.buffer)