mirror of
https://github.com/th-ch/youtube-music.git
synced 2026-01-11 18:41:47 +00:00
Fixed missing videochange dataupdated event when using shuffle (#3659)
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: rewhex <gitea@cluser.local>
This commit is contained in:
@ -12,6 +12,8 @@ import type {
|
|||||||
import type { SongInfo } from './song-info';
|
import type { SongInfo } from './song-info';
|
||||||
import type { VideoDataChanged } from '@/types/video-data-changed';
|
import type { VideoDataChanged } from '@/types/video-data-changed';
|
||||||
|
|
||||||
|
const DATAUPDATED_FALLBACK_TIMEOUT_MS = 1500;
|
||||||
|
|
||||||
let songInfo: SongInfo = {} as SongInfo;
|
let songInfo: SongInfo = {} as SongInfo;
|
||||||
export const getSongInfo = () => songInfo;
|
export const getSongInfo = () => songInfo;
|
||||||
|
|
||||||
@ -253,12 +255,25 @@ export const setupSongInfo = (api: YoutubePlayer) => {
|
|||||||
);
|
);
|
||||||
|
|
||||||
const waitingEvent = new Set<string>();
|
const waitingEvent = new Set<string>();
|
||||||
|
const waitingTimeouts = new Map<string, NodeJS.Timeout>();
|
||||||
|
|
||||||
|
const clearVideoTimeout = (videoId: string) => {
|
||||||
|
const timeoutId = waitingTimeouts.get(videoId);
|
||||||
|
|
||||||
|
if (timeoutId) {
|
||||||
|
clearTimeout(timeoutId);
|
||||||
|
waitingTimeouts.delete(videoId);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
// Name = "dataloaded" and abit later "dataupdated"
|
// Name = "dataloaded" and abit later "dataupdated"
|
||||||
|
// Sometimes "dataupdated" is not fired, so we need to fallback to "dataloaded"
|
||||||
api.addEventListener('videodatachange', (name, videoData) => {
|
api.addEventListener('videodatachange', (name, videoData) => {
|
||||||
videoEventDispatcher(name, videoData);
|
videoEventDispatcher(name, videoData);
|
||||||
|
|
||||||
if (name === 'dataupdated' && waitingEvent.has(videoData.videoId)) {
|
if (name === 'dataupdated' && waitingEvent.has(videoData.videoId)) {
|
||||||
waitingEvent.delete(videoData.videoId);
|
waitingEvent.delete(videoData.videoId);
|
||||||
|
clearVideoTimeout(videoData.videoId);
|
||||||
sendSongInfo(videoData);
|
sendSongInfo(videoData);
|
||||||
} else if (name === 'dataloaded') {
|
} else if (name === 'dataloaded') {
|
||||||
const video = document.querySelector<HTMLVideoElement>('video');
|
const video = document.querySelector<HTMLVideoElement>('video');
|
||||||
@ -269,7 +284,18 @@ export const setupSongInfo = (api: YoutubePlayer) => {
|
|||||||
video?.addEventListener(status, playPausedHandlers[status]);
|
video?.addEventListener(status, playPausedHandlers[status]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
clearVideoTimeout(videoData.videoId);
|
||||||
waitingEvent.add(videoData.videoId);
|
waitingEvent.add(videoData.videoId);
|
||||||
|
|
||||||
|
const timeoutId = setTimeout(() => {
|
||||||
|
if (waitingEvent.has(videoData.videoId)) {
|
||||||
|
waitingEvent.delete(videoData.videoId);
|
||||||
|
waitingTimeouts.delete(videoData.videoId);
|
||||||
|
sendSongInfo(videoData);
|
||||||
|
}
|
||||||
|
}, DATAUPDATED_FALLBACK_TIMEOUT_MS);
|
||||||
|
|
||||||
|
waitingTimeouts.set(videoData.videoId, timeoutId);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user