Salastil/streamwall
1
0
Fork 0
mirror of https://github.com/streamwall/streamwall.git synced 2026-01-27 23:42:49 -05:00
Code Issues Packages Projects Releases Wiki Activity

Improve handling of disconnected Streamdelay server

Browse Source
This commit is contained in:
Max Goodhart
2020-06-30 17:23:16 -07:00
parent cc79f387fd
commit cc14f2a17f
3 changed files with 33 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/web/control.js
View File

@@ -22,7 +22,9 @@ function App({ wsEndpoint }) {
const [streams, setStreams] = useState([])
const [customStreams, setCustomStreams] = useState([])
const [stateIdxMap, setStateIdxMap] = useState(new Map())
const [delayState, setDelayState] = useState(false)
const [delayState, setDelayState] = useState({
isConnected: false,
})
const allStreams = sortBy([...streams, ...customStreams], ['_id'])
useEffect(() => {
@@ -70,7 +72,7 @@ function App({ wsEndpoint }) {
setStreams(newStreams)
setCustomStreams(newCustomStreams)
setDelayState(
streamdelay && {
streamdelay.isConnected && {
...streamdelay,
state: State.from(streamdelay.state),
},
@@ -228,12 +230,10 @@ function App({ wsEndpoint }) {
<div>
connection status: {isConnected ? 'connected' : 'connecting...'}
</div>
{delayState !== false && (
<StreamDelayBox
delayState={delayState}
setStreamCensored={setStreamCensored}
/>
)}
<StreamDelayBox
delayState={delayState}
setStreamCensored={setStreamCensored}
/>
<StyledDataContainer isConnected={isConnected}>
<div>
{range(0, GRID_COUNT).map((y) => (
@@ -304,12 +304,14 @@ function StreamDelayBox({ delayState, setStreamCensored }) {
setStreamCensored(!delayState.isCensored)
}, [delayState.isCensored, setStreamCensored])
let buttonText
if (delayState.state.matches('censorship.censored.deactivating')) {
buttonText = 'Deactivating...'
} else if (delayState.isCensored) {
buttonText = 'Uncensor stream'
} else {
buttonText = 'Censor stream'
if (delayState.isConnected) {
if (delayState.state.matches('censorship.censored.deactivating')) {
buttonText = 'Deactivating...'
} else if (delayState.isCensored) {
buttonText = 'Uncensor stream'
} else {
buttonText = 'Censor stream'
}
}
return (
<div>
@@ -317,15 +319,17 @@ function StreamDelayBox({ delayState, setStreamCensored }) {
<strong>Streamdelay</strong>
<span>{delayState.isConnected ? 'connected' : 'connecting...'}</span>
{delayState.isConnected && (
<span>delay: {delayState.delaySeconds}s</span>
<>
<span>delay: {delayState.delaySeconds}s</span>
<StyledToggleButton
isActive={delayState.isCensored}
onClick={handleToggleStreamCensored}
tabIndex={1}
>
{buttonText}
</StyledToggleButton>
</>
)}
<StyledToggleButton
isActive={delayState.isCensored}
onClick={handleToggleStreamCensored}
tabIndex={1}
>
{buttonText}
</StyledToggleButton>
</StyledStreamDelayBox>
</div>
)