refactor: extract startup lifecycle hooks orchestration

src/core/services/startup-lifecycle-hooks-runtime-service.test.ts

@@ -0,0 +1,63 @@
+import test from "node:test";
+import assert from "node:assert/strict";
+import { createStartupLifecycleHooksRuntimeService } from "./startup-lifecycle-hooks-runtime-service";
+
+test("createStartupLifecycleHooksRuntimeService wires app-ready and app-shutdown handlers", async () => {
+  const calls: string[] = [];
+  const hooks = createStartupLifecycleHooksRuntimeService({
+    appReadyDeps: {
+      loadSubtitlePosition: () => calls.push("loadSubtitlePosition"),
+      resolveKeybindings: () => calls.push("resolveKeybindings"),
+      createMpvClient: () => calls.push("createMpvClient"),
+      reloadConfig: () => calls.push("reloadConfig"),
+      getResolvedConfig: () => ({
+        secondarySub: { defaultMode: "hover" },
+        websocket: { enabled: "auto", port: 1234 },
+      }),
+      getConfigWarnings: () => [],
+      logConfigWarning: () => calls.push("logConfigWarning"),
+      initRuntimeOptionsManager: () => calls.push("initRuntimeOptionsManager"),
+      setSecondarySubMode: () => calls.push("setSecondarySubMode"),
+      defaultSecondarySubMode: "hover",
+      defaultWebsocketPort: 8765,
+      hasMpvWebsocketPlugin: () => true,
+      startSubtitleWebsocket: () => calls.push("startSubtitleWebsocket"),
+      log: () => calls.push("log"),
+      createMecabTokenizerAndCheck: async () => {
+        calls.push("createMecabTokenizerAndCheck");
+      },
+      createSubtitleTimingTracker: () => calls.push("createSubtitleTimingTracker"),
+      loadYomitanExtension: async () => {
+        calls.push("loadYomitanExtension");
+      },
+      texthookerOnlyMode: false,
+      shouldAutoInitializeOverlayRuntimeFromConfig: () => false,
+      initializeOverlayRuntime: () => calls.push("initializeOverlayRuntime"),
+      handleInitialArgs: () => calls.push("handleInitialArgs"),
+    },
+    appShutdownDeps: {
+      unregisterAllGlobalShortcuts: () => calls.push("unregisterAllGlobalShortcuts"),
+      stopSubtitleWebsocket: () => calls.push("stopSubtitleWebsocket"),
+      stopTexthookerService: () => calls.push("stopTexthookerService"),
+      destroyYomitanParserWindow: () => calls.push("destroyYomitanParserWindow"),
+      clearYomitanParserPromises: () => calls.push("clearYomitanParserPromises"),
+      stopWindowTracker: () => calls.push("stopWindowTracker"),
+      destroyMpvSocket: () => calls.push("destroyMpvSocket"),
+      clearReconnectTimer: () => calls.push("clearReconnectTimer"),
+      destroySubtitleTimingTracker: () => calls.push("destroySubtitleTimingTracker"),
+      destroyAnkiIntegration: () => calls.push("destroyAnkiIntegration"),
+    },
+    shouldRestoreWindowsOnActivate: () => true,
+    restoreWindowsOnActivate: () => calls.push("restoreWindowsOnActivate"),
+  });
+
+  await hooks.onReady();
+  hooks.onWillQuitCleanup();
+  assert.equal(hooks.shouldRestoreWindowsOnActivate(), true);
+  hooks.restoreWindowsOnActivate();
+
+  assert.ok(calls.includes("loadSubtitlePosition"));
+  assert.ok(calls.includes("handleInitialArgs"));
+  assert.ok(calls.includes("destroyAnkiIntegration"));
+  assert.ok(calls.includes("restoreWindowsOnActivate"));
+});

src/core/services/startup-lifecycle-hooks-runtime-service.ts

