Sakurai/poke
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix stuff + add stuff

Browse Source
This commit is contained in:
ashley 2025-10-06 12:36:13 +02:00
parent 9acb67bd1c
commit b30ca97ef7
1 changed files with 41 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
css/player-base.js
View File

@ -2,8 +2,8 @@
var _yt_player = videojs; var _yt_player = videojs;
var versionclient = "youtube.player.web_20250917_22_RC00" var versionclient = "youtube.player.web_20250917_22_RC00"
document.addEventListener("DOMContentLoaded", () => { document.addEventListener("DOMContentLoaded", () => {
// video.js 8 init - source can be seen in https://poketube.fun/static/vjs.min.js or the vjs.min.js file // video.js 8 init - source can be seen in https://poketube.fun/static/vjs.min.js or the vjs.min.js file
const video = videojs('video', { const video = videojs('video', {
controls: true, controls: true,
@ -54,13 +54,23 @@ var versionclient = "youtube.player.web_20250917_22_RC00"
let seekingInProgress = false; let seekingInProgress = false;
let resumeAfterSeek = false; let resumeAfterSeek = false;
// FIX: bridge freeze to stop play/pause mirroring during/after seeks
let bridgeDisabled = false;
let bridgeEnableTimer = null;
const BRIDGE_GRACE_MS = 600;
function disableBridge(ms = BRIDGE_GRACE_MS) {
bridgeDisabled = true;
if (bridgeEnableTimer) clearTimeout(bridgeEnableTimer);
bridgeEnableTimer = setTimeout(() => { bridgeDisabled = false; }, ms);
}
// FIX: state arbiter watchdog (forces both to share same paused/playing state) // FIX: state arbiter watchdog (forces both to share same paused/playing state)
let arbiterTimer = null; let arbiterTimer = null;
const ARBITER_MS = 150; const ARBITER_MS = 150;
function startArbiter() { function startArbiter() {
if (arbiterTimer) clearInterval(arbiterTimer); if (arbiterTimer) clearInterval(arbiterTimer);
arbiterTimer = setInterval(() => { arbiterTimer = setInterval(() => {
if (syncing || restarting || seekingInProgress) return; if (syncing || restarting || seekingInProgress || bridgeDisabled) return;
// treat "playing" strictly; ended counts as paused // treat "playing" strictly; ended counts as paused
const vPlaying = !video.paused() && !video.ended(); const vPlaying = !video.paused() && !video.ended();
@ -204,7 +214,7 @@ var versionclient = "youtube.player.web_20250917_22_RC00"
// FIX: unified play/pause coordinators (no ping-pong) // FIX: unified play/pause coordinators (no ping-pong)
async function playTogether({ allowMutedRetry = true } = {}) { async function playTogether({ allowMutedRetry = true } = {}) {
if (syncing || restarting || seekingInProgress) return; // FIX: don't start while seeking if (syncing || restarting || seekingInProgress || bridgeDisabled) return; // FIX: don't start while seeking/bridged
syncing = true; syncing = true;
try { try {
// align clocks first // align clocks first
@ -368,23 +378,23 @@ var versionclient = "youtube.player.web_20250917_22_RC00"
// sync-safe event bridging using the coordinators (no ping-pong) // sync-safe event bridging using the coordinators (no ping-pong)
video.on('play', () => { video.on('play', () => {
if (seekingInProgress) return; // FIX if (seekingInProgress || bridgeDisabled) return; // FIX
vIsPlaying = true; vIsPlaying = true;
if (!aIsPlaying) playTogether({ allowMutedRetry: true }); if (!aIsPlaying) playTogether({ allowMutedRetry: true });
}); });
audio.addEventListener('play', () => { audio.addEventListener('play', () => {
if (seekingInProgress) return; // FIX if (seekingInProgress || bridgeDisabled) return; // FIX
aIsPlaying = true; aIsPlaying = true;
if (!vIsPlaying) playTogether({ allowMutedRetry: true }); if (!vIsPlaying) playTogether({ allowMutedRetry: true });
}); });
video.on('pause', () => { video.on('pause', () => {
if (restarting || seekingInProgress) return; // FIX if (restarting || seekingInProgress || bridgeDisabled) return; // FIX
vIsPlaying = false; vIsPlaying = false;
pauseTogether(); pauseTogether();
}); });
audio.addEventListener('pause', () => { audio.addEventListener('pause', () => {
if (restarting || seekingInProgress) return; // FIX if (restarting || seekingInProgress || bridgeDisabled) return; // FIX
aIsPlaying = false; aIsPlaying = false;
pauseTogether(); pauseTogether();
}); });
@ -426,19 +436,31 @@ var versionclient = "youtube.player.web_20250917_22_RC00"
tick(); tick();
}); });
// FIX: wait for *both* to report 'playing' (true co-play), with a short timeout
const waitBothPlaying = (timeoutMs = 800) => new Promise(resolve => {
const start = performance.now();
const tick = () => {
if (vIsPlaying && aIsPlaying) return resolve(true);
if (performance.now() - start > timeoutMs) return resolve(false);
setTimeout(tick, 30);
};
tick();
});
// suppress spurious 'ended' right after seeks (mobile/browser quirk guard) // suppress spurious 'ended' right after seeks (mobile/browser quirk guard)
let wasPlayingBeforeSeek = false; let wasPlayingBeforeSeek = false;
video.on('seeking', () => { video.on('seeking', () => {
if (restarting) return; if (restarting) return;
seekingInProgress = true; // FIX seekingInProgress = true; // FIX
disableBridge(1200); // FIX: freeze mirroring while the seek settles
wasPlayingBeforeSeek = !video.paused(); wasPlayingBeforeSeek = !video.paused();
resumeAfterSeek = wasPlayingBeforeSeek; // FIX resumeAfterSeek = wasPlayingBeforeSeek; // FIX
try { audio.pause(); } catch {} pauseTogether(); // FIX: atomically stop both sides during seek
clearSyncLoop();
const vt = Number(video.currentTime()); const vt = Number(video.currentTime());
if (Math.abs(vt - Number(audio.currentTime)) > 0.1) safeSetCT(audio, vt); if (Math.abs(vt - Number(audio.currentTime)) > 0.1) safeSetCT(audio, vt);
vIsPlaying = false; aIsPlaying = false; // FIX vIsPlaying = false; aIsPlaying = false; // FIX
stopArbiter(); // FIX: arbiter off during seek window
}); });
video.on('seeked', async () => { video.on('seeked', async () => {
@ -446,16 +468,20 @@ var versionclient = "youtube.player.web_20250917_22_RC00"
const vt = Number(video.currentTime()); const vt = Number(video.currentTime());
if (Math.abs(vt - Number(audio.currentTime)) > 0.05) safeSetCT(audio, vt); if (Math.abs(vt - Number(audio.currentTime)) > 0.05) safeSetCT(audio, vt);
// FIX: only resume once the new point is playable; avoid first-load ping-pong // FIX: only resume once the new point is playable, then wait for both to be truly "playing"
if (resumeAfterSeek) { if (resumeAfterSeek) {
await waitUntilPlayable(vt, 1000); await waitUntilPlayable(vt, 1000);
playTogether({ allowMutedRetry: false }); await playTogether({ allowMutedRetry: true });
await waitBothPlaying(900);
} else { } else {
pauseTogether(); pauseTogether();
} }
seekingInProgress = false; // FIX // FIX: re-enable bridge after short grace (prevents first-load ping-pong)
resumeAfterSeek = false; // FIX disableBridge(300);
seekingInProgress = false;
resumeAfterSeek = false;
startArbiter(); // back on
}); });
video.on('canplaythrough', () => { video.on('canplaythrough', () => {
@ -516,6 +542,7 @@ var versionclient = "youtube.player.web_20250917_22_RC00"
}); });
// https://codeberg.org/ashley/poke/src/branch/main/src/libpoketube/libpoketube-youtubei-objects.json // https://codeberg.org/ashley/poke/src/branch/main/src/libpoketube/libpoketube-youtubei-objects.json