Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
013fee2421 | ||
|
|
bb45abbb70 | ||
|
|
67b47fd868 |
2
package-lock.json
generated
2
package-lock.json
generated
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "yjs",
|
"name": "yjs",
|
||||||
"version": "13.0.0-6",
|
"version": "13.0.0-7",
|
||||||
"lockfileVersion": 1,
|
"lockfileVersion": 1,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"acorn": {
|
"acorn": {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "yjs",
|
"name": "yjs",
|
||||||
"version": "13.0.0-6",
|
"version": "13.0.0-7",
|
||||||
"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",
|
||||||
|
|||||||
@@ -269,17 +269,20 @@ export default function extendConnector (Y/* :any */) {
|
|||||||
})
|
})
|
||||||
return Promise.reject(new Error('Incompatible protocol version'))
|
return Promise.reject(new Error('Incompatible protocol version'))
|
||||||
}
|
}
|
||||||
if (message.type === 'sync step 1' && this.connections[sender] != null && this.connections[sender].auth == null) {
|
if ((message.type === 'sync step 1' || message.type === 'sync step 2') && this.connections[sender] != null && this.connections[sender].auth == null) {
|
||||||
// authenticate using auth in message
|
// authenticate using auth in message
|
||||||
var auth = this.checkAuth(message.auth, this.y)
|
var auth = this.checkAuth(message.auth, this.y)
|
||||||
this.connections[sender].auth = auth
|
this.connections[sender].auth = auth
|
||||||
auth.then(auth => {
|
auth.then(auth => {
|
||||||
// in case operations were received before sender was received
|
// in case operations were received before sender was received
|
||||||
// we apply the messages after authentication
|
// we apply the messages after authentication
|
||||||
this.connections[sender].waitingMessages.forEach(msg => {
|
this.connections[sender].syncStep2.promise.then(() => {
|
||||||
this.receiveMessage(sender, msg)
|
// we do it after sync step 1
|
||||||
|
this.connections[sender].waitingMessages.forEach(msg => {
|
||||||
|
this.receiveMessage(sender, msg)
|
||||||
|
})
|
||||||
|
this.connections[sender].waitingMessages = null
|
||||||
})
|
})
|
||||||
this.connections[sender].waitingMessages = null
|
|
||||||
for (var f of this.userEventListeners) {
|
for (var f of this.userEventListeners) {
|
||||||
f({
|
f({
|
||||||
action: 'userAuthenticated',
|
action: 'userAuthenticated',
|
||||||
@@ -389,7 +392,7 @@ export default function extendConnector (Y/* :any */) {
|
|||||||
})
|
})
|
||||||
} else if (this.connections[sender] != null) {
|
} else if (this.connections[sender] != null) {
|
||||||
// wait for authentication
|
// wait for authentication
|
||||||
let senderConn = this.connection[sender]
|
let senderConn = this.connections[sender]
|
||||||
senderConn.waitingMessages = senderConn.waitingMessages || []
|
senderConn.waitingMessages = senderConn.waitingMessages || []
|
||||||
senderConn.waitingMessages.push(message)
|
senderConn.waitingMessages.push(message)
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
1
y.node.js.map
Normal file
1
y.node.js.map
Normal file
File diff suppressed because one or more lines are too long
1
y.test.js.map
Normal file
1
y.test.js.map
Normal file
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user