@@ -0,0 +1,44 @@
+import { AppLifecycleDepsRuntimeOptions } from "./app-lifecycle-deps-runtime-service";
+import {
+  AppReadyRuntimeDeps,
+  runAppReadyRuntimeService,
+} from "./app-ready-runtime-service";
+import {
+  AppShutdownRuntimeDeps,
+  runAppShutdownRuntimeService,
+} from "./app-shutdown-runtime-service";
+import {
+  createStartupAppReadyDepsRuntimeService,
+  createStartupAppShutdownDepsRuntimeService,
+} from "./startup-lifecycle-runtime-deps-service";
+
+type StartupLifecycleHookDeps = Pick<
+  AppLifecycleDepsRuntimeOptions,
+  "onReady" | "onWillQuitCleanup" | "shouldRestoreWindowsOnActivate" | "restoreWindowsOnActivate"
+>;
+
+export interface StartupLifecycleHooksRuntimeOptions {
+  appReadyDeps: AppReadyRuntimeDeps;
+  appShutdownDeps: AppShutdownRuntimeDeps;
+  shouldRestoreWindowsOnActivate: () => boolean;
+  restoreWindowsOnActivate: () => void;
+}
+
+export function createStartupLifecycleHooksRuntimeService(
+  options: StartupLifecycleHooksRuntimeOptions,
+): StartupLifecycleHookDeps {
+  return {
+    onReady: async () => {
+      await runAppReadyRuntimeService(
+        createStartupAppReadyDepsRuntimeService(options.appReadyDeps),
+      );
+    },
+    onWillQuitCleanup: () => {
+      runAppShutdownRuntimeService(
+        createStartupAppShutdownDepsRuntimeService(options.appShutdownDeps),
+      );
+    },
+    shouldRestoreWindowsOnActivate: options.shouldRestoreWindowsOnActivate,
+    restoreWindowsOnActivate: options.restoreWindowsOnActivate,
+  };
+}

src/main.ts

@@ -186,8 +186,6 @@ import {
   getOverlayWindowsRuntimeService,
   setOverlayDebugVisualizationEnabledRuntimeService,
 } from "./core/services/overlay-broadcast-runtime-service";
-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 { createCliCommandDepsRuntimeService } from "./core/services/cli-command-deps-runtime-service";
@@ -225,10 +223,7 @@ import {
   createYomitanSettingsWindowDepsRuntimeService,
   runOverlayShortcutLocalFallbackRuntimeService,
 } from "./core/services/shortcut-ui-runtime-deps-service";
