mirror of
https://github.com/ksyasuda/SubMiner.git
synced 2026-08-01 07:21:33 -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
207 lines
6.7 KiB
TypeScript
207 lines
6.7 KiB
TypeScript
export type ActiveJellyfinRemotePlaybackState = {
|
|
itemId: string;
|
|
mediaSourceId?: string;
|
|
audioStreamIndex?: number | null;
|
|
subtitleStreamIndex?: number | null;
|
|
playMethod: 'DirectPlay' | 'Transcode';
|
|
loadedMediaPath?: string | null;
|
|
stopReportsAfterMs?: number;
|
|
lastKnownPositionSeconds?: number;
|
|
};
|
|
|
|
type JellyfinSession = {
|
|
serverUrl: string;
|
|
accessToken: string;
|
|
userId: string;
|
|
username: string;
|
|
};
|
|
|
|
type JellyfinClientInfo = {
|
|
clientName: string;
|
|
clientVersion: string;
|
|
deviceId: string;
|
|
};
|
|
|
|
type JellyfinConfigLike = {
|
|
serverUrl?: string;
|
|
accessToken?: string;
|
|
userId?: string;
|
|
username?: string;
|
|
};
|
|
|
|
function asInteger(value: unknown): number | undefined {
|
|
if (typeof value === 'number' && Number.isSafeInteger(value)) return value;
|
|
if (typeof value === 'string') {
|
|
const parsed = Number(value.trim());
|
|
if (Number.isSafeInteger(parsed)) return parsed;
|
|
}
|
|
return undefined;
|
|
}
|
|
|
|
export function getConfiguredJellyfinSession(config: JellyfinConfigLike): JellyfinSession | null {
|
|
if (!config.serverUrl || !config.accessToken || !config.userId) {
|
|
return null;
|
|
}
|
|
return {
|
|
serverUrl: config.serverUrl,
|
|
accessToken: config.accessToken,
|
|
userId: config.userId,
|
|
username: config.username || '',
|
|
};
|
|
}
|
|
|
|
export type JellyfinRemotePlayHandlerDeps = {
|
|
getConfiguredSession: () => JellyfinSession | null;
|
|
getClientInfo: () => JellyfinClientInfo;
|
|
getJellyfinConfig: () => unknown;
|
|
getActivePlayback?: () => ActiveJellyfinRemotePlaybackState | null;
|
|
playJellyfinItem: (params: {
|
|
session: JellyfinSession;
|
|
clientInfo: JellyfinClientInfo;
|
|
jellyfinConfig: unknown;
|
|
itemId: string;
|
|
audioStreamIndex?: number;
|
|
subtitleStreamIndex?: number;
|
|
startTimeTicksOverride?: number;
|
|
fallbackToPlanStartTimeOnZeroOverride?: boolean;
|
|
setQuitOnDisconnectArm?: boolean;
|
|
}) => Promise<void>;
|
|
logWarn: (message: string) => void;
|
|
};
|
|
|
|
export function createHandleJellyfinRemotePlay(deps: JellyfinRemotePlayHandlerDeps) {
|
|
return async (payload: unknown): Promise<void> => {
|
|
const session = deps.getConfiguredSession();
|
|
if (!session) return;
|
|
const clientInfo = deps.getClientInfo();
|
|
const jellyfinConfig = deps.getJellyfinConfig();
|
|
const data = payload && typeof payload === 'object' ? (payload as Record<string, unknown>) : {};
|
|
const itemIds = Array.isArray(data.ItemIds)
|
|
? data.ItemIds.filter((entry): entry is string => typeof entry === 'string')
|
|
: [];
|
|
const itemId = itemIds[0];
|
|
if (!itemId) {
|
|
deps.logWarn('Ignoring Jellyfin remote Play event without ItemIds.');
|
|
return;
|
|
}
|
|
if (deps.getActivePlayback?.()?.itemId === itemId) {
|
|
return;
|
|
}
|
|
const hasStartPositionTicks = Object.prototype.hasOwnProperty.call(data, 'StartPositionTicks');
|
|
const startTimeTicksOverride = hasStartPositionTicks
|
|
? (asInteger(data.StartPositionTicks) ?? 0)
|
|
: 0;
|
|
await deps.playJellyfinItem({
|
|
session,
|
|
clientInfo,
|
|
jellyfinConfig,
|
|
itemId,
|
|
audioStreamIndex: asInteger(data.AudioStreamIndex),
|
|
subtitleStreamIndex: asInteger(data.SubtitleStreamIndex),
|
|
startTimeTicksOverride,
|
|
fallbackToPlanStartTimeOnZeroOverride: hasStartPositionTicks,
|
|
setQuitOnDisconnectArm: false,
|
|
});
|
|
};
|
|
}
|
|
|
|
type MpvClientLike = object;
|
|
|
|
export type JellyfinRemotePlaystateHandlerDeps = {
|
|
getMpvClient: () => MpvClientLike | null;
|
|
sendMpvCommand: (client: MpvClientLike, command: (string | number)[]) => void;
|
|
reportJellyfinRemoteProgress: (force: boolean) => Promise<void>;
|
|
reportJellyfinRemoteStopped: () => Promise<void>;
|
|
jellyfinTicksToSeconds: (ticks: number) => number;
|
|
};
|
|
|
|
export function createHandleJellyfinRemotePlaystate(deps: JellyfinRemotePlaystateHandlerDeps) {
|
|
return async (payload: unknown): Promise<void> => {
|
|
const data = payload && typeof payload === 'object' ? (payload as Record<string, unknown>) : {};
|
|
const command = String(data.Command || '');
|
|
const client = deps.getMpvClient();
|
|
if (!client) return;
|
|
if (command === 'Pause') {
|
|
deps.sendMpvCommand(client, ['set_property', 'pause', 'yes']);
|
|
await deps.reportJellyfinRemoteProgress(true);
|
|
return;
|
|
}
|
|
if (command === 'Unpause') {
|
|
deps.sendMpvCommand(client, ['set_property', 'pause', 'no']);
|
|
await deps.reportJellyfinRemoteProgress(true);
|
|
return;
|
|
}
|
|
if (command === 'PlayPause') {
|
|
deps.sendMpvCommand(client, ['cycle', 'pause']);
|
|
await deps.reportJellyfinRemoteProgress(true);
|
|
return;
|
|
}
|
|
if (command === 'Stop') {
|
|
deps.sendMpvCommand(client, ['stop']);
|
|
await deps.reportJellyfinRemoteStopped();
|
|
return;
|
|
}
|
|
if (command === 'Seek') {
|
|
const seekTicks = asInteger(data.SeekPositionTicks);
|
|
if (seekTicks !== undefined) {
|
|
deps.sendMpvCommand(client, [
|
|
'seek',
|
|
deps.jellyfinTicksToSeconds(seekTicks),
|
|
'absolute+exact',
|
|
]);
|
|
await deps.reportJellyfinRemoteProgress(true);
|
|
}
|
|
}
|
|
};
|
|
}
|
|
|
|
export type JellyfinRemoteGeneralCommandHandlerDeps = {
|
|
getMpvClient: () => MpvClientLike | null;
|
|
sendMpvCommand: (client: MpvClientLike, command: (string | number)[]) => void;
|
|
getActivePlayback: () => ActiveJellyfinRemotePlaybackState | null;
|
|
reportJellyfinRemoteProgress: (force: boolean) => Promise<void>;
|
|
logDebug: (message: string) => void;
|
|
};
|
|
|
|
export function createHandleJellyfinRemoteGeneralCommand(
|
|
deps: JellyfinRemoteGeneralCommandHandlerDeps,
|
|
) {
|
|
return async (payload: unknown): Promise<void> => {
|
|
const data = payload && typeof payload === 'object' ? (payload as Record<string, unknown>) : {};
|
|
const command = String(data.Name || '');
|
|
const args =
|
|
data.Arguments && typeof data.Arguments === 'object'
|
|
? (data.Arguments as Record<string, unknown>)
|
|
: {};
|
|
const client = deps.getMpvClient();
|
|
if (!client) return;
|
|
|
|
if (command === 'SetAudioStreamIndex') {
|
|
const index = asInteger(args.Index);
|
|
if (index !== undefined) {
|
|
deps.sendMpvCommand(client, ['set_property', 'aid', index]);
|
|
const playback = deps.getActivePlayback();
|
|
if (playback) {
|
|
playback.audioStreamIndex = index;
|
|
}
|
|
await deps.reportJellyfinRemoteProgress(true);
|
|
}
|
|
return;
|
|
}
|
|
if (command === 'SetSubtitleStreamIndex') {
|
|
const index = asInteger(args.Index);
|
|
if (index !== undefined) {
|
|
deps.sendMpvCommand(client, ['set_property', 'sid', index < 0 ? 'no' : index]);
|
|
const playback = deps.getActivePlayback();
|
|
if (playback) {
|
|
playback.subtitleStreamIndex = index < 0 ? null : index;
|
|
}
|
|
await deps.reportJellyfinRemoteProgress(true);
|
|
}
|
|
return;
|
|
}
|
|
|
|
deps.logDebug(`Ignoring unsupported Jellyfin GeneralCommand: ${command}`);
|
|
};
|
|
}
|