Compare commits

..

9 Commits

Author SHA1 Message Date
CodeDevMLH
6d90523eef Update manifest.json for release v1.7.0.7 [skip ci] 2026-03-06 00:45:38 +00:00
CodeDevMLH
2a3e8057a1 Bump version to 1.7.0.7
All checks were successful
Auto Release Plugin / build-and-release (push) Successful in 51s
2026-03-06 01:44:24 +01:00
CodeDevMLH
42026b0ee8 test revert 2026-03-06 01:44:04 +01:00
CodeDevMLH
64dbc3cfd3 Update manifest.json for release v1.7.0.6 [skip ci] 2026-03-06 00:25:04 +00:00
CodeDevMLH
c998266dd7 Bump version to 1.7.0.6
All checks were successful
Auto Release Plugin / build-and-release (push) Successful in 53s
2026-03-06 01:24:11 +01:00
CodeDevMLH
9b941e5a77 test again 2026-03-06 01:23:49 +01:00
CodeDevMLH
1d70d7166d Update manifest.json for release v1.7.0.5 [skip ci] 2026-03-05 23:59:06 +00:00
CodeDevMLH
5331f0faf1 Bump version to 1.7.0.5
All checks were successful
Auto Release Plugin / build-and-release (push) Successful in 50s
2026-03-06 00:58:15 +01:00
CodeDevMLH
0508188705 test nochmal
Some checks failed
Auto Release Plugin / build-and-release (push) Has been cancelled
2026-03-06 00:57:58 +01:00
3 changed files with 152 additions and 214 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.4</Version> <Version>1.7.0.7</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