-import {
-  createStartupAppReadyDepsRuntimeService,
-  createStartupAppShutdownDepsRuntimeService,
-} from "./core/services/startup-lifecycle-runtime-deps-service";
+import { createStartupLifecycleHooksRuntimeService } from "./core/services/startup-lifecycle-hooks-runtime-service";
 import { createRuntimeOptionsManagerRuntimeService } from "./core/services/runtime-options-manager-runtime-service";
 import { createAppLoggingRuntimeService } from "./core/services/app-logging-runtime-service";
 import {
@@ -525,172 +520,166 @@ const startupState = runStartupBootstrapRuntimeService({
       handleCliCommand: (nextArgs, source) => handleCliCommand(nextArgs, source),
       printHelp: () => printHelp(DEFAULT_TEXTHOOKER_PORT),
       logNoRunningInstance: () => appLogger.logNoRunningInstance(),
-      onReady: async () => {
-        await runAppReadyRuntimeService(
-          createStartupAppReadyDepsRuntimeService({
-            loadSubtitlePosition: () => loadSubtitlePosition(),
-            resolveKeybindings: () => {
-              keybindings = resolveKeybindings(getResolvedConfig(), DEFAULT_KEYBINDINGS);
-            },
-            createMpvClient: () => {
-              mpvClient = new MpvIpcClient(
-                mpvSocketPath,
-                createMpvIpcClientDepsRuntimeService({
-                  getResolvedConfig: () => getResolvedConfig(),
-                  autoStartOverlay,
-                  setOverlayVisible: (visible) => setOverlayVisible(visible),
-                  shouldBindVisibleOverlayToMpvSubVisibility: () =>
-                    shouldBindVisibleOverlayToMpvSubVisibility(),
-                  isVisibleOverlayVisible: () => visibleOverlayVisible,
-                  getReconnectTimer: () => reconnectTimer,
-                  setReconnectTimer: (timer) => {
-                    reconnectTimer = timer;
-                  },
-                  getCurrentSubText: () => currentSubText,
-                  setCurrentSubText: (text) => {
-                    currentSubText = text;
-                  },
-                  setCurrentSubAssText: (text) => {
-                    currentSubAssText = text;
-                  },
-                  getSubtitleTimingTracker: () => subtitleTimingTracker,
-                  subtitleWsBroadcast: (text) => {
-                    subtitleWsService.broadcast(text);
-                  },
-                  getOverlayWindowsCount: () => getOverlayWindows().length,
-                  tokenizeSubtitle: (text) => tokenizeSubtitle(text),
-                  broadcastToOverlayWindows: (channel, ...channelArgs) => {
-                    broadcastToOverlayWindows(channel, ...channelArgs);
-                  },
-                  updateCurrentMediaPath: (mediaPath) => {
-                    updateCurrentMediaPath(mediaPath);
-                  },
-                  updateMpvSubtitleRenderMetrics: (patch) => {
-                    updateMpvSubtitleRenderMetrics(patch);
-                  },
-                  getMpvSubtitleRenderMetrics: () => mpvSubtitleRenderMetrics,
-                  setPreviousSecondarySubVisibility: (value) => {
-                    previousSecondarySubVisibility = value;
-                  },
-                  showMpvOsd: (text) => {
-                    showMpvOsd(text);
-                  },
-                }),
-              );
-            },
-            reloadConfig: () => {
-              configService.reloadConfig();
-            },
-            getResolvedConfig: () => getResolvedConfig(),
-            getConfigWarnings: () => configService.getWarnings(),
-            logConfigWarning: (warning) => appLogger.logConfigWarning(warning),
-            initRuntimeOptionsManager: () => {
-              runtimeOptionsManager = createRuntimeOptionsManagerRuntimeService({
-                getAnkiConfig: () => configService.getConfig().ankiConnect,
-                applyAnkiPatch: (patch) => {
-                  if (ankiIntegration) {
-                    ankiIntegration.applyRuntimeConfigPatch(patch);
-                  }
+      ...createStartupLifecycleHooksRuntimeService({
+        appReadyDeps: {
+          loadSubtitlePosition: () => loadSubtitlePosition(),
+          resolveKeybindings: () => {
+            keybindings = resolveKeybindings(getResolvedConfig(), DEFAULT_KEYBINDINGS);
+          },
+          createMpvClient: () => {
+            mpvClient = new MpvIpcClient(
+              mpvSocketPath,
+              createMpvIpcClientDepsRuntimeService({
+                getResolvedConfig: () => getResolvedConfig(),
+                autoStartOverlay,
+                setOverlayVisible: (visible) => setOverlayVisible(visible),
+                shouldBindVisibleOverlayToMpvSubVisibility: () =>
+                  shouldBindVisibleOverlayToMpvSubVisibility(),
+                isVisibleOverlayVisible: () => visibleOverlayVisible,
+                getReconnectTimer: () => reconnectTimer,
+                setReconnectTimer: (timer) => {
+                  reconnectTimer = timer;
                 },
-                onOptionsChanged: () => {
-                  broadcastRuntimeOptionsChanged();
-                  refreshOverlayShortcuts();
+                getCurrentSubText: () => currentSubText,
+                setCurrentSubText: (text) => {
+                  currentSubText = text;
                 },
-              });
-            },
-            setSecondarySubMode: (mode) => {
-              secondarySubMode = mode;
-            },
-            defaultSecondarySubMode: "hover",
-            defaultWebsocketPort: DEFAULT_CONFIG.websocket.port,
-            hasMpvWebsocketPlugin: () => hasMpvWebsocketPlugin(),
-            startSubtitleWebsocket: (port) => {
-              subtitleWsService.start(port, () => currentSubText);
-            },
-            log: (message) => appLogger.logInfo(message),
-            createMecabTokenizerAndCheck: async () =>
-              createMecabTokenizerAndCheckRuntimeService({
-                createMecabTokenizer: () => new MecabTokenizer(),
-                setMecabTokenizer: (tokenizer) => {
-                  mecabTokenizer = tokenizer;
+                setCurrentSubAssText: (text) => {
+                  currentSubAssText = text;
+                },
+                getSubtitleTimingTracker: () => subtitleTimingTracker,
+                subtitleWsBroadcast: (text) => {
+                  subtitleWsService.broadcast(text);
+                },
+                getOverlayWindowsCount: () => getOverlayWindows().length,
+                tokenizeSubtitle: (text) => tokenizeSubtitle(text),
+                broadcastToOverlayWindows: (channel, ...channelArgs) => {
+                  broadcastToOverlayWindows(channel, ...channelArgs);
+                },
+                updateCurrentMediaPath: (mediaPath) => {
+                  updateCurrentMediaPath(mediaPath);
+                },
+                updateMpvSubtitleRenderMetrics: (patch) => {
+                  updateMpvSubtitleRenderMetrics(patch);
+                },
+                getMpvSubtitleRenderMetrics: () => mpvSubtitleRenderMetrics,
+                setPreviousSecondarySubVisibility: (value) => {
+                  previousSecondarySubVisibility = value;
+                },
+                showMpvOsd: (text) => {
+                  showMpvOsd(text);
                 },
               }),
-            createSubtitleTimingTracker: () =>
-              createSubtitleTimingTrackerRuntimeService({
-                createSubtitleTimingTracker: () => new SubtitleTimingTracker(),
-                setSubtitleTimingTracker: (tracker) => {
-                  subtitleTimingTracker = tracker;
-                },
-              }),
-            loadYomitanExtension: async () => {
-              await loadYomitanExtension();
-            },
-            texthookerOnlyMode,
-            shouldAutoInitializeOverlayRuntimeFromConfig: () =>
-              shouldAutoInitializeOverlayRuntimeFromConfig(),
-            initializeOverlayRuntime: () => initializeOverlayRuntime(),
-            handleInitialArgs: () => handleInitialArgs(),
-          }),
-        );
-      },
-      onWillQuitCleanup: () => {
-        runAppShutdownRuntimeService(
-          createStartupAppShutdownDepsRuntimeService({
-            unregisterAllGlobalShortcuts: () => {
-              globalShortcut.unregisterAll();
-            },
-            stopSubtitleWebsocket: () => {
-              subtitleWsService.stop();
-            },
-            stopTexthookerService: () => {
-              texthookerService.stop();
-            },
-            destroyYomitanParserWindow: () => {
-              if (yomitanParserWindow && !yomitanParserWindow.isDestroyed()) {
-                yomitanParserWindow.destroy();
-              }
-              yomitanParserWindow = null;
-            },
-            clearYomitanParserPromises: () => {
-              yomitanParserReadyPromise = null;
-              yomitanParserInitPromise = null;
-            },
-            stopWindowTracker: () => {
-              if (windowTracker) {
-                windowTracker.stop();
-              }
-            },
-            destroyMpvSocket: () => {
-              if (mpvClient && mpvClient.socket) {
-                mpvClient.socket.destroy();
-              }
-            },
-            clearReconnectTimer: () => {
-              if (reconnectTimer) {
-                clearTimeout(reconnectTimer);
-              }
-            },
-            destroySubtitleTimingTracker: () => {
-              if (subtitleTimingTracker) {
-                subtitleTimingTracker.destroy();
-              }
-            },
-            destroyAnkiIntegration: () => {
-              if (ankiIntegration) {
-                ankiIntegration.destroy();
-              }
-            },
-          }),
-        );
-      },
-      shouldRestoreWindowsOnActivate: () =>
-        overlayRuntimeInitialized && BrowserWindow.getAllWindows().length === 0,
-      restoreWindowsOnActivate: () => {
-        createMainWindow();
-        createInvisibleWindow();
-        updateVisibleOverlayVisibility();
-        updateInvisibleOverlayVisibility();
-      },
+            );
+          },
+          reloadConfig: () => {
+            configService.reloadConfig();
+          },
+          getResolvedConfig: () => getResolvedConfig(),
+          getConfigWarnings: () => configService.getWarnings(),
+          logConfigWarning: (warning) => appLogger.logConfigWarning(warning),
+          initRuntimeOptionsManager: () => {
+            runtimeOptionsManager = createRuntimeOptionsManagerRuntimeService({
+              getAnkiConfig: () => configService.getConfig().ankiConnect,
+              applyAnkiPatch: (patch) => {
+                if (ankiIntegration) {
+                  ankiIntegration.applyRuntimeConfigPatch(patch);
+                }
+              },
+              onOptionsChanged: () => {
+                broadcastRuntimeOptionsChanged();
+                refreshOverlayShortcuts();
+              },
+            });
+          },
+          setSecondarySubMode: (mode) => {
+            secondarySubMode = mode;
+          },
+          defaultSecondarySubMode: "hover",
+          defaultWebsocketPort: DEFAULT_CONFIG.websocket.port,
+          hasMpvWebsocketPlugin: () => hasMpvWebsocketPlugin(),
+          startSubtitleWebsocket: (port) => {
+            subtitleWsService.start(port, () => currentSubText);
+          },
+          log: (message) => appLogger.logInfo(message),
+          createMecabTokenizerAndCheck: async () =>
+            createMecabTokenizerAndCheckRuntimeService({
+              createMecabTokenizer: () => new MecabTokenizer(),
+              setMecabTokenizer: (tokenizer) => {
+                mecabTokenizer = tokenizer;
+              },
+            }),
+          createSubtitleTimingTracker: () =>
+            createSubtitleTimingTrackerRuntimeService({
+              createSubtitleTimingTracker: () => new SubtitleTimingTracker(),
+              setSubtitleTimingTracker: (tracker) => {
+                subtitleTimingTracker = tracker;
+              },
+            }),
+          loadYomitanExtension: async () => {
+            await loadYomitanExtension();
+          },
+          texthookerOnlyMode,
+          shouldAutoInitializeOverlayRuntimeFromConfig: () =>
+            shouldAutoInitializeOverlayRuntimeFromConfig(),
+          initializeOverlayRuntime: () => initializeOverlayRuntime(),
+          handleInitialArgs: () => handleInitialArgs(),
+        },
+        appShutdownDeps: {
+          unregisterAllGlobalShortcuts: () => {
+            globalShortcut.unregisterAll();
+          },
+          stopSubtitleWebsocket: () => {
+            subtitleWsService.stop();
+          },
+          stopTexthookerService: () => {
+            texthookerService.stop();
+          },
+          destroyYomitanParserWindow: () => {
+            if (yomitanParserWindow && !yomitanParserWindow.isDestroyed()) {
+              yomitanParserWindow.destroy();
+            }
+            yomitanParserWindow = null;
+          },
+          clearYomitanParserPromises: () => {
+            yomitanParserReadyPromise = null;
+            yomitanParserInitPromise = null;
+          },
+          stopWindowTracker: () => {
+            if (windowTracker) {
+              windowTracker.stop();
+            }
+          },
+          destroyMpvSocket: () => {
+            if (mpvClient && mpvClient.socket) {
+              mpvClient.socket.destroy();
+            }
+          },
+          clearReconnectTimer: () => {
+            if (reconnectTimer) {
+              clearTimeout(reconnectTimer);
+            }
+          },
+          destroySubtitleTimingTracker: () => {
+            if (subtitleTimingTracker) {
+              subtitleTimingTracker.destroy();
+            }
+          },
+          destroyAnkiIntegration: () => {
+            if (ankiIntegration) {
+              ankiIntegration.destroy();
+            }
+          },
+        },
+        shouldRestoreWindowsOnActivate: () =>
+          overlayRuntimeInitialized && BrowserWindow.getAllWindows().length === 0,
+        restoreWindowsOnActivate: () => {
+          createMainWindow();
+          createInvisibleWindow();
+          updateVisibleOverlayVisibility();
+          updateInvisibleOverlayVisibility();
+        },
+      }),
     }));
   },
 });