LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

Remove polling, still happen on channel pages (#1558)

Browse source
This commit is contained in:
saltrafael 2022-06-09 15:43:45 -03:00 committed by GitHub
parent 54ee4ee94a
commit c38e37cd38
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ui/component/channelContent/view.jsx
View file

@ -97,7 +97,7 @@ function ChannelContent(props: Props) {
const isInitialized = Boolean(activeLivestreamForChannel) || activeLivestreamInitialized; const isInitialized = Boolean(activeLivestreamForChannel) || activeLivestreamInitialized;
const isChannelBroadcasting = Boolean(activeLivestreamForChannel); const isChannelBroadcasting = Boolean(activeLivestreamForChannel);
useFetchLiveStatus(claimId, doFetchChannelLiveStatus); useFetchLiveStatus(claimId, doFetchChannelLiveStatus, true);
const showScheduledLiveStreams = claimType !== 'collection'; // ie. not on the playlist page. const showScheduledLiveStreams = claimType !== 'collection'; // ie. not on the playlist page.

7
ui/effects/use-fetch-live.js
View file

@ -5,6 +5,7 @@ import { LIVESTREAM_STATUS_CHECK_INTERVAL_SOON, LIVESTREAM_STATUS_CHECK_INTERVAL
export default function useFetchLiveStatus( export default function useFetchLiveStatus(
channelClaimId: ?string, channelClaimId: ?string,
doFetchChannelLiveStatus: (string) => void, doFetchChannelLiveStatus: (string) => void,
poll?: boolean,
fasterPoll?: boolean fasterPoll?: boolean
) { ) {
// Find out current channels status + active live claim every 30 seconds // Find out current channels status + active live claim every 30 seconds
@ -12,12 +13,14 @@ export default function useFetchLiveStatus(
if (!channelClaimId) return; if (!channelClaimId) return;
const fetch = () => doFetchChannelLiveStatus(channelClaimId || ''); const fetch = () => doFetchChannelLiveStatus(channelClaimId || '');
const interval = fasterPoll ? LIVESTREAM_STATUS_CHECK_INTERVAL_SOON : LIVESTREAM_STATUS_CHECK_INTERVAL;
fetch(); fetch();
if (poll) {
const interval = fasterPoll ? LIVESTREAM_STATUS_CHECK_INTERVAL_SOON : LIVESTREAM_STATUS_CHECK_INTERVAL;
const intervalId = setInterval(fetch, interval); const intervalId = setInterval(fetch, interval);
return () => clearInterval(intervalId); return () => clearInterval(intervalId);
}, [channelClaimId, doFetchChannelLiveStatus, fasterPoll]); }
}, [channelClaimId, doFetchChannelLiveStatus, fasterPoll, poll]);
} }

11
ui/page/livestream/view.jsx
View file

@ -107,16 +107,7 @@ export default function LivestreamPage(props: Props) {
// eslint-disable-next-line react-hooks/exhaustive-deps // eslint-disable-next-line react-hooks/exhaustive-deps
}, []); }, []);
const claimReleaseStartingSoonStatic = () => useFetchLiveStatus(livestreamChannelId, doFetchChannelLiveStatus);
releaseTime.isBetween(moment(), moment().add(LIVESTREAM_STARTS_SOON_BUFFER, 'minutes'));
const claimReleaseStartedRecentlyStatic = () =>
releaseTime.isBetween(moment().subtract(LIVESTREAM_STARTED_RECENTLY_BUFFER, 'minutes'), moment());
// Find out current channels status + active live claim every 30 seconds (or 15 if not live)
const fasterPoll = !isCurrentClaimLive && (claimReleaseStartingSoonStatic() || claimReleaseStartedRecentlyStatic());
useFetchLiveStatus(livestreamChannelId, doFetchChannelLiveStatus, fasterPoll);
React.useEffect(() => { React.useEffect(() => {
setActiveStreamUri(!isCurrentClaimLive && isChannelBroadcasting ? activeLivestreamForChannel.claimUri : false); setActiveStreamUri(!isCurrentClaimLive && isChannelBroadcasting ? activeLivestreamForChannel.claimUri : false);

15
ui/redux/actions/livestream.js
View file

@ -10,7 +10,6 @@ import {
filterUpcomingLiveStreamClaims, filterUpcomingLiveStreamClaims,
} from 'util/livestream'; } from 'util/livestream';
import moment from 'moment'; import moment from 'moment';
import { LocalStorage, LS } from 'util/storage';
import { isEmpty } from 'util/object'; import { isEmpty } from 'util/object';
export const doFetchNoSourceClaims = (channelId: string) => async (dispatch: Dispatch, getState: GetState) => { export const doFetchNoSourceClaims = (channelId: string) => async (dispatch: Dispatch, getState: GetState) => {
@ -116,20 +115,11 @@ const findActiveStreams = async (
}; };
export const doFetchChannelLiveStatus = (channelId: string) => async (dispatch: Dispatch) => { export const doFetchChannelLiveStatus = (channelId: string) => async (dispatch: Dispatch) => {
const statusForId = LS.CHANNEL_LIVE_STATUS;
const localStatus = LocalStorage.getItem(statusForId);
try { try {
const { channelStatus, channelData } = await fetchLiveChannel(channelId); const { channelStatus, channelData } = await fetchLiveChannel(channelId);
// store live state locally, and force 2 non-live statuses before returninig NOT LIVE. This allows for the stream to finish before disposing player.
if (localStatus === LiveStatus.LIVE && channelStatus === LiveStatus.NOT_LIVE) {
LocalStorage.removeItem(statusForId);
return;
}
if (channelStatus === LiveStatus.NOT_LIVE && !localStatus) { if (channelStatus === LiveStatus.NOT_LIVE) {
dispatch({ type: ACTIONS.REMOVE_CHANNEL_FROM_ACTIVE_LIVESTREAMS, data: { channelId } }); dispatch({ type: ACTIONS.REMOVE_CHANNEL_FROM_ACTIVE_LIVESTREAMS, data: { channelId } });
LocalStorage.removeItem(statusForId);
return; return;
} }
@ -145,11 +135,8 @@ export const doFetchChannelLiveStatus = (channelId: string) => async (dispatch:
channelData[channelId].claimUri = liveClaim.stream.canonical_url; channelData[channelId].claimUri = liveClaim.stream.canonical_url;
dispatch({ type: ACTIONS.ADD_CHANNEL_TO_ACTIVE_LIVESTREAMS, data: { ...channelData } }); dispatch({ type: ACTIONS.ADD_CHANNEL_TO_ACTIVE_LIVESTREAMS, data: { ...channelData } });
} }
LocalStorage.setItem(statusForId, channelStatus);
} catch (err) { } catch (err) {
dispatch({ type: ACTIONS.REMOVE_CHANNEL_FROM_ACTIVE_LIVESTREAMS, data: { channelId } }); dispatch({ type: ACTIONS.REMOVE_CHANNEL_FROM_ACTIVE_LIVESTREAMS, data: { channelId } });
LocalStorage.removeItem(statusForId);
} }
}; };