Compare commits

...

3 Commits

Author SHA1 Message Date
CodeDevMLH
cc861f4263 Update manifest.json for release v1.7.0.4 [skip ci] 2026-03-05 23:35:23 +00:00
CodeDevMLH
10e6cdc4a2 Bump version to 1.7.0.4
All checks were successful
Auto Release Plugin / build-and-release (push) Successful in 51s
2026-03-06 00:34:32 +01:00
CodeDevMLH
a8c7faab6b Add Safari support for YouTube video playback using plain iframe embed 2026-03-06 00:34:19 +01:00
3 changed files with 169 additions and 131 deletions

View File

@@ -12,7 +12,7 @@
<!-- <TreatWarningsAsErrors>false</TreatWarningsAsErrors> --> <!-- <TreatWarningsAsErrors>false</TreatWarningsAsErrors> -->
<Title>Jellyfin Media Bar Enhanced Plugin</Title> <Title>Jellyfin Media Bar Enhanced Plugin</Title>
<Authors>CodeDevMLH</Authors> <Authors>CodeDevMLH</Authors>
<Version>1.7.0.3</Version> <Version>1.7.0.4</Version>
<RepositoryUrl>https://github.com/CodeDevMLH/jellyfin-plugin-media-bar-enhanced</RepositoryUrl> <RepositoryUrl>https://github.com/CodeDevMLH/jellyfin-plugin-media-bar-enhanced</RepositoryUrl>
</PropertyGroup> </PropertyGroup>

View File

