mirror of
https://github.com/Psychotoxical/psysonic.git
synced 2026-07-22 07:15:47 +00:00
refactor(app): Phase B.2 — split App() into MiniPlayerApp + MainApp (#557)
The 186-LOC default export shrinks to a thin window-kind switch with
shared document-attribute hooks. The mini-player tree and the main-app
tree each move into their own module under src/app/.
- src/app/MiniPlayerApp.tsx (48 LOC):
DragDropProvider + MiniPlayer + cross-window storage sync
- src/app/MainApp.tsx (129 LOC):
BrowserRouter + Routes + main-only lifecycle hooks
(audio listeners, hot cache, global shortcuts, mini-player
bridge, easter egg, scrollbar auto-hide)
AppShell + RequireAuth + TauriEventBridge are now named exports from
App.tsx so MainApp can compose them; Phase C/D will extract those into
their own modules.
App.tsx: 1453 -> 1308 LOC. Behaviour-preserving.
This commit is contained in:
committed by
GitHub
parent
0cd8998dc9
commit
f09da2d2a3
@@ -0,0 +1,129 @@
|
||||
import { lazy, Suspense, useEffect, useState } from 'react';
|
||||
import { BrowserRouter, Route, Routes } from 'react-router-dom';
|
||||
import { invoke } from '@tauri-apps/api/core';
|
||||
import { showToast } from '../utils/toast';
|
||||
import { WindowVisibilityProvider } from '../hooks/useWindowVisibility';
|
||||
import { DragDropProvider } from '../contexts/DragDropContext';
|
||||
import PasteClipboardHandler from '../components/PasteClipboardHandler';
|
||||
import ExportPickerModal from '../components/ExportPickerModal';
|
||||
import ZipDownloadOverlay from '../components/ZipDownloadOverlay';
|
||||
import FpsOverlay from '../components/FpsOverlay';
|
||||
import { useAuthStore } from '../store/authStore';
|
||||
import { useGlobalShortcutsStore } from '../store/globalShortcutsStore';
|
||||
import { initAudioListeners } from '../store/playerStore';
|
||||
import { initHotCachePrefetch } from '../hotCachePrefetch';
|
||||
import { initMiniPlayerBridgeOnMain } from '../utils/miniPlayerBridge';
|
||||
import { IS_WINDOWS } from '../utils/platform';
|
||||
import { AppShell, RequireAuth, TauriEventBridge } from '../App';
|
||||
|
||||
const Login = lazy(() => import('../pages/Login'));
|
||||
|
||||
/**
|
||||
* Main webview tree. Hosts the router, the application shell (sidebar /
|
||||
* player bar / queue panel / main scroll viewport), the Tauri event bridge,
|
||||
* and all background lifecycle hooks (audio listeners, hot-cache prefetch,
|
||||
* global shortcuts, mini-player bridge, easter egg, scrollbar auto-hide).
|
||||
*/
|
||||
export default function MainApp() {
|
||||
const [exportPickerOpen, setExportPickerOpen] = useState(false);
|
||||
|
||||
// Push playback state to mini window + handle control events.
|
||||
useEffect(() => {
|
||||
return initMiniPlayerBridgeOnMain();
|
||||
}, []);
|
||||
|
||||
// Optionally pre-create the mini player webview hidden so the first open
|
||||
// is instant. Windows already does this unconditionally in Rust .setup() as
|
||||
// a hang workaround — skip here to avoid double-building.
|
||||
const preloadMiniPlayer = useAuthStore(s => s.preloadMiniPlayer);
|
||||
useEffect(() => {
|
||||
if (IS_WINDOWS || !preloadMiniPlayer) return;
|
||||
invoke('preload_mini_player').catch(() => {});
|
||||
}, [preloadMiniPlayer]);
|
||||
|
||||
useEffect(() => {
|
||||
return initAudioListeners();
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
return initHotCachePrefetch();
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
useGlobalShortcutsStore.getState().registerAll();
|
||||
}, []);
|
||||
|
||||
// ── Easter egg: Ctrl+Shift+Alt+N → export new albums image ──
|
||||
useEffect(() => {
|
||||
const onKey = (e: KeyboardEvent) => {
|
||||
if (!e.ctrlKey || !e.shiftKey || !e.altKey || e.code !== 'KeyN') return;
|
||||
e.preventDefault();
|
||||
setExportPickerOpen(true);
|
||||
};
|
||||
window.addEventListener('keydown', onKey);
|
||||
return () => window.removeEventListener('keydown', onKey);
|
||||
}, []);
|
||||
|
||||
const handleExport = async (since: number) => {
|
||||
setExportPickerOpen(false);
|
||||
try {
|
||||
const { exportNewAlbumsImage } = await import('../utils/exportNewAlbums');
|
||||
const result = await exportNewAlbumsImage(since);
|
||||
if (result) {
|
||||
const files = result.paths.length > 1 ? ` (${result.paths.length} Dateien)` : '';
|
||||
showToast(`📸 ${result.count} Alben exportiert${files}`);
|
||||
} else {
|
||||
showToast('📭 Keine Alben in diesem Zeitraum gefunden');
|
||||
}
|
||||
} catch (err) {
|
||||
showToast(`❌ Export fehlgeschlagen: ${String(err).slice(0, 80)}`);
|
||||
console.error('[easter egg] export failed:', err);
|
||||
}
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
const timers = new Map<HTMLElement, ReturnType<typeof setTimeout>>();
|
||||
const onScroll = (e: Event) => {
|
||||
const el = e.target as HTMLElement;
|
||||
el.classList.add('is-scrolling');
|
||||
const existing = timers.get(el);
|
||||
if (existing !== undefined) clearTimeout(existing);
|
||||
timers.set(el, setTimeout(() => {
|
||||
el.classList.remove('is-scrolling');
|
||||
timers.delete(el);
|
||||
}, 800));
|
||||
};
|
||||
document.addEventListener('scroll', onScroll, true);
|
||||
return () => {
|
||||
document.removeEventListener('scroll', onScroll, true);
|
||||
timers.forEach(t => clearTimeout(t));
|
||||
};
|
||||
}, []);
|
||||
|
||||
return (
|
||||
<WindowVisibilityProvider>
|
||||
<BrowserRouter>
|
||||
<PasteClipboardHandler />
|
||||
<TauriEventBridge />
|
||||
<Suspense fallback={null}>
|
||||
<Routes>
|
||||
<Route path="/login" element={<Login />} />
|
||||
<Route
|
||||
path="/*"
|
||||
element={
|
||||
<RequireAuth>
|
||||
<DragDropProvider>
|
||||
<AppShell />
|
||||
</DragDropProvider>
|
||||
</RequireAuth>
|
||||
}
|
||||
/>
|
||||
</Routes>
|
||||
</Suspense>
|
||||
{exportPickerOpen && <ExportPickerModal onConfirm={handleExport} onClose={() => setExportPickerOpen(false)} />}
|
||||
<ZipDownloadOverlay />
|
||||
<FpsOverlay />
|
||||
</BrowserRouter>
|
||||
</WindowVisibilityProvider>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,127 @@
|
||||
/**
|
||||
* Smoke + behaviour test for the mini-player webview tree. The component
|
||||
* itself is mostly composition; the meaningful logic is the storage-event
|
||||
* cross-window state-sync handler.
|
||||
*/
|
||||
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
|
||||
|
||||
// vi.mock factories run before module-level vars are initialized; route the
|
||||
// shared mocks through vi.hoisted() so the references resolve in time.
|
||||
const { themeRehydrate, fontRehydrate, keybindingsRehydrate } = vi.hoisted(() => ({
|
||||
themeRehydrate: vi.fn(),
|
||||
fontRehydrate: vi.fn(),
|
||||
keybindingsRehydrate: vi.fn(),
|
||||
}));
|
||||
|
||||
vi.mock('../store/themeStore', () => ({
|
||||
useThemeStore: { persist: { rehydrate: themeRehydrate } },
|
||||
}));
|
||||
vi.mock('../store/fontStore', () => ({
|
||||
useFontStore: { persist: { rehydrate: fontRehydrate } },
|
||||
}));
|
||||
vi.mock('../store/keybindingsStore', () => ({
|
||||
useKeybindingsStore: { persist: { rehydrate: keybindingsRehydrate } },
|
||||
}));
|
||||
vi.mock('../utils/perfFlags', () => ({
|
||||
usePerfProbeFlags: () => ({ disableTooltipPortal: true }),
|
||||
}));
|
||||
vi.mock('../i18n', () => ({
|
||||
default: { changeLanguage: vi.fn() },
|
||||
}));
|
||||
vi.mock('../components/MiniPlayer', () => ({ default: () => <div data-testid="mini-player" /> }));
|
||||
vi.mock('../components/GlobalConfirmModal', () => ({ default: () => <div data-testid="confirm-modal" /> }));
|
||||
vi.mock('../components/TooltipPortal', () => ({ default: () => <div data-testid="tooltip-portal" /> }));
|
||||
vi.mock('../components/FpsOverlay', () => ({ default: () => <div data-testid="fps-overlay" /> }));
|
||||
vi.mock('../contexts/DragDropContext', () => ({
|
||||
DragDropProvider: ({ children }: { children: React.ReactNode }) => <>{children}</>,
|
||||
}));
|
||||
|
||||
import { render, cleanup } from '@testing-library/react';
|
||||
import MiniPlayerApp from './MiniPlayerApp';
|
||||
import i18n from '../i18n';
|
||||
|
||||
beforeEach(() => {
|
||||
themeRehydrate.mockClear();
|
||||
fontRehydrate.mockClear();
|
||||
keybindingsRehydrate.mockClear();
|
||||
vi.mocked(i18n.changeLanguage).mockClear();
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
cleanup();
|
||||
});
|
||||
|
||||
function fireStorage(key: string | null, newValue: string | null = 'x'): void {
|
||||
// jsdom does not synthesize cross-tab storage events from setItem on the
|
||||
// same window — dispatch one manually.
|
||||
window.dispatchEvent(new StorageEvent('storage', { key: key ?? '', newValue: newValue ?? '' }));
|
||||
}
|
||||
|
||||
describe('MiniPlayerApp', () => {
|
||||
it('renders the mini-player tree (smoke)', () => {
|
||||
const { getByTestId } = render(<MiniPlayerApp />);
|
||||
expect(getByTestId('mini-player')).toBeTruthy();
|
||||
expect(getByTestId('confirm-modal')).toBeTruthy();
|
||||
expect(getByTestId('fps-overlay')).toBeTruthy();
|
||||
});
|
||||
|
||||
it('hides the tooltip portal when the perf flag disables it', () => {
|
||||
const { queryByTestId } = render(<MiniPlayerApp />);
|
||||
expect(queryByTestId('tooltip-portal')).toBeNull();
|
||||
});
|
||||
|
||||
describe('storage event handler', () => {
|
||||
it('rehydrates themeStore on psysonic_theme writes', () => {
|
||||
render(<MiniPlayerApp />);
|
||||
fireStorage('psysonic_theme');
|
||||
expect(themeRehydrate).toHaveBeenCalledTimes(1);
|
||||
expect(fontRehydrate).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('rehydrates fontStore on psysonic_font writes', () => {
|
||||
render(<MiniPlayerApp />);
|
||||
fireStorage('psysonic_font');
|
||||
expect(fontRehydrate).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
|
||||
it('rehydrates keybindingsStore on psysonic_keybindings writes', () => {
|
||||
render(<MiniPlayerApp />);
|
||||
fireStorage('psysonic_keybindings');
|
||||
expect(keybindingsRehydrate).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
|
||||
it('switches i18n language on psysonic_language writes', () => {
|
||||
render(<MiniPlayerApp />);
|
||||
fireStorage('psysonic_language', 'de');
|
||||
expect(i18n.changeLanguage).toHaveBeenCalledWith('de');
|
||||
});
|
||||
|
||||
it('ignores psysonic_language when newValue is empty', () => {
|
||||
render(<MiniPlayerApp />);
|
||||
fireStorage('psysonic_language', '');
|
||||
expect(i18n.changeLanguage).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('ignores unrelated storage keys', () => {
|
||||
render(<MiniPlayerApp />);
|
||||
fireStorage('some-other-key');
|
||||
expect(themeRehydrate).not.toHaveBeenCalled();
|
||||
expect(fontRehydrate).not.toHaveBeenCalled();
|
||||
expect(keybindingsRehydrate).not.toHaveBeenCalled();
|
||||
expect(i18n.changeLanguage).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('ignores storage events with no key', () => {
|
||||
render(<MiniPlayerApp />);
|
||||
fireStorage(null);
|
||||
expect(themeRehydrate).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('detaches the listener on unmount', () => {
|
||||
const { unmount } = render(<MiniPlayerApp />);
|
||||
unmount();
|
||||
fireStorage('psysonic_theme');
|
||||
expect(themeRehydrate).not.toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,48 @@
|
||||
import { useEffect } from 'react';
|
||||
import { DragDropProvider } from '../contexts/DragDropContext';
|
||||
import MiniPlayer from '../components/MiniPlayer';
|
||||
import GlobalConfirmModal from '../components/GlobalConfirmModal';
|
||||
import TooltipPortal from '../components/TooltipPortal';
|
||||
import FpsOverlay from '../components/FpsOverlay';
|
||||
import { useThemeStore } from '../store/themeStore';
|
||||
import { useFontStore } from '../store/fontStore';
|
||||
import { useKeybindingsStore } from '../store/keybindingsStore';
|
||||
import { usePerfProbeFlags } from '../utils/perfFlags';
|
||||
import i18n from '../i18n';
|
||||
|
||||
/**
|
||||
* Mini-player webview tree. Rendered in the secondary Tauri window labelled
|
||||
* "mini" — no router, no sidebar, no full audio listeners. The window listens
|
||||
* for state pushes from the main webview (via the storage event below) and
|
||||
* sends control events back through the mini-player bridge.
|
||||
*/
|
||||
export default function MiniPlayerApp() {
|
||||
const perfFlags = usePerfProbeFlags();
|
||||
|
||||
// Both webviews share localStorage (same origin), so the `storage` event
|
||||
// fires in this window whenever main mutates a persisted key — but Zustand
|
||||
// persist only reads localStorage on initial load, hence the explicit
|
||||
// rehydrate.
|
||||
useEffect(() => {
|
||||
const onStorage = (e: StorageEvent) => {
|
||||
if (!e.key) return;
|
||||
if (e.key === 'psysonic_theme') useThemeStore.persist.rehydrate();
|
||||
else if (e.key === 'psysonic_font') useFontStore.persist.rehydrate();
|
||||
else if (e.key === 'psysonic_keybindings') useKeybindingsStore.persist.rehydrate();
|
||||
else if (e.key === 'psysonic_language' && e.newValue) {
|
||||
i18n.changeLanguage(e.newValue);
|
||||
}
|
||||
};
|
||||
window.addEventListener('storage', onStorage);
|
||||
return () => window.removeEventListener('storage', onStorage);
|
||||
}, []);
|
||||
|
||||
return (
|
||||
<DragDropProvider>
|
||||
<MiniPlayer />
|
||||
<GlobalConfirmModal />
|
||||
{!perfFlags.disableTooltipPortal && <TooltipPortal />}
|
||||
<FpsOverlay />
|
||||
</DragDropProvider>
|
||||
);
|
||||
}
|
||||
Reference in New Issue
Block a user