implement timeout for creating Yjs instance

This commit is contained in:
Kevin Jahns 2017-08-14 15:39:17 +02:00
parent 86c46cf0ec
commit e16195cb54
2 changed files with 16 additions and 3 deletions

View File

@ -12,17 +12,20 @@ Y({
connector: { connector: {
name: 'websockets-client', name: 'websockets-client',
room: 'Textarea-example', room: 'Textarea-example',
url: url || 'http://127.0.0.1:1234' url: 'https://yjs-v13.herokuapp.com/'
}, },
sourceDir: '/bower_components', sourceDir: '/bower_components',
share: { share: {
textarea: 'Text', // y.share.textarea is of type Y.Text textarea: 'Text', // y.share.textarea is of type Y.Text
test: 'Array' test: 'Array'
} },
timeout: 5000 // reject if no connection was established within 5 seconds
}).then(function (y) { }).then(function (y) {
window.yTextarea = y window.yTextarea = y
// bind the textarea to a shared text element // bind the textarea to a shared text element
y.share.textarea.bind(document.getElementById('textfield')) y.share.textarea.bind(document.getElementById('textfield'))
// thats it.. // thats it..
}).catch(() => {
console.log('Something went wrong while creating the instance..')
}) })

View File

@ -139,10 +139,20 @@ export default function Y (opts/* :YOptions */) /* :Promise<YConfig> */ {
opts.share = Y.utils.copyObject(opts.share) opts.share = Y.utils.copyObject(opts.share)
Y.requestModules(modules).then(function () { Y.requestModules(modules).then(function () {
var yconfig = new YConfig(opts) var yconfig = new YConfig(opts)
let resolved = false
if (opts.timeout != null && opts.timeout >= 0) {
setTimeout(function () {
if (!resolved) {
reject(new Error('Yjs init timeout'))
yconfig.destroy()
}
}, opts.timeout)
}
yconfig.db.whenUserIdSet(function () { yconfig.db.whenUserIdSet(function () {
yconfig.init(function () { yconfig.init(function () {
resolved = true
resolve(yconfig) resolve(yconfig)
}) }, reject)
}) })
}).catch(reject) }).catch(reject)
} }