mirror of
https://github.com/navidrome/navidrome.git
synced 2025-04-15 19:50:37 +03:00
Connect eventStream after login
This commit is contained in:
parent
9fe978953c
commit
9892524ab8
@ -29,7 +29,7 @@ import {
|
||||
import createAdminStore from './store/createAdminStore'
|
||||
import { i18nProvider } from './i18n'
|
||||
import config from './config'
|
||||
import { startEventStream } from './eventStream'
|
||||
import { setDispatch, startEventStream } from './eventStream'
|
||||
import { keyMap } from './hotkeys'
|
||||
import useChangeThemeColor from './useChangeThemeColor'
|
||||
|
||||
@ -69,10 +69,8 @@ const Admin = (props) => {
|
||||
useChangeThemeColor()
|
||||
useEffect(() => {
|
||||
if (config.devActivityPanel) {
|
||||
authProvider
|
||||
.checkAuth()
|
||||
.then(() => startEventStream(adminStore.dispatch))
|
||||
.catch(() => {}) // ignore if not logged in
|
||||
setDispatch(adminStore.dispatch)
|
||||
authProvider.checkAuth().then(() => startEventStream(adminStore.dispatch))
|
||||
}
|
||||
}, [])
|
||||
|
||||
|
@ -35,7 +35,7 @@ const setTimeout = (value) => {
|
||||
es.close()
|
||||
}
|
||||
es = null
|
||||
await startEventStream(dispatch)
|
||||
await startEventStream()
|
||||
}, currentIntervalCheck)
|
||||
}
|
||||
|
||||
@ -50,6 +50,10 @@ const stopEventStream = () => {
|
||||
timeout = null
|
||||
}
|
||||
|
||||
const setDispatch = (dispatchFunc) => {
|
||||
dispatch = dispatchFunc
|
||||
}
|
||||
|
||||
const eventHandler = (event) => {
|
||||
const data = JSON.parse(event.data)
|
||||
if (event.type !== 'keepAlive') {
|
||||
@ -60,12 +64,10 @@ const eventHandler = (event) => {
|
||||
|
||||
const throttledEventHandler = throttle(eventHandler, 100, { trailing: true })
|
||||
|
||||
const startEventStream = async (dispatchFunc) => {
|
||||
dispatch = dispatchFunc
|
||||
const startEventStream = async () => {
|
||||
setTimeout(currentIntervalCheck)
|
||||
if (!localStorage.getItem('is-authenticated')) {
|
||||
console.log('Cannot create a unauthenticated EventSource connection')
|
||||
return Promise.reject()
|
||||
return Promise.resolve()
|
||||
}
|
||||
return getEventStream()
|
||||
.then((newStream) => {
|
||||
@ -85,4 +87,4 @@ const startEventStream = async (dispatchFunc) => {
|
||||
})
|
||||
}
|
||||
|
||||
export { startEventStream, stopEventStream }
|
||||
export { setDispatch, startEventStream, stopEventStream }
|
||||
|
Loading…
x
Reference in New Issue
Block a user