@@ -1403,8 +1403,6 @@ const ApiUtils = {
return { return {
id: trailer.Id, id: trailer.Id,
// static=true forces Jellyfin to direct-stream (no transcoding) which enables
// HTTP Range Requests (Accept-Ranges: bytes) — required by Safari for video playback
url: `${STATE.jellyfinData.serverAddress}/Videos/${trailer.Id}/stream.mp4?mediaSourceId=${mediaSourceId}&api_key=${STATE.jellyfinData.accessToken}&static=true` url: `${STATE.jellyfinData.serverAddress}/Videos/${trailer.Id}/stream.mp4?mediaSourceId=${mediaSourceId}&api_key=${STATE.jellyfinData.accessToken}&static=true`
}; };
} }
@@ -1444,7 +1442,7 @@ const ApiUtils = {
return { return {
id: video.Id, id: video.Id,
url: `${STATE.jellyfinData.serverAddress}/Videos/${video.Id}/stream.mp4?api_key=${STATE.jellyfinData.accessToken}` url: `${STATE.jellyfinData.serverAddress}/Videos/${video.Id}/stream.mp4?api_key=${STATE.jellyfinData.accessToken}&static=true`
}; };
} }
} }
@@ -1670,7 +1668,7 @@ const SlideCreator = {
trailerUrl = { trailerUrl = {
id: videoId, id: videoId,
url: `${STATE.jellyfinData.serverAddress}/Videos/${videoId}/stream.mp4?api_key=${STATE.jellyfinData.accessToken}` url: `${STATE.jellyfinData.serverAddress}/Videos/${videoId}/stream.mp4?api_key=${STATE.jellyfinData.accessToken}&static=true`
}; };
} else { } else {
// Assume it's a standard URL (YouTube, etc.) // Assume it's a standard URL (YouTube, etc.)
@@ -1736,193 +1734,153 @@ 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;" style: "opacity: 0; transition: opacity 1.2s ease-in-out;" // Start interrupted/transparent
}); });
// Detect Safari/WebKit — the YouTube IFrame API causes Error 153 on WebKit const ytPlayerDiv = SlideUtils.createElement("div", {
// due to cross-origin postMessage restrictions. Use a plain iframe embed instead. id: `youtube-player-${itemId}`,
const isSafariWebKit = /Safari/.test(navigator.userAgent) && !/Chrome/.test(navigator.userAgent) && !/Chromium/.test(navigator.userAgent); style: "width: 100%; height: 100%;"
});
videoBackdrop.appendChild(ytPlayerDiv);
if (isSafariWebKit) { // Initialize YouTube Player
// ── Safari: plain iframe embed ─────────────────────────────────────────── SlideUtils.loadYouTubeIframeAPI().then(() => {
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)}`; // Fetch SponsorBlock data
ApiUtils.fetchSponsorBlockData(videoId).then(segments => {
const playerVars = {
autoplay: 0,
mute: STATE.slideshow.isMuted ? 1 : 0,
controls: 0,
disablekb: 1,
fs: 0,
iv_load_policy: 3,
rel: 0,
loop: 0,
playsinline: 1,
origin: window.location.origin,
enablejsapi: 1
};
const ytIframe = document.createElement('iframe'); // Determine video quality
ytIframe.style.cssText = 'width:100%;height:100%;border:0;pointer-events:none;'; let quality = 'hd1080';
ytIframe.setAttribute('allow', 'accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share'); if (CONFIG.preferredVideoQuality === 'Maximum') {
ytIframe.setAttribute('allowfullscreen', ''); quality = 'highres';
ytIframe.setAttribute('referrerpolicy', 'strict-origin-when-cross-origin'); } else if (CONFIG.preferredVideoQuality === '720p') {
ytIframe.src = embedUrl; quality = 'hd720';
videoBackdrop.appendChild(ytIframe); } 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';
}
// Show immediately — no onStateChange available for plain iframes playerVars.suggestedQuality = quality;
videoBackdrop.style.opacity = '1';
// Create a stub player compatible with all slide management code // Apply SponsorBlock start/end times
STATE.slideshow.videoPlayers[itemId] = { if (segments.intro) {
_isSafariIframe: true, playerVars.start = Math.ceil(segments.intro[1]);
_iframe: ytIframe, console.info(`SponsorBlock intro detected for video ${videoId}: skipping to ${playerVars.start}s`);
_videoId: videoId, }
_embedUrl: embedUrl, if (segments.outro) {
pauseVideo() { ytIframe.src = ''; }, playerVars.end = Math.floor(segments.outro[0]);
stopVideo() { ytIframe.src = ''; }, console.info(`SponsorBlock outro detected for video ${videoId}: ending at ${playerVars.end}s`);
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(); }
};
console.log(`🍎 Safari detected — using plain iframe embed for YouTube video ${videoId}`); STATE.slideshow.videoPlayers[itemId] = new YT.Player(`youtube-player-${itemId}`, {
height: '100%',
width: '100%',
videoId: videoId,
host: 'https://www.youtube-nocookie.com',
playerVars: playerVars,
events: {
'onReady': (event) => {
const iframe = event.target.getIframe();
if (iframe) {
iframe.setAttribute('referrerpolicy', 'strict-origin-when-cross-origin');
}
} else { // Store start/end time and videoId for later use
// ── Non-Safari: YouTube IFrame API ────────────────────────────────────── event.target._startTime = playerVars.start || 0;
const ytPlayerDiv = SlideUtils.createElement("div", { event.target._endTime = playerVars.end || undefined;
id: `youtube-player-${itemId}`, event.target._videoId = videoId;
style: "width: 100%; height: 100%;"
}); // Store reference to wrapper for fading
event.target._wrapperDiv = videoBackdrop;
videoBackdrop.appendChild(ytPlayerDiv); if (STATE.slideshow.isMuted) {
event.target.mute();
} else {
event.target.unMute();
event.target.setVolume(40);
}
SlideUtils.loadYouTubeIframeAPI().then(() => { if (typeof event.target.setPlaybackQuality === 'function') {
ApiUtils.fetchSponsorBlockData(videoId).then(segments => { event.target.setPlaybackQuality(quality);
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
};
// Determine video quality // Only play if this is the active slide
let quality = 'hd1080'; const slide = document.querySelector(`.slide[data-item-id="${itemId}"]`);
if (CONFIG.preferredVideoQuality === 'Maximum') { const isVideoPlayerOpen = document.querySelector('.videoPlayerContainer') || document.querySelector('.youtubePlayerContainer');
quality = 'highres';
} else if (CONFIG.preferredVideoQuality === '720p') {
quality = 'hd720';
} else if (CONFIG.preferredVideoQuality === '1080p') {
quality = 'hd1080';
} else {
quality = window.screen.width > 1920 ? 'highres' : 'hd1080';
}
playerVars.suggestedQuality = quality; if (slide && slide.classList.contains('active') && !document.hidden && (!isVideoPlayerOpen || isVideoPlayerOpen.classList.contains('hide'))) {
event.target.playVideo();
// Apply SponsorBlock start/end times
if (segments.intro) { // Check if it actually started playing after a short delay (handling autoplay blocks)
playerVars.start = Math.ceil(segments.intro[1]); const timeoutId = setTimeout(() => {
console.info(`SponsorBlock intro detected for video ${videoId}: skipping to ${playerVars.start}s`); // Re-check conditions before processing fallback
} const isVideoPlayerOpenNow = document.querySelector('.videoPlayerContainer') || document.querySelector('.youtubePlayerContainer');
if (segments.outro) { if (document.hidden || (isVideoPlayerOpenNow && !isVideoPlayerOpenNow.classList.contains('hide')) || !slide.classList.contains('active')) {
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}`, {
height: '100%',
width: '100%',
videoId: videoId,
host: 'https://www.youtube-nocookie.com',
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
event.target._startTime = playerVars.start || 0;
event.target._endTime = playerVars.end || undefined;
event.target._videoId = videoId;
// Store reference to wrapper for fading
event.target._wrapperDiv = videoBackdrop;
// Unmute now if user wants sound.
if (!STATE.slideshow.isMuted) {
event.target.unMute();
event.target.setVolume(40);
}
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 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.`); console.log(`Navigation detected during autoplay check for ${itemId}, stopping video.`);
try { try {
event.target.stopVideo(); event.target.stopVideo();
} catch (e) { console.warn("Error stopping video:", e); } } catch (e) { console.warn("Error stopping video in timeout:", e); }
return; 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();
} }
if (event.target.getPlayerState() !== YT.PlayerState.PLAYING &&
event.target.getPlayerState() !== YT.PlayerState.BUFFERING) {
console.warn(`Autoplay blocked for ${itemId}, attempting muted fallback`);
event.target.mute();
event.target.playVideo();
}
}, 1000);
if (!STATE.slideshow.autoplayTimeouts) STATE.slideshow.autoplayTimeouts = [];
STATE.slideshow.autoplayTimeouts.push(timeoutId);
// Pause slideshow timer when video starts if configured
if (CONFIG.waitForTrailerToEnd && STATE.slideshow.slideInterval) {
STATE.slideshow.slideInterval.stop();
} }
}, }
'onError': (event) => { },
console.warn(`YouTube player error ${event.data} for video ${videoId}`); 'onStateChange': (event) => {
if (CONFIG.waitForTrailerToEnd) { // 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) {
const slide = document.querySelector(`.slide[data-item-id="${itemId}"]`);
if (slide && slide.classList.contains('active')) {
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) {
@@ -1938,7 +1896,6 @@ const SlideCreator = {
}; };
videoAttributes.muted = ""; videoAttributes.muted = "";
videoAttributes.playsinline = ""; // again Safari needs extra treatment...
videoBackdrop = SlideUtils.createElement("video", videoAttributes); videoBackdrop = SlideUtils.createElement("video", videoAttributes);
videoBackdrop.volume = 0.4; videoBackdrop.volume = 0.4;
@@ -1970,10 +1927,7 @@ const SlideCreator = {
}); });
videoBackdrop.addEventListener('error', (event) => { videoBackdrop.addEventListener('error', (event) => {
const src = event.target.src || event.target.getAttribute('data-src') || 'unknown'; console.warn(`Local video error for item ${itemId}`);
const errCode = event.target.error ? event.target.error.code : 'n/a';
const errMsg = event.target.error ? event.target.error.message : 'n/a';
console.warn(`Local video error for item ${itemId} | code=${errCode} | msg=${errMsg} | url=${src}`);
const slide = event.target.closest('.slide'); const slide = event.target.closest('.slide');
if (slide && slide.classList.contains('active')) { if (slide && slide.classList.contains('active')) {
SlideshowManager.nextSlide(); SlideshowManager.nextSlide();
@@ -2512,58 +2466,42 @@ const SlideshowManager = {
if (videoBackdrop.tagName === 'VIDEO') { if (videoBackdrop.tagName === 'VIDEO') {
// Restore src from data-src if it was deactivated to release connections // Restore src from data-src if it was deactivated to release connections
const lazySrc = videoBackdrop.getAttribute('data-src'); const lazySrc = videoBackdrop.getAttribute('data-src');
const isFreshLoad = lazySrc && !videoBackdrop.src; if (lazySrc && !videoBackdrop.src) {
videoBackdrop.src = lazySrc;
}
videoBackdrop.currentTime = 0;
videoBackdrop.muted = STATE.slideshow.isMuted; videoBackdrop.muted = STATE.slideshow.isMuted;
if (!STATE.slideshow.isMuted) { if (!STATE.slideshow.isMuted) {
videoBackdrop.volume = 0.4; videoBackdrop.volume = 0.4;
} }
const doPlay = () => { videoBackdrop.play().catch(e => {
if (!currentSlide.classList.contains('active')) return; // Check if it actually started playing after a short delay (handling autoplay blocks)
videoBackdrop.play().catch(e => { setTimeout(() => {
setTimeout(() => { if (videoBackdrop.paused && currentSlide.classList.contains('active')) {
if (videoBackdrop.paused && currentSlide.classList.contains('active')) { console.warn(`Autoplay blocked for ${currentItemId}, attempting muted fallback`);
console.warn(`Autoplay blocked for ${currentItemId}, attempting muted fallback`); videoBackdrop.muted = true;
videoBackdrop.muted = true; videoBackdrop.play().catch(err => console.error("Muted fallback failed", err));
videoBackdrop.play().catch(err => console.error("Muted fallback failed", err)); }
} }, 1000);
}, 1000); });
});
};
if (isFreshLoad) {
// Safari: set src, then wait for loadedmetadata before seeking/playing
videoBackdrop.src = lazySrc;
videoBackdrop.load();
videoBackdrop.addEventListener('loadedmetadata', () => {
videoBackdrop.currentTime = 0;
doPlay();
}, { once: true });
} else {
// src already set (e.g. paused slide resuming)
videoBackdrop.currentTime = 0;
doPlay();
}
} else if (STATE.slideshow.videoPlayers && STATE.slideshow.videoPlayers[currentItemId]) { } else if (STATE.slideshow.videoPlayers && STATE.slideshow.videoPlayers[currentItemId]) {
const player = STATE.slideshow.videoPlayers[currentItemId]; const player = STATE.slideshow.videoPlayers[currentItemId];
if (player && typeof player.loadVideoById === 'function' && player._videoId) { if (player && typeof player.loadVideoById === 'function' && player._videoId) {
// Use loadVideoById to enforce start and end times // Use loadVideoById to enforce start and end times
// load always starts muted first, then unmute if needed
player.loadVideoById({ player.loadVideoById({
videoId: player._videoId, videoId: player._videoId,
startSeconds: player._startTime || 0, startSeconds: player._startTime || 0,
endSeconds: player._endTime endSeconds: player._endTime
}); });
player.mute();
if (!STATE.slideshow.isMuted) { if (STATE.slideshow.isMuted) {
setTimeout(() => { player.mute();
// Only unmute if still on the same slide } else {
if (currentSlide.classList.contains('active')) { player.unMute();
player.unMute(); player.setVolume(40);
player.setVolume(40);
}
}, 600);
} }
// Check if playback successfully started, otherwise fallback to muted // Check if playback successfully started, otherwise fallback to muted

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.4", "version": "1.7.0.7",
"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.4/Jellyfin.Plugin.MediaBarEnhanced.zip", "sourceUrl": "https://git.mahom03-spacecloud.de/CodeDevMLH/jellyfin-plugin-media-bar-enhanced/releases/download/v1.7.0.7/Jellyfin.Plugin.MediaBarEnhanced.zip",
"checksum": "a8f3cbea12cdce5902212d4ca753eb83", "checksum": "932e1b1cd932d5c681175e3590b77458",
"timestamp": "2026-03-05T23:35:22Z" "timestamp": "2026-03-06T00:45:37Z"
}, },
{ {
"version": "1.6.6.4", "version": "1.6.6.4",