refactor: extract yomitan runtime wiring from main

2026-02-28 06:22:45 -08:00 · 2026-02-20 02:00:16 -08:00
parent 062677dcc5
commit 3aeb10ae61
5 changed files with 207 additions and 46 deletions
--- a/src/main.ts
+++ b/src/main.ts
@@ -428,14 +428,7 @@ import {
  createBuildInitializeOverlayRuntimeBootstrapMainDepsHandler,
  createBuildOpenYomitanSettingsMainDepsHandler,
 } from './main/runtime/app-runtime-main-deps';
-import {
-  createEnsureYomitanExtensionLoadedHandler,
-  createLoadYomitanExtensionHandler,
-} from './main/runtime/yomitan-extension-loader';
-import {
-  createBuildEnsureYomitanExtensionLoadedMainDepsHandler,
-  createBuildLoadYomitanExtensionMainDepsHandler,
-} from './main/runtime/yomitan-extension-loader-main-deps';
+import { createYomitanExtensionRuntime } from './main/runtime/yomitan-extension-runtime';
 import { createBuildInitializeOverlayRuntimeOptionsHandler } from './main/runtime/overlay-runtime-options';
 import { createBuildInitializeOverlayRuntimeMainDepsHandler } from './main/runtime/overlay-runtime-options-main-deps';
 import { createBuildCliCommandContextDepsHandler } from './main/runtime/cli-command-context-deps';
@@ -2374,8 +2367,10 @@ const buildUpdateMpvSubtitleRenderMetricsMainDepsHandler =
    broadcastToOverlayWindows('mpv-subtitle-render-metrics:set', metrics);
  },
 });
+const updateMpvSubtitleRenderMetricsMainDeps =
+  buildUpdateMpvSubtitleRenderMetricsMainDepsHandler();
 const updateMpvSubtitleRenderMetricsRuntime = createUpdateMpvSubtitleRenderMetricsHandler(
-  buildUpdateMpvSubtitleRenderMetricsMainDepsHandler(),
+  updateMpvSubtitleRenderMetricsMainDeps,
 );

 function updateMpvSubtitleRenderMetrics(patch: Partial<MpvSubtitleRenderMetrics>): void {
@@ -2525,16 +2520,17 @@ const buildEnforceOverlayLayerOrderMainDepsHandler =
  getInvisibleWindow: () => overlayManager.getInvisibleWindow(),
  ensureOverlayWindowLevel: (window) => ensureOverlayWindowLevel(window as BrowserWindow),
 });
+const enforceOverlayLayerOrderMainDeps = buildEnforceOverlayLayerOrderMainDepsHandler();
 const enforceOverlayLayerOrder = createEnforceOverlayLayerOrderHandler(
-  buildEnforceOverlayLayerOrderMainDepsHandler(),
+  enforceOverlayLayerOrderMainDeps,
 );

 async function loadYomitanExtension(): Promise<Extension | null> {
-  return loadYomitanExtensionHandler();
+  return yomitanExtensionRuntime.loadYomitanExtension();
 }

 async function ensureYomitanExtensionLoaded(): Promise<Extension | null> {
-  return ensureYomitanExtensionLoadedHandler();
+  return yomitanExtensionRuntime.ensureYomitanExtensionLoaded();
 }

 function createOverlayWindow(kind: 'visible' | 'invisible'): BrowserWindow {
@@ -2811,8 +2807,9 @@ const buildRefreshKnownWordCacheMainDepsHandler = createBuildRefreshKnownWordCac
  getAnkiIntegration: () => appState.ankiIntegration,
  missingIntegrationMessage: 'AnkiConnect integration not enabled',
 });
