mirror of
https://github.com/umap-project/umap.git
synced 2025-04-28 19:42:36 +02:00
fix(sync): wait for websocket full connection
Websocket has now a "connect" method, which is a promise, that yields "onconnect", so the engine can wait for it before proceding.
This commit is contained in:
parent
1ce491a70c
commit
414cc805c2
2 changed files with 51 additions and 46 deletions
|
@ -75,19 +75,20 @@ export class SyncEngine {
|
|||
this.reconnect()
|
||||
return
|
||||
}
|
||||
this.start(response.token)
|
||||
await this.start(response.token)
|
||||
}
|
||||
|
||||
start(authToken) {
|
||||
async start(authToken) {
|
||||
const path = this._umap.urls.get('ws_sync', { map_id: this._umap.id })
|
||||
const protocol = window.location.protocol === 'http:' ? 'ws:' : 'wss:'
|
||||
this.transport = new WebSocketTransport(
|
||||
this.transport = new WebSocketTransport(this)
|
||||
await this.transport.connect(
|
||||
`${protocol}//${window.location.host}${path}`,
|
||||
authToken,
|
||||
this,
|
||||
this.peerId,
|
||||
this._umap.properties.user?.name
|
||||
)
|
||||
this.onConnection()
|
||||
}
|
||||
|
||||
stop() {
|
||||
|
@ -108,11 +109,11 @@ export class SyncEngine {
|
|||
this.websocketConnected = false
|
||||
this.updaters.map.update({ key: 'numberOfConnectedPeers' })
|
||||
|
||||
this._reconnectTimeout = setTimeout(() => {
|
||||
this._reconnectTimeout = setTimeout(async () => {
|
||||
if (this._reconnectDelay < MAX_RECONNECT_DELAY) {
|
||||
this._reconnectDelay = this._reconnectDelay * RECONNECT_DELAY_FACTOR
|
||||
}
|
||||
this.authenticate()
|
||||
await this.authenticate()
|
||||
}, this._reconnectDelay)
|
||||
}
|
||||
upsert(subject, metadata, value) {
|
||||
|
|
|
@ -3,14 +3,17 @@ const PING_INTERVAL = 30000
|
|||
const FIRST_CONNECTION_TIMEOUT = 2000
|
||||
|
||||
export class WebSocketTransport {
|
||||
constructor(webSocketURI, authToken, messagesReceiver, peerId, username) {
|
||||
constructor(messagesReceiver) {
|
||||
this.receiver = messagesReceiver
|
||||
}
|
||||
|
||||
async connect(webSocketURI, authToken, peerId, username) {
|
||||
return new Promise((resolve, reject) => {
|
||||
this.websocket = new WebSocket(webSocketURI)
|
||||
|
||||
this.websocket.onopen = () => {
|
||||
this.send('JoinRequest', { token: authToken, peer: peerId, username })
|
||||
this.receiver.onConnection()
|
||||
resolve(this.websocket)
|
||||
}
|
||||
this.websocket.addEventListener('message', this.onMessage.bind(this))
|
||||
this.websocket.onclose = () => {
|
||||
|
@ -50,6 +53,7 @@ export class WebSocketTransport {
|
|||
}, PONG_TIMEOUT)
|
||||
}
|
||||
}, PING_INTERVAL)
|
||||
})
|
||||
}
|
||||
|
||||
onMessage(wsMessage) {
|
||||
|
|
Loading…
Reference in a new issue