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
204 lines
6.1 KiB
TypeScript
204 lines
6.1 KiB
TypeScript
import { CliArgs, CliCommandSource } from '../../cli/args';
|
|
import { createLogger } from '../../logger';
|
|
|
|
const logger = createLogger('main:app-lifecycle');
|
|
|
|
export interface AppLifecycleServiceDeps {
|
|
shouldStartApp: (args: CliArgs) => boolean;
|
|
parseArgs: (argv: string[]) => CliArgs;
|
|
requestSingleInstanceLock: () => boolean;
|
|
quitApp: () => void;
|
|
exitApp: (code: number) => void;
|
|
onSecondInstance: (handler: (_event: unknown, argv: string[]) => void) => void;
|
|
handleCliCommand: (args: CliArgs, source: CliCommandSource) => void;
|
|
printHelp: () => void;
|
|
logNoRunningInstance: () => void;
|
|
startControlServer?: (handleArgv: (argv: string[]) => void) => (() => void) | void;
|
|
whenReady: (handler: () => Promise<void>) => void;
|
|
onWindowAllClosed: (handler: () => void) => void;
|
|
onWillQuit: (handler: () => void) => void;
|
|
onActivate: (handler: () => void) => void;
|
|
isDarwinPlatform: () => boolean;
|
|
onReady: () => Promise<void>;
|
|
onWillQuitCleanup: () => void;
|
|
shouldRestoreWindowsOnActivate: () => boolean;
|
|
restoreWindowsOnActivate: () => void;
|
|
shouldQuitOnWindowAllClosed: () => boolean;
|
|
}
|
|
|
|
interface AppLike {
|
|
requestSingleInstanceLock: () => boolean;
|
|
quit: () => void;
|
|
exit?: (exitCode?: number) => void;
|
|
on: (...args: any[]) => unknown;
|
|
whenReady: () => Promise<void>;
|
|
}
|
|
|
|
export interface AppLifecycleDepsRuntimeOptions {
|
|
app: AppLike;
|
|
platform: NodeJS.Platform;
|
|
shouldStartApp: (args: CliArgs) => boolean;
|
|
parseArgs: (argv: string[]) => CliArgs;
|
|
handleCliCommand: (args: CliArgs, source: CliCommandSource) => void;
|
|
printHelp: () => void;
|
|
logNoRunningInstance: () => void;
|
|
startControlServer?: (handleArgv: (argv: string[]) => void) => (() => void) | void;
|
|
onReady: () => Promise<void>;
|
|
onWillQuitCleanup: () => void;
|
|
shouldRestoreWindowsOnActivate: () => boolean;
|
|
restoreWindowsOnActivate: () => void;
|
|
shouldQuitOnWindowAllClosed: () => boolean;
|
|
}
|
|
|
|
export function createAppLifecycleDepsRuntime(
|
|
options: AppLifecycleDepsRuntimeOptions,
|
|
): AppLifecycleServiceDeps {
|
|
return {
|
|
shouldStartApp: options.shouldStartApp,
|
|
parseArgs: options.parseArgs,
|
|
requestSingleInstanceLock: () => options.app.requestSingleInstanceLock(),
|
|
quitApp: () => options.app.quit(),
|
|
exitApp: (code) => {
|
|
if (options.app.exit) {
|
|
options.app.exit(code);
|
|
return;
|
|
}
|
|
process.exitCode = code;
|
|
options.app.quit();
|
|
},
|
|
onSecondInstance: (handler) => {
|
|
options.app.on('second-instance', handler as (...args: unknown[]) => void);
|
|
},
|
|
handleCliCommand: options.handleCliCommand,
|
|
printHelp: options.printHelp,
|
|
logNoRunningInstance: options.logNoRunningInstance,
|
|
startControlServer: options.startControlServer,
|
|
whenReady: (handler) => {
|
|
options.app
|
|
.whenReady()
|
|
.then(handler)
|
|
.catch((error) => {
|
|
logger.error('App ready handler failed:', error);
|
|
});
|
|
},
|
|
onWindowAllClosed: (handler) => {
|
|
options.app.on('window-all-closed', handler as (...args: unknown[]) => void);
|
|
},
|
|
onWillQuit: (handler) => {
|
|
options.app.on('will-quit', handler as (...args: unknown[]) => void);
|
|
},
|
|
onActivate: (handler) => {
|
|
options.app.on('activate', handler as (...args: unknown[]) => void);
|
|
},
|
|
isDarwinPlatform: () => options.platform === 'darwin',
|
|
onReady: options.onReady,
|
|
onWillQuitCleanup: options.onWillQuitCleanup,
|
|
shouldRestoreWindowsOnActivate: options.shouldRestoreWindowsOnActivate,
|
|
restoreWindowsOnActivate: options.restoreWindowsOnActivate,
|
|
shouldQuitOnWindowAllClosed: options.shouldQuitOnWindowAllClosed,
|
|
};
|
|
}
|
|
|
|
export function startAppLifecycle(initialArgs: CliArgs, deps: AppLifecycleServiceDeps): void {
|
|
if (initialArgs.help && !deps.shouldStartApp(initialArgs)) {
|
|
deps.printHelp();
|
|
deps.quitApp();
|
|
return;
|
|
}
|
|
|
|
const gotTheLock = deps.requestSingleInstanceLock();
|
|
if (initialArgs.appPing) {
|
|
deps.exitApp(gotTheLock ? 1 : 0);
|
|
return;
|
|
}
|
|
|
|
if (!gotTheLock) {
|
|
deps.quitApp();
|
|
return;
|
|
}
|
|
|
|
let appReadyRuntimeComplete = false;
|
|
const pendingSecondInstanceCommands: CliArgs[] = [];
|
|
let stopControlServer: (() => void) | null = null;
|
|
const handleSecondInstanceCommand = (args: CliArgs): void => {
|
|
try {
|
|
deps.handleCliCommand(args, 'second-instance');
|
|
} catch (error) {
|
|
logger.error('Failed to handle second-instance CLI command:', error);
|
|
}
|
|
};
|
|
|
|
const flushPendingSecondInstanceCommands = (): void => {
|
|
while (pendingSecondInstanceCommands.length > 0) {
|
|
const nextArgs = pendingSecondInstanceCommands.shift();
|
|
if (nextArgs) {
|
|
handleSecondInstanceCommand(nextArgs);
|
|
}
|
|
}
|
|
};
|
|
|
|
const dispatchSecondInstanceArgv = (argv: string[]): void => {
|
|
try {
|
|
const nextArgs = deps.parseArgs(argv);
|
|
if (!appReadyRuntimeComplete) {
|
|
pendingSecondInstanceCommands.push(nextArgs);
|
|
return;
|
|
}
|
|
|
|
handleSecondInstanceCommand(nextArgs);
|
|
} catch (error) {
|
|
logger.error('Failed to handle second-instance CLI command:', error);
|
|
}
|
|
};
|
|
|
|
deps.onSecondInstance((_event, argv) => {
|
|
dispatchSecondInstanceArgv(argv);
|
|
});
|
|
|
|
if (!deps.shouldStartApp(initialArgs)) {
|
|
if (initialArgs.stop && !initialArgs.start) {
|
|
deps.quitApp();
|
|
} else {
|
|
deps.logNoRunningInstance();
|
|
deps.quitApp();
|
|
}
|
|
return;
|
|
}
|
|
|
|
try {
|
|
stopControlServer = deps.startControlServer?.(dispatchSecondInstanceArgv) ?? null;
|
|
} catch (error) {
|
|
logger.error('Failed to start app control socket:', error);
|
|
}
|
|
|
|
deps.whenReady(async () => {
|
|
try {
|
|
await deps.onReady();
|
|
} finally {
|
|
appReadyRuntimeComplete = true;
|
|
flushPendingSecondInstanceCommands();
|
|
}
|
|
});
|
|
|
|
deps.onWindowAllClosed(() => {
|
|
if (
|
|
deps.shouldQuitOnWindowAllClosed() &&
|
|
(!deps.isDarwinPlatform() || initialArgs.settings || initialArgs.setup)
|
|
) {
|
|
deps.quitApp();
|
|
}
|
|
});
|
|
|
|
deps.onWillQuit(() => {
|
|
stopControlServer?.();
|
|
stopControlServer = null;
|
|
deps.onWillQuitCleanup();
|
|
});
|
|
|
|
deps.onActivate(() => {
|
|
if (deps.shouldRestoreWindowsOnActivate()) {
|
|
deps.restoreWindowsOnActivate();
|
|
}
|
|
});
|
|
}
|