mirrors
/
navidrome
mirror of https://github.com/navidrome/navidrome.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix another possible race condition

This commit is contained in:
Deluan 2020-12-13 20:17:20 -05:00
parent f2fd7ed016
commit ea09629803
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ui/src/eventStream.js
View File

@ -12,7 +12,8 @@ let dispatch = null
let timeout = null
const getEventStream = async () => {
if (es === null) {
if (!es) {
// Call `keepalive` to refresh the jwt token
await httpClient(`${REST_URL}/keepalive/eventSource`)
es = new EventSource(
baseUrl(`${REST_URL}/events?jwt=${localStorage.getItem('token')}`)
@ -24,15 +25,15 @@ const getEventStream = async () => {
// Reestablish the event stream after 20 secs of inactivity
const setTimeout = (value) => {
currentIntervalCheck = value
if (timeout != null) {
if (timeout) {
window.clearTimeout(timeout)
}
timeout = window.setTimeout(() => {
if (es != null) {
timeout = window.setTimeout(async () => {
if (es) {
es.close()
}
es = null
startEventStream(dispatch)
await startEventStream(dispatch)
}, currentIntervalCheck)
}
@ -41,7 +42,7 @@ const stopEventStream = () => {
es.close()
}
es = null
if (timeout != null) {
if (timeout) {
window.clearTimeout(timeout)
}
timeout = null