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

Merge e666f02b88 into fb6df6f955

Browse source
This commit is contained in:
Yohan Boniface 2025-02-12 10:11:16 +01:00 committed by GitHub
commit 97c9f9ed88
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,3 +1,6 @@
import { uMapAlert as Alert } from '../../components/alerts/alert.js'
import { translate } from '../i18n.js'
const PONG_TIMEOUT = 5000 const PONG_TIMEOUT = 5000
const PING_INTERVAL = 30000 const PING_INTERVAL = 30000
const FIRST_CONNECTION_TIMEOUT = 2000 const FIRST_CONNECTION_TIMEOUT = 2000
@ -14,15 +17,20 @@ export class WebSocketTransport {
} }
this.websocket.addEventListener('message', this.onMessage.bind(this)) this.websocket.addEventListener('message', this.onMessage.bind(this))
this.websocket.onclose = () => { this.websocket.onclose = () => {
console.log('websocket closed') console.debug('websocket closed')
if (!this.receiver.closeRequested) { if (!this.receiver.closeRequested) {
console.log('Not requested, reconnecting...') Alert.info(
translate(
'This map has enabled real-time synchronization with other users, but you are currently disconnected. We will try to reconnect in the background and reconcile with other users, but this feature is still experimental, and you might lose data. Have fun!'
)
)
console.debug('Not requested, reconnecting...')
this.receiver.reconnect() this.receiver.reconnect()
} }
} }
this.websocket.onerror = (error) => { this.websocket.onerror = (error) => {
console.log('WS ERROR', error) console.debug('WS ERROR', error)
} }
this.ensureOpen = setInterval(() => { this.ensureOpen = setInterval(() => {
@ -38,7 +46,7 @@ export class WebSocketTransport {
// See https://making.close.com/posts/reliable-websockets/ for more details. // See https://making.close.com/posts/reliable-websockets/ for more details.
this.pingInterval = setInterval(() => { this.pingInterval = setInterval(() => {
if (this.websocket.readyState === WebSocket.OPEN) { if (this.websocket.readyState === WebSocket.OPEN) {
console.log('sending ping') console.debug('sending ping')
this.websocket.send('ping') this.websocket.send('ping')
this.pongReceived = false this.pongReceived = false
setTimeout(() => { setTimeout(() => {
@ -68,7 +76,7 @@ export class WebSocketTransport {
} }
close() { close() {
console.log('Closing') console.debug('Closing')
this.receiver.closeRequested = true this.receiver.closeRequested = true
this.websocket.close() this.websocket.close()
} }