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

remove option forwardToSyncing clients as it is no longer necessary - it was previously only used by y-webrtc

Browse Source
This commit is contained in:
Kevin Jahns 2017-07-13 00:48:14 +02:00
parent 3c317828d1
commit 6c8876d282
1 changed files with 1 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/Connector.js
View File

@ -14,8 +14,6 @@ export default function extendConnector (Y/* :any */) {
userEventListeners: Array<Function>; userEventListeners: Array<Function>;
whenSyncedListeners: Array<Function>; whenSyncedListeners: Array<Function>;
currentSyncTarget: ?UserId; currentSyncTarget: ?UserId;
syncingClients: Array<UserId>;
forwardToSyncingClients: boolean;
debug: boolean; debug: boolean;
syncStep2: Promise; syncStep2: Promise;
userId: UserId; userId: UserId;
@ -56,8 +54,6 @@ export default function extendConnector (Y/* :any */) {
this.userEventListeners = [] this.userEventListeners = []
this.whenSyncedListeners = [] this.whenSyncedListeners = []
this.currentSyncTarget = null this.currentSyncTarget = null
this.syncingClients = []
this.forwardToSyncingClients = opts.forwardToSyncingClients !== false
this.debug = opts.debug === true this.debug = opts.debug === true
this.broadcastOpBuffer = [] this.broadcastOpBuffer = []
this.protocolVersion = 11 this.protocolVersion = 11
@ -85,7 +81,6 @@ export default function extendConnector (Y/* :any */) {
this.connections = new Map() this.connections = new Map()
this.isSynced = false this.isSynced = false
this.currentSyncTarget = null this.currentSyncTarget = null
this.syncingClients = []
this.whenSyncedListeners = [] this.whenSyncedListeners = []
this.y.db.stopGarbageCollector() this.y.db.stopGarbageCollector()
return this.y.db.whenTransactionsFinished() return this.y.db.whenTransactionsFinished()
@ -125,9 +120,6 @@ export default function extendConnector (Y/* :any */) {
this.currentSyncTarget = null this.currentSyncTarget = null
this.findNextSyncTarget() this.findNextSyncTarget()
} }
this.syncingClients = this.syncingClients.filter(function (cli) {
return cli !== user
})
for (var f of this.userEventListeners) { for (var f of this.userEventListeners) {
f({ f({
action: 'userLeft', action: 'userLeft',
@ -325,21 +317,6 @@ export default function extendConnector (Y/* :any */) {
answer.os = yield * this.getOperations(m.stateSet) answer.os = yield * this.getOperations(m.stateSet)
} }
conn.send(sender, answer) conn.send(sender, answer)
if (false && conn.forwardToSyncingClients) { // still need this? was previously disabled. TODO: remove forward syncingClients
conn.syncingClients.push(sender)
setTimeout(function () {
conn.syncingClients = conn.syncingClients.filter(function (cli) {
return cli !== sender
})
conn.send(sender, {
type: 'sync done'
})
}, 5000) // TODO: conn.syncingClientDuration)
} else {
conn.send(sender, {
type: 'sync done'
})
}
}) })
}) })
} else if (message.type === 'sync step 2' && canWrite(auth)) { } else if (message.type === 'sync step 2' && canWrite(auth)) {
@ -363,18 +340,12 @@ export default function extendConnector (Y/* :any */) {
}) })
defer.resolve() defer.resolve()
}) })
return defer.promise
} else if (message.type === 'sync done') {
var self = this var self = this
this.connections.get(sender).syncStep2.promise.then(function () { this.connections.get(sender).syncStep2.promise.then(function () {
self._setSyncedWith(sender) self._setSyncedWith(sender)
}) })
return defer.promise
} else if (message.type === 'update' && canWrite(auth)) { } else if (message.type === 'update' && canWrite(auth)) {
if (this.forwardToSyncingClients) {
for (var client of this.syncingClients) {
this.send(client, message)
}
}
if (this.y.db.forwardAppliedOperations) { if (this.y.db.forwardAppliedOperations) {
var delops = message.ops.filter(function (o) { var delops = message.ops.filter(function (o) {
return o.struct === 'Delete' return o.struct === 'Delete'