+const refreshKnownWordCacheMainDeps = buildRefreshKnownWordCacheMainDepsHandler();
 const refreshKnownWordCacheHandler = createRefreshKnownWordCacheHandler(
-  buildRefreshKnownWordCacheMainDepsHandler(),
+  refreshKnownWordCacheMainDeps,
 );

 const buildTriggerFieldGroupingMainDepsHandler = createBuildTriggerFieldGroupingMainDepsHandler({
@@ -2820,8 +2817,9 @@ const buildTriggerFieldGroupingMainDepsHandler = createBuildTriggerFieldGrouping
  showMpvOsd: (text) => showMpvOsd(text),
  triggerFieldGroupingCore,
 });
+const triggerFieldGroupingMainDeps = buildTriggerFieldGroupingMainDepsHandler();
 const triggerFieldGroupingHandler = createTriggerFieldGroupingHandler(
-  buildTriggerFieldGroupingMainDepsHandler(),
+  triggerFieldGroupingMainDeps,
 );

 const buildMarkLastCardAsAudioCardMainDepsHandler =
@@ -2830,8 +2828,10 @@ const buildMarkLastCardAsAudioCardMainDepsHandler =
  showMpvOsd: (text) => showMpvOsd(text),
  markLastCardAsAudioCardCore,
 });
+const markLastCardAsAudioCardMainDeps =
+  buildMarkLastCardAsAudioCardMainDepsHandler();
 const markLastCardAsAudioCardHandler = createMarkLastCardAsAudioCardHandler(
-  buildMarkLastCardAsAudioCardMainDepsHandler(),
+  markLastCardAsAudioCardMainDeps,
 );

 const buildMineSentenceCardMainDepsHandler = createBuildMineSentenceCardMainDepsHandler({
@@ -2851,8 +2851,9 @@ const buildHandleMultiCopyDigitMainDepsHandler = createBuildHandleMultiCopyDigit
  showMpvOsd: (text) => showMpvOsd(text),
  handleMultiCopyDigitCore,
 });
+const handleMultiCopyDigitMainDeps = buildHandleMultiCopyDigitMainDepsHandler();
 const handleMultiCopyDigitHandler = createHandleMultiCopyDigitHandler(
-  buildHandleMultiCopyDigitMainDepsHandler(),
+  handleMultiCopyDigitMainDeps,
 );

 const buildCopyCurrentSubtitleMainDepsHandler = createBuildCopyCurrentSubtitleMainDepsHandler({
@@ -2861,8 +2862,9 @@ const buildCopyCurrentSubtitleMainDepsHandler = createBuildCopyCurrentSubtitleMa
  showMpvOsd: (text) => showMpvOsd(text),
  copyCurrentSubtitleCore,
 });
+const copyCurrentSubtitleMainDeps = buildCopyCurrentSubtitleMainDepsHandler();
 const copyCurrentSubtitleHandler = createCopyCurrentSubtitleHandler(
-  buildCopyCurrentSubtitleMainDepsHandler(),
+  copyCurrentSubtitleMainDeps,
 );

 const buildHandleMineSentenceDigitMainDepsHandler =
@@ -2879,8 +2881,9 @@ const buildHandleMineSentenceDigitMainDepsHandler =
  },
  handleMineSentenceDigitCore,
 });
+const handleMineSentenceDigitMainDeps = buildHandleMineSentenceDigitMainDepsHandler();
 const handleMineSentenceDigitHandler = createHandleMineSentenceDigitHandler(
-  buildHandleMineSentenceDigitMainDepsHandler(),
+  handleMineSentenceDigitMainDeps,
 );
 const buildSetVisibleOverlayVisibleMainDepsHandler =
  createBuildSetVisibleOverlayVisibleMainDepsHandler({
@@ -2899,8 +2902,10 @@ const buildSetVisibleOverlayVisibleMainDepsHandler =
    setMpvSubVisibilityRuntime(appState.mpvClient, mpvSubVisible);
  },
 });