@@ -1736,155 +1736,193 @@ const SlideCreator = {
// Create a wrapper for opacity transition // Create a wrapper for opacity transition
videoBackdrop = SlideUtils.createElement("div", { videoBackdrop = SlideUtils.createElement("div", {
className: `backdrop video-backdrop ${videoClass}`, className: `backdrop video-backdrop ${videoClass}`,
style: "opacity: 0; transition: opacity 1.2s ease-in-out;" // Start interrupted/transparent style: "opacity: 0; transition: opacity 1.2s ease-in-out;"
}); });
const ytPlayerDiv = SlideUtils.createElement("div", { // Detect Safari/WebKit — the YouTube IFrame API causes Error 153 on WebKit
id: `youtube-player-${itemId}`, // due to cross-origin postMessage restrictions. Use a plain iframe embed instead.
style: "width: 100%; height: 100%;" const isSafariWebKit = /Safari/.test(navigator.userAgent) && !/Chrome/.test(navigator.userAgent) && !/Chromium/.test(navigator.userAgent);
});
videoBackdrop.appendChild(ytPlayerDiv); if (isSafariWebKit) {
// ── Safari: plain iframe embed ───────────────────────────────────────────
const embedUrl = `https://www.youtube-nocookie.com/embed/${videoId}?autoplay=1&mute=1&controls=0&playsinline=1&rel=0&iv_load_policy=3&enablejsapi=0&origin=${encodeURIComponent(window.location.origin)}`;
// Initialize YouTube Player const ytIframe = document.createElement('iframe');
SlideUtils.loadYouTubeIframeAPI().then(() => { ytIframe.style.cssText = 'width:100%;height:100%;border:0;pointer-events:none;';
// Fetch SponsorBlock data ytIframe.setAttribute('allow', 'accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share');
ApiUtils.fetchSponsorBlockData(videoId).then(segments => { ytIframe.setAttribute('allowfullscreen', '');
const playerVars = { ytIframe.setAttribute('referrerpolicy', 'strict-origin-when-cross-origin');
autoplay: 1, ytIframe.src = embedUrl;
mute: 1, // need to be muted for Safari, because apple makes life difficult... videoBackdrop.appendChild(ytIframe);
controls: 0,
disablekb: 1,
fs: 0,
iv_load_policy: 3,
rel: 0,
loop: 0,
playsinline: 1,
origin: window.location.origin,
enablejsapi: 1
};
// Determine video quality // Show immediately — no onStateChange available for plain iframes
let quality = 'hd1080'; videoBackdrop.style.opacity = '1';
if (CONFIG.preferredVideoQuality === 'Maximum') {
quality = 'highres';
} else if (CONFIG.preferredVideoQuality === '720p') {
quality = 'hd720';
} else if (CONFIG.preferredVideoQuality === '1080p') {
quality = 'hd1080';
} else { // Auto or fallback
// If screen is wider than 1920, prefer highres, otherwise 1080p
quality = window.screen.width > 1920 ? 'highres' : 'hd1080';
}
playerVars.suggestedQuality = quality; // Create a stub player compatible with all slide management code
STATE.slideshow.videoPlayers[itemId] = {
_isSafariIframe: true,
_iframe: ytIframe,
_videoId: videoId,
_embedUrl: embedUrl,
pauseVideo() { ytIframe.src = ''; },
stopVideo() { ytIframe.src = ''; },
playVideo() { if (!ytIframe.src) ytIframe.src = this._embedUrl; },
mute() { /* cannot mute plain iframe mid-play */ },
unMute() { /* cannot unmute plain iframe mid-play */ },
setVolume() { /* not available */ },
getIframe() { return ytIframe; },
getPlayerState() { return 1; }, // always report PLAYING so fallback timeouts don't fire
loadVideoById({ videoId: vid }) {
const url = `https://www.youtube-nocookie.com/embed/${vid}?autoplay=1&mute=1&controls=0&playsinline=1&rel=0&iv_load_policy=3&enablejsapi=0`;
ytIframe.src = url;
this._videoId = vid;
this._embedUrl = url;
},
destroy() { ytIframe.remove(); }
};
// Apply SponsorBlock start/end times console.log(`🍎 Safari detected — using plain iframe embed for YouTube video ${videoId}`);
if (segments.intro) {
playerVars.start = Math.ceil(segments.intro[1]);
console.info(`SponsorBlock intro detected for video ${videoId}: skipping to ${playerVars.start}s`);
}
if (segments.outro) {
playerVars.end = Math.floor(segments.outro[0]);
console.info(`SponsorBlock outro detected for video ${videoId}: ending at ${playerVars.end}s`);
}
STATE.slideshow.videoPlayers[itemId] = new YT.Player(`youtube-player-${itemId}`, { } else {
height: '100%', // ── Non-Safari: YouTube IFrame API ──────────────────────────────────────
width: '100%', const ytPlayerDiv = SlideUtils.createElement("div", {
videoId: videoId, id: `youtube-player-${itemId}`,
host: 'https://www.youtube-nocookie.com', style: "width: 100%; height: 100%;"
playerVars: playerVars, });
events: {
'onReady': (event) => {
const iframe = event.target.getIframe();
if (iframe) {
iframe.setAttribute('referrerpolicy', 'strict-origin-when-cross-origin');
// Full allow attribute matching what YouTube sets on their own embed pages
iframe.setAttribute('allow', 'accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share');
}
// Store start/end time and videoId for later use videoBackdrop.appendChild(ytPlayerDiv);
event.target._startTime = playerVars.start || 0;
event.target._endTime = playerVars.end || undefined;
event.target._videoId = videoId;
// Store reference to wrapper for fading SlideUtils.loadYouTubeIframeAPI().then(() => {
event.target._wrapperDiv = videoBackdrop; ApiUtils.fetchSponsorBlockData(videoId).then(segments => {
const playerVars = {
autoplay: 1,
mute: 1, // need to be muted for Safari, because apple makes life difficult...
controls: 0,
disablekb: 1,
fs: 0,
iv_load_policy: 3,
rel: 0,
loop: 0,
playsinline: 1,
origin: window.location.origin,
enablejsapi: 1
};
// Unmute now if user wants sound. // Determine video quality
if (!STATE.slideshow.isMuted) { let quality = 'hd1080';
event.target.unMute(); if (CONFIG.preferredVideoQuality === 'Maximum') {
event.target.setVolume(40); quality = 'highres';
} } else if (CONFIG.preferredVideoQuality === '720p') {
quality = 'hd720';
} else if (CONFIG.preferredVideoQuality === '1080p') {
quality = 'hd1080';
} else {
quality = window.screen.width > 1920 ? 'highres' : 'hd1080';
}
if (typeof event.target.setPlaybackQuality === 'function') { playerVars.suggestedQuality = quality;
event.target.setPlaybackQuality(quality);
}
// Stop playback if slide was navigated away from // Apply SponsorBlock start/end times
const slide = document.querySelector(`.slide[data-item-id="${itemId}"]`); if (segments.intro) {
const isVideoPlayerOpen = document.querySelector('.videoPlayerContainer') || document.querySelector('.youtubePlayerContainer'); playerVars.start = Math.ceil(segments.intro[1]);
console.info(`SponsorBlock intro detected for video ${videoId}: skipping to ${playerVars.start}s`);
}
if (segments.outro) {
playerVars.end = Math.floor(segments.outro[0]);
console.info(`SponsorBlock outro detected for video ${videoId}: ending at ${playerVars.end}s`);
}
if (!slide || !slide.classList.contains('active') || document.hidden || (isVideoPlayerOpen && !isVideoPlayerOpen.classList.contains('hide'))) { STATE.slideshow.videoPlayers[itemId] = new YT.Player(`youtube-player-${itemId}`, {
event.target.stopVideo(); height: '100%',
} else { width: '100%',
// Pause slideshow timer when video starts if configured videoId: videoId,
if (CONFIG.waitForTrailerToEnd && STATE.slideshow.slideInterval) { host: 'https://www.youtube-nocookie.com',
STATE.slideshow.slideInterval.stop(); playerVars: playerVars,
events: {
'onReady': (event) => {
const iframe = event.target.getIframe();
if (iframe) {
iframe.setAttribute('referrerpolicy', 'strict-origin-when-cross-origin');
// Full allow attribute matching what YouTube sets on their own embed pages
iframe.setAttribute('allow', 'accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share');
} }
// Safety check after 1s: handle navigation-away during the window, // Store start/end time and videoId for later use
// and fallback to muted play if autoplay failed for any reason. event.target._startTime = playerVars.start || 0;
const timeoutId = setTimeout(() => { event.target._endTime = playerVars.end || undefined;
const isVideoPlayerOpenNow = document.querySelector('.videoPlayerContainer') || document.querySelector('.youtubePlayerContainer'); event.target._videoId = videoId;
if (document.hidden || (isVideoPlayerOpenNow && !isVideoPlayerOpenNow.classList.contains('hide')) || !slide.classList.contains('active')) {
console.log(`Navigation detected during autoplay check for ${itemId}, stopping video.`);
try {
event.target.stopVideo();
} catch (e) { console.warn("Error stopping video:", e); }
return;
}
// If somehow not playing/buffering yet, force muted fallback // Store reference to wrapper for fading
const state = event.target.getPlayerState(); event.target._wrapperDiv = videoBackdrop;
if (state !== YT.PlayerState.PLAYING && state !== YT.PlayerState.BUFFERING) {
console.warn(`Autoplay stalled for ${itemId}, attempting muted fallback`);
event.target.mute();
event.target.playVideo();
}
}, 1000);
if (!STATE.slideshow.autoplayTimeouts) STATE.slideshow.autoplayTimeouts = []; // Unmute now if user wants sound.
STATE.slideshow.autoplayTimeouts.push(timeoutId); if (!STATE.slideshow.isMuted) {
} event.target.unMute();
}, event.target.setVolume(40);
'onStateChange': (event) => { }
// Fade in when playing
if (event.data === YT.PlayerState.PLAYING) {
if (event.target._wrapperDiv) {
event.target._wrapperDiv.style.opacity = "1";
}
}
if (event.data === YT.PlayerState.ENDED) { if (typeof event.target.setPlaybackQuality === 'function') {
event.target.setPlaybackQuality(quality);
}
// Stop playback if slide was navigated away from
const slide = document.querySelector(`.slide[data-item-id="${itemId}"]`); const slide = document.querySelector(`.slide[data-item-id="${itemId}"]`);
if (slide && slide.classList.contains('active')) { const isVideoPlayerOpen = document.querySelector('.videoPlayerContainer') || document.querySelector('.youtubePlayerContainer');
if (!slide || !slide.classList.contains('active') || document.hidden || (isVideoPlayerOpen && !isVideoPlayerOpen.classList.contains('hide'))) {
event.target.stopVideo();
} else {
if (CONFIG.waitForTrailerToEnd && STATE.slideshow.slideInterval) {
STATE.slideshow.slideInterval.stop();
}
const timeoutId = setTimeout(() => {
const isVideoPlayerOpenNow = document.querySelector('.videoPlayerContainer') || document.querySelector('.youtubePlayerContainer');
if (document.hidden || (isVideoPlayerOpenNow && !isVideoPlayerOpenNow.classList.contains('hide')) || !slide.classList.contains('active')) {
console.log(`Navigation detected during autoplay check for ${itemId}, stopping video.`);
try {
event.target.stopVideo();
} catch (e) { console.warn("Error stopping video:", e); }
return;
}
const state = event.target.getPlayerState();
if (state !== YT.PlayerState.PLAYING && state !== YT.PlayerState.BUFFERING) {
console.warn(`Autoplay stalled for ${itemId}, attempting muted fallback`);
event.target.mute();
event.target.playVideo();
}
}, 1000);
if (!STATE.slideshow.autoplayTimeouts) STATE.slideshow.autoplayTimeouts = [];
STATE.slideshow.autoplayTimeouts.push(timeoutId);
}
},
'onStateChange': (event) => {
if (event.data === YT.PlayerState.PLAYING) {
if (event.target._wrapperDiv) {
event.target._wrapperDiv.style.opacity = "1";
}
}
if (event.data === YT.PlayerState.ENDED) {
const slide = document.querySelector(`.slide[data-item-id="${itemId}"]`);
if (slide && slide.classList.contains('active')) {
SlideshowManager.nextSlide();
}
}
},
'onError': (event) => {
console.warn(`YouTube player error ${event.data} for video ${videoId}`);
if (CONFIG.waitForTrailerToEnd) {
SlideshowManager.nextSlide(); SlideshowManager.nextSlide();
} }
} }
},
'onError': (event) => {
console.warn(`YouTube player error ${event.data} for video ${videoId}`);
// Fallback to next slide on error
if (CONFIG.waitForTrailerToEnd) {
SlideshowManager.nextSlide();
}
} }
} });
}); });
}); });
}); } // end non-Safari
// 2. Check for local video trailers in MediaSources if yt is not available // 2. Check for local video trailers in MediaSources if yt is not available
} else if (!isYoutube) { } else if (!isYoutube) {

View File

@@ -9,12 +9,12 @@
"imageUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/raw/branch/main/logo.png", "imageUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/raw/branch/main/logo.png",
"versions": [ "versions": [
{ {
"version": "1.7.0.3", "version": "1.7.0.4",
"changelog": "- Add YouTube no-cookie host and referrer policy for iframe security to fix playback issues on iOS/MacOS", "changelog": "- Add YouTube no-cookie host and referrer policy for iframe security to fix playback issues on iOS/MacOS",
"targetAbi": "10.11.0.0", "targetAbi": "10.11.0.0",
"sourceUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/releases/download/v1.7.0.3/Jellyfin.Plugin.MediaBarEnhanced.zip", "sourceUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/releases/download/v1.7.0.4/Jellyfin.Plugin.MediaBarEnhanced.zip",
"checksum": "b4f35ff869129d43c075948e5430b199", "checksum": "a8f3cbea12cdce5902212d4ca753eb83",
"timestamp": "2026-03-05T23:23:07Z" "timestamp": "2026-03-05T23:35:22Z"
}, },
{ {
"version": "1.6.6.4", "version": "1.6.6.4",