Windows update (#49)

src/main/runtime/playlist-browser-open.ts

@@ -1,9 +1,11 @@
 import type { OverlayHostedModal } from '../../shared/ipc/contracts';
 import { IPC_CHANNELS } from '../../shared/ipc/contracts';
+import { openOverlayHostedModal, retryOverlayModalOpen } from './overlay-hosted-modal-open';
 
 const PLAYLIST_BROWSER_MODAL: OverlayHostedModal = 'playlist-browser';
+const PLAYLIST_BROWSER_OPEN_TIMEOUT_MS = 1500;
 
-export function openPlaylistBrowser(deps: {
+export async function openPlaylistBrowser(deps: {
   ensureOverlayStartupPrereqs: () => void;
   ensureOverlayWindowsReadyForVisibilityActions: () => void;
   sendToActiveOverlayWindow: (
@@ -14,10 +16,33 @@ export function openPlaylistBrowser(deps: {
       preferModalWindow?: boolean;
     },
   ) => boolean;
-}): boolean {
-  deps.ensureOverlayStartupPrereqs();
-  deps.ensureOverlayWindowsReadyForVisibilityActions();
-  return deps.sendToActiveOverlayWindow(IPC_CHANNELS.event.playlistBrowserOpen, undefined, {
-    restoreOnModalClose: PLAYLIST_BROWSER_MODAL,
-  });
+  waitForModalOpen: (modal: OverlayHostedModal, timeoutMs: number) => Promise<boolean>;
+  logWarn: (message: string) => void;
+}): Promise<boolean> {
+  return await retryOverlayModalOpen(
+    {
+      waitForModalOpen: deps.waitForModalOpen,
+      logWarn: deps.logWarn,
+    },
+    {
+      modal: PLAYLIST_BROWSER_MODAL,
+      timeoutMs: PLAYLIST_BROWSER_OPEN_TIMEOUT_MS,
+      retryWarning:
+        'Playlist browser modal did not acknowledge modal open on first attempt; retrying dedicated modal window.',
+      sendOpen: () =>
+        openOverlayHostedModal(
+          {
+            ensureOverlayStartupPrereqs: deps.ensureOverlayStartupPrereqs,
+            ensureOverlayWindowsReadyForVisibilityActions:
+              deps.ensureOverlayWindowsReadyForVisibilityActions,
+            sendToActiveOverlayWindow: deps.sendToActiveOverlayWindow,
+          },
+          {
+            channel: IPC_CHANNELS.event.playlistBrowserOpen,
+            modal: PLAYLIST_BROWSER_MODAL,
+            preferModalWindow: true,
+          },
+        ),
+    },
+  );
 }