refactor: extract app lifecycle dependency builder

This commit is contained in:
2026-02-10 00:20:38 -08:00
parent 7bacac2b4e
commit caa9a40585
4 changed files with 142 additions and 21 deletions

View File

@@ -16,7 +16,7 @@
"docs:build": "vitepress build docs",
"docs:preview": "vitepress preview docs --host 0.0.0.0 --port 4173 --strictPort",
"test:config": "pnpm run build && node --test dist/config/config.test.js",
"test:core": "pnpm run build && node --test dist/cli/args.test.js dist/cli/help.test.js dist/core/services/cli-command-service.test.js dist/core/services/numeric-shortcut-session-service.test.js dist/core/services/secondary-subtitle-service.test.js dist/core/services/mpv-render-metrics-service.test.js dist/core/services/mpv-runtime-service.test.js dist/core/services/runtime-options-runtime-service.test.js dist/core/services/overlay-modal-restore-service.test.js dist/core/services/runtime-config-service.test.js dist/core/services/overlay-bridge-runtime-service.test.js dist/core/services/overlay-visibility-facade-service.test.js dist/core/services/overlay-broadcast-runtime-service.test.js dist/core/services/app-ready-runtime-service.test.js dist/core/services/app-shutdown-runtime-service.test.js dist/core/services/mpv-client-deps-runtime-service.test.js",
"test:core": "pnpm run build && node --test dist/cli/args.test.js dist/cli/help.test.js dist/core/services/cli-command-service.test.js dist/core/services/numeric-shortcut-session-service.test.js dist/core/services/secondary-subtitle-service.test.js dist/core/services/mpv-render-metrics-service.test.js dist/core/services/mpv-runtime-service.test.js dist/core/services/runtime-options-runtime-service.test.js dist/core/services/overlay-modal-restore-service.test.js dist/core/services/runtime-config-service.test.js dist/core/services/overlay-bridge-runtime-service.test.js dist/core/services/overlay-visibility-facade-service.test.js dist/core/services/overlay-broadcast-runtime-service.test.js dist/core/services/app-ready-runtime-service.test.js dist/core/services/app-shutdown-runtime-service.test.js dist/core/services/mpv-client-deps-runtime-service.test.js dist/core/services/app-lifecycle-deps-runtime-service.test.js",
"test:subtitle": "pnpm run build && node --test dist/subtitle/stages.test.js dist/subtitle/pipeline.test.js",
"generate:config-example": "pnpm run build && node dist/generate-config-example.js",
"start": "pnpm run build && electron . --start",

View File

@@ -0,0 +1,79 @@
import test from "node:test";
import assert from "node:assert/strict";
import { createAppLifecycleDepsRuntimeService } from "./app-lifecycle-deps-runtime-service";
test("createAppLifecycleDepsRuntimeService maps app methods and platform", async () => {
const events: Record<string, (...args: unknown[]) => void> = {};
let lockRequested = 0;
let quitCalled = 0;
const deps = createAppLifecycleDepsRuntimeService({
app: {
requestSingleInstanceLock: () => {
lockRequested += 1;
return true;
},
quit: () => {
quitCalled += 1;
},
on: (event, listener) => {
events[event] = listener;
},
whenReady: async () => {},
},
platform: "darwin",
shouldStartApp: () => true,
parseArgs: () => ({
start: false,
stop: false,
toggle: false,
toggleVisibleOverlay: false,
toggleInvisibleOverlay: false,
settings: false,
show: false,
hide: false,
showVisibleOverlay: false,
hideVisibleOverlay: false,
showInvisibleOverlay: false,
hideInvisibleOverlay: false,
copySubtitle: false,
copySubtitleMultiple: false,
mineSentence: false,
mineSentenceMultiple: false,
updateLastCardFromClipboard: false,
toggleSecondarySub: false,
triggerFieldGrouping: false,
triggerSubsync: false,
markAudioCard: false,
openRuntimeOptions: false,
texthooker: false,
help: false,
autoStartOverlay: false,
generateConfig: false,
backupOverwrite: false,
verbose: false,
}),
handleCliCommand: () => {},
printHelp: () => {},
logNoRunningInstance: () => {},
onReady: async () => {},
onWillQuitCleanup: () => {},
shouldRestoreWindowsOnActivate: () => false,
restoreWindowsOnActivate: () => {},
});
assert.equal(deps.requestSingleInstanceLock(), true);
deps.quitApp();
assert.equal(lockRequested, 1);
assert.equal(quitCalled, 1);
assert.equal(deps.isDarwinPlatform(), true);
let callbackRan = false;
deps.whenReady(async () => {
callbackRan = true;
});
await new Promise((resolve) => setImmediate(resolve));
assert.equal(callbackRan, true);
deps.onActivate(() => {});
assert.equal(typeof events["activate"], "function");
});