+const setVisibleOverlayVisibleMainDeps =
+  buildSetVisibleOverlayVisibleMainDepsHandler();
 const setVisibleOverlayVisibleHandler = createSetVisibleOverlayVisibleHandler(
-  buildSetVisibleOverlayVisibleMainDepsHandler(),
+  setVisibleOverlayVisibleMainDeps,
 );

 const buildSetInvisibleOverlayVisibleMainDepsHandler =
@@ -2913,16 +2918,19 @@ const buildSetInvisibleOverlayVisibleMainDepsHandler =
  syncInvisibleOverlayMousePassthrough: () =>
    overlayVisibilityRuntime.syncInvisibleOverlayMousePassthrough(),
 });
+const setInvisibleOverlayVisibleMainDeps =
+  buildSetInvisibleOverlayVisibleMainDepsHandler();
 const setInvisibleOverlayVisibleHandler = createSetInvisibleOverlayVisibleHandler(
-  buildSetInvisibleOverlayVisibleMainDepsHandler(),
+  setInvisibleOverlayVisibleMainDeps,
 );

 const buildToggleVisibleOverlayMainDepsHandler = createBuildToggleVisibleOverlayMainDepsHandler({
  getVisibleOverlayVisible: () => overlayManager.getVisibleOverlayVisible(),
  setVisibleOverlayVisible: (visible) => setVisibleOverlayVisible(visible),
 });
+const toggleVisibleOverlayMainDeps = buildToggleVisibleOverlayMainDepsHandler();
 const toggleVisibleOverlayHandler = createToggleVisibleOverlayHandler(
-  buildToggleVisibleOverlayMainDepsHandler(),
+  toggleVisibleOverlayMainDeps,
 );

 const buildToggleInvisibleOverlayMainDepsHandler =
@@ -2930,15 +2938,18 @@ const buildToggleInvisibleOverlayMainDepsHandler =
  getInvisibleOverlayVisible: () => overlayManager.getInvisibleOverlayVisible(),
  setInvisibleOverlayVisible: (visible) => setInvisibleOverlayVisible(visible),
 });
+const toggleInvisibleOverlayMainDeps =
+  buildToggleInvisibleOverlayMainDepsHandler();
 const toggleInvisibleOverlayHandler = createToggleInvisibleOverlayHandler(
-  buildToggleInvisibleOverlayMainDepsHandler(),
+  toggleInvisibleOverlayMainDeps,
 );

 const buildSetOverlayVisibleMainDepsHandler = createBuildSetOverlayVisibleMainDepsHandler({
  setVisibleOverlayVisible: (visible) => setVisibleOverlayVisible(visible),
 });
+const setOverlayVisibleMainDeps = buildSetOverlayVisibleMainDepsHandler();
 const setOverlayVisibleHandler = createSetOverlayVisibleHandler(
-  buildSetOverlayVisibleMainDepsHandler(),
+  setOverlayVisibleMainDeps,
 );

 const buildToggleOverlayMainDepsHandler = createBuildToggleOverlayMainDepsHandler({
@@ -2950,8 +2961,10 @@ const buildHandleOverlayModalClosedMainDepsHandler =
  createBuildHandleOverlayModalClosedMainDepsHandler({
  handleOverlayModalClosedRuntime: (modal) => overlayModalRuntime.handleOverlayModalClosed(modal),
 });
+const handleOverlayModalClosedMainDeps =
+  buildHandleOverlayModalClosedMainDepsHandler();
 const handleOverlayModalClosedHandler = createHandleOverlayModalClosedHandler(
-  buildHandleOverlayModalClosedMainDepsHandler(),
+  handleOverlayModalClosedMainDeps,
 );

 const buildAppendClipboardVideoToQueueMainDepsHandler =
@@ -2964,8 +2977,10 @@ const buildAppendClipboardVideoToQueueMainDepsHandler =
    sendMpvCommandRuntime(appState.mpvClient, command);
  },
 });
