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

remove all async-functions - making it compatible with node 6

Browse Source
This commit is contained in:
Kevin Jahns
2017-08-01 16:15:36 +02:00
parent fed77d532f
commit 65e8c29b33
4 changed files with 37 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/Connector.js
View File

@@ -220,7 +220,7 @@ export default function extendConnector (Y/* :any */) {
/*
You received a raw message, and you know that it is intended for Yjs. Then call this function.
*/
async receiveMessage (sender, buffer) {
receiveMessage (sender, buffer) {
if (!(buffer instanceof ArrayBuffer || buffer instanceof Uint8Array)) {
throw new Error('Expected Message to be an ArrayBuffer or Uint8Array!')
}
@@ -244,31 +244,29 @@ export default function extendConnector (Y/* :any */) {
if (messageType === 'sync step 1' || messageType === 'sync step 2') {
let auth = decoder.readVarUint()
if (senderConn.auth == null) {
senderConn.processAfterAuth.push([sender, buffer])
// check auth
let authPermissions = await this.checkAuth(auth, this.y, sender)
senderConn.auth = authPermissions
this.y.emit('userAuthenticated', {
user: senderConn.uid,
auth: authPermissions
})
senderConn.syncStep2.promise.then(() => {
return this.checkAuth(auth, this.y, sender).then(authPermissions => {
senderConn.auth = authPermissions
this.y.emit('userAuthenticated', {
user: senderConn.uid,
auth: authPermissions
})
return senderConn.syncStep2.promise
}).then(() => {
if (senderConn.processAfterAuth == null) {
return
}
for (let i = 0; i < senderConn.processAfterAuth.length; i++) {
let m = senderConn.processAfterAuth[i]
this.receiveMessage(m[0], m[1])
return Promise.resolve()
}
let messages = senderConn.processAfterAuth
senderConn.processAfterAuth = null
return Promise.all(messages.map(m =>
this.receiveMessage(m[0], m[1])
))
})
}
}
if (senderConn.auth == null) {
senderConn.processAfterAuth.push([sender, buffer])
return
}
if (messageType === 'sync step 1' && (senderConn.auth === 'write' || senderConn.auth === 'read')) {
// cannot wait for sync step 1 to finish, because we may wait for sync step 2 in sync step 1 (->lock)
computeMessageSyncStep1(decoder, encoder, this, senderConn, sender)
@@ -278,7 +276,7 @@ export default function extendConnector (Y/* :any */) {
} else if (messageType === 'update' && senderConn.auth === 'write') {
return computeMessageUpdate(decoder, encoder, this, senderConn, sender)
} else {
console.error('Unable to receive message')
Promise.reject('Unable to receive message')
}
}
_setSyncedWith (user) {