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
152 lines
5.1 KiB
TypeScript
152 lines
5.1 KiB
TypeScript
import { resolveJellyfinRemoteDeviceName } from './jellyfin-device-identity';
|
|
|
|
type JellyfinRemoteConfig = {
|
|
enabled: boolean;
|
|
remoteControlEnabled: boolean;
|
|
remoteControlAutoConnect: boolean;
|
|
serverUrl: string;
|
|
accessToken?: string;
|
|
userId?: string;
|
|
autoAnnounce: boolean;
|
|
};
|
|
|
|
type JellyfinClientInfo = {
|
|
deviceId: string;
|
|
clientName: string;
|
|
clientVersion: string;
|
|
};
|
|
|
|
type JellyfinRemoteService = {
|
|
start: () => void;
|
|
stop: () => void;
|
|
advertiseNow: () => Promise<boolean>;
|
|
};
|
|
|
|
type JellyfinRemoteEventPayload = unknown;
|
|
|
|
type JellyfinRemoteServiceOptions = {
|
|
serverUrl: string;
|
|
accessToken: string;
|
|
deviceId: string;
|
|
clientName: string;
|
|
clientVersion: string;
|
|
deviceName: string;
|
|
capabilities: {
|
|
PlayableMediaTypes: string;
|
|
SupportedCommands: string;
|
|
SupportsMediaControl: boolean;
|
|
};
|
|
onConnected: () => void;
|
|
onDisconnected: () => void;
|
|
onPlay: (payload: JellyfinRemoteEventPayload) => void;
|
|
onPlaystate: (payload: JellyfinRemoteEventPayload) => void;
|
|
onGeneralCommand: (payload: JellyfinRemoteEventPayload) => void;
|
|
};
|
|
|
|
export function createStartJellyfinRemoteSessionHandler(deps: {
|
|
getJellyfinConfig: () => JellyfinRemoteConfig;
|
|
getCurrentSession: () => JellyfinRemoteService | null;
|
|
setCurrentSession: (session: JellyfinRemoteService | null) => void;
|
|
createRemoteSessionService: (options: JellyfinRemoteServiceOptions) => JellyfinRemoteService;
|
|
getClientInfo: () => JellyfinClientInfo;
|
|
getHostName: () => string;
|
|
defaultDeviceId: string;
|
|
defaultClientName: string;
|
|
defaultClientVersion: string;
|
|
handlePlay: (payload: JellyfinRemoteEventPayload) => Promise<void>;
|
|
handlePlaystate: (payload: JellyfinRemoteEventPayload) => Promise<void>;
|
|
handleGeneralCommand: (payload: JellyfinRemoteEventPayload) => Promise<void>;
|
|
logInfo: (message: string) => void;
|
|
logWarn: (message: string, details?: unknown) => void;
|
|
onSessionStateChanged?: () => void;
|
|
}) {
|
|
return async (options?: { explicit?: boolean }): Promise<void> => {
|
|
const jellyfinConfig = deps.getJellyfinConfig();
|
|
if (jellyfinConfig.enabled === false) return;
|
|
if (jellyfinConfig.remoteControlEnabled === false) return;
|
|
if (jellyfinConfig.remoteControlAutoConnect === false && options?.explicit !== true) return;
|
|
if (!jellyfinConfig.serverUrl || !jellyfinConfig.accessToken || !jellyfinConfig.userId) return;
|
|
|
|
const clientInfo = deps.getClientInfo();
|
|
const clientName = clientInfo.clientName || deps.defaultClientName;
|
|
const clientVersion = clientInfo.clientVersion || deps.defaultClientVersion;
|
|
const deviceName = resolveJellyfinRemoteDeviceName({
|
|
hostName: deps.getHostName(),
|
|
});
|
|
|
|
const existing = deps.getCurrentSession();
|
|
if (existing) {
|
|
existing.stop();
|
|
deps.setCurrentSession(null);
|
|
}
|
|
|
|
const service = deps.createRemoteSessionService({
|
|
serverUrl: jellyfinConfig.serverUrl,
|
|
accessToken: jellyfinConfig.accessToken,
|
|
deviceId: clientInfo.deviceId || deps.defaultDeviceId,
|
|
clientName,
|
|
clientVersion,
|
|
deviceName,
|
|
capabilities: {
|
|
PlayableMediaTypes: 'Video,Audio',
|
|
SupportedCommands:
|
|
'Play,Playstate,PlayMediaSource,SetAudioStreamIndex,SetSubtitleStreamIndex,Mute,Unmute,SetVolume,DisplayContent',
|
|
SupportsMediaControl: true,
|
|
},
|
|
onConnected: () => {
|
|
deps.logInfo('Jellyfin remote websocket connected.');
|
|
if (jellyfinConfig.autoAnnounce) {
|
|
void service.advertiseNow().then((registered) => {
|
|
if (registered) {
|
|
deps.logInfo('Jellyfin cast target is visible to server sessions.');
|
|
} else {
|
|
deps.logWarn(
|
|
'Jellyfin remote connected but device not visible in server sessions yet.',
|
|
);
|
|
}
|
|
});
|
|
}
|
|
},
|
|
onDisconnected: () => {
|
|
deps.logWarn('Jellyfin remote websocket disconnected; retrying.');
|
|
},
|
|
onPlay: (payload) => {
|
|
void deps.handlePlay(payload).catch((error) => {
|
|
deps.logWarn('Failed handling Jellyfin remote Play event', error);
|
|
});
|
|
},
|
|
onPlaystate: (payload) => {
|
|
void deps.handlePlaystate(payload).catch((error) => {
|
|
deps.logWarn('Failed handling Jellyfin remote Playstate event', error);
|
|
});
|
|
},
|
|
onGeneralCommand: (payload) => {
|
|
void deps.handleGeneralCommand(payload).catch((error) => {
|
|
deps.logWarn('Failed handling Jellyfin remote GeneralCommand event', error);
|
|
});
|
|
},
|
|
});
|
|
|
|
service.start();
|
|
deps.setCurrentSession(service);
|
|
deps.onSessionStateChanged?.();
|
|
deps.logInfo(`Jellyfin remote session enabled (${deviceName}).`);
|
|
};
|
|
}
|
|
|
|
export function createStopJellyfinRemoteSessionHandler(deps: {
|
|
getCurrentSession: () => JellyfinRemoteService | null;
|
|
setCurrentSession: (session: JellyfinRemoteService | null) => void;
|
|
clearActivePlayback: () => void;
|
|
onSessionStateChanged?: () => void;
|
|
}) {
|
|
return (): void => {
|
|
const session = deps.getCurrentSession();
|
|
if (!session) return;
|
|
session.stop();
|
|
deps.setCurrentSession(null);
|
|
deps.clearActivePlayback();
|
|
deps.onSessionStateChanged?.();
|
|
};
|
|
}
|