mirror of
https://github.com/ksyasuda/SubMiner.git
synced 2026-05-26 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
450 lines
14 KiB
TypeScript
450 lines
14 KiB
TypeScript
import type { BrowserWindow } from 'electron';
|
|
import type { OverlayHostedModal } from '../shared/ipc/contracts';
|
|
import type { WindowGeometry } from '../types';
|
|
import { OVERLAY_WINDOW_CONTENT_READY_FLAG } from '../core/services/overlay-window-flags';
|
|
|
|
const MODAL_REVEAL_FALLBACK_DELAY_MS = 250;
|
|
|
|
function requestOverlayApplicationFocus(): void {
|
|
try {
|
|
const electron = require('electron') as {
|
|
app?: {
|
|
focus?: (options?: { steal?: boolean }) => void;
|
|
};
|
|
};
|
|
electron.app?.focus?.({ steal: true });
|
|
} catch {
|
|
// Ignore focus-steal failures in non-Electron test environments.
|
|
}
|
|
}
|
|
|
|
function setWindowFocusable(window: BrowserWindow): void {
|
|
const maybeFocusableWindow = window as BrowserWindow & {
|
|
setFocusable?: (focusable: boolean) => void;
|
|
};
|
|
maybeFocusableWindow.setFocusable?.(true);
|
|
}
|
|
|
|
export interface OverlayWindowResolver {
|
|
getMainWindow: () => BrowserWindow | null;
|
|
getModalWindow: () => BrowserWindow | null;
|
|
createModalWindow: () => BrowserWindow | null;
|
|
getModalGeometry: () => WindowGeometry;
|
|
setModalWindowBounds: (geometry: WindowGeometry) => void;
|
|
}
|
|
|
|
export interface OverlayModalRuntime {
|
|
sendToActiveOverlayWindow: (
|
|
channel: string,
|
|
payload?: unknown,
|
|
runtimeOptions?: {
|
|
restoreOnModalClose?: OverlayHostedModal;
|
|
preferModalWindow?: boolean;
|
|
},
|
|
) => boolean;
|
|
openRuntimeOptionsPalette: () => void;
|
|
openJimaku: () => void;
|
|
handleOverlayModalClosed: (modal: OverlayHostedModal) => void;
|
|
notifyOverlayModalOpened: (modal: OverlayHostedModal) => void;
|
|
waitForModalOpen: (modal: OverlayHostedModal, timeoutMs: number) => Promise<boolean>;
|
|
getRestoreVisibleOverlayOnModalClose: () => Set<OverlayHostedModal>;
|
|
}
|
|
|
|
type RevealFallbackHandle = NonNullable<Parameters<typeof globalThis.clearTimeout>[0]>;
|
|
|
|
export interface OverlayModalRuntimeOptions {
|
|
onModalStateChange?: (isActive: boolean) => void;
|
|
scheduleRevealFallback?: (callback: () => void, delayMs: number) => RevealFallbackHandle;
|
|
clearRevealFallback?: (timeout: RevealFallbackHandle) => void;
|
|
}
|
|
|
|
export function createOverlayModalRuntimeService(
|
|
deps: OverlayWindowResolver,
|
|
options: OverlayModalRuntimeOptions = {},
|
|
): OverlayModalRuntime {
|
|
const restoreVisibleOverlayOnModalClose = new Set<OverlayHostedModal>();
|
|
const modalOpenWaiters = new Map<OverlayHostedModal, Array<(opened: boolean) => void>>();
|
|
let modalActive = false;
|
|
let mainWindowMousePassthroughForcedByModal = false;
|
|
let mainWindowHiddenByModal = false;
|
|
let modalWindowPrimedForImmediateShow = false;
|
|
let pendingModalWindowReveal: BrowserWindow | null = null;
|
|
let pendingModalWindowRevealTimeout: RevealFallbackHandle | null = null;
|
|
const scheduleRevealFallback = (callback: () => void, delayMs: number): RevealFallbackHandle =>
|
|
(options.scheduleRevealFallback ?? globalThis.setTimeout)(callback, delayMs);
|
|
const clearRevealFallback = (timeout: RevealFallbackHandle): void =>
|
|
(options.clearRevealFallback ?? globalThis.clearTimeout)(timeout);
|
|
|
|
const notifyModalStateChange = (nextState: boolean): void => {
|
|
if (modalActive === nextState) return;
|
|
modalActive = nextState;
|
|
options.onModalStateChange?.(nextState);
|
|
};
|
|
|
|
const resolveModalWindow = (): BrowserWindow | null => {
|
|
const existingWindow = deps.getModalWindow();
|
|
if (existingWindow && !existingWindow.isDestroyed()) {
|
|
return existingWindow;
|
|
}
|
|
const createdWindow = deps.createModalWindow();
|
|
if (!createdWindow || createdWindow.isDestroyed()) {
|
|
return null;
|
|
}
|
|
return createdWindow;
|
|
};
|
|
|
|
const getTargetOverlayWindow = (): BrowserWindow | null => {
|
|
const visibleMainWindow = deps.getMainWindow();
|
|
|
|
if (visibleMainWindow && !visibleMainWindow.isDestroyed() && visibleMainWindow.isVisible()) {
|
|
return visibleMainWindow;
|
|
}
|
|
return null;
|
|
};
|
|
|
|
const getActiveOverlayWindowForModalInput = (): BrowserWindow | null => {
|
|
const modalWindow = deps.getModalWindow();
|
|
if (modalWindow && !modalWindow.isDestroyed()) {
|
|
return modalWindow;
|
|
}
|
|
|
|
const visibleMainWindow = deps.getMainWindow();
|
|
if (visibleMainWindow && !visibleMainWindow.isDestroyed()) {
|
|
return visibleMainWindow;
|
|
}
|
|
|
|
return null;
|
|
};
|
|
|
|
const isWindowReadyForIpc = (window: BrowserWindow): boolean => {
|
|
if (window.isDestroyed()) {
|
|
return false;
|
|
}
|
|
if (window.webContents.isLoading()) {
|
|
return false;
|
|
}
|
|
const overlayWindow = window as BrowserWindow & {
|
|
[OVERLAY_WINDOW_CONTENT_READY_FLAG]?: boolean;
|
|
};
|
|
if (
|
|
typeof overlayWindow[OVERLAY_WINDOW_CONTENT_READY_FLAG] === 'boolean' &&
|
|
overlayWindow[OVERLAY_WINDOW_CONTENT_READY_FLAG] !== true
|
|
) {
|
|
return false;
|
|
}
|
|
const currentURL = window.webContents.getURL();
|
|
return currentURL !== '' && currentURL !== 'about:blank';
|
|
};
|
|
|
|
const elevateModalWindow = (window: BrowserWindow): void => {
|
|
if (window.isDestroyed()) return;
|
|
window.setAlwaysOnTop(true, 'screen-saver', 3);
|
|
window.moveTop();
|
|
};
|
|
|
|
const sendOrQueueForWindow = (
|
|
window: BrowserWindow,
|
|
sendNow: (window: BrowserWindow) => void,
|
|
): void => {
|
|
if (isWindowReadyForIpc(window)) {
|
|
sendNow(window);
|
|
return;
|
|
}
|
|
|
|
let delivered = false;
|
|
const deliverWhenReady = (): void => {
|
|
if (delivered || window.isDestroyed() || !isWindowReadyForIpc(window)) {
|
|
return;
|
|
}
|
|
delivered = true;
|
|
sendNow(window);
|
|
};
|
|
|
|
window.webContents.once('did-finish-load', deliverWhenReady);
|
|
window.once('ready-to-show', deliverWhenReady);
|
|
};
|
|
|
|
const showModalWindow = (
|
|
window: BrowserWindow,
|
|
options: {
|
|
passThroughMouseEvents: boolean;
|
|
} = { passThroughMouseEvents: false },
|
|
): void => {
|
|
setWindowFocusable(window);
|
|
requestOverlayApplicationFocus();
|
|
if (!window.isVisible()) {
|
|
window.show();
|
|
}
|
|
elevateModalWindow(window);
|
|
if (options.passThroughMouseEvents) {
|
|
window.setIgnoreMouseEvents(true, { forward: true });
|
|
} else {
|
|
window.setIgnoreMouseEvents(false);
|
|
}
|
|
window.focus();
|
|
if (!window.webContents.isFocused()) {
|
|
window.webContents.focus();
|
|
}
|
|
};
|
|
|
|
const ensureModalWindowInteractive = (window: BrowserWindow): void => {
|
|
setWindowFocusable(window);
|
|
requestOverlayApplicationFocus();
|
|
window.setIgnoreMouseEvents(false);
|
|
elevateModalWindow(window);
|
|
|
|
if (window.isVisible()) {
|
|
window.focus();
|
|
window.webContents.focus();
|
|
return;
|
|
}
|
|
|
|
showModalWindow(window);
|
|
};
|
|
|
|
const showOverlayWindowForModal = (window: BrowserWindow): void => {
|
|
window.show();
|
|
if (!window.isFocused()) {
|
|
window.focus();
|
|
}
|
|
};
|
|
|
|
const clearPendingModalWindowReveal = (): void => {
|
|
if (pendingModalWindowRevealTimeout === null) {
|
|
pendingModalWindowReveal = null;
|
|
return;
|
|
}
|
|
|
|
clearRevealFallback(pendingModalWindowRevealTimeout);
|
|
pendingModalWindowRevealTimeout = null;
|
|
pendingModalWindowReveal = null;
|
|
};
|
|
|
|
const setMainWindowMousePassthroughForModal = (enabled: boolean): void => {
|
|
const mainWindow = deps.getMainWindow();
|
|
if (!mainWindow || mainWindow.isDestroyed()) {
|
|
mainWindowMousePassthroughForcedByModal = false;
|
|
return;
|
|
}
|
|
|
|
if (enabled) {
|
|
if (!mainWindow.isVisible()) {
|
|
mainWindowMousePassthroughForcedByModal = false;
|
|
return;
|
|
}
|
|
mainWindow.setIgnoreMouseEvents(true, { forward: true });
|
|
mainWindowMousePassthroughForcedByModal = true;
|
|
return;
|
|
}
|
|
|
|
if (!mainWindowMousePassthroughForcedByModal) {
|
|
return;
|
|
}
|
|
mainWindow.setIgnoreMouseEvents(false);
|
|
mainWindowMousePassthroughForcedByModal = false;
|
|
};
|
|
|
|
const setMainWindowVisibilityForModal = (hidden: boolean): void => {
|
|
const mainWindow = deps.getMainWindow();
|
|
if (!mainWindow || mainWindow.isDestroyed()) {
|
|
mainWindowHiddenByModal = false;
|
|
return;
|
|
}
|
|
|
|
if (hidden) {
|
|
if (!mainWindow.isVisible()) {
|
|
mainWindowHiddenByModal = false;
|
|
return;
|
|
}
|
|
mainWindow.hide();
|
|
mainWindowHiddenByModal = true;
|
|
return;
|
|
}
|
|
|
|
if (!mainWindowHiddenByModal) {
|
|
return;
|
|
}
|
|
mainWindow.show();
|
|
mainWindowHiddenByModal = false;
|
|
};
|
|
|
|
const scheduleModalWindowReveal = (window: BrowserWindow): void => {
|
|
pendingModalWindowReveal = window;
|
|
if (pendingModalWindowRevealTimeout !== null) {
|
|
return;
|
|
}
|
|
|
|
pendingModalWindowRevealTimeout = scheduleRevealFallback(() => {
|
|
const targetWindow = pendingModalWindowReveal;
|
|
clearPendingModalWindowReveal();
|
|
if (!targetWindow || targetWindow.isDestroyed() || targetWindow.isVisible()) {
|
|
return;
|
|
}
|
|
if (!isWindowReadyForIpc(targetWindow)) {
|
|
return;
|
|
}
|
|
showModalWindow(targetWindow, { passThroughMouseEvents: false });
|
|
}, MODAL_REVEAL_FALLBACK_DELAY_MS);
|
|
};
|
|
|
|
const sendToActiveOverlayWindow = (
|
|
channel: string,
|
|
payload?: unknown,
|
|
runtimeOptions?: {
|
|
restoreOnModalClose?: OverlayHostedModal;
|
|
preferModalWindow?: boolean;
|
|
},
|
|
): boolean => {
|
|
const restoreOnModalClose = runtimeOptions?.restoreOnModalClose;
|
|
const preferModalWindow = runtimeOptions?.preferModalWindow === true;
|
|
|
|
const sendNow = (window: BrowserWindow): void => {
|
|
ensureModalWindowInteractive(window);
|
|
if (payload === undefined) {
|
|
window.webContents.send(channel);
|
|
} else {
|
|
window.webContents.send(channel, payload);
|
|
}
|
|
};
|
|
|
|
if (restoreOnModalClose) {
|
|
const mainWindow = getTargetOverlayWindow();
|
|
if (!preferModalWindow && mainWindow && !mainWindow.isDestroyed() && mainWindow.isVisible()) {
|
|
restoreVisibleOverlayOnModalClose.add(restoreOnModalClose);
|
|
sendOrQueueForWindow(mainWindow, (window) => {
|
|
if (payload === undefined) {
|
|
window.webContents.send(channel);
|
|
} else {
|
|
window.webContents.send(channel, payload);
|
|
}
|
|
});
|
|
return true;
|
|
}
|
|
|
|
const modalWindow = resolveModalWindow();
|
|
if (!modalWindow) return false;
|
|
|
|
restoreVisibleOverlayOnModalClose.add(restoreOnModalClose);
|
|
deps.setModalWindowBounds(deps.getModalGeometry());
|
|
const wasVisible = modalWindow.isVisible();
|
|
if (!wasVisible) {
|
|
if (modalWindowPrimedForImmediateShow && isWindowReadyForIpc(modalWindow)) {
|
|
showModalWindow(modalWindow);
|
|
} else {
|
|
scheduleModalWindowReveal(modalWindow);
|
|
}
|
|
} else if (!modalWindow.isFocused()) {
|
|
showModalWindow(modalWindow);
|
|
}
|
|
|
|
sendOrQueueForWindow(modalWindow, (window) => {
|
|
if (window.isVisible()) {
|
|
ensureModalWindowInteractive(window);
|
|
}
|
|
if (payload === undefined) {
|
|
window.webContents.send(channel);
|
|
} else {
|
|
window.webContents.send(channel, payload);
|
|
}
|
|
});
|
|
return true;
|
|
}
|
|
|
|
const target = getTargetOverlayWindow();
|
|
if (!target) return false;
|
|
|
|
const wasVisible = target.isVisible();
|
|
if (!wasVisible) {
|
|
showOverlayWindowForModal(target);
|
|
}
|
|
|
|
sendOrQueueForWindow(target, sendNow);
|
|
return true;
|
|
};
|
|
|
|
const openRuntimeOptionsPalette = (): void => {
|
|
sendToActiveOverlayWindow('runtime-options:open', undefined, {
|
|
restoreOnModalClose: 'runtime-options',
|
|
});
|
|
};
|
|
|
|
const openJimaku = (): void => {
|
|
sendToActiveOverlayWindow('jimaku:open', undefined, {
|
|
restoreOnModalClose: 'jimaku',
|
|
});
|
|
};
|
|
|
|
const handleOverlayModalClosed = (modal: OverlayHostedModal): void => {
|
|
if (!restoreVisibleOverlayOnModalClose.has(modal)) return;
|
|
restoreVisibleOverlayOnModalClose.delete(modal);
|
|
const modalWindow = deps.getModalWindow();
|
|
if (restoreVisibleOverlayOnModalClose.size === 0) {
|
|
clearPendingModalWindowReveal();
|
|
if (modalWindow && !modalWindow.isDestroyed()) {
|
|
modalWindow.destroy();
|
|
}
|
|
modalWindowPrimedForImmediateShow = false;
|
|
mainWindowMousePassthroughForcedByModal = false;
|
|
mainWindowHiddenByModal = false;
|
|
notifyModalStateChange(false);
|
|
}
|
|
};
|
|
|
|
const notifyOverlayModalOpened = (modal: OverlayHostedModal): void => {
|
|
if (!restoreVisibleOverlayOnModalClose.has(modal)) return;
|
|
const waiters = modalOpenWaiters.get(modal) ?? [];
|
|
modalOpenWaiters.delete(modal);
|
|
for (const resolve of waiters) {
|
|
resolve(true);
|
|
}
|
|
notifyModalStateChange(true);
|
|
const targetWindow = getActiveOverlayWindowForModalInput();
|
|
clearPendingModalWindowReveal();
|
|
if (!targetWindow || targetWindow.isDestroyed()) {
|
|
return;
|
|
}
|
|
|
|
const modalWindow = deps.getModalWindow();
|
|
if (modalWindow && !modalWindow.isDestroyed() && targetWindow === modalWindow) {
|
|
setMainWindowMousePassthroughForModal(true);
|
|
setMainWindowVisibilityForModal(true);
|
|
}
|
|
|
|
if (targetWindow.isVisible()) {
|
|
ensureModalWindowInteractive(targetWindow);
|
|
return;
|
|
}
|
|
|
|
showModalWindow(targetWindow);
|
|
};
|
|
|
|
const waitForModalOpen = async (modal: OverlayHostedModal, timeoutMs: number): Promise<boolean> =>
|
|
await new Promise<boolean>((resolve) => {
|
|
const waiters = modalOpenWaiters.get(modal) ?? [];
|
|
const finish = (opened: boolean): void => {
|
|
clearTimeout(timeout);
|
|
resolve(opened);
|
|
};
|
|
waiters.push(finish);
|
|
modalOpenWaiters.set(modal, waiters);
|
|
const timeout = setTimeout(() => {
|
|
const current = modalOpenWaiters.get(modal) ?? [];
|
|
modalOpenWaiters.set(
|
|
modal,
|
|
current.filter((candidate) => candidate !== finish),
|
|
);
|
|
resolve(false);
|
|
}, timeoutMs);
|
|
});
|
|
|
|
return {
|
|
sendToActiveOverlayWindow,
|
|
openRuntimeOptionsPalette,
|
|
openJimaku,
|
|
handleOverlayModalClosed,
|
|
notifyOverlayModalOpened,
|
|
waitForModalOpen,
|
|
getRestoreVisibleOverlayOnModalClose: () => restoreVisibleOverlayOnModalClose,
|
|
};
|
|
}
|