diff --git a/package.json b/package.json index e254c39..4854bd5 100644 --- a/package.json +++ b/package.json @@ -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 dist/core/services/app-lifecycle-deps-runtime-service.test.js dist/core/services/runtime-options-manager-runtime-service.test.js dist/core/services/config-warning-runtime-service.test.js dist/core/services/app-logging-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 dist/core/services/runtime-options-manager-runtime-service.test.js dist/core/services/config-warning-runtime-service.test.js dist/core/services/app-logging-runtime-service.test.js dist/core/services/startup-resource-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", diff --git a/src/core/services/startup-resource-runtime-service.test.ts b/src/core/services/startup-resource-runtime-service.test.ts new file mode 100644 index 0000000..9474155 --- /dev/null +++ b/src/core/services/startup-resource-runtime-service.test.ts @@ -0,0 +1,36 @@ +import test from "node:test"; +import assert from "node:assert/strict"; +import { + createMecabTokenizerAndCheckRuntimeService, + createSubtitleTimingTrackerRuntimeService, +} from "./startup-resource-runtime-service"; + +test("createMecabTokenizerAndCheckRuntimeService sets tokenizer and checks availability", async () => { + const calls: string[] = []; + let assigned: unknown = null; + await createMecabTokenizerAndCheckRuntimeService({ + createMecabTokenizer: () => ({ + checkAvailability: async () => { + calls.push("checkAvailability"); + }, + }), + setMecabTokenizer: (tokenizer) => { + assigned = tokenizer; + calls.push("setMecabTokenizer"); + }, + }); + assert.equal(assigned !== null, true); + assert.deepEqual(calls, ["setMecabTokenizer", "checkAvailability"]); +}); + +test("createSubtitleTimingTrackerRuntimeService sets created tracker", () => { + const tracker = { id: "x" }; + let assigned: unknown = null; + createSubtitleTimingTrackerRuntimeService({ + createSubtitleTimingTracker: () => tracker, + setSubtitleTimingTracker: (value) => { + assigned = value; + }, + }); + assert.equal(assigned, tracker); +}); diff --git a/src/core/services/startup-resource-runtime-service.ts b/src/core/services/startup-resource-runtime-service.ts new file mode 100644 index 0000000..f82c946 --- /dev/null +++ b/src/core/services/startup-resource-runtime-service.ts @@ -0,0 +1,26 @@ +interface MecabTokenizerLike { + checkAvailability: () => Promise; +} + +interface SubtitleTimingTrackerLike {} + +export async function createMecabTokenizerAndCheckRuntimeService< + T extends MecabTokenizerLike, +>(options: { + createMecabTokenizer: () => T; + setMecabTokenizer: (tokenizer: T) => void; +}): Promise { + const tokenizer = options.createMecabTokenizer(); + options.setMecabTokenizer(tokenizer); + await tokenizer.checkAvailability(); +} + +export function createSubtitleTimingTrackerRuntimeService< + T extends SubtitleTimingTrackerLike, +>(options: { + createSubtitleTimingTracker: () => T; + setSubtitleTimingTracker: (tracker: T) => void; +}): void { + const tracker = options.createSubtitleTimingTracker(); + options.setSubtitleTimingTracker(tracker); +} diff --git a/src/main.ts b/src/main.ts index b5f307f..587bcac 100644 --- a/src/main.ts +++ b/src/main.ts @@ -207,6 +207,10 @@ import { createMpvIpcClientDepsRuntimeService } from "./core/services/mpv-client import { createAppLifecycleDepsRuntimeService } from "./core/services/app-lifecycle-deps-runtime-service"; import { createRuntimeOptionsManagerRuntimeService } from "./core/services/runtime-options-manager-runtime-service"; import { createAppLoggingRuntimeService } from "./core/services/app-logging-runtime-service"; +import { + createMecabTokenizerAndCheckRuntimeService, + createSubtitleTimingTrackerRuntimeService, +} from "./core/services/startup-resource-runtime-service"; import { runSubsyncManualFromIpcRuntimeService, triggerSubsyncFromConfigRuntimeService, @@ -557,13 +561,20 @@ if (initialArgs.generateConfig && !shouldStartApp(initialArgs)) { subtitleWsService.start(port, () => currentSubText); }, log: (message) => appLogger.logInfo(message), - createMecabTokenizerAndCheck: async () => { - mecabTokenizer = new MecabTokenizer(); - await mecabTokenizer.checkAvailability(); - }, - createSubtitleTimingTracker: () => { - subtitleTimingTracker = new SubtitleTimingTracker(); - }, + createMecabTokenizerAndCheck: async () => + createMecabTokenizerAndCheckRuntimeService({ + createMecabTokenizer: () => new MecabTokenizer(), + setMecabTokenizer: (tokenizer) => { + mecabTokenizer = tokenizer; + }, + }), + createSubtitleTimingTracker: () => + createSubtitleTimingTrackerRuntimeService({ + createSubtitleTimingTracker: () => new SubtitleTimingTracker(), + setSubtitleTimingTracker: (tracker) => { + subtitleTimingTracker = tracker; + }, + }), loadYomitanExtension: async () => { await loadYomitanExtension(); },