View File

@@ -0,0 +1,57 @@
import { CliArgs, CliCommandSource } from "../../cli/args";
import { AppLifecycleServiceDeps } from "./app-lifecycle-service";
interface AppLike {
requestSingleInstanceLock: () => boolean;
quit: () => 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;
onReady: () => Promise<void>;
onWillQuitCleanup: () => void;
shouldRestoreWindowsOnActivate: () => boolean;
restoreWindowsOnActivate: () => void;
}
export function createAppLifecycleDepsRuntimeService(
options: AppLifecycleDepsRuntimeOptions,
): AppLifecycleServiceDeps {
return {
shouldStartApp: options.shouldStartApp,
parseArgs: options.parseArgs,
requestSingleInstanceLock: () => options.app.requestSingleInstanceLock(),
quitApp: () => options.app.quit(),
onSecondInstance: (handler) => {
options.app.on("second-instance", handler as (...args: unknown[]) => void);
},
handleCliCommand: options.handleCliCommand,
printHelp: options.printHelp,
logNoRunningInstance: options.logNoRunningInstance,
whenReady: (handler) => {
options.app.whenReady().then(handler);
},
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,
};
}

View File

@@ -204,6 +204,7 @@ import {
import { runAppReadyRuntimeService } from "./core/services/app-ready-runtime-service";
import { runAppShutdownRuntimeService } from "./core/services/app-shutdown-runtime-service";
import { createMpvIpcClientDepsRuntimeService } from "./core/services/mpv-client-deps-runtime-service";
import { createAppLifecycleDepsRuntimeService } from "./core/services/app-lifecycle-deps-runtime-service";
import {
runSubsyncManualFromIpcRuntimeService,
triggerSubsyncFromConfigRuntimeService,
@@ -463,32 +464,16 @@ if (initialArgs.generateConfig && !shouldStartApp(initialArgs)) {
app.quit();
});
} else {
startAppLifecycleService(initialArgs, {
startAppLifecycleService(initialArgs, createAppLifecycleDepsRuntimeService({
app,
platform: process.platform,
shouldStartApp: (args) => shouldStartApp(args),
parseArgs: (argv) => parseArgs(argv),
requestSingleInstanceLock: () => app.requestSingleInstanceLock(),
quitApp: () => app.quit(),
onSecondInstance: (handler) => {
app.on("second-instance", handler);
},
handleCliCommand: (args, source) => handleCliCommand(args, source),
printHelp: () => printHelp(DEFAULT_TEXTHOOKER_PORT),
logNoRunningInstance: () => {
console.error("No running instance. Use --start to launch the app.");
},
whenReady: (handler) => {
app.whenReady().then(handler);
},
onWindowAllClosed: (handler) => {
app.on("window-all-closed", handler);
},
onWillQuit: (handler) => {
app.on("will-quit", handler);
},
onActivate: (handler) => {
app.on("activate", handler);
},
isDarwinPlatform: () => process.platform === "darwin",
onReady: async () => {
await runAppReadyRuntimeService({
loadSubtitlePosition: () => loadSubtitlePosition(),
@@ -652,7 +637,7 @@ if (initialArgs.generateConfig && !shouldStartApp(initialArgs)) {
updateVisibleOverlayVisibility();
updateInvisibleOverlayVisibility();
},
});
}));
}
function handleCliCommand(