Windows update (#49)

src/main/runtime/youtube-picker-open.ts

@@ -1,5 +1,6 @@
 import type { YoutubePickerOpenPayload } from '../../types';
 import type { OverlayHostedModal } from '../../shared/ipc/contracts';
+import { retryOverlayModalOpen } from './overlay-hosted-modal-open';
 
 const YOUTUBE_PICKER_MODAL: OverlayHostedModal = 'youtube-track-picker';
 const YOUTUBE_PICKER_OPEN_TIMEOUT_MS = 1500;
@@ -19,24 +20,21 @@ export async function openYoutubeTrackPicker(
   },
   payload: YoutubePickerOpenPayload,
 ): Promise<boolean> {
-  const sendPickerOpen = (): boolean =>
-    deps.sendToActiveOverlayWindow('youtube:picker-open', payload, {
-      restoreOnModalClose: YOUTUBE_PICKER_MODAL,
-      preferModalWindow: true,
-    });
-
-  if (!sendPickerOpen()) {
-    return false;
-  }
-  if (await deps.waitForModalOpen(YOUTUBE_PICKER_MODAL, YOUTUBE_PICKER_OPEN_TIMEOUT_MS)) {
-    return true;
-  }
-
-  deps.logWarn(
-    'YouTube subtitle picker did not acknowledge modal open on first attempt; retrying dedicated modal window.',
+  return await retryOverlayModalOpen(
+    {
+      waitForModalOpen: deps.waitForModalOpen,
+      logWarn: deps.logWarn,
+    },
+    {
+      modal: YOUTUBE_PICKER_MODAL,
+      timeoutMs: YOUTUBE_PICKER_OPEN_TIMEOUT_MS,
+      retryWarning:
+        'YouTube subtitle picker did not acknowledge modal open on first attempt; retrying dedicated modal window.',
+      sendOpen: () =>
+        deps.sendToActiveOverlayWindow('youtube:picker-open', payload, {
+          restoreOnModalClose: YOUTUBE_PICKER_MODAL,
+          preferModalWindow: true,
+        }),
+    },
   );
-  if (!sendPickerOpen()) {
-    return false;
-  }
-  return await deps.waitForModalOpen(YOUTUBE_PICKER_MODAL, YOUTUBE_PICKER_OPEN_TIMEOUT_MS);
 }