Add error boundary to player. For #2811

This commit is contained in:
Gabe Kangas
2023-03-12 22:52:04 -07:00
parent 868893340e
commit 11a11e64ad

View File

@@ -3,6 +3,7 @@ import { useRecoilState, useRecoilValue } from 'recoil';
import { useHotkeys } from 'react-hotkeys-hook'; import { useHotkeys } from 'react-hotkeys-hook';
import { VideoJsPlayerOptions } from 'video.js'; import { VideoJsPlayerOptions } from 'video.js';
import classNames from 'classnames'; import classNames from 'classnames';
import { ErrorBoundary } from 'react-error-boundary';
import { VideoJS } from '../VideoJS/VideoJS'; import { VideoJS } from '../VideoJS/VideoJS';
import ViewerPing from '../viewer-ping'; import ViewerPing from '../viewer-ping';
import { VideoPoster } from '../VideoPoster/VideoPoster'; import { VideoPoster } from '../VideoPoster/VideoPoster';
@@ -13,6 +14,7 @@ import createVideoSettingsMenuButton from '../settings-menu';
import LatencyCompensator from '../latencyCompensator'; import LatencyCompensator from '../latencyCompensator';
import styles from './OwncastPlayer.module.scss'; import styles from './OwncastPlayer.module.scss';
import { VideoSettingsServiceContext } from '../../../services/video-settings-service'; import { VideoSettingsServiceContext } from '../../../services/video-settings-service';
import { ComponentError } from '../../ui/ComponentError/ComponentError';
const PLAYER_VOLUME = 'owncast_volume'; const PLAYER_VOLUME = 'owncast_volume';
const LATENCY_COMPENSATION_ENABLED = 'latencyCompensatorEnabled'; const LATENCY_COMPENSATION_ENABLED = 'latencyCompensatorEnabled';
@@ -300,6 +302,16 @@ export const OwncastPlayer: FC<OwncastPlayerProps> = ({
); );
return ( return (
<ErrorBoundary
// eslint-disable-next-line react/no-unstable-nested-components
fallbackRender={({ error, resetErrorBoundary }) => (
<ComponentError
componentName="OwncastPlayer"
message={error.message}
retryFunction={resetErrorBoundary}
/>
)}
>
<div className={classNames(styles.container, className)} id="player"> <div className={classNames(styles.container, className)} id="player">
{online && ( {online && (
<div className={styles.player}> <div className={styles.player}>
@@ -312,6 +324,7 @@ export const OwncastPlayer: FC<OwncastPlayerProps> = ({
)} )}
</div> </div>
</div> </div>
</ErrorBoundary>
); );
}; };
export default OwncastPlayer; export default OwncastPlayer;