Compare commits

..

1 Commits

Author SHA1 Message Date
Kevin Jahns
256d08cb2a v13.0.0-18 -- distribution files 2017-09-20 11:34:24 +02:00
9 changed files with 14 additions and 23619 deletions

View File

@@ -1,6 +1,6 @@
{ {
"name": "yjs", "name": "yjs",
"version": "13.0.0-19", "version": "13.0.0-18",
"description": "A framework for real-time p2p shared editing on any data", "description": "A framework for real-time p2p shared editing on any data",
"main": "./y.node.js", "main": "./y.node.js",
"browser": "./y.js", "browser": "./y.js",

View File

@@ -42,11 +42,6 @@ export default function extendConnector (Y/* :any */) {
if (opts.generateUserId !== false) { if (opts.generateUserId !== false) {
this.setUserId(Y.utils.generateUserId()) this.setUserId(Y.utils.generateUserId())
} }
if (opts.maxBufferLength == null) {
this.maxBufferLength = -1
} else {
this.maxBufferLength = opts.maxBufferLength
}
} }
reconnect () { reconnect () {
@@ -202,19 +197,14 @@ export default function extendConnector (Y/* :any */) {
encoder.writeVarString(self.opts.room) encoder.writeVarString(self.opts.room)
encoder.writeVarString('update') encoder.writeVarString('update')
let ops = self.broadcastOpBuffer let ops = self.broadcastOpBuffer
self.broadcastOpBuffer = []
let length = ops.length let length = ops.length
let encoderPosLen = encoder.pos encoder.writeUint32(length)
encoder.writeUint32(0) for (var i = 0; i < length; i++) {
for (var i = 0; i < length && (self.maxBufferLength < 0 || encoder.length < self.maxBufferLength); i++) {
let op = ops[i] let op = ops[i]
Y.Struct[op.struct].binaryEncode(encoder, op) Y.Struct[op.struct].binaryEncode(encoder, op)
} }
encoder.setUint32(encoderPosLen, i)
self.broadcastOpBuffer = ops.slice(i)
self.broadcast(encoder.createBuffer()) self.broadcast(encoder.createBuffer())
if (i !== length) {
setTimeout(broadcastOperations, 100)
}
} }
} }
if (this.broadcastOpBuffer.length === 0) { if (this.broadcastOpBuffer.length === 0) {

View File

@@ -8,10 +8,6 @@ export class BinaryEncoder {
this.data = [] this.data = []
} }
get length () {
return this.data.length
}
get pos () { get pos () {
return this.data.length return this.data.length
} }

8
y.js

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -1,7 +1,7 @@
/** /**
* yjs - A framework for real-time p2p shared editing on any data * yjs - A framework for real-time p2p shared editing on any data
* @version v13.0.0-19 * @version v13.0.0-18
* @license MIT * @license MIT
*/ */
@@ -292,10 +292,6 @@ class BinaryEncoder {
this.data = []; this.data = [];
} }
get length () {
return this.data.length
}
get pos () { get pos () {
return this.data.length return this.data.length
} }
@@ -670,11 +666,6 @@ function extendConnector (Y/* :any */) {
if (opts.generateUserId !== false) { if (opts.generateUserId !== false) {
this.setUserId(Y.utils.generateUserId()); this.setUserId(Y.utils.generateUserId());
} }
if (opts.maxBufferLength == null) {
this.maxBufferLength = -1;
} else {
this.maxBufferLength = opts.maxBufferLength;
}
} }
reconnect () { reconnect () {
@@ -830,19 +821,14 @@ function extendConnector (Y/* :any */) {
encoder.writeVarString(self.opts.room); encoder.writeVarString(self.opts.room);
encoder.writeVarString('update'); encoder.writeVarString('update');
let ops = self.broadcastOpBuffer; let ops = self.broadcastOpBuffer;
self.broadcastOpBuffer = [];
let length = ops.length; let length = ops.length;
let encoderPosLen = encoder.pos; encoder.writeUint32(length);
encoder.writeUint32(0); for (var i = 0; i < length; i++) {
for (var i = 0; i < length && (self.maxBufferLength < 0 || encoder.length < self.maxBufferLength); i++) {
let op = ops[i]; let op = ops[i];
Y.Struct[op.struct].binaryEncode(encoder, op); Y.Struct[op.struct].binaryEncode(encoder, op);
} }
encoder.setUint32(encoderPosLen, i);
self.broadcastOpBuffer = ops.slice(i);
self.broadcast(encoder.createBuffer()); self.broadcast(encoder.createBuffer());
if (i !== length) {
setTimeout(broadcastOperations, 100);
}
} }
} }
if (this.broadcastOpBuffer.length === 0) { if (this.broadcastOpBuffer.length === 0) {

File diff suppressed because one or more lines are too long

23576
y.test.js

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long