mirror of
https://github.com/ksyasuda/SubMiner.git
synced 2026-05-27 00:55:16 -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
264 lines
8.7 KiB
TypeScript
264 lines
8.7 KiB
TypeScript
import type { ActiveJellyfinRemotePlaybackState } from './jellyfin-remote-commands';
|
|
|
|
type JellyfinRemoteSessionLike = {
|
|
isConnected: () => boolean;
|
|
reportProgress: (payload: {
|
|
itemId: string;
|
|
mediaSourceId?: string;
|
|
positionTicks: number;
|
|
isPaused: boolean;
|
|
playMethod: 'DirectPlay' | 'Transcode';
|
|
audioStreamIndex?: number | null;
|
|
subtitleStreamIndex?: number | null;
|
|
eventName: 'TimeUpdate';
|
|
}) => Promise<unknown>;
|
|
reportStopped: (payload: {
|
|
itemId: string;
|
|
mediaSourceId?: string;
|
|
positionTicks?: number;
|
|
failed?: boolean;
|
|
playMethod: 'DirectPlay' | 'Transcode';
|
|
audioStreamIndex?: number | null;
|
|
subtitleStreamIndex?: number | null;
|
|
eventName: 'stop';
|
|
}) => Promise<unknown>;
|
|
};
|
|
|
|
type MpvClientLike = {
|
|
currentTimePos?: number;
|
|
requestProperty?: (name: string) => Promise<unknown>;
|
|
};
|
|
|
|
export function secondsToJellyfinTicks(seconds: number, ticksPerSecond: number): number {
|
|
if (!Number.isFinite(seconds)) return 0;
|
|
return Math.max(0, Math.floor(seconds * ticksPerSecond));
|
|
}
|
|
|
|
export function markJellyfinRemotePlaybackLoaded(
|
|
playback: ActiveJellyfinRemotePlaybackState | null,
|
|
path: string,
|
|
): void {
|
|
const normalizedPath = path.trim();
|
|
if (playback && normalizedPath) {
|
|
playback.loadedMediaPath = normalizedPath;
|
|
}
|
|
}
|
|
|
|
export function shouldAutoLoadSecondarySubTrackForJellyfinPlayback(
|
|
playback: ActiveJellyfinRemotePlaybackState | null,
|
|
path: string,
|
|
): boolean {
|
|
const normalizedPath = path.trim();
|
|
if (!normalizedPath || !playback) {
|
|
return true;
|
|
}
|
|
const loadedMediaPath = playback.loadedMediaPath?.trim() ?? '';
|
|
if (!loadedMediaPath) {
|
|
return false;
|
|
}
|
|
return loadedMediaPath !== normalizedPath;
|
|
}
|
|
|
|
function isMpvPauseEnabled(value: unknown): boolean {
|
|
if (typeof value === 'boolean') return value;
|
|
if (typeof value === 'number') return value !== 0;
|
|
if (typeof value === 'string') {
|
|
const normalized = value.trim().toLowerCase();
|
|
if (!normalized || normalized === 'no' || normalized === 'false' || normalized === '0') {
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
function normalizeMpvPositionSeconds(value: unknown): number {
|
|
const seconds = Number(value);
|
|
if (!Number.isFinite(seconds)) return 0;
|
|
return Math.max(0, seconds);
|
|
}
|
|
|
|
function getCachedMpvPositionSeconds(client: MpvClientLike | null): number | null {
|
|
if (!client) return null;
|
|
const seconds = Number(client.currentTimePos);
|
|
return Number.isFinite(seconds) ? Math.max(0, seconds) : null;
|
|
}
|
|
|
|
async function readMpvPositionSeconds(client: MpvClientLike | null): Promise<number> {
|
|
const cached = getCachedMpvPositionSeconds(client);
|
|
if (cached !== null) return cached;
|
|
const position = await client?.requestProperty?.('time-pos');
|
|
return normalizeMpvPositionSeconds(position);
|
|
}
|
|
|
|
async function readMpvPositionSecondsOrFallback(
|
|
client: MpvClientLike | null,
|
|
fallback = 0,
|
|
): Promise<number> {
|
|
try {
|
|
return await readMpvPositionSeconds(client);
|
|
} catch {
|
|
return fallback;
|
|
}
|
|
}
|
|
|
|
function cacheLastKnownPosition(
|
|
playback: ActiveJellyfinRemotePlaybackState,
|
|
positionSeconds: number,
|
|
): void {
|
|
if (!Number.isFinite(positionSeconds)) return;
|
|
if (positionSeconds > 0 || playback.lastKnownPositionSeconds === undefined) {
|
|
playback.lastKnownPositionSeconds = Math.max(0, positionSeconds);
|
|
}
|
|
}
|
|
|
|
function resolveReportablePositionSeconds(
|
|
playback: ActiveJellyfinRemotePlaybackState,
|
|
positionSeconds: number,
|
|
): number {
|
|
const normalizedPosition = normalizeMpvPositionSeconds(positionSeconds);
|
|
if (normalizedPosition > 0) return normalizedPosition;
|
|
const cachedPosition = playback.lastKnownPositionSeconds;
|
|
if (typeof cachedPosition === 'number' && Number.isFinite(cachedPosition) && cachedPosition > 0) {
|
|
return cachedPosition;
|
|
}
|
|
return normalizedPosition;
|
|
}
|
|
|
|
function isSeekLikePositionJump(
|
|
previousPositionSeconds: number | null,
|
|
nextPositionSeconds: number,
|
|
thresholdSeconds: number,
|
|
): boolean {
|
|
if (previousPositionSeconds === null) return false;
|
|
return Math.abs(nextPositionSeconds - previousPositionSeconds) >= thresholdSeconds;
|
|
}
|
|
|
|
export type JellyfinRemoteProgressReporterDeps = {
|
|
getActivePlayback: () => ActiveJellyfinRemotePlaybackState | null;
|
|
clearActivePlayback: () => void;
|
|
getSession: () => JellyfinRemoteSessionLike | null;
|
|
getMpvClient: () => MpvClientLike | null;
|
|
getNow: () => number;
|
|
getLastProgressAtMs: () => number;
|
|
setLastProgressAtMs: (value: number) => void;
|
|
progressIntervalMs: number;
|
|
ticksPerSecond: number;
|
|
logDebug: (message: string, error: unknown) => void;
|
|
};
|
|
|
|
export function createReportJellyfinRemoteProgressHandler(
|
|
deps: JellyfinRemoteProgressReporterDeps,
|
|
) {
|
|
let lastReportedPositionSeconds: number | null = null;
|
|
|
|
return async (force = false): Promise<void> => {
|
|
const playback = deps.getActivePlayback();
|
|
if (!playback) return;
|
|
const session = deps.getSession();
|
|
// Timeline posts are HTTP requests; keep them flowing while the remote websocket reconnects.
|
|
if (!session) return;
|
|
const now = deps.getNow();
|
|
try {
|
|
const mpvClient = deps.getMpvClient();
|
|
const observedPositionSeconds = await readMpvPositionSeconds(mpvClient);
|
|
cacheLastKnownPosition(playback, observedPositionSeconds);
|
|
const positionSeconds = resolveReportablePositionSeconds(playback, observedPositionSeconds);
|
|
const forceForSeekJump = isSeekLikePositionJump(
|
|
lastReportedPositionSeconds,
|
|
positionSeconds,
|
|
Math.max(2, deps.progressIntervalMs / 1000),
|
|
);
|
|
if (
|
|
!force &&
|
|
!forceForSeekJump &&
|
|
now - deps.getLastProgressAtMs() < deps.progressIntervalMs
|
|
) {
|
|
return;
|
|
}
|
|
const paused = await mpvClient?.requestProperty?.('pause');
|
|
await session.reportProgress({
|
|
itemId: playback.itemId,
|
|
mediaSourceId: playback.mediaSourceId,
|
|
positionTicks: secondsToJellyfinTicks(positionSeconds, deps.ticksPerSecond),
|
|
isPaused: isMpvPauseEnabled(paused),
|
|
playMethod: playback.playMethod,
|
|
audioStreamIndex: playback.audioStreamIndex,
|
|
subtitleStreamIndex: playback.subtitleStreamIndex,
|
|
eventName: 'TimeUpdate',
|
|
});
|
|
lastReportedPositionSeconds = positionSeconds;
|
|
deps.setLastProgressAtMs(now);
|
|
} catch (error) {
|
|
deps.logDebug('Failed to report Jellyfin remote progress', error);
|
|
}
|
|
};
|
|
}
|
|
|
|
export type JellyfinRemoteStoppedReporterDeps = {
|
|
getActivePlayback: () => ActiveJellyfinRemotePlaybackState | null;
|
|
clearActivePlayback: () => void;
|
|
getSession: () => JellyfinRemoteSessionLike | null;
|
|
getMpvClient: () => MpvClientLike | null;
|
|
getNow?: () => number;
|
|
ticksPerSecond: number;
|
|
logDebug: (message: string, error: unknown) => void;
|
|
};
|
|
|
|
export function createReportJellyfinRemoteStoppedHandler(deps: JellyfinRemoteStoppedReporterDeps) {
|
|
return async (): Promise<void> => {
|
|
const playback = deps.getActivePlayback();
|
|
if (!playback) return;
|
|
if (playback.loadedMediaPath === null) {
|
|
deps.clearActivePlayback();
|
|
return;
|
|
}
|
|
if (
|
|
typeof playback.stopReportsAfterMs === 'number' &&
|
|
Number.isFinite(playback.stopReportsAfterMs) &&
|
|
(deps.getNow?.() ?? Date.now()) < playback.stopReportsAfterMs
|
|
) {
|
|
return;
|
|
}
|
|
const session = deps.getSession();
|
|
// Timeline posts are HTTP requests; keep them flowing while the remote websocket reconnects.
|
|
if (!session) {
|
|
deps.clearActivePlayback();
|
|
return;
|
|
}
|
|
try {
|
|
const observedPositionSeconds = await readMpvPositionSecondsOrFallback(deps.getMpvClient());
|
|
const positionSeconds = resolveReportablePositionSeconds(playback, observedPositionSeconds);
|
|
const positionTicks = secondsToJellyfinTicks(positionSeconds, deps.ticksPerSecond);
|
|
try {
|
|
await session.reportProgress({
|
|
itemId: playback.itemId,
|
|
mediaSourceId: playback.mediaSourceId,
|
|
positionTicks,
|
|
isPaused: false,
|
|
playMethod: playback.playMethod,
|
|
audioStreamIndex: playback.audioStreamIndex,
|
|
subtitleStreamIndex: playback.subtitleStreamIndex,
|
|
eventName: 'TimeUpdate',
|
|
});
|
|
} catch (error) {
|
|
deps.logDebug('Failed to report Jellyfin remote final progress', error);
|
|
}
|
|
await session.reportStopped({
|
|
itemId: playback.itemId,
|
|
mediaSourceId: playback.mediaSourceId,
|
|
positionTicks,
|
|
failed: false,
|
|
playMethod: playback.playMethod,
|
|
audioStreamIndex: playback.audioStreamIndex,
|
|
subtitleStreamIndex: playback.subtitleStreamIndex,
|
|
eventName: 'stop',
|
|
});
|
|
} catch (error) {
|
|
deps.logDebug('Failed to report Jellyfin remote stop', error);
|
|
} finally {
|
|
deps.clearActivePlayback();
|
|
}
|
|
};
|
|
}
|