mirror of
https://github.com/ksyasuda/SubMiner.git
synced 2026-07-07 13:08:54 -07:00
b1bdeabca8
* fix(jellyfin): show overlay, inject plugin, and fix stats title on playb - Show visible overlay automatically during Jellyfin playback so subtitleStyle applies - Inject bundled mpv plugin on auto-launch so keybindings work without overlay focus - Group Jellyfin playback stats under item metadata (jellyfin://host/item/id) instead of stream URLs so episodes merge with matching local titles - Mark ffsubsync unavailable in subsync modal for remote media paths - Drain queued second-instance commands even when onReady throws * fix(overlay): stabilize macOS focus handoff and sidebar Yomitan pause - Keep overlay visible during macOS foreground probe after overlay blur - Hold sidebar hover-pause while a Yomitan lookup popup remains open * fix(jellyfin): fix discovery loop, device identity, tray state, and Disc - Derive device identity from OS hostname; remove legacy configurable client/device fields - Prevent discovery playback from reloading active item, misreporting pause state, and duplicate overlay restores - Restart stale tray discovery sessions without re-login when server drops SubMiner cast target - Sync tray discovery checkbox state on Linux after CLI/startup/remote-session changes - Stop Discord presence falling back to stream URLs; prime title before tokenized stream loads - Fix picker library discovery when log level is above info - Fix config.example.jsonc trailing commas and array formatting * docs(release): trim and consolidate prerelease notes for 0.15.0 - Remove breaking changes section and several redundant bullet points - Consolidate per-platform updater notes into a single entry - Normalize em-dash separators to hyphens in section headers * fix(config): remove trailing commas from config.example.jsonc - Strip trailing commas throughout both config.example.jsonc copies - Reformat inline arrays to multi-line for JSON strictness - Update Jellyfin subtitle preload and playback launch tests and impl * fix(tokenizer): preserve known-word highlight when POS filters suppress - Known-word cache matches now set isKnown=true even for tokens excluded by POS filters - POS exclusion gate suppresses N+1, frequency, and JLPT only; known status is computed before the gate - Jellyfin subtitle preload continues after cleanup failures instead of aborting - Update config docs and option description to document the known-word bypass behavior * fix(jellyfin): send explicit hide/show overlay instead of toggle - Track overlay visibility in plugin state; y-t uses explicit hide/show commands when state is known - Prevent paused Jellyfin playback from resuming on overlay hide - Fix subtitle cache cleanup to only remove dirs after successful cleanup * fix(jellyfin): fix remote progress sync, seek reporting, and startup sto - arm active playback before loadfile with loadedMediaPath: null to suppress premature stop events - force immediate progress report on seek-like position jumps at the mpv time-pos level - send positionTicks and failed=false in reportStopped payload - remove EventName from HTTP timeline payloads (websocket-only field) - add startup grace window to drop stop events before media finishes loading * fix(jellyfin): fix overlay toggle sync, redirect reload, and AppImage bi - Sync visible-overlay state back to plugin via script messages to avoid toggle/hide drift - Collapse duplicate toggle events within 250ms to prevent hide-then-show on single keypress - Preserve manual hide across Jellyfin path-changing redirects even when media-title drops - Rearm managed subtitle defaults on path-changing redirects - Route toggleVisibleOverlay session binding through plugin toggle instead of app-side IPC - Show Linux/Hyprland overlay passively (showInactive) to avoid stealing mpv keyboard focus - Fix AppImage binary resolution to prefer $APPIMAGE env over mounted inner binary - Add stats window layer management so delete/update dialogs appear above stats window - Fix Jellyfin remote progress sync during Linux websocket reconnect windows * Fix CodeRabbit review feedback * fix(jellyfin): subtitle timing, resume progress, and overlay sync - Add per-stream subtitle delay persistence and auto timeline-offset correction - Strip server-selected subtitle stream from mpv load URL; suppress plugin subtitle rearm and auto-start during app-managed preload - Fix resume position lost when mpv resets on stop; use last known position for final progress/stopped reports - Keep Play vs Resume distinct to avoid early seek race on normal play - Fix discovery resume when remote play sends StartPositionTicks=0 despite saved progress - Deduplicate show/hide overlay commands using recorded visibility state - Rewrite docs-site Jellyfin page around cast-to-device UX * test: update lifecycle cleanup assertion * fix: clear aborted playback state, fix overlay passthrough, and guard du - Reset app_managed_playback_pending on lifecycle cleanup to prevent state leak into next item - Record visible overlay action only after command succeeds, not before - Non-native passive overlay now always click-through on re-show (fix isNonNativePassiveOverlay ordering) - Defer activeParsedSubtitleMediaPath assignment until after prefetch completes - Move autoplay gate release into the hide branch of toggleVisibleOverlay - Clear active Jellyfin playback when stopping media that never loaded - Reset managed subtitle delay and delay key when no external tracks are available - Await async removeDir in subtitle cache cleanup - Guard duplicate delete clicks in MediaDetailView and SessionsTab with refs - Escape key in DeleteConfirmDialog now calls stopPropagation and stopImmediatePropagation
252 lines
8.3 KiB
TypeScript
252 lines
8.3 KiB
TypeScript
import type { JellyfinAuthSession, JellyfinPlaybackPlan } from '../../core/services/jellyfin';
|
|
import type { JellyfinConfig } from '../../types';
|
|
import type { MpvRuntimeClientLike } from '../../core/services/mpv';
|
|
|
|
type JellyfinClientInfo = {
|
|
clientName: string;
|
|
clientVersion: string;
|
|
deviceId: string;
|
|
};
|
|
|
|
type ActivePlaybackState = {
|
|
itemId: string;
|
|
mediaSourceId: undefined;
|
|
audioStreamIndex?: number | null;
|
|
subtitleStreamIndex?: number | null;
|
|
playMethod: 'DirectPlay' | 'Transcode';
|
|
loadedMediaPath?: string | null;
|
|
stopReportsAfterMs?: number;
|
|
lastKnownPositionSeconds?: number;
|
|
};
|
|
|
|
export type JellyfinPlaybackStatsMetadata = {
|
|
mediaPath: string;
|
|
displayTitle: string;
|
|
itemTitle: string;
|
|
seriesTitle: string | null;
|
|
seasonNumber: number | null;
|
|
episodeNumber: number | null;
|
|
itemId: string;
|
|
};
|
|
|
|
const JELLYFIN_LOADFILE_SUBTITLE_SUPPRESSION_OPTIONS = [
|
|
'sid=no',
|
|
'secondary-sid=no',
|
|
'sub-auto=no',
|
|
'sub-visibility=no',
|
|
'secondary-sub-visibility=no',
|
|
];
|
|
|
|
function runBestEffortPlaybackHook(callback: () => void | Promise<void>): void {
|
|
try {
|
|
void Promise.resolve(callback()).catch(() => {});
|
|
} catch {
|
|
// Best-effort metadata/title hooks must not block playback startup.
|
|
}
|
|
}
|
|
|
|
async function awaitBestEffortPlaybackHook(callback: () => void | Promise<void>): Promise<void> {
|
|
try {
|
|
await Promise.resolve(callback());
|
|
} catch {
|
|
// Best-effort startup hooks must not block playback startup.
|
|
}
|
|
}
|
|
|
|
function applyStartTimeTicksToPlaybackUrl(url: string, startTimeTicksOverride?: number): string {
|
|
if (typeof startTimeTicksOverride !== 'number') return url;
|
|
try {
|
|
const resolved = new URL(url);
|
|
if (startTimeTicksOverride > 0) {
|
|
resolved.searchParams.set('StartTimeTicks', String(Math.max(0, startTimeTicksOverride)));
|
|
} else {
|
|
resolved.searchParams.delete('StartTimeTicks');
|
|
}
|
|
return resolved.toString();
|
|
} catch {
|
|
return url;
|
|
}
|
|
}
|
|
|
|
function stripStartTimeTicksFromPlaybackUrl(url: string): string {
|
|
try {
|
|
const resolved = new URL(url);
|
|
resolved.searchParams.delete('StartTimeTicks');
|
|
return resolved.toString();
|
|
} catch {
|
|
return url;
|
|
}
|
|
}
|
|
|
|
function stripManagedSubtitleStreamFromPlaybackUrl(url: string): string {
|
|
try {
|
|
const resolved = new URL(url);
|
|
resolved.searchParams.delete('SubtitleStreamIndex');
|
|
return resolved.toString();
|
|
} catch {
|
|
return url;
|
|
}
|
|
}
|
|
|
|
function resolveEffectiveStartTimeTicks(
|
|
planStartTimeTicks: number,
|
|
startTimeTicksOverride?: number,
|
|
fallbackToPlanStartTimeOnZeroOverride = false,
|
|
) {
|
|
if (typeof startTimeTicksOverride === 'number' && startTimeTicksOverride > 0) {
|
|
return Math.max(0, startTimeTicksOverride);
|
|
}
|
|
if (typeof startTimeTicksOverride === 'number') {
|
|
return fallbackToPlanStartTimeOnZeroOverride ? Math.max(0, planStartTimeTicks) : 0;
|
|
}
|
|
return Math.max(0, planStartTimeTicks);
|
|
}
|
|
|
|
function buildJellyfinLoadfileOptions(plan: JellyfinPlaybackPlan, startSeconds: number): string {
|
|
const options = [...JELLYFIN_LOADFILE_SUBTITLE_SUPPRESSION_OPTIONS];
|
|
if (plan.mode === 'direct' && startSeconds > 0) {
|
|
options.push(`start=${startSeconds}`);
|
|
}
|
|
return options.join(',');
|
|
}
|
|
|
|
export function createPlayJellyfinItemInMpvHandler(deps: {
|
|
ensureMpvConnectedForPlayback: () => Promise<boolean>;
|
|
getMpvClient: () => MpvRuntimeClientLike | null;
|
|
resolvePlaybackPlan: (params: {
|
|
session: JellyfinAuthSession;
|
|
clientInfo: JellyfinClientInfo;
|
|
jellyfinConfig: JellyfinConfig;
|
|
itemId: string;
|
|
audioStreamIndex?: number | null;
|
|
subtitleStreamIndex?: number | null;
|
|
}) => Promise<JellyfinPlaybackPlan>;
|
|
applyJellyfinMpvDefaults: (mpvClient: MpvRuntimeClientLike) => void;
|
|
showVisibleOverlay: () => void;
|
|
sendMpvCommand: (command: Array<string | number>) => void;
|
|
armQuitOnDisconnect: () => void;
|
|
schedule: (callback: () => void, delayMs: number) => void;
|
|
convertTicksToSeconds: (ticks: number) => number;
|
|
preloadExternalSubtitles: (params: {
|
|
session: JellyfinAuthSession;
|
|
clientInfo: JellyfinClientInfo;
|
|
itemId: string;
|
|
}) => void | Promise<void>;
|
|
setActivePlayback: (state: ActivePlaybackState) => void;
|
|
setLastProgressAtMs: (value: number) => void;
|
|
reportPlaying: (payload: {
|
|
itemId: string;
|
|
mediaSourceId: undefined;
|
|
playMethod: 'DirectPlay' | 'Transcode';
|
|
positionTicks?: number;
|
|
isPaused?: boolean;
|
|
audioStreamIndex?: number | null;
|
|
subtitleStreamIndex?: number | null;
|
|
eventName: 'start';
|
|
}) => void;
|
|
showMpvOsd: (text: string) => void;
|
|
recordJellyfinPlaybackMetadata?: (
|
|
metadata: JellyfinPlaybackStatsMetadata,
|
|
) => void | Promise<void>;
|
|
updateCurrentMediaTitle?: (title: string) => void | Promise<void>;
|
|
}) {
|
|
return async (params: {
|
|
session: JellyfinAuthSession;
|
|
clientInfo: JellyfinClientInfo;
|
|
jellyfinConfig: JellyfinConfig;
|
|
itemId: string;
|
|
audioStreamIndex?: number | null;
|
|
subtitleStreamIndex?: number | null;
|
|
startTimeTicksOverride?: number;
|
|
fallbackToPlanStartTimeOnZeroOverride?: boolean;
|
|
setQuitOnDisconnectArm?: boolean;
|
|
}): Promise<void> => {
|
|
const connected = await deps.ensureMpvConnectedForPlayback();
|
|
const mpvClient = deps.getMpvClient();
|
|
if (!connected || !mpvClient) {
|
|
throw new Error(
|
|
'MPV not connected and auto-launch failed. Ensure mpv is installed and available in PATH.',
|
|
);
|
|
}
|
|
|
|
const plan = await deps.resolvePlaybackPlan({
|
|
session: params.session,
|
|
clientInfo: params.clientInfo,
|
|
jellyfinConfig: params.jellyfinConfig,
|
|
itemId: params.itemId,
|
|
audioStreamIndex: params.audioStreamIndex,
|
|
subtitleStreamIndex: params.subtitleStreamIndex,
|
|
});
|
|
|
|
deps.applyJellyfinMpvDefaults(mpvClient);
|
|
deps.sendMpvCommand(['set_property', 'sub-auto', 'no']);
|
|
deps.sendMpvCommand(['set_property', 'sid', 'no']);
|
|
deps.sendMpvCommand(['set_property', 'secondary-sid', 'no']);
|
|
deps.sendMpvCommand(['set_property', 'sub-visibility', 'no']);
|
|
deps.sendMpvCommand(['set_property', 'secondary-sub-visibility', 'no']);
|
|
const startTimeTicks = resolveEffectiveStartTimeTicks(
|
|
plan.startTimeTicks,
|
|
params.startTimeTicksOverride,
|
|
params.fallbackToPlanStartTimeOnZeroOverride,
|
|
);
|
|
const startSeconds =
|
|
startTimeTicks > 0 ? Math.max(0, deps.convertTicksToSeconds(startTimeTicks)) : 0;
|
|
const playbackUrlBase =
|
|
plan.mode === 'direct'
|
|
? stripStartTimeTicksFromPlaybackUrl(plan.url)
|
|
: applyStartTimeTicksToPlaybackUrl(plan.url, startTimeTicks);
|
|
const playbackUrl = stripManagedSubtitleStreamFromPlaybackUrl(playbackUrlBase);
|
|
const loadfileOptions = buildJellyfinLoadfileOptions(plan, startSeconds);
|
|
const playMethod = plan.mode === 'direct' ? 'DirectPlay' : 'Transcode';
|
|
runBestEffortPlaybackHook(() => deps.updateCurrentMediaTitle?.(plan.title));
|
|
runBestEffortPlaybackHook(() =>
|
|
deps.recordJellyfinPlaybackMetadata?.({
|
|
mediaPath: playbackUrl,
|
|
displayTitle: plan.title,
|
|
itemTitle: plan.itemTitle,
|
|
seriesTitle: plan.seriesTitle,
|
|
seasonNumber: plan.seasonNumber,
|
|
episodeNumber: plan.episodeNumber,
|
|
itemId: params.itemId,
|
|
}),
|
|
);
|
|
deps.setActivePlayback({
|
|
itemId: params.itemId,
|
|
mediaSourceId: undefined,
|
|
audioStreamIndex: plan.audioStreamIndex,
|
|
subtitleStreamIndex: plan.subtitleStreamIndex,
|
|
playMethod,
|
|
loadedMediaPath: null,
|
|
lastKnownPositionSeconds: startSeconds > 0 ? startSeconds : undefined,
|
|
});
|
|
deps.setLastProgressAtMs(0);
|
|
deps.sendMpvCommand(['script-message', 'subminer-managed-subtitles-loading']);
|
|
deps.sendMpvCommand(['loadfile', playbackUrl, 'replace', -1, loadfileOptions]);
|
|
if (params.setQuitOnDisconnectArm !== false) {
|
|
deps.armQuitOnDisconnect();
|
|
}
|
|
deps.sendMpvCommand(['set_property', 'force-media-title', plan.title]);
|
|
|
|
await awaitBestEffortPlaybackHook(() =>
|
|
deps.preloadExternalSubtitles({
|
|
session: params.session,
|
|
clientInfo: params.clientInfo,
|
|
itemId: params.itemId,
|
|
}),
|
|
);
|
|
deps.showVisibleOverlay();
|
|
|
|
deps.reportPlaying({
|
|
itemId: params.itemId,
|
|
mediaSourceId: undefined,
|
|
playMethod,
|
|
positionTicks: startTimeTicks,
|
|
isPaused: false,
|
|
audioStreamIndex: plan.audioStreamIndex,
|
|
subtitleStreamIndex: plan.subtitleStreamIndex,
|
|
eventName: 'start',
|
|
});
|
|
deps.showMpvOsd(`Jellyfin ${plan.mode}: ${plan.title}`);
|
|
};
|
|
}
|