+const appendClipboardVideoToQueueMainDeps =
+  buildAppendClipboardVideoToQueueMainDepsHandler();
 const appendClipboardVideoToQueueHandler = createAppendClipboardVideoToQueueHandler(
-  buildAppendClipboardVideoToQueueMainDepsHandler(),
+  appendClipboardVideoToQueueMainDeps,
 );

 const buildMpvCommandFromIpcRuntimeMainDepsHandler =
@@ -2993,18 +3008,23 @@ const buildMpvCommandFromIpcRuntimeMainDepsHandler =
 const buildHandleMpvCommandFromIpcMainDepsHandler =
  createBuildHandleMpvCommandFromIpcMainDepsHandler({
  handleMpvCommandFromIpcRuntime,
-  buildMpvCommandDeps: () => buildMpvCommandFromIpcRuntimeMainDepsHandler(),
+  buildMpvCommandDeps: () => mpvCommandFromIpcRuntimeMainDeps,
 });
+const mpvCommandFromIpcRuntimeMainDeps = buildMpvCommandFromIpcRuntimeMainDepsHandler();
+const handleMpvCommandFromIpcMainDeps =
+  buildHandleMpvCommandFromIpcMainDepsHandler();
 const handleMpvCommandFromIpcHandler = createHandleMpvCommandFromIpcHandler(
-  buildHandleMpvCommandFromIpcMainDepsHandler(),
+  handleMpvCommandFromIpcMainDeps,
 );

 const buildRunSubsyncManualFromIpcMainDepsHandler =
  createBuildRunSubsyncManualFromIpcMainDepsHandler({
  runManualFromIpc: (request: SubsyncManualRunRequest) => subsyncRuntime.runManualFromIpc(request),
 });
+const runSubsyncManualFromIpcMainDeps =
+  buildRunSubsyncManualFromIpcMainDepsHandler();
 const runSubsyncManualFromIpcHandler = createRunSubsyncManualFromIpcHandler(
-  buildRunSubsyncManualFromIpcMainDepsHandler(),
+  runSubsyncManualFromIpcMainDeps,
 );
 const buildCliCommandContextMainDepsHandler = createBuildCliCommandContextMainDepsHandler({
    appState,
@@ -3048,8 +3068,9 @@ const buildCliCommandContextMainDepsHandler = createBuildCliCommandContextMainDe
    logWarn: (message: string) => logger.warn(message),
    logError: (message: string, err: unknown) => logger.error(message, err),
  });
+const cliCommandContextMainDeps = buildCliCommandContextMainDepsHandler();
 const buildCliCommandContextDepsHandler = createBuildCliCommandContextDepsHandler(
-  buildCliCommandContextMainDepsHandler(),
+  cliCommandContextMainDeps,
 );
 const createOverlayWindowHandler = createCreateOverlayWindowHandler<BrowserWindow>(
  createBuildCreateOverlayWindowMainDepsHandler<BrowserWindow>({
@@ -3137,7 +3158,7 @@ const destroyTrayHandler = createDestroyTrayHandler(
    },
  })(),
 );
-const buildLoadYomitanExtensionMainDepsHandler = createBuildLoadYomitanExtensionMainDepsHandler({
+const yomitanExtensionRuntime = createYomitanExtensionRuntime({
  loadYomitanExtensionCore,
  userDataPath: USER_DATA_PATH,
  getYomitanParserWindow: () => appState.yomitanParserWindow,
@@ -3153,22 +3174,12 @@ const buildLoadYomitanExtensionMainDepsHandler = createBuildLoadYomitanExtension
  setYomitanExtension: (extension) => {
    appState.yomitanExt = extension;
  },
+  getYomitanExtension: () => appState.yomitanExt,
+  getLoadInFlight: () => yomitanLoadInFlight,
+  setLoadInFlight: (promise) => {
+    yomitanLoadInFlight = promise;
+  },
 });
-const loadYomitanExtensionHandler = createLoadYomitanExtensionHandler(
-  buildLoadYomitanExtensionMainDepsHandler(),
-);
-const buildEnsureYomitanExtensionLoadedMainDepsHandler =
-  createBuildEnsureYomitanExtensionLoadedMainDepsHandler({
-    getYomitanExtension: () => appState.yomitanExt,
-    getLoadInFlight: () => yomitanLoadInFlight,
-    setLoadInFlight: (promise) => {
-      yomitanLoadInFlight = promise;
-    },
-    loadYomitanExtension: () => loadYomitanExtension(),
-  });
-const ensureYomitanExtensionLoadedHandler = createEnsureYomitanExtensionLoadedHandler(
-  buildEnsureYomitanExtensionLoadedMainDepsHandler(),
-);
 const buildInitializeOverlayRuntimeOptionsHandler = createBuildInitializeOverlayRuntimeOptionsHandler(
  createBuildInitializeOverlayRuntimeMainDepsHandler({
    appState,
--- a/src/main/runtime/yomitan-extension-runtime.test.ts
+++ b/src/main/runtime/yomitan-extension-runtime.test.ts
@@ -0,0 +1,96 @@
+import assert from 'node:assert/strict';
+import test from 'node:test';
+import type { Extension } from 'electron';
+import { createYomitanExtensionRuntime } from './yomitan-extension-runtime';
+
+test('yomitan extension runtime reuses in-flight ensure load and clears it after resolve', async () => {
+  let extension: Extension | null = null;
+  let inFlight: Promise<Extension | null> | null = null;
+  let parserWindow: unknown = null;
+  let readyPromise: Promise<void> | null = null;
+  let initPromise: Promise<boolean> | null = null;
+  let loadCalls = 0;
+  const releaseLoadState: { releaseLoad: ((value: Extension | null) => void) | null } = {
+    releaseLoad: null,
+  };
+
+  const runtime = createYomitanExtensionRuntime({
+    loadYomitanExtensionCore: async (options) => {
+      loadCalls += 1;
+      options.setYomitanParserWindow(null);
+      options.setYomitanParserReadyPromise(Promise.resolve());
+      options.setYomitanParserInitPromise(Promise.resolve(true));
+      return await new Promise<Extension | null>((resolve) => {
+        releaseLoadState.releaseLoad = (value) => {
+          options.setYomitanExtension(value);
+          resolve(value);
+        };
+      });
+    },
+    userDataPath: '/tmp',
+    getYomitanParserWindow: () => parserWindow as never,
+    setYomitanParserWindow: (window) => {
+      parserWindow = window;
+    },
+    setYomitanParserReadyPromise: (promise) => {
+      readyPromise = promise as Promise<void> | null;
+    },
+    setYomitanParserInitPromise: (promise) => {
+      initPromise = promise as Promise<boolean> | null;
+    },
+    setYomitanExtension: (next) => {
+      extension = next;
+    },
+    getYomitanExtension: () => extension,
+    getLoadInFlight: () => inFlight,
+    setLoadInFlight: (promise) => {
+      inFlight = promise;
+    },
+  });
+
+  const first = runtime.ensureYomitanExtensionLoaded();
+  const second = runtime.ensureYomitanExtensionLoaded();
+  assert.equal(loadCalls, 1);
+  assert.ok(inFlight);
+  assert.equal(parserWindow, null);
+  assert.ok(readyPromise);
+  assert.ok(initPromise);
+
+  const fakeExtension = { id: 'yomitan' } as Extension;
+  const releaseLoad = releaseLoadState.releaseLoad;
+  if (!releaseLoad) {
+    throw new Error('expected in-flight yomitan load resolver');
+  }
+  releaseLoad(fakeExtension);
+  assert.equal(await first, fakeExtension);
+  assert.equal(await second, fakeExtension);
+  assert.equal(extension, fakeExtension);
+  assert.equal(inFlight, null);
+
+  const third = await runtime.ensureYomitanExtensionLoaded();
+  assert.equal(third, fakeExtension);
+  assert.equal(loadCalls, 1);
+});
+
+test('yomitan extension runtime direct load delegates to core', async () => {
+  let loadCalls = 0;
+
+  const runtime = createYomitanExtensionRuntime({
+    loadYomitanExtensionCore: async () => {
+      loadCalls += 1;
+      return null;
+    },
+    userDataPath: '/tmp',
+    getYomitanParserWindow: () => null,
+    setYomitanParserWindow: () => {},
+    setYomitanParserReadyPromise: () => {},
+    setYomitanParserInitPromise: () => {},
+    setYomitanExtension: () => {},
+    getYomitanExtension: () => null,
+    getLoadInFlight: () => null,
+    setLoadInFlight: () => {},
+  });
+
+  assert.equal(await runtime.loadYomitanExtension(), null);
+  assert.equal(loadCalls, 1);
+});
--- a/src/main/runtime/yomitan-extension-runtime.ts
+++ b/src/main/runtime/yomitan-extension-runtime.ts
@@ -0,0 +1,50 @@
+import { createEnsureYomitanExtensionLoadedHandler, createLoadYomitanExtensionHandler } from './yomitan-extension-loader';
+import {
+  createBuildEnsureYomitanExtensionLoadedMainDepsHandler,
+  createBuildLoadYomitanExtensionMainDepsHandler,
+} from './yomitan-extension-loader-main-deps';
+
+type LoadYomitanExtensionMainDeps = Parameters<
+  typeof createBuildLoadYomitanExtensionMainDepsHandler
+>[0];
+
+type EnsureYomitanExtensionLoadedMainDeps = Omit<
+  Parameters<typeof createBuildEnsureYomitanExtensionLoadedMainDepsHandler>[0],
+  'loadYomitanExtension'
+>;
+
+export type YomitanExtensionRuntimeDeps = LoadYomitanExtensionMainDeps &
+  EnsureYomitanExtensionLoadedMainDeps;
+
+export function createYomitanExtensionRuntime(deps: YomitanExtensionRuntimeDeps) {
+  const buildLoadYomitanExtensionMainDepsHandler = createBuildLoadYomitanExtensionMainDepsHandler({
+    loadYomitanExtensionCore: deps.loadYomitanExtensionCore,
+    userDataPath: deps.userDataPath,
+    getYomitanParserWindow: deps.getYomitanParserWindow,
+    setYomitanParserWindow: deps.setYomitanParserWindow,
+    setYomitanParserReadyPromise: deps.setYomitanParserReadyPromise,
+    setYomitanParserInitPromise: deps.setYomitanParserInitPromise,
+    setYomitanExtension: deps.setYomitanExtension,
+  });
+  const loadYomitanExtensionHandler = createLoadYomitanExtensionHandler(
+    buildLoadYomitanExtensionMainDepsHandler(),
+  );
+
+  const buildEnsureYomitanExtensionLoadedMainDepsHandler =
+    createBuildEnsureYomitanExtensionLoadedMainDepsHandler({
+      getYomitanExtension: deps.getYomitanExtension,
+      getLoadInFlight: deps.getLoadInFlight,
+      setLoadInFlight: deps.setLoadInFlight,
+      loadYomitanExtension: () => loadYomitanExtensionHandler(),
+    });
+  const ensureYomitanExtensionLoadedHandler = createEnsureYomitanExtensionLoadedHandler(
+    buildEnsureYomitanExtensionLoadedMainDepsHandler(),
+  );
+
+  return {
+    loadYomitanExtension: (): Promise<ReturnType<typeof deps.getYomitanExtension>> =>
+      loadYomitanExtensionHandler(),
+    ensureYomitanExtensionLoaded: (): Promise<ReturnType<typeof deps.getYomitanExtension>> =>
+      ensureYomitanExtensionLoadedHandler(),
+  };
+}