almet/umap
1
0
Fork 0
mirror of https://github.com/umap-project/umap.git synced 2025-04-29 03:42:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix(sync): wait for websocket full connection (#2503)

Browse source 
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:
Yohan Boniface 2025-02-14 17:22:57 +01:00 committed by GitHub
commit b107de3421
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 51 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
umap/static/umap/js/modules/sync/engine.js
View file

@ -76,19 +76,20 @@ export class SyncEngine {
this.reconnect() this.reconnect()
return 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 path = this._umap.urls.get('ws_sync', { map_id: this._umap.id })
const protocol = window.location.protocol === 'http:' ? 'ws:' : 'wss:' 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}`, `${protocol}//${window.location.host}${path}`,
authToken, authToken,
this,
this.peerId, this.peerId,
this._umap.properties.user?.name this._umap.properties.user?.name
) )
this.onConnection()
} }
stop() { stop() {
@ -109,11 +110,11 @@ export class SyncEngine {
this.websocketConnected = false this.websocketConnected = false
this.updaters.map.update({ key: 'numberOfConnectedPeers' }) this.updaters.map.update({ key: 'numberOfConnectedPeers' })
this._reconnectTimeout = setTimeout(() => { this._reconnectTimeout = setTimeout(async () => {
if (this._reconnectDelay < MAX_RECONNECT_DELAY) { if (this._reconnectDelay < MAX_RECONNECT_DELAY) {
this._reconnectDelay = this._reconnectDelay * RECONNECT_DELAY_FACTOR this._reconnectDelay = this._reconnectDelay * RECONNECT_DELAY_FACTOR
} }
this.authenticate() await this.authenticate()
}, this._reconnectDelay) }, this._reconnectDelay)
} }
upsert(subject, metadata, value) { upsert(subject, metadata, value) {

8
umap/static/umap/js/modules/sync/websocket.js
View file

@ -3,14 +3,17 @@ const PING_INTERVAL = 30000
const FIRST_CONNECTION_TIMEOUT = 2000 const FIRST_CONNECTION_TIMEOUT = 2000
export class WebSocketTransport { export class WebSocketTransport {
constructor(webSocketURI, authToken, messagesReceiver, peerId, username) { constructor(messagesReceiver) {
this.receiver = messagesReceiver this.receiver = messagesReceiver
}
async connect(webSocketURI, authToken, peerId, username) {
return new Promise((resolve, reject) => {
this.websocket = new WebSocket(webSocketURI) this.websocket = new WebSocket(webSocketURI)
this.websocket.onopen = () => { this.websocket.onopen = () => {
this.send('JoinRequest', { token: authToken, peer: peerId, username }) this.send('JoinRequest', { token: authToken, peer: peerId, username })
this.receiver.onConnection() resolve(this.websocket)
} }
this.websocket.addEventListener('message', this.onMessage.bind(this)) this.websocket.addEventListener('message', this.onMessage.bind(this))
this.websocket.onclose = () => { this.websocket.onclose = () => {
@ -50,6 +53,7 @@ export class WebSocketTransport {
}, PONG_TIMEOUT) }, PONG_TIMEOUT)
} }
}, PING_INTERVAL) }, PING_INTERVAL)
})
} }
onMessage(wsMessage) { onMessage(wsMessage) {