GithubBackup/Foxel
1
0
Fork 0
mirror of https://github.com/DrizzleTime/Foxel.git synced 2026-08-28 19:46:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: refactor VideoRoomPage by removing unused components and optimizing state management

Browse Source
This commit is contained in:
shiyu
2026-05-16 13:55:51 +08:00
parent 6cfafbe066
commit 2af2a8756f
2 changed files with 24 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/src/pages/VideoRoomPage.css
-114
View File
@@ -61,9 +61,6 @@
} }
.video-room-shell { .video-room-shell {
display: grid;
grid-template-columns: minmax(0, 1fr) 360px;
gap: 18px;
max-width: 1720px; max-width: 1720px;
margin: 0 auto; margin: 0 auto;
} }
@@ -100,113 +97,6 @@
color: var(--ant-color-primary, #1677ff); color: var(--ant-color-primary, #1677ff);
} }
.video-room-side {
display: flex;
flex-direction: column;
gap: 14px;
min-width: 0;
}
.video-room-panel.ant-card {
border-color: rgba(255, 255, 255, 0.08);
background: #14191d;
}
.video-room-panel .ant-card-head {
min-height: 48px;
border-bottom-color: rgba(255, 255, 255, 0.08);
}
.video-room-panel .ant-card-head-title {
color: rgba(255, 255, 255, 0.9);
font-weight: 600;
}
.video-room-panel .ant-card-body {
padding: 16px;
}
.video-room-dot {
display: block;
width: 8px;
height: 8px;
border-radius: 999px;
background: var(--ant-color-error, #ff4d4f);
box-shadow: 0 0 0 4px rgba(255, 77, 79, 0.14);
}
.video-room-dot.is-connected {
background: var(--ant-color-success, #52c41a);
box-shadow: 0 0 0 4px rgba(82, 196, 26, 0.14);
}
.video-room-status-list {
display: flex;
flex-direction: column;
gap: 10px;
margin-bottom: 16px;
}
.video-room-status-item {
display: flex;
align-items: center;
gap: 12px;
min-width: 0;
padding: 12px;
border: 1px solid rgba(255, 255, 255, 0.06);
border-radius: 8px;
background: rgba(255, 255, 255, 0.03);
}
.video-room-status-item > .anticon {
flex: none;
color: var(--ant-color-primary, #1677ff);
font-size: 18px;
}
.video-room-status-item div {
min-width: 0;
}
.video-room-status-item span {
display: block;
margin-bottom: 2px;
color: rgba(255, 255, 255, 0.45);
font-size: 12px;
}
.video-room-status-item strong {
display: block;
overflow: hidden;
color: rgba(255, 255, 255, 0.88);
font-size: 14px;
font-weight: 600;
text-overflow: ellipsis;
white-space: nowrap;
}
.video-room-primary-action.ant-btn {
height: 40px;
}
.video-room-panel__text {
margin: 0 0 14px;
color: rgba(255, 255, 255, 0.55);
font-size: 14px;
line-height: 1.6;
}
@media (max-width: 1180px) {
.video-room-shell {
grid-template-columns: 1fr;
}
.video-room-side {
display: grid;
grid-template-columns: repeat(2, minmax(0, 1fr));
}
}
@media (max-width: 760px) { @media (max-width: 760px) {
.video-room-page { .video-room-page {
padding: 14px; padding: 14px;
@@ -231,8 +121,4 @@
height: 56vh; height: 56vh;
min-height: 280px; min-height: 280px;
} }
.video-room-side {
display: flex;
}
} }
web/src/pages/VideoRoomPage.tsx
+24 -64
View File
@@ -1,15 +1,10 @@
import { memo, useEffect, useRef, useState } from 'react'; import { memo, useEffect, useRef, useState } from 'react';
import { useParams } from 'react-router'; import { useParams } from 'react-router';
import { Button, Card, Empty, Space, Spin, Tag, Tooltip, Typography, message } from 'antd'; import { Button, Empty, Space, Spin, Tag, Tooltip, Typography, message } from 'antd';
import { import {
CheckCircleFilled, CheckCircleFilled,
ClockCircleOutlined,
CopyOutlined,
DisconnectOutlined, DisconnectOutlined,
FileTextOutlined,
LinkOutlined, LinkOutlined,
PlayCircleOutlined,
ReloadOutlined,
} from '@ant-design/icons'; } from '@ant-design/icons';
import Artplayer from 'artplayer'; import Artplayer from 'artplayer';
import { videoRoomsApi, type VideoRoomInfo, type VideoRoomState } from '../api/videoRooms'; import { videoRoomsApi, type VideoRoomInfo, type VideoRoomState } from '../api/videoRooms';
@@ -20,6 +15,16 @@ const { Text, Title } = Typography;
const SYNC_THRESHOLD = 1.2; const SYNC_THRESHOLD = 1.2;
function getSyncedTime(state: VideoRoomState) {
const baseTime = Math.max(0, Number(state.current_time) || 0);
if (state.paused || !state.updated_at) return baseTime;
const updatedAt = Date.parse(state.updated_at);
if (Number.isNaN(updatedAt)) return baseTime;
return baseTime + Math.max(0, (Date.now() - updatedAt) / 1000);
}
function formatTime(seconds: number) { function formatTime(seconds: number) {
const safeSeconds = Math.max(0, Math.floor(seconds || 0)); const safeSeconds = Math.max(0, Math.floor(seconds || 0));
const hours = Math.floor(safeSeconds / 3600); const hours = Math.floor(safeSeconds / 3600);
@@ -43,6 +48,7 @@ const VideoRoomPage = memo(function VideoRoomPage() {
const wsRef = useRef<WebSocket | null>(null); const wsRef = useRef<WebSocket | null>(null);
const applyingRemoteRef = useRef(false); const applyingRemoteRef = useRef(false);
const sendTimerRef = useRef<number | null>(null); const sendTimerRef = useRef<number | null>(null);
const liveStateRef = useRef<VideoRoomState | null>(null);
const [room, setRoom] = useState<VideoRoomInfo | null>(null); const [room, setRoom] = useState<VideoRoomInfo | null>(null);
const [liveState, setLiveState] = useState<VideoRoomState | null>(null); const [liveState, setLiveState] = useState<VideoRoomState | null>(null);
const [loading, setLoading] = useState(true); const [loading, setLoading] = useState(true);
@@ -58,6 +64,7 @@ const VideoRoomPage = memo(function VideoRoomPage() {
if (!mounted) return; if (!mounted) return;
setRoom(data); setRoom(data);
setLiveState(data.state); setLiveState(data.state);
liveStateRef.current = data.state;
}) })
.catch((e: any) => { .catch((e: any) => {
if (!mounted) return; if (!mounted) return;
@@ -100,10 +107,11 @@ const VideoRoomPage = memo(function VideoRoomPage() {
const applyState = (state: VideoRoomState) => { const applyState = (state: VideoRoomState) => {
const art = artInstance.current; const art = artInstance.current;
liveStateRef.current = state;
setLiveState(state); setLiveState(state);
if (!art) return; if (!art) return;
const video = art.video; const video = art.video;
const targetTime = Math.max(0, Number(state.current_time) || 0); const targetTime = getSyncedTime(state);
applyingRemoteRef.current = true; applyingRemoteRef.current = true;
if (Math.abs((video.currentTime || 0) - targetTime) > SYNC_THRESHOLD) { if (Math.abs((video.currentTime || 0) - targetTime) > SYNC_THRESHOLD) {
video.currentTime = targetTime; video.currentTime = targetTime;
@@ -119,6 +127,10 @@ const VideoRoomPage = memo(function VideoRoomPage() {
}, 250); }, 250);
}; };
const applyLatestState = () => {
applyState(liveStateRef.current || room.state);
};
const art = new Artplayer({ const art = new Artplayer({
container: artRef.current, container: artRef.current,
url: videoRoomsApi.streamUrl(token), url: videoRoomsApi.streamUrl(token),
@@ -131,7 +143,9 @@ const VideoRoomPage = memo(function VideoRoomPage() {
}); });
artInstance.current = art; artInstance.current = art;
art.on('ready', () => applyState(room.state)); art.on('ready', applyLatestState);
art.video.addEventListener('loadedmetadata', applyLatestState);
art.video.addEventListener('canplay', applyLatestState);
art.on('play', sendStateSoon); art.on('play', sendStateSoon);
art.on('pause', sendStateSoon); art.on('pause', sendStateSoon);
art.on('seek', sendStateSoon); art.on('seek', sendStateSoon);
@@ -157,6 +171,8 @@ const VideoRoomPage = memo(function VideoRoomPage() {
window.clearTimeout(sendTimerRef.current); window.clearTimeout(sendTimerRef.current);
sendTimerRef.current = null; sendTimerRef.current = null;
} }
art.video.removeEventListener('loadedmetadata', applyLatestState);
art.video.removeEventListener('canplay', applyLatestState);
ws.close(); ws.close();
art.destroy(); art.destroy();
wsRef.current = null; wsRef.current = null;
@@ -169,18 +185,6 @@ const VideoRoomPage = memo(function VideoRoomPage() {
message.success(t('Copied to clipboard')); message.success(t('Copied to clipboard'));
}; };
const handleResync = () => {
if (!liveState) return;
const art = artInstance.current;
if (!art) return;
art.video.currentTime = Math.max(0, Number(liveState.current_time) || 0);
if (liveState.paused) {
void art.video.pause();
} else {
void art.video.play().catch(() => undefined);
}
};
if (loading) { if (loading) {
return ( return (
<div className="video-room-page video-room-page--center"> <div className="video-room-page video-room-page--center">
@@ -238,50 +242,6 @@ const VideoRoomPage = memo(function VideoRoomPage() {
<span>{t('Playback state is shared in this room')}</span> <span>{t('Playback state is shared in this room')}</span>
</div> </div>
</section> </section>
<aside className="video-room-side">
<Card
className="video-room-panel"
title={t('Room status')}
extra={<span className={connected ? 'video-room-dot is-connected' : 'video-room-dot'} />}
>
<div className="video-room-status-list">
<div className="video-room-status-item">
<PlayCircleOutlined />
<div>
<span>{t('Playback')}</span>
<strong>{state.paused ? t('Paused') : t('Playing')}</strong>
</div>
</div>
<div className="video-room-status-item">
<ClockCircleOutlined />
<div>
<span>{t('Current position')}</span>
<strong>{formatTime(state.current_time)}</strong>
</div>
</div>
<div className="video-room-status-item">
<FileTextOutlined />
<div>
<span>{t('File')}</span>
<strong title={room.path}>{fileName}</strong>
</div>
</div>
</div>
<Button block className="video-room-primary-action" icon={<ReloadOutlined />} onClick={handleResync}>
{t('Resync playback')}
</Button>
</Card>
<Card className="video-room-panel" title={t('Room link')}>
<p className="video-room-panel__text">
{t('Share this room link with friends')}
</p>
<Button block icon={<CopyOutlined />} onClick={handleCopy}>
{t('Copy Link')}
</Button>
</Card>
</aside>
</main> </main>
</div> </div>
); );