Compare commits

..
133 changed files with 5128 additions and 6851 deletions

No files matched your search

+4 -9
View File
@@ -73,15 +73,10 @@ select your signing team, then build and run. For a Release build, use Xcode's
Archive action with the Catalyst destination. EAS's existing iOS profiles still Archive action with the Catalyst destination. EAS's existing iOS profiles still
build iPhone/iPad apps. build iPhone/iPad apps.
Don't enable Catalyst by hand in Xcode; the plugin configures everything during The Catalyst plugin enables the Xcode target and React Native's CocoaPods
prebuild. It enables the Xcode target and React Native's CocoaPods patches, patches. It disables precompiled React Native and Expo modules so dependencies
raises pod deployment targets to the app's, and disables precompiled React can compile for Catalyst. The Mac app derives a separate bundle identifier with
Native and Expo modules so dependencies can compile for Catalyst. System volume Apple's `maccatalyst.` prefix. System volume stays under macOS control.
stays under macOS control.
The Mac app uses the same bundle identifier as the iOS app, so sign both with the
same team. Handoff only pairs apps with a matching team and activity type, which
`app.config.ts` declares once per build profile in `NSUserActivityTypes`.
To return a checkout to ordinary iOS builds, rerun prebuild without To return a checkout to ordinary iOS builds, rerun prebuild without
`MAC_CATALYST=1`. Keep `APP_VARIANT` consistent when starting Metro. `MAC_CATALYST=1`. Keep `APP_VARIANT` consistent when starting Metro.
+2 -4
View File
@@ -4,9 +4,7 @@ This integration uses Expo 58 inline modules and `expo-app-intents`. Rebuild the
Playback and library changes open oTunes because they need its authenticated React runtime. Swift dispatches a request and waits for an app-owned completion acknowledgment. Playback waits for the native audio player to load the requested track; warmup waits for it to load while paused. Errors reach Siri, and requests that have expired are discarded before starting a side effect. Native catalog reads do not open the app. Playback and library changes open oTunes because they need its authenticated React runtime. Swift dispatches a request and waits for an app-owned completion acknowledgment. Playback waits for the native audio player to load the requested track; warmup waits for it to load while paused. Errors reach Siri, and requests that have expired are discarded before starting a side effect. Native catalog reads do not open the app.
The full entity catalog lives in Application Support. Expo's UserDefaults catalog holds at most 100 suggestions per kind, with favorites first, and mirrors those suggestions into Spotlight. Siri's native queries search the full disk catalog. The full entity catalog lives in Application Support. The backend supplies pages of 200 records. Expo's UserDefaults catalog holds at most 100 suggestions per kind, with favorites first, and mirrors those suggestions into Spotlight. Siri's native queries search the full disk catalog. Catalogs refresh on launch, foreground entry, favorite changes, and every five minutes while foregrounded.
Sync is incremental. The app subscribes to `intentCatalog.head`, the newest insert, rename or deletion per kind, and fetches a kind only when it moves past the cursor stored in AsyncStorage. `intentCatalog.page` then returns records created after the cursor plus renames and deletions from the `intentCatalogChanges` log. The log keeps 30 days; older cursors, or more than 2,000 changes, rebuild that kind from scratch. Favorites are stamped onto records on device from the favorites subscription, so liking a song costs no catalog queries. Playlists come from the live `intentCatalog.playlists` query. Code lives in `components/app-intents/`: `catalog-sync.ts`, `now-playing.ts`, and `dispatch.ts`.
Songs, albums, artists, and playlists have Spotlight open intents and on-screen entity associations. Associations require iOS 18.4 and Xcode 27; Spotlight indexing requires iOS 18. Playback donations are made after the player starts, preserve shuffle, and resolve real catalog entities. Removed records trigger donation cleanup. Sign-out clears catalogs, Spotlight entries, donations, and pending invocations. On iOS 27, the query types also handle system requests to rebuild Spotlight indexes. Songs, albums, artists, and playlists have Spotlight open intents and on-screen entity associations. Associations require iOS 18.4 and Xcode 27; Spotlight indexing requires iOS 18. Playback donations are made after the player starts, preserve shuffle, and resolve real catalog entities. Removed records trigger donation cleanup. Sign-out clears catalogs, Spotlight entries, donations, and pending invocations. On iOS 27, the query types also handle system requests to rebuild Spotlight indexes.
@@ -16,7 +14,7 @@ Audio schema intents require Xcode 27 and iOS 27. Custom intents remain availabl
Deploy the companion Convex changes before installing the new mobile build: Deploy the companion Convex changes before installing the new mobile build:
- `intentCatalog.head`, `intentCatalog.page` and `intentCatalog.playlists` supply the entity catalog. Library mutations record renames and deletions in `intentCatalogChanges`, pruned daily. - `library.intentCatalogPage` supplies authenticated, paginated entity records.
- `appIntentPlaylists` records playlist-creation request IDs in the same transaction as creation. Replaying a request returns the original playlist ID. - `appIntentPlaylists` records playlist-creation request IDs in the same transaction as creation. Replaying a request returns the original playlist ID.
- `playlists.createPlaylist` accepts an optional `invocationId`; existing callers can omit it. - `playlists.createPlaylist` accepts an optional `invocationId`; existing callers can omit it.
+2 -5
View File
@@ -26,8 +26,6 @@ export default ({ config }: ConfigContext): ExpoConfig => {
production: "oTunes", production: "oTunes",
}[variant] }[variant]
const bundleIdentifier = `${config.ios!.bundleIdentifier}${suffix}`
return { return {
...config, ...config,
plugins: [ plugins: [
@@ -42,12 +40,11 @@ export default ({ config }: ConfigContext): ExpoConfig => {
icon: `./assets/icon${iconSuffix}.png`, icon: `./assets/icon${iconSuffix}.png`,
ios: { ios: {
...config.ios, ...config.ios,
bundleIdentifier, bundleIdentifier: `${config.ios!.bundleIdentifier}${suffix}`,
icon: `./assets/${composer}.icon`, icon: `./assets/${composer}.icon`,
infoPlist: { infoPlist: {
...config.ios?.infoPlist, ...config.ios?.infoPlist,
// HandoffModule publishes this `.media` type; Catalyst shares this bundle ID. NSUserActivityTypes: [`com.abunchofknowitalls.otunes${suffix}.media`],
NSUserActivityTypes: [`${bundleIdentifier}.media`],
}, },
}, },
android: { android: {
-1
View File
@@ -54,7 +54,6 @@
"expo-status-bar", "expo-status-bar",
"expo-app-intents", "expo-app-intents",
"./plugins/with-android-colors", "./plugins/with-android-colors",
"./plugins/with-android-fast-fade",
[ [
"expo-navigation-bar", "expo-navigation-bar",
{ {
+24 -13
View File
@@ -6,8 +6,8 @@ import { NavigationBar } from "expo-navigation-bar"
import { import {
ScreenPaletteProvider, ScreenPaletteProvider,
useAndroidTabPalette, useAndroidTabPalette,
useAndroidTabHasArtworkPalette, useAndroidTabBackgroundStyle,
useTabletBackgroundStyle, useAndroidNativeTabColors,
} from "@/contexts/android-tab-theme" } from "@/contexts/android-tab-theme"
import { DarkTheme, DefaultTheme, ThemeProvider } from "expo-router" import { DarkTheme, DefaultTheme, ThemeProvider } from "expo-router"
import { NativeTabs } from "expo-router/native-tabs" import { NativeTabs } from "expo-router/native-tabs"
@@ -46,13 +46,12 @@ function useRouterTheme() {
} }
function useNativeTabColors() { function useNativeTabColors() {
// These props initialize native tabs; the worklet owns subsequent colors.
const selectedColor = colors.dark.primary
const themeIsDark = useIsDark() const themeIsDark = useIsDark()
const androidPalette = useAndroidTabPalette() const androidPalette = colors.dark
const hasArtworkPalette = useAndroidTabHasArtworkPalette() const artworkPalette = useAndroidTabPalette()
const selectedColor = hasArtworkPalette const isDark = Platform.OS === "android" ? artworkPalette.isDark : themeIsDark
? androidPalette.foreground
: androidPalette.accentText
const isDark = Platform.OS === "android" ? androidPalette.isDark : themeIsDark
const inactive = appleMusic.tabInactive const inactive = appleMusic.tabInactive
const iconColor = const iconColor =
@@ -62,14 +61,14 @@ function useNativeTabColors() {
selected: appleMusic.pink, selected: appleMusic.pink,
} }
: { : {
default: androidPalette.secondaryForeground, default: androidPalette.mutedForeground,
selected: selectedColor, selected: selectedColor,
} }
const labelColor = const labelColor =
Platform.OS === "ios" Platform.OS === "ios"
? DynamicColorIOS({ dark: inactive, light: "#636366" }) ? DynamicColorIOS({ dark: inactive, light: "#636366" })
: androidPalette.secondaryForeground : androidPalette.mutedForeground
return { return {
isDark, isDark,
@@ -86,17 +85,20 @@ function useNativeTabColors() {
blurEffect: isDark blurEffect: isDark
? "systemChromeMaterialDark" ? "systemChromeMaterialDark"
: "systemChromeMaterialLight", : "systemChromeMaterialLight",
backgroundColor: // Reveal the shared UI-thread background beneath the native tab bar.
Platform.OS === "ios" ? undefined : androidPalette.background, backgroundColor: Platform.OS === "ios" ? undefined : "transparent",
} }
} }
function TabsContent() { function TabsContent() {
const tabletLayout = useTabletLayout() const tabletLayout = useTabletLayout()
const homeColors = useAndroidNativeTabColors()
const libraryColors = useAndroidNativeTabColors()
const searchColors = useAndroidNativeTabColors()
const keyboardVisible = useAndroidKeyboardVisible() const keyboardVisible = useAndroidKeyboardVisible()
const routerTheme = useRouterTheme() const routerTheme = useRouterTheme()
const tabColors = useNativeTabColors() const tabColors = useNativeTabColors()
const backgroundStyle = useTabletBackgroundStyle() const backgroundStyle = useAndroidTabBackgroundStyle()
const { currentSong, queueSongIds } = usePlaybackQueue() const { currentSong, queueSongIds } = usePlaybackQueue()
const showBottomAccessory = Boolean(currentSong && queueSongIds.length > 0) const showBottomAccessory = Boolean(currentSong && queueSongIds.length > 0)
@@ -138,6 +140,9 @@ function TabsContent() {
<NativeTabs.Trigger <NativeTabs.Trigger
name="home" name="home"
unstable_nativeProps={
Platform.OS === "android" ? homeColors : undefined
}
disableTransparentOnScrollEdge disableTransparentOnScrollEdge
contentStyle={androidContentStyle} contentStyle={androidContentStyle}
> >
@@ -147,6 +152,9 @@ function TabsContent() {
<NativeTabs.Trigger <NativeTabs.Trigger
name="library" name="library"
unstable_nativeProps={
Platform.OS === "android" ? libraryColors : undefined
}
disableTransparentOnScrollEdge disableTransparentOnScrollEdge
contentStyle={androidContentStyle} contentStyle={androidContentStyle}
> >
@@ -161,6 +169,9 @@ function TabsContent() {
<NativeTabs.Trigger <NativeTabs.Trigger
name="search" name="search"
unstable_nativeProps={
Platform.OS === "android" ? searchColors : undefined
}
disableTransparentOnScrollEdge disableTransparentOnScrollEdge
contentStyle={androidContentStyle} contentStyle={androidContentStyle}
> >
@@ -1,4 +1,3 @@
import { Ionicons } from "@expo/vector-icons"
import { SongSwipeRow } from "@/components/song-swipe-row" import { SongSwipeRow } from "@/components/song-swipe-row"
import { import {
useSwipeRowGroup, useSwipeRowGroup,
@@ -8,13 +7,21 @@ import {
CollectionHero, CollectionHero,
useCollectionHeroLayout, useCollectionHeroLayout,
} from "@/components/collection-hero" } from "@/components/collection-hero"
import {
PaletteText,
PaletteIcon,
renderArtworkBackButton,
} from "@/components/palette-text"
import Animated from "react-native-reanimated" import Animated from "react-native-reanimated"
import { useScreenPalette } from "@/contexts/android-tab-theme" import {
renderAndroidArtworkBackground,
useScreenPalette,
} from "@/contexts/android-tab-theme"
import { MusicEntityView } from "@/components/music-entity-view" import { MusicEntityView } from "@/components/music-entity-view"
import { Link, Stack, useIsFocused, useLocalSearchParams } from "expo-router" import { Link, Stack, useIsFocused, useLocalSearchParams } from "expo-router"
import { StatusBar } from "expo-status-bar" import { StatusBar } from "expo-status-bar"
import { memo, useCallback, useEffect, useMemo } from "react" import { memo, useCallback, useEffect, useMemo } from "react"
import { Platform, Pressable, StyleSheet, Text, View } from "react-native" import { Platform, Pressable, StyleSheet, View } from "react-native"
import { import {
CollectionDivider, CollectionDivider,
@@ -82,6 +89,20 @@ export default function AlbumScreen() {
[album] [album]
) )
// Older servers do not include album format availability yet.
const formatTracks = useCachedQuery(
api.library.getSongsForPlayback,
album && (album.hasLossless === undefined || album.hasAtmos === undefined)
? { ids: songIds }
: "skip"
)
const hasLossless =
album?.hasLossless ??
formatTracks?.some((track) => track && "lossless" in track.files)
const hasAtmos =
album?.hasAtmos ??
formatTracks?.some((track) => track && "atmos" in track.files)
useEffect(() => { useEffect(() => {
if (album) { if (album) {
rememberSongs(albumDetailSongs(album)) rememberSongs(albumDetailSongs(album))
@@ -90,12 +111,6 @@ export default function AlbumScreen() {
const listItems = useMemo(() => albumListItems(album?.tracks ?? []), [album]) const listItems = useMemo(() => albumListItems(album?.tracks ?? []), [album])
const playTrack = useCallback(
(songId: Id<"songs">, ids: Id<"songs">[]) =>
playFromSong(songId, ids, `album:${id}`),
[id, playFromSong]
)
const renderItem = useCallback( const renderItem = useCallback(
({ item }: { item: AlbumListItem }) => { ({ item }: { item: AlbumListItem }) => {
if (item.type === "disc") { if (item.type === "disc") {
@@ -110,7 +125,9 @@ export default function AlbumScreen() {
songIds={songIds} songIds={songIds}
palette={palette} palette={palette}
favorited={isSongFavorite(item.track.id)} favorited={isSongFavorite(item.track.id)}
onPlay={playTrack} onPlay={(songId, ids) =>
playFromSong(songId, ids, `album:${album.id}`)
}
onAction={handleAlbumTrackAction} onAction={handleAlbumTrackAction}
/> />
) : null ) : null
@@ -120,7 +137,7 @@ export default function AlbumScreen() {
handleAlbumTrackAction, handleAlbumTrackAction,
isSongFavorite, isSongFavorite,
palette, palette,
playTrack, playFromSong,
songIds, songIds,
swipeGroup, swipeGroup,
] ]
@@ -135,14 +152,17 @@ export default function AlbumScreen() {
headerLargeTitle: false, headerLargeTitle: false,
...(Platform.OS === "android" ...(Platform.OS === "android"
? { ? {
headerStyle: { backgroundColor: palette.background }, headerStyle: { backgroundColor: "transparent" },
headerBackground: renderAndroidArtworkBackground,
headerBackVisible: false,
headerLeft: renderArtworkBackButton,
headerTintColor: palette.foreground, headerTintColor: palette.foreground,
} }
: {}), : {}),
}} }}
/> />
<CollectionDetailSkeleton <CollectionDetailSkeleton
variant="album" zoomCoverSize={220}
onLayout={onLayout} onLayout={onLayout}
style={backgroundStyle} style={backgroundStyle}
backgroundColor={ backgroundColor={
@@ -163,9 +183,9 @@ export default function AlbumScreen() {
}} }}
/> />
<View style={[styles.empty, { backgroundColor: colors.background }]}> <View style={[styles.empty, { backgroundColor: colors.background }]}>
<Text style={{ color: colors.mutedForeground }}> <PaletteText style={{ color: colors.mutedForeground }}>
Album not found. Album not found.
</Text> </PaletteText>
</View> </View>
</> </>
) )
@@ -186,7 +206,10 @@ export default function AlbumScreen() {
headerTintColor: palette.foreground, headerTintColor: palette.foreground,
...(Platform.OS === "android" ...(Platform.OS === "android"
? { ? {
headerStyle: { backgroundColor: palette.background }, headerStyle: { backgroundColor: "transparent" },
headerBackground: renderAndroidArtworkBackground,
headerBackVisible: false,
headerLeft: renderArtworkBackButton,
statusBarStyle: palette.isDark statusBarStyle: palette.isDark
? ("light" as const) ? ("light" as const)
: ("dark" as const), : ("dark" as const),
@@ -208,10 +231,11 @@ export default function AlbumScreen() {
} }
> >
<Pressable hitSlop={8}> <Pressable hitSlop={8}>
<Ionicons <PaletteIcon
tone="foreground"
name="ellipsis-horizontal" name="ellipsis-horizontal"
size={22} size={22}
color={colors.foreground} color={palette.isDark ? "#fff" : "#000"}
/> />
</Pressable> </Pressable>
</MediaActionMenu> </MediaActionMenu>
@@ -269,7 +293,8 @@ export default function AlbumScreen() {
{ backgroundColor: palette.surface }, { backgroundColor: palette.surface },
]} ]}
> >
<Ionicons <PaletteIcon
tone={favorited ? "accent" : "foreground"}
name={favorited ? "star" : "star-outline"} name={favorited ? "star" : "star-outline"}
size={24} size={24}
color={favorited ? palette.accent : palette.foreground} color={favorited ? palette.accent : palette.foreground}
@@ -295,7 +320,8 @@ export default function AlbumScreen() {
{ backgroundColor: palette.surface }, { backgroundColor: palette.surface },
]} ]}
> >
<Ionicons <PaletteIcon
tone="foreground"
name="shuffle" name="shuffle"
size={24} size={24}
color={palette.foreground} color={palette.foreground}
@@ -304,7 +330,8 @@ export default function AlbumScreen() {
</View> </View>
} }
> >
<Text <PaletteText
tone="foreground"
style={[ style={[
styles.title, styles.title,
heroLayout.landscape && styles.titleLandscape, heroLayout.landscape && styles.titleLandscape,
@@ -312,12 +339,13 @@ export default function AlbumScreen() {
]} ]}
> >
{album.title} {album.title}
</Text> </PaletteText>
<Pressable <Pressable
onPress={() => push(`/artist/${album.artist.id}`)} onPress={() => push(`/artist/${album.artist.id}`)}
style={styles.artistPressable} style={styles.artistPressable}
> >
<Text <PaletteText
tone="accentText"
style={[ style={[
styles.artist, styles.artist,
heroLayout.landscape && styles.artistLandscape, heroLayout.landscape && styles.artistLandscape,
@@ -325,7 +353,7 @@ export default function AlbumScreen() {
]} ]}
> >
{album.artist.name} {album.artist.name}
</Text> </PaletteText>
</Pressable> </Pressable>
<View <View
style={{ style={{
@@ -339,32 +367,43 @@ export default function AlbumScreen() {
}} }}
> >
{metadata ? ( {metadata ? (
<Text style={{ color: palette.secondaryForeground }}> <PaletteText
tone="secondaryForeground"
style={{ color: palette.secondaryForeground }}
>
{metadata} {metadata}
</Text> </PaletteText>
) : null} ) : null}
{album.hasLossless ? ( {hasLossless ? (
<> <>
{metadata ? ( {metadata ? (
<Text style={{ color: palette.secondaryForeground }}> <PaletteText
tone="secondaryForeground"
style={{ color: palette.secondaryForeground }}
>
· ·
</Text> </PaletteText>
) : null} ) : null}
<AudioFormatBadge <AudioFormatBadge
artwork
format="lossless" format="lossless"
color={palette.secondaryForeground} color={palette.secondaryForeground}
backgroundColor={palette.background} backgroundColor={palette.background}
/> />
</> </>
) : null} ) : null}
{album.hasAtmos ? ( {hasAtmos ? (
<> <>
{metadata || album.hasLossless ? ( {metadata || hasLossless ? (
<Text style={{ color: palette.secondaryForeground }}> <PaletteText
tone="secondaryForeground"
style={{ color: palette.secondaryForeground }}
>
· ·
</Text> </PaletteText>
) : null} ) : null}
<AudioFormatBadge <AudioFormatBadge
artwork
format="atmos" format="atmos"
color={palette.secondaryForeground} color={palette.secondaryForeground}
backgroundColor={palette.background} backgroundColor={palette.background}
@@ -488,11 +527,12 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
style={styles.trackRow} style={styles.trackRow}
onPress={() => void onPlay(track.id as Id<"songs">, songIds)} onPress={() => void onPlay(track.id as Id<"songs">, songIds)}
> >
<Text <PaletteText
tone="secondaryForeground"
style={[styles.trackNumber, { color: palette.secondaryForeground }]} style={[styles.trackNumber, { color: palette.secondaryForeground }]}
> >
{number} {number}
</Text> </PaletteText>
<View <View
style={[ style={[
styles.trackContent, styles.trackContent,
@@ -500,24 +540,29 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
]} ]}
> >
<View style={styles.trackMeta}> <View style={styles.trackMeta}>
<Text <PaletteText
tone="foreground"
style={[styles.trackTitle, { color: palette.foreground }]} style={[styles.trackTitle, { color: palette.foreground }]}
numberOfLines={1} numberOfLines={1}
> >
{track.title} {track.title}
</Text> </PaletteText>
{track.artists ? ( {track.artists ? (
<Text <PaletteText
tone="secondaryForeground"
style={{ color: palette.secondaryForeground }} style={{ color: palette.secondaryForeground }}
numberOfLines={1} numberOfLines={1}
> >
{track.artists.join(", ")} {track.artists.join(", ")}
</Text> </PaletteText>
) : null} ) : null}
</View> </View>
<Text style={{ color: palette.secondaryForeground }}> <PaletteText
tone="secondaryForeground"
style={{ color: palette.secondaryForeground }}
>
{formatDuration(track.durationSeconds)} {formatDuration(track.durationSeconds)}
</Text> </PaletteText>
</View> </View>
</Row> </Row>
</MusicEntityView> </MusicEntityView>
@@ -42,7 +42,7 @@ export default function ArtistScreen() {
headerLargeTitle: false, headerLargeTitle: false,
}} }}
/> />
<CollectionDetailSkeleton variant="artist" /> <CollectionDetailSkeleton round />
</> </>
) )
} }
@@ -1,14 +1,21 @@
import { Ionicons } from "@expo/vector-icons"
import { import {
CollectionHero, CollectionHero,
useCollectionHeroLayout, useCollectionHeroLayout,
} from "@/components/collection-hero" } from "@/components/collection-hero"
import {
PaletteText,
PaletteIcon,
renderArtworkBackButton,
} from "@/components/palette-text"
import Animated from "react-native-reanimated" import Animated from "react-native-reanimated"
import { import {
PlaylistSearchBar, PlaylistSearchBar,
usePlaylistSearch, usePlaylistSearch,
} from "@/components/playlist-search-bar" } from "@/components/playlist-search-bar"
import { useScreenPalette } from "@/contexts/android-tab-theme" import {
renderAndroidArtworkBackground,
useScreenPalette,
} from "@/contexts/android-tab-theme"
import { MusicEntityView } from "@/components/music-entity-view" import { MusicEntityView } from "@/components/music-entity-view"
import { useMutation } from "convex/react" import { useMutation } from "convex/react"
import { memo, useCallback, useEffect, useMemo } from "react" import { memo, useCallback, useEffect, useMemo } from "react"
@@ -24,7 +31,6 @@ import {
Platform, Platform,
Pressable, Pressable,
StyleSheet, StyleSheet,
Text,
View, View,
type ListRenderItemInfo, type ListRenderItemInfo,
} from "react-native" } from "react-native"
@@ -105,14 +111,17 @@ export default function PlaylistScreen() {
headerLargeTitle: false, headerLargeTitle: false,
...(Platform.OS === "android" ...(Platform.OS === "android"
? { ? {
headerStyle: { backgroundColor: palette.background }, headerStyle: { backgroundColor: "transparent" },
headerBackground: renderAndroidArtworkBackground,
headerBackVisible: false,
headerLeft: renderArtworkBackButton,
headerTintColor: palette.foreground, headerTintColor: palette.foreground,
} }
: {}), : {}),
}} }}
/> />
<CollectionDetailSkeleton <CollectionDetailSkeleton
variant="playlist" zoomCoverSize={200}
onLayout={onLayout} onLayout={onLayout}
style={backgroundStyle} style={backgroundStyle}
backgroundColor={ backgroundColor={
@@ -133,9 +142,9 @@ export default function PlaylistScreen() {
}} }}
/> />
<View style={[styles.empty, { backgroundColor: colors.background }]}> <View style={[styles.empty, { backgroundColor: colors.background }]}>
<Text style={{ color: colors.mutedForeground }}> <PaletteText style={{ color: colors.mutedForeground }}>
Playlist not found. Playlist not found.
</Text> </PaletteText>
</View> </View>
</> </>
) )
@@ -170,7 +179,6 @@ function PlaylistContent({
}) { }) {
const router = useRouter() const router = useRouter()
const isFocused = useIsFocused() const isFocused = useIsFocused()
const colors = useThemeColors()
const { playPlaylist, playPlaylistShuffled, playFromSong } = const { playPlaylist, playPlaylistShuffled, playFromSong } =
usePlaybackActions() usePlaybackActions()
const { isSongFavorite } = useFavorites() const { isSongFavorite } = useFavorites()
@@ -194,6 +202,12 @@ function PlaylistContent({
[playFromSong, songIds, playlistId] [playFromSong, songIds, playlistId]
) )
const handleSongMenuAction = useCallback(
(song: BrowseSong, action: MediaAction) =>
void handleSongAction(song, action),
[handleSongAction]
)
const handleRemoveSong = useCallback( const handleRemoveSong = useCallback(
async (songId: Id<"songs">) => { async (songId: Id<"songs">) => {
if (!playlistId) return false if (!playlistId) return false
@@ -212,14 +226,6 @@ function PlaylistContent({
[playlistId, removeSongs] [playlistId, removeSongs]
) )
const handleSongMenuAction = useCallback(
(song: BrowseSong, action: MediaAction) => {
if (action === "remove-from-playlist") void handleRemoveSong(song.id)
else void handleSongAction(song, action)
},
[handleRemoveSong, handleSongAction]
)
const handlePlay = useCallback(() => { const handlePlay = useCallback(() => {
if (playlistId) void playPlaylist(playlistId, songIds) if (playlistId) void playPlaylist(playlistId, songIds)
}, [playPlaylist, playlistId, songIds]) }, [playPlaylist, playlistId, songIds])
@@ -271,7 +277,10 @@ function PlaylistContent({
headerTintColor: palette.foreground, headerTintColor: palette.foreground,
...(Platform.OS === "android" ...(Platform.OS === "android"
? { ? {
headerStyle: { backgroundColor: palette.background }, headerStyle: { backgroundColor: "transparent" },
headerBackground: renderAndroidArtworkBackground,
headerBackVisible: false,
headerLeft: renderArtworkBackButton,
statusBarStyle: palette.isDark statusBarStyle: palette.isDark
? ("light" as const) ? ("light" as const)
: ("dark" as const), : ("dark" as const),
@@ -290,10 +299,11 @@ function PlaylistContent({
onAction={handlePlaylistMenuAction} onAction={handlePlaylistMenuAction}
> >
<Pressable hitSlop={8}> <Pressable hitSlop={8}>
<Ionicons <PaletteIcon
tone="foreground"
name="ellipsis-horizontal" name="ellipsis-horizontal"
size={22} size={22}
color={colors.foreground} color={palette.isDark ? "#fff" : "#000"}
/> />
</Pressable> </Pressable>
</MediaActionMenu> </MediaActionMenu>
@@ -301,7 +311,6 @@ function PlaylistContent({
} }
}, [ }, [
canEdit, canEdit,
colors.foreground,
deletePlaylist, deletePlaylist,
handlePlaylistDetailAction, handlePlaylistDetailAction,
palette.foreground, palette.foreground,
@@ -361,14 +370,15 @@ function PlaylistContent({
contentInsetAdjustmentBehavior="automatic" contentInsetAdjustmentBehavior="automatic"
onScrollBeginDrag={swipeGroup.closeOpenRow} onScrollBeginDrag={swipeGroup.closeOpenRow}
ListEmptyComponent={ ListEmptyComponent={
<Text <PaletteText
tone="secondaryForeground"
style={[ style={[
styles.emptyResults, styles.emptyResults,
{ color: palette.secondaryForeground }, { color: palette.secondaryForeground },
]} ]}
> >
{songs.length ? "No songs found." : "No songs in this playlist."} {songs.length ? "No songs found." : "No songs in this playlist."}
</Text> </PaletteText>
} }
ListHeaderComponent={ ListHeaderComponent={
<PlaylistHero <PlaylistHero
@@ -422,7 +432,6 @@ const PlaylistSongRow = memo(function PlaylistSongRow({
playlistLabel={PLAYLIST_LABEL} playlistLabel={PLAYLIST_LABEL}
palette={palette} palette={palette}
inset inset
removable={removable}
swipe={ swipe={
Platform.OS !== "web" Platform.OS !== "web"
? { ? {
@@ -430,7 +439,12 @@ const PlaylistSongRow = memo(function PlaylistSongRow({
backgroundColor: palette.background, backgroundColor: palette.background,
onPlayNext: () => onAction(song, "play-next"), onPlayNext: () => onAction(song, "play-next"),
onAddToQueue: () => onAction(song, "play-last"), onAddToQueue: () => onAction(song, "play-last"),
onRemove: removable ? () => void handleRemove() : undefined, onRemove:
Platform.OS === "android" && removable
? () => {
void onRemove(song.id)
}
: undefined,
} }
: undefined : undefined
} }
@@ -461,15 +475,19 @@ const PlaylistSongRow = memo(function PlaylistSongRow({
}} }}
style={[styles.removeAction, { backgroundColor: colors.destructive }]} style={[styles.removeAction, { backgroundColor: colors.destructive }]}
> >
<Ionicons name="trash" size={22} color={colors.primaryForeground} /> <PaletteIcon
<Text name="trash"
size={22}
color={colors.primaryForeground}
/>
<PaletteText
style={[ style={[
styles.removeActionText, styles.removeActionText,
{ color: colors.primaryForeground }, { color: colors.primaryForeground },
]} ]}
> >
Remove Remove
</Text> </PaletteText>
</Pressable> </Pressable>
)} )}
> >
@@ -549,7 +567,8 @@ const PlaylistHero = memo(function PlaylistHero({
}, },
]} ]}
> >
<Ionicons <PaletteIcon
tone={isSubscribed ? "foreground" : "accentForeground"}
name={isSubscribed ? "checkmark" : "add"} name={isSubscribed ? "checkmark" : "add"}
size={24} size={24}
color={ color={
@@ -575,12 +594,18 @@ const PlaylistHero = memo(function PlaylistHero({
onPress={onShuffle} onPress={onShuffle}
style={[styles.iconAction, { backgroundColor: palette.surface }]} style={[styles.iconAction, { backgroundColor: palette.surface }]}
> >
<Ionicons name="shuffle" size={24} color={palette.foreground} /> <PaletteIcon
tone="foreground"
name="shuffle"
size={24}
color={palette.foreground}
/>
</Pressable> </Pressable>
</View> </View>
} }
> >
<Text <PaletteText
tone="foreground"
style={[ style={[
styles.title, styles.title,
heroLayout.landscape && styles.titleLandscape, heroLayout.landscape && styles.titleLandscape,
@@ -588,15 +613,16 @@ const PlaylistHero = memo(function PlaylistHero({
]} ]}
> >
{title} {title}
</Text> </PaletteText>
<Text <PaletteText
tone="foreground"
style={{ style={{
color: palette.foreground, color: palette.foreground,
fontSize: heroLayout.landscape ? 22 : 16, fontSize: heroLayout.landscape ? 22 : 16,
}} }}
> >
{ownerName} {ownerName}
</Text> </PaletteText>
</CollectionHero> </CollectionHero>
<CollectionDivider color={palette.divider} /> <CollectionDivider color={palette.divider} />
</MusicEntityView> </MusicEntityView>
@@ -84,7 +84,7 @@ export default function FavoritesScreen() {
return ( return (
<> <>
<Stack.Screen options={SCREEN_OPTIONS} /> <Stack.Screen options={SCREEN_OPTIONS} />
<CollectionDetailSkeleton variant="favorites" /> <CollectionDetailSkeleton />
</> </>
) )
} }
@@ -1,4 +1,4 @@
import { atmosEnabled, dolbyAtmosSupported } from "@/lib/playback-capabilities" import { dolbyAtmosSupported } from "@/lib/playback-capabilities"
import { Ionicons } from "@expo/vector-icons" import { Ionicons } from "@expo/vector-icons"
import { useAction, useMutation, useQuery } from "convex/react" import { useAction, useMutation, useQuery } from "convex/react"
import { Image } from "expo-image" import { Image } from "expo-image"
@@ -26,12 +26,10 @@ import {
} from "@/lib/artwork-color-preference" } from "@/lib/artwork-color-preference"
import { initialsFromName } from "@/lib/format" import { initialsFromName } from "@/lib/format"
import { useCachedQuery } from "@/hooks/use-cached-query" import { useCachedQuery } from "@/hooks/use-cached-query"
import { clearCoverPaletteCache } from "@/hooks/use-cover-palette"
import { useProfileImageUrl } from "@/hooks/use-profile-image-url"
import { changeServer, signOut } from "@/lib/session" import { changeServer, signOut } from "@/lib/session"
import { radius, spacing, useThemeColors } from "@/lib/theme" import { radius, spacing, useThemeColors } from "@/lib/theme"
import { showError } from "@/lib/toast" import { showError } from "@/lib/toast"
import type { PlaybackQuality } from "@otunes/convex/playback-stream" import type { PlaybackQuality } from "@/lib/urls"
import { api } from "@otunes/convex/_generated/api" import { api } from "@otunes/convex/_generated/api"
import type { Id } from "@otunes/convex/_generated/dataModel" import type { Id } from "@otunes/convex/_generated/dataModel"
@@ -186,7 +184,6 @@ function AppearanceSection() {
setSaving(true) setSaving(true)
try { try {
await setArtworkColorsEnabled(checked) await setArtworkColorsEnabled(checked)
clearCoverPaletteCache()
} catch { } catch {
showError("Could not save artwork colors preference.") showError("Could not save artwork colors preference.")
} finally { } finally {
@@ -420,7 +417,7 @@ function QualitySection({ user }: { user: CurrentUser }) {
: "This device does not support Dolby Atmos playback." : "This device does not support Dolby Atmos playback."
} }
disabled={!dolbyAtmosSupported} disabled={!dolbyAtmosSupported}
value={atmosEnabled(user)} value={dolbyAtmosSupported && (user.preferAtmos ?? false)}
onValueChange={(checked) => onValueChange={(checked) =>
void updateAtmos({ preferAtmos: checked }).catch((error: Error) => void updateAtmos({ preferAtmos: checked }).catch((error: Error) =>
showError(error.message) showError(error.message)
@@ -771,7 +768,6 @@ function ProfileAvatar({
style?: StyleProp<ViewStyle> style?: StyleProp<ViewStyle>
}) { }) {
const colors = useThemeColors() const colors = useThemeColors()
const imageUrl = useProfileImageUrl(user.image)
const avatarStyle = [ const avatarStyle = [
styles.avatar, styles.avatar,
{ {
@@ -783,11 +779,11 @@ function ProfileAvatar({
style, style,
] ]
if (imageUrl) { if (user.image) {
return ( return (
<View style={avatarStyle}> <View style={avatarStyle}>
<Image <Image
source={{ uri: imageUrl }} source={{ uri: user.image }}
style={styles.avatarImage} style={styles.avatarImage}
contentFit="cover" contentFit="cover"
/> />
@@ -118,7 +118,12 @@ export default function LibraryScreen() {
) )
if (status === "LoadingFirstPage" && !isCached) { if (status === "LoadingFirstPage" && !isCached) {
return <MediaGridSkeleton contentInset={false} header={listHeader} /> return (
<View style={{ flex: 1, backgroundColor: colors.background }}>
{listHeader}
<MediaGridSkeleton contentInset={false} />
</View>
)
} }
return ( return (
+1 -1
View File
@@ -73,10 +73,10 @@ export default function AppLayout() {
return ( return (
<ConvexAuthRecovery onInvalidate={invalidateSession}> <ConvexAuthRecovery onInvalidate={invalidateSession}>
<PlaybackProvider> <PlaybackProvider>
<AppIntentBridge />
<AppNavigationSync /> <AppNavigationSync />
<AddToPlaylistProvider> <AddToPlaylistProvider>
<FavoritesProvider> <FavoritesProvider>
<AppIntentBridge />
<Stack screenOptions={stackOptions}> <Stack screenOptions={stackOptions}>
<Stack.Screen <Stack.Screen
name="(tabs)" name="(tabs)"
+142 -119
View File
@@ -1,12 +1,12 @@
import { useTabletLayout } from "@/hooks/use-tablet-layout" import { useTabletLayout } from "@/hooks/use-tablet-layout"
import { TabletNowPlaying } from "@/components/tablet-now-playing" import { TabletNowPlaying } from "@/components/tablet-now-playing"
import { atmosEnabled } from "@/lib/playback-capabilities" import { dolbyAtmosSupported } from "@/lib/playback-capabilities"
import { NavigationBar } from "expo-navigation-bar" import { NavigationBar } from "expo-navigation-bar"
import { MusicEntityView } from "@/components/music-entity-view" import { MusicEntityView } from "@/components/music-entity-view"
import { Stack, useRouter, useLocalSearchParams } from "expo-router" import { Stack, useRouter, useLocalSearchParams } from "expo-router"
import * as Haptics from "expo-haptics" import * as Haptics from "expo-haptics"
import { StatusBar } from "expo-status-bar" import { StatusBar } from "expo-status-bar"
import { useCallback, useEffect, useMemo, useRef, useState } from "react" import { useEffect, useRef, useState } from "react"
import { Gesture, GestureDetector } from "react-native-gesture-handler" import { Gesture, GestureDetector } from "react-native-gesture-handler"
import { import {
Platform, Platform,
@@ -45,16 +45,16 @@ import {
QUEUE_HORIZONTAL_INSET, QUEUE_HORIZONTAL_INSET,
} from "@/components/now-playing-queue" } from "@/components/now-playing-queue"
import { PlayerArtistMenu } from "@/components/player-artist-menu" import { PlayerArtistMenu } from "@/components/player-artist-menu"
import { PlayerProgress } from "@/components/player-progress"
import { PlayerSlider } from "@/components/player-slider" import { PlayerSlider } from "@/components/player-slider"
import { PlayerSymbol } from "@/components/player-symbol" import { PlayerSymbol } from "@/components/player-symbol"
import { useFavorites } from "@/contexts/favorites" import { useFavorites } from "@/contexts/favorites"
import { usePlaybackActions, usePlaybackQueue } from "@/contexts/playback" import { usePlayback } from "@/contexts/playback"
import { useServerConfig } from "@/contexts/server-config" import { useServerConfig } from "@/contexts/server-config"
import { useCachedQuery } from "@/hooks/use-cached-query" import { useCachedQuery } from "@/hooks/use-cached-query"
import { useCoverPalette } from "@/hooks/use-cover-palette" import { useCoverPalette } from "@/hooks/use-cover-palette"
import { useMediaMenuActions } from "@/hooks/use-media-menu-actions" import { useMediaMenuActions } from "@/hooks/use-media-menu-actions"
import { useSystemVolume } from "@/hooks/use-system-volume" import { useSystemVolume } from "@/hooks/use-system-volume"
import { formatDuration, formatRemainingDuration } from "@/lib/format"
import { import {
nowPlayingColors, nowPlayingColors,
type NowPlayingColors, type NowPlayingColors,
@@ -90,13 +90,20 @@ export default function PlayerScreen() {
isPlaying, isPlaying,
shuffleEnabled, shuffleEnabled,
repeatEnabled, repeatEnabled,
currentTime,
duration,
queueSongIds, queueSongIds,
} = usePlaybackQueue() setIsPlaying,
const { setIsPlaying, skipNext, skipPrevious } = usePlaybackActions() seekTo,
skipNext,
skipPrevious,
} = usePlayback()
const { volume, setVolume, available: volumeAvailable } = useSystemVolume()
const { queue } = useLocalSearchParams<{ queue?: string }>() const { queue } = useLocalSearchParams<{ queue?: string }>()
const [showQueue, setShowQueue] = useState(queue === "1") const [showQueue, setShowQueue] = useState(queue === "1")
const [isDismissing, setIsDismissing] = useState(false) const [isDismissing, setIsDismissing] = useState(false)
const [stageHeight, setStageHeight] = useState(0) const [stageHeight, setStageHeight] = useState(0)
const [scrubTime, setScrubTime] = useState<number | null>(null)
const user = useCachedQuery(api.auth.currentUser) const user = useCachedQuery(api.auth.currentUser)
const playbackInfo = useCachedQuery( const playbackInfo = useCachedQuery(
api.library.getSongPlaybackInfo, api.library.getSongPlaybackInfo,
@@ -107,7 +114,7 @@ export default function PlayerScreen() {
? playbackFormat( ? playbackFormat(
playbackInfo.files, playbackInfo.files,
user.playbackQuality, user.playbackQuality,
atmosEnabled(user) dolbyAtmosSupported && (user.preferAtmos ?? false)
) )
: null : null
@@ -119,7 +126,7 @@ export default function PlayerScreen() {
coverUri, coverUri,
currentSong ? currentSong.album.cover != null : undefined currentSong ? currentSong.album.cover != null : undefined
) )
const colors = useMemo(() => nowPlayingColors(palette), [palette]) const colors = nowPlayingColors(palette)
const background = useSharedValue(colors.background) const background = useSharedValue(colors.background)
useEffect(() => { useEffect(() => {
@@ -152,65 +159,33 @@ export default function PlayerScreen() {
})) }))
// The player covers the status bar, so it can't use the native sheet's // The player covers the status bar, so it can't use the native sheet's
// swipe to dismiss. Each GestureDetector needs its own gesture instance. // swipe to dismiss.
const makeDismissGesture = useCallback( function dismissGesture() {
() => return Gesture.Pan()
Gesture.Pan() .activeOffsetY(12)
.activeOffsetY(12) .failOffsetY(-12)
.failOffsetY(-12) .failOffsetX([-20, 20])
.failOffsetX([-20, 20]) .onUpdate((event) => {
.onUpdate((event) => { dismissY.value = Math.max(0, event.translationY)
dismissY.value = Math.max(0, event.translationY) })
}) .onEnd((event) => {
.onEnd((event) => { if (
if ( event.translationY > DISMISS_DISTANCE ||
event.translationY > DISMISS_DISTANCE || event.velocityY > DISMISS_VELOCITY
event.velocityY > DISMISS_VELOCITY ) {
) { scheduleOnRN(setIsDismissing, true)
scheduleOnRN(setIsDismissing, true) dismissY.value = withTiming(
dismissY.value = withTiming( windowHeight,
windowHeight, { duration: 220 },
{ duration: 220 }, (finished) => {
(finished) => { if (finished) scheduleOnRN(router.back)
if (finished) scheduleOnRN(router.back) }
} )
) } else {
} else { dismissY.value = withSpring(0, { duration: 350, dampingRatio: 0.85 })
dismissY.value = withSpring(0, { }
duration: 350, })
dampingRatio: 0.85, }
})
}
}),
[dismissY, router, windowHeight]
)
const handleGesture = useMemo(makeDismissGesture, [makeDismissGesture])
const controlsGesture = useMemo(makeDismissGesture, [makeDismissGesture])
const stageGesture = useMemo(
() => makeDismissGesture().enabled(!showQueue),
[makeDismissGesture, showQueue]
)
const hasCover = currentSong ? currentSong.album.cover != null : false
const queueHeader = useMemo(
() =>
currentSong ? (
<View style={styles.queueHeader}>
<CoverImage
uri={coverUri}
hasCover={hasCover}
style={styles.queueArtwork}
/>
<SongMeta song={currentSong} colors={colors} compact />
</View>
) : null,
[colors, coverUri, currentSong, hasCover]
)
const songMeta = useMemo(
() =>
currentSong ? <SongMeta song={currentSong} colors={colors} /> : null,
[colors, currentSong]
)
const hasQueue = queueSongIds.length > 0 const hasQueue = queueSongIds.length > 0
@@ -229,6 +204,7 @@ export default function PlayerScreen() {
return null return null
} }
const hasCover = currentSong.album.cover != null
const bottomInset = Math.max(insets.bottom, spacing.md) const bottomInset = Math.max(insets.bottom, spacing.md)
const artworkSize = Math.max( const artworkSize = Math.max(
0, 0,
@@ -237,6 +213,9 @@ export default function PlayerScreen() {
stageHeight > 0 ? stageHeight - META_HEIGHT - spacing.xl : Infinity stageHeight > 0 ? stageHeight - META_HEIGHT - spacing.xl : Infinity
) )
) )
const displayedTime = scrubTime ?? currentTime
const timeColor =
scrubTime === null ? colors.secondaryForeground : colors.foreground
function togglePlayback() { function togglePlayback() {
void Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Light) void Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Light)
@@ -255,10 +234,10 @@ export default function PlayerScreen() {
colors={colors} colors={colors}
backgroundStyle={backgroundStyle} backgroundStyle={backgroundStyle}
dismissStyle={dismissStyle} dismissStyle={dismissStyle}
dismissGestures={{ handle: handleGesture, artwork: controlsGesture }} dismissGesture={dismissGesture}
showQueue={showQueue} showQueue={showQueue}
toggleQueue={toggleQueue} toggleQueue={toggleQueue}
metadata={songMeta} metadata={<SongMeta song={currentSong} colors={colors} />}
/> />
</MusicEntityView> </MusicEntityView>
) )
@@ -285,7 +264,7 @@ export default function PlayerScreen() {
id={currentSong.id} id={currentSong.id}
style={[styles.safe, { paddingTop: insets.top }]} style={[styles.safe, { paddingTop: insets.top }]}
> >
<GestureDetector gesture={handleGesture}> <GestureDetector gesture={dismissGesture()}>
<Pressable <Pressable
onPress={() => router.back()} onPress={() => router.back()}
hitSlop={12} hitSlop={12}
@@ -299,7 +278,7 @@ export default function PlayerScreen() {
</Pressable> </Pressable>
</GestureDetector> </GestureDetector>
<GestureDetector gesture={stageGesture}> <GestureDetector gesture={dismissGesture().enabled(!showQueue)}>
<View <View
style={styles.stage} style={styles.stage}
onLayout={(event) => onLayout={(event) =>
@@ -318,7 +297,20 @@ export default function PlayerScreen() {
<NowPlayingQueue <NowPlayingQueue
colors={colors} colors={colors}
viewportHeight={stageHeight} viewportHeight={stageHeight}
currentHeader={queueHeader} currentHeader={
<View style={styles.queueHeader}>
<CoverImage
uri={coverUri}
hasCover={hasCover}
style={styles.queueArtwork}
/>
<SongMeta
song={currentSong}
colors={colors}
compact
/>
</View>
}
/> />
</Animated.View> </Animated.View>
) : null ) : null
@@ -342,28 +334,50 @@ export default function PlayerScreen() {
/> />
</Animated.View> </Animated.View>
</View> </View>
<View style={styles.meta}>{songMeta}</View> <View style={styles.meta}>
<SongMeta song={currentSong} colors={colors} />
</View>
</Animated.View> </Animated.View>
)} )}
</LayoutAnimationConfig> </LayoutAnimationConfig>
</View> </View>
</GestureDetector> </GestureDetector>
<GestureDetector gesture={controlsGesture}> <GestureDetector gesture={dismissGesture()}>
<View style={[styles.controls, { paddingBottom: bottomInset }]}> <View style={[styles.controls, { paddingBottom: bottomInset }]}>
<PlayerProgress <PlayerSlider
colors={colors} accessibilityLabel="Playback position"
timeStyle={styles.time} value={displayedTime}
center={ maximumValue={duration}
format ? ( fillColor={colors.sliderFill}
activeFillColor={colors.foreground}
trackColor={colors.sliderTrack}
onValueChange={setScrubTime}
onSlidingComplete={(value) => {
void seekTo(value)
setScrubTime(null)
}}
/>
<View style={styles.timeRow}>
<Text style={[styles.time, { color: timeColor }]}>
{formatDuration(displayedTime)}
</Text>
{format ? (
<View style={styles.format} pointerEvents="none">
<AudioFormatBadge <AudioFormatBadge
format={format} format={format}
color={colors.secondaryForeground} color={colors.secondaryForeground}
backgroundColor={colors.background} backgroundColor={colors.background}
/> />
) : null </View>
} ) : null}
/> <Text style={[styles.time, { color: timeColor }]}>
{formatRemainingDuration(displayedTime, duration).replace(
"-",
"\u2212"
)}
</Text>
</View>
<View style={styles.transport}> <View style={styles.transport}>
<TransportButton <TransportButton
@@ -405,7 +419,35 @@ export default function PlayerScreen() {
</TransportButton> </TransportButton>
</View> </View>
<VolumeSlider colors={colors} /> {volumeAvailable ? (
<PlayerSlider
accessibilityLabel="Volume"
commitHoldMs={0}
animateValueChanges
value={volume}
maximumValue={1}
fillColor={colors.sliderFill}
activeFillColor={colors.foreground}
trackColor={colors.sliderTrack}
onValueChange={setVolume}
leading={
<PlayerSymbol
name="speaker.fill"
fallback="volume-low"
size={14}
color={colors.secondaryForeground}
/>
}
trailing={
<PlayerSymbol
name="speaker.wave.3.fill"
fallback="volume-high"
size={14}
color={colors.secondaryForeground}
/>
}
/>
) : null}
<View style={styles.footer}> <View style={styles.footer}>
<Pressable <Pressable
@@ -475,41 +517,6 @@ export default function PlayerScreen() {
) )
} }
/** Phone volume slider. Owns the volume listener so volume changes stay local. */
function VolumeSlider({ colors }: { colors: NowPlayingColors }) {
const { volume, setVolume, available } = useSystemVolume()
if (!available) return null
return (
<PlayerSlider
accessibilityLabel="Volume"
commitHoldMs={0}
animateValueChanges
value={volume}
maximumValue={1}
fillColor={colors.sliderFill}
activeFillColor={colors.foreground}
trackColor={colors.sliderTrack}
onValueChange={setVolume}
leading={
<PlayerSymbol
name="speaker.fill"
fallback="volume-low"
size={14}
color={colors.secondaryForeground}
/>
}
trailing={
<PlayerSymbol
name="speaker.wave.3.fill"
fallback="volume-high"
size={14}
color={colors.secondaryForeground}
/>
}
/>
)
}
/** Title and artist with the favorite and more buttons. */ /** Title and artist with the favorite and more buttons. */
function SongMeta({ function SongMeta({
song, song,
@@ -732,7 +739,23 @@ const styles = StyleSheet.create({
paddingHorizontal: HORIZONTAL_INSET, paddingHorizontal: HORIZONTAL_INSET,
paddingTop: spacing.md, paddingTop: spacing.md,
}, },
time: { fontWeight: "600" }, timeRow: {
flexDirection: "row",
alignItems: "center",
justifyContent: "space-between",
marginTop: -4,
},
format: {
position: "absolute",
left: 0,
right: 0,
alignItems: "center",
},
time: {
fontSize: 12,
fontWeight: "600",
fontVariant: ["tabular-nums"],
},
transport: { transport: {
flexDirection: "row", flexDirection: "row",
alignItems: "center", alignItems: "center",
+799 -12
View File
@@ -1,21 +1,147 @@
import { useQuery } from "convex/react" import { useConvex, useQuery } from "convex/react"
import * as AppIntents from "expo-app-intents" import * as AppIntents from "expo-app-intents"
import { useMemo, useSyncExternalStore } from "react" import type { AppIntentEntity, AppIntentInvocation } from "expo-app-intents"
import { useEffect, useMemo, useRef, useSyncExternalStore } from "react"
import { AppState } from "react-native"
import {
completeMusicInvocation,
publishMusicCatalog,
trackMusicCatalogSync,
} from "@/lib/app-intents"
import { useAppNavigation } from "@/lib/app-navigation"
import { useMusicCatalogSync } from "@/components/app-intents/catalog-sync"
import { useIntentDispatch } from "@/components/app-intents/dispatch"
import { useNowPlayingCatalog } from "@/components/app-intents/now-playing"
import { import {
ANONYMOUS_CACHE_SCOPE, ANONYMOUS_CACHE_SCOPE,
useCacheScope, useCacheScope,
} from "@/contexts/persistent-cache" } from "@/contexts/persistent-cache"
import { usePlayback } from "@/contexts/playback"
import {
FAVORITES_PLAYLIST_ID,
loadHandledIntentIds,
rememberHandledIntentId,
} from "@/lib/app-intent-handled"
import { showError } from "@/lib/toast"
import { fetchCachedQuery } from "@otunes/convex/client/cached-query"
import { getPlaybackStore } from "@otunes/convex/client/playback-store" import { getPlaybackStore } from "@otunes/convex/client/playback-store"
import type { RepeatMode } from "@otunes/convex/client/playback-queue"
import { api } from "@otunes/convex/_generated/api" import { api } from "@otunes/convex/_generated/api"
import type { Id } from "@otunes/convex/_generated/dataModel"
const warmedAudioIds = new Set<string>()
class IntentRejected extends Error {}
const KNOWN_INTENTS = new Set([
"playMusic",
"warmupAudio",
"addToPlaylist",
"addToUpNext",
"clearUpNext",
"createPlaylist",
"createStation",
"updateAffinity",
"transport",
"openMusic",
])
type MusicSource = {
kind: string
id: string
}
function readString(value: unknown) {
return typeof value === "string" && value.trim() ? value : null
}
function readSources(value: unknown): MusicSource[] {
if (!Array.isArray(value)) {
return []
}
return value.flatMap((entry) => {
if (!entry || typeof entry !== "object") {
return []
}
const source = entry as { kind?: unknown; id?: unknown }
if (typeof source.kind !== "string" || typeof source.id !== "string") {
return []
}
if (!source.kind || !source.id) {
return []
}
return [{ kind: source.kind, id: source.id }]
})
}
function shuffleChoice(value: unknown, fallback: boolean) {
if (value === "songs") return true
if (value === "off") return false
if (value == null) return fallback
throw new IntentRejected("Shuffle must be Off or Songs.")
}
function repeatChoice(value: unknown): RepeatMode | null {
if (value == null) return null
if (value === "none") return "none"
if (value === "one") return "once"
if (value === "all") return "always"
throw new IntentRejected("Repeat must be None, One, or All.")
}
function ensureActive(invocation: AppIntentInvocation) {
const deadline = invocation.params.deadline
if (typeof deadline === "number" && Date.now() >= deadline) {
throw new IntentRejected("This request expired. Please try again.")
}
}
function isTransient(error: unknown) {
const message = (
error instanceof Error ? error.message : String(error)
).toLowerCase()
return (
message.includes("not authenticated") ||
message.includes("network") ||
message.includes("fetch") ||
message.includes("connection") ||
message.includes("timed out") ||
message.includes("timeout")
)
}
function songEntity(song: {
id: string
title: string
artistName: string
artistId: string
albumTitle: string
albumId: string
durationSeconds: number
genres?: string
year?: number
track?: number
diskNumber?: number | null
favorite?: boolean
}): AppIntentEntity {
return {
id: song.id,
title: song.title,
subtitle: song.artistName,
synonyms: song.artistName ? [song.artistName] : undefined,
metadata: {
artistName: song.artistName,
artistId: song.artistId,
albumTitle: song.albumTitle,
albumId: song.albumId,
duration: String(song.durationSeconds),
genres: song.genres ?? "",
year: song.year == null ? "" : String(song.year),
track: song.track == null ? "" : String(song.track),
disk: song.diskNumber == null ? "" : String(song.diskNumber),
favorite: song.favorite ? "1" : "0",
},
}
}
/**
* Siri and Shortcuts integration: the on-device entity catalog, the current
* song, and intent dispatch. Must render inside `FavoritesProvider`.
*/
export function AppIntentBridge() { export function AppIntentBridge() {
const scope = useCacheScope() const scope = useCacheScope()
const store = useMemo( const store = useMemo(
@@ -28,8 +154,669 @@ export function AppIntentBridge() {
} }
function ReadyAppIntentBridge() { function ReadyAppIntentBridge() {
useMusicCatalogSync() const convex = useConvex()
useNowPlayingCatalog() const cacheScope = useCacheScope()
useIntentDispatch() const playback = usePlayback()
const user = useQuery(api.auth.currentUser)
const navigation = useAppNavigation()
const favorites = useQuery(api.favorites.getUserFavorites)
const catalogUserKey = user ? JSON.stringify([user._id, favorites]) : null
const store = useMemo(
() =>
getPlaybackStore(
cacheScope === ANONYMOUS_CACHE_SCOPE ? null : cacheScope
),
[cacheScope]
)
const snapshot = useSyncExternalStore(store.subscribe, store.getSnapshot)
const handledIds = useRef<Set<string> | null>(null)
const publishChain = useRef(Promise.resolve())
const publishGeneration = useRef(0)
const playbackRef = useRef(playback)
playbackRef.current = playback
useEffect(() => {
if (!AppIntents.isAvailable() || !user) return
const generation = ++publishGeneration.current
let stopped = false
let refreshing = false
const refresh = () => {
if (refreshing || stopped) return
refreshing = true
publishChain.current = publishChain.current
.catch(() => undefined)
.then(async () => {
for (const kind of ["artist", "album", "song", "playlist"] as const) {
const entities: AppIntentEntity[] = []
let cursor: string | null = null
do {
const result: {
page: AppIntentEntity[]
isDone: boolean
continueCursor: string
} = await convex.query(api.library.intentCatalogPage, {
kind,
paginationOpts: { cursor, numItems: 200 },
})
if (stopped || generation !== publishGeneration.current) return
entities.push(...result.page)
cursor = result.isDone ? null : result.continueCursor
} while (cursor !== null)
await publishMusicCatalog(kind, entities)
}
})
.catch((error) =>
console.warn("Could not publish music catalog.", error)
)
.finally(() => {
refreshing = false
})
trackMusicCatalogSync(publishChain.current)
}
refresh()
const subscription = AppState.addEventListener("change", (state) => {
if (state === "active") refresh()
})
const timer = setInterval(() => {
if (AppState.currentState === "active") refresh()
}, 5 * 60_000)
return () => {
stopped = true
++publishGeneration.current
subscription.remove()
clearInterval(timer)
}
}, [convex, cacheScope, catalogUserKey])
const currentSongId = playback.queueSongIds[0] ?? null
const currentSong = playback.currentSong
useEffect(() => {
if (!snapshot.hydrated || !AppIntents.isAvailable()) {
return
}
if (!currentSongId) {
void publishMusicCatalog("nowPlaying", []).catch((error) => {
console.warn("Could not clear the current song.", error)
})
return
}
if (!currentSong || currentSong.id !== currentSongId) {
return
}
void publishMusicCatalog("nowPlaying", [
songEntity({
id: currentSong.id,
title: currentSong.title,
artistName: currentSong.artist.name,
artistId: currentSong.artist.id,
albumTitle: currentSong.album.title,
albumId: currentSong.album.id,
durationSeconds: currentSong.durationSeconds,
}),
]).catch((error) => {
console.warn("Could not publish the current song.", error)
})
}, [currentSong, currentSongId, snapshot.hydrated])
AppIntents.useAppIntents(async (pendingIntents) => {
if (!handledIds.current) {
handledIds.current = await loadHandledIntentIds()
}
const handled = handledIds.current
for (const invocation of pendingIntents) {
if (handled.has(invocation.id)) {
const token = readString(invocation.params.completionToken)
if (token) await completeMusicInvocation(token, null)
await AppIntents.removePendingInvocationAsync(invocation.id)
continue
}
if (!KNOWN_INTENTS.has(invocation.name)) {
await AppIntents.removePendingInvocationAsync(invocation.id)
continue
}
const token = readString(invocation.params.completionToken)
try {
ensureActive(invocation)
await performInvocation(invocation)
if (
["playMusic", "warmupAudio", "transport", "createStation"].includes(
invocation.name
)
) {
const id = store.getState().queue[0]
const song = playbackRef.current.currentSong
if (!id) await publishMusicCatalog("nowPlaying", [])
else if (song?.id === id)
await publishMusicCatalog("nowPlaying", [
songEntity({
id: song.id,
title: song.title,
artistName: song.artist.name,
artistId: song.artist.id,
albumTitle: song.album.title,
albumId: song.album.id,
durationSeconds: song.durationSeconds,
}),
])
}
await rememberHandledIntentId(handled, invocation.id)
if (token) await completeMusicInvocation(token, null)
await AppIntents.removePendingInvocationAsync(invocation.id)
} catch (error) {
if (token) {
await completeMusicInvocation(
token,
error instanceof Error ? error.message : "oTunes couldn't do that."
)
}
if (token || error instanceof IntentRejected || !isTransient(error)) {
const message =
error instanceof Error ? error.message : "oTunes couldn't do that."
if (!(error instanceof IntentRejected) || message) {
showError(message)
}
try {
await rememberHandledIntentId(handled, invocation.id)
await AppIntents.removePendingInvocationAsync(invocation.id)
} catch (removeError) {
console.warn(
"App Intent remains pending",
invocation.id,
removeError
)
}
continue
}
console.warn("App Intent remains pending", invocation.id, error)
}
}
async function songIdsFor(kind: string, id: string) {
if (kind === "song") {
return [id as Id<"songs">]
}
if (kind === "album") {
return fetchCachedQuery(
convex,
cacheScope,
api.playlists.getAlbumSongIds,
{
albumId: id as Id<"albums">,
}
)
}
if (kind === "artist") {
return fetchCachedQuery(
convex,
cacheScope,
api.playlists.getOrderedArtistSongIds,
{ artistId: id as Id<"artists"> }
)
}
if (kind === "playlist") {
if (id === FAVORITES_PLAYLIST_ID) {
const favorites = await fetchCachedQuery(
convex,
cacheScope,
api.favorites.getUserFavorites,
{}
)
return favorites.favoriteSongs
}
return fetchCachedQuery(
convex,
cacheScope,
api.playlists.getPlaylistSongIds,
{ playlistId: id as Id<"playlists"> }
)
}
throw new IntentRejected("Choose a song, album, artist, or playlist.")
}
async function uniqueSongIds(sources: MusicSource[]) {
const ids: Id<"songs">[] = []
for (const source of sources) {
ids.push(...(await songIdsFor(source.kind, source.id)))
}
return [...new Set(ids)]
}
async function performInvocation(invocation: AppIntentInvocation) {
const actions = playbackRef.current
switch (invocation.name) {
case "openMusic": {
const kind = readString(invocation.params.kind)
const id = readString(invocation.params.id)
if (!id || !kind) throw new IntentRejected("Choose music to open.")
if (kind === "song") {
const song = await convex.query(api.library.getSong, {
id: id as Id<"songs">,
})
if (!song)
throw new IntentRejected("This song is no longer available.")
navigation.push(`/album/${song.album}`)
} else if (kind === "playlist" && id === FAVORITES_PLAYLIST_ID) {
navigation.push("/playlist/favorites")
} else if (["album", "artist", "playlist"].includes(kind)) {
navigation.push(`/${kind}/${id}`)
} else throw new IntentRejected("Unknown music type.")
return
}
case "playMusic":
await playMusic(invocation)
if (!["next", "tail"].includes(String(invocation.params.queue))) {
ensureActive(invocation)
await playbackRef.current.waitForPlaybackReady(true)
}
return
case "warmupAudio":
await warmup(invocation)
ensureActive(invocation)
await playbackRef.current.waitForPlaybackReady(false)
warmedAudioIds.add(invocation.id)
return
case "addToPlaylist":
await addToPlaylist(invocation)
return
case "addToUpNext":
await addToUpNext(invocation)
return
case "clearUpNext":
ensureActive(invocation)
await actions.clearUpNext()
return
case "createPlaylist":
await createPlaylist(invocation)
return
case "createStation":
await createStation(invocation)
ensureActive(invocation)
await playbackRef.current.waitForPlaybackReady(true)
return
case "updateAffinity":
await updateAffinity(invocation)
return
case "transport":
await transport(invocation)
if (store.getState().queue.length > 0) {
const command = invocation.params.command
await playbackRef.current.waitForPlaybackReady(
command === "resume"
? true
: command === "pause"
? false
: undefined
)
}
return
default:
return
}
}
async function playMusic(invocation: AppIntentInvocation) {
const actions = playbackRef.current
const queue = readString(invocation.params.queue) ?? "now"
const warmupId = readString(invocation.params.warmupId)
const repeat = repeatChoice(invocation.params.repeat)
if (repeat) {
ensureActive(invocation)
await actions.setRepeatMode(repeat)
}
if (queue === "next" || queue === "tail") {
const kind = readString(invocation.params.kind)
const id = readString(invocation.params.id)
if (!kind || !id) {
throw new IntentRejected("Choose music to add to Up Next.")
}
const shuffled = shuffleChoice(
invocation.params.shuffle,
actions.shuffleEnabled
)
if (shuffled !== actions.shuffleEnabled) {
ensureActive(invocation)
await actions.setShuffleEnabled(shuffled)
}
const ids = await songIdsFor(kind, id)
if (ids.length === 0) {
throw new IntentRejected("Nothing to add to Up Next.")
}
if (queue === "next") {
ensureActive(invocation)
await actions.addToQueueNext(ids)
} else {
ensureActive(invocation)
await actions.addToQueueLast(ids)
}
return
}
if (warmupId && warmedAudioIds.has(warmupId)) {
const shuffled = shuffleChoice(
invocation.params.shuffle,
actions.shuffleEnabled
)
if (shuffled !== actions.shuffleEnabled) {
ensureActive(invocation)
await actions.setShuffleEnabled(shuffled)
}
ensureActive(invocation)
actions.setIsPlaying(true)
return
}
const kind = readString(invocation.params.kind) ?? "resume"
if (kind === "resume") {
const shuffled = shuffleChoice(
invocation.params.shuffle,
actions.shuffleEnabled
)
if (shuffled !== actions.shuffleEnabled) {
ensureActive(invocation)
await actions.setShuffleEnabled(shuffled)
}
if (actions.queueSongIds.length === 0) {
const favorites = await fetchCachedQuery(
convex,
cacheScope,
api.favorites.getUserFavorites,
{}
)
if (favorites.favoriteSongs.length === 0) {
throw new IntentRejected(
"Nothing is queued, and your favorites are empty."
)
}
if (shuffled) {
ensureActive(invocation)
await actions.playShuffled(favorites.favoriteSongs)
} else {
ensureActive(invocation)
await actions.playInOrder(favorites.favoriteSongs)
}
return
}
ensureActive(invocation)
actions.setIsPlaying(true)
return
}
const id = readString(invocation.params.id)
if (!id) {
throw new IntentRejected("Choose music to play.")
}
const shuffled = shuffleChoice(
invocation.params.shuffle,
actions.shuffleEnabled
)
if (kind === "song") {
const song = await fetchCachedQuery(
convex,
cacheScope,
api.library.getSong,
{
id: id as Id<"songs">,
}
)
if (!song) {
throw new IntentRejected("That song is no longer in your library.")
}
const albumSongIds = await fetchCachedQuery(
convex,
cacheScope,
api.playlists.getAlbumSongIds,
{ albumId: song.album }
)
ensureActive(invocation)
await actions.startFromSong(
song._id,
albumSongIds.length > 0 ? albumSongIds : [song._id],
shuffled,
true
)
return
}
const ids = await songIdsFor(kind, id)
if (ids.length === 0) {
throw new IntentRejected("Nothing to play.")
}
if (shuffled) {
ensureActive(invocation)
await actions.playShuffled(ids)
} else {
ensureActive(invocation)
await actions.playInOrder(ids)
}
}
async function warmup(invocation: AppIntentInvocation) {
const kind = readString(invocation.params.kind)
const id = readString(invocation.params.id)
if (!kind || !id) {
throw new IntentRejected("Choose music to get ready.")
}
const shuffled = shuffleChoice(invocation.params.shuffle, false)
if (kind === "song") {
const song = await fetchCachedQuery(
convex,
cacheScope,
api.library.getSong,
{
id: id as Id<"songs">,
}
)
if (!song) {
throw new IntentRejected("That song is no longer in your library.")
}
const albumSongIds = await fetchCachedQuery(
convex,
cacheScope,
api.playlists.getAlbumSongIds,
{ albumId: song.album }
)
ensureActive(invocation)
await playbackRef.current.startFromSong(
song._id,
albumSongIds.length > 0 ? albumSongIds : [song._id],
shuffled,
false
)
} else {
const ids = await songIdsFor(kind, id)
if (ids.length === 0) {
throw new IntentRejected("Nothing to get ready.")
}
ensureActive(invocation)
await playbackRef.current.prepareQueue(ids, shuffled)
}
}
async function addToPlaylist(invocation: AppIntentInvocation) {
const playlistId = readString(invocation.params.playlistId)
const sources = readSources(invocation.params.sources)
if (!playlistId || sources.length === 0) {
throw new IntentRejected("Choose music and a playlist.")
}
const songIds = await uniqueSongIds(sources)
if (songIds.length === 0) {
throw new IntentRejected("Those items have no songs to add.")
}
if (playlistId === FAVORITES_PLAYLIST_ID) {
for (const source of sources) {
if (source.kind === "song") {
ensureActive(invocation)
await convex.mutation(api.favorites.favoriteSong, {
songId: source.id as Id<"songs">,
})
} else if (source.kind === "album") {
ensureActive(invocation)
await convex.mutation(api.favorites.favoriteAlbum, {
albumId: source.id as Id<"albums">,
})
} else if (source.kind === "artist") {
ensureActive(invocation)
await convex.mutation(api.favorites.favoriteArtist, {
artistId: source.id as Id<"artists">,
})
} else if (source.kind === "playlist") {
const ids = await songIdsFor(source.kind, source.id)
if (ids.length > 0) {
ensureActive(invocation)
await convex.mutation(api.favorites.favoriteSongs, {
songIds: ids,
})
}
} else {
throw new IntentRejected(
"Choose a song, album, artist, or playlist."
)
}
}
return
}
ensureActive(invocation)
await convex.mutation(api.playlists.addSongsToPlaylist, {
playlistId: playlistId as Id<"playlists">,
songIds,
})
}
async function addToUpNext(invocation: AppIntentInvocation) {
const sources = readSources(invocation.params.sources)
if (sources.length === 0) {
throw new IntentRejected("Choose music to add to Up Next.")
}
const ids = await uniqueSongIds(sources)
if (ids.length === 0) {
throw new IntentRejected("Nothing to add to Up Next.")
}
const position =
readString(invocation.params.position) === "last" ? "last" : "next"
if (position === "last") {
ensureActive(invocation)
await playbackRef.current.addToQueueLast(ids)
} else {
ensureActive(invocation)
await playbackRef.current.addToQueueNext(ids)
}
}
async function createPlaylist(invocation: AppIntentInvocation) {
const name = readString(invocation.params.name)
if (!name) {
throw new IntentRejected("A playlist needs a name.")
}
const songIds = await uniqueSongIds(
readSources(invocation.params.sources)
)
ensureActive(invocation)
await convex.mutation(api.playlists.createPlaylist, {
name,
songIds,
invocationId: invocation.id,
})
}
async function createStation(invocation: AppIntentInvocation) {
const artistId = readString(invocation.params.artistId)
if (!artistId) {
throw new IntentRejected("Nothing is playing in oTunes.")
}
const ids = await songIdsFor("artist", artistId)
if (ids.length === 0)
throw new IntentRejected("This artist has no songs to play.")
ensureActive(invocation)
await playbackRef.current.playShuffled(ids)
}
async function updateAffinity(invocation: AppIntentInvocation) {
const kind = readString(invocation.params.kind)
const id = readString(invocation.params.id)
const state = readString(invocation.params.state)
if (!kind || !id || (state !== "like" && state !== "unset")) {
throw new IntentRejected(
"oTunes can love or unlike a song, album, or artist."
)
}
if (kind === "playlist") {
throw new IntentRejected("oTunes can love songs, albums, and artists.")
}
if (state === "like") {
if (kind === "song") {
ensureActive(invocation)
await convex.mutation(api.favorites.favoriteSong, {
songId: id as Id<"songs">,
})
} else if (kind === "album") {
ensureActive(invocation)
await convex.mutation(api.favorites.favoriteAlbum, {
albumId: id as Id<"albums">,
})
} else if (kind === "artist") {
ensureActive(invocation)
await convex.mutation(api.favorites.favoriteArtist, {
artistId: id as Id<"artists">,
})
} else {
throw new IntentRejected(
"oTunes can love songs, albums, and artists."
)
}
return
}
if (kind === "song") {
ensureActive(invocation)
await convex.mutation(api.favorites.unfavoriteSong, {
songId: id as Id<"songs">,
})
} else if (kind === "album") {
ensureActive(invocation)
await convex.mutation(api.favorites.unfavoriteAlbum, {
albumId: id as Id<"albums">,
})
} else if (kind === "artist") {
ensureActive(invocation)
await convex.mutation(api.favorites.unfavoriteArtist, {
artistId: id as Id<"artists">,
})
} else {
throw new IntentRejected("oTunes can love songs, albums, and artists.")
}
}
async function transport(invocation: AppIntentInvocation) {
const actions = playbackRef.current
const command = readString(invocation.params.command)
if (command === "pause") {
ensureActive(invocation)
actions.setIsPlaying(false)
return
}
if (command === "resume") {
if (actions.queueSongIds.length === 0) {
throw new IntentRejected("Nothing is queued in oTunes.")
}
ensureActive(invocation)
actions.setIsPlaying(true)
return
}
if (command === "next") {
ensureActive(invocation)
await actions.skipNext()
return
}
if (command === "previous") {
ensureActive(invocation)
await actions.skipPrevious()
return
}
throw new IntentRejected("oTunes doesn't know that playback control.")
}
})
return null return null
} }
@@ -1,198 +0,0 @@
import { useConvex, useQuery } from "convex/react"
import * as AppIntents from "expo-app-intents"
import type { AppIntentEntity } from "expo-app-intents"
import { useEffect, useRef } from "react"
import { AppState } from "react-native"
import { useCacheScope } from "@/contexts/persistent-cache"
import {
loadCatalogCursors,
saveCatalogCursors,
type CatalogCursors,
} from "@/lib/app-intent-handled"
import {
publishMusicCatalog,
readMusicCatalog,
trackMusicCatalogSync,
} from "@/lib/app-intents"
import { api } from "@otunes/convex/_generated/api"
import type { FunctionReturnType } from "convex/server"
const LIBRARY_KINDS = ["artist", "album", "song"] as const
type LibraryKind = (typeof LIBRARY_KINDS)[number]
const PAGE_SIZE = 500
type CatalogPage = FunctionReturnType<typeof api.intentCatalog.page>
type Favorites = {
favoriteSongs: string[]
favoriteAlbums: string[]
favoriteArtists: string[]
}
function favoriteIds(favorites: Favorites, kind: LibraryKind) {
return new Set<string>(
kind === "song"
? favorites.favoriteSongs
: kind === "album"
? favorites.favoriteAlbums
: favorites.favoriteArtists
)
}
/** Stamps `metadata.favorite`, which Siri uses to rank suggestions. */
function withFavorite(entity: AppIntentEntity, favorite: boolean) {
const flag = favorite ? "1" : "0"
return entity.metadata?.favorite === flag
? entity
: { ...entity, metadata: { ...entity.metadata, favorite: flag } }
}
/**
* Keeps the on-device Siri catalog in step with the server. `intentCatalog.head`
* is a live subscription, so the library is fetched only when it changes, and
* then only the records changed since the stored cursor. Favorites are applied
* locally from the existing favorites subscription.
*/
export function useMusicCatalogSync() {
const convex = useConvex()
const scope = useCacheScope()
const head = useQuery(api.intentCatalog.head)
const favorites = useQuery(api.favorites.getUserFavorites)
const playlists = useQuery(api.intentCatalog.playlists)
const latest = useRef({ head, favorites, playlists })
latest.current = { head, favorites, playlists }
const schedule = useRef<() => void>(() => undefined)
useEffect(() => {
if (!AppIntents.isAvailable()) return
let stopped = false
let running = false
let dirty = false
let cursors: CatalogCursors | null = null
// What the disk catalog reflects, to skip no-op republishes.
const appliedFavorites = new Map<LibraryKind, Set<string>>()
let publishedPlaylists: string | null = null
async function fetchChanges(kind: LibraryKind, since: number | undefined) {
const upserts: AppIntentEntity[] = []
let removed: string[] = []
let head = 0
let cursor: string | null = null
do {
const result: CatalogPage = await convex.query(api.intentCatalog.page, {
kind,
since,
paginationOpts: { cursor, numItems: PAGE_SIZE },
})
if (stopped) return null
if (cursor === null) {
if (result.reset) return fetchChanges(kind, undefined)
head = result.head ?? 0
removed = result.removed
}
upserts.push(...result.page)
cursor = result.isDone ? null : result.continueCursor
} while (cursor !== null)
return { upserts, removed, head, full: since === undefined }
}
async function syncKind(
kind: LibraryKind,
serverHead: number,
favorites: Favorites
) {
if (!cursors) return
const since = cursors[kind]
const stale = since === undefined || serverHead > since
const liked = favoriteIds(favorites, kind)
const previousLiked = appliedFavorites.get(kind)
const likesChanged =
!previousLiked ||
previousLiked.size !== liked.size ||
[...liked].some((id) => !previousLiked.has(id))
if (!stale && !likesChanged) return
const changes = stale ? await fetchChanges(kind, since) : null
if (stopped) return
const records = new Map<string, AppIntentEntity>()
if (!changes?.full) {
for (const entity of await readMusicCatalog(kind)) {
records.set(entity.id, entity)
}
}
for (const id of changes?.removed ?? []) records.delete(id)
for (const entity of changes?.upserts ?? [])
records.set(entity.id, entity)
let modified = changes !== null
for (const [id, entity] of records) {
const next = withFavorite(entity, liked.has(id))
if (next !== entity) {
records.set(id, next)
modified = true
}
}
if (stopped) return
if (modified) await publishMusicCatalog(kind, [...records.values()])
appliedFavorites.set(kind, liked)
if (changes && !stopped) {
cursors = { ...cursors, [kind]: changes.head }
await saveCatalogCursors(scope, cursors)
}
}
async function syncOnce() {
const { head, favorites, playlists } = latest.current
cursors ??= await loadCatalogCursors(scope)
if (head && favorites) {
for (const kind of LIBRARY_KINDS) {
if (stopped) return
await syncKind(kind, head[kind], favorites)
}
}
if (playlists && !stopped) {
const json = JSON.stringify(playlists)
if (json !== publishedPlaylists) {
await publishMusicCatalog("playlist", playlists)
publishedPlaylists = json
}
}
}
schedule.current = () => {
if (stopped) return
if (running) {
dirty = true
return
}
running = true
const sync = (async () => {
do {
dirty = false
await syncOnce()
} while (dirty && !stopped)
})()
.catch((error) =>
console.warn("Could not publish music catalog.", error)
)
.finally(() => {
running = false
})
trackMusicCatalogSync(sync)
}
schedule.current()
// Retries a failed sync; a no-op without server queries when current.
const subscription = AppState.addEventListener("change", (state) => {
if (state === "active") schedule.current()
})
return () => {
stopped = true
schedule.current = () => undefined
subscription.remove()
}
}, [convex, scope])
useEffect(() => {
schedule.current()
}, [head, favorites, playlists])
}
@@ -1,631 +0,0 @@
import { useConvex } from "convex/react"
import * as AppIntents from "expo-app-intents"
import type { AppIntentInvocation } from "expo-app-intents"
import { useMemo, useRef } from "react"
import { useFavorites, type FavoriteKind } from "@/contexts/favorites"
import {
ANONYMOUS_CACHE_SCOPE,
useCacheScope,
} from "@/contexts/persistent-cache"
import { usePlaybackActions, usePlaybackQueue } from "@/contexts/playback"
import {
FAVORITES_PLAYLIST_ID,
loadHandledIntentIds,
rememberHandledIntentId,
} from "@/lib/app-intent-handled"
import { completeMusicInvocation } from "@/lib/app-intents"
import { useAppNavigation } from "@/lib/app-navigation"
import { showError } from "@/lib/toast"
import { fetchCachedQuery } from "@otunes/convex/client/cached-query"
import { getPlaybackStore } from "@otunes/convex/client/playback-store"
import type { RepeatMode } from "@otunes/convex/client/playback-queue"
import { api } from "@otunes/convex/_generated/api"
import type { Id } from "@otunes/convex/_generated/dataModel"
import { publishNowPlaying } from "./now-playing"
const warmedAudioIds = new Set<string>()
class IntentRejected extends Error {}
const KNOWN_INTENTS = new Set([
"playMusic",
"warmupAudio",
"addToPlaylist",
"addToUpNext",
"clearUpNext",
"createPlaylist",
"createStation",
"updateAffinity",
"transport",
"openMusic",
])
type MusicSource = {
kind: string
id: string
}
function readString(value: unknown) {
return typeof value === "string" && value.trim() ? value : null
}
function readSources(value: unknown): MusicSource[] {
if (!Array.isArray(value)) {
return []
}
return value.flatMap((entry) => {
if (!entry || typeof entry !== "object") {
return []
}
const source = entry as { kind?: unknown; id?: unknown }
if (typeof source.kind !== "string" || typeof source.id !== "string") {
return []
}
if (!source.kind || !source.id) {
return []
}
return [{ kind: source.kind, id: source.id }]
})
}
function isFavoriteKind(kind: string): kind is FavoriteKind {
return kind === "song" || kind === "album" || kind === "artist"
}
function shuffleChoice(value: unknown, fallback: boolean) {
if (value === "songs") return true
if (value === "off") return false
if (value == null) return fallback
throw new IntentRejected("Shuffle must be Off or Songs.")
}
function repeatChoice(value: unknown): RepeatMode | null {
if (value == null) return null
if (value === "none") return "none"
if (value === "one") return "once"
if (value === "all") return "always"
throw new IntentRejected("Repeat must be None, One, or All.")
}
function ensureActive(invocation: AppIntentInvocation) {
const deadline = invocation.params.deadline
if (typeof deadline === "number" && Date.now() >= deadline) {
throw new IntentRejected("This request expired. Please try again.")
}
}
function isTransient(error: unknown) {
const message = (
error instanceof Error ? error.message : String(error)
).toLowerCase()
return (
message.includes("not authenticated") ||
message.includes("network") ||
message.includes("fetch") ||
message.includes("connection") ||
message.includes("timed out") ||
message.includes("timeout")
)
}
/** Runs Siri and Shortcuts invocations queued by the native intents. */
export function useIntentDispatch() {
const convex = useConvex()
const cacheScope = useCacheScope()
const playback = { ...usePlaybackQueue(), ...usePlaybackActions() }
const favorites = useFavorites()
const navigation = useAppNavigation()
const store = useMemo(
() =>
getPlaybackStore(
cacheScope === ANONYMOUS_CACHE_SCOPE ? null : cacheScope
),
[cacheScope]
)
const handledIds = useRef<Set<string> | null>(null)
const playbackRef = useRef(playback)
playbackRef.current = playback
/** Intent ids arrive as strings; the server validates them. */
function setFavorite(kind: FavoriteKind, id: string, favorite: boolean) {
return kind === "song"
? favorites.setFavorite(kind, id as Id<"songs">, favorite)
: kind === "album"
? favorites.setFavorite(kind, id as Id<"albums">, favorite)
: favorites.setFavorite(kind, id as Id<"artists">, favorite)
}
AppIntents.useAppIntents(async (pendingIntents) => {
if (!handledIds.current) {
handledIds.current = await loadHandledIntentIds()
}
const handled = handledIds.current
for (const invocation of pendingIntents) {
if (handled.has(invocation.id)) {
const token = readString(invocation.params.completionToken)
if (token) await completeMusicInvocation(token, null)
await AppIntents.removePendingInvocationAsync(invocation.id)
continue
}
if (!KNOWN_INTENTS.has(invocation.name)) {
await AppIntents.removePendingInvocationAsync(invocation.id)
continue
}
const token = readString(invocation.params.completionToken)
try {
ensureActive(invocation)
await performInvocation(invocation)
if (
["playMusic", "warmupAudio", "transport", "createStation"].includes(
invocation.name
)
) {
await publishNowPlaying(
store.getState().queue[0] ?? null,
playbackRef.current.currentSong
)
}
await rememberHandledIntentId(handled, invocation.id)
if (token) await completeMusicInvocation(token, null)
await AppIntents.removePendingInvocationAsync(invocation.id)
} catch (error) {
if (token) {
await completeMusicInvocation(
token,
error instanceof Error ? error.message : "oTunes couldn't do that."
)
}
if (token || error instanceof IntentRejected || !isTransient(error)) {
const message =
error instanceof Error ? error.message : "oTunes couldn't do that."
if (!(error instanceof IntentRejected) || message) {
showError(message)
}
try {
await rememberHandledIntentId(handled, invocation.id)
await AppIntents.removePendingInvocationAsync(invocation.id)
} catch (removeError) {
console.warn(
"App Intent remains pending",
invocation.id,
removeError
)
}
continue
}
console.warn("App Intent remains pending", invocation.id, error)
}
}
async function songIdsFor(kind: string, id: string) {
if (kind === "song") {
return [id as Id<"songs">]
}
if (kind === "album") {
return fetchCachedQuery(
convex,
cacheScope,
api.playlists.getAlbumSongIds,
{
albumId: id as Id<"albums">,
}
)
}
if (kind === "artist") {
return fetchCachedQuery(
convex,
cacheScope,
api.playlists.getOrderedArtistSongIds,
{ artistId: id as Id<"artists"> }
)
}
if (kind === "playlist") {
if (id === FAVORITES_PLAYLIST_ID) {
const favorites = await fetchCachedQuery(
convex,
cacheScope,
api.favorites.getUserFavorites,
{}
)
return favorites.favoriteSongs
}
return fetchCachedQuery(
convex,
cacheScope,
api.playlists.getPlaylistSongIds,
{ playlistId: id as Id<"playlists"> }
)
}
throw new IntentRejected("Choose a song, album, artist, or playlist.")
}
async function uniqueSongIds(sources: MusicSource[]) {
const ids: Id<"songs">[] = []
for (const source of sources) {
ids.push(...(await songIdsFor(source.kind, source.id)))
}
return [...new Set(ids)]
}
async function performInvocation(invocation: AppIntentInvocation) {
const actions = playbackRef.current
switch (invocation.name) {
case "openMusic": {
const kind = readString(invocation.params.kind)
const id = readString(invocation.params.id)
if (!id || !kind) throw new IntentRejected("Choose music to open.")
if (kind === "song") {
const song = await convex.query(api.library.getSong, {
id: id as Id<"songs">,
})
if (!song)
throw new IntentRejected("This song is no longer available.")
navigation.push(`/album/${song.album}`)
} else if (kind === "playlist" && id === FAVORITES_PLAYLIST_ID) {
navigation.push("/playlist/favorites")
} else if (["album", "artist", "playlist"].includes(kind)) {
navigation.push(`/${kind}/${id}`)
} else throw new IntentRejected("Unknown music type.")
return
}
case "playMusic":
await playMusic(invocation)
if (!["next", "tail"].includes(String(invocation.params.queue))) {
ensureActive(invocation)
await playbackRef.current.waitForPlaybackReady(true)
}
return
case "warmupAudio":
await warmup(invocation)
ensureActive(invocation)
await playbackRef.current.waitForPlaybackReady(false)
warmedAudioIds.add(invocation.id)
return
case "addToPlaylist":
await addToPlaylist(invocation)
return
case "addToUpNext":
await addToUpNext(invocation)
return
case "clearUpNext":
ensureActive(invocation)
await actions.clearUpNext()
return
case "createPlaylist":
await createPlaylist(invocation)
return
case "createStation":
await createStation(invocation)
ensureActive(invocation)
await playbackRef.current.waitForPlaybackReady(true)
return
case "updateAffinity":
await updateAffinity(invocation)
return
case "transport":
await transport(invocation)
if (store.getState().queue.length > 0) {
const command = invocation.params.command
await playbackRef.current.waitForPlaybackReady(
command === "resume"
? true
: command === "pause"
? false
: undefined
)
}
return
default:
return
}
}
async function playMusic(invocation: AppIntentInvocation) {
const actions = playbackRef.current
const queue = readString(invocation.params.queue) ?? "now"
const warmupId = readString(invocation.params.warmupId)
const repeat = repeatChoice(invocation.params.repeat)
if (repeat) {
ensureActive(invocation)
await actions.setRepeatMode(repeat)
}
if (queue === "next" || queue === "tail") {
const kind = readString(invocation.params.kind)
const id = readString(invocation.params.id)
if (!kind || !id) {
throw new IntentRejected("Choose music to add to Up Next.")
}
const shuffled = shuffleChoice(
invocation.params.shuffle,
actions.shuffleEnabled
)
if (shuffled !== actions.shuffleEnabled) {
ensureActive(invocation)
await actions.setShuffleEnabled(shuffled)
}
const ids = await songIdsFor(kind, id)
if (ids.length === 0) {
throw new IntentRejected("Nothing to add to Up Next.")
}
if (queue === "next") {
ensureActive(invocation)
await actions.addToQueueNext(ids)
} else {
ensureActive(invocation)
await actions.addToQueueLast(ids)
}
return
}
if (warmupId && warmedAudioIds.has(warmupId)) {
const shuffled = shuffleChoice(
invocation.params.shuffle,
actions.shuffleEnabled
)
if (shuffled !== actions.shuffleEnabled) {
ensureActive(invocation)
await actions.setShuffleEnabled(shuffled)
}
ensureActive(invocation)
actions.setIsPlaying(true)
return
}
const kind = readString(invocation.params.kind) ?? "resume"
if (kind === "resume") {
const shuffled = shuffleChoice(
invocation.params.shuffle,
actions.shuffleEnabled
)
if (shuffled !== actions.shuffleEnabled) {
ensureActive(invocation)
await actions.setShuffleEnabled(shuffled)
}
if (actions.queueSongIds.length === 0) {
const favorites = await fetchCachedQuery(
convex,
cacheScope,
api.favorites.getUserFavorites,
{}
)
if (favorites.favoriteSongs.length === 0) {
throw new IntentRejected(
"Nothing is queued, and your favorites are empty."
)
}
if (shuffled) {
ensureActive(invocation)
await actions.playShuffled(favorites.favoriteSongs)
} else {
ensureActive(invocation)
await actions.playInOrder(favorites.favoriteSongs)
}
return
}
ensureActive(invocation)
actions.setIsPlaying(true)
return
}
const id = readString(invocation.params.id)
if (!id) {
throw new IntentRejected("Choose music to play.")
}
const shuffled = shuffleChoice(
invocation.params.shuffle,
actions.shuffleEnabled
)
if (kind === "song") {
const song = await fetchCachedQuery(
convex,
cacheScope,
api.library.getSong,
{
id: id as Id<"songs">,
}
)
if (!song) {
throw new IntentRejected("That song is no longer in your library.")
}
const albumSongIds = await fetchCachedQuery(
convex,
cacheScope,
api.playlists.getAlbumSongIds,
{ albumId: song.album }
)
ensureActive(invocation)
await actions.startFromSong(
song._id,
albumSongIds.length > 0 ? albumSongIds : [song._id],
shuffled,
true
)
return
}
const ids = await songIdsFor(kind, id)
if (ids.length === 0) {
throw new IntentRejected("Nothing to play.")
}
if (shuffled) {
ensureActive(invocation)
await actions.playShuffled(ids)
} else {
ensureActive(invocation)
await actions.playInOrder(ids)
}
}
async function warmup(invocation: AppIntentInvocation) {
const kind = readString(invocation.params.kind)
const id = readString(invocation.params.id)
if (!kind || !id) {
throw new IntentRejected("Choose music to get ready.")
}
const shuffled = shuffleChoice(invocation.params.shuffle, false)
if (kind === "song") {
const song = await fetchCachedQuery(
convex,
cacheScope,
api.library.getSong,
{
id: id as Id<"songs">,
}
)
if (!song) {
throw new IntentRejected("That song is no longer in your library.")
}
const albumSongIds = await fetchCachedQuery(
convex,
cacheScope,
api.playlists.getAlbumSongIds,
{ albumId: song.album }
)
ensureActive(invocation)
await playbackRef.current.startFromSong(
song._id,
albumSongIds.length > 0 ? albumSongIds : [song._id],
shuffled,
false
)
} else {
const ids = await songIdsFor(kind, id)
if (ids.length === 0) {
throw new IntentRejected("Nothing to get ready.")
}
ensureActive(invocation)
await playbackRef.current.prepareQueue(ids, shuffled)
}
}
async function addToPlaylist(invocation: AppIntentInvocation) {
const playlistId = readString(invocation.params.playlistId)
const sources = readSources(invocation.params.sources)
if (!playlistId || sources.length === 0) {
throw new IntentRejected("Choose music and a playlist.")
}
const songIds = await uniqueSongIds(sources)
if (songIds.length === 0) {
throw new IntentRejected("Those items have no songs to add.")
}
if (playlistId === FAVORITES_PLAYLIST_ID) {
for (const source of sources) {
if (isFavoriteKind(source.kind)) {
ensureActive(invocation)
await setFavorite(source.kind, source.id, true)
} else if (source.kind === "playlist") {
const ids = await songIdsFor(source.kind, source.id)
ensureActive(invocation)
await favorites.addFavoriteSongs(ids)
} else {
throw new IntentRejected(
"Choose a song, album, artist, or playlist."
)
}
}
return
}
ensureActive(invocation)
await convex.mutation(api.playlists.addSongsToPlaylist, {
playlistId: playlistId as Id<"playlists">,
songIds,
})
}
async function addToUpNext(invocation: AppIntentInvocation) {
const sources = readSources(invocation.params.sources)
if (sources.length === 0) {
throw new IntentRejected("Choose music to add to Up Next.")
}
const ids = await uniqueSongIds(sources)
if (ids.length === 0) {
throw new IntentRejected("Nothing to add to Up Next.")
}
const position =
readString(invocation.params.position) === "last" ? "last" : "next"
if (position === "last") {
ensureActive(invocation)
await playbackRef.current.addToQueueLast(ids)
} else {
ensureActive(invocation)
await playbackRef.current.addToQueueNext(ids)
}
}
async function createPlaylist(invocation: AppIntentInvocation) {
const name = readString(invocation.params.name)
if (!name) {
throw new IntentRejected("A playlist needs a name.")
}
const songIds = await uniqueSongIds(
readSources(invocation.params.sources)
)
ensureActive(invocation)
await convex.mutation(api.playlists.createPlaylist, {
name,
songIds,
invocationId: invocation.id,
})
}
async function createStation(invocation: AppIntentInvocation) {
const artistId = readString(invocation.params.artistId)
if (!artistId) {
throw new IntentRejected("Nothing is playing in oTunes.")
}
const ids = await songIdsFor("artist", artistId)
if (ids.length === 0)
throw new IntentRejected("This artist has no songs to play.")
ensureActive(invocation)
await playbackRef.current.playShuffled(ids)
}
async function updateAffinity(invocation: AppIntentInvocation) {
const kind = readString(invocation.params.kind)
const id = readString(invocation.params.id)
const state = readString(invocation.params.state)
if (!kind || !id || (state !== "like" && state !== "unset")) {
throw new IntentRejected(
"oTunes can love or unlike a song, album, or artist."
)
}
if (!isFavoriteKind(kind)) {
throw new IntentRejected("oTunes can love songs, albums, and artists.")
}
ensureActive(invocation)
await setFavorite(kind, id, state === "like")
}
async function transport(invocation: AppIntentInvocation) {
const actions = playbackRef.current
const command = readString(invocation.params.command)
if (command === "pause") {
ensureActive(invocation)
actions.setIsPlaying(false)
return
}
if (command === "resume") {
if (actions.queueSongIds.length === 0) {
throw new IntentRejected("Nothing is queued in oTunes.")
}
ensureActive(invocation)
actions.setIsPlaying(true)
return
}
if (command === "next") {
ensureActive(invocation)
await actions.skipNext()
return
}
if (command === "previous") {
ensureActive(invocation)
await actions.skipPrevious()
return
}
throw new IntentRejected("oTunes doesn't know that playback control.")
}
})
}
@@ -1,59 +0,0 @@
import * as AppIntents from "expo-app-intents"
import type { AppIntentEntity } from "expo-app-intents"
import { useEffect } from "react"
import { usePlaybackQueue } from "@/contexts/playback"
import { publishMusicCatalog } from "@/lib/app-intents"
type CurrentSong = NonNullable<
ReturnType<typeof usePlaybackQueue>["currentSong"]
>
function nowPlayingEntity(song: CurrentSong): AppIntentEntity {
const artistName = song.artist.name
return {
id: song.id,
title: song.title,
subtitle: artistName,
synonyms: artistName ? [artistName] : undefined,
metadata: {
artistName,
artistId: song.artist.id,
albumTitle: song.album.title,
albumId: song.album.id,
duration: String(song.durationSeconds),
genres: "",
year: "",
track: "",
disk: "",
favorite: "0",
},
}
}
/**
* Publishes the "nowPlaying" catalog Siri reads for the current song. With an
* id but no matching `song` it leaves the catalog alone until the song loads.
*/
export async function publishNowPlaying(
queueHeadId: string | null,
song: CurrentSong | null
) {
if (!queueHeadId) await publishMusicCatalog("nowPlaying", [])
else if (song?.id === queueHeadId)
await publishMusicCatalog("nowPlaying", [nowPlayingEntity(song)])
}
/** Keeps the "nowPlaying" catalog in step with the playback queue. */
export function useNowPlayingCatalog() {
const playback = usePlaybackQueue()
const queueHeadId = playback.queueSongIds[0] ?? null
const song = playback.currentSong
useEffect(() => {
if (!AppIntents.isAvailable()) return
void publishNowPlaying(queueHeadId, song).catch((error) => {
console.warn("Could not publish the current song.", error)
})
}, [queueHeadId, song])
}
+35 -21
View File
@@ -1,33 +1,40 @@
import { StyleSheet, Text, View } from "react-native" import { PaletteText } from "@/components/palette-text"
import { StyleSheet, View } from "react-native"
import Svg, { G, Path } from "react-native-svg" import Svg, { G, Path } from "react-native-svg"
import {
DOLBY_PATHS,
DOLBY_VIEW_BOX,
DOLBY_WIDTH,
LOSSLESS_FALL,
LOSSLESS_FALL_GAP,
LOSSLESS_PEAKS,
LOSSLESS_STROKES,
LOSSLESS_THIN_WIDTH,
LOSSLESS_VIEW_BOX,
LOSSLESS_WIDTH,
MARK_HEIGHT,
} from "@otunes/convex/client/audio-format-marks"
import type { PlaybackFormat } from "@otunes/convex/playback-stream" import type { PlaybackFormat } from "@otunes/convex/playback-stream"
const LABEL_SIZE = 13 const LABEL_SIZE = 13
const MARK_HEIGHT = 11
function DolbyMark({ color }: { color: string }) { function DolbyMark({ color }: { color: string }) {
return ( return (
<Svg width={DOLBY_WIDTH} height={MARK_HEIGHT} viewBox={DOLBY_VIEW_BOX}> <Svg
{DOLBY_PATHS.map((d) => ( width={(MARK_HEIGHT * 23) / 16}
<Path key={d} d={d} fill={color} /> height={MARK_HEIGHT}
))} viewBox="0 0 23 16"
>
<Path d="M0 0H2.5A8 8 0 0 1 2.5 16H0Z" fill={color} />
<Path d="M23 0H20.5A8 8 0 0 0 20.5 16H23Z" fill={color} />
</Svg> </Svg>
) )
} }
const LOSSLESS_PEAKS = [110, 215, 320]
const LOSSLESS_THIN_WIDTH = 24
const LOSSLESS_STROKES: [peak: number, d: string][] = [
[110, "M-70 320C-62 245 -38 166 0 166"],
[215, "M-70 320C-62 245 -38 166 0 166"],
[320, "M-30 185C-22 173 -11 166 0 166"],
[110, "M166 413C176 413 186 406 194 395"],
[215, "M166 413C200 413 226 340 240 275"],
[320, "M166 413C200 413 226 340 240 275"],
]
const LOSSLESS_FALL =
"M0 178L4 179L8 181L12 184L16 189L20 196L23 204L27 213L30 223L34 233L39 243L43 254L48 266L53 278L58 289L62 301L66 313L71 325L75 336L79 347L83 357L86 364L89 370L93 377L97 382L101 387L105 392L109 397L113 401L117 405L121 408L126 412L130 415L134 417L139 419L143 421L148 423L152 424L157 424L161 425L166 425L166 401L163 401L161 400L159 400L157 399L154 397L152 396L151 394L149 392L147 389L145 386L143 383L142 380L140 376L138 371L137 367L135 362L134 357L132 351L130 345L127 339L124 330L120 319L116 308L111 297L107 285L102 272L98 260L93 248L88 235L82 223L76 212L69 201L61 192L53 183L45 175L37 168L28 163L19 158L10 155L0 154Z"
const LOSSLESS_FALL_GAP =
"M0 178L4 180L6 184L8 190L9 197L11 203L14 210L17 219L21 228L24 238L29 248L33 259L38 270L43 282L47 293L52 305L56 317L60 328L64 340L68 351L73 361L76 368L79 375L83 381L87 387L91 393L95 398L100 403L104 408L109 412L113 416L118 419L124 422L130 424L135 425L141 426L147 426L152 426L157 425L161 425L166 425L166 401L163 401L161 399L159 398L158 395L157 393L156 390L155 387L155 384L154 381L153 379L152 376L150 373L149 369L148 366L146 361L145 357L143 352L142 347L140 341L137 335L134 326L130 315L126 304L122 293L117 281L113 268L108 256L103 243L98 231L92 219L86 207L79 196L71 186L62 177L53 168L44 161L32 157L21 155L10 154L0 154Z"
/** /**
* Three overlapping waves. Each thick downstroke is outlined in the * Three overlapping waves. Each thick downstroke is outlined in the
* background color so it reads as passing over the strokes behind it. * background color so it reads as passing over the strokes behind it.
@@ -41,9 +48,9 @@ function LosslessMark({
}) { }) {
return ( return (
<Svg <Svg
width={LOSSLESS_WIDTH} width={(MARK_HEIGHT * 544) / 271}
height={MARK_HEIGHT} height={MARK_HEIGHT}
viewBox={LOSSLESS_VIEW_BOX} viewBox="28 154 544 271"
> >
{LOSSLESS_STROKES.map(([peak, d], index) => ( {LOSSLESS_STROKES.map(([peak, d], index) => (
<Path <Path
@@ -68,10 +75,12 @@ function LosslessMark({
/** The Dolby Atmos or Lossless label shown under the progress bar. */ /** The Dolby Atmos or Lossless label shown under the progress bar. */
export function AudioFormatBadge({ export function AudioFormatBadge({
artwork = false,
format, format,
color, color,
backgroundColor, backgroundColor,
}: { }: {
artwork?: boolean
format: PlaybackFormat format: PlaybackFormat
color: string color: string
backgroundColor: string backgroundColor: string
@@ -84,7 +93,12 @@ export function AudioFormatBadge({
) : ( ) : (
<LosslessMark color={color} backgroundColor={backgroundColor} /> <LosslessMark color={color} backgroundColor={backgroundColor} />
)} )}
<Text style={[styles.label, { color }]}>{label}</Text> <PaletteText
tone={artwork ? "secondaryForeground" : undefined}
style={[styles.label, { color }]}
>
{label}
</PaletteText>
</View> </View>
) )
} }
+7 -3
View File
@@ -1,5 +1,6 @@
import { PaletteText } from "@/components/palette-text"
import { memo } from "react" import { memo } from "react"
import { StyleSheet, Text, View } from "react-native" import { StyleSheet, View } from "react-native"
import { useThemeColors } from "@/lib/theme" import { useThemeColors } from "@/lib/theme"
@@ -25,9 +26,12 @@ export const DiscHeader = memo(function DiscHeader({
}) { }) {
const colors = useThemeColors() const colors = useThemeColors()
return ( return (
<Text style={[styles.discHeader, { color: color ?? colors.foreground }]}> <PaletteText
tone={color ? "foreground" : undefined}
style={[styles.discHeader, { color: color ?? colors.foreground }]}
>
{label} {label}
</Text> </PaletteText>
) )
}) })
+1 -5
View File
@@ -35,11 +35,7 @@ export function HandoffBridge() {
if (!active || !activity) return if (!active || !activity) return
try { try {
const source = new URL(activity.server) const source = new URL(activity.server)
if (!config) { if (!config || source.origin !== new URL(config.serverUrl).origin) {
showError("Connect to an oTunes server to continue this activity.")
return
}
if (source.origin !== new URL(config.serverUrl).origin) {
showError("This activity belongs to a different oTunes server.") showError("This activity belongs to a different oTunes server.")
return return
} }
@@ -32,7 +32,6 @@ export type MediaAction =
| "favorite" | "favorite"
| "go-artist" | "go-artist"
| "go-album" | "go-album"
| "remove-from-playlist"
| "delete-playlist" | "delete-playlist"
export type MediaNavigation = { export type MediaNavigation = {
@@ -55,7 +54,6 @@ export type MediaMenuConfig = {
playlistLabel?: string playlistLabel?: string
favorited?: boolean favorited?: boolean
showFavorite?: boolean showFavorite?: boolean
showRemoveFromPlaylist?: boolean
stationArtistId?: string stationArtistId?: string
navigation?: MediaNavigation navigation?: MediaNavigation
share?: MediaShareContext share?: MediaShareContext
@@ -78,7 +76,6 @@ const MEDIA_ACTION_ITEMS: {
playlistLabel: string playlistLabel: string
) => string ) => string
image: NonNullable<MenuAction["image"]> & string image: NonNullable<MenuAction["image"]> & string
destructive?: boolean
}[] = [ }[] = [
{ {
action: "playlist", action: "playlist",
@@ -122,12 +119,6 @@ const MEDIA_ACTION_ITEMS: {
`${favorited ? "Unfavorite" : "Favorite"}${countSuffix}`, `${favorited ? "Unfavorite" : "Favorite"}${countSuffix}`,
image: "star", image: "star",
}, },
{
action: "remove-from-playlist",
label: () => "Remove from Playlist",
image: "minus.circle",
destructive: true,
},
{ {
action: "delete-playlist", action: "delete-playlist",
label: () => "Delete Playlist", label: () => "Delete Playlist",
@@ -143,10 +134,6 @@ function isActionIncluded(
return false return false
} }
if (action === "remove-from-playlist") {
return config.showRemoveFromPlaylist === true
}
if (config.includeActions) { if (config.includeActions) {
return config.includeActions.includes(action) return config.includeActions.includes(action)
} }
@@ -203,7 +190,6 @@ export function buildMediaMenuActions(
id: item.action, id: item.action,
title: item.label(countSuffix, favorited, playlistLabel), title: item.label(countSuffix, favorited, playlistLabel),
image: item.action === "favorite" && favorited ? "star.fill" : item.image, image: item.action === "favorite" && favorited ? "star.fill" : item.image,
...(item.destructive ? { attributes: { destructive: true } } : {}),
}) })
} }
@@ -338,7 +324,6 @@ const NativeContextMenuAction: ComponentType<{
identifier: string identifier: string
title: string title: string
icon?: string icon?: string
destructive?: boolean
onSelected: () => void onSelected: () => void
}> | null = }> | null =
Platform.OS === "ios" Platform.OS === "ios"
@@ -392,7 +377,6 @@ function NativeMediaContextMenu({
identifier={action.id ?? action.title} identifier={action.id ?? action.title}
title={action.title} title={action.title}
icon={typeof action.image === "string" ? action.image : undefined} icon={typeof action.image === "string" ? action.image : undefined}
destructive={action.attributes?.destructive}
onSelected={() => handleAction(action.id as MediaAction)} onSelected={() => handleAction(action.id as MediaAction)}
/> />
))} ))}
@@ -25,7 +25,6 @@ const actionIcons = {
favorite: "star-outline", favorite: "star-outline",
"go-artist": "person-outline", "go-artist": "person-outline",
"go-album": "disc-outline", "go-album": "disc-outline",
"remove-from-playlist": "remove-circle-outline",
"delete-playlist": "trash-outline", "delete-playlist": "trash-outline",
} satisfies Record<MediaAction, ComponentProps<typeof Ionicons>["name"]> } satisfies Record<MediaAction, ComponentProps<typeof Ionicons>["name"]>
+32 -14
View File
@@ -1,11 +1,13 @@
import { PaletteText, PaletteIcon } from "@/components/palette-text"
import Animated from "react-native-reanimated"
import { import {
useAndroidTabPalette, useAndroidTabPalette,
useAndroidTabBackgroundStyle,
useAndroidTabHasArtworkPalette, useAndroidTabHasArtworkPalette,
} from "@/contexts/android-tab-theme" } from "@/contexts/android-tab-theme"
import { Ionicons } from "@expo/vector-icons"
import { NativeTabs } from "expo-router/native-tabs" import { NativeTabs } from "expo-router/native-tabs"
import { useRouter } from "expo-router" import { useRouter } from "expo-router"
import { Platform, Pressable, StyleSheet, Text, View } from "react-native" import { Platform, Pressable, StyleSheet, View } from "react-native"
import { useSafeAreaInsets } from "react-native-safe-area-context" import { useSafeAreaInsets } from "react-native-safe-area-context"
@@ -65,7 +67,8 @@ function MiniPlayerContent({
<View <View
style={isAccessory ? styles.accessoryInlineMeta : styles.inlineMeta} style={isAccessory ? styles.accessoryInlineMeta : styles.inlineMeta}
> >
<Text <PaletteText
tone="foreground"
style={[ style={[
isAccessory ? styles.accessoryTitle : styles.title, isAccessory ? styles.accessoryTitle : styles.title,
{ color: colors.foreground }, { color: colors.foreground },
@@ -73,7 +76,7 @@ function MiniPlayerContent({
numberOfLines={1} numberOfLines={1}
> >
{currentSong.title} {currentSong.title}
</Text> </PaletteText>
</View> </View>
<Pressable <Pressable
style={styles.controlButton} style={styles.controlButton}
@@ -83,7 +86,8 @@ function MiniPlayerContent({
}} }}
hitSlop={6} hitSlop={6}
> >
<Ionicons <PaletteIcon
tone="foreground"
name={isPlaying ? "pause" : "play"} name={isPlaying ? "pause" : "play"}
size={20} size={20}
color={colors.foreground} color={colors.foreground}
@@ -101,7 +105,8 @@ function MiniPlayerContent({
style={artworkStyle} style={artworkStyle}
/> />
<View style={isAccessory ? styles.accessoryMeta : styles.meta}> <View style={isAccessory ? styles.accessoryMeta : styles.meta}>
<Text <PaletteText
tone="foreground"
style={[ style={[
isAccessory ? styles.accessoryTitle : styles.title, isAccessory ? styles.accessoryTitle : styles.title,
{ color: colors.foreground }, { color: colors.foreground },
@@ -109,8 +114,9 @@ function MiniPlayerContent({
numberOfLines={1} numberOfLines={1}
> >
{currentSong.title} {currentSong.title}
</Text> </PaletteText>
<Text <PaletteText
tone="secondaryForeground"
style={[ style={[
isAccessory ? styles.accessoryArtist : styles.artist, isAccessory ? styles.accessoryArtist : styles.artist,
{ color: colors.mutedForeground }, { color: colors.mutedForeground },
@@ -118,7 +124,7 @@ function MiniPlayerContent({
numberOfLines={1} numberOfLines={1}
> >
{currentSong.artist.name} {currentSong.artist.name}
</Text> </PaletteText>
</View> </View>
<View style={styles.controls}> <View style={styles.controls}>
{Platform.OS === "android" && !isAccessory ? ( {Platform.OS === "android" && !isAccessory ? (
@@ -132,7 +138,12 @@ function MiniPlayerContent({
}} }}
hitSlop={6} hitSlop={6}
> >
<Ionicons name="play-back" size={24} color={colors.foreground} /> <PaletteIcon
tone="foreground"
name="play-back"
size={24}
color={colors.foreground}
/>
</Pressable> </Pressable>
) : null} ) : null}
<Pressable <Pressable
@@ -143,7 +154,8 @@ function MiniPlayerContent({
}} }}
hitSlop={6} hitSlop={6}
> >
<Ionicons <PaletteIcon
tone="foreground"
name={isPlaying ? "pause" : "play"} name={isPlaying ? "pause" : "play"}
size={24} size={24}
color={colors.foreground} color={colors.foreground}
@@ -157,7 +169,12 @@ function MiniPlayerContent({
}} }}
hitSlop={6} hitSlop={6}
> >
<Ionicons name="play-forward" size={24} color={colors.foreground} /> <PaletteIcon
tone="foreground"
name="play-forward"
size={24}
color={colors.foreground}
/>
</Pressable> </Pressable>
</View> </View>
</Pressable> </Pressable>
@@ -167,9 +184,10 @@ function MiniPlayerContent({
function MiniPlayerChrome({ children }: { children: React.ReactNode }) { function MiniPlayerChrome({ children }: { children: React.ReactNode }) {
const palette = useAndroidTabPalette() const palette = useAndroidTabPalette()
const hasArtworkPalette = useAndroidTabHasArtworkPalette() const hasArtworkPalette = useAndroidTabHasArtworkPalette()
const backgroundStyle = useAndroidTabBackgroundStyle()
return ( return (
<View style={[styles.androidBar, { backgroundColor: palette.background }]}> <Animated.View style={[styles.androidBar, backgroundStyle]}>
{children} {children}
{hasArtworkPalette ? ( {hasArtworkPalette ? (
<View <View
@@ -187,7 +205,7 @@ function MiniPlayerChrome({ children }: { children: React.ReactNode }) {
{ backgroundColor: palette.secondaryForeground }, { backgroundColor: palette.secondaryForeground },
]} ]}
/> />
</View> </Animated.View>
) )
} }
+97 -121
View File
@@ -38,7 +38,7 @@ import {
type SwipeRowGroup, type SwipeRowGroup,
} from "@/components/ios-swipe-to-remove-row" } from "@/components/ios-swipe-to-remove-row"
import { PlayerSymbol } from "@/components/player-symbol" import { PlayerSymbol } from "@/components/player-symbol"
import { usePlaybackActions, usePlaybackQueue } from "@/contexts/playback" import { usePlayback } from "@/contexts/playback"
import { useServerConfig } from "@/contexts/server-config" import { useServerConfig } from "@/contexts/server-config"
import type { Id } from "@otunes/convex/_generated/dataModel" import type { Id } from "@otunes/convex/_generated/dataModel"
import type { NowPlayingColors } from "@/lib/now-playing-colors" import type { NowPlayingColors } from "@/lib/now-playing-colors"
@@ -110,16 +110,18 @@ export function NowPlayingQueue({
tablet?: boolean tablet?: boolean
fadeColor?: string fadeColor?: string
}) { }) {
const { queueSongIds, queueHistorySongIds, shuffleEnabled, repeatEnabled } =
usePlaybackQueue()
const { const {
queueSongIds,
queueHistorySongIds,
shuffleEnabled,
repeatEnabled,
toggleShuffle, toggleShuffle,
cycleRepeat, cycleRepeat,
clearHistory, clearHistory,
reorderQueue, reorderQueue,
skipToQueueIndex, skipToQueueIndex,
skipToHistoryIndex, skipToHistoryIndex,
} = usePlaybackActions() } = usePlayback()
const [viewportWidth, setViewportWidth] = useState(0) const [viewportWidth, setViewportWidth] = useState(0)
const swipeGroup = useSwipeRowGroup() const swipeGroup = useSwipeRowGroup()
const [scrollEnabled, setScrollEnabled] = useState(true) const [scrollEnabled, setScrollEnabled] = useState(true)
@@ -305,126 +307,100 @@ export function NowPlayingQueue({
[drag] [drag]
) )
const lastIndex = queueSongIds.length - 1 const renderItem = ({ item }: { item: QueueListItem }) => {
const renderItem = useCallback( switch (item.type) {
({ item }: { item: QueueListItem }) => { case "history-header":
switch (item.type) { return (
case "history-header": <View style={styles.historyHeader}>
return ( <Text style={[styles.sectionTitle, { color: colors.foreground }]}>
<View style={styles.historyHeader}> History
<Text style={[styles.sectionTitle, { color: colors.foreground }]}> </Text>
History <Pressable onPress={() => void clearHistory()} hitSlop={10}>
</Text>
<Pressable onPress={() => void clearHistory()} hitSlop={10}>
<Text
style={[styles.clear, { color: colors.secondaryForeground }]}
>
Clear
</Text>
</Pressable>
</View>
)
case "history":
return (
<HistoryRow
songId={item.songId}
historyIndex={item.historyIndex}
colors={colors}
onPress={skipToHistoryIndex}
/>
)
case "current":
return <View style={styles.current}>{currentHeader}</View>
case "controls":
return (
<View
style={[
styles.controls,
{
height: itemHeight(item),
backgroundColor: tablet ? "transparent" : colors.background,
},
]}
>
{!tablet ? (
<View style={styles.toggles}>
<QueueToggle
colors={colors}
selected={shuffleEnabled}
label="Shuffle"
symbol="shuffle"
fallback="shuffle"
onPress={toggleShuffle}
/>
<QueueToggle
colors={colors}
selected={repeatEnabled !== "none"}
label={repeatEnabled === "once" ? "Repeat one" : "Repeat"}
symbol={repeatEnabled === "once" ? "repeat.1" : "repeat"}
fallback="repeat"
onPress={cycleRepeat}
/>
</View>
) : null}
{item.showTitle ? (
<Text
style={[styles.sectionTitle, { color: colors.foreground }]}
>
Continue Playing
</Text>
) : null}
</View>
)
case "upcoming":
return (
<UpcomingRow
songId={item.songId}
queueIndex={item.queueIndex}
lastIndex={lastIndex}
tablet={tablet}
colors={colors}
drag={drag}
swipeGroup={swipeGroup}
onPress={skipToQueueIndex}
onRemove={handleRemove}
onDragStart={handleDragStart}
onDrop={handleDrop}
/>
)
case "empty":
return (
<View style={[styles.empty, { height: item.height }]}>
<Text <Text
style={[ style={[styles.clear, { color: colors.secondaryForeground }]}
styles.emptyText,
{ color: colors.secondaryForeground },
]}
> >
Nothing else is queued. Clear
</Text> </Text>
</View> </Pressable>
) </View>
} )
}, case "history":
[ return (
clearHistory, <HistoryRow
colors, songId={item.songId}
currentHeader, historyIndex={item.historyIndex}
cycleRepeat, colors={colors}
drag, onPress={skipToHistoryIndex}
handleDragStart, />
handleDrop, )
handleRemove, case "current":
lastIndex, return <View style={styles.current}>{currentHeader}</View>
repeatEnabled, case "controls":
shuffleEnabled, return (
skipToHistoryIndex, <View
skipToQueueIndex, style={[
swipeGroup, styles.controls,
tablet, {
toggleShuffle, height: itemHeight(item),
] backgroundColor: tablet ? "transparent" : colors.background,
) },
]}
>
{!tablet ? (
<View style={styles.toggles}>
<QueueToggle
colors={colors}
selected={shuffleEnabled}
label="Shuffle"
symbol="shuffle"
fallback="shuffle"
onPress={toggleShuffle}
/>
<QueueToggle
colors={colors}
selected={repeatEnabled !== "none"}
label={repeatEnabled === "once" ? "Repeat one" : "Repeat"}
symbol={repeatEnabled === "once" ? "repeat.1" : "repeat"}
fallback="repeat"
onPress={cycleRepeat}
/>
</View>
) : null}
{item.showTitle ? (
<Text style={[styles.sectionTitle, { color: colors.foreground }]}>
Continue Playing
</Text>
) : null}
</View>
)
case "upcoming":
return (
<UpcomingRow
songId={item.songId}
queueIndex={item.queueIndex}
lastIndex={queueSongIds.length - 1}
tablet={tablet}
colors={colors}
drag={drag}
swipeGroup={swipeGroup}
onPress={skipToQueueIndex}
onRemove={handleRemove}
onDragStart={handleDragStart}
onDrop={handleDrop}
/>
)
case "empty":
return (
<View style={[styles.empty, { height: item.height }]}>
<Text
style={[styles.emptyText, { color: colors.secondaryForeground }]}
>
Nothing else is queued.
</Text>
</View>
)
}
}
return ( return (
<View <View
+49
View File
@@ -0,0 +1,49 @@
import { Ionicons } from "@expo/vector-icons"
import type { ComponentProps } from "react"
import { Pressable, type TextProps } from "react-native"
import { useRouter } from "expo-router"
import Animated from "react-native-reanimated"
import {
useAnimatedPaletteColor,
type PaletteColor,
} from "@/contexts/android-tab-theme"
const AnimatedIcon = Animated.createAnimatedComponent(Ionicons)
/** Keep artwork text colors on the same UI-thread animation as the background. */
export function PaletteText({
tone,
style,
...props
}: TextProps & { tone?: PaletteColor }) {
const colorStyle = useAnimatedPaletteColor(tone)
return <Animated.Text {...props} style={[style, colorStyle]} />
}
export function PaletteIcon({
tone,
style,
...props
}: ComponentProps<typeof Ionicons> & { tone?: PaletteColor }) {
const colorStyle = useAnimatedPaletteColor(tone)
return <AnimatedIcon {...props} style={[style, colorStyle]} />
}
function ArtworkBackButton() {
const router = useRouter()
return (
<Pressable
accessibilityRole="button"
accessibilityLabel="Navigate up"
hitSlop={8}
onPress={() => router.back()}
>
<PaletteIcon tone="foreground" name="arrow-back" size={24} />
</Pressable>
)
}
export function renderArtworkBackButton() {
return <ArtworkBackButton />
}
@@ -1,83 +0,0 @@
import { useState, type ReactNode } from "react"
import {
StyleSheet,
Text,
View,
type StyleProp,
type TextStyle,
} from "react-native"
import { PlayerSlider } from "@/components/player-slider"
import { usePlaybackActions, usePlaybackProgress } from "@/contexts/playback"
import { formatDuration, formatRemainingDuration } from "@/lib/format"
import type { NowPlayingColors } from "@/lib/now-playing-colors"
/**
* Position slider with elapsed and remaining labels. The only player piece
* subscribed to the playback clock, so the rest of the player stays still
* while audio plays.
*/
export function PlayerProgress({
colors,
center,
timeStyle,
}: {
colors: NowPlayingColors
/** Shown centered between the time labels. */
center?: ReactNode
timeStyle?: StyleProp<TextStyle>
}) {
const { currentTime, duration } = usePlaybackProgress()
const { seekTo } = usePlaybackActions()
const [scrubTime, setScrubTime] = useState<number | null>(null)
const time = scrubTime ?? currentTime
const timeColor =
scrubTime === null ? colors.secondaryForeground : colors.foreground
return (
<>
<PlayerSlider
accessibilityLabel="Playback position"
value={time}
maximumValue={duration}
fillColor={colors.sliderFill}
activeFillColor={colors.foreground}
trackColor={colors.sliderTrack}
onValueChange={setScrubTime}
onSlidingComplete={(value) => {
void seekTo(value)
setScrubTime(null)
}}
/>
<View style={styles.row}>
<Text style={[styles.time, timeStyle, { color: timeColor }]}>
{formatDuration(time)}
</Text>
{center ? (
<View style={styles.center} pointerEvents="none">
{center}
</View>
) : null}
<Text style={[styles.time, timeStyle, { color: timeColor }]}>
{formatRemainingDuration(time, duration).replace("-", "−")}
</Text>
</View>
</>
)
}
const styles = StyleSheet.create({
row: {
flexDirection: "row",
alignItems: "center",
justifyContent: "space-between",
marginTop: -4,
},
center: {
position: "absolute",
left: 0,
right: 0,
alignItems: "center",
},
time: { fontSize: 12, fontVariant: ["tabular-nums"] },
})
+13 -11
View File
@@ -1,5 +1,6 @@
import { SongSwipeRow } from "@/components/song-swipe-row" import { SongSwipeRow } from "@/components/song-swipe-row"
import type { SwipeRowGroup } from "@/components/ios-swipe-to-remove-row" import type { SwipeRowGroup } from "@/components/ios-swipe-to-remove-row"
import { PaletteText } from "@/components/palette-text"
import { MusicEntityView } from "@/components/music-entity-view" import { MusicEntityView } from "@/components/music-entity-view"
import { collectionInset } from "@/components/collection-list" import { collectionInset } from "@/components/collection-list"
import { CoverImage } from "@/components/cover-image" import { CoverImage } from "@/components/cover-image"
@@ -15,7 +16,7 @@ import {
useThemeColors, useThemeColors,
} from "@/lib/theme" } from "@/lib/theme"
import { memo, useCallback } from "react" import { memo, useCallback } from "react"
import { Platform, Pressable, StyleSheet, Text, View } from "react-native" import { Platform, Pressable, StyleSheet, View } from "react-native"
import { import {
MediaContextMenu, MediaContextMenu,
@@ -63,22 +64,27 @@ export const SongRow = memo(function SongRow({
const content = ( const content = (
<> <>
<View style={styles.rowMeta}> <View style={styles.rowMeta}>
<Text <PaletteText
tone={palette ? "foreground" : undefined}
style={[styles.rowTitle, { color: foreground }]} style={[styles.rowTitle, { color: foreground }]}
numberOfLines={1} numberOfLines={1}
> >
{song.title} {song.title}
</Text> </PaletteText>
<Text <PaletteText
tone={palette ? "secondaryForeground" : undefined}
style={[styles.rowSubtitle, { color: secondaryForeground }]} style={[styles.rowSubtitle, { color: secondaryForeground }]}
numberOfLines={1} numberOfLines={1}
> >
{song.artist.name} · {song.album.title} {song.artist.name} · {song.album.title}
</Text> </PaletteText>
</View> </View>
<Text style={[styles.duration, { color: secondaryForeground }]}> <PaletteText
tone={palette ? "secondaryForeground" : undefined}
style={[styles.duration, { color: secondaryForeground }]}
>
{formatDuration(song.durationSeconds)} {formatDuration(song.durationSeconds)}
</Text> </PaletteText>
{trailing} {trailing}
</> </>
) )
@@ -154,7 +160,6 @@ export const SongListRow = memo(function SongListRow({
palette, palette,
inset, inset,
swipe, swipe,
removable,
onPlay, onPlay,
onAction, onAction,
}: { }: {
@@ -170,8 +175,6 @@ export const SongListRow = memo(function SongListRow({
onRemove?: () => void onRemove?: () => void
backgroundColor: string backgroundColor: string
} }
/** Shows "Remove from Playlist" in the context menu. */
removable?: boolean
onPlay: (song: BrowseSong) => void onPlay: (song: BrowseSong) => void
onAction: (song: BrowseSong, action: MediaAction) => void onAction: (song: BrowseSong, action: MediaAction) => void
}) { }) {
@@ -199,7 +202,6 @@ export const SongListRow = memo(function SongListRow({
stationArtistId: song.artist.id, stationArtistId: song.artist.id,
favorited, favorited,
playlistLabel, playlistLabel,
showRemoveFromPlaylist: removable,
navigation: { navigation: {
artist: { id: song.artist.id }, artist: { id: song.artist.id },
album: { id: song.album.id }, album: { id: song.album.id },
@@ -4,15 +4,19 @@ import { Stack } from "expo-router"
import { useDebouncedSearch } from "@/hooks/use-debounced-search" import { useDebouncedSearch } from "@/hooks/use-debounced-search"
import { useThemeColors } from "@/lib/theme" import { useThemeColors } from "@/lib/theme"
import { filterSongs } from "@otunes/convex/client/song-search"
import type { BrowseSong } from "@otunes/convex/types" import type { BrowseSong } from "@otunes/convex/types"
export function usePlaylistSearch(songs: BrowseSong[]) { export function usePlaylistSearch(songs: BrowseSong[]) {
const search = useDebouncedSearch() const search = useDebouncedSearch()
const filteredSongs = useMemo( const filteredSongs = useMemo(() => {
() => filterSongs(songs, search.searchQuery), const query = search.searchQuery.toLowerCase()
[songs, search.searchQuery] if (!query) return songs
) return songs.filter((song) =>
[song.title, song.artist.name, song.album.title].some((value) =>
value.toLowerCase().includes(query)
)
)
}, [songs, search.searchQuery])
return { ...search, filteredSongs } return { ...search, filteredSongs }
} }
@@ -4,7 +4,6 @@ import { Image } from "expo-image"
import { Pressable, StyleSheet, Text, View } from "react-native" import { Pressable, StyleSheet, Text, View } from "react-native"
import { useCachedQuery } from "@/hooks/use-cached-query" import { useCachedQuery } from "@/hooks/use-cached-query"
import { useProfileImageUrl } from "@/hooks/use-profile-image-url"
import { initialsFromName } from "@/lib/format" import { initialsFromName } from "@/lib/format"
import { radius, useThemeColors } from "@/lib/theme" import { radius, useThemeColors } from "@/lib/theme"
import { api } from "@otunes/convex/_generated/api" import { api } from "@otunes/convex/_generated/api"
@@ -14,7 +13,6 @@ export function ProfileHeaderButton() {
const openSettings = useOpenSettings() const openSettings = useOpenSettings()
const colors = useThemeColors() const colors = useThemeColors()
const user = useCachedQuery(api.auth.currentUser) const user = useCachedQuery(api.auth.currentUser)
const imageUrl = useProfileImageUrl(user?.image)
if (tabletLayout) return null if (tabletLayout) return null
@@ -35,9 +33,9 @@ export function ProfileHeaderButton() {
}, },
]} ]}
> >
{imageUrl ? ( {user?.image ? (
<Image <Image
source={{ uri: imageUrl }} source={{ uri: user.image }}
style={styles.image} style={styles.image}
contentFit="cover" contentFit="cover"
/> />
+167 -297
View File
@@ -1,20 +1,15 @@
import { useMediaGridLayout } from "@/hooks/use-media-grid-layout" import { useMediaGridLayout } from "@/hooks/use-media-grid-layout"
import { useTabletLayout } from "@/hooks/use-tablet-layout"
import { import {
CollectionHero, CollectionHero,
useCollectionHeroLayout, useCollectionHeroLayout,
} from "@/components/collection-hero" } from "@/components/collection-hero"
import {
CollectionDivider,
collectionInset,
} from "@/components/collection-list"
import { tabletCardTextHeight } from "@/components/tablet-media-grid"
import { Link } from "expo-router" import { Link } from "expo-router"
import { useHeaderHeight } from "expo-router/react-navigation" import { useHeaderHeight } from "expo-router/react-navigation"
import Reanimated from "react-native-reanimated" import Reanimated from "react-native-reanimated"
import { type ComponentProps, type ReactNode } from "react" import { type ReactNode, type ComponentProps } from "react"
import { import {
Platform, Platform,
ScrollView,
StyleSheet, StyleSheet,
View, View,
type DimensionValue, type DimensionValue,
@@ -22,42 +17,34 @@ import {
type ViewStyle, type ViewStyle,
} from "react-native" } from "react-native"
import { contentBottomInset } from "@/components/player"
import { carouselCardWidth, radius, spacing, useThemeColors } from "@/lib/theme" import { carouselCardWidth, radius, spacing, useThemeColors } from "@/lib/theme"
/** /** Reserve the transparent native header explicitly while skeletons cannot scroll. */
* Loading screens never scroll, so they cannot rely on scroll-view inset function SkeletonContent({
* adjustment. iOS headers are transparent and overlap the screen; Android
* headers are opaque and already sit above it.
*/
function SkeletonScreen({
children, children,
style, embedded = false,
backgroundColor,
onLayout,
}: { }: {
children: ReactNode children: ReactNode
style?: ComponentProps<typeof Reanimated.View>["style"] embedded?: boolean
backgroundColor?: string
onLayout?: () => void
}) { }) {
const colors = useThemeColors() const colors = useThemeColors()
const headerHeight = useHeaderHeight() const headerHeight = useHeaderHeight()
if (embedded) return <>{children}</>
return ( return (
<Reanimated.View <ScrollView
onLayout={onLayout} style={{ flex: 1, backgroundColor: colors.background }}
contentContainerStyle={{
paddingTop: Platform.OS === "ios" ? headerHeight : 0,
paddingBottom: contentBottomInset,
}}
contentInsetAdjustmentBehavior="never"
scrollEnabled={false}
accessibilityLabel="Loading" accessibilityLabel="Loading"
accessibilityRole="progressbar"
style={[
styles.screen,
{
backgroundColor: backgroundColor ?? colors.background,
paddingTop: Platform.OS === "ios" ? headerHeight : 0,
},
style,
]}
> >
{children} {children}
</Reanimated.View> </ScrollView>
) )
} }
@@ -74,103 +61,56 @@ export function Skeleton({ style }: { style?: StyleProp<ViewStyle> }) {
) )
} }
/** Occupies the line box of text at `fontSize`, so loaded text lands in place. */
function TextLine({ function TextLine({
width, width,
fontSize, height = 14,
}: { }: {
width: DimensionValue width: DimensionValue
fontSize: number height?: number
}) { }) {
return ( return <Skeleton style={{ width, height, borderRadius: 4 }} />
<View
style={{
width,
height: Math.round(fontSize * 1.2),
justifyContent: "center",
}}
>
<Skeleton
style={{ height: Math.round(fontSize * 0.8), borderRadius: 4 }}
/>
</View>
)
} }
/** Mirrors `SongRow`, including its `inset` album/playlist layout. */ export function SongRowSkeleton() {
export function SongRowSkeleton({ inset = false }: { inset?: boolean }) {
const colors = useThemeColors() const colors = useThemeColors()
const meta = (
<View style={styles.songMeta}>
<TextLine width="60%" fontSize={16} />
<View style={styles.songSubtitle}>
<TextLine width="40%" fontSize={14} />
</View>
</View>
)
if (inset) {
return (
<View style={styles.insetRow}>
<Skeleton style={styles.songArtwork} />
<View
style={[
styles.insetSongContent,
{ borderBottomColor: colors.border },
]}
>
{meta}
</View>
</View>
)
}
return ( return (
<View style={[styles.songRow, { borderBottomColor: colors.border }]}> <View style={[styles.songRow, { borderBottomColor: colors.border }]}>
<Skeleton style={styles.songArtwork} /> <Skeleton style={styles.songArtwork} />
{meta} <View style={styles.songMeta}>
</View> <TextLine width="60%" height={16} />
) <TextLine width="40%" />
}
function TrackRowSkeleton() {
const colors = useThemeColors()
return (
<View style={styles.trackRow}>
<View style={styles.trackNumber}>
<TextLine width={12} fontSize={16} />
</View>
<View style={[styles.trackContent, { borderBottomColor: colors.border }]}>
<TextLine width="55%" fontSize={16} />
</View> </View>
</View> </View>
) )
} }
function SongRows({ rows, inset }: { rows: number; inset?: boolean }) { export function SongListSkeleton({
return Array.from({ length: rows }, (_, index) => ( rows = 10,
<SongRowSkeleton key={index} inset={inset} /> embedded = false,
)) }: {
} rows?: number
embedded?: boolean
export function SongListSkeleton({ rows = 10 }: { rows?: number }) { }) {
return ( return (
<SkeletonScreen> <SkeletonContent embedded={embedded}>
<SongRows rows={rows} /> <View accessibilityLabel="Loading" accessibilityRole="progressbar">
</SkeletonScreen> {Array.from({ length: rows }, (_, index) => (
<SongRowSkeleton key={index} />
))}
</View>
</SkeletonContent>
) )
} }
/** Mirrors the album, playlist, and artist cards in `media-cards`. */
function CardSkeleton({ function CardSkeleton({
width, width,
minHeight,
round = false, round = false,
}: { }: {
width: number width: number
minHeight?: number
round?: boolean round?: boolean
}) { }) {
return ( return (
<View style={[styles.card, { width, minHeight }]}> <View style={[styles.card, { width }]}>
<Skeleton <Skeleton
style={{ style={{
width, width,
@@ -178,37 +118,35 @@ function CardSkeleton({
borderRadius: round ? width / 2 : radius.md, borderRadius: round ? width / 2 : radius.md,
}} }}
/> />
<TextLine width="80%" fontSize={14} /> <TextLine width="80%" />
{round ? null : <TextLine width="50%" fontSize={12} />} {round ? null : <TextLine width="50%" height={12} />}
</View> </View>
) )
} }
/** Mirrors `MediaGridList`: a `FlatList` on phones, `TabletMediaGrid` on iPad. */ export function MediaGridSkeleton({
function MediaGridContent({ items = 6,
items, contentInset = true,
contentInset, embedded = false,
header,
}: { }: {
items: number items?: number
contentInset: boolean contentInset?: boolean
header?: ReactNode embedded?: boolean
}) { }) {
const tabletLayout = useTabletLayout()
const { cardWidth, columns, onLayout, horizontalPadding, gap, ready } = const { cardWidth, columns, onLayout, horizontalPadding, gap, ready } =
useMediaGridLayout() useMediaGridLayout()
return ( return (
<> <SkeletonContent embedded={embedded}>
{header}
<View <View
onLayout={onLayout} onLayout={onLayout}
accessibilityLabel="Loading"
accessibilityRole="progressbar"
style={[ style={[
styles.grid, styles.grid,
contentInset ? styles.gridInset : styles.gridRowInset,
{ {
paddingHorizontal: horizontalPadding, paddingHorizontal: horizontalPadding,
paddingTop: contentInset ? horizontalPadding : 0, paddingTop: contentInset ? horizontalPadding : 0,
// FlatList applies its content gap after the list header as well.
marginTop: header && !tabletLayout ? gap : 0,
gap, gap,
}, },
]} ]}
@@ -216,47 +154,20 @@ function MediaGridContent({
{Array.from( {Array.from(
{ length: ready ? Math.max(items, columns * 3) : 0 }, { length: ready ? Math.max(items, columns * 3) : 0 },
(_, index) => ( (_, index) => (
<CardSkeleton <CardSkeleton key={index} width={cardWidth} />
key={index}
width={cardWidth}
minHeight={
tabletLayout ? cardWidth + tabletCardTextHeight : undefined
}
/>
) )
)} )}
</View> </View>
</> </SkeletonContent>
)
}
export function MediaGridSkeleton({
items = 6,
contentInset = true,
header,
}: {
items?: number
contentInset?: boolean
/** The loaded list's `ListHeaderComponent`, so it keeps its position. */
header?: ReactNode
}) {
return (
<SkeletonScreen>
<MediaGridContent
items={items}
contentInset={contentInset}
header={header}
/>
</SkeletonScreen>
) )
} }
export function CarouselSkeleton() { export function CarouselSkeleton() {
return ( return (
<View style={styles.carousel}> <View style={styles.carousel}>
<TextLine width={160} fontSize={22} /> <TextLine width={160} height={22} />
<View style={styles.carouselRow}> <View style={styles.carouselRow}>
{Array.from({ length: 8 }, (_, index) => ( {Array.from({ length: 3 }, (_, index) => (
<CardSkeleton key={index} width={carouselCardWidth} /> <CardSkeleton key={index} width={carouselCardWidth} />
))} ))}
</View> </View>
@@ -265,148 +176,140 @@ export function CarouselSkeleton() {
} }
export function HomeSkeleton() { export function HomeSkeleton() {
const headerHeight = useHeaderHeight()
const colors = useThemeColors()
return ( return (
<SkeletonScreen> <ScrollView
<View style={styles.home}> style={{ flex: 1, backgroundColor: colors.background }}
<CarouselSkeleton /> contentContainerStyle={[
<CarouselSkeleton /> styles.home,
</View> { paddingTop: (Platform.OS === "ios" ? headerHeight : 0) + spacing.lg },
</SkeletonScreen> ]}
) contentInsetAdjustmentBehavior="never"
} scrollEnabled={false}
accessibilityLabel="Loading"
function HeroActions({ >
favorite = true, <CarouselSkeleton />
reverse = false, <CarouselSkeleton />
}: { </ScrollView>
favorite?: boolean
reverse?: boolean
}) {
return (
<View style={[styles.actions, reverse && styles.actionsReverse]}>
{favorite ? <Skeleton style={styles.iconAction} /> : null}
<Skeleton style={styles.playButton} />
<Skeleton style={styles.iconAction} />
</View>
) )
} }
/** Album and playlist pages: cover, title, play buttons, then tracks. */ /** Album and playlist pages: cover, title, play buttons, then tracks. */
export function CollectionDetailSkeleton({ export function CollectionDetailSkeleton({
variant, zoomCoverSize,
style, style,
round = false,
backgroundColor, backgroundColor,
onLayout, onLayout,
}: { }: {
variant: "album" | "playlist" | "favorites" | "artist" zoomCoverSize?: number
style?: ComponentProps<typeof Reanimated.View>["style"] style?: ComponentProps<typeof Reanimated.ScrollView>["style"]
round?: boolean
backgroundColor?: string backgroundColor?: string
onLayout?: () => void onLayout?: () => void
}) { }) {
const colors = useThemeColors()
const headerHeight = useHeaderHeight()
const { landscape, coverSize: tabletCoverSize } = useCollectionHeroLayout() const { landscape, coverSize: tabletCoverSize } = useCollectionHeroLayout()
const coverSize =
if (variant === "artist" || variant === "favorites") { !round && landscape
const artist = variant === "artist" ? tabletCoverSize!
const coverSize = artist ? 180 : 200 : (zoomCoverSize ?? (round ? 180 : 210))
const hero = ( const actions = (
<View style={styles.centeredHero}> <View style={styles.actions}>
<Skeleton <Skeleton style={styles.iconAction} />
style={{ <Skeleton style={styles.playButton} />
width: coverSize, <Skeleton style={styles.iconAction} />
height: coverSize, </View>
borderRadius: artist ? coverSize / 2 : radius.lg, )
}} const artwork = (
/> <Skeleton
<TextLine width={200} fontSize={artist ? 28 : 24} /> style={{
<HeroActions favorite={artist} /> width: coverSize,
</View> height: coverSize,
) borderRadius: round ? coverSize / 2 : radius.lg,
return ( }}
<SkeletonScreen />
style={style} )
backgroundColor={backgroundColor}
onLayout={onLayout}
>
{artist ? (
<MediaGridContent items={4} contentInset={false} header={hero} />
) : (
<>
{hero}
<CollectionDivider />
<SongRows rows={8} inset />
</>
)}
</SkeletonScreen>
)
}
const album = variant === "album"
const coverSize = tabletCoverSize ?? (album ? 220 : 200)
return ( return (
<SkeletonScreen <Reanimated.ScrollView
style={style}
backgroundColor={backgroundColor}
onLayout={onLayout} onLayout={onLayout}
style={[
{ flex: 1, backgroundColor: backgroundColor ?? colors.background },
style,
]}
contentContainerStyle={{
paddingTop: Platform.OS === "ios" ? headerHeight : 0,
paddingBottom: contentBottomInset,
}}
contentInsetAdjustmentBehavior="never"
scrollEnabled={false}
accessibilityLabel="Loading"
> >
<CollectionHero {round ? (
artwork={ <View style={styles.artistHero}>
<Link.AppleZoomTarget> {zoomCoverSize ? (
<View collapsable={false}> <Link.AppleZoomTarget>
<Skeleton <View collapsable={false}>{artwork}</View>
style={{ </Link.AppleZoomTarget>
width: coverSize, ) : (
height: coverSize, artwork
borderRadius: radius.lg, )}
}} <TextLine width={200} height={24} />
/> <TextLine width={120} height={16} />
</View> {actions}
</Link.AppleZoomTarget> </View>
}
actions={<HeroActions favorite={album} reverse={landscape} />}
>
<TextLine
width={landscape ? "85%" : 200}
fontSize={landscape ? 22 : 24}
/>
<TextLine
width={landscape ? "60%" : 120}
fontSize={landscape ? 22 : 16}
/>
{album ? (
<TextLine width={landscape ? "40%" : 150} fontSize={14} />
) : null}
</CollectionHero>
<CollectionDivider />
{album ? (
Array.from({ length: 10 }, (_, index) => (
<TrackRowSkeleton key={index} />
))
) : ( ) : (
<SongRows rows={8} inset /> <CollectionHero
artwork={
zoomCoverSize ? (
<Link.AppleZoomTarget>
<View collapsable={false}>{artwork}</View>
</Link.AppleZoomTarget>
) : (
artwork
)
}
actions={actions}
>
<TextLine width={landscape && !round ? "85%" : 200} height={24} />
<TextLine
width={landscape && !round ? "60%" : 120}
height={landscape && !round ? 22 : 16}
/>
<TextLine width={landscape && !round ? "70%" : 150} height={14} />
</CollectionHero>
)} )}
</SkeletonScreen> {round ? (
<MediaGridSkeleton items={4} contentInset={false} embedded />
) : (
<SongListSkeleton rows={8} embedded />
)}
</Reanimated.ScrollView>
) )
} }
export function ArtistListSkeleton({ rows = 12 }: { rows?: number }) { export function ArtistListSkeleton({ rows = 12 }: { rows?: number }) {
const colors = useThemeColors() const colors = useThemeColors()
return ( return (
<SkeletonScreen> <SkeletonContent>
{Array.from({ length: rows }, (_, index) => ( <View accessibilityLabel="Loading" accessibilityRole="progressbar">
<View {Array.from({ length: rows }, (_, index) => (
key={index} <View
style={[styles.artistRow, { borderBottomColor: colors.border }]} key={index}
> style={[styles.artistRow, { borderBottomColor: colors.border }]}
<Skeleton style={styles.artistAvatar} /> >
<TextLine width="50%" fontSize={16} /> <Skeleton style={styles.artistAvatar} />
</View> <TextLine width="50%" height={16} />
))} </View>
</SkeletonScreen> ))}
</View>
</SkeletonContent>
) )
} }
const styles = StyleSheet.create({ const styles = StyleSheet.create({
screen: { flex: 1, overflow: "hidden" },
songRow: { songRow: {
flexDirection: "row", flexDirection: "row",
alignItems: "center", alignItems: "center",
@@ -416,55 +319,22 @@ const styles = StyleSheet.create({
paddingHorizontal: spacing.lg, paddingHorizontal: spacing.lg,
borderBottomWidth: StyleSheet.hairlineWidth, borderBottomWidth: StyleSheet.hairlineWidth,
}, },
insetRow: {
flexDirection: "row",
alignItems: "center",
gap: spacing.md,
paddingLeft: collectionInset,
},
insetSongContent: {
flex: 1,
flexDirection: "row",
alignItems: "center",
alignSelf: "stretch",
minHeight: 64,
paddingVertical: 10,
marginRight: collectionInset,
borderBottomWidth: StyleSheet.hairlineWidth,
},
songArtwork: { width: 44, height: 44, borderRadius: 6 }, songArtwork: { width: 44, height: 44, borderRadius: 6 },
songMeta: { flex: 1 }, songMeta: { flex: 1, gap: 6 },
songSubtitle: { marginTop: 3 },
trackRow: {
flexDirection: "row",
alignItems: "center",
gap: spacing.sm,
paddingLeft: collectionInset,
},
trackNumber: { width: 24, alignItems: "center" },
trackContent: {
flex: 1,
justifyContent: "center",
alignSelf: "stretch",
minHeight: 52,
paddingVertical: 12,
marginRight: collectionInset,
borderBottomWidth: StyleSheet.hairlineWidth,
},
card: { gap: spacing.xs }, card: { gap: spacing.xs },
grid: { flexDirection: "row", flexWrap: "wrap" }, grid: { flexDirection: "row", flexWrap: "wrap", gap: spacing.md },
gridInset: { padding: spacing.lg },
gridRowInset: { paddingHorizontal: spacing.lg },
carousel: { gap: spacing.md, overflow: "hidden" }, carousel: { gap: spacing.md, overflow: "hidden" },
carouselRow: { flexDirection: "row", gap: spacing.md }, carouselRow: { flexDirection: "row", gap: spacing.md },
home: { padding: spacing.lg, gap: spacing.xl }, home: { padding: spacing.lg, gap: spacing.xl },
centeredHero: { alignItems: "center", padding: spacing.lg, gap: spacing.sm }, artistHero: { alignItems: "center", padding: spacing.lg, gap: spacing.sm },
actions: { actions: {
flexDirection: "row", flexDirection: "row",
alignItems: "center", alignItems: "center",
justifyContent: "center",
gap: spacing.sm, gap: spacing.sm,
marginTop: spacing.sm, marginTop: spacing.sm,
}, },
actionsReverse: { flexDirection: "row-reverse" },
iconAction: { width: 44, height: 44, borderRadius: 22 }, iconAction: { width: 44, height: 44, borderRadius: 22 },
playButton: { width: 160, height: 44, borderRadius: 999 }, playButton: { width: 160, height: 44, borderRadius: 999 },
artistRow: { artistRow: {
+41 -41
View File
@@ -31,19 +31,14 @@ import type { SwipeRowGroup } from "@/components/ios-swipe-to-remove-row"
const IS_ANDROID = Platform.OS === "android" const IS_ANDROID = Platform.OS === "android"
const ACTION_WIDTH = 82 const ACTION_WIDTH = 82
/** Width of each action when two share a side. */ const LEADING_ACTION_WIDTH = 72
const PAIRED_ACTION_WIDTH = 72
const SPRING = { duration: 450, dampingRatio: 1 } const SPRING = { duration: 450, dampingRatio: 1 }
function impact() { function impact() {
void Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Medium) void Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Medium)
} }
/** /** A tap competes with the swipe so dragging a moving row never starts playback. */
* A tap competes with the swipe so dragging a moving row never starts playback.
* A full swipe commits the outer action: Add to Queue on the leading side, and
* Remove on the trailing side when `onRemove` is set.
*/
export function SongSwipeRow({ export function SongSwipeRow({
children, children,
style, style,
@@ -63,8 +58,7 @@ export function SongSwipeRow({
onAddToQueue: () => void onAddToQueue: () => void
onRemove?: () => void onRemove?: () => void
}) { }) {
const hasRemove = !!onRemove const hasRemove = IS_ANDROID && !!onRemove
const trailingWidth = hasRemove ? PAIRED_ACTION_WIDTH * 2 : ACTION_WIDTH
const x = useSharedValue(0) const x = useSharedValue(0)
const startX = useSharedValue(0) const startX = useSharedValue(0)
const width = useSharedValue(0) const width = useSharedValue(0)
@@ -95,10 +89,9 @@ export function SongSwipeRow({
(side: number) => { (side: number) => {
close() close()
if (side > 0) onAddToQueue() if (side > 0) onAddToQueue()
// Without Remove, the trailing action is the Download placeholder. // Download is intentionally a placeholder.
else onRemove?.()
}, },
[close, onAddToQueue, onRemove] [close, onAddToQueue]
) )
const tapRow = useCallback(() => { const tapRow = useCallback(() => {
if (open) close() if (open) close()
@@ -124,7 +117,9 @@ export function SongSwipeRow({
const commit = const commit =
Math.abs(x.value) > Math.abs(x.value) >
Math.max( Math.max(
x.value > 0 ? PAIRED_ACTION_WIDTH * 2 : trailingWidth, x.value > 0
? LEADING_ACTION_WIDTH * 2
: ACTION_WIDTH * (hasRemove ? 2 : 1),
width.value * 0.55 width.value * 0.55
) )
if (commit !== committed.value) { if (commit !== committed.value) {
@@ -146,7 +141,10 @@ export function SongSwipeRow({
? side ? side
: 0 : 0
x.value = withSpring( x.value = withSpring(
target * (target > 0 ? PAIRED_ACTION_WIDTH * 2 : trailingWidth), target *
(target > 0
? LEADING_ACTION_WIDTH * 2
: ACTION_WIDTH * (hasRemove ? 2 : 1)),
{ {
...SPRING, ...SPRING,
velocity: event.velocityX, velocity: event.velocityX,
@@ -169,6 +167,7 @@ export function SongSwipeRow({
return Gesture.Exclusive(pan, tap) return Gesture.Exclusive(pan, tap)
}, [ }, [
activate, activate,
hasRemove,
begin, begin,
close, close,
commitProgress, commitProgress,
@@ -176,7 +175,6 @@ export function SongSwipeRow({
settle, settle,
startX, startX,
tapRow, tapRow,
trailingWidth,
width, width,
x, x,
]) ])
@@ -229,28 +227,31 @@ export function SongSwipeRow({
onPlayNext() onPlayNext()
}} }}
/> />
{hasRemove && (
<SwipeAction
side={-1}
secondary
paired
remove
x={x}
height={height}
progress={commitProgress}
open={open === -1}
onPress={() => {
close()
onRemove?.()
}}
/>
)}
<SwipeAction <SwipeAction
side={-1} side={-1}
paired={hasRemove} paired={hasRemove}
remove={hasRemove}
x={x} x={x}
height={height} height={height}
progress={commitProgress} progress={commitProgress}
open={open === -1} open={open === -1}
onPress={() => activate(-1)} onPress={() => activate(-1)}
/> />
{hasRemove && (
<SwipeAction
side={-1}
secondary
paired
x={x}
height={height}
progress={commitProgress}
open={open === -1}
onPress={close}
/>
)}
<GestureDetector gesture={gesture}> <GestureDetector gesture={gesture}>
<Animated.View <Animated.View
accessible accessible
@@ -265,7 +266,10 @@ export function SongSwipeRow({
: []), : []),
]} ]}
onAccessibilityAction={(event) => { onAccessibilityAction={(event) => {
if (event.nativeEvent.actionName === "remove") activate(-1) if (event.nativeEvent.actionName === "remove" && hasRemove) {
close()
onRemove?.()
}
if (event.nativeEvent.actionName === "addToQueue") activate(1) if (event.nativeEvent.actionName === "addToQueue") activate(1)
if (event.nativeEvent.actionName === "playNext") { if (event.nativeEvent.actionName === "playNext") {
close() close()
@@ -333,10 +337,10 @@ function SwipeAction({
const resting = Math.max( const resting = Math.max(
0, 0,
Math.min( Math.min(
revealed - (paired ? 10 : 20), revealed - (side > 0 ? 10 : 20),
interpolate( interpolate(
revealed, revealed,
[24, paired ? PAIRED_ACTION_WIDTH : ACTION_WIDTH, 220], [24, side > 0 ? LEADING_ACTION_WIDTH : ACTION_WIDTH, 220],
[0, 62, 200] [0, 62, 200]
) )
) )
@@ -400,9 +404,7 @@ function SwipeAction({
styles.pill, styles.pill,
{ {
backgroundColor: remove backgroundColor: remove
? IS_ANDROID ? "#d32f2f"
? "#d32f2f"
: "#ff3b30"
: side > 0 : side > 0
? secondary ? secondary
? "#6b5bff" ? "#6b5bff"
@@ -430,13 +432,11 @@ function SwipeAction({
) : ( ) : (
<SymbolView <SymbolView
name={ name={
remove side > 0
? "trash" ? secondary
: side > 0 ? "text.line.first.and.arrowtriangle.forward"
? secondary : "text.line.last.and.arrowtriangle.forward"
? "text.line.first.and.arrowtriangle.forward" : "arrow.down"
: "text.line.last.and.arrowtriangle.forward"
: "arrow.down"
} }
size={22} size={22}
tintColor="white" tintColor="white"
@@ -3,13 +3,13 @@ import { SafeAreaView } from "react-native-safe-area-context"
import { Platform } from "react-native" import { Platform } from "react-native"
import type { ReactNode } from "react" import type { ReactNode } from "react"
import { useTabletBackgroundStyle } from "@/contexts/android-tab-theme" import { useAndroidTabBackgroundStyle } from "@/contexts/android-tab-theme"
import { TabletPlayerLayoutSync } from "@/contexts/tablet-player-layout" import { TabletPlayerLayoutSync } from "@/contexts/tablet-player-layout"
import { TabletSidebar } from "@/components/tablet-sidebar" import { TabletSidebar } from "@/components/tablet-sidebar"
/** Apply sidebar insets natively, before Yoga measures the content pane. */ /** Apply sidebar insets natively, before Yoga measures the content pane. */
export function TabScreenContent({ children }: { children: ReactNode }) { export function TabScreenContent({ children }: { children: ReactNode }) {
const backgroundStyle = useTabletBackgroundStyle() const backgroundStyle = useAndroidTabBackgroundStyle()
if (Platform.OS !== "ios" || !Platform.isPad) return <>{children}</> if (Platform.OS !== "ios" || !Platform.isPad) return <>{children}</>
return ( return (
<Animated.View style={[{ flex: 1 }, backgroundStyle]}> <Animated.View style={[{ flex: 1 }, backgroundStyle]}>
+1 -4
View File
@@ -19,9 +19,6 @@ import { useMediaGridLayout } from "@/hooks/use-media-grid-layout"
import { tabletLayoutTransition } from "@/lib/tablet-motion" import { tabletLayoutTransition } from "@/lib/tablet-motion"
import { useThemeColors } from "@/lib/theme" import { useThemeColors } from "@/lib/theme"
/** Height reserved under each tablet card's artwork for its title and subtitle. */
export const tabletCardTextHeight = 48
type GridProps = { type GridProps = {
content: MediaItem[] content: MediaItem[]
paddingBottom: number paddingBottom: number
@@ -51,7 +48,7 @@ export function TabletMediaGrid({
const [headerHeight, setHeaderHeight] = useState(0) const [headerHeight, setHeaderHeight] = useState(0)
const [scrollY, setScrollY] = useState(0) const [scrollY, setScrollY] = useState(0)
const lastRequestedLength = useRef(-1) const lastRequestedLength = useRef(-1)
const rowHeight = cardWidth + tabletCardTextHeight + gap const rowHeight = cardWidth + 48 + gap
const firstRow = Math.max( const firstRow = Math.max(
0, 0,
Math.floor((scrollY - headerHeight) / rowHeight) - 2 Math.floor((scrollY - headerHeight) / rowHeight) - 2
+61 -16
View File
@@ -1,5 +1,11 @@
import { useEffect, useState, type ComponentProps, type ReactNode } from "react" import { useEffect, useState, type ComponentProps, type ReactNode } from "react"
import { Pressable, StyleSheet, View, useWindowDimensions } from "react-native" import {
Pressable,
StyleSheet,
Text,
View,
useWindowDimensions,
} from "react-native"
import Animated, { import Animated, {
Easing, Easing,
ReduceMotion, ReduceMotion,
@@ -8,7 +14,7 @@ import Animated, {
useSharedValue, useSharedValue,
withTiming, withTiming,
} from "react-native-reanimated" } from "react-native-reanimated"
import { GestureDetector, type Gesture } from "react-native-gesture-handler" import { GestureDetector, Gesture } from "react-native-gesture-handler"
import { useSafeAreaInsets } from "react-native-safe-area-context" import { useSafeAreaInsets } from "react-native-safe-area-context"
import { useRouter } from "expo-router" import { useRouter } from "expo-router"
import { StatusBar } from "expo-status-bar" import { StatusBar } from "expo-status-bar"
@@ -16,12 +22,12 @@ import { StatusBar } from "expo-status-bar"
import { AudioOutputButton } from "@/components/audio-output-button" import { AudioOutputButton } from "@/components/audio-output-button"
import { CoverImage } from "@/components/cover-image" import { CoverImage } from "@/components/cover-image"
import { NowPlayingQueue } from "@/components/now-playing-queue" import { NowPlayingQueue } from "@/components/now-playing-queue"
import { PlayerProgress } from "@/components/player-progress"
import { PlayerSlider } from "@/components/player-slider" import { PlayerSlider } from "@/components/player-slider"
import { PlayerSymbol } from "@/components/player-symbol" import { PlayerSymbol } from "@/components/player-symbol"
import { usePlaybackActions, usePlaybackQueue } from "@/contexts/playback" import { usePlayback } from "@/contexts/playback"
import { useServerConfig } from "@/contexts/server-config" import { useServerConfig } from "@/contexts/server-config"
import { useSystemVolume } from "@/hooks/use-system-volume" import { useSystemVolume } from "@/hooks/use-system-volume"
import { formatDuration, formatRemainingDuration } from "@/lib/format"
import type { NowPlayingColors } from "@/lib/now-playing-colors" import type { NowPlayingColors } from "@/lib/now-playing-colors"
import { albumCoverUrl } from "@/lib/urls" import { albumCoverUrl } from "@/lib/urls"
@@ -36,7 +42,7 @@ export function TabletNowPlaying({
colors, colors,
backgroundStyle, backgroundStyle,
dismissStyle, dismissStyle,
dismissGestures, dismissGesture,
showQueue, showQueue,
toggleQueue, toggleQueue,
metadata, metadata,
@@ -44,10 +50,7 @@ export function TabletNowPlaying({
colors: NowPlayingColors colors: NowPlayingColors
backgroundStyle: ComponentProps<typeof Animated.View>["style"] backgroundStyle: ComponentProps<typeof Animated.View>["style"]
dismissStyle: ComponentProps<typeof Animated.View>["style"] dismissStyle: ComponentProps<typeof Animated.View>["style"]
dismissGestures: { dismissGesture: () => ReturnType<typeof Gesture.Pan>
handle: ReturnType<typeof Gesture.Pan>
artwork: ReturnType<typeof Gesture.Pan>
}
showQueue: boolean showQueue: boolean
toggleQueue: () => void toggleQueue: () => void
metadata: ReactNode metadata: ReactNode
@@ -56,11 +59,22 @@ export function TabletNowPlaying({
const insets = useSafeAreaInsets() const insets = useSafeAreaInsets()
const { width, height } = useWindowDimensions() const { width, height } = useWindowDimensions()
const { config } = useServerConfig() const { config } = useServerConfig()
const { currentSong, isPlaying, shuffleEnabled, repeatEnabled } = const {
usePlaybackQueue() currentSong,
const { setIsPlaying, skipNext, skipPrevious, toggleShuffle, cycleRepeat } = currentTime,
usePlaybackActions() duration,
isPlaying,
setIsPlaying,
seekTo,
skipNext,
skipPrevious,
shuffleEnabled,
repeatEnabled,
toggleShuffle,
cycleRepeat,
} = usePlayback()
const { volume, setVolume, available: volumeAvailable } = useSystemVolume() const { volume, setVolume, available: volumeAvailable } = useSystemVolume()
const [scrubTime, setScrubTime] = useState<number | null>(null)
const [queueHeight, setQueueHeight] = useState(0) const [queueHeight, setQueueHeight] = useState(0)
const wideLayout = width >= 700 const wideLayout = width >= 700
const sideBySide = showQueue && wideLayout const sideBySide = showQueue && wideLayout
@@ -99,6 +113,7 @@ export function TabletNowPlaying({
opacity: interpolate(progress.value, [0, 0.15, 1], [0, 0, 1]), opacity: interpolate(progress.value, [0, 0.15, 1], [0, 0, 1]),
transform: [{ translateX: (1 - progress.value) * 48 }], transform: [{ translateX: (1 - progress.value) * 48 }],
})) }))
const time = scrubTime ?? currentTime
if (!currentSong || !config) return null if (!currentSong || !config) return null
const control = ( const control = (
label: string, label: string,
@@ -135,7 +150,7 @@ export function TabletNowPlaying({
return ( return (
<Animated.View style={[styles.root, backgroundStyle, dismissStyle]}> <Animated.View style={[styles.root, backgroundStyle, dismissStyle]}>
<StatusBar style={colors.isDark ? "light" : "dark"} /> <StatusBar style={colors.isDark ? "light" : "dark"} />
<GestureDetector gesture={dismissGestures.handle}> <GestureDetector gesture={dismissGesture()}>
<Pressable <Pressable
onPress={() => router.back()} onPress={() => router.back()}
accessibilityRole="button" accessibilityRole="button"
@@ -149,7 +164,7 @@ export function TabletNowPlaying({
</GestureDetector> </GestureDetector>
<View style={styles.body}> <View style={styles.body}>
<Animated.View style={[styles.main, mainMotion]}> <Animated.View style={[styles.main, mainMotion]}>
<GestureDetector gesture={dismissGestures.artwork}> <GestureDetector gesture={dismissGesture()}>
<View style={styles.artworkArea}> <View style={styles.artworkArea}>
<Animated.View style={artworkMotion}> <Animated.View style={artworkMotion}>
<CoverImage <CoverImage
@@ -162,7 +177,31 @@ export function TabletNowPlaying({
</GestureDetector> </GestureDetector>
<Animated.View style={[styles.controls, controlsMotion]}> <Animated.View style={[styles.controls, controlsMotion]}>
<View style={styles.meta}>{metadata}</View> <View style={styles.meta}>{metadata}</View>
<PlayerProgress colors={colors} /> <PlayerSlider
accessibilityLabel="Playback position"
value={time}
maximumValue={duration}
fillColor={colors.sliderFill}
activeFillColor={colors.foreground}
trackColor={colors.sliderTrack}
onValueChange={setScrubTime}
onSlidingComplete={(value) => {
void seekTo(value)
setScrubTime(null)
}}
/>
<View style={styles.times}>
<Text
style={[styles.time, { color: colors.secondaryForeground }]}
>
{formatDuration(time)}
</Text>
<Text
style={[styles.time, { color: colors.secondaryForeground }]}
>
{formatRemainingDuration(time, duration).replace("-", "−")}
</Text>
</View>
<View style={styles.transport}> <View style={styles.transport}>
{control( {control(
"Shuffle", "Shuffle",
@@ -337,6 +376,12 @@ const styles = StyleSheet.create({
}, },
controls: { width: "100%", maxWidth: 456, paddingHorizontal: 0 }, controls: { width: "100%", maxWidth: 456, paddingHorizontal: 0 },
meta: { height: 48 }, meta: { height: 48 },
times: {
flexDirection: "row",
justifyContent: "space-between",
marginTop: -4,
},
time: { fontSize: 12, fontVariant: ["tabular-nums"] },
transport: { transport: {
flexDirection: "row", flexDirection: "row",
alignItems: "center", alignItems: "center",
+1 -3
View File
@@ -4,7 +4,6 @@ import { useIsFocused } from "expo-router"
import { Platform, type ViewProps } from "react-native" import { Platform, type ViewProps } from "react-native"
import { useCachedQuery } from "@/hooks/use-cached-query" import { useCachedQuery } from "@/hooks/use-cached-query"
import { useProfileImageUrl } from "@/hooks/use-profile-image-url"
import { initialsFromName } from "@/lib/format" import { initialsFromName } from "@/lib/format"
import { api } from "@otunes/convex/_generated/api" import { api } from "@otunes/convex/_generated/api"
@@ -23,7 +22,6 @@ const NativeSidebar =
export function TabletSidebar() { export function TabletSidebar() {
const user = useCachedQuery(api.auth.currentUser) const user = useCachedQuery(api.auth.currentUser)
const imageUrl = useProfileImageUrl(user?.image)
const openSettings = useOpenSettings() const openSettings = useOpenSettings()
const active = useIsFocused() const active = useIsFocused()
@@ -33,7 +31,7 @@ export function TabletSidebar() {
style={{ position: "absolute", width: 0, height: 0 }} style={{ position: "absolute", width: 0, height: 0 }}
accountName={user?.name ?? "Account"} accountName={user?.name ?? "Account"}
initials={initialsFromName(user?.name ?? "Me")} initials={initialsFromName(user?.name ?? "Me")}
imageURL={imageUrl} imageURL={user?.image}
active={active} active={active}
onProfilePress={openSettings} onProfilePress={openSettings}
/> />
+15 -2
View File
@@ -1,3 +1,4 @@
import { PaletteText, PaletteIcon } from "@/components/palette-text"
import { import {
ActivityIndicator, ActivityIndicator,
Platform, Platform,
@@ -73,8 +74,20 @@ export function Button({
<ActivityIndicator color={textColor} /> <ActivityIndicator color={textColor} />
) : ( ) : (
<View style={styles.buttonContent}> <View style={styles.buttonContent}>
{icon ? <Ionicons name={icon} size={18} color={textColor} /> : null} {icon ? (
<Text style={[styles.buttonText, { color: textColor }]}>{title}</Text> <PaletteIcon
tone={tint ? "accentForeground" : undefined}
name={icon}
size={18}
color={textColor}
/>
) : null}
<PaletteText
tone={tint ? "accentForeground" : undefined}
style={[styles.buttonText, { color: textColor }]}
>
{title}
</PaletteText>
</View> </View>
)} )}
</Pressable> </Pressable>
+129 -38
View File
@@ -14,10 +14,14 @@ import {
useState, useState,
type PropsWithChildren, type PropsWithChildren,
} from "react" } from "react"
import { Platform } from "react-native" import { Platform, StyleSheet, type HostInstance } from "react-native"
import { import Reanimated, {
useSharedValue, useSharedValue,
useAnimatedStyle, useAnimatedStyle,
useAnimatedReaction,
useAnimatedRef,
setNativeProps,
processColor,
withTiming, withTiming,
type SharedValue, type SharedValue,
} from "react-native-reanimated" } from "react-native-reanimated"
@@ -25,17 +29,19 @@ import {
import { themeCoverPalette, type CoverPalette } from "@/lib/cover-palette" import { themeCoverPalette, type CoverPalette } from "@/lib/cover-palette"
import { useIsDark, useThemeColors } from "@/lib/theme" import { useIsDark, useThemeColors } from "@/lib/theme"
export type PaletteColor = Exclude<keyof CoverPalette, "isDark">
type PaletteColors = Pick<CoverPalette, PaletteColor> & {
selectedColor: string
}
type TabTheme = { type TabTheme = {
palette: CoverPalette palette: CoverPalette
colors: SharedValue<PaletteColors>
hasArtworkPalette: boolean hasArtworkPalette: boolean
tabletBackground: SharedValue<string>
setPalette: (palette: CoverPalette | null, owner: string) => void setPalette: (palette: CoverPalette | null, owner: string) => void
} }
const AndroidTabTheme = createContext<TabTheme | null>(null) const AndroidTabTheme = createContext<TabTheme | null>(null)
const isTablet = Platform.OS === "ios" && Platform.isPad
const sharesPalette = Platform.OS === "android" || isTablet
function useDefaultPalette() { function useDefaultPalette() {
const theme = useThemeColors() const theme = useThemeColors()
const isDark = useIsDark() const isDark = useIsDark()
@@ -54,37 +60,52 @@ export function ScreenPaletteProvider({ children }: PropsWithChildren) {
palette.foreground !== defaultPalette.foreground || palette.foreground !== defaultPalette.foreground ||
palette.secondaryForeground !== defaultPalette.secondaryForeground || palette.secondaryForeground !== defaultPalette.secondaryForeground ||
palette.accent !== defaultPalette.accent palette.accent !== defaultPalette.accent
const tabletBackground = useSharedValue(defaultPalette.background) const { isDark: _defaultIsDark, ...defaultColors } = defaultPalette
const animatedColors = useSharedValue<PaletteColors>({
...defaultColors,
selectedColor: defaultPalette.accentText,
})
useLayoutEffect(() => { useLayoutEffect(() => {
if (!isTablet) return const { isDark: _isDark, ...colors } = palette
tabletBackground.value = withTiming(palette.background, { animatedColors.value = withTiming(
duration: TABLET_FADE_MS, {
}) ...colors,
}, [tabletBackground, palette.background]) selectedColor: hasArtwork
? palette.foreground
: defaultPalette.accentText,
},
{ duration: PALETTE_FADE_MS }
)
}, [animatedColors, palette, defaultPalette, hasArtwork])
const paletteOwner = useRef<string | null>(null) const paletteOwner = useRef<string | null>(null)
const setPalette = useCallback( const setPalette = useCallback(
(palette: CoverPalette | null, owner: string) => { (palette: CoverPalette | null, owner: string) => {
if (!palette && paletteOwner.current !== owner) return if (!palette && paletteOwner.current !== owner) return
paletteOwner.current = palette ? owner : null paletteOwner.current = palette ? owner : null
if (isTablet) { // Start on the UI thread immediately. React may defer commits while
// React may defer commits while the iPad stack is animating. // the native stack is animating, including transitionStart state updates.
tabletBackground.value = withTiming( const target = palette ?? defaultPalette
(palette ?? defaultPalette).background, const { isDark: _isDark, ...colors } = target
{ duration: TABLET_FADE_MS } animatedColors.value = withTiming(
) {
} ...colors,
selectedColor: palette ? target.foreground : target.accentText,
},
{ duration: PALETTE_FADE_MS }
)
setScreen(palette ? { palette, owner } : null) setScreen(palette ? { palette, owner } : null)
}, },
[tabletBackground, defaultPalette] [animatedColors, defaultPalette]
) )
const artworkPalette = hasArtwork ? palette : null
const value = useMemo( const value = useMemo(
() => ({ () => ({
palette: hasArtwork ? palette : defaultPalette, palette: artworkPalette ?? defaultPalette,
hasArtworkPalette: hasArtwork, colors: animatedColors,
tabletBackground, hasArtworkPalette: artworkPalette !== null,
setPalette, setPalette,
}), }),
[defaultPalette, hasArtwork, palette, setPalette, tabletBackground] [defaultPalette, artworkPalette, setPalette, animatedColors]
) )
return ( return (
<AndroidTabTheme.Provider value={value}> <AndroidTabTheme.Provider value={value}>
@@ -93,6 +114,50 @@ export function ScreenPaletteProvider({ children }: PropsWithChildren) {
) )
} }
/**
* NativeTabs forwards raw screen props to its Fabric screen. Bind that host
* directly so appearance updates stay on the UI thread with the page colors.
*/
export function useAndroidNativeTabColors() {
const colors = useContext(AndroidTabTheme)?.colors
const ref = useAnimatedRef<HostInstance>()
const mounted = useSharedValue(false)
const attach = useCallback(
(host: HostInstance | null) => {
if (host) ref(host)
mounted.value = host !== null
},
[ref, mounted]
)
useAnimatedReaction(
() => ({ colors: colors?.value, mounted: mounted.value }),
({ colors: palette, mounted: ready }) => {
if (Platform.OS !== "android" || !ready || !palette) return
const normal = processColor(palette.secondaryForeground)
const selected = processColor(palette.selectedColor)
setNativeProps(ref, {
standardAppearance: {
tabBarBackgroundColor: processColor("transparent"),
tabBarItemRippleColor: selected,
tabBarItemActiveIndicatorEnabled: false,
tabBarItemTitleSmallLabelFontSize: 10,
tabBarItemTitleLargeLabelFontSize: 10,
normal: {
tabBarItemTitleFontColor: normal,
tabBarItemIconColor: normal,
},
selected: {
tabBarItemTitleFontColor: selected,
tabBarItemIconColor: selected,
},
},
})
}
)
return { ref: attach, style: { backgroundColor: "transparent" } }
}
export function useAndroidTabPalette() { export function useAndroidTabPalette() {
const theme = useContext(AndroidTabTheme) const theme = useContext(AndroidTabTheme)
const defaultPalette = useDefaultPalette() const defaultPalette = useDefaultPalette()
@@ -103,29 +168,53 @@ export function useAndroidTabHasArtworkPalette() {
return useContext(AndroidTabTheme)?.hasArtworkPalette ?? false return useContext(AndroidTabTheme)?.hasArtworkPalette ?? false
} }
/** iPad fades the sidebar and content pane together; other layouts skip it. */ export function useAndroidTabBackgroundStyle() {
export function useTabletBackgroundStyle() { const theme = useContext(AndroidTabTheme)
const background = useContext(AndroidTabTheme)?.tabletBackground const fallback = useDefaultPalette().background
const colors = theme?.colors
return useAnimatedStyle(() => return useAnimatedStyle(() =>
isTablet && background ? { backgroundColor: background.value } : {} Platform.OS === "android" || (Platform.OS === "ios" && Platform.isPad)
? { backgroundColor: colors?.value.background ?? fallback }
: {}
) )
} }
const TABLET_FADE_MS = 400 /** Color tokens share the background's UI-thread timing. */
export function useAnimatedPaletteColor(tone: PaletteColor | undefined) {
const colors = useContext(AndroidTabTheme)?.colors
return useAnimatedStyle(() =>
Platform.OS === "android" && tone && colors
? { color: colors.value[tone] }
: {}
)
}
/** /** Native headers draw this same UI-thread background as the page and bars. */
* Artwork screens always paint their own palette so it slides with the page. function AndroidArtworkBackground() {
* Shared chrome (tab bar, mini player) switches when the transition starts. const style = useAndroidTabBackgroundStyle()
*/ return <Reanimated.View style={[StyleSheet.absoluteFill, style]} />
}
export function renderAndroidArtworkBackground() {
return <AndroidArtworkBackground />
}
const PALETTE_FADE_MS = 400
/** The focused artwork screen selects the shared background for page and bars. */
export function useScreenPalette(palette: CoverPalette) { export function useScreenPalette(palette: CoverPalette) {
const isFocused = useIsFocused() const isFocused = useIsFocused()
const isTablet = Platform.OS === "ios" && Platform.isPad
const sharesPalette =
Platform.OS === "android" || (Platform.OS === "ios" && Platform.isPad)
const owner = useRoute().key const owner = useRoute().key
const navigation = const navigation =
useNavigation<NativeStackNavigationProp<Record<string, undefined>>>() useNavigation<NativeStackNavigationProp<Record<string, undefined>>>()
const [laidOut, setLaidOut] = useState(false) const [laidOut, setLaidOut] = useState(false)
const [closing, setClosing] = useState(false) const [closing, setClosing] = useState(false)
const onLayout = useCallback(() => setLaidOut(true), []) const onLayout = useCallback(() => setLaidOut(true), [])
const setPalette = useContext(AndroidTabTheme)?.setPalette const theme = useContext(AndroidTabTheme)
const setPalette = theme?.setPalette
useLayoutEffect(() => { useLayoutEffect(() => {
if (!sharesPalette) return if (!sharesPalette) return
const start = navigation.addListener("transitionStart", ({ data }) => { const start = navigation.addListener("transitionStart", ({ data }) => {
@@ -141,18 +230,20 @@ export function useScreenPalette(palette: CoverPalette) {
start() start()
cancel() cancel()
} }
}, [navigation, setPalette, owner, palette]) }, [navigation, sharesPalette, setPalette, owner, palette])
const defaultPalette = useDefaultPalette()
const ready = laidOut || isTablet const ready = laidOut || isTablet
const backgroundStyle = useTabletBackgroundStyle() const target = isFocused && ready && !closing ? palette : defaultPalette
const backgroundStyle = useAndroidTabBackgroundStyle()
useLayoutEffect(() => { useLayoutEffect(() => {
if (!sharesPalette || !setPalette || !isFocused || !ready || closing) return if (!sharesPalette || !setPalette || !isFocused || !ready || closing) return
setPalette(palette, owner) setPalette(palette, owner)
return () => setPalette(null, owner) return () => setPalette(null, owner)
}, [closing, ready, isFocused, owner, palette, setPalette]) }, [closing, ready, isFocused, owner, palette, setPalette, sharesPalette])
return { return {
palette, palette: Platform.OS === "android" ? target : palette,
backgroundStyle, backgroundStyle,
onLayout: sharesPalette ? onLayout : undefined, onLayout: sharesPalette ? onLayout : undefined,
} }
+142 -89
View File
@@ -12,28 +12,22 @@ import {
import { useCachedQuery } from "@/hooks/use-cached-query" import { useCachedQuery } from "@/hooks/use-cached-query"
import { api } from "@otunes/convex/_generated/api" import { api } from "@otunes/convex/_generated/api"
import { favoriteOptimisticUpdates } from "@otunes/convex/client/favorites"
import type { Id } from "@otunes/convex/_generated/dataModel" import type { Id } from "@otunes/convex/_generated/dataModel"
import { showError } from "@/lib/toast" import { showError } from "@/lib/toast"
/** /**
* `useMutation(...).withOptimisticUpdate(...)` with a stable identity. Pass a * `useMutation(...).withOptimisticUpdate(...)` with a stable identity. The
* module-level update so it does not change between renders. * update is captured on first render, so it must not close over render state.
*/ */
function useOptimisticMutation<Mutation extends FunctionReference<"mutation">>( function useOptimisticMutation<Mutation extends FunctionReference<"mutation">>(
mutation: Mutation, mutation: Mutation,
optimisticUpdate: OptimisticUpdate<FunctionArgs<Mutation>> optimisticUpdate: OptimisticUpdate<FunctionArgs<Mutation>>
): ReactMutation<Mutation> { ): ReactMutation<Mutation> {
const base = useMutation(mutation) const base = useMutation(mutation)
return useMemo( const updateRef = useRef(optimisticUpdate)
() => base.withOptimisticUpdate(optimisticUpdate), return useMemo(() => base.withOptimisticUpdate(updateRef.current), [base])
[base, optimisticUpdate]
)
} }
type FavoriteTables = { song: "songs"; album: "albums"; artist: "artists" }
export type FavoriteKind = keyof FavoriteTables
type FavoritesContextValue = { type FavoritesContextValue = {
isSongFavorite: (songId: string) => boolean isSongFavorite: (songId: string) => boolean
isAlbumFavorite: (albumId: string) => boolean isAlbumFavorite: (albumId: string) => boolean
@@ -42,20 +36,6 @@ type FavoritesContextValue = {
toggleAlbumFavorite: (albumId: Id<"albums">) => Promise<void> toggleAlbumFavorite: (albumId: Id<"albums">) => Promise<void>
toggleArtistFavorite: (artistId: Id<"artists">) => Promise<void> toggleArtistFavorite: (artistId: Id<"artists">) => Promise<void>
favoriteSongs: (songIds: Id<"songs">[]) => Promise<void> favoriteSongs: (songIds: Id<"songs">[]) => Promise<void>
/** Idempotent; throws so callers like Siri can report failures. */
setFavorite: <Kind extends FavoriteKind>(
kind: Kind,
id: Id<FavoriteTables[Kind]>,
favorite: boolean
) => Promise<void>
/** Throws so callers like Siri can report failures. */
addFavoriteSongs: (songIds: Id<"songs">[]) => Promise<void>
}
function showFavoritesError(error: unknown) {
showError(
error instanceof Error ? error.message : "Failed to update favorites"
)
} }
const FavoritesContext = createContext<FavoritesContextValue | null>(null) const FavoritesContext = createContext<FavoritesContextValue | null>(null)
@@ -72,31 +52,110 @@ export function FavoritesProvider({ children }: { children: ReactNode }) {
const favorites = useCachedQuery(api.favorites.getUserFavorites) const favorites = useCachedQuery(api.favorites.getUserFavorites)
const favoriteSong = useOptimisticMutation( const favoriteSong = useOptimisticMutation(
api.favorites.favoriteSong, api.favorites.favoriteSong,
favoriteOptimisticUpdates.favoriteSong (store, { songId }) => {
const current = store.getQuery(api.favorites.getUserFavorites, {})
if (!current || current.favoriteSongs.includes(songId)) return
store.setQuery(
api.favorites.getUserFavorites,
{},
{
...current,
favoriteSongs: [...current.favoriteSongs, songId],
}
)
}
) )
const unfavoriteSong = useOptimisticMutation( const unfavoriteSong = useOptimisticMutation(
api.favorites.unfavoriteSong, api.favorites.unfavoriteSong,
favoriteOptimisticUpdates.unfavoriteSong (store, { songId }) => {
const current = store.getQuery(api.favorites.getUserFavorites, {})
if (!current) return
store.setQuery(
api.favorites.getUserFavorites,
{},
{
...current,
favoriteSongs: current.favoriteSongs.filter((id) => id !== songId),
}
)
}
) )
const favoriteAlbum = useOptimisticMutation( const favoriteAlbum = useOptimisticMutation(
api.favorites.favoriteAlbum, api.favorites.favoriteAlbum,
favoriteOptimisticUpdates.favoriteAlbum (store, { albumId }) => {
const current = store.getQuery(api.favorites.getUserFavorites, {})
if (!current || current.favoriteAlbums.includes(albumId)) return
store.setQuery(
api.favorites.getUserFavorites,
{},
{
...current,
favoriteAlbums: [...current.favoriteAlbums, albumId],
}
)
}
) )
const unfavoriteAlbum = useOptimisticMutation( const unfavoriteAlbum = useOptimisticMutation(
api.favorites.unfavoriteAlbum, api.favorites.unfavoriteAlbum,
favoriteOptimisticUpdates.unfavoriteAlbum (store, { albumId }) => {
const current = store.getQuery(api.favorites.getUserFavorites, {})
if (!current) return
store.setQuery(
api.favorites.getUserFavorites,
{},
{
...current,
favoriteAlbums: current.favoriteAlbums.filter((id) => id !== albumId),
}
)
}
) )
const favoriteArtist = useOptimisticMutation( const favoriteArtist = useOptimisticMutation(
api.favorites.favoriteArtist, api.favorites.favoriteArtist,
favoriteOptimisticUpdates.favoriteArtist (store, { artistId }) => {
const current = store.getQuery(api.favorites.getUserFavorites, {})
if (!current || current.favoriteArtists.includes(artistId)) return
store.setQuery(
api.favorites.getUserFavorites,
{},
{
...current,
favoriteArtists: [...current.favoriteArtists, artistId],
}
)
}
) )
const unfavoriteArtist = useOptimisticMutation( const unfavoriteArtist = useOptimisticMutation(
api.favorites.unfavoriteArtist, api.favorites.unfavoriteArtist,
favoriteOptimisticUpdates.unfavoriteArtist (store, { artistId }) => {
const current = store.getQuery(api.favorites.getUserFavorites, {})
if (!current) return
store.setQuery(
api.favorites.getUserFavorites,
{},
{
...current,
favoriteArtists: current.favoriteArtists.filter(
(id) => id !== artistId
),
}
)
}
) )
const favoriteSongsMutation = useOptimisticMutation( const favoriteSongsMutation = useOptimisticMutation(
api.favorites.favoriteSongs, api.favorites.favoriteSongs,
favoriteOptimisticUpdates.favoriteSongs (store, { songIds }) => {
const current = store.getQuery(api.favorites.getUserFavorites, {})
if (!current) return
store.setQuery(
api.favorites.getUserFavorites,
{},
{
...current,
favoriteSongs: [...new Set([...current.favoriteSongs, ...songIds])],
}
)
}
) )
const songIds = useMemo( const songIds = useMemo(
@@ -114,72 +173,70 @@ export function FavoritesProvider({ children }: { children: ReactNode }) {
const idsRef = useRef({ songIds, albumIds, artistIds }) const idsRef = useRef({ songIds, albumIds, artistIds })
idsRef.current = { songIds, albumIds, artistIds } idsRef.current = { songIds, albumIds, artistIds }
const setFavorite = useCallback( const toggleSongFavorite = useCallback(
async <Kind extends FavoriteKind>( async (songId: Id<"songs">) => {
kind: Kind, try {
id: Id<FavoriteTables[Kind]>, if (idsRef.current.songIds.has(songId)) {
favorite: boolean await unfavoriteSong({ songId })
) => { } else {
if (kind === "song") { await favoriteSong({ songId })
const songId = id as Id<"songs"> }
await (favorite ? favoriteSong : unfavoriteSong)({ songId }) } catch (error) {
} else if (kind === "album") { showError(
const albumId = id as Id<"albums"> error instanceof Error ? error.message : "Failed to update favorites"
await (favorite ? favoriteAlbum : unfavoriteAlbum)({ albumId }) )
} else {
const artistId = id as Id<"artists">
await (favorite ? favoriteArtist : unfavoriteArtist)({ artistId })
} }
}, },
[ [favoriteSong, unfavoriteSong]
favoriteSong,
unfavoriteSong,
favoriteAlbum,
unfavoriteAlbum,
favoriteArtist,
unfavoriteArtist,
]
)
const toggleSongFavorite = useCallback(
(songId: Id<"songs">) =>
setFavorite("song", songId, !idsRef.current.songIds.has(songId)).catch(
showFavoritesError
),
[setFavorite]
) )
const toggleAlbumFavorite = useCallback( const toggleAlbumFavorite = useCallback(
(albumId: Id<"albums">) => async (albumId: Id<"albums">) => {
setFavorite( try {
"album", if (idsRef.current.albumIds.has(albumId)) {
albumId, await unfavoriteAlbum({ albumId })
!idsRef.current.albumIds.has(albumId) } else {
).catch(showFavoritesError), await favoriteAlbum({ albumId })
[setFavorite] }
} catch (error) {
showError(
error instanceof Error ? error.message : "Failed to update favorites"
)
}
},
[favoriteAlbum, unfavoriteAlbum]
) )
const toggleArtistFavorite = useCallback( const toggleArtistFavorite = useCallback(
(artistId: Id<"artists">) => async (artistId: Id<"artists">) => {
setFavorite( try {
"artist", if (idsRef.current.artistIds.has(artistId)) {
artistId, await unfavoriteArtist({ artistId })
!idsRef.current.artistIds.has(artistId) } else {
).catch(showFavoritesError), await favoriteArtist({ artistId })
[setFavorite] }
) } catch (error) {
showError(
const addFavoriteSongs = useCallback( error instanceof Error ? error.message : "Failed to update favorites"
async (ids: Id<"songs">[]) => { )
const unique = [...new Set(ids)] }
if (unique.length > 0) await favoriteSongsMutation({ songIds: unique })
}, },
[favoriteSongsMutation] [favoriteArtist, unfavoriteArtist]
) )
const favoriteSongs = useCallback( const favoriteSongs = useCallback(
(ids: Id<"songs">[]) => addFavoriteSongs(ids).catch(showFavoritesError), async (ids: Id<"songs">[]) => {
[addFavoriteSongs] const unique = [...new Set(ids)]
if (unique.length === 0) return
try {
await favoriteSongsMutation({ songIds: unique })
} catch (error) {
showError(
error instanceof Error ? error.message : "Failed to update favorites"
)
}
},
[favoriteSongsMutation]
) )
const value = useMemo( const value = useMemo(
@@ -191,8 +248,6 @@ export function FavoritesProvider({ children }: { children: ReactNode }) {
toggleAlbumFavorite, toggleAlbumFavorite,
toggleArtistFavorite, toggleArtistFavorite,
favoriteSongs, favoriteSongs,
setFavorite,
addFavoriteSongs,
}), }),
[ [
songIds, songIds,
@@ -202,8 +257,6 @@ export function FavoritesProvider({ children }: { children: ReactNode }) {
toggleAlbumFavorite, toggleAlbumFavorite,
toggleArtistFavorite, toggleArtistFavorite,
favoriteSongs, favoriteSongs,
setFavorite,
addFavoriteSongs,
] ]
) )
+15 -1
View File
@@ -1,5 +1,4 @@
import { useAuthToken } from "@convex-dev/auth/react" import { useAuthToken } from "@convex-dev/auth/react"
import { userIdFromToken } from "@otunes/convex/client/auth-token"
import { createContext, useContext, useMemo, type ReactNode } from "react" import { createContext, useContext, useMemo, type ReactNode } from "react"
import { loadPersistentCache } from "@/lib/persistent-cache" import { loadPersistentCache } from "@/lib/persistent-cache"
@@ -10,6 +9,21 @@ const CacheScopeContext = createContext(ANONYMOUS_CACHE_SCOPE)
void loadPersistentCache() void loadPersistentCache()
function userIdFromToken(token: string | null) {
const payload = token?.split(".")[1]
if (!payload) {
return null
}
try {
const json = atob(payload.replace(/-/g, "+").replace(/_/g, "/"))
const subject = (JSON.parse(json) as { sub?: unknown }).sub
return typeof subject === "string" ? (subject.split("|")[0] ?? null) : null
} catch {
return null
}
}
/** Namespaces persisted client data by server and signed-in user. */ /** Namespaces persisted client data by server and signed-in user. */
export function PersistentCacheProvider({ export function PersistentCacheProvider({
serverUrl, serverUrl,
+43 -35
View File
@@ -97,8 +97,6 @@ type PlaybackContextValue = {
type PlaybackActionsValue = Pick< type PlaybackActionsValue = Pick<
PlaybackContextValue, PlaybackContextValue,
| "seekTo"
| "waitForPlaybackReady"
| "setIsPlaying" | "setIsPlaying"
| "playInOrder" | "playInOrder"
| "playShuffled" | "playShuffled"
@@ -138,11 +136,6 @@ type PlaybackQueueValue = Pick<
| "repeatEnabled" | "repeatEnabled"
> >
type PlaybackProgressValue = Pick<
PlaybackContextValue,
"currentTime" | "duration"
>
type CollectionPlayers = Pick< type CollectionPlayers = Pick<
PlaybackActionsValue, PlaybackActionsValue,
| "playAlbum" | "playAlbum"
@@ -164,17 +157,14 @@ type CollectionPlay = {
recorded: RecordedPlay recorded: RecordedPlay
} }
const PlaybackContext = createContext<PlaybackContextValue | null>(null)
const PlaybackActionsContext = createContext<PlaybackActionsValue | null>(null) const PlaybackActionsContext = createContext<PlaybackActionsValue | null>(null)
const PlaybackQueueContext = createContext<PlaybackQueueValue | null>(null) const PlaybackQueueContext = createContext<PlaybackQueueValue | null>(null)
const PlaybackProgressContext = createContext<PlaybackProgressValue | null>(
null
)
/** Ticks while audio plays. Keep consumers small (slider and time labels). */ export function usePlayback() {
export function usePlaybackProgress() { const context = useContext(PlaybackContext)
const context = useContext(PlaybackProgressContext)
if (!context) { if (!context) {
throw new Error("usePlaybackProgress must be used within PlaybackProvider") throw new Error("usePlayback must be used within PlaybackProvider")
} }
return context return context
} }
@@ -213,19 +203,17 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
useEffect(() => { useEffect(() => {
if (!isSignedIn) return if (!isSignedIn) return
store.setTransport({ store.setTransport((state) =>
sync: (state) => syncPlaybackStateMutation({
syncPlaybackStateMutation({ songQueue: state.queue,
songQueue: state.queue, queueHistory: state.history,
queueHistory: state.history, shuffleEnabled: state.shuffleEnabled,
shuffleEnabled: state.shuffleEnabled, repeatEnabled: state.repeatEnabled,
repeatEnabled: state.repeatEnabled, currentSongProgress: state.progressSeconds,
currentSongProgress: state.progressSeconds, })
}), )
loadProgress: () => convex.query(api.playback.getSongProgress, {}),
})
return () => store.setTransport(null) return () => store.setTransport(null)
}, [store, isSignedIn, syncPlaybackStateMutation, convex]) }, [store, isSignedIn, syncPlaybackStateMutation])
useEffect(() => { useEffect(() => {
if (!serverPlayback) return if (!serverPlayback) return
@@ -641,8 +629,6 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
const actionsValue = useMemo<PlaybackActionsValue>( const actionsValue = useMemo<PlaybackActionsValue>(
() => ({ () => ({
seekTo,
waitForPlaybackReady,
...collectionPlayers, ...collectionPlayers,
setIsPlaying, setIsPlaying,
playInOrder, playInOrder,
@@ -683,14 +669,12 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
playInOrder, playInOrder,
playShuffled, playShuffled,
reorderQueue, reorderQueue,
seekTo,
setIsPlaying, setIsPlaying,
skipNext, skipNext,
skipPrevious, skipPrevious,
skipToHistoryIndex, skipToHistoryIndex,
skipToQueueIndex, skipToQueueIndex,
toggleShuffle, toggleShuffle,
waitForPlaybackReady,
] ]
) )
@@ -715,17 +699,41 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
] ]
) )
const progressValue = useMemo<PlaybackProgressValue>( const value = useMemo<PlaybackContextValue>(
() => ({ currentTime, duration }), () => ({
[currentTime, duration] ...actionsValue,
waitForPlaybackReady,
queueSongIds,
queueHistorySongIds,
currentSong,
shuffleEnabled: playback.shuffleEnabled,
repeatEnabled,
isPlaying: isPlaybackActive,
currentTime,
duration,
seekTo,
}),
[
actionsValue,
waitForPlaybackReady,
currentSong,
currentTime,
duration,
isPlaybackActive,
playback.shuffleEnabled,
queueHistorySongIds,
queueSongIds,
repeatEnabled,
seekTo,
]
) )
return ( return (
<PlaybackActionsContext.Provider value={actionsValue}> <PlaybackActionsContext.Provider value={actionsValue}>
<PlaybackQueueContext.Provider value={queueValue}> <PlaybackQueueContext.Provider value={queueValue}>
<PlaybackProgressContext.Provider value={progressValue}> <PlaybackContext.Provider value={value}>
{children} {children}
</PlaybackProgressContext.Provider> </PlaybackContext.Provider>
</PlaybackQueueContext.Provider> </PlaybackQueueContext.Provider>
</PlaybackActionsContext.Provider> </PlaybackActionsContext.Provider>
) )
+1 -7
View File
@@ -134,13 +134,7 @@ export function createCoverPaletteSource<Swatches>({
} }
} }
/** Forget in-memory swatches so covers are re-extracted. */ return { prefetch, usePalette }
function clear() {
swatchesByKey.clear()
pending.clear()
}
return { prefetch, usePalette, clear }
} }
function sameSwatches(a: unknown, b: unknown) { function sameSwatches(a: unknown, b: unknown) {
-12
View File
@@ -3,7 +3,6 @@ import {
type CoverPaletteResult, type CoverPaletteResult,
} from "@/hooks/cover-palette-source" } from "@/hooks/cover-palette-source"
import { import {
clearLegacyCoverPaletteCache,
prefetchLegacyCoverPalette, prefetchLegacyCoverPalette,
useLegacyCoverPalette, useLegacyCoverPalette,
} from "@/hooks/use-legacy-cover-palette" } from "@/hooks/use-legacy-cover-palette"
@@ -13,7 +12,6 @@ import {
} from "@/lib/artwork-color-preference" } from "@/lib/artwork-color-preference"
import { extractCoverSwatches } from "@/lib/artwork-colors" import { extractCoverSwatches } from "@/lib/artwork-colors"
import { deriveCoverPalette, type CoverSwatches } from "@/lib/cover-palette" import { deriveCoverPalette, type CoverSwatches } from "@/lib/cover-palette"
import { clearCachePrefix } from "@/lib/persistent-cache"
export { COVER_PALETTE_WAIT_MS } from "@/hooks/cover-palette-source" export { COVER_PALETTE_WAIT_MS } from "@/hooks/cover-palette-source"
@@ -23,16 +21,6 @@ const region = createCoverPaletteSource<CoverSwatches>({
derive: (swatches) => deriveCoverPalette(swatches), derive: (swatches) => deriveCoverPalette(swatches),
}) })
/**
* Forget every extracted palette, in memory and on device, so covers are
* re-extracted. Both pipelines share the `palette:` cache prefix.
*/
export function clearCoverPaletteCache() {
region.clear()
clearLegacyCoverPaletteCache()
clearCachePrefix("palette")
}
/** Warm visible artwork colors before a detail page is pushed. */ /** Warm visible artwork colors before a detail page is pushed. */
export function prefetchCoverPalette(uri: string) { export function prefetchCoverPalette(uri: string) {
void loadArtworkColorsEnabled().then((enabled) => void loadArtworkColorsEnabled().then((enabled) =>
@@ -65,5 +65,3 @@ export const prefetchLegacyCoverPalette = legacy.prefetch
/** `react-native-image-colors` pipeline used when new artwork colors are off. */ /** `react-native-image-colors` pipeline used when new artwork colors are off. */
export const useLegacyCoverPalette = legacy.usePalette export const useLegacyCoverPalette = legacy.usePalette
export const clearLegacyCoverPaletteCache = legacy.clear
+20 -17
View File
@@ -1,4 +1,4 @@
import { atmosEnabled } from "@/lib/playback-capabilities" import { dolbyAtmosSupported } from "@/lib/playback-capabilities"
import { import {
createAudioPlaylist, createAudioPlaylist,
setAudioModeAsync, setAudioModeAsync,
@@ -113,8 +113,6 @@ export function useNativePlaylistSync({
measuredDuration > 0 measuredDuration > 0
? measuredDuration ? measuredDuration
: (currentSong?.durationSeconds ?? 0) : (currentSong?.durationSeconds ?? 0)
const durationRef = useRef(duration)
durationRef.current = duration
const queueSyncKey = useMemo( const queueSyncKey = useMemo(
() => JSON.stringify(queueSongIds), () => JSON.stringify(queueSongIds),
[queueSongIds] [queueSongIds]
@@ -134,7 +132,11 @@ export function useNativePlaylistSync({
]) ])
: "" : ""
const userPlaybackKey = user const userPlaybackKey = user
? JSON.stringify([user._id, user.playbackQuality, atmosEnabled(user)]) ? JSON.stringify([
user._id,
user.playbackQuality,
dolbyAtmosSupported && (user.preferAtmos ?? false),
])
: "" : ""
const settleWaiters = useCallback(() => { const settleWaiters = useCallback(() => {
@@ -411,17 +413,18 @@ export function useNativePlaylistSync({
[startPlayer] [startPlayer]
) )
// Reads duration from a ref so seekTo, and every action built on it, stays const seekTo = useCallback(
// stable across track changes. async (seconds: number) => {
const seekTo = useCallback(async (seconds: number) => { const playlist = playlistRef.current
const playlist = playlistRef.current if (!playlist) return
if (!playlist) return const maxDuration = playlist.duration || duration || 0
const maxDuration = playlist.duration || durationRef.current || 0 const clamped = Math.max(0, Math.min(seconds, maxDuration))
const clamped = Math.max(0, Math.min(seconds, maxDuration)) await playlist.seekTo(clamped)
await playlist.seekTo(clamped) currentTimeRef.current = clamped
currentTimeRef.current = clamped setCurrentTime(clamped)
setCurrentTime(clamped) },
}, []) [duration]
)
const handlePlaybackLoadFailure = useCallback(() => { const handlePlaybackLoadFailure = useCallback(() => {
autoPlayNextRef.current = false autoPlayNextRef.current = false
@@ -459,7 +462,7 @@ export function useNativePlaylistSync({
} }
if (!isCurrentLoad()) return if (!isCurrentLoad()) return
const loadKey = `${user.playbackQuality}:${atmosEnabled(user)}:${cookieHeader}` const loadKey = `${user.playbackQuality}:${dolbyAtmosSupported && (user.preferAtmos ?? false)}:${cookieHeader}`
const needsRebuild = const needsRebuild =
loadedLoadKeyRef.current !== loadKey || loadedLoadKeyRef.current !== loadKey ||
nativePlaylistNeedsRebuild( nativePlaylistNeedsRebuild(
@@ -500,7 +503,7 @@ export function useNativePlaylistSync({
const plan = playbackStreamPlan( const plan = playbackStreamPlan(
song.files, song.files,
user.playbackQuality, user.playbackQuality,
atmosEnabled(user) dolbyAtmosSupported && (user.preferAtmos ?? false)
) )
sources.set( sources.set(
song.id, song.id,
@@ -1,13 +0,0 @@
import { useServerConfig } from "@/contexts/server-config"
/**
* Resolves `currentUser.image` to a loadable URI. Stored avatars come back as
* paths on the oTunes web server; legacy ones are data URLs.
*/
export function useProfileImageUrl(image: string | undefined) {
const { config } = useServerConfig()
if (!image?.startsWith("/")) {
return image
}
return config ? `${config.serverUrl.replace(/\/+$/, "")}${image}` : undefined
}
-35
View File
@@ -5,7 +5,6 @@ import { publishMusicCatalog } from "@/lib/app-intents"
export const FAVORITES_PLAYLIST_ID = "otunes:favorites" export const FAVORITES_PLAYLIST_ID = "otunes:favorites"
const HANDLED_KEY = "otunes:handled-app-intents" const HANDLED_KEY = "otunes:handled-app-intents"
const CATALOG_CURSORS_KEY = "otunes:app-intent-catalog-cursors"
const MAX_HANDLED = 200 const MAX_HANDLED = 200
const CATALOG_KINDS = [ const CATALOG_KINDS = [
@@ -21,7 +20,6 @@ export async function clearAppIntentCatalogs() {
return return
} }
const results = await Promise.allSettled([ const results = await Promise.allSettled([
AsyncStorage.removeItem(CATALOG_CURSORS_KEY),
AppIntents.deleteDonationsAsync({ intent: "playMusic" }), AppIntents.deleteDonationsAsync({ intent: "playMusic" }),
AppIntents.clearPendingInvocationsAsync(), AppIntents.clearPendingInvocationsAsync(),
...CATALOG_KINDS.map((kind) => publishMusicCatalog(kind, [])), ...CATALOG_KINDS.map((kind) => publishMusicCatalog(kind, [])),
@@ -30,39 +28,6 @@ export async function clearAppIntentCatalogs() {
if (failed?.status === "rejected") throw failed.reason if (failed?.status === "rejected") throw failed.reason
} }
/**
* Server `head` values the disk catalog is synced to, per library kind. A
* missing kind means it has never synced and needs a full download.
*/
export type CatalogCursors = Partial<
Record<"song" | "album" | "artist", number>
>
/** Cursors for `scope`; another server or user's cursors read as empty. */
export async function loadCatalogCursors(
scope: string
): Promise<CatalogCursors> {
try {
const raw = await AsyncStorage.getItem(CATALOG_CURSORS_KEY)
const parsed = raw
? (JSON.parse(raw) as { scope?: unknown; cursors?: CatalogCursors })
: null
return parsed?.scope === scope ? (parsed.cursors ?? {}) : {}
} catch {
return {}
}
}
export async function saveCatalogCursors(
scope: string,
cursors: CatalogCursors
) {
await AsyncStorage.setItem(
CATALOG_CURSORS_KEY,
JSON.stringify({ scope, cursors })
)
}
export async function loadHandledIntentIds() { export async function loadHandledIntentIds() {
const raw = await AsyncStorage.getItem(HANDLED_KEY) const raw = await AsyncStorage.getItem(HANDLED_KEY)
if (!raw) { if (!raw) {
-7
View File
@@ -50,13 +50,6 @@ export function publishMusicCatalog(kind: string, entities: AppIntentEntity[]) {
return write return write
} }
/** The full disk catalog for `kind`, as last published. */
export async function readMusicCatalog(kind: string) {
await publishing.catch(() => undefined)
if (!native || !AppIntents.isAvailable()) return []
return JSON.parse(await native.catalogJSON(kind)) as AppIntentEntity[]
}
export async function completeMusicInvocation( export async function completeMusicInvocation(
token: string, token: string,
error: string | null error: string | null
+38 -7
View File
@@ -1,9 +1,40 @@
import type { MediaShareTarget } from "@otunes/convex/client/media-links" export type MediaShareContext = (
| { type: "album"; albumId: string }
| { type: "song"; albumId: string; songId: string }
| { type: "playlist"; playlistId: string; isFavorites?: boolean }
| { type: "artist"; artistId: string }
) & { title: string }
export { export function shouldShowShare(
mediaShareUrl, share: MediaShareContext | undefined,
shouldShowShare, selectedCount: number
} from "@otunes/convex/client/media-links" ) {
if (!share) {
return false
}
if (share.type === "song") {
return selectedCount === 1
}
return true
}
/** A share target plus the title shown in the native share sheet. */ export function mediaShareUrl(
export type MediaShareContext = MediaShareTarget & { title: string } serverUrl: string,
share: MediaShareContext
): string {
const origin = serverUrl.replace(/\/+$/, "")
switch (share.type) {
case "album":
return `${origin}/album/${share.albumId}`
case "song":
return `${origin}/album/${share.albumId}?s=${share.songId}`
case "playlist":
if (share.isFavorites) {
return `${origin}/playlist/favorites`
}
return `${origin}/playlist/${share.playlistId}`
case "artist":
return `${origin}/artist/${share.artistId}`
}
}
+1 -1
View File
@@ -28,7 +28,7 @@ export function useStackScreenOptions(
headerBackButtonDisplayMode: "minimal", headerBackButtonDisplayMode: "minimal",
...(Platform.OS === "android" ...(Platform.OS === "android"
? { ? {
animation: "fade", animation: "slide_from_right",
headerLargeTitle: false, headerLargeTitle: false,
headerTransparent: false, headerTransparent: false,
headerStyle: { backgroundColor: theme.background }, headerStyle: { backgroundColor: theme.background },
-5
View File
@@ -2,8 +2,3 @@ import { Platform } from "react-native"
// Android Dolby decoder reports do not reliably indicate working Atmos playback. // Android Dolby decoder reports do not reliably indicate working Atmos playback.
export const dolbyAtmosSupported = Platform.OS === "ios" export const dolbyAtmosSupported = Platform.OS === "ios"
/** Whether to stream Atmos for this user: they opted in and the device can play it. */
export function atmosEnabled(user: { preferAtmos?: boolean }) {
return dolbyAtmosSupported && (user.preferAtmos ?? false)
}
+4 -4
View File
@@ -5,10 +5,8 @@ import type { Id } from "@otunes/convex/_generated/dataModel"
import type { BrowseSong } from "@otunes/convex/types" import type { BrowseSong } from "@otunes/convex/types"
import { import {
getCachedSong, getCachedSong,
getSongSnapshot,
getSongsVersion, getSongsVersion,
requestSongs, requestSongs,
songFromSnapshot,
subscribeSongs, subscribeSongs,
} from "@otunes/convex/client/song-cache" } from "@otunes/convex/client/song-cache"
import { isPersistentCacheLoaded } from "@/lib/persistent-cache" import { isPersistentCacheLoaded } from "@/lib/persistent-cache"
@@ -52,10 +50,12 @@ export function useSongs(songIds: readonly Id<"songs">[]) {
*/ */
export function useSong(songId: Id<"songs"> | null): BrowseSong | null { export function useSong(songId: Id<"songs"> | null): BrowseSong | null {
const convex = useConvex() const convex = useConvex()
// While the song is missing the snapshot is the cache version, so every
// cache change re-renders and retries the fetch below.
const snapshot = useSyncExternalStore(subscribeSongs, () => const snapshot = useSyncExternalStore(subscribeSongs, () =>
getSongSnapshot(songId) songId ? (getCachedSong(songId) ?? getSongsVersion()) : null
) )
const song = songFromSnapshot(snapshot) const song = typeof snapshot === "object" ? snapshot : null
useEffect(() => { useEffect(() => {
if (songId && !song && isPersistentCacheLoaded()) { if (songId && !song && isPersistentCacheLoaded()) {
+33 -11
View File
@@ -1,11 +1,9 @@
import { import { dolbyAtmosSupported } from "@/lib/playback-capabilities"
type PlaybackQuality,
songHlsPlaylistPath,
songPlayPath,
} from "@otunes/convex/playback-stream"
import { Platform } from "react-native" import { Platform } from "react-native"
import type { AudioSource } from "expo-audio" import type { AudioSource } from "expo-audio"
export type PlaybackQuality = "low" | "medium" | "high" | "lossless"
export const coverImageSizes = [64, 128, 192, 256, 384, 512, 768, 1024] as const export const coverImageSizes = [64, 128, 192, 256, 384, 512, 768, 1024] as const
export type CoverImageSize = (typeof coverImageSizes)[number] export type CoverImageSize = (typeof coverImageSizes)[number]
@@ -47,6 +45,33 @@ export function playlistCoverUrl(
return sizedCoverUrl(`${serverUrl}/api/playlist/${playlistId}/cover`, size) return sizedCoverUrl(`${serverUrl}/api/playlist/${playlistId}/cover`, size)
} }
export function songPlayUrl(
serverUrl: string,
songId: string,
quality: PlaybackQuality | undefined,
preferAtmos: boolean | undefined
) {
const params = new URLSearchParams()
if (Platform.OS === "ios") params.set("losslessFormat", "alac")
if (quality) params.set("quality", quality)
if (dolbyAtmosSupported && preferAtmos) params.set("preferAtmos", "true")
const query = params.toString()
return `${serverUrl}/api/song/${songId}/play${query ? `?${query}` : ""}`
}
export function songHlsPlaylistUrl(
serverUrl: string,
songId: string,
quality: PlaybackQuality | undefined,
preferAtmos: boolean | undefined
) {
const params = new URLSearchParams()
if (quality) params.set("quality", quality)
if (dolbyAtmosSupported && preferAtmos) params.set("preferAtmos", "true")
const query = params.toString()
return `${serverUrl}/api/song/${songId}/play/hls${query ? `?${query}` : ""}`
}
export function songAudioSource( export function songAudioSource(
serverUrl: string, serverUrl: string,
songId: string, songId: string,
@@ -55,12 +80,9 @@ export function songAudioSource(
useHls: boolean, useHls: boolean,
options?: { cookieHeader?: string | null; songTitle?: string } options?: { cookieHeader?: string | null; songTitle?: string }
): AudioSource { ): AudioSource {
const path = useHls const uri = useHls
? songHlsPlaylistPath(songId, quality, preferAtmos) ? songHlsPlaylistUrl(serverUrl, songId, quality, preferAtmos)
: songPlayPath(songId, quality, preferAtmos, { : songPlayUrl(serverUrl, songId, quality, preferAtmos)
losslessFormat: Platform.OS === "ios" ? "alac" : undefined,
})
const uri = `${serverUrl}${path}`
const headers = options?.cookieHeader const headers = options?.cookieHeader
? { Cookie: options.cookieHeader } ? { Cookie: options.cookieHeader }
@@ -7,15 +7,11 @@ private enum HandoffState {
static var pending: [String: String]? static var pending: [String: String]?
static var notify: (() -> Void)? static var notify: (() -> Void)?
// app.config.ts declares the one `.media` type per build profile; iOS and static var activityType: String {
// Catalyst must publish the same string for Handoff to pair them. Other "\(Bundle.main.bundleIdentifier!).media"
// plugins (expo-router) append their own types, so match by suffix. }
static let activityType =
(Bundle.main.object(forInfoDictionaryKey: "NSUserActivityTypes") as! [String])
.first { $0.hasSuffix(".media") }!
} }
// ExpoAppSceneDelegate forwards scene(_:continue:) and cold-start activities here.
public final class HandoffAppDelegateSubscriber: ExpoAppDelegateSubscriber { public final class HandoffAppDelegateSubscriber: ExpoAppDelegateSubscriber {
public func application( public func application(
_ application: UIApplication, _ application: UIApplication,
@@ -1,36 +0,0 @@
const fs = require("fs")
const path = require("path")
const { withDangerousMod } = require("expo/config-plugins")
// Overrides react-native-screens' 150ms crossfade for `animation: "fade"`.
// App resources win over library resources with the same name, so the stack
// fades through black in 100ms: the old page out, then the new page in.
const anims = {
"rns_fade_out.xml": `<alpha xmlns:android="http://schemas.android.com/apk/res/android"
android:fromAlpha="1.0"
android:toAlpha="0.0"
android:duration="50" />
`,
"rns_fade_in.xml": `<alpha xmlns:android="http://schemas.android.com/apk/res/android"
android:fromAlpha="0.0"
android:toAlpha="1.0"
android:startOffset="50"
android:duration="50" />
`,
}
module.exports = (config) =>
withDangerousMod(config, [
"android",
(config) => {
const dir = path.join(
config.modRequest.platformProjectRoot,
"app/src/main/res/anim"
)
fs.mkdirSync(dir, { recursive: true })
for (const [name, xml] of Object.entries(anims)) {
fs.writeFileSync(path.join(dir, name), `<?xml version="1.0" encoding="utf-8"?>\n${xml}`)
}
return config
},
])
+7 -23
View File
@@ -4,20 +4,6 @@ const {
withXcodeProject, withXcodeProject,
} = require("expo/config-plugins") } = require("expo/config-plugins")
// Pods left at React Native's iOS 15.1 minimum map to a macOS target below what
// current Xcode accepts for Catalyst, so raise them to the app's own target.
const raisePodDeploymentTargets = `
app_target = installer.aggregate_targets.first.platform.deployment_target
installer.pods_project.targets.each do |target|
target.build_configurations.each do |build|
current = build.build_settings['IPHONEOS_DEPLOYMENT_TARGET']
if current.nil? || Pod::Version.new(current) < app_target
build.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = app_target.to_s
end
end
end
`
// Opt in during prebuild so normal iOS builds keep their precompiled dependencies. // Opt in during prebuild so normal iOS builds keep their precompiled dependencies.
module.exports = (config) => { module.exports = (config) => {
config = withPodfileProperties(config, (config) => { config = withPodfileProperties(config, (config) => {
@@ -27,15 +13,14 @@ module.exports = (config) => {
}) })
config = withPodfile(config, (config) => { config = withPodfile(config, (config) => {
const flag = /:mac_catalyst_enabled\s*=>\s*(?:false|true)/ const pattern = /:mac_catalyst_enabled\s*=>\s*(?:false|true)/
const postInstall = /(react_native_post_install\([\s\S]*?\n {4}\)\n)/ if (!pattern.test(config.modResults.contents)) {
let contents = config.modResults.contents
if (!flag.test(contents) || !postInstall.test(contents)) {
throw new Error("Cannot enable Catalyst: Expo's Podfile template has changed") throw new Error("Cannot enable Catalyst: Expo's Podfile template has changed")
} }
contents = contents.replace(flag, ":mac_catalyst_enabled => true") config.modResults.contents = config.modResults.contents.replace(
contents = contents.replace(postInstall, `$1${raisePodDeploymentTargets}`) pattern,
config.modResults.contents = contents ":mac_catalyst_enabled => true"
)
return config return config
}) })
@@ -47,8 +32,7 @@ module.exports = (config) => {
for (const { value } of lists[target.buildConfigurationList].buildConfigurations) { for (const { value } of lists[target.buildConfigurationList].buildConfigurations) {
const settings = configurations[value].buildSettings const settings = configurations[value].buildSettings
settings.SUPPORTS_MACCATALYST = "YES" settings.SUPPORTS_MACCATALYST = "YES"
// Share the iOS bundle ID so Handoff and the App ID match across devices. settings.DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = "YES"
settings.DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = "NO"
settings.TARGETED_DEVICE_FAMILY = '"1,2"' settings.TARGETED_DEVICE_FAMILY = '"1,2"'
} }
return config return config
@@ -1,7 +1,6 @@
import { fetchQuery } from "convex/nextjs" import { fetchQuery } from "convex/nextjs"
import { convexServerOptions } from "@/lib/convex-server" import { convexServerOptions } from "@/lib/convex-server"
import { api } from "@otunes/convex/_generated/api" import { api } from "@otunes/convex/_generated/api"
import type { Id } from "@otunes/convex/_generated/dataModel"
import { Metadata } from "next" import { Metadata } from "next"
interface PageProps { interface PageProps {
@@ -12,12 +11,12 @@ export async function generateMetadata({
params, params,
}: PageProps): Promise<Metadata> { }: PageProps): Promise<Metadata> {
const { id } = await params const { id } = await params
const detail = await fetchQuery( const artists = await fetchQuery(
api.library.browseArtistDetail, api.library.browseArtists,
{ id: id as Id<"artists"> }, {},
convexServerOptions() convexServerOptions()
).catch(() => null) )
const selectedArtist = detail?.artist const selectedArtist = artists.find((artist) => artist.id === id)
return { return {
title: `${selectedArtist ? `${selectedArtist.name}` : "oTunes"}`, title: `${selectedArtist ? `${selectedArtist.name}` : "oTunes"}`,
+2 -2
View File
@@ -10,10 +10,10 @@ export async function GET(
const { id } = await params const { id } = await params
try { try {
const cover = await getConvexClient().query(api.library.getAlbumCover, { const album = await getConvexClient().query(api.library.getAlbum, {
id: id as Id<"albums">, id: id as Id<"albums">,
}) })
return serveCoverFile(cover, request) return serveCoverFile(album?.cover, request)
} catch { } catch {
return new Response("Not found", { status: 404 }) return new Response("Not found", { status: 404 })
} }
+2 -2
View File
@@ -10,10 +10,10 @@ export async function GET(
const { id } = await params const { id } = await params
try { try {
const cover = await getConvexClient().query(api.library.getArtistCover, { const artist = await getConvexClient().query(api.library.getArtist, {
id: id as Id<"artists">, id: id as Id<"artists">,
}) })
return serveCoverFile(cover, request) return serveCoverFile(artist?.cover, request)
} catch { } catch {
return new Response("Not found", { status: 404 }) return new Response("Not found", { status: 404 })
} }
@@ -9,10 +9,10 @@ export async function GET(
) { ) {
const { id } = await params const { id } = await params
try { try {
const cover = await getConvexClient().query(api.library.getPlaylistCover, { const playlist = await getConvexClient().query(api.library.getPlaylist, {
id: id as Id<"playlists">, id: id as Id<"playlists">,
}) })
return serveCoverFile(cover, request) return serveCoverFile(playlist?.cover, request)
} catch { } catch {
return new Response("Not found", { status: 404 }) return new Response("Not found", { status: 404 })
} }
+6 -2
View File
@@ -1,4 +1,6 @@
import { getSongSource } from "@/lib/server-song" import { api } from "@otunes/convex/_generated/api"
import type { Id } from "@otunes/convex/_generated/dataModel"
import { getConvexClient } from "@/lib/convex-server"
import { ensureHlsJob, HLS_SEGMENT_SECONDS } from "@/lib/server-hls" import { ensureHlsJob, HLS_SEGMENT_SECONDS } from "@/lib/server-hls"
import { NextRequest } from "next/server" import { NextRequest } from "next/server"
@@ -15,7 +17,9 @@ export async function GET(
const { id } = await params const { id } = await params
try { try {
const song = await getSongSource(id) const song = (await getConvexClient().query(api.library.getSong, {
id: id as Id<"songs">,
}))!
const quality = request.nextUrl.searchParams.get("quality") const quality = request.nextUrl.searchParams.get("quality")
const preferAtmos = const preferAtmos =
@@ -1,4 +1,6 @@
import { getSongSource } from "@/lib/server-song" import { api } from "@otunes/convex/_generated/api"
import type { Id } from "@otunes/convex/_generated/dataModel"
import { getConvexClient } from "@/lib/convex-server"
import { import {
ensureHlsJob, ensureHlsJob,
getExistingHlsJob, getExistingHlsJob,
@@ -34,11 +36,16 @@ export async function GET(
const quality = request.nextUrl.searchParams.get("quality") const quality = request.nextUrl.searchParams.get("quality")
const preferAtmos = const preferAtmos =
request.nextUrl.searchParams.get("preferAtmos") === "true" request.nextUrl.searchParams.get("preferAtmos") === "true"
// Resolve the source even when a job is cached so every segment is authorized. const existingJob = getExistingHlsJob(id, quality, preferAtmos)
const song = await getSongSource(id)
const job = const job =
getExistingHlsJob(id, quality, preferAtmos) ?? existingJob ??
(await ensureHlsJob(song, quality, preferAtmos)) (await ensureHlsJob(
(await getConvexClient().query(api.library.getSong, {
id: id as Id<"songs">,
}))!,
quality,
preferAtmos
))
if (segmentIndex >= job.segmentCount) { if (segmentIndex >= job.segmentCount) {
return new Response("Segment not found", { status: 404 }) return new Response("Segment not found", { status: 404 })
} }
+46 -24
View File
@@ -1,15 +1,13 @@
import { import { api } from "@otunes/convex/_generated/api"
parsePlaybackQuality, import type { Id } from "@otunes/convex/_generated/dataModel"
playbackStreamPlan,
} from "@otunes/convex/playback-stream"
import { audioContentTypeForPath } from "@/lib/audio-content-type" import { audioContentTypeForPath } from "@/lib/audio-content-type"
import { seekableLosslessFile } from "@/lib/server-lossless" import { seekableLosslessFile } from "@/lib/server-lossless"
import { getSongSource } from "@/lib/server-song" import { getConvexClient } from "@/lib/convex-server"
import { audioInfo } from "@/lib/server-audio-info"
import { ffmpegToReadableStream, streamFile } from "@/lib/server-audio-stream" import { ffmpegToReadableStream, streamFile } from "@/lib/server-audio-stream"
import { spawnFfmpeg } from "@/lib/server-ffmpeg"
import { NextRequest, NextResponse, userAgent } from "next/server" import { NextRequest, NextResponse, userAgent } from "next/server"
import { spawn } from "node:child_process"
import fs from "node:fs/promises" import fs from "node:fs/promises"
import * as music from "music-metadata"
function parseByteRange(rangeHeader: string | null, fileSize: number) { function parseByteRange(rangeHeader: string | null, fileSize: number) {
if (!rangeHeader) { if (!rangeHeader) {
@@ -120,29 +118,47 @@ export async function GET(
const { browser } = userAgent(request) const { browser } = userAgent(request)
try { try {
const song = await getSongSource(id) const song = (await getConvexClient().query(api.library.getSong, {
id: id as Id<"songs">,
}))!
const { const quality = request.nextUrl.searchParams.get("quality") as
source: originalCodec, "low" | "medium" | "high" | "lossless" | null
kbps,
transcodeNeeded, const preferAtmos =
} = playbackStreamPlan(
song.files,
// Without a quality, serve the original file as this route always has.
parsePlaybackQuality(request.nextUrl.searchParams.get("quality")) ??
"lossless",
request.nextUrl.searchParams.get("preferAtmos") === "true" request.nextUrl.searchParams.get("preferAtmos") === "true"
)
let kbps = 0
if (quality === "low") {
kbps = 64
} else if (quality === "medium") {
kbps = 128
} else if (quality === "high") {
kbps = 256
}
let originalCodec = "lossless" in song.files ? "lossless" : "normal"
let transcodeNeeded = true
if (preferAtmos && "atmos" in song.files) {
originalCodec = "atmos"
transcodeNeeded = false
} else if (kbps === 0 && "lossless" in song.files) {
originalCodec = "lossless"
transcodeNeeded = false
} else if (kbps === 0 || (kbps === 256 && "normal" in song.files)) {
originalCodec = "normal"
transcodeNeeded = false
}
const metadata = await music.parseFile(song.files[originalCodec])
if (!transcodeNeeded && originalCodec === "lossless") { if (!transcodeNeeded && originalCodec === "lossless") {
// Native iOS playback does not identify itself as Safari. // Native iOS playback does not identify itself as Safari.
const acceptsAlac = const acceptsAlac =
browser.name === "Safari" || browser.name === "Safari" ||
request.nextUrl.searchParams.get("losslessFormat") === "alac" request.nextUrl.searchParams.get("losslessFormat") === "alac"
if ( if (acceptsAlac && metadata.format.codec === "ALAC") {
acceptsAlac &&
(await audioInfo(song.files[originalCodec])).codec === "ALAC"
) {
try { try {
return await streamFileResponse( return await streamFileResponse(
request, request,
@@ -167,6 +183,11 @@ export async function GET(
(originalCodec === "atmos" || originalCodec === "normal") (originalCodec === "atmos" || originalCodec === "normal")
) { ) {
// TODO: Dolby Atmos doesn't work on Google Chrome // TODO: Dolby Atmos doesn't work on Google Chrome
console.log(
metadata.format.codec,
metadata.format.container,
metadata.format.codecProfile
)
try { try {
return await streamFileResponse( return await streamFileResponse(
request, request,
@@ -179,6 +200,7 @@ export async function GET(
} }
const ffmpegArgs = [ const ffmpegArgs = [
"-nostdin",
"-i", "-i",
song.files[originalCodec], song.files[originalCodec],
"-c:a", "-c:a",
@@ -192,8 +214,8 @@ export async function GET(
try { try {
// TODO: Fix seeking for this // TODO: Fix seeking for this
const ffmpeg = await spawnFfmpeg(ffmpegArgs, request.signal) const ffmpegProcess = spawn("ffmpeg", ffmpegArgs)
const stream = ffmpegToReadableStream(ffmpeg) const stream = ffmpegToReadableStream(ffmpegProcess)
return new NextResponse(stream, { return new NextResponse(stream, {
status: 200, status: 200,
@@ -1,55 +0,0 @@
import { api } from "@otunes/convex/_generated/api"
import type { Id } from "@otunes/convex/_generated/dataModel"
import sharp from "sharp"
import { getConvexClient, getConvexServerUrl } from "@/lib/convex-server"
const AVATAR_SIZE = 256
/**
* Serves a profile photo from Convex storage, downscaled. URLs carry the
* storage id (`?v=`), so a new photo gets a new URL and responses can be
* cached for good.
*/
export async function GET(
_request: Request,
{ params }: { params: Promise<{ id: string }> }
) {
const { id } = await params
try {
const storageUrl = await getConvexClient().query(
api.users.getProfileImageUrl,
{ userId: id as Id<"users"> }
)
if (!storageUrl) {
return new Response("Not found", { status: 404 })
}
// The backend builds storage URLs from its public origin, which may not
// be reachable from here. Fetch the same path from the internal URL.
const { pathname, search } = new URL(storageUrl)
const upstream = await fetch(
new URL(pathname + search, getConvexServerUrl())
)
if (!upstream.ok) {
return new Response("Not found", { status: 404 })
}
const data = await sharp(Buffer.from(await upstream.arrayBuffer()))
.rotate()
.resize(AVATAR_SIZE, AVATAR_SIZE, {
fit: "cover",
withoutEnlargement: true,
})
.webp({ quality: 85 })
.toBuffer()
return new Response(new Uint8Array(data), {
headers: {
"Content-Type": "image/webp",
"Cache-Control": "public, max-age=31536000, immutable",
},
})
} catch {
return new Response("Not found", { status: 404 })
}
}
+2 -2
View File
@@ -13,7 +13,7 @@ import {
MediaContextMenuItems, MediaContextMenuItems,
type MediaContextAction, type MediaContextAction,
} from "@/components/media-context-menu" } from "@/components/media-context-menu"
import { usePlaybackActions } from "@/components/playback-provider" import { usePlayback } from "@/components/playback-provider"
import { useQueueMediaActions } from "@/hooks/use-queue-media-actions" import { useQueueMediaActions } from "@/hooks/use-queue-media-actions"
import { api } from "@otunes/convex/_generated/api" import { api } from "@otunes/convex/_generated/api"
import { Button } from "@/components/ui/button" import { Button } from "@/components/ui/button"
@@ -48,7 +48,7 @@ export function AlbumCard({ album }: { album: BrowseAlbum }) {
const cacheScope = useCacheScope() const cacheScope = useCacheScope()
const { openAddAlbumToPlaylist } = useAddToPlaylist() const { openAddAlbumToPlaylist } = useAddToPlaylist()
const { isAlbumFavorite, toggleAlbumFavorite } = useFavorites() const { isAlbumFavorite, toggleAlbumFavorite } = useFavorites()
const { playAlbum } = usePlaybackActions() const { playAlbum } = usePlayback()
const { runQueueAction, createStation } = useQueueMediaActions() const { runQueueAction, createStation } = useQueueMediaActions()
const [menuOpen, setMenuOpen] = React.useState(false) const [menuOpen, setMenuOpen] = React.useState(false)
const [hovered, setHovered] = React.useState(false) const [hovered, setHovered] = React.useState(false)
+267 -81
View File
@@ -4,45 +4,47 @@ import { PageHeader } from "@/components/library-skeletons"
import * as React from "react" import * as React from "react"
import Image from "next/image" import Image from "next/image"
import Link from "next/link" import Link from "next/link"
import { Play, Share2, Shuffle } from "lucide-react" import { Play, Share2, Shuffle, Star } from "lucide-react"
import { AudioFormatBadge } from "@/components/audio-format-badge" import { AudioFormatBadge } from "@/components/audio-format-badge"
import { MediaCollectionFooter } from "@/components/media-collection-footer" import { MediaCollectionFooter } from "@/components/media-collection-footer"
import { TrackNumberPlayButton } from "@/components/track-number-play-button"
import { useAddToPlaylist } from "@/components/add-to-playlist-provider"
import { FavoriteMediaButton } from "@/components/favorite-media-button" import { FavoriteMediaButton } from "@/components/favorite-media-button"
import { useFavorites } from "@/components/favorites-provider" import { useFavorites } from "@/components/favorites-provider"
import { import { usePlayback } from "@/components/playback-provider"
useCurrentSongId,
usePlaybackActions,
} from "@/components/playback-provider"
import { copyAlbumLink } from "@/lib/media-links" import { copyAlbumLink } from "@/lib/media-links"
import { import {
MediaContextMenu, MediaContextMenu,
type MediaContextAction, type MediaContextAction,
} from "@/components/media-context-menu" } from "@/components/media-context-menu"
import { TrackRow } from "@/components/track-row"
import { Button } from "@/components/ui/button" import { Button } from "@/components/ui/button"
import { ScrollArea } from "@/components/ui/scroll-area" import { ScrollArea } from "@/components/ui/scroll-area"
import { import { useCachedQuery } from "@/hooks/use-cached-query"
useMediaActions, import { api } from "@otunes/convex/_generated/api"
useTrackListMediaAction, import { useQueueMediaActions } from "@/hooks/use-queue-media-actions"
} from "@/hooks/use-media-actions"
import { useTrackSelection } from "@/hooks/use-track-selection" import { useTrackSelection } from "@/hooks/use-track-selection"
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils"
import type { Id } from "@otunes/convex/_generated/dataModel" import type { Id } from "@otunes/convex/_generated/dataModel"
import type { import type { BrowseAlbumDetail, BrowseAlbumTrack } from "@otunes/convex/types"
BrowseAlbumDetail,
BrowseAlbumTrack,
BrowseSong,
} from "@otunes/convex/types"
import { import {
getSelectionRangePositions, getSelectionRangePositions,
isInSelectionRange,
ALBUM_TRACK_ROW,
ALBUM_TRACK_TITLE,
SelectionRangeHighlight,
TRACK_LIST_CONTAINER, TRACK_LIST_CONTAINER,
TrackRowActiveHighlight,
TrackRowHoverHighlight,
TRACK_ROW_PADDING,
type SelectionRangePosition,
} from "@/lib/selection-range-styles" } from "@/lib/selection-range-styles"
import { albumCoverUrl } from "@/lib/cover-urls" import { albumCoverUrl } from "@/lib/cover-urls"
import { sumDurationSeconds } from "@/lib/media-summary" import { sumDurationSeconds } from "@/lib/media-summary"
import { albumDetailSongs, rememberSongs } from "@/lib/song-cache" import { albumDetailSongs, rememberSongs } from "@/lib/song-cache"
import { formatDuration } from "@/lib/format-duration"
function formatMetadata(genre: string | null, year: number | null): string | null { function formatMetadata(genre: string | null, year: number | null): string | null {
const parts: string[] = [] const parts: string[] = []
@@ -93,6 +95,159 @@ function groupAlbumTracksByDisk(tracks: BrowseAlbumTrack[]): AlbumTrackSection[]
return sections return sections
} }
function TrackRow({
track,
sectionIndex,
artist,
isActive,
isSelected,
selectionPosition,
isFavorite,
selectedCount,
onSelect,
onPointerDown,
onToggleFavorite,
onPrepareContextMenu,
onMediaAction,
isNowPlaying,
onPlay,
albumId,
}: {
track: BrowseAlbumTrack
sectionIndex: number
artist: BrowseAlbumDetail["artist"]
albumId: string
isActive: boolean
isSelected: boolean
selectionPosition: SelectionRangePosition
isFavorite: boolean
selectedCount: number
onSelect: (event: React.MouseEvent) => void
onPointerDown: (event: React.MouseEvent) => void
onToggleFavorite: () => void
onPrepareContextMenu: () => void
onMediaAction: (action: MediaContextAction, trackId: string) => void
isNowPlaying: boolean
onPlay: () => void
}) {
const displayTrack =
track.track > 0 ? track.track : sectionIndex + 1
const inRange = isInSelectionRange(selectionPosition)
return (
<div
role="button"
tabIndex={0}
onMouseDown={onPointerDown}
onClick={onSelect}
onDoubleClick={(event) => {
event.preventDefault()
onPlay()
}}
onKeyDown={(event) => {
if (event.key === "Enter" || event.key === " ") {
event.preventDefault()
onSelect(event as unknown as React.MouseEvent)
}
}}
className={cn(
"group relative w-full cursor-pointer select-none py-2.5 text-left text-sm transition-colors",
inRange && "text-primary-foreground"
)}
>
<SelectionRangeHighlight position={selectionPosition} />
{!inRange && isActive ? <TrackRowActiveHighlight /> : null}
{!inRange && !isActive ? <TrackRowHoverHighlight /> : null}
<div
className={cn("relative z-10", ALBUM_TRACK_ROW, TRACK_ROW_PADDING)}
>
<div className="flex shrink-0 items-center justify-center">
<Button
variant="ghost"
size="icon-sm"
className={cn(
"size-8 opacity-0 transition-opacity group-hover:opacity-100",
inRange
? "text-primary-foreground hover:bg-white/15 hover:text-primary-foreground"
: "text-primary hover:text-primary",
(isFavorite || isActive || isSelected) && "opacity-100"
)}
aria-label={
isFavorite
? `Remove ${track.title} from favorites`
: `Favorite ${track.title}`
}
onClick={(event) => {
event.stopPropagation()
onToggleFavorite()
}}
>
<Star
className={cn(
"size-4",
isFavorite && (inRange ? "fill-current" : "fill-primary")
)}
/>
</Button>
</div>
<TrackNumberPlayButton
displayTrack={displayTrack}
title={track.title}
isActive={isActive}
isNowPlaying={isNowPlaying}
inRange={inRange}
onPlay={onPlay}
/>
<div className="min-w-0 flex-1">
<div className={ALBUM_TRACK_TITLE}>{track.title}</div>
{track.artists ? (
<p
className={cn(
"truncate text-xs",
inRange
? "text-primary-foreground/80"
: "text-muted-foreground"
)}
>
{track.artists.join(", ")}
</p>
) : null}
</div>
<span
className={cn(
"shrink-0 text-right tabular-nums",
inRange ? "text-primary-foreground" : "text-muted-foreground"
)}
>
{formatDuration(track.durationSeconds)}
</span>
<MediaContextMenu
label={`More options for ${track.title}`}
stationArtistId={artist.id}
selectedCount={selectedCount}
inSelectionRange={inRange}
onOpenMenu={onPrepareContextMenu}
onAction={(action) => onMediaAction(action, track.id)}
favorited={isFavorite}
navigation={{
artist: { id: artist.id },
album: { id: albumId },
}}
share={{
type: "song",
albumId,
songId: track.id,
}}
/>
</div>
</div>
)
}
export function AlbumView({ export function AlbumView({
album, album,
highlightedSongId, highlightedSongId,
@@ -100,20 +255,36 @@ export function AlbumView({
album: BrowseAlbumDetail album: BrowseAlbumDetail
highlightedSongId?: string highlightedSongId?: string
}) { }) {
const { openAddToPlaylist } = useAddToPlaylist()
const { const {
isSongFavorite, isSongFavorite,
isAlbumFavorite, isAlbumFavorite,
toggleSongFavorite, toggleSongFavorite,
toggleAlbumFavorite, toggleAlbumFavorite,
favoriteSongs,
} = useFavorites() } = useFavorites()
const currentSongId = useCurrentSongId() const { currentSong, playFromSong, playAlbum, playAlbumShuffled } =
const { playFromSong, playAlbum, playAlbumShuffled } = usePlaybackActions() usePlayback()
const { runSongsAction } = useMediaActions() const { runQueueAction, createStation } = useQueueMediaActions()
const albumSongIds = React.useMemo( const albumSongIds = React.useMemo(
() => album.tracks.map((track) => track.id as Id<"songs">), () => album.tracks.map((track) => track.id as Id<"songs">),
[album.tracks] [album.tracks]
) )
// Older servers do not include album format availability yet.
const formatTracks = useCachedQuery(
api.library.getSongsForPlayback,
album.hasLossless === undefined || album.hasAtmos === undefined
? { ids: albumSongIds }
: "skip"
)
const hasLossless =
album.hasLossless ??
formatTracks?.some((track) => track && "lossless" in track.files)
const hasAtmos =
album.hasAtmos ??
formatTracks?.some((track) => track && "atmos" in track.files)
React.useEffect(() => { React.useEffect(() => {
rememberSongs(albumDetailSongs(album)) rememberSongs(albumDetailSongs(album))
}, [album]) }, [album])
@@ -132,6 +303,7 @@ export function AlbumView({
const { const {
selectedIds, selectedIds,
selectedCount, selectedCount,
isSelected,
handleSelect, handleSelect,
handlePointerDown, handlePointerDown,
prepareContextMenu, prepareContextMenu,
@@ -159,55 +331,55 @@ export function AlbumView({
return indexById return indexById
}, [album.tracks]) }, [album.tracks])
const trackSongs = React.useMemo( function handleMediaAction(
() => action: MediaContextAction,
new Map<string, BrowseSong>( fallbackTrackId?: string
album.tracks.map((track) => [ ) {
track.id, const targetIds =
{ selectedIds.size > 0
id: track.id, ? Array.from(selectedIds)
title: track.title, : fallbackTrackId
durationSeconds: track.durationSeconds, ? [fallbackTrackId]
artist: album.artist, : activeTrackId
album: { id: album.id, title: album.title, cover: album.cover }, ? [activeTrackId]
}, : []
]) switch (action) {
), case "create-station":
[album.tracks, album.artist, album.id, album.title, album.cover] void createStation(album.artist.id)
) break
case "favorite":
const handleMediaAction = useTrackListMediaAction({ void favoriteSongs(targetIds as Id<"songs">[])
selectedIds, break
artistId: album.artist.id, case "playlist":
}) openAddToPlaylist(targetIds as Id<"songs">[])
break
const handleRowSelect = React.useCallback( case "play-next":
(index: number, event: React.MouseEvent) => { case "play-last":
const trackId = album.tracks[index].id case "shuffle":
handleSelect(trackId, index, event) void runQueueAction(action, targetIds as Id<"songs">[])
setActiveTrackId(trackId) break
}, }
[album.tracks, handleSelect] }
)
const handleRowPlay = React.useCallback(
(index: number) => {
void playFromSong(album.tracks[index].id, albumSongIds, `album:${album.id}`)
},
[album.tracks, album.id, albumSongIds, playFromSong]
)
const handleToggleFavorite = React.useCallback(
(songId: string) => void toggleSongFavorite(songId as Id<"songs">),
[toggleSongFavorite]
)
function handleAlbumMediaAction(action: MediaContextAction) { function handleAlbumMediaAction(action: MediaContextAction) {
if (action === "favorite") { const targetIds = album.tracks.map((track) => track.id as Id<"songs">)
void toggleAlbumFavorite(album.id as Id<"albums">)
return switch (action) {
case "create-station":
void createStation(album.artist.id)
break
case "favorite":
void toggleAlbumFavorite(album.id as Id<"albums">)
break
case "playlist":
openAddToPlaylist(targetIds)
break
case "play-next":
case "play-last":
case "shuffle":
void runQueueAction(action, targetIds)
break
} }
runSongsAction(action, albumSongIds, album.artist.id)
} }
return ( return (
@@ -244,15 +416,15 @@ export function AlbumView({
</Link> </Link>
<div className="flex flex-wrap items-center justify-center gap-2 text-sm text-muted-foreground sm:justify-start"> <div className="flex flex-wrap items-center justify-center gap-2 text-sm text-muted-foreground sm:justify-start">
{metadata ? <span>{metadata}</span> : null} {metadata ? <span>{metadata}</span> : null}
{album.hasLossless ? ( {hasLossless ? (
<> <>
{metadata ? <span aria-hidden>·</span> : null} {metadata ? <span aria-hidden>·</span> : null}
<AudioFormatBadge format="lossless" /> <AudioFormatBadge format="lossless" />
</> </>
) : null} ) : null}
{album.hasAtmos ? ( {hasAtmos ? (
<> <>
{metadata || album.hasLossless ? ( {metadata || hasLossless ? (
<span aria-hidden>·</span> <span aria-hidden>·</span>
) : null} ) : null}
<AudioFormatBadge format="atmos" /> <AudioFormatBadge format="atmos" />
@@ -341,25 +513,39 @@ export function AlbumView({
return ( return (
<TrackRow <TrackRow
key={track.id} key={track.id}
variant="album" track={track}
song={trackSongs.get(track.id)!} sectionIndex={sectionTrackIndex}
index={listIndex} artist={album.artist}
trackNumber={ albumId={album.id}
track.track > 0 ? track.track : sectionTrackIndex + 1
}
subtitle={track.artists?.join(", ")}
isActive={track.id === activeTrackId} isActive={track.id === activeTrackId}
isSelected={isSelected(track.id)}
selectionPosition={selectionPositions[listIndex]} selectionPosition={selectionPositions[listIndex]}
isFavorite={isSongFavorite(track.id)} isFavorite={isSongFavorite(track.id)}
selectedCount={selectedCount} selectedCount={
selectionStationArtistId={album.artist.id} isSelected(track.id) && selectedCount > 0
isNowPlaying={currentSongId === track.id} ? selectedCount
: 1
}
onPointerDown={handlePointerDown} onPointerDown={handlePointerDown}
onSelect={handleRowSelect} onSelect={(event) => {
onPlay={handleRowPlay} handleSelect(track.id, listIndex, event)
onToggleFavorite={handleToggleFavorite} setActiveTrackId(track.id)
onPrepareContextMenu={prepareContextMenu} }}
onToggleFavorite={() =>
void toggleSongFavorite(track.id as Id<"songs">)
}
onPrepareContextMenu={() =>
prepareContextMenu(track.id)
}
onMediaAction={handleMediaAction} onMediaAction={handleMediaAction}
isNowPlaying={currentSong?.id === track.id}
onPlay={() =>
void playFromSong(
track.id as Id<"songs">,
albumSongIds,
`album:${album.id}`
)
}
/> />
) )
})} })}
+40 -6
View File
@@ -4,19 +4,27 @@ import { PageHeader } from "@/components/library-skeletons"
import * as React from "react" import * as React from "react"
import Image from "next/image" import Image from "next/image"
import { Play, Shuffle } from "lucide-react" import { Play, Shuffle } from "lucide-react"
import { useConvex } from "convex/react"
import { useCacheScope } from "@/components/persistent-cache-provider"
import { useAddToPlaylist } from "@/components/add-to-playlist-provider"
import { useFavorites } from "@/components/favorites-provider" import { useFavorites } from "@/components/favorites-provider"
import { usePlaybackActions } from "@/components/playback-provider" import { usePlayback } from "@/components/playback-provider"
import { useMediaActions } from "@/hooks/use-media-actions" import { useQueueMediaActions } from "@/hooks/use-queue-media-actions"
import { AlbumCard } from "@/components/album-card" import { AlbumCard } from "@/components/album-card"
import { FavoriteMediaButton } from "@/components/favorite-media-button" import { FavoriteMediaButton } from "@/components/favorite-media-button"
import { MediaContextMenu } from "@/components/media-context-menu" import {
MediaContextMenu,
type MediaContextAction,
} from "@/components/media-context-menu"
import { Button } from "@/components/ui/button" import { Button } from "@/components/ui/button"
import { ScrollArea } from "@/components/ui/scroll-area" import { ScrollArea } from "@/components/ui/scroll-area"
import { api } from "@otunes/convex/_generated/api"
import type { Id } from "@otunes/convex/_generated/dataModel" import type { Id } from "@otunes/convex/_generated/dataModel"
import type { BrowseAlbum, BrowseArtist } from "@otunes/convex/types" import type { BrowseAlbum, BrowseArtist } from "@otunes/convex/types"
import { albumGridClassName } from "@/lib/album-grid-classes" import { albumGridClassName } from "@/lib/album-grid-classes"
import { artistCoverUrl } from "@/lib/cover-urls" import { artistCoverUrl } from "@/lib/cover-urls"
import { fetchCachedQuery } from "@otunes/convex/client/cached-query"
export function ArtistView({ export function ArtistView({
artist, artist,
@@ -26,8 +34,34 @@ export function ArtistView({
albums: BrowseAlbum[] albums: BrowseAlbum[]
}) { }) {
const { isArtistFavorite, toggleArtistFavorite } = useFavorites() const { isArtistFavorite, toggleArtistFavorite } = useFavorites()
const { playArtist, playArtistShuffled } = usePlaybackActions() const { openAddArtistToPlaylist } = useAddToPlaylist()
const { runArtistAction } = useMediaActions() const { playArtist, playArtistShuffled } = usePlayback()
const { runQueueAction } = useQueueMediaActions()
const convex = useConvex()
const cacheScope = useCacheScope()
async function handleMediaAction(action: MediaContextAction) {
switch (action) {
case "favorite":
void toggleArtistFavorite(artist.id as Id<"artists">)
break
case "playlist":
void openAddArtistToPlaylist(artist.id as Id<"artists">)
break
case "play-next":
case "play-last":
case "shuffle": {
const songIds = await fetchCachedQuery(
convex,
cacheScope,
api.playlists.getOrderedArtistSongIds,
{ artistId: artist.id as Id<"artists"> }
)
void runQueueAction(action, songIds)
break
}
}
}
return ( return (
<div className="flex h-svh flex-col"> <div className="flex h-svh flex-col">
@@ -84,7 +118,7 @@ export function ArtistView({
label={`More options for ${artist.name}`} label={`More options for ${artist.name}`}
selectedCount={albums.length} selectedCount={albums.length}
onOpenMenu={() => {}} onOpenMenu={() => {}}
onAction={(action) => void runArtistAction(action, artist.id)} onAction={handleMediaAction}
favorited={isArtistFavorite(artist.id)} favorited={isArtistFavorite(artist.id)}
trackRowTrigger={false} trackRowTrigger={false}
triggerVariant="secondary" triggerVariant="secondary"
+66 -40
View File
@@ -4,24 +4,27 @@ import * as React from "react"
import Image from "next/image" import Image from "next/image"
import Link from "next/link" import Link from "next/link"
import { ChevronRightIcon, Play, Shuffle } from "lucide-react" import { ChevronRightIcon, Play, Shuffle } from "lucide-react"
import { useConvex } from "convex/react"
import { useCacheScope } from "@/components/persistent-cache-provider"
import { AlbumCard } from "@/components/album-card" import { AlbumCard } from "@/components/album-card"
import { useAddToPlaylist } from "@/components/add-to-playlist-provider"
import { FavoriteMediaButton } from "@/components/favorite-media-button" import { FavoriteMediaButton } from "@/components/favorite-media-button"
import { useFavorites } from "@/components/favorites-provider" import { useFavorites } from "@/components/favorites-provider"
import { import {
MediaContextMenu, MediaContextMenu,
type MediaContextAction, type MediaContextAction,
MediaContextMenuArea,
type MediaContextMenuProps,
} from "@/components/media-context-menu" } from "@/components/media-context-menu"
import { usePlaybackActions } from "@/components/playback-provider" import { usePlayback } from "@/components/playback-provider"
import { useMediaActions } from "@/hooks/use-media-actions" import { useQueueMediaActions } from "@/hooks/use-queue-media-actions"
import { Button } from "@/components/ui/button" import { Button } from "@/components/ui/button"
import { ScrollArea } from "@/components/ui/scroll-area" import { ScrollArea } from "@/components/ui/scroll-area"
import { api } from "@otunes/convex/_generated/api"
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils"
import type { Id } from "@otunes/convex/_generated/dataModel" import type { Id } from "@otunes/convex/_generated/dataModel"
import type { BrowseAlbum, BrowseArtist } from "@otunes/convex/types" import type { BrowseAlbum, BrowseArtist } from "@otunes/convex/types"
import { artistCoverUrl } from "@/lib/cover-urls" import { artistCoverUrl } from "@/lib/cover-urls"
import { fetchCachedQuery } from "@otunes/convex/client/cached-query"
function ArtistAvatar({ artist }: { artist: BrowseArtist }) { function ArtistAvatar({ artist }: { artist: BrowseArtist }) {
return ( return (
@@ -52,42 +55,36 @@ function ArtistListItem({
onSelect: () => void onSelect: () => void
onMediaAction: (action: MediaContextAction) => void onMediaAction: (action: MediaContextAction) => void
}) { }) {
const menu: MediaContextMenuProps = {
label: `More options for ${artist.name}`,
selectedCount: albumCount,
inSelectionRange: isSelected,
onOpenMenu: () => {},
onAction: onMediaAction,
favorited: isFavorite,
share: { type: "artist", artistId: artist.id },
}
return ( return (
<MediaContextMenuArea menu={menu}> <div
<div className={cn(
"group flex w-full min-w-0 items-center gap-1 overflow-hidden pr-1",
isSelected ? "bg-primary text-primary-foreground" : "hover:bg-muted/50"
)}
>
<button
type="button"
onClick={onSelect}
className={cn( className={cn(
"group flex w-full min-w-0 items-center gap-1 overflow-hidden pr-1", "flex min-w-0 flex-1 items-center gap-3 overflow-hidden px-4 py-2.5 text-left text-sm transition-colors",
isSelected isSelected ? "text-primary-foreground" : ""
? "bg-primary text-primary-foreground"
: "hover:bg-muted/50"
)} )}
> >
<button <ArtistAvatar artist={artist} />
type="button" <span className="min-w-0 flex-1 truncate font-medium">
onClick={onSelect} {artist.name}
className={cn( </span>
"flex min-w-0 flex-1 items-center gap-3 overflow-hidden px-4 py-2.5 text-left text-sm transition-colors", </button>
isSelected ? "text-primary-foreground" : "" <MediaContextMenu
)} label={`More options for ${artist.name}`}
> selectedCount={albumCount}
<ArtistAvatar artist={artist} /> inSelectionRange={isSelected}
<span className="min-w-0 flex-1 truncate font-medium"> onOpenMenu={() => {}}
{artist.name} onAction={onMediaAction}
</span> favorited={isFavorite}
</button> share={{ type: "artist", artistId: artist.id }}
<MediaContextMenu {...menu} /> />
</div> </div>
</MediaContextMenuArea>
) )
} }
@@ -113,9 +110,12 @@ export function ArtistsView({
} }
return sortedArtists[0]?.id ?? "" return sortedArtists[0]?.id ?? ""
}, [artistId, sortedArtists]) }, [artistId, sortedArtists])
const convex = useConvex()
const cacheScope = useCacheScope()
const { openAddArtistToPlaylist } = useAddToPlaylist()
const { isArtistFavorite, toggleArtistFavorite } = useFavorites() const { isArtistFavorite, toggleArtistFavorite } = useFavorites()
const { playArtist, playArtistShuffled } = usePlaybackActions() const { playArtist, playArtistShuffled } = usePlayback()
const { runArtistAction } = useMediaActions() const { runQueueAction } = useQueueMediaActions()
const selectedArtist = sortedArtists.find( const selectedArtist = sortedArtists.find(
(artist) => artist.id === selectedId (artist) => artist.id === selectedId
@@ -130,6 +130,32 @@ export function ArtistsView({
return counts return counts
}, [albums]) }, [albums])
async function handleMediaAction(
artistId: string,
action: MediaContextAction
) {
switch (action) {
case "favorite":
void toggleArtistFavorite(artistId as Id<"artists">)
break
case "playlist":
void openAddArtistToPlaylist(artistId as Id<"artists">)
break
case "play-next":
case "play-last":
case "shuffle": {
const songIds = await fetchCachedQuery(
convex,
cacheScope,
api.playlists.getOrderedArtistSongIds,
{ artistId: artistId as Id<"artists"> }
)
void runQueueAction(action, songIds)
break
}
}
}
return ( return (
<div className="flex min-h-0 flex-1"> <div className="flex min-h-0 flex-1">
<ScrollArea className="w-72 shrink-0 border-r"> <ScrollArea className="w-72 shrink-0 border-r">
@@ -143,7 +169,7 @@ export function ArtistsView({
isFavorite={isArtistFavorite(artist.id)} isFavorite={isArtistFavorite(artist.id)}
onSelect={() => onSelectArtist(artist.id)} onSelect={() => onSelectArtist(artist.id)}
onMediaAction={(action) => onMediaAction={(action) =>
void runArtistAction(action, artist.id) void handleMediaAction(artist.id, action)
} }
/> />
))} ))}
@@ -199,7 +225,7 @@ export function ArtistsView({
selectedCount={artistAlbums.length} selectedCount={artistAlbums.length}
onOpenMenu={() => {}} onOpenMenu={() => {}}
onAction={(action) => onAction={(action) =>
void runArtistAction(action, selectedArtist.id) void handleMediaAction(selectedArtist.id, action)
} }
favorited={isArtistFavorite(selectedArtist.id)} favorited={isArtistFavorite(selectedArtist.id)}
trackRowTrigger={false} trackRowTrigger={false}
+26 -19
View File
@@ -1,28 +1,35 @@
import {
DOLBY_PATHS,
DOLBY_VIEW_BOX,
DOLBY_WIDTH,
LOSSLESS_FALL,
LOSSLESS_FALL_GAP,
LOSSLESS_PEAKS,
LOSSLESS_STROKES,
LOSSLESS_THIN_WIDTH,
LOSSLESS_VIEW_BOX,
LOSSLESS_WIDTH,
MARK_HEIGHT,
} from "@otunes/convex/client/audio-format-marks"
import type { PlaybackFormat } from "@otunes/convex/playback-stream" import type { PlaybackFormat } from "@otunes/convex/playback-stream"
const MARK_HEIGHT = 11
function DolbyMark({ color }: { color: string }) { function DolbyMark({ color }: { color: string }) {
return ( return (
<svg width={DOLBY_WIDTH} height={MARK_HEIGHT} viewBox={DOLBY_VIEW_BOX}> <svg
{DOLBY_PATHS.map((d) => ( width={(MARK_HEIGHT * 23) / 16}
<path key={d} d={d} fill={color} /> height={MARK_HEIGHT}
))} viewBox="0 0 23 16"
>
<path d="M0 0H2.5A8 8 0 0 1 2.5 16H0Z" fill={color} />
<path d="M23 0H20.5A8 8 0 0 0 20.5 16H23Z" fill={color} />
</svg> </svg>
) )
} }
const LOSSLESS_PEAKS = [110, 215, 320]
const LOSSLESS_THIN_WIDTH = 24
const LOSSLESS_STROKES: [peak: number, d: string][] = [
[110, "M-70 320C-62 245 -38 166 0 166"],
[215, "M-70 320C-62 245 -38 166 0 166"],
[320, "M-30 185C-22 173 -11 166 0 166"],
[110, "M166 413C176 413 186 406 194 395"],
[215, "M166 413C200 413 226 340 240 275"],
[320, "M166 413C200 413 226 340 240 275"],
]
const LOSSLESS_FALL =
"M0 178L4 179L8 181L12 184L16 189L20 196L23 204L27 213L30 223L34 233L39 243L43 254L48 266L53 278L58 289L62 301L66 313L71 325L75 336L79 347L83 357L86 364L89 370L93 377L97 382L101 387L105 392L109 397L113 401L117 405L121 408L126 412L130 415L134 417L139 419L143 421L148 423L152 424L157 424L161 425L166 425L166 401L163 401L161 400L159 400L157 399L154 397L152 396L151 394L149 392L147 389L145 386L143 383L142 380L140 376L138 371L137 367L135 362L134 357L132 351L130 345L127 339L124 330L120 319L116 308L111 297L107 285L102 272L98 260L93 248L88 235L82 223L76 212L69 201L61 192L53 183L45 175L37 168L28 163L19 158L10 155L0 154Z"
const LOSSLESS_FALL_GAP =
"M0 178L4 180L6 184L8 190L9 197L11 203L14 210L17 219L21 228L24 238L29 248L33 259L38 270L43 282L47 293L52 305L56 317L60 328L64 340L68 351L73 361L76 368L79 375L83 381L87 387L91 393L95 398L100 403L104 408L109 412L113 416L118 419L124 422L130 424L135 425L141 426L147 426L152 426L157 425L161 425L166 425L166 401L163 401L161 399L159 398L158 395L157 393L156 390L155 387L155 384L154 381L153 379L152 376L150 373L149 369L148 366L146 361L145 357L143 352L142 347L140 341L137 335L134 326L130 315L126 304L122 293L117 281L113 268L108 256L103 243L98 231L92 219L86 207L79 196L71 186L62 177L53 168L44 161L32 157L21 155L10 154L0 154Z"
/** /**
* Three overlapping waves. Each thick downstroke is outlined in the * Three overlapping waves. Each thick downstroke is outlined in the
* background color so it reads as passing over the strokes behind it. * background color so it reads as passing over the strokes behind it.
@@ -36,9 +43,9 @@ function LosslessMark({
}) { }) {
return ( return (
<svg <svg
width={LOSSLESS_WIDTH} width={(MARK_HEIGHT * 544) / 271}
height={MARK_HEIGHT} height={MARK_HEIGHT}
viewBox={LOSSLESS_VIEW_BOX} viewBox="28 154 544 271"
> >
{LOSSLESS_STROKES.map(([peak, d], index) => ( {LOSSLESS_STROKES.map(([peak, d], index) => (
<path <path
+92 -53
View File
@@ -1,31 +1,13 @@
"use client" "use client"
import * as React from "react" import * as React from "react"
import type { OptimisticUpdate } from "convex/browser" import { useMutation } from "convex/react"
import { useMutation, type ReactMutation } from "convex/react"
import type { FunctionArgs, FunctionReference } from "convex/server"
import { toast } from "sonner" import { toast } from "sonner"
import { useCachedQuery } from "@/hooks/use-cached-query" import { useCachedQuery } from "@/hooks/use-cached-query"
import { api } from "@otunes/convex/_generated/api" import { api } from "@otunes/convex/_generated/api"
import { favoriteOptimisticUpdates } from "@otunes/convex/client/favorites"
import type { Id } from "@otunes/convex/_generated/dataModel" import type { Id } from "@otunes/convex/_generated/dataModel"
/**
* `useMutation(...).withOptimisticUpdate(...)` with a stable identity. Pass a
* module-level update so it does not change between renders.
*/
function useOptimisticMutation<Mutation extends FunctionReference<"mutation">>(
mutation: Mutation,
optimisticUpdate: OptimisticUpdate<FunctionArgs<Mutation>>
): ReactMutation<Mutation> {
const base = useMutation(mutation)
return React.useMemo(
() => base.withOptimisticUpdate(optimisticUpdate),
[base, optimisticUpdate]
)
}
type FavoritesContextValue = { type FavoritesContextValue = {
isSongFavorite: (songId: string) => boolean isSongFavorite: (songId: string) => boolean
isAlbumFavorite: (albumId: string) => boolean isAlbumFavorite: (albumId: string) => boolean
@@ -52,38 +34,97 @@ export function useFavorites() {
export function FavoritesProvider({ children }: { children: React.ReactNode }) { export function FavoritesProvider({ children }: { children: React.ReactNode }) {
const favorites = useCachedQuery(api.favorites.getUserFavorites) const favorites = useCachedQuery(api.favorites.getUserFavorites)
const favoriteSong = useOptimisticMutation( const favoriteSong = useMutation(api.favorites.favoriteSong).withOptimisticUpdate(
api.favorites.favoriteSong, (store, { songId }) => {
favoriteOptimisticUpdates.favoriteSong const current = store.getQuery(api.favorites.getUserFavorites, {})
) if (current && !current.favoriteSongs.includes(songId)) {
const favoriteSongsMutation = useOptimisticMutation( store.setQuery(api.favorites.getUserFavorites, {}, {
api.favorites.favoriteSongs, ...current,
favoriteOptimisticUpdates.favoriteSongs favoriteSongs: [...current.favoriteSongs, songId],
) })
const unfavoriteSong = useOptimisticMutation( }
api.favorites.unfavoriteSong, }
favoriteOptimisticUpdates.unfavoriteSong
)
const unfavoriteSongs = useOptimisticMutation(
api.favorites.unfavoriteSongs,
favoriteOptimisticUpdates.unfavoriteSongs
)
const favoriteAlbum = useOptimisticMutation(
api.favorites.favoriteAlbum,
favoriteOptimisticUpdates.favoriteAlbum
)
const unfavoriteAlbum = useOptimisticMutation(
api.favorites.unfavoriteAlbum,
favoriteOptimisticUpdates.unfavoriteAlbum
)
const favoriteArtist = useOptimisticMutation(
api.favorites.favoriteArtist,
favoriteOptimisticUpdates.favoriteArtist
)
const unfavoriteArtist = useOptimisticMutation(
api.favorites.unfavoriteArtist,
favoriteOptimisticUpdates.unfavoriteArtist
) )
const favoriteSongsMutation = useMutation(
api.favorites.favoriteSongs
).withOptimisticUpdate((store, { songIds }) => {
const current = store.getQuery(api.favorites.getUserFavorites, {})
if (current) {
store.setQuery(api.favorites.getUserFavorites, {}, {
...current,
favoriteSongs: [...new Set([...current.favoriteSongs, ...songIds])],
})
}
})
const unfavoriteSong = useMutation(
api.favorites.unfavoriteSong
).withOptimisticUpdate((store, { songId }) => {
const current = store.getQuery(api.favorites.getUserFavorites, {})
if (current) {
store.setQuery(api.favorites.getUserFavorites, {}, {
...current,
favoriteSongs: current.favoriteSongs.filter((id) => id !== songId),
})
}
})
const unfavoriteSongs = useMutation(
api.favorites.unfavoriteSongs
).withOptimisticUpdate((store, { songIds }) => {
const current = store.getQuery(api.favorites.getUserFavorites, {})
if (current) {
const removed = new Set(songIds)
store.setQuery(api.favorites.getUserFavorites, {}, {
...current,
favoriteSongs: current.favoriteSongs.filter((id) => !removed.has(id)),
})
}
})
const favoriteAlbum = useMutation(
api.favorites.favoriteAlbum
).withOptimisticUpdate((store, { albumId }) => {
const current = store.getQuery(api.favorites.getUserFavorites, {})
if (current && !current.favoriteAlbums.includes(albumId)) {
store.setQuery(api.favorites.getUserFavorites, {}, {
...current,
favoriteAlbums: [...current.favoriteAlbums, albumId],
})
}
})
const unfavoriteAlbum = useMutation(
api.favorites.unfavoriteAlbum
).withOptimisticUpdate((store, { albumId }) => {
const current = store.getQuery(api.favorites.getUserFavorites, {})
if (current) {
store.setQuery(api.favorites.getUserFavorites, {}, {
...current,
favoriteAlbums: current.favoriteAlbums.filter((id) => id !== albumId),
})
}
})
const favoriteArtist = useMutation(
api.favorites.favoriteArtist
).withOptimisticUpdate((store, { artistId }) => {
const current = store.getQuery(api.favorites.getUserFavorites, {})
if (current && !current.favoriteArtists.includes(artistId)) {
store.setQuery(api.favorites.getUserFavorites, {}, {
...current,
favoriteArtists: [...current.favoriteArtists, artistId],
})
}
})
const unfavoriteArtist = useMutation(
api.favorites.unfavoriteArtist
).withOptimisticUpdate((store, { artistId }) => {
const current = store.getQuery(api.favorites.getUserFavorites, {})
if (current) {
store.setQuery(api.favorites.getUserFavorites, {}, {
...current,
favoriteArtists: current.favoriteArtists.filter(
(id) => id !== artistId
),
})
}
})
const songIds = React.useMemo( const songIds = React.useMemo(
() => new Set(favorites?.favoriteSongs.map(String) ?? []), () => new Set(favorites?.favoriteSongs.map(String) ?? []),
@@ -247,8 +288,6 @@ export function FavoritesProvider({ children }: { children: React.ReactNode }) {
) )
return ( return (
<FavoritesContext.Provider value={value}> <FavoritesContext.Provider value={value}>{children}</FavoritesContext.Provider>
{children}
</FavoritesContext.Provider>
) )
} }
+52 -111
View File
@@ -15,13 +15,6 @@ import {
} from "lucide-react" } from "lucide-react"
import { Button } from "@/components/ui/button" import { Button } from "@/components/ui/button"
import {
ContextMenu,
ContextMenuContent,
ContextMenuItem,
ContextMenuSeparator,
ContextMenuTrigger,
} from "@/components/ui/context-menu"
import { import {
DropdownMenu, DropdownMenu,
DropdownMenuContent, DropdownMenuContent,
@@ -30,7 +23,6 @@ import {
DropdownMenuTrigger, DropdownMenuTrigger,
} from "@/components/ui/dropdown-menu" } from "@/components/ui/dropdown-menu"
import { copyMediaShareLink, type MediaShareContext } from "@/lib/media-links" import { copyMediaShareLink, type MediaShareContext } from "@/lib/media-links"
import { shouldShowShare } from "@otunes/convex/client/media-links"
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils"
export type MediaContextAction = export type MediaContextAction =
@@ -48,26 +40,17 @@ export type MediaContextNavigation = {
export type { MediaShareContext } from "@/lib/media-links" export type { MediaShareContext } from "@/lib/media-links"
// Lets the same items render inside a dropdown or a right-click menu. function shouldShowShare(
const MenuKindContext = React.createContext<"dropdown" | "context">("dropdown") share: MediaShareContext | undefined,
selectedCount: number
/** Menu item that works in both `MediaContextMenu` and `MediaContextMenuArea`. */
export function MediaMenuItem(
props: React.ComponentProps<typeof DropdownMenuItem>
) { ) {
return React.use(MenuKindContext) === "context" ? ( if (!share) {
<ContextMenuItem {...props} /> return false
) : ( }
<DropdownMenuItem {...props} /> if (share.type === "song") {
) return selectedCount === 1
} }
return true
export function MediaMenuSeparator() {
return React.use(MenuKindContext) === "context" ? (
<ContextMenuSeparator />
) : (
<DropdownMenuSeparator />
)
} }
function actionLabel(base: string, selectedCount: number) { function actionLabel(base: string, selectedCount: number) {
@@ -100,86 +83,86 @@ export function MediaContextMenuItems({
<> <>
{showShare ? ( {showShare ? (
<> <>
<MediaMenuItem <DropdownMenuItem
className="justify-between" className="justify-between"
onClick={() => void copyMediaShareLink(share!)} onClick={() => void copyMediaShareLink(share!)}
> >
Share Share
<Share2 /> <Share2 />
</MediaMenuItem> </DropdownMenuItem>
<MediaMenuSeparator /> <DropdownMenuSeparator />
</> </>
) : null} ) : null}
<MediaMenuItem <DropdownMenuItem
className="justify-between" className="justify-between"
onClick={() => onAction("playlist")} onClick={() => onAction("playlist")}
> >
{actionLabel(playlistLabel, selectedCount)} {actionLabel(playlistLabel, selectedCount)}
<ListPlus /> <ListPlus />
</MediaMenuItem> </DropdownMenuItem>
<MediaMenuSeparator /> <DropdownMenuSeparator />
<MediaMenuItem <DropdownMenuItem
className="justify-between" className="justify-between"
onClick={() => onAction("play-next")} onClick={() => onAction("play-next")}
> >
{actionLabel("Play Next", selectedCount)} {actionLabel("Play Next", selectedCount)}
<ListStart /> <ListStart />
</MediaMenuItem> </DropdownMenuItem>
<MediaMenuItem <DropdownMenuItem
className="justify-between" className="justify-between"
onClick={() => onAction("play-last")} onClick={() => onAction("play-last")}
> >
{actionLabel("Play Last", selectedCount)} {actionLabel("Play Last", selectedCount)}
<ListEnd /> <ListEnd />
</MediaMenuItem> </DropdownMenuItem>
<MediaMenuItem <DropdownMenuItem
className="justify-between" className="justify-between"
onClick={() => onAction("shuffle")} onClick={() => onAction("shuffle")}
> >
{actionLabel("Shuffle", selectedCount)} {actionLabel("Shuffle", selectedCount)}
<Shuffle /> <Shuffle />
</MediaMenuItem> </DropdownMenuItem>
{stationArtistId ? ( {stationArtistId ? (
<MediaMenuItem <DropdownMenuItem
className="justify-between" className="justify-between"
onClick={() => onAction("create-station")} onClick={() => onAction("create-station")}
> >
Create Station Create Station
<Shuffle /> <Shuffle />
</MediaMenuItem> </DropdownMenuItem>
) : null} ) : null}
{artist || album ? ( {artist || album ? (
<> <>
<MediaMenuSeparator /> <DropdownMenuSeparator />
{artist ? ( {artist ? (
<MediaMenuItem asChild className="justify-between"> <DropdownMenuItem asChild className="justify-between">
<Link href={`/artist/${artist.id}`}> <Link href={`/artist/${artist.id}`}>
Go to Artist Go to Artist
<MicVocal /> <MicVocal />
</Link> </Link>
</MediaMenuItem> </DropdownMenuItem>
) : null} ) : null}
{album ? ( {album ? (
<MediaMenuItem asChild className="justify-between"> <DropdownMenuItem asChild className="justify-between">
<Link href={`/album/${album.id}`}> <Link href={`/album/${album.id}`}>
Go to Album Go to Album
<GalleryVerticalEnd /> <GalleryVerticalEnd />
</Link> </Link>
</MediaMenuItem> </DropdownMenuItem>
) : null} ) : null}
</> </>
) : null} ) : null}
{showFavorite ? ( {showFavorite ? (
<> <>
<MediaMenuSeparator /> <DropdownMenuSeparator />
<MediaMenuItem <DropdownMenuItem
variant={favorited ? "destructive" : "default"} variant={favorited ? "destructive" : "default"}
className="justify-between" className="justify-between"
onClick={() => onAction("favorite")} onClick={() => onAction("favorite")}
> >
{actionLabel(favorited ? "Unfavorite" : "Favorite", selectedCount)} {actionLabel(favorited ? "Unfavorite" : "Favorite", selectedCount)}
<Star /> <Star />
</MediaMenuItem> </DropdownMenuItem>
</> </>
) : null} ) : null}
</> </>
@@ -211,67 +194,6 @@ export function mediaContextMenuTriggerClassName({
) )
} }
export type MediaContextMenuProps = {
label: string
selectedCount: number
onOpenMenu: () => void
onAction: (action: MediaContextAction) => void
playlistLabel?: string
showFavorite?: boolean
favorited?: boolean
stationArtistId?: string
navigation?: MediaContextNavigation
share?: MediaShareContext
inSelectionRange?: boolean
/** When false, the trigger uses default button/dropdown styling (page headers). */
trackRowTrigger?: boolean
triggerClassName?: string
triggerVariant?: "ghost" | "secondary"
triggerIconClassName?: string
align?: "start" | "end"
/** Extra items; use `MediaMenuItem` so they also work in the right-click menu. */
children?: React.ReactNode
}
/**
* Opens `menu` (the props given to the row's `MediaContextMenu`) when
* `children`, a single element such as a track row, is right-clicked.
*/
export function MediaContextMenuArea({
menu,
children,
}: {
menu: MediaContextMenuProps
children: React.ReactElement
}) {
return (
<ContextMenu
onOpenChange={(open) => {
if (open) {
menu.onOpenMenu()
}
}}
>
<ContextMenuTrigger asChild>{children}</ContextMenuTrigger>
<ContextMenuContent className="w-48">
<MenuKindContext value="context">
<MediaContextMenuItems
selectedCount={menu.selectedCount}
onAction={menu.onAction}
playlistLabel={menu.playlistLabel}
showFavorite={menu.showFavorite}
favorited={menu.favorited}
stationArtistId={menu.stationArtistId}
navigation={menu.navigation}
share={menu.share}
/>
{menu.children}
</MenuKindContext>
</ContextMenuContent>
</ContextMenu>
)
}
export function MediaContextMenu({ export function MediaContextMenu({
label, label,
selectedCount, selectedCount,
@@ -290,7 +212,26 @@ export function MediaContextMenu({
triggerIconClassName = "size-4", triggerIconClassName = "size-4",
align = "end", align = "end",
children, children,
}: MediaContextMenuProps) { }: {
label: string
selectedCount: number
onOpenMenu: () => void
onAction: (action: MediaContextAction) => void
playlistLabel?: string
showFavorite?: boolean
favorited?: boolean
stationArtistId?: string
navigation?: MediaContextNavigation
share?: MediaShareContext
inSelectionRange?: boolean
/** When false, the trigger uses default button/dropdown styling (page headers). */
trackRowTrigger?: boolean
triggerClassName?: string
triggerVariant?: "ghost" | "secondary"
triggerIconClassName?: string
align?: "start" | "end"
children?: React.ReactNode
}) {
return ( return (
<DropdownMenu <DropdownMenu
onOpenChange={(open) => { onOpenChange={(open) => {
+2 -1
View File
@@ -47,12 +47,13 @@ import {
import { usePlayback } from "@/components/playback-provider" import { usePlayback } from "@/components/playback-provider"
import { api } from "@otunes/convex/_generated/api" import { api } from "@otunes/convex/_generated/api"
import type { Id } from "@otunes/convex/_generated/dataModel" import type { Id } from "@otunes/convex/_generated/dataModel"
import type { PlaybackQuality } from "@otunes/convex/playback-stream"
import { resizeProfileImageToDataUrl } from "@/lib/resize-profile-image" import { resizeProfileImageToDataUrl } from "@/lib/resize-profile-image"
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils"
type Section = "profile" | "quality" | "users" | "library" type Section = "profile" | "quality" | "users" | "library"
type PlaybackQuality = "low" | "medium" | "high" | "lossless"
type CurrentUser = { type CurrentUser = {
_id: Id<"users"> _id: Id<"users">
name: string name: string
@@ -1,7 +1,6 @@
"use client" "use client"
import { useAuthToken } from "@convex-dev/auth/react" import { useAuthToken } from "@convex-dev/auth/react"
import { userIdFromToken } from "@otunes/convex/client/auth-token"
import { createContext, ReactNode, useContext, useEffect, useMemo } from "react" import { createContext, ReactNode, useContext, useEffect, useMemo } from "react"
import { loadPersistentCache } from "@/lib/persistent-cache" import { loadPersistentCache } from "@/lib/persistent-cache"
@@ -14,6 +13,21 @@ if (typeof window !== "undefined") {
void loadPersistentCache() void loadPersistentCache()
} }
function userIdFromToken(token: string | null) {
const payload = token?.split(".")[1]
if (!payload) {
return null
}
try {
const json = atob(payload.replace(/-/g, "+").replace(/_/g, "/"))
const subject = (JSON.parse(json) as { sub?: unknown }).sub
return typeof subject === "string" ? (subject.split("|")[0] ?? null) : null
} catch {
return null
}
}
/** Namespaces persisted client data by the signed-in user. */ /** Namespaces persisted client data by the signed-in user. */
export function PersistentCacheProvider({ children }: { children: ReactNode }) { export function PersistentCacheProvider({ children }: { children: ReactNode }) {
const token = useAuthToken() const token = useAuthToken()
+37 -91
View File
@@ -22,10 +22,7 @@ import type { BrowseSong } from "@otunes/convex/types"
import { import {
playbackFormat, playbackFormat,
type PlaybackFormat, type PlaybackFormat,
type PlaybackQuality,
playbackStreamPlan, playbackStreamPlan,
songHlsPlaylistPath,
songPlayPath,
} from "@otunes/convex/playback-stream" } from "@otunes/convex/playback-stream"
import { import {
ANONYMOUS_CACHE_SCOPE, ANONYMOUS_CACHE_SCOPE,
@@ -43,6 +40,7 @@ import {
getServerPlaybackSnapshot, getServerPlaybackSnapshot,
} from "@otunes/convex/client/playback-store" } from "@otunes/convex/client/playback-store"
import { rememberSongs, useSong } from "@/lib/song-cache" import { rememberSongs, useSong } from "@/lib/song-cache"
import { songHlsPlaylistUrl, songPlayUrl } from "@/lib/song-play-url"
const PREVIOUS_TRACK_RESTART_THRESHOLD_SECONDS = 5 const PREVIOUS_TRACK_RESTART_THRESHOLD_SECONDS = 5
const PROGRESS_SAVE_INTERVAL_MS = 5000 const PROGRESS_SAVE_INTERVAL_MS = 5000
@@ -104,26 +102,7 @@ type PlaybackContextValue = {
dolbyAtmosSupported: boolean | null dolbyAtmosSupported: boolean | null
} }
type PlaybackActions = Omit<
PlaybackContextValue,
| "queueSongIds"
| "queueHistorySongIds"
| "currentFormat"
| "currentSong"
| "shuffleEnabled"
| "repeatEnabled"
| "queueOpen"
| "isPlaying"
| "volume"
| "dolbyAtmosSupported"
>
const PlaybackContext = createContext<PlaybackContextValue | null>(null) const PlaybackContext = createContext<PlaybackContextValue | null>(null)
// Long lists read these narrow contexts so playback state changes do not
// re-render every row.
const PlaybackActionsContext = createContext<PlaybackActions | null>(null)
const CurrentSongIdContext = createContext<Id<"songs"> | null>(null)
const IsPlayingContext = createContext(false)
const PlaybackProgressContext = createContext<{ const PlaybackProgressContext = createContext<{
currentTime: number currentTime: number
duration: number duration: number
@@ -185,14 +164,14 @@ function readStoredVolume(): number {
type PlaybackLoadSettings = { type PlaybackLoadSettings = {
preferAtmos: boolean preferAtmos: boolean
playbackQuality: PlaybackQuality playbackQuality: "low" | "medium" | "high" | "lossless"
useHls: boolean useHls: boolean
} }
function playbackLoadSettings( function playbackLoadSettings(
user: { user: {
preferAtmos?: boolean preferAtmos?: boolean
playbackQuality?: PlaybackQuality playbackQuality?: "low" | "medium" | "high" | "lossless"
}, },
dolbyAtmosSupported: boolean | null, dolbyAtmosSupported: boolean | null,
files: Record<string, unknown> files: Record<string, unknown>
@@ -247,12 +226,12 @@ function loadAudioSource(
): AudioSourceCleanup { ): AudioSourceCleanup {
let disposed = false let disposed = false
let hlsInstance: Hls | null = null let hlsInstance: Hls | null = null
const directUrl = songPlayPath( const directUrl = songPlayUrl(
songId, songId,
settings.playbackQuality, settings.playbackQuality,
settings.preferAtmos settings.preferAtmos
) )
const hlsUrl = songHlsPlaylistPath( const hlsUrl = songHlsPlaylistUrl(
songId, songId,
settings.playbackQuality, settings.playbackQuality,
settings.preferAtmos settings.preferAtmos
@@ -322,22 +301,6 @@ export function usePlayback() {
return context return context
} }
export function usePlaybackActions() {
const context = useContext(PlaybackActionsContext)
if (!context) {
throw new Error("usePlaybackActions must be used within PlaybackProvider")
}
return context
}
export function useCurrentSongId() {
return useContext(CurrentSongIdContext)
}
export function useIsPlaying() {
return useContext(IsPlayingContext)
}
export function usePlaybackProgress() { export function usePlaybackProgress() {
const context = useContext(PlaybackProgressContext) const context = useContext(PlaybackProgressContext)
if (!context) { if (!context) {
@@ -376,19 +339,17 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
if (!isSignedIn) { if (!isSignedIn) {
return return
} }
store.setTransport({ store.setTransport((state) =>
sync: (state) => syncPlaybackStateMutation({
syncPlaybackStateMutation({ songQueue: state.queue,
songQueue: state.queue, queueHistory: state.history,
queueHistory: state.history, shuffleEnabled: state.shuffleEnabled,
shuffleEnabled: state.shuffleEnabled, repeatEnabled: state.repeatEnabled,
repeatEnabled: state.repeatEnabled, currentSongProgress: state.progressSeconds,
currentSongProgress: state.progressSeconds, })
}), )
loadProgress: () => convex.query(api.playback.getSongProgress, {}),
})
return () => store.setTransport(null) return () => store.setTransport(null)
}, [store, isSignedIn, syncPlaybackStateMutation, convex]) }, [store, isSignedIn, syncPlaybackStateMutation])
useEffect(() => { useEffect(() => {
if (!serverPlayback) { if (!serverPlayback) {
@@ -1400,8 +1361,17 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
) )
: null : null
const actions = useMemo<PlaybackActions>( const value = useMemo<PlaybackContextValue>(
() => ({ () => ({
queueSongIds: playback.queue,
queueHistorySongIds: playback.history,
currentSong,
currentFormat,
shuffleEnabled: playback.shuffleEnabled,
repeatEnabled: playback.repeatEnabled,
queueOpen,
isPlaying: isPlaybackActive,
volume,
setQueueOpen, setQueueOpen,
toggleQueueOpen, toggleQueueOpen,
setIsPlaying, setIsPlaying,
@@ -1425,8 +1395,15 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
skipToQueueIndex, skipToQueueIndex,
skipNext, skipNext,
skipPrevious, skipPrevious,
dolbyAtmosSupported,
}), }),
[ [
playback,
currentSong,
currentFormat,
queueOpen,
isPlaybackActive,
volume,
toggleQueueOpen, toggleQueueOpen,
setVolume, setVolume,
playInOrder, playInOrder,
@@ -1448,31 +1425,6 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
skipToQueueIndex, skipToQueueIndex,
skipNext, skipNext,
skipPrevious, skipPrevious,
]
)
const value = useMemo<PlaybackContextValue>(
() => ({
...actions,
queueSongIds: playback.queue,
queueHistorySongIds: playback.history,
currentSong,
currentFormat,
shuffleEnabled: playback.shuffleEnabled,
repeatEnabled: playback.repeatEnabled,
queueOpen,
isPlaying: isPlaybackActive,
volume,
dolbyAtmosSupported,
}),
[
actions,
playback,
currentSong,
currentFormat,
queueOpen,
isPlaybackActive,
volume,
dolbyAtmosSupported, dolbyAtmosSupported,
] ]
) )
@@ -1483,16 +1435,10 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
) )
return ( return (
<PlaybackActionsContext.Provider value={actions}> <PlaybackContext.Provider value={value}>
<CurrentSongIdContext.Provider value={currentSongId}> <PlaybackProgressContext.Provider value={progressValue}>
<IsPlayingContext.Provider value={isPlaybackActive}> {children}
<PlaybackContext.Provider value={value}> </PlaybackProgressContext.Provider>
<PlaybackProgressContext.Provider value={progressValue}> </PlaybackContext.Provider>
{children}
</PlaybackProgressContext.Provider>
</PlaybackContext.Provider>
</IsPlayingContext.Provider>
</CurrentSongIdContext.Provider>
</PlaybackActionsContext.Provider>
) )
} }
+27 -34
View File
@@ -33,39 +33,6 @@ import { albumCoverUrl } from "@/lib/cover-urls"
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils"
import { formatDuration } from "@/lib/format-duration" import { formatDuration } from "@/lib/format-duration"
function PlayerSeekBar({ hasActiveSong }: { hasActiveSong: boolean }) {
const { currentTime, duration, seekTo } = usePlaybackProgress()
const [isSeeking, setIsSeeking] = React.useState(false)
const [seekValue, setSeekValue] = React.useState(0)
const displayTime = hasActiveSong ? (isSeeking ? seekValue : currentTime) : 0
const maxDuration = Math.max(duration, 1)
return (
<Slider
className={cn(
"h-3 flex-1 [&_[data-slot=slider-range]]:bg-current/80 [&_[data-slot=slider-thumb]]:size-2 [&_[data-slot=slider-thumb]]:border-current [&_[data-slot=slider-thumb]]:bg-current [&_[data-slot=slider-thumb]]:opacity-0 focus-within:[&_[data-slot=slider-thumb]]:opacity-100 hover:[&_[data-slot=slider-thumb]]:opacity-100 [&_[data-slot=slider-track]]:h-[3px] [&_[data-slot=slider-track]]:bg-current/30 md:[&_[data-slot=slider-track]]:h-0.5",
!hasActiveSong && "[&_[data-slot=slider-thumb]]:hidden"
)}
min={0}
max={maxDuration}
step={0.1}
value={[displayTime]}
disabled={!hasActiveSong}
onValueChange={([value]) => {
setIsSeeking(true)
setSeekValue(value)
}}
onValueCommit={([value]) => {
seekTo(value)
setIsSeeking(false)
}}
aria-label="Seek"
aria-valuetext={`${formatDuration(displayTime)} of ${formatDuration(duration)}`}
/>
)
}
export function PlayerBar() { export function PlayerBar() {
const { const {
currentSong, currentSong,
@@ -84,10 +51,16 @@ export function PlayerBar() {
skipNext, skipNext,
skipPrevious, skipPrevious,
} = usePlayback() } = usePlayback()
const { currentTime, duration, seekTo } = usePlaybackProgress()
const { state, isMobile } = useSidebar() const { state, isMobile } = useSidebar()
const [isSeeking, setIsSeeking] = React.useState(false)
const [seekValue, setSeekValue] = React.useState(0)
const hasQueue = queueSongIds.length > 0 const hasQueue = queueSongIds.length > 0
const hasActiveSong = Boolean(currentSong)
const sidebarExpanded = !isMobile && state === "expanded" const sidebarExpanded = !isMobile && state === "expanded"
const displayTime = hasActiveSong ? (isSeeking ? seekValue : currentTime) : 0
const maxDuration = Math.max(duration, 1)
return ( return (
<div <div
@@ -219,7 +192,27 @@ export function PlayerBar() {
/> />
)} )}
<div className="absolute inset-x-0 -bottom-1"> <div className="absolute inset-x-0 -bottom-1">
<PlayerSeekBar hasActiveSong={Boolean(currentSong)} /> <Slider
className={cn(
"h-3 flex-1 [&_[data-slot=slider-range]]:bg-current/80 [&_[data-slot=slider-thumb]]:size-2 [&_[data-slot=slider-thumb]]:border-current [&_[data-slot=slider-thumb]]:bg-current [&_[data-slot=slider-thumb]]:opacity-0 focus-within:[&_[data-slot=slider-thumb]]:opacity-100 hover:[&_[data-slot=slider-thumb]]:opacity-100 [&_[data-slot=slider-track]]:h-[3px] [&_[data-slot=slider-track]]:bg-current/30 md:[&_[data-slot=slider-track]]:h-0.5",
!hasActiveSong && "[&_[data-slot=slider-thumb]]:hidden"
)}
min={0}
max={maxDuration}
step={0.1}
value={[displayTime]}
disabled={!hasActiveSong}
onValueChange={([value]) => {
setIsSeeking(true)
setSeekValue(value)
}}
onValueCommit={([value]) => {
seekTo(value)
setIsSeeking(false)
}}
aria-label="Seek"
aria-valuetext={`${formatDuration(displayTime)} of ${formatDuration(duration)}`}
/>
</div> </div>
</div> </div>
+2 -2
View File
@@ -15,7 +15,7 @@ import {
MediaContextMenuItems, MediaContextMenuItems,
type MediaContextAction, type MediaContextAction,
} from "@/components/media-context-menu" } from "@/components/media-context-menu"
import { usePlaybackActions } from "@/components/playback-provider" import { usePlayback } from "@/components/playback-provider"
import { Button } from "@/components/ui/button" import { Button } from "@/components/ui/button"
import { import {
DropdownMenu, DropdownMenu,
@@ -30,7 +30,7 @@ export function PlaylistCard({ playlist }: { playlist: PlaylistSummary }) {
const convex = useConvex() const convex = useConvex()
const cacheScope = useCacheScope() const cacheScope = useCacheScope()
const { openAddPlaylistToPlaylist } = useAddToPlaylist() const { openAddPlaylistToPlaylist } = useAddToPlaylist()
const { playPlaylist } = usePlaybackActions() const { playPlaylist } = usePlayback()
const { runQueueAction } = useQueueMediaActions() const { runQueueAction } = useQueueMediaActions()
async function handleCardAction(action: MediaContextAction) { async function handleCardAction(action: MediaContextAction) {
+384 -104
View File
@@ -9,18 +9,15 @@ import { useMutation } from "convex/react"
import { Play, SearchIcon, Share2, Shuffle, Star, Trash2 } from "lucide-react" import { Play, SearchIcon, Share2, Shuffle, Star, Trash2 } from "lucide-react"
import { toast } from "sonner" import { toast } from "sonner"
import { useAddToPlaylist } from "@/components/add-to-playlist-provider"
import { useFavorites } from "@/components/favorites-provider" import { useFavorites } from "@/components/favorites-provider"
import { import { usePlayback } from "@/components/playback-provider"
useCurrentSongId,
usePlaybackActions,
} from "@/components/playback-provider"
import { MediaCollectionFooter } from "@/components/media-collection-footer" import { MediaCollectionFooter } from "@/components/media-collection-footer"
import { TrackNumberPlayButton } from "@/components/track-number-play-button"
import { import {
MediaContextMenu, MediaContextMenu,
type MediaContextAction, type MediaContextAction,
} from "@/components/media-context-menu" } from "@/components/media-context-menu"
import { TrackRow } from "@/components/track-row"
import { VirtualList } from "@/components/virtual-list"
import { Button } from "@/components/ui/button" import { Button } from "@/components/ui/button"
import { import {
DropdownMenuItem, DropdownMenuItem,
@@ -28,23 +25,242 @@ import {
} from "@/components/ui/dropdown-menu" } from "@/components/ui/dropdown-menu"
import { ScrollArea } from "@/components/ui/scroll-area" import { ScrollArea } from "@/components/ui/scroll-area"
import { useCachedQuery } from "@/hooks/use-cached-query" import { useCachedQuery } from "@/hooks/use-cached-query"
import { import { useQueueMediaActions } from "@/hooks/use-queue-media-actions"
useMediaActions,
useTrackListMediaAction,
} from "@/hooks/use-media-actions"
import { useTrackSelection } from "@/hooks/use-track-selection" import { useTrackSelection } from "@/hooks/use-track-selection"
import { api } from "@otunes/convex/_generated/api" import { api } from "@otunes/convex/_generated/api"
import type { Id } from "@otunes/convex/_generated/dataModel" import type { Id } from "@otunes/convex/_generated/dataModel"
import type { BrowsePlaylistDetail, BrowseSong } from "@otunes/convex/types" import type { BrowsePlaylistDetail, BrowseSong } from "@otunes/convex/types"
import { playlistCoverUrl } from "@/lib/cover-urls" import { albumCoverUrl, playlistCoverUrl } from "@/lib/cover-urls"
import { copyPlaylistLink } from "@/lib/media-links" import { copyPlaylistLink } from "@/lib/media-links"
import { sumDurationSeconds } from "@/lib/media-summary" import { sumDurationSeconds } from "@/lib/media-summary"
import { rememberSongs } from "@/lib/song-cache" import { rememberSongs } from "@/lib/song-cache"
import { filterSongs } from "@otunes/convex/client/song-search" import { cn } from "@/lib/utils"
import { getSelectionRangePositions } from "@/lib/selection-range-styles" import {
getSelectionRangePositions,
isInSelectionRange,
ALBUM_TRACK_ROW,
ALBUM_TRACK_TITLE,
SelectionRangeHighlight,
TrackRowActiveHighlight,
TrackRowHoverHighlight,
TRACK_ROW_PADDING,
type SelectionRangePosition,
} from "@/lib/selection-range-styles"
import { formatDuration } from "@/lib/format-duration"
const ADD_TO_ANOTHER_PLAYLIST = "Add to Another Playlist" const ADD_TO_ANOTHER_PLAYLIST = "Add to Another Playlist"
const estimatePlaylistRowSize = () => 60
function PlaylistSongCover({
song,
inRange,
isFavorite,
onToggleFavorite,
}: {
song: BrowseSong
inRange: boolean
isFavorite: boolean
onToggleFavorite: () => void
}) {
return (
<div
className={cn(
"group/cover relative size-10 shrink-0 overflow-hidden rounded ring-1",
inRange ? "ring-white/25" : "ring-foreground/10"
)}
>
<Image
src={albumCoverUrl(song.album.id)}
alt={song.album.title}
fill
sizes="40px"
className="object-cover"
/>
<div
className={cn(
"absolute inset-0 flex items-center justify-center bg-black/0 opacity-0 transition-opacity group-hover/cover:opacity-100",
"group-hover/cover:bg-black/40"
)}
>
<Button
variant="ghost"
size="icon-sm"
className={cn(
"size-8",
inRange
? "text-primary-foreground hover:bg-white/15 hover:text-primary-foreground"
: "text-primary hover:text-primary"
)}
aria-label={
isFavorite
? `Remove ${song.title} from favorites`
: `Favorite ${song.title}`
}
onClick={(event) => {
event.stopPropagation()
onToggleFavorite()
}}
>
<Star
className={cn(
"size-4",
isFavorite && (inRange ? "fill-current" : "fill-primary")
)}
/>
</Button>
</div>
</div>
)
}
function PlaylistSongRow({
song,
index,
isOwner,
canRemove,
isActive,
selectionPosition,
isFavorite,
selectedCount,
stationArtist,
isDragging,
onSelect,
onPointerDown,
onToggleFavorite,
onPrepareContextMenu,
onMediaAction,
onRemove,
onDragStart,
onDragOver,
onDrop,
showFavoriteInMenu = true,
removeLabel = "Remove from Playlist",
isNowPlaying,
onPlay,
}: {
song: BrowseSong
index: number
isOwner: boolean
canRemove: boolean
isActive: boolean
selectionPosition: SelectionRangePosition
isFavorite: boolean
selectedCount: number
stationArtist?: string
isDragging: boolean
onSelect: (event: React.MouseEvent) => void
onPointerDown: (event: React.MouseEvent) => void
onToggleFavorite: () => void
onPrepareContextMenu: () => void
onMediaAction: (action: MediaContextAction, songId: string) => void
onRemove: () => void
onDragStart: (event: React.DragEvent) => void
onDragOver: (event: React.DragEvent) => void
onDrop: (event: React.DragEvent) => void
showFavoriteInMenu?: boolean
removeLabel?: string
isNowPlaying: boolean
onPlay: () => void
}) {
const displayTrack = index + 1
const inRange = isInSelectionRange(selectionPosition)
return (
<div
role="button"
tabIndex={0}
draggable={isOwner}
onDragStart={onDragStart}
onDragOver={onDragOver}
onDrop={onDrop}
onMouseDown={onPointerDown}
onClick={onSelect}
onDoubleClick={(event) => {
event.preventDefault()
onPlay()
}}
onKeyDown={(event) => {
if (event.key === "Enter" || event.key === " ") {
event.preventDefault()
onSelect(event as unknown as React.MouseEvent)
}
}}
className={cn(
"group relative w-full cursor-pointer select-none py-2.5 text-left text-sm transition-colors",
inRange && "text-primary-foreground",
isDragging && "opacity-50"
)}
>
<SelectionRangeHighlight position={selectionPosition} />
{!inRange && isActive ? <TrackRowActiveHighlight /> : null}
{!inRange && !isActive ? <TrackRowHoverHighlight /> : null}
<div
className={cn("relative z-10", ALBUM_TRACK_ROW, TRACK_ROW_PADDING)}
>
<PlaylistSongCover
song={song}
inRange={inRange}
isFavorite={isFavorite}
onToggleFavorite={onToggleFavorite}
/>
<TrackNumberPlayButton
displayTrack={displayTrack}
title={song.title}
isActive={isActive}
isNowPlaying={isNowPlaying}
inRange={inRange}
onPlay={onPlay}
/>
<span className={ALBUM_TRACK_TITLE}>{song.title}</span>
<span
className={cn(
"shrink-0 text-right tabular-nums",
inRange ? "text-primary-foreground" : "text-muted-foreground"
)}
>
{formatDuration(song.durationSeconds)}
</span>
<MediaContextMenu
label={`More options for ${song.title}`}
stationArtistId={stationArtist}
selectedCount={selectedCount}
inSelectionRange={inRange}
onOpenMenu={onPrepareContextMenu}
onAction={(action) => onMediaAction(action, song.id)}
playlistLabel={ADD_TO_ANOTHER_PLAYLIST}
showFavorite={showFavoriteInMenu}
favorited={isFavorite}
navigation={{
artist: { id: song.artist.id },
album: { id: song.album.id },
}}
share={{
type: "song",
albumId: song.album.id,
songId: song.id,
}}
>
{canRemove ? (
<>
<DropdownMenuSeparator />
<DropdownMenuItem
variant="destructive"
className="justify-between"
onClick={onRemove}
>
{removeLabel}
<Trash2 />
</DropdownMenuItem>
</>
) : null}
</MediaContextMenu>
</div>
</div>
)
}
export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) { export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
const router = useRouter() const router = useRouter()
@@ -54,17 +270,22 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
currentUser === undefined currentUser === undefined
? playlist.isOwner ? playlist.isOwner
: currentUser?._id === playlist.owner.id : currentUser?._id === playlist.owner.id
const { isSongFavorite, toggleSongFavorite, toggleSongsFavorite } = const { openAddToPlaylist } = useAddToPlaylist()
useFavorites()
const currentSongId = useCurrentSongId()
const { const {
isSongFavorite,
toggleSongFavorite,
toggleSongsFavorite,
favoriteSongs: addFavoriteSongs,
} = useFavorites()
const {
currentSong,
playInOrder, playInOrder,
playShuffled, playShuffled,
playPlaylist, playPlaylist,
playPlaylistShuffled, playPlaylistShuffled,
playFromSong, playFromSong,
} = usePlaybackActions() } = usePlayback()
const { runSongsAction } = useMediaActions() const { runQueueAction, createStation } = useQueueMediaActions()
const removeSongs = useMutation(api.playlists.removeSongsFromPlaylist) const removeSongs = useMutation(api.playlists.removeSongsFromPlaylist)
const reorderSongs = useMutation(api.playlists.reorderPlaylistSongs) const reorderSongs = useMutation(api.playlists.reorderPlaylistSongs)
const deletePlaylist = useMutation(api.playlists.deletePlaylist) const deletePlaylist = useMutation(api.playlists.deletePlaylist)
@@ -80,19 +301,22 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
? playlist.songs.filter((song) => !hiddenFavoriteIds.has(song.id)) ? playlist.songs.filter((song) => !hiddenFavoriteIds.has(song.id))
: playlistSongs : playlistSongs
const [searchQuery, setSearchQuery] = React.useState("") const [searchQuery, setSearchQuery] = React.useState("")
const isSearching = searchQuery.trim() !== "" const normalizedQuery = searchQuery.trim().toLowerCase()
const filteredSongs = React.useMemo( const filteredSongs = React.useMemo(
() => filterSongs(songs, searchQuery), () =>
[songs, searchQuery] normalizedQuery
? songs.filter((song) =>
[song.title, song.artist.name, song.album.title].some((value) =>
value.toLowerCase().includes(normalizedQuery)
)
)
: songs,
[songs, normalizedQuery]
) )
const playlistSongIds = React.useMemo( const playlistSongIds = React.useMemo(
() => songs.map((song) => song.id as Id<"songs">), () => songs.map((song) => song.id as Id<"songs">),
[songs] [songs]
) )
const playlistPositionById = React.useMemo(
() => new Map(songs.map((song, index) => [song.id, index + 1])),
[songs]
)
const [activeTrackId, setActiveTrackId] = React.useState("") const [activeTrackId, setActiveTrackId] = React.useState("")
const [dragIndex, setDragIndex] = React.useState<number | null>(null) const [dragIndex, setDragIndex] = React.useState<number | null>(null)
const [isSubscribed, setIsSubscribed] = React.useState(playlist.isSubscribed) const [isSubscribed, setIsSubscribed] = React.useState(playlist.isSubscribed)
@@ -107,6 +331,7 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
const { const {
selectedIds, selectedIds,
selectedCount, selectedCount,
isSelected,
handleSelect, handleSelect,
handlePointerDown, handlePointerDown,
prepareContextMenu, prepareContextMenu,
@@ -144,37 +369,57 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
} }
} }
const handleMediaAction = useTrackListMediaAction({ selectedIds, songs }) function resolveTargetIds(fallbackSongId?: string) {
return selectedIds.size > 0
? Array.from(selectedIds)
: fallbackSongId
? [fallbackSongId]
: activeTrackId
? [activeTrackId]
: []
}
function handleMediaAction(
action: MediaContextAction,
fallbackSongId?: string
) {
const targetIds = resolveTargetIds(fallbackSongId)
switch (action) {
case "create-station": {
const artistId = stationArtistId(songs, new Set(targetIds))
if (artistId) void createStation(artistId)
break
}
case "favorite":
void addFavoriteSongs(targetIds as Id<"songs">[])
break
case "playlist":
openAddToPlaylist(targetIds as Id<"songs">[])
break
case "play-next":
case "play-last":
case "shuffle":
void runQueueAction(action, targetIds as Id<"songs">[])
break
}
}
function handlePlaylistMediaAction(action: MediaContextAction) { function handlePlaylistMediaAction(action: MediaContextAction) {
runSongsAction(action, playlistSongIds) const targetIds = songs.map((song) => song.id as Id<"songs">)
}
const canReorder = isOwner && !isFavorites && !isSearching switch (action) {
case "favorite":
function handleRowSelect(index: number, event: React.MouseEvent) { void addFavoriteSongs(targetIds)
const songId = filteredSongs[index].id break
handleSelect(songId, index, event) case "playlist":
setActiveTrackId(songId) openAddToPlaylist(targetIds)
} break
case "play-next":
function handleRowPlay(index: number) { case "play-last":
void playFromSong( case "shuffle":
filteredSongs[index].id, void runQueueAction(action, targetIds)
playlistSongIds, break
`playlist:${playlist.id}`
)
}
function handleToggleFavorite(songId: string) {
const wasFavorite = isSongFavorite(songId)
void toggleSongFavorite(songId as Id<"songs">)
if (isFavorites && wasFavorite) {
setHiddenFavoriteIds((current) => {
const next = new Set(current)
next.add(songId)
return next
})
} }
} }
@@ -185,7 +430,10 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
: [songId] : [songId]
if (isFavorites) { if (isFavorites) {
const succeeded = await toggleSongsFavorite(ids as Id<"songs">[], true) const succeeded = await toggleSongsFavorite(
ids as Id<"songs">[],
true
)
if (!succeeded) return if (!succeeded) return
return return
} }
@@ -198,9 +446,7 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
setPlaylistSongs((current) => setPlaylistSongs((current) =>
current.filter((song) => !ids.includes(song.id)) current.filter((song) => !ids.includes(song.id))
) )
toast.success( toast.success(ids.length > 1 ? `Removed ${ids.length} songs` : "Removed song")
ids.length > 1 ? `Removed ${ids.length} songs` : "Removed song"
)
} catch (error) { } catch (error) {
toast.error( toast.error(
error instanceof Error ? error.message : "Failed to remove song" error instanceof Error ? error.message : "Failed to remove song"
@@ -228,7 +474,13 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
} }
function handleDrop(targetIndex: number) { function handleDrop(targetIndex: number) {
if (!canReorder || dragIndex === null || dragIndex === targetIndex) { if (
normalizedQuery ||
isFavorites ||
!isOwner ||
dragIndex === null ||
dragIndex === targetIndex
) {
setDragIndex(null) setDragIndex(null)
return return
} }
@@ -289,7 +541,7 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
<PageHeader openApp /> <PageHeader openApp />
<ScrollArea className="min-h-0 flex-1"> <ScrollArea className="min-h-0 flex-1">
<div className="pb-28"> <div className="pb-28">
<div className="mx-auto w-full max-w-9/10 min-w-0"> <div className="mx-auto w-full min-w-0 max-w-9/10">
<div className="flex flex-col gap-8 px-6 pt-6 pb-8 sm:flex-row sm:items-end"> <div className="flex flex-col gap-8 px-6 pt-6 pb-8 sm:flex-row sm:items-end">
<div className="relative mx-auto aspect-square w-full max-w-60 shrink-0 overflow-hidden rounded-lg ring-1 ring-foreground/10 sm:mx-0"> <div className="relative mx-auto aspect-square w-full max-w-60 shrink-0 overflow-hidden rounded-lg ring-1 ring-foreground/10 sm:mx-0">
{isFavorites ? ( {isFavorites ? (
@@ -419,52 +671,80 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
</div> </div>
</div> </div>
{filteredSongs.length > 0 ? ( {filteredSongs.length > 0 ? (
<VirtualList filteredSongs.map((song, index) => (
count={filteredSongs.length} <PlaylistSongRow
estimateSize={estimatePlaylistRowSize} key={song.id}
getItemKey={(index) => filteredSongs[index].id} song={song}
// Keep the drag source mounted so its drop still lands. index={index}
keepMounted={dragIndex} isOwner={isOwner && !isFavorites && !normalizedQuery}
renderItem={(index) => { canRemove={isFavorites || isOwner}
const song = filteredSongs[index] showFavoriteInMenu={!isFavorites}
return ( removeLabel={
<TrackRow isFavorites ? "Unfavorite" : "Remove from Playlist"
variant="playlist" }
song={song} isActive={song.id === activeTrackId}
index={index} selectionPosition={selectionPositions[index]}
trackNumber={playlistPositionById.get(song.id)} isFavorite={isSongFavorite(song.id)}
isActive={song.id === activeTrackId} selectedCount={
isNowPlaying={currentSongId === song.id} isSelected(song.id) && selectedCount > 0
isFavorite={isSongFavorite(song.id)} ? selectedCount
isDragging={dragIndex === index} : 1
selectionPosition={selectionPositions[index]} }
selectedCount={selectedCount} stationArtist={
selectionStationArtistId={selectedStationArtistId} isSelected(song.id)
playlistLabel={ADD_TO_ANOTHER_PLAYLIST} ? selectedStationArtistId
showFavoriteInMenu={!isFavorites} : song.artist.id
removeLabel={ }
isFavorites isDragging={dragIndex === index}
? "Unfavorite" onPointerDown={handlePointerDown}
: isOwner onSelect={(event) => {
? "Remove from Playlist" handleSelect(song.id, index, event)
: undefined setActiveTrackId(song.id)
} }}
onPointerDown={handlePointerDown} onToggleFavorite={() => {
onSelect={handleRowSelect} const wasFavorite = isSongFavorite(song.id)
onPlay={handleRowPlay} void toggleSongFavorite(song.id as Id<"songs">)
onToggleFavorite={handleToggleFavorite} if (isFavorites && wasFavorite) {
onPrepareContextMenu={prepareContextMenu} setHiddenFavoriteIds((current) => {
onMediaAction={handleMediaAction} const next = new Set(current)
onRemove={handleRemoveSong} next.add(song.id)
onDragStart={canReorder ? setDragIndex : undefined} return next
onDrop={canReorder ? handleDrop : undefined} })
/> }
) }}
}} onPrepareContextMenu={() => prepareContextMenu(song.id)}
/> onMediaAction={handleMediaAction}
onRemove={() => handleRemoveSong(song.id)}
onDragStart={(event) => {
if (normalizedQuery || isFavorites || !isOwner) {
return
}
setDragIndex(index)
event.dataTransfer.effectAllowed = "move"
}}
onDragOver={(event) => {
if (normalizedQuery || isFavorites || !isOwner) {
return
}
event.preventDefault()
}}
onDrop={(event) => {
event.preventDefault()
handleDrop(index)
}}
isNowPlaying={currentSong?.id === song.id}
onPlay={() =>
void playFromSong(
song.id as Id<"songs">,
playlistSongIds,
`playlist:${playlist.id}`
)
}
/>
))
) : ( ) : (
<p className="px-6 py-8 text-sm text-muted-foreground"> <p className="px-6 py-8 text-sm text-muted-foreground">
{isSearching {normalizedQuery
? "No songs found." ? "No songs found."
: "This playlist has no songs yet."} : "This playlist has no songs yet."}
</p> </p>
+170 -36
View File
@@ -1,10 +1,11 @@
"use client" "use client"
import * as React from "react" import * as React from "react"
import Image from "next/image"
import { Music2 } from "lucide-react"
import { PlaybackSongMeta } from "@/components/playback-song-meta" import { PlaybackSongMeta } from "@/components/playback-song-meta"
import { usePlayback } from "@/components/playback-provider" import { usePlayback } from "@/components/playback-provider"
import { TrackCover, TrackRow } from "@/components/track-row"
import { Button } from "@/components/ui/button" import { Button } from "@/components/ui/button"
import { ScrollArea } from "@/components/ui/scroll-area" import { ScrollArea } from "@/components/ui/scroll-area"
import { Skeleton } from "@/components/ui/skeleton" import { Skeleton } from "@/components/ui/skeleton"
@@ -12,11 +13,19 @@ import { Spinner } from "@/components/ui/spinner"
import { useTrackSelection } from "@/hooks/use-track-selection" import { useTrackSelection } from "@/hooks/use-track-selection"
import type { Id } from "@otunes/convex/_generated/dataModel" import type { Id } from "@otunes/convex/_generated/dataModel"
import type { BrowseSong, HistorySong, QueueSong } from "@otunes/convex/types" import type { BrowseSong, HistorySong, QueueSong } from "@otunes/convex/types"
import { albumCoverUrl } from "@/lib/cover-urls"
import { import {
getContiguousSelectedIndices, getContiguousSelectedIndices,
moveQueueBlock, moveQueueBlock,
} from "@/lib/move-queue-block" } from "@/lib/move-queue-block"
import { getSelectionRangePositions } from "@/lib/selection-range-styles" import {
getSelectionRangePositions,
isInSelectionRange,
QueueSelectionRangeHighlight,
QueueTrackRowActiveHighlight,
QueueTrackRowHoverHighlight,
type SelectionRangePosition,
} from "@/lib/selection-range-styles"
import { useSongs } from "@/lib/song-cache" import { useSongs } from "@/lib/song-cache"
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils"
import { formatDuration } from "@/lib/format-duration" import { formatDuration } from "@/lib/format-duration"
@@ -47,16 +56,48 @@ function toSelectableQueue(
}) })
} }
function QueueSongCover({
albumId,
title,
inRange,
}: {
albumId: string
title: string
inRange: boolean
}) {
return (
<div
className={cn(
"relative size-10 shrink-0 overflow-hidden ring-1",
inRange ? "ring-white/25" : "ring-foreground/10"
)}
>
<Image
src={albumCoverUrl(albumId)}
alt={title}
fill
sizes="40px"
className="object-cover"
/>
</div>
)
}
function HistorySongRow({ song }: { song: HistorySong }) { function HistorySongRow({ song }: { song: HistorySong }) {
return ( return (
<li className="relative w-full py-2 text-left text-sm opacity-60"> <li className="relative w-full py-2 text-left text-sm opacity-60">
<div className="relative z-10 flex items-center gap-3 px-2"> <div className="relative z-10 flex items-center gap-3 px-2">
<TrackCover {song.album.id ? (
albumId={song.album.id} <QueueSongCover
alt={song.album.title} albumId={song.album.id}
inRange={false} title={song.album.title}
square inRange={false}
/> />
) : (
<div className="flex size-10 shrink-0 items-center justify-center bg-muted ring-1 ring-foreground/10">
<Music2 className="size-4 text-muted-foreground" />
</div>
)}
<PlaybackSongMeta <PlaybackSongMeta
song={song} song={song}
@@ -74,6 +115,106 @@ function HistorySongRow({ song }: { song: HistorySong }) {
) )
} }
const QueueSongRow = React.forwardRef<
HTMLLIElement,
{
song: QueueSelectable
isNowPlaying: boolean
selectionPosition: SelectionRangePosition
isDragging: boolean
onSelect: (event: React.MouseEvent) => void
onPointerDown: (event: React.MouseEvent) => void
onSkipTo: () => void
onDragStart: (event: React.DragEvent) => void
onDragOver: (event: React.DragEvent) => void
onDrop: (event: React.DragEvent) => void
}
>(function QueueSongRow(
{
song,
isNowPlaying,
selectionPosition,
isDragging,
onSelect,
onPointerDown,
onSkipTo,
onDragStart,
onDragOver,
onDrop,
},
ref
) {
const inRange = isInSelectionRange(selectionPosition)
return (
<li
ref={ref}
role="button"
tabIndex={0}
draggable
onDragStart={onDragStart}
onDragOver={onDragOver}
onDrop={onDrop}
onMouseDown={onPointerDown}
onClick={onSelect}
onDoubleClick={(event) => {
event.preventDefault()
onSkipTo()
}}
onKeyDown={(event) => {
if (event.key === "Enter" || event.key === " ") {
event.preventDefault()
onSelect(event as unknown as React.MouseEvent)
}
}}
className={cn(
"group relative w-full cursor-pointer select-none py-2 text-left text-sm transition-colors",
inRange && "text-primary-foreground",
isDragging && "opacity-50"
)}
>
<QueueSelectionRangeHighlight position={selectionPosition} />
{!inRange && isNowPlaying ? <QueueTrackRowActiveHighlight /> : null}
{!inRange && !isNowPlaying ? <QueueTrackRowHoverHighlight /> : null}
<div className="relative z-10 flex items-center gap-3 px-2">
{song.album.id ? (
<QueueSongCover
albumId={song.album.id}
title={song.album.title}
inRange={inRange}
/>
) : (
<div
className={cn(
"flex size-10 shrink-0 items-center justify-center bg-muted ring-1",
inRange ? "ring-white/25" : "ring-foreground/10"
)}
>
<Music2 className="size-4 text-muted-foreground" />
</div>
)}
<PlaybackSongMeta
song={song}
isCurrent={isNowPlaying}
inRange={inRange}
align="start"
showAlbum={false}
/>
<span
className={cn(
"shrink-0 text-xs tabular-nums",
inRange ? "text-primary-foreground" : "text-muted-foreground"
)}
>
{formatDuration(song.durationSeconds)}
</span>
</div>
</li>
)
})
function QueueSongRowSkeleton() { function QueueSongRowSkeleton() {
return ( return (
<li className="flex items-center gap-3 px-2 py-2" aria-hidden> <li className="flex items-center gap-3 px-2 py-2" aria-hidden>
@@ -97,7 +238,7 @@ export function QueuePanel() {
skipToQueueIndex, skipToQueueIndex,
} = usePlayback() } = usePlayback()
const loadMoreRef = React.useRef<HTMLDivElement>(null) const loadMoreRef = React.useRef<HTMLDivElement>(null)
const nowPlayingRef = React.useRef<HTMLElement>(null) const nowPlayingRef = React.useRef<HTMLLIElement>(null)
const [visibleCount, setVisibleCount] = React.useState( const [visibleCount, setVisibleCount] = React.useState(
QUEUE_INITIAL_VISIBLE_COUNT QUEUE_INITIAL_VISIBLE_COUNT
) )
@@ -165,25 +306,12 @@ export function QueuePanel() {
return () => observer.disconnect() return () => observer.disconnect()
}, [hasMore]) }, [hasMore])
const selectionItems = React.useMemo( const {
() => selectableQueue.map((item) => ({ id: item.selectionId })), selectedIds,
[selectableQueue] handleSelect,
) handlePointerDown,
const { selectedIds, handleSelect, handlePointerDown } = } = useTrackSelection(
useTrackSelection(selectionItems) selectableQueue.map((item) => ({ id: item.selectionId }))
const handleRowSelect = React.useCallback(
(index: number, event: React.MouseEvent) => {
handleSelect(selectableQueue[index].selectionId, index, event)
},
[selectableQueue, handleSelect]
)
const handleRowPlay = React.useCallback(
(index: number) => {
void skipToQueueIndex(selectableQueue[index].queueIndex)
},
[selectableQueue, skipToQueueIndex]
) )
const selectionPositions = React.useMemo( const selectionPositions = React.useMemo(
@@ -270,21 +398,27 @@ export function QueuePanel() {
<ul className="flex flex-col py-1"> <ul className="flex flex-col py-1">
{selectableQueue.map((item, index) => {selectableQueue.map((item, index) =>
item.song ? ( item.song ? (
<TrackRow <QueueSongRow
key={item.selectionId} key={item.selectionId}
ref={item.queueIndex === 0 ? nowPlayingRef : undefined} ref={item.queueIndex === 0 ? nowPlayingRef : undefined}
variant="queue"
song={item.song} song={item.song}
index={index}
isActive={item.queueIndex === 0}
isNowPlaying={item.queueIndex === 0} isNowPlaying={item.queueIndex === 0}
selectionPosition={selectionPositions[index]} selectionPosition={selectionPositions[index]}
isDragging={draggingIndices.has(index)} isDragging={draggingIndices.has(index)}
onPointerDown={handlePointerDown} onPointerDown={handlePointerDown}
onSelect={handleRowSelect} onSelect={(event) => {
onPlay={handleRowPlay} handleSelect(item.selectionId, index, event)
onDragStart={setDragIndex} }}
onDrop={handleDrop} onSkipTo={() => void skipToQueueIndex(item.queueIndex)}
onDragStart={(event) => {
setDragIndex(index)
event.dataTransfer.effectAllowed = "move"
}}
onDragOver={(event) => event.preventDefault()}
onDrop={(event) => {
event.preventDefault()
handleDrop(index)
}}
/> />
) : ( ) : (
<QueueSongRowSkeleton key={item.selectionId} /> <QueueSongRowSkeleton key={item.selectionId} />
+42 -49
View File
@@ -8,8 +8,6 @@ import { useQueueMediaActions } from "@/hooks/use-queue-media-actions"
import { import {
MediaContextMenu, MediaContextMenu,
type MediaContextAction, type MediaContextAction,
MediaContextMenuArea,
type MediaContextMenuProps,
} from "@/components/media-context-menu" } from "@/components/media-context-menu"
import type { Id } from "@otunes/convex/_generated/dataModel" import type { Id } from "@otunes/convex/_generated/dataModel"
import type { BrowseSong } from "@otunes/convex/types" import type { BrowseSong } from "@otunes/convex/types"
@@ -40,57 +38,52 @@ export function SearchSongItem({ song }: { song: BrowseSong }) {
} }
} }
const menu: MediaContextMenuProps = {
label: `More options for ${song.title}`,
stationArtistId: song.artist.id,
selectedCount: 1,
onOpenMenu: () => {},
onAction: handleAction,
favorited: isSongFavorite(song.id),
navigation: {
artist: { id: song.artist.id },
album: { id: song.album.id },
},
share: {
type: "song",
albumId: song.album.id,
songId: song.id,
},
triggerClassName:
"size-8 shrink-0 opacity-0 transition-opacity group-hover:opacity-100 data-[state=open]:opacity-100",
triggerVariant: "ghost",
}
return ( return (
<MediaContextMenuArea menu={menu}> <div className="group flex items-center gap-3 rounded-lg px-1 py-1.5 transition-colors hover:bg-muted/50">
<div className="group flex items-center gap-3 rounded-lg px-1 py-1.5 transition-colors hover:bg-muted/50"> <Link
href={`/album/${song.album.id}`}
className="relative size-11 shrink-0 overflow-hidden rounded ring-1 ring-foreground/10"
>
<Image
src={albumCoverUrl(song.album.id)}
alt={song.album.title}
fill
sizes="44px"
className="object-cover"
/>
</Link>
<div className="min-w-0 flex-1">
<Link href={`/album/${song.album.id}`} className="hover:underline">
<p className="truncate text-sm font-medium">{song.title}</p>
</Link>
<Link <Link
href={`/album/${song.album.id}`} href={`/artist/${song.artist.id}`}
className="relative size-11 shrink-0 overflow-hidden rounded ring-1 ring-foreground/10" className="text-muted-foreground hover:text-foreground hover:underline"
> >
<Image <p className="truncate text-sm">{song.artist.name}</p>
src={albumCoverUrl(song.album.id)}
alt={song.album.title}
fill
sizes="44px"
className="object-cover"
/>
</Link> </Link>
<div className="min-w-0 flex-1">
<Link href={`/album/${song.album.id}`} className="hover:underline">
<p className="truncate text-sm font-medium">{song.title}</p>
</Link>
<Link
href={`/artist/${song.artist.id}`}
className="text-muted-foreground hover:text-foreground hover:underline"
>
<p className="truncate text-sm">{song.artist.name}</p>
</Link>
</div>
<MediaContextMenu {...menu} />
</div> </div>
</MediaContextMenuArea>
<MediaContextMenu
label={`More options for ${song.title}`}
stationArtistId={song.artist.id}
selectedCount={1}
onOpenMenu={() => {}}
onAction={handleAction}
favorited={isSongFavorite(song.id)}
navigation={{
artist: { id: song.artist.id },
album: { id: song.album.id },
}}
share={{
type: "song",
albumId: song.album.id,
songId: song.id,
}}
triggerClassName="size-8 shrink-0 opacity-0 transition-opacity group-hover:opacity-100 data-[state=open]:opacity-100"
triggerVariant="ghost"
/>
</div>
) )
} }
+323 -61
View File
@@ -2,20 +2,18 @@
import { MobileSidebarTrigger } from "@/components/mobile-sidebar-trigger" import { MobileSidebarTrigger } from "@/components/mobile-sidebar-trigger"
import { stationArtistId } from "@/lib/station-artist" import { stationArtistId } from "@/lib/station-artist"
import { import { useEffect, useMemo, useState, useRef, MouseEvent } from "react"
useCallback, import Image from "next/image"
useEffect, import Link from "next/link"
useMemo, import { ArrowUpDown, Play, Star } from "lucide-react"
useState,
useRef,
type MouseEvent,
} from "react"
import { ArrowUpDown } from "lucide-react"
import { useAddToPlaylist } from "@/components/add-to-playlist-provider"
import { useFavorites } from "@/components/favorites-provider" import { useFavorites } from "@/components/favorites-provider"
import { usePlaybackActions } from "@/components/playback-provider" import { usePlayback } from "@/components/playback-provider"
import { LibraryTrackListHeader, TrackRow } from "@/components/track-row" import {
import { VirtualList } from "@/components/virtual-list" MediaContextMenu,
type MediaContextAction,
} from "@/components/media-context-menu"
import { Button } from "@/components/ui/button" import { Button } from "@/components/ui/button"
import { import {
DropdownMenu, DropdownMenu,
@@ -27,28 +25,247 @@ import {
DropdownMenuTrigger, DropdownMenuTrigger,
} from "@/components/ui/dropdown-menu" } from "@/components/ui/dropdown-menu"
import { useCachedPaginatedQuery } from "@/hooks/use-cached-query" import { useCachedPaginatedQuery } from "@/hooks/use-cached-query"
import { useTrackListMediaAction } from "@/hooks/use-media-actions" import { useQueueMediaActions } from "@/hooks/use-queue-media-actions"
import { useTrackSelection } from "@/hooks/use-track-selection" import { useTrackSelection } from "@/hooks/use-track-selection"
import { SongListSkeleton } from "@/components/library-skeletons" import { SongListSkeleton } from "@/components/library-skeletons"
import { ScrollArea } from "@/components/ui/scroll-area" import { ScrollArea } from "@/components/ui/scroll-area"
import { Spinner } from "@/components/ui/spinner" import { Spinner } from "@/components/ui/spinner"
import { api } from "@otunes/convex/_generated/api" import { api } from "@otunes/convex/_generated/api"
import {
Table,
TableBody,
TableCell,
TableHead,
TableHeader,
TableRow,
} from "@/components/ui/table"
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils"
import type { Id } from "@otunes/convex/_generated/dataModel" import type { Id } from "@otunes/convex/_generated/dataModel"
import type { BrowseSong } from "@otunes/convex/types"
import { albumCoverUrl } from "@/lib/cover-urls"
import { import {
getSelectionRangePositions, getSelectionRangePositions,
isInSelectionRange,
ALBUM_TRACK_TITLE,
SongsSelectionRangeHighlight,
SongsTrackRowHoverHighlight,
TRACK_ROW_PADDING, TRACK_ROW_PADDING,
type SelectionRangePosition,
} from "@/lib/selection-range-styles" } from "@/lib/selection-range-styles"
import { formatDuration } from "@/lib/format-duration"
type SortKey = "title" | "artist" | "album" type SortKey = "title" | "artist" | "album"
type SortDirection = "asc" | "desc" type SortDirection = "asc" | "desc"
const SONGS_PAGE_SIZE = 50 const SONGS_PAGE_SIZE = 50
const estimateSongRowSize = () => 56
const songRowLayout =
"flex w-full items-center gap-x-4"
const nameColumnLayout =
"grid grid-cols-[2rem_2.5rem_minmax(0,10rem)] items-center gap-x-2"
const songColumnClass = "w-36 shrink-0 truncate"
function SongCover({
song,
inRange,
onPlay,
}: {
song: BrowseSong
inRange: boolean
onPlay: () => void
}) {
return (
<div
className={cn(
"relative size-10 shrink-0 overflow-hidden rounded ring-1",
inRange ? "ring-white/25" : "ring-foreground/10"
)}
>
<Image
src={albumCoverUrl(song.album.id)}
alt={song.album.title}
fill
sizes="40px"
className="object-cover"
/>
<div className="absolute inset-0 flex items-center justify-center bg-black/0 transition-colors group-hover:bg-black/40">
<Button
size="icon-sm"
className="size-7 rounded-full opacity-0 transition-opacity group-hover:opacity-100"
aria-label={`Play ${song.title}`}
onClick={(event) => {
event.preventDefault()
event.stopPropagation()
onPlay()
}}
>
<Play className="size-3 fill-current" />
</Button>
</div>
</div>
)
}
function SongRow({
song,
isSelected,
selectionPosition,
isFavorite,
selectedCount,
stationArtist,
onSelect,
onPointerDown,
onToggleFavorite,
onPrepareContextMenu,
onMediaAction,
onPlay,
}: {
song: BrowseSong
isSelected: boolean
selectionPosition: SelectionRangePosition
isFavorite: boolean
selectedCount: number
stationArtist?: string
onSelect: (event: MouseEvent) => void
onPointerDown: (event: MouseEvent) => void
onToggleFavorite: () => void
onPrepareContextMenu: () => void
onMediaAction: (action: MediaContextAction, songId: string) => void
onPlay: () => void
}) {
const inRange = isInSelectionRange(selectionPosition)
const linkClass = inRange
? "text-primary-foreground hover:text-primary-foreground/80 hover:underline"
: "text-muted-foreground hover:text-foreground hover:underline"
return (
<TableRow
onMouseDown={onPointerDown}
onClick={onSelect}
onDoubleClick={(event) => {
event.preventDefault()
onPlay()
}}
className="group cursor-pointer select-none border-none hover:bg-transparent"
>
<TableCell colSpan={4} className="p-0">
<div
className={cn(
"relative py-2",
inRange && "text-primary-foreground"
)}
>
<SongsSelectionRangeHighlight position={selectionPosition} />
{!inRange ? <SongsTrackRowHoverHighlight /> : null}
<div
className={cn("relative z-10", songRowLayout, TRACK_ROW_PADDING)}
>
<div className={nameColumnLayout}>
<div className="flex items-center justify-center">
<Button
variant="ghost"
size="icon-sm"
className={cn(
"size-8 opacity-0 transition-opacity group-hover:opacity-100",
inRange
? "text-primary-foreground hover:bg-white/15 hover:text-primary-foreground"
: "text-primary hover:text-primary",
(isFavorite || isSelected) && "opacity-100"
)}
aria-label={
isFavorite
? `Remove ${song.title} from favorites`
: `Favorite ${song.title}`
}
onClick={(event) => {
event.stopPropagation()
onToggleFavorite()
}}
>
<Star
className={cn(
"size-4",
isFavorite && (inRange ? "fill-current" : "fill-primary")
)}
/>
</Button>
</div>
<SongCover song={song} inRange={inRange} onPlay={onPlay} />
<span className={ALBUM_TRACK_TITLE}>
{song.title}
{song.explicit ? (
<span
className={cn(
"ml-1.5 inline-flex size-3.5 shrink-0 items-center justify-center rounded-sm text-[9px] font-semibold leading-none",
inRange
? "bg-white/20 text-primary-foreground"
: "bg-muted-foreground/20 text-muted-foreground"
)}
aria-label="Explicit"
>
E
</span>
) : null}
</span>
</div>
<div className={songColumnClass}>
<Link
href={"/artist/" + song.artist.id}
className={linkClass}
onClick={(event) => event.stopPropagation()}
>
{song.artist.name}
</Link>
</div>
<div className={songColumnClass}>
<Link
href={"/album/" + song.album.id}
className={linkClass}
onClick={(event) => event.stopPropagation()}
>
{song.album.title}
</Link>
</div>
<div className="min-w-4 flex-1" />
<span
className={cn(
"shrink-0 text-right tabular-nums",
inRange ? "text-primary-foreground" : "text-muted-foreground"
)}
>
{formatDuration(song.durationSeconds)}
</span>
<MediaContextMenu
label={`More options for ${song.title}`}
stationArtistId={stationArtist}
selectedCount={selectedCount}
align="end"
inSelectionRange={inRange}
onOpenMenu={onPrepareContextMenu}
onAction={(action) => onMediaAction(action, song.id)}
favorited={isFavorite}
navigation={{
artist: { id: song.artist.id },
album: { id: song.album.id },
}}
share={{
type: "song",
albumId: song.album.id,
songId: song.id,
}}
/>
</div>
</div>
</TableCell>
</TableRow>
)
}
export function SongsView() { export function SongsView() {
const { isSongFavorite, toggleSongFavorite } = useFavorites() const { openAddToPlaylist } = useAddToPlaylist()
const { playFromLibrarySong } = usePlaybackActions() const { isSongFavorite, toggleSongFavorite, favoriteSongs } = useFavorites()
const { playFromLibrarySong } = usePlayback()
const { runQueueAction, createStation } = useQueueMediaActions()
const [sortKey, setSortKey] = useState<SortKey>("title") const [sortKey, setSortKey] = useState<SortKey>("title")
const [sortDirection, setSortDirection] = const [sortDirection, setSortDirection] =
useState<SortDirection>("asc") useState<SortDirection>("asc")
@@ -89,6 +306,7 @@ export function SongsView() {
const { const {
selectedIds, selectedIds,
selectedCount, selectedCount,
isSelected,
handleSelect, handleSelect,
handlePointerDown, handlePointerDown,
prepareContextMenu, prepareContextMenu,
@@ -109,27 +327,32 @@ export function SongsView() {
[songs, selectedIds] [songs, selectedIds]
) )
const handleMediaAction = useTrackListMediaAction({ selectedIds, songs }) function handleMediaAction(action: MediaContextAction, fallbackSongId?: string) {
const targetIds =
const handleRowSelect = useCallback( selectedIds.size > 0
(index: number, event: MouseEvent) => { ? Array.from(selectedIds)
handleSelect(songs[index].id, index, event) : fallbackSongId
}, ? [fallbackSongId]
[songs, handleSelect] : []
) switch (action) {
case "create-station": {
const handleRowPlay = useCallback( const artistId = stationArtistId(songs, new Set(targetIds))
(index: number) => { if (artistId) void createStation(artistId)
void playFromLibrarySong(songs[index].id, { sortKey, sortDirection }) break
}, }
[songs, sortKey, sortDirection, playFromLibrarySong] case "favorite":
) void favoriteSongs(targetIds as Id<"songs">[])
break
const handleToggleFavorite = useCallback( case "playlist":
(songId: string) => void toggleSongFavorite(songId as Id<"songs">), openAddToPlaylist(targetIds as Id<"songs">[])
[toggleSongFavorite] break
) case "play-next":
const getSongKey = useCallback((index: number) => songs[index].id, [songs]) case "play-last":
case "shuffle":
void runQueueAction(action, targetIds as Id<"songs">[])
break
}
}
if (status === "LoadingFirstPage" && !isCached) { if (status === "LoadingFirstPage" && !isCached) {
return ( return (
@@ -200,7 +423,7 @@ export function SongsView() {
</p> </p>
) : null} ) : null}
<ScrollArea className="min-h-0 flex-1 [&_[data-slot=scroll-area-viewport]>div]:block!"> <ScrollArea className="min-h-0 flex-1">
<div <div
className="w-full pb-28" className="w-full pb-28"
onClick={(event) => { onClick={(event) => {
@@ -209,29 +432,68 @@ export function SongsView() {
} }
}} }}
> >
<LibraryTrackListHeader /> <Table>
<VirtualList <TableHeader>
count={songs.length} <TableRow className="border-none hover:bg-transparent">
estimateSize={estimateSongRowSize} <TableHead colSpan={4} className="h-9 p-0 font-normal">
getItemKey={getSongKey} <div className={cn(songRowLayout, TRACK_ROW_PADDING)}>
renderItem={(index) => ( <div className={nameColumnLayout}>
<TrackRow <span aria-hidden />
variant="library" <span aria-hidden />
song={songs[index]} <span className="text-xs text-muted-foreground">Name</span>
index={index} </div>
selectionPosition={selectionPositions[index]} <span className={cn(songColumnClass, "text-xs text-muted-foreground")}>
isFavorite={isSongFavorite(songs[index].id)} Artist
selectedCount={selectedCount} </span>
selectionStationArtistId={selectedStationArtistId} <span className={cn(songColumnClass, "text-xs text-muted-foreground")}>
onPointerDown={handlePointerDown} Album
onSelect={handleRowSelect} </span>
onPlay={handleRowPlay} <div className="min-w-4 flex-1" />
onToggleFavorite={handleToggleFavorite} <span className="shrink-0 text-right text-xs text-muted-foreground">
onPrepareContextMenu={prepareContextMenu} Time
onMediaAction={handleMediaAction} </span>
/> <span className="size-8 shrink-0" aria-hidden />
)} </div>
/> </TableHead>
</TableRow>
</TableHeader>
<TableBody>
{songs.map((song, index) => (
<SongRow
key={song.id}
song={song}
isSelected={isSelected(song.id)}
selectionPosition={selectionPositions[index]}
isFavorite={isSongFavorite(song.id)}
stationArtist={
isSelected(song.id)
? selectedStationArtistId
: song.artist.id
}
selectedCount={
isSelected(song.id) && selectedCount > 0
? selectedCount
: 1
}
onPointerDown={handlePointerDown}
onSelect={(event) => {
handleSelect(song.id, index, event)
}}
onToggleFavorite={() =>
void toggleSongFavorite(song.id as Id<"songs">)
}
onPrepareContextMenu={() => prepareContextMenu(song.id)}
onMediaAction={handleMediaAction}
onPlay={() =>
void playFromLibrarySong(song.id as Id<"songs">, {
sortKey,
sortDirection,
})
}
/>
))}
</TableBody>
</Table>
<div <div
ref={loadMoreRef} ref={loadMoreRef}
className="flex items-center justify-center py-4" className="flex items-center justify-center py-4"
@@ -3,62 +3,10 @@
import type { MouseEvent } from "react" import type { MouseEvent } from "react"
import { AudioLines, Pause, Play } from "lucide-react" import { AudioLines, Pause, Play } from "lucide-react"
import { import { usePlayback } from "@/components/playback-provider"
useIsPlaying,
usePlaybackActions,
} from "@/components/playback-provider"
import { Button } from "@/components/ui/button" import { Button } from "@/components/ui/button"
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils"
function trackButtonClassName(showPlay: boolean, inRange: boolean) {
return cn(
"absolute size-8 opacity-0 transition-opacity group-hover:opacity-100",
showPlay && "opacity-100",
inRange
? "text-primary-foreground hover:bg-white/15 hover:text-primary-foreground"
: "text-primary hover:text-primary"
)
}
function NowPlayingButton({
title,
inRange,
}: {
title: string
inRange: boolean
}) {
const isPlaying = useIsPlaying()
const { setIsPlaying } = usePlaybackActions()
return (
<Button
variant="ghost"
size="icon-sm"
className={trackButtonClassName(true, inRange)}
aria-label={isPlaying ? `Pause ${title}` : `Play ${title}`}
onClick={(event: MouseEvent) => {
event.stopPropagation()
setIsPlaying(!isPlaying)
}}
>
<span className="absolute inset-0 flex items-center justify-center transition-opacity group-hover:opacity-0">
{isPlaying ? (
<AudioLines className="size-4" />
) : (
<Play className="size-4 fill-current" />
)}
</span>
<span className="absolute inset-0 flex items-center justify-center opacity-0 transition-opacity group-hover:opacity-100">
{isPlaying ? (
<Pause className="size-4" />
) : (
<Play className="size-4 fill-current" />
)}
</span>
</Button>
)
}
export function TrackNumberPlayButton({ export function TrackNumberPlayButton({
displayTrack, displayTrack,
title, title,
@@ -74,7 +22,26 @@ export function TrackNumberPlayButton({
inRange: boolean inRange: boolean
onPlay: () => void onPlay: () => void
}) { }) {
const { isPlaying, setIsPlaying } = usePlayback()
const showPlay = isActive || isNowPlaying const showPlay = isActive || isNowPlaying
const isCurrentlyPlaying = isNowPlaying && isPlaying
const buttonClassName = cn(
"absolute size-8 opacity-0 transition-opacity group-hover:opacity-100",
showPlay && "opacity-100",
inRange
? "text-primary-foreground hover:bg-white/15 hover:text-primary-foreground"
: "text-primary hover:text-primary"
)
const handleClick = (event: MouseEvent) => {
event.stopPropagation()
if (isNowPlaying) {
setIsPlaying(!isPlaying)
return
}
onPlay()
}
return ( return (
<div <div
@@ -92,17 +59,35 @@ export function TrackNumberPlayButton({
{displayTrack} {displayTrack}
</span> </span>
{isNowPlaying ? ( {isNowPlaying ? (
<NowPlayingButton title={title} inRange={inRange} /> <Button
variant="ghost"
size="icon-sm"
className={buttonClassName}
aria-label={isCurrentlyPlaying ? `Pause ${title}` : `Play ${title}`}
onClick={handleClick}
>
<span className="absolute inset-0 flex items-center justify-center transition-opacity group-hover:opacity-0">
{isCurrentlyPlaying ? (
<AudioLines className="size-4" />
) : (
<Play className="size-4 fill-current" />
)}
</span>
<span className="absolute inset-0 flex items-center justify-center opacity-0 transition-opacity group-hover:opacity-100">
{isCurrentlyPlaying ? (
<Pause className="size-4" />
) : (
<Play className="size-4 fill-current" />
)}
</span>
</Button>
) : ( ) : (
<Button <Button
variant="ghost" variant="ghost"
size="icon-sm" size="icon-sm"
className={trackButtonClassName(showPlay, inRange)} className={buttonClassName}
aria-label={`Play ${title}`} aria-label={`Play ${title}`}
onClick={(event) => { onClick={handleClick}
event.stopPropagation()
onPlay()
}}
> >
<Play className="size-4 fill-current" /> <Play className="size-4 fill-current" />
</Button> </Button>
-518
View File
@@ -1,518 +0,0 @@
"use client"
import * as React from "react"
import Image from "next/image"
import Link from "next/link"
import { Music2, Play, Star, Trash2 } from "lucide-react"
import {
MediaContextMenu,
MediaContextMenuArea,
MediaMenuItem,
MediaMenuSeparator,
type MediaContextAction,
type MediaContextMenuProps,
} from "@/components/media-context-menu"
import { PlaybackSongMeta } from "@/components/playback-song-meta"
import { TrackNumberPlayButton } from "@/components/track-number-play-button"
import { Button } from "@/components/ui/button"
import { albumCoverUrl } from "@/lib/cover-urls"
import {
ALBUM_TRACK_ROW,
ALBUM_TRACK_TITLE,
isInSelectionRange,
SelectionRangeHighlight,
TrackRowActiveHighlight,
TrackRowHoverHighlight,
TRACK_ROW_PADDING,
type SelectionRangePosition,
} from "@/lib/selection-range-styles"
import { formatDuration } from "@/lib/format-duration"
import { cn } from "@/lib/utils"
import type { BrowseSong } from "@otunes/convex/types"
/**
* - `library`: favorite star, cover with play overlay, title, artist and album
* columns (use with `LibraryTrackListHeader`).
* - `album`: favorite star, track number, title with optional credits.
* - `playlist`: cover with favorite overlay, track number, title.
* - `queue`: square cover, title and artist, no menu.
*/
export type TrackRowVariant = "library" | "album" | "playlist" | "queue"
export type TrackRowProps = {
variant: TrackRowVariant
song: BrowseSong
/** Position in the list the selection hook was given. */
index: number
/** Number shown in the track number column (`album` and `playlist`). */
trackNumber?: number
/** Secondary line under the title, e.g. album track credits. */
subtitle?: string
selectionPosition: SelectionRangePosition
isActive?: boolean
isNowPlaying?: boolean
isFavorite?: boolean
isDragging?: boolean
/** Total selected songs; the menu acts on these when this row is selected. */
selectedCount?: number
/** Station artist for the selection when this row is selected. */
selectionStationArtistId?: string
playlistLabel?: string
showFavoriteInMenu?: boolean
/** Adds a destructive menu item calling `onRemove`. */
removeLabel?: string
ref?: React.Ref<HTMLElement>
onSelect: (index: number, event: React.MouseEvent) => void
onPointerDown: (event: React.MouseEvent) => void
onPlay: (index: number) => void
onToggleFavorite?: (songId: string) => void
onPrepareContextMenu?: (songId: string) => void
/** Renders the "more options" and right-click menus when provided. */
onMediaAction?: (action: MediaContextAction, songId: string) => void
onRemove?: (songId: string) => void
/** Makes the row draggable when provided. */
onDragStart?: (index: number) => void
onDrop?: (index: number) => void
}
const LIBRARY_ROW_LAYOUT = "flex w-full items-center gap-x-4"
const LIBRARY_NAME_COLUMNS =
"grid grid-cols-[2rem_2.5rem_minmax(0,10rem)] items-center gap-x-2"
const LIBRARY_COLUMN = "w-36 shrink-0 truncate"
export function TrackCover({
albumId,
alt,
inRange,
square = false,
children,
}: {
albumId: string | undefined
alt: string
inRange: boolean
square?: boolean
/** Overlay shown above the cover image. */
children?: React.ReactNode
}) {
const ringClass = inRange ? "ring-white/25" : "ring-foreground/10"
if (!albumId) {
return (
<div
className={cn(
"flex size-10 shrink-0 items-center justify-center bg-muted ring-1",
!square && "rounded",
ringClass
)}
>
<Music2 className="size-4 text-muted-foreground" />
</div>
)
}
return (
<div
className={cn(
"group/cover relative size-10 shrink-0 overflow-hidden ring-1",
!square && "rounded",
ringClass
)}
>
<Image
src={albumCoverUrl(albumId)}
alt={alt}
fill
sizes="40px"
className="object-cover"
/>
{children}
</div>
)
}
function FavoriteStarButton({
title,
isFavorite,
inRange,
className,
onToggle,
}: {
title: string
isFavorite: boolean
inRange: boolean
className?: string
onToggle: () => void
}) {
return (
<Button
variant="ghost"
size="icon-sm"
className={cn(
"size-8",
inRange
? "text-primary-foreground hover:bg-white/15 hover:text-primary-foreground"
: "text-primary hover:text-primary",
className
)}
aria-label={isFavorite ? `Remove ${title} from favorites` : `Favorite ${title}`}
onClick={(event) => {
event.stopPropagation()
onToggle()
}}
>
<Star
className={cn(
"size-4",
isFavorite && (inRange ? "fill-current" : "fill-primary")
)}
/>
</Button>
)
}
function ExplicitBadge({ inRange }: { inRange: boolean }) {
return (
<span
className={cn(
"ml-1.5 inline-flex size-3.5 shrink-0 items-center justify-center rounded-sm text-[9px] font-semibold leading-none",
inRange
? "bg-white/20 text-primary-foreground"
: "bg-muted-foreground/20 text-muted-foreground"
)}
aria-label="Explicit"
>
E
</span>
)
}
function TrackTitle({
song,
subtitle,
inRange,
}: {
song: BrowseSong
subtitle?: string
inRange: boolean
}) {
return (
<div className="min-w-0 flex-1">
<div className={ALBUM_TRACK_TITLE}>
{song.title}
{song.explicit ? <ExplicitBadge inRange={inRange} /> : null}
</div>
{subtitle ? (
<p
className={cn(
"truncate text-xs",
inRange ? "text-primary-foreground/80" : "text-muted-foreground"
)}
>
{subtitle}
</p>
) : null}
</div>
)
}
export function LibraryTrackListHeader() {
const labelClass = "text-xs text-muted-foreground"
return (
<div className={cn("flex h-9 items-center", LIBRARY_ROW_LAYOUT, TRACK_ROW_PADDING)}>
<div className={LIBRARY_NAME_COLUMNS}>
<span aria-hidden />
<span aria-hidden />
<span className={labelClass}>Name</span>
</div>
<span className={cn(LIBRARY_COLUMN, labelClass)}>Artist</span>
<span className={cn(LIBRARY_COLUMN, labelClass)}>Album</span>
<div className="min-w-4 flex-1" />
<span className={cn("shrink-0 text-right", labelClass)}>Time</span>
<span className="size-8 shrink-0" aria-hidden />
</div>
)
}
function TrackRowComponent({
variant,
song,
index,
trackNumber,
subtitle,
selectionPosition,
isActive = false,
isNowPlaying = false,
isFavorite = false,
isDragging = false,
selectedCount = 0,
selectionStationArtistId,
playlistLabel,
showFavoriteInMenu = true,
removeLabel,
ref,
onSelect,
onPointerDown,
onPlay,
onToggleFavorite,
onPrepareContextMenu,
onMediaAction,
onRemove,
onDragStart,
onDrop,
}: TrackRowProps) {
const inRange = isInSelectionRange(selectionPosition)
const flush = variant === "library" || variant === "queue"
const play = () => onPlay(index)
const toggleFavorite = () => onToggleFavorite?.(song.id)
const favoriteStar = (
<div className="flex shrink-0 items-center justify-center">
<FavoriteStarButton
title={song.title}
isFavorite={isFavorite}
inRange={inRange}
className={cn(
"opacity-0 transition-opacity group-hover:opacity-100",
(isFavorite || isActive || inRange) && "opacity-100"
)}
onToggle={toggleFavorite}
/>
</div>
)
const trackNumberButton = (
<TrackNumberPlayButton
displayTrack={trackNumber ?? index + 1}
title={song.title}
isActive={isActive}
isNowPlaying={isNowPlaying}
inRange={inRange}
onPlay={play}
/>
)
const duration = (
<span
className={cn(
"shrink-0 text-right tabular-nums",
variant === "queue" && "text-xs",
inRange ? "text-primary-foreground" : "text-muted-foreground"
)}
>
{formatDuration(song.durationSeconds)}
</span>
)
// Shared by the "more options" button and the right-click menu.
const menuProps: MediaContextMenuProps | null = onMediaAction
? {
label: `More options for ${song.title}`,
stationArtistId: inRange ? selectionStationArtistId : song.artist.id,
selectedCount: inRange && selectedCount > 0 ? selectedCount : 1,
inSelectionRange: inRange,
onOpenMenu: () => onPrepareContextMenu?.(song.id),
onAction: (action) => onMediaAction(action, song.id),
playlistLabel,
showFavorite: showFavoriteInMenu,
favorited: isFavorite,
navigation: {
artist: { id: song.artist.id },
album: { id: song.album.id },
},
share: { type: "song", albumId: song.album.id, songId: song.id },
children:
removeLabel && onRemove ? (
<>
<MediaMenuSeparator />
<MediaMenuItem
variant="destructive"
className="justify-between"
onClick={() => onRemove(song.id)}
>
{removeLabel}
<Trash2 />
</MediaMenuItem>
</>
) : null,
}
: null
const menu = menuProps ? <MediaContextMenu {...menuProps} /> : null
let content: React.ReactNode
switch (variant) {
case "library": {
const linkClass = inRange
? "text-primary-foreground hover:text-primary-foreground/80 hover:underline"
: "text-muted-foreground hover:text-foreground hover:underline"
content = (
<div className={cn("relative z-10", LIBRARY_ROW_LAYOUT, TRACK_ROW_PADDING)}>
<div className={LIBRARY_NAME_COLUMNS}>
{favoriteStar}
<TrackCover albumId={song.album.id} alt={song.album.title} inRange={inRange}>
<div className="absolute inset-0 flex items-center justify-center bg-black/0 transition-colors group-hover:bg-black/40">
<Button
size="icon-sm"
className="size-7 rounded-full opacity-0 transition-opacity group-hover:opacity-100"
aria-label={`Play ${song.title}`}
onClick={(event) => {
event.preventDefault()
event.stopPropagation()
play()
}}
>
<Play className="size-3 fill-current" />
</Button>
</div>
</TrackCover>
<TrackTitle song={song} inRange={inRange} />
</div>
<div className={LIBRARY_COLUMN}>
<Link
href={"/artist/" + song.artist.id}
className={linkClass}
onClick={(event) => event.stopPropagation()}
>
{song.artist.name}
</Link>
</div>
<div className={LIBRARY_COLUMN}>
<Link
href={"/album/" + song.album.id}
className={linkClass}
onClick={(event) => event.stopPropagation()}
>
{song.album.title}
</Link>
</div>
<div className="min-w-4 flex-1" />
{duration}
{menu}
</div>
)
break
}
case "album":
content = (
<div className={cn("relative z-10", ALBUM_TRACK_ROW, TRACK_ROW_PADDING)}>
{favoriteStar}
{trackNumberButton}
<TrackTitle song={song} subtitle={subtitle} inRange={inRange} />
{duration}
{menu}
</div>
)
break
case "playlist":
content = (
<div className={cn("relative z-10", ALBUM_TRACK_ROW, TRACK_ROW_PADDING)}>
<TrackCover albumId={song.album.id} alt={song.album.title} inRange={inRange}>
<div className="absolute inset-0 flex items-center justify-center bg-black/0 opacity-0 transition-opacity group-hover/cover:bg-black/40 group-hover/cover:opacity-100">
<FavoriteStarButton
title={song.title}
isFavorite={isFavorite}
inRange={inRange}
onToggle={toggleFavorite}
/>
</div>
</TrackCover>
{trackNumberButton}
<TrackTitle song={song} subtitle={subtitle} inRange={inRange} />
{duration}
{menu}
</div>
)
break
case "queue":
content = (
<div className="relative z-10 flex items-center gap-3 px-2">
<TrackCover
albumId={song.album.id}
alt={song.album.title}
inRange={inRange}
square
/>
<PlaybackSongMeta
song={song}
isCurrent={isNowPlaying}
inRange={inRange}
align="start"
showAlbum={false}
/>
{duration}
</div>
)
break
}
const shellProps = {
role: "button",
tabIndex: 0,
draggable: onDragStart ? true : undefined,
onDragStart: onDragStart
? (event: React.DragEvent) => {
event.dataTransfer.effectAllowed = "move"
onDragStart(index)
}
: undefined,
onDragOver: onDragStart
? (event: React.DragEvent) => event.preventDefault()
: undefined,
onDrop: onDrop
? (event: React.DragEvent) => {
event.preventDefault()
onDrop(index)
}
: undefined,
onMouseDown: onPointerDown,
onClick: (event: React.MouseEvent) => onSelect(index, event),
onDoubleClick: (event: React.MouseEvent) => {
event.preventDefault()
play()
},
onKeyDown: (event: React.KeyboardEvent) => {
if (event.key === "Enter" || event.key === " ") {
event.preventDefault()
onSelect(index, event as unknown as React.MouseEvent)
}
},
className: cn(
"group relative w-full cursor-pointer select-none text-left text-sm transition-colors",
flush ? "py-2" : "py-2.5",
inRange && "text-primary-foreground",
isDragging && "opacity-50"
),
}
const children = (
<>
<SelectionRangeHighlight position={selectionPosition} flush={flush} />
{!inRange && isActive ? <TrackRowActiveHighlight flush={flush} /> : null}
{!inRange && !isActive ? <TrackRowHoverHighlight flush={flush} /> : null}
{content}
</>
)
const shell =
variant === "queue" ? (
<li ref={ref as React.Ref<HTMLLIElement>} {...shellProps}>
{children}
</li>
) : (
<div ref={ref as React.Ref<HTMLDivElement>} {...shellProps}>
{children}
</div>
)
return menuProps ? (
<MediaContextMenuArea menu={menuProps}>{shell}</MediaContextMenuArea>
) : (
shell
)
}
/**
* Pass stable callbacks: they receive the row's `index` or song id, so one
* handler can serve every row.
*/
export const TrackRow = React.memo(TrackRowComponent)
-120
View File
@@ -1,120 +0,0 @@
"use client"
import * as React from "react"
import {
defaultRangeExtractor,
useVirtualizer,
type Range,
} from "@tanstack/react-virtual"
import { cn } from "@/lib/utils"
const scrollViewportSelector = '[data-slot="scroll-area-viewport"]'
/**
* Renders only the visible items of a list placed inside a `ScrollArea`.
* The list may sit below other content in the same viewport.
*/
export function VirtualList({
count,
estimateSize,
getItemKey,
renderItem,
overscan = 10,
keepMounted = null,
className,
}: {
count: number
estimateSize: (index: number) => number
getItemKey: (index: number) => string
renderItem: (index: number) => React.ReactNode
overscan?: number
/** Index rendered even when off screen, e.g. the source of a drag. */
keepMounted?: number | null
className?: string
}) {
const listRef = React.useRef<HTMLDivElement>(null)
const [scrollMargin, setScrollMargin] = React.useState(0)
React.useLayoutEffect(() => {
const list = listRef.current
const viewport = list?.closest<HTMLElement>(scrollViewportSelector)
if (!list || !viewport) return
const measure = () => {
setScrollMargin(
Math.round(
list.getBoundingClientRect().top -
viewport.getBoundingClientRect().top +
viewport.scrollTop
)
)
}
const observer = new ResizeObserver(measure)
observer.observe(viewport)
if (viewport.firstElementChild) {
observer.observe(viewport.firstElementChild)
}
return () => observer.disconnect()
}, [])
const getScrollElement = () =>
listRef.current?.closest<HTMLElement>(scrollViewportSelector) ?? null
const virtualizer = useVirtualizer({
count,
getScrollElement,
// The virtualizer scrolls to this offset on attach. Keep the viewport's
// current position so `ScrollRestoration` is not reset to the top.
initialOffset: () => getScrollElement()?.scrollTop ?? 0,
estimateSize,
getItemKey,
overscan,
scrollMargin,
rangeExtractor: React.useCallback(
(range: Range) => {
const indexes = defaultRangeExtractor(range)
if (
keepMounted !== null &&
keepMounted < range.count &&
!indexes.includes(keepMounted)
) {
indexes.push(keepMounted)
indexes.sort((a, b) => a - b)
}
return indexes
},
[keepMounted]
),
})
// The virtualizer caches its offset across a detach. Clear it so a
// re-attach (e.g. StrictMode's effect replay) re-reads `initialOffset`
// instead of scrolling back to a stale position.
React.useLayoutEffect(
() => () => {
virtualizer.scrollOffset = null
},
[virtualizer]
)
return (
<div
ref={listRef}
className={cn("relative w-full", className)}
style={{ height: virtualizer.getTotalSize() }}
>
{virtualizer.getVirtualItems().map((item) => (
<div
key={item.key}
data-index={item.index}
ref={virtualizer.measureElement}
className="absolute top-0 left-0 w-full"
style={{ transform: `translateY(${item.start - scrollMargin}px)` }}
>
{renderItem(item.index)}
</div>
))}
</div>
)
}
+2 -21
View File
@@ -9,18 +9,13 @@ import {
type PaginatedQueryReference, type PaginatedQueryReference,
} from "convex/react" } from "convex/react"
import type { FunctionReference } from "convex/server" import type { FunctionReference } from "convex/server"
import { useCallback, useEffect, useMemo, useSyncExternalStore } from "react" import { useCallback, useEffect, useSyncExternalStore } from "react"
import { useCacheScope } from "@/components/persistent-cache-provider" import { useCacheScope } from "@/components/persistent-cache-provider"
import { queryCacheKey } from "@otunes/convex/client/cached-query" import { queryCacheKey } from "@otunes/convex/client/cached-query"
import { readCache, subscribeCache, writeCache } from "@/lib/persistent-cache" import { readCache, subscribeCache, writeCache } from "@/lib/persistent-cache"
const MAX_CACHED_PAGINATED_ITEMS = 200 const MAX_CACHED_PAGINATED_ITEMS = 200
const MAX_RESTORED_PAGINATED_ITEMS = 1000
// Items loaded per paginated query this session, so a remount (e.g. back
// navigation) loads as much as before and scroll restoration can reach it.
const loadedItemCounts = new Map<string, number>()
const noopUnsubscribe = () => {} const noopUnsubscribe = () => {}
@@ -70,7 +65,6 @@ export function useCachedQuery<Query extends FunctionReference<"query">>(
/** /**
* `usePaginatedQuery` that shows the first persisted pages while the first live * `usePaginatedQuery` that shows the first persisted pages while the first live
* page loads. `isCached` is true while those persisted results are shown. * page loads. `isCached` is true while those persisted results are shown.
* Remounts start with as many items as were last loaded this session.
*/ */
export function useCachedPaginatedQuery<Query extends PaginatedQueryReference>( export function useCachedPaginatedQuery<Query extends PaginatedQueryReference>(
query: Query, query: Query,
@@ -78,28 +72,15 @@ export function useCachedPaginatedQuery<Query extends PaginatedQueryReference>(
options: { initialNumItems: number } options: { initialNumItems: number }
) { ) {
const scope = useCacheScope() const scope = useCacheScope()
const result = usePaginatedQuery(query, args, options)
const key = const key =
args === "skip" args === "skip"
? null ? null
: `${queryCacheKey(scope, query, args as Record<string, unknown>)}:pages` : `${queryCacheKey(scope, query, args as Record<string, unknown>)}:pages`
// Fixed per key: `usePaginatedQuery` restarts when this changes.
const initialNumItems = useMemo(
() =>
Math.max(
options.initialNumItems,
Math.min(
(key && loadedItemCounts.get(key)) || 0,
MAX_RESTORED_PAGINATED_ITEMS
)
),
[key, options.initialNumItems]
)
const result = usePaginatedQuery(query, args, { initialNumItems })
const cached = useCachedValue<PaginatedQueryItem<Query>[]>(key) const cached = useCachedValue<PaginatedQueryItem<Query>[]>(key)
useEffect(() => { useEffect(() => {
if (key && result.status !== "LoadingFirstPage") { if (key && result.status !== "LoadingFirstPage") {
loadedItemCounts.set(key, result.results.length)
writeCache(key, result.results.slice(0, MAX_CACHED_PAGINATED_ITEMS)) writeCache(key, result.results.slice(0, MAX_CACHED_PAGINATED_ITEMS))
} }
}, [key, result.status, result.results]) }, [key, result.status, result.results])
-104
View File
@@ -1,104 +0,0 @@
"use client"
import * as React from "react"
import { useConvex } from "convex/react"
import { useAddToPlaylist } from "@/components/add-to-playlist-provider"
import { useFavorites } from "@/components/favorites-provider"
import type { MediaContextAction } from "@/components/media-context-menu"
import { useCacheScope } from "@/components/persistent-cache-provider"
import { useQueueMediaActions } from "@/hooks/use-queue-media-actions"
import { stationArtistId } from "@/lib/station-artist"
import { api } from "@otunes/convex/_generated/api"
import type { Id } from "@otunes/convex/_generated/dataModel"
import { fetchCachedQuery } from "@otunes/convex/client/cached-query"
export function useMediaActions() {
const { openAddToPlaylist, openAddArtistToPlaylist } = useAddToPlaylist()
const { favoriteSongs, toggleArtistFavorite } = useFavorites()
const { runQueueAction, createStation } = useQueueMediaActions()
const convex = useConvex()
const cacheScope = useCacheScope()
const runSongsAction = React.useCallback(
(
action: MediaContextAction,
songIds: Id<"songs">[],
stationArtist?: string
) => {
switch (action) {
case "create-station":
if (stationArtist) void createStation(stationArtist)
break
case "favorite":
void favoriteSongs(songIds)
break
case "playlist":
openAddToPlaylist(songIds)
break
case "play-next":
case "play-last":
case "shuffle":
void runQueueAction(action, songIds)
break
}
},
[createStation, favoriteSongs, openAddToPlaylist, runQueueAction]
)
const runArtistAction = React.useCallback(
async (action: MediaContextAction, artistId: string) => {
switch (action) {
case "favorite":
void toggleArtistFavorite(artistId as Id<"artists">)
break
case "playlist":
void openAddArtistToPlaylist(artistId as Id<"artists">)
break
case "play-next":
case "play-last":
case "shuffle": {
const songIds = await fetchCachedQuery(
convex,
cacheScope,
api.playlists.getOrderedArtistSongIds,
{ artistId: artistId as Id<"artists"> }
)
void runQueueAction(action, songIds)
break
}
}
},
[convex, cacheScope, toggleArtistFavorite, openAddArtistToPlaylist, runQueueAction]
)
return { runSongsAction, runArtistAction }
}
/**
* Handles a track row menu action, targeting the current selection or else the
* row's song. The station artist is `artistId` when given, otherwise the artist
* every targeted song in `songs` shares.
*/
export function useTrackListMediaAction({
selectedIds,
songs,
artistId,
}: {
selectedIds: ReadonlySet<string>
songs?: { id: string; artist: { id: string } }[]
artistId?: string
}) {
const { runSongsAction } = useMediaActions()
return React.useCallback(
(action: MediaContextAction, songId: string) => {
const targetIds = selectedIds.size > 0 ? Array.from(selectedIds) : [songId]
const stationArtist =
artistId ??
(songs ? stationArtistId(songs, new Set(targetIds)) : undefined)
runSongsAction(action, targetIds as Id<"songs">[], stationArtist)
},
[selectedIds, songs, artistId, runSongsAction]
)
}
+2 -2
View File
@@ -3,7 +3,7 @@
import * as React from "react" import * as React from "react"
import { toast } from "sonner" import { toast } from "sonner"
import { usePlaybackActions } from "@/components/playback-provider" import { usePlayback } from "@/components/playback-provider"
import type { MediaContextAction } from "@/components/media-context-menu" import type { MediaContextAction } from "@/components/media-context-menu"
import type { Id } from "@otunes/convex/_generated/dataModel" import type { Id } from "@otunes/convex/_generated/dataModel"
@@ -29,7 +29,7 @@ function queueActionMessage(action: QueueMediaAction, count: number) {
export function useQueueMediaActions() { export function useQueueMediaActions() {
const { addToQueueNext, addToQueueLast, playShuffled, playArtistShuffled } = const { addToQueueNext, addToQueueLast, playShuffled, playArtistShuffled } =
usePlaybackActions() usePlayback()
const runQueueAction = React.useCallback( const runQueueAction = React.useCallback(
async (action: QueueMediaAction, songIds: Id<"songs">[]) => { async (action: QueueMediaAction, songIds: Id<"songs">[]) => {
-19
View File
@@ -1,19 +0,0 @@
"use client"
import * as React from "react"
/**
* Returns a function with a stable identity that always calls the latest
* `callback`. Only call it from event handlers, never during render.
*/
export function useStableCallback<Args extends unknown[], Result>(
callback: (...args: Args) => Result
): (...args: Args) => Result {
const callbackRef = React.useRef(callback)
React.useLayoutEffect(() => {
callbackRef.current = callback
})
return React.useCallback((...args: Args) => callbackRef.current(...args), [])
}
+55 -9
View File
@@ -1,16 +1,62 @@
import { toast } from "sonner" import { toast } from "sonner"
import {
mediaShareUrl,
type MediaShareTarget,
} from "@otunes/convex/client/media-links"
export type MediaShareContext = MediaShareTarget export type MediaShareContext =
| { type: "album"; albumId: string }
| { type: "song"; albumId: string; songId: string }
| { type: "playlist"; playlistId: string; isFavorites?: boolean }
| { type: "artist"; artistId: string }
function mediaOrigin() {
if (typeof window === "undefined") {
return ""
}
return window.location.origin
}
function albumShareUrl(albumId: string) {
return `${mediaOrigin()}/album/${albumId}`
}
function songShareUrl(albumId: string, songId: string) {
return `${mediaOrigin()}/album/${albumId}?s=${songId}`
}
function playlistShareUrl(
playlistId: string,
options?: { isFavorites?: boolean }
) {
if (options?.isFavorites) {
return `${mediaOrigin()}/playlist/favorites`
}
return `${mediaOrigin()}/playlist/${playlistId}`
}
function artistShareUrl(artistId: string) {
return `${mediaOrigin()}/artist/${artistId}`
}
function mediaShareUrl(share: MediaShareContext) {
switch (share.type) {
case "album":
return albumShareUrl(share.albumId)
case "song":
return songShareUrl(share.albumId, share.songId)
case "playlist":
return playlistShareUrl(share.playlistId, {
isFavorites: share.isFavorites,
})
case "artist":
return artistShareUrl(share.artistId)
}
}
async function copyTextToClipboard(text: string) {
await navigator.clipboard.writeText(text)
toast.success("Link Copied")
}
export async function copyMediaShareLink(share: MediaShareContext) { export async function copyMediaShareLink(share: MediaShareContext) {
await navigator.clipboard.writeText( await copyTextToClipboard(mediaShareUrl(share))
mediaShareUrl(window.location.origin, share)
)
toast.success("Link Copied")
} }
export async function copyAlbumLink(albumId: string) { export async function copyAlbumLink(albumId: string) {
+95 -21
View File
@@ -46,7 +46,7 @@ export function getSelectionRangePositions(
return positions return positions
} }
export function selectionHighlightRadiusClass( function selectionHighlightRadiusClass(
position: SelectionRangePosition position: SelectionRangePosition
) { ) {
switch (position) { switch (position) {
@@ -61,21 +61,12 @@ export function selectionHighlightRadiusClass(
} }
} }
export const TRACK_ROW_HIGHLIGHT_INSET = "absolute inset-y-0 left-2 right-2" const TRACK_ROW_HIGHLIGHT_INSET = "absolute inset-y-0 left-2 right-2"
/** Full-width, square-corner highlight used by the library and queue lists. */
export const FLUSH_ROW_HIGHLIGHT_INSET = "absolute inset-0"
/**
* Track row highlights are inset rounded pills by default; `flush` makes them
* full-width with square corners.
*/
export function SelectionRangeHighlight({ export function SelectionRangeHighlight({
position, position,
flush = false,
}: { }: {
position: SelectionRangePosition position: SelectionRangePosition
flush?: boolean
}) { }) {
if (position === "none") { if (position === "none") {
return null return null
@@ -86,34 +77,34 @@ export function SelectionRangeHighlight({
aria-hidden aria-hidden
className={cn( className={cn(
"pointer-events-none bg-primary", "pointer-events-none bg-primary",
flush TRACK_ROW_HIGHLIGHT_INSET,
? FLUSH_ROW_HIGHLIGHT_INSET selectionHighlightRadiusClass(position)
: [TRACK_ROW_HIGHLIGHT_INSET, selectionHighlightRadiusClass(position)]
)} )}
/> />
) )
} }
export function TrackRowHoverHighlight({ flush = false }: { flush?: boolean }) { /** Inset rounded hover background matching the selection pill shape. */
export function TrackRowHoverHighlight() {
return ( return (
<div <div
aria-hidden aria-hidden
className={cn( className={cn(
"pointer-events-none bg-muted/60 opacity-0 transition-opacity group-hover:opacity-100", "pointer-events-none rounded-lg bg-muted/60 opacity-0 transition-opacity group-hover:opacity-100",
flush ? FLUSH_ROW_HIGHLIGHT_INSET : [TRACK_ROW_HIGHLIGHT_INSET, "rounded-lg"] TRACK_ROW_HIGHLIGHT_INSET
)} )}
/> />
) )
} }
/** Background for the active (focused or now playing) row. */ /** Inset rounded background for the active (now playing) row. */
export function TrackRowActiveHighlight({ flush = false }: { flush?: boolean }) { export function TrackRowActiveHighlight() {
return ( return (
<div <div
aria-hidden aria-hidden
className={cn( className={cn(
"pointer-events-none bg-muted/60", "pointer-events-none rounded-lg bg-muted/60",
flush ? FLUSH_ROW_HIGHLIGHT_INSET : [TRACK_ROW_HIGHLIGHT_INSET, "rounded-lg"] TRACK_ROW_HIGHLIGHT_INSET
)} )}
/> />
) )
@@ -125,6 +116,42 @@ export const TRACK_ROW_PADDING = "pl-8 pr-10"
/** Centers the track list in the main content area. */ /** Centers the track list in the main content area. */
export const TRACK_LIST_CONTAINER = "mx-auto w-full max-w-9/10" export const TRACK_LIST_CONTAINER = "mx-auto w-full max-w-9/10"
/** Full-width highlight for library song rows (no horizontal inset). */
const SONGS_ROW_HIGHLIGHT_INSET = "absolute inset-0"
export function SongsSelectionRangeHighlight({
position,
}: {
position: SelectionRangePosition
}) {
if (position === "none") {
return null
}
return (
<div
aria-hidden
className={cn(
"pointer-events-none bg-primary",
SONGS_ROW_HIGHLIGHT_INSET
)}
/>
)
}
/** Full-width hover background for library song rows (not rounded). */
export function SongsTrackRowHoverHighlight() {
return (
<div
aria-hidden
className={cn(
"pointer-events-none bg-muted/60 opacity-0 transition-opacity group-hover:opacity-100",
SONGS_ROW_HIGHLIGHT_INSET
)}
/>
)
}
/** Album track row: star, track #, title (flex), duration, menu. */ /** Album track row: star, track #, title (flex), duration, menu. */
export const ALBUM_TRACK_ROW = "flex w-full min-w-0 items-center gap-x-3" export const ALBUM_TRACK_ROW = "flex w-full min-w-0 items-center gap-x-3"
@@ -133,3 +160,50 @@ export const ALBUM_TRACK_TITLE = "min-w-0 flex-1 truncate font-normal"
export function isInSelectionRange(position: SelectionRangePosition) { export function isInSelectionRange(position: SelectionRangePosition) {
return position !== "none" return position !== "none"
} }
/** Full-width, square-corner highlights for the queue sidebar. */
const QUEUE_ROW_HIGHLIGHT_INSET = "absolute inset-0"
export function QueueSelectionRangeHighlight({
position,
}: {
position: SelectionRangePosition
}) {
if (position === "none") {
return null
}
return (
<div
aria-hidden
className={cn(
"pointer-events-none bg-primary",
QUEUE_ROW_HIGHLIGHT_INSET
)}
/>
)
}
export function QueueTrackRowHoverHighlight() {
return (
<div
aria-hidden
className={cn(
"pointer-events-none bg-muted/60 opacity-0 transition-opacity group-hover:opacity-100",
QUEUE_ROW_HIGHLIGHT_INSET
)}
/>
)
}
export function QueueTrackRowActiveHighlight() {
return (
<div
aria-hidden
className={cn(
"pointer-events-none bg-muted/60",
QUEUE_ROW_HIGHLIGHT_INSET
)}
/>
)
}
-41
View File
@@ -1,41 +0,0 @@
import fs from "node:fs/promises"
import * as music from "music-metadata"
const MAX_ENTRIES = 1000
export type AudioInfo = {
codec: string | undefined
duration: number | undefined
}
const cache = new Map<string, Promise<AudioInfo>>()
/** Codec info for a file, parsed once per file version. */
export async function audioInfo(file: string): Promise<AudioInfo> {
const stat = await fs.stat(file)
const key = `${file}\0${stat.size}\0${stat.mtimeMs}`
const cached = cache.get(key)
if (cached) {
cache.delete(key)
cache.set(key, cached)
return cached
}
const info = music.parseFile(file).then(({ format }) => ({
codec: format.codec,
duration: format.duration,
}))
cache.set(key, info)
info.catch(() => {
if (cache.get(key) === info) {
cache.delete(key)
}
})
if (cache.size > MAX_ENTRIES) {
cache.delete(cache.keys().next().value!)
}
return info
}
+84 -84
View File
@@ -1,96 +1,96 @@
import { createReadStream } from "node:fs" import { type ChildProcessWithoutNullStreams } from "node:child_process"
import type { Readable } from "node:stream" import { createReadStream, ReadStream } from "node:fs"
import type { FfmpegProcess } from "@/lib/server-ffmpeg"
const HIGH_WATER_MARK_BYTES = 256 * 1024
export type ByteRange = { export type ByteRange = {
start: number start: number
end: number end: number
} }
/** async function* nodeStreamToIterator(stream: ReadStream) {
* Wraps a Node stream, pausing it while the consumer is behind. `cancel` runs for await (const chunk of stream) {
* when the consumer goes away (seek, track change, disconnect). `finish` runs yield new Uint8Array(chunk)
* when the source ends and may reject to error the stream. }
*/
function toWebStream(
source: Readable,
{
cancel,
finish,
}: { cancel: () => void; finish?: () => Promise<void> }
): ReadableStream<Uint8Array> {
let done = false
return new ReadableStream<Uint8Array>(
{
start(controller) {
const fail = (error: unknown) => {
if (done) {
return
}
done = true
controller.error(error)
cancel()
}
source.on("data", (chunk: Buffer) => {
if (done) {
return
}
controller.enqueue(new Uint8Array(chunk))
if ((controller.desiredSize ?? 0) <= 0) {
source.pause()
}
})
source.once("error", fail)
source.once("end", () => {
if (done) {
return
}
void (finish?.() ?? Promise.resolve()).then(() => {
if (!done) {
done = true
controller.close()
}
}, fail)
})
},
pull() {
source.resume()
},
cancel() {
if (done) {
return
}
done = true
cancel()
},
},
new ByteLengthQueuingStrategy({ highWaterMark: HIGH_WATER_MARK_BYTES })
)
} }
export function streamFile(path: string, range?: ByteRange) { // @ts-expect-error trust me bro
const file = createReadStream(path, range) function iteratorToStream(iterator) {
return toWebStream(file, { cancel: () => file.destroy() }) return new ReadableStream({
} async pull(controller) {
const { value, done } = await iterator.next()
/** Streams ffmpeg stdout and kills ffmpeg when the consumer goes away. */ if (done) {
export function ffmpegToReadableStream({ controller.close()
child, } else {
exited, controller.enqueue(value)
stderrTail,
}: FfmpegProcess) {
return toWebStream(child.stdout, {
cancel: () => child.kill("SIGKILL"),
finish: async () => {
const code = await exited
if (code !== 0) {
console.error(`ffmpeg transcode exited with code ${code}`, stderrTail())
throw new Error(`ffmpeg exited with code ${code}`)
} }
}, },
}) })
} }
export function streamFile(path: string, range?: ByteRange): ReadableStream {
const nodeStream = createReadStream(path, range)
return iteratorToStream(nodeStreamToIterator(nodeStream))
}
export function ffmpegToReadableStream(
ffmpegProcess: ChildProcessWithoutNullStreams
) {
let closed = false
return new ReadableStream({
start(controller) {
const finalize = (err?: Error) => {
if (closed) {
return
}
closed = true
try {
if (err) {
controller.error(err)
} else {
controller.close()
}
} catch {
// Consumer may have already closed the stream (e.g. track change).
}
}
ffmpegProcess.stdout.on("data", (chunk: Buffer) => {
if (closed) {
return
}
try {
controller.enqueue(new Uint8Array(chunk))
} catch {
closed = true
ffmpegProcess.kill("SIGKILL")
}
})
ffmpegProcess.stderr.on("data", (data) => {
console.error(`FFmpeg log: ${data.toString()}`)
})
ffmpegProcess.stdout.on("end", () => finalize())
ffmpegProcess.stdout.on("error", (err) => finalize(err))
ffmpegProcess.on("close", (code) => {
if (code !== 0 && !closed) {
finalize(new Error(`ffmpeg exited with code ${code}`))
} else {
finalize()
}
})
ffmpegProcess.on("error", (err) => finalize(err))
},
cancel() {
if (closed) {
return
}
closed = true
ffmpegProcess.kill("SIGKILL")
},
})
}
-132
View File
@@ -1,132 +0,0 @@
import fs from "node:fs/promises"
import os from "node:os"
import path from "node:path"
const DEFAULT_MAX_MB = 2048
const ORPHAN_MAX_AGE_MS = 60 * 60 * 1000
/** Prefix for in-progress entries. Pruning removes old unpinned ones as abandoned. */
export const CACHE_ORPHAN_PREFIX = "convert-"
type CacheState = {
pinned: Map<string, number>
pruning: Promise<void> | null
}
const globalState = globalThis as typeof globalThis & {
__otunesCache?: CacheState
}
const state = (globalState.__otunesCache ??= {
pinned: new Map(),
pruning: null,
})
/**
* Transcode cache root. Set OTUNES_CACHE_DIR to a persistent volume to keep
* transcodes across restarts.
*/
export function cacheRoot() {
return process.env.OTUNES_CACHE_DIR || path.join(os.tmpdir(), "otunes-cache")
}
export function cacheDir(kind: "hls" | "lossless") {
return path.join(cacheRoot(), kind)
}
function maxCacheBytes() {
const configured = Number(process.env.OTUNES_CACHE_MAX_MB)
const mb = Number.isFinite(configured) && configured > 0 ? configured : DEFAULT_MAX_MB
return mb * 1024 * 1024
}
/** Pinned entries are never pruned. Pins are reference counted. */
export function pinCacheEntry(entry: string) {
state.pinned.set(entry, (state.pinned.get(entry) ?? 0) + 1)
}
export function unpinCacheEntry(entry: string) {
const count = state.pinned.get(entry) ?? 0
if (count <= 1) {
state.pinned.delete(entry)
} else {
state.pinned.set(entry, count - 1)
}
}
/** Marks an entry as recently used so pruning removes it last. */
export async function touchCacheEntry(entry: string) {
const now = new Date()
await fs.utimes(entry, now, now)
}
async function entrySize(entry: string): Promise<number> {
const stat = await fs.stat(entry).catch(() => null)
if (!stat) {
return 0
}
if (!stat.isDirectory()) {
return stat.size
}
const names = await fs.readdir(entry).catch(() => [])
const sizes = await Promise.all(
names.map((name) => entrySize(path.join(entry, name)))
)
return sizes.reduce((total, size) => total + size, 0)
}
async function prune() {
const entries: {
path: string
size: number
mtimeMs: number
orphan: boolean
}[] = []
for (const kind of ["hls", "lossless"] as const) {
const dir = cacheDir(kind)
const names = await fs.readdir(dir).catch(() => [])
for (const name of names) {
const entry = path.join(dir, name)
const stat = await fs.stat(entry).catch(() => null)
if (!stat) {
continue
}
entries.push({
path: entry,
size: await entrySize(entry),
mtimeMs: stat.mtimeMs,
orphan: name.startsWith(CACHE_ORPHAN_PREFIX),
})
}
}
const maxBytes = maxCacheBytes()
const now = Date.now()
let total = entries.reduce((sum, entry) => sum + entry.size, 0)
entries.sort((a, b) => a.mtimeMs - b.mtimeMs)
for (const entry of entries) {
if (state.pinned.has(entry.path)) {
continue
}
const remove = entry.orphan
? now - entry.mtimeMs > ORPHAN_MAX_AGE_MS
: total > maxBytes
if (remove) {
await fs.rm(entry.path, { recursive: true, force: true }).catch(() => {})
total -= entry.size
}
}
}
/**
* Removes least recently used entries until the cache fits under
* OTUNES_CACHE_MAX_MB, plus abandoned in-progress entries.
*/
export function pruneCache() {
state.pruning ??= prune()
.catch((error) => console.error("Transcode cache prune failed", error))
.finally(() => {
state.pruning = null
})
return state.pruning
}
-113
View File
@@ -1,113 +0,0 @@
import { spawn, type ChildProcessWithoutNullStreams } from "node:child_process"
import os from "node:os"
const STDERR_TAIL_BYTES = 4096
export type FfmpegProcess = {
child: ChildProcessWithoutNullStreams
/** Resolves with the exit code, or null when killed by a signal. */
exited: Promise<number | null>
stderrTail: () => string
}
type Limiter = {
running: number
waiting: (() => void)[]
}
// Kept on globalThis so dev reloads share one limit with processes they spawned.
const globalState = globalThis as typeof globalThis & {
__otunesFfmpegLimiter?: Limiter
}
const limiter = (globalState.__otunesFfmpegLimiter ??= {
running: 0,
waiting: [],
})
function maxConcurrentFfmpeg() {
const configured = Number(process.env.OTUNES_MAX_FFMPEG)
if (Number.isInteger(configured) && configured > 0) {
return configured
}
return Math.max(2, os.availableParallelism())
}
async function acquireSlot(signal?: AbortSignal) {
signal?.throwIfAborted()
if (limiter.running < maxConcurrentFfmpeg()) {
limiter.running += 1
return
}
await new Promise<void>((resolve, reject) => {
const grant = () => {
signal?.removeEventListener("abort", onAbort)
resolve()
}
const onAbort = () => {
const index = limiter.waiting.indexOf(grant)
if (index !== -1) {
limiter.waiting.splice(index, 1)
}
reject(signal?.reason)
}
limiter.waiting.push(grant)
signal?.addEventListener("abort", onAbort, { once: true })
})
}
function releaseSlot() {
const next = limiter.waiting.shift()
if (next) {
// The slot passes straight to the next waiter.
next()
} else {
limiter.running -= 1
}
}
/**
* Spawns ffmpeg once a slot under the concurrency cap is free. The slot is
* held until the process exits. Rejects if `signal` aborts while queued.
*/
export async function spawnFfmpeg(
args: string[],
signal?: AbortSignal
): Promise<FfmpegProcess> {
await acquireSlot(signal)
let child: ChildProcessWithoutNullStreams
try {
child = spawn("ffmpeg", [
"-nostdin",
"-hide_banner",
"-loglevel",
"error",
...args,
])
} catch (error) {
releaseSlot()
throw error
}
// stderr must be drained or ffmpeg blocks once the pipe buffer fills.
let stderr = ""
child.stderr.on("data", (data: Buffer) => {
stderr = (stderr + data.toString()).slice(-STDERR_TAIL_BYTES)
})
const exited = new Promise<number | null>((resolve) => {
let released = false
const finish = (code: number | null) => {
if (!released) {
released = true
releaseSlot()
}
resolve(code)
}
child.once("error", () => finish(1))
child.once("close", (code) => finish(code))
})
return { child, exited, stderrTail: () => stderr.trim() }
}
+118 -194
View File
@@ -1,28 +1,13 @@
import type { Doc } from "@otunes/convex/_generated/dataModel" import type { Doc } from "@otunes/convex/_generated/dataModel"
import {
parsePlaybackQuality,
playbackStreamPlan,
qualityKbps,
} from "@otunes/convex/playback-stream"
import crypto from "node:crypto" import crypto from "node:crypto"
import fs from "node:fs/promises" import fs from "node:fs/promises"
import path from "node:path" import path from "node:path"
import { audioInfo } from "@/lib/server-audio-info" import { spawn } from "node:child_process"
import { import * as music from "music-metadata"
cacheDir,
pinCacheEntry,
pruneCache,
touchCacheEntry,
unpinCacheEntry,
} from "@/lib/server-cache"
import { spawnFfmpeg, type FfmpegProcess } from "@/lib/server-ffmpeg"
export const HLS_SEGMENT_SECONDS = 6 export const HLS_SEGMENT_SECONDS = 6
const HLS_MAX_IDLE_MS = 30 * 60 * 1000 const HLS_MAX_IDLE_MS = 30 * 60 * 1000
/** The server-only slice of a song needed to transcode it. */
export type SongSource = Pick<Doc<"songs">, "_id" | "files" | "length">
type HlsJob = { type HlsJob = {
key: string key: string
lookupKey: string lookupKey: string
@@ -32,28 +17,42 @@ type HlsJob = {
lastTouchedAt: number lastTouchedAt: number
processExited: boolean processExited: boolean
processExitCode: number | null processExitCode: number | null
process: FfmpegProcess | null
abort: AbortController
evicted: boolean
} }
type HlsState = { const jobs = new Map<string, HlsJob>()
/** In-flight and ready jobs by cache key, so overlapping requests share one ffmpeg. */ const jobsByLookup = new Map<string, HlsJob>()
pending: Map<string, Promise<HlsJob>> let lastCleanupAt = 0
jobs: Map<string, HlsJob>
jobsByLookup: Map<string, HlsJob> export function qualityKbps(quality: string | null) {
lastCleanupAt: number if (quality === "low") {
return 64
}
if (quality === "high") {
return 256
}
return 128
} }
const globalState = globalThis as typeof globalThis & { export function selectHlsSourceCodec(
__otunesHls?: HlsState song: Doc<"songs">,
quality: string | null,
preferAtmos: boolean
) {
let sourceCodec = "lossless" in song.files ? "lossless" : "normal"
if (preferAtmos && "atmos" in song.files) {
sourceCodec = "atmos"
} else if (quality === "high" && "normal" in song.files) {
sourceCodec = "normal"
}
return sourceCodec
}
function hlsCacheRoot() {
return "/tmp/otunes"
} }
const state = (globalState.__otunesHls ??= {
pending: new Map(),
jobs: new Map(),
jobsByLookup: new Map(),
lastCleanupAt: 0,
})
function hlsLookupKey( function hlsLookupKey(
songId: string, songId: string,
@@ -64,7 +63,7 @@ function hlsLookupKey(
} }
async function hlsJobKey( async function hlsJobKey(
song: SongSource, song: Doc<"songs">,
sourcePath: string, sourcePath: string,
kbps: number kbps: number
) { ) {
@@ -89,38 +88,31 @@ export function hlsSegmentPath(job: HlsJob, segmentIndex: number) {
async function touchHlsJob(job: HlsJob) { async function touchHlsJob(job: HlsJob) {
job.lastTouchedAt = Date.now() job.lastTouchedAt = Date.now()
await touchCacheEntry(job.dir).catch(() => {}) await fs.utimes(job.dir, new Date(job.lastTouchedAt), new Date(job.lastTouchedAt)).catch(
() => {}
)
}
function forgetJob(job: HlsJob) {
jobs.delete(job.key)
if (jobsByLookup.get(job.lookupKey) === job) {
jobsByLookup.delete(job.lookupKey)
}
} }
async function evictJob(job: HlsJob) { async function evictJob(job: HlsJob) {
if (job.evicted) { forgetJob(job)
return await fs.rm(job.dir, { recursive: true, force: true }).catch(() => {})
}
job.evicted = true
state.pending.delete(job.key)
state.jobs.delete(job.key)
if (state.jobsByLookup.get(job.lookupKey) === job) {
state.jobsByLookup.delete(job.lookupKey)
}
job.abort.abort()
job.process?.child.kill("SIGKILL")
const complete = job.processExited && job.processExitCode === 0
if (!complete) {
await job.process?.exited
await fs.rm(job.dir, { recursive: true, force: true }).catch(() => {})
}
unpinCacheEntry(job.dir)
} }
async function cleanupIdleHlsJobs() { async function cleanupIdleHlsJobs() {
const now = Date.now() const now = Date.now()
if (now - state.lastCleanupAt < 60_000) { if (now - lastCleanupAt < 60_000) {
return return
} }
state.lastCleanupAt = now lastCleanupAt = now
for (const job of [...state.jobs.values()]) { for (const job of [...jobs.values()]) {
if (now - job.lastTouchedAt > HLS_MAX_IDLE_MS) { if (now - job.lastTouchedAt > HLS_MAX_IDLE_MS) {
await evictJob(job) await evictJob(job)
} }
@@ -132,7 +124,7 @@ export function getExistingHlsJob(
quality: string | null, quality: string | null,
preferAtmos: boolean preferAtmos: boolean
) { ) {
return state.jobsByLookup.get(hlsLookupKey(songId, quality, preferAtmos)) ?? null return jobsByLookup.get(hlsLookupKey(songId, quality, preferAtmos)) ?? null
} }
export async function waitForHlsSegment( export async function waitForHlsSegment(
@@ -145,22 +137,18 @@ export async function waitForHlsSegment(
const startedAt = Date.now() const startedAt = Date.now()
while (Date.now() - startedAt < timeoutMs) { while (Date.now() - startedAt < timeoutMs) {
// Read before checking the file so a segment renamed just before exit is found.
const exited = job.processExited
try { try {
// ffmpeg writes to a .tmp file and renames it when complete. const firstStat = await fs.stat(segmentPath)
await fs.access(segmentPath) if (firstStat.size > 0) {
return segmentPath await new Promise((resolve) => setTimeout(resolve, 100))
} catch { const secondStat = await fs.stat(segmentPath)
if (job.evicted) { if (firstStat.size === secondStat.size) {
throw new Error("HLS job was evicted") return segmentPath
}
} }
if (exited) { } catch {
throw new Error( if (job.processExited && job.processExitCode !== 0) {
job.processExitCode === 0 throw new Error(`HLS transcode failed with code ${job.processExitCode}`)
? "HLS segment does not exist"
: `HLS transcode failed with code ${job.processExitCode}`
)
} }
} }
await new Promise((resolve) => setTimeout(resolve, 100)) await new Promise((resolve) => setTimeout(resolve, 100))
@@ -169,15 +157,52 @@ export async function waitForHlsSegment(
throw new Error("Timed out waiting for HLS segment") throw new Error("Timed out waiting for HLS segment")
} }
async function hasCompletePlaylist(dir: string) { export async function ensureHlsJob(
const playlist = await fs song: Doc<"songs">,
.readFile(path.join(dir, "index.m3u8"), "utf8") quality: string | null,
.catch(() => "") preferAtmos: boolean
return playlist.includes("#EXT-X-ENDLIST") ) {
} await cleanupIdleHlsJobs()
const kbps = qualityKbps(quality)
const sourceCodec = selectHlsSourceCodec(song, quality, preferAtmos)
const sourcePath = song.files[sourceCodec]
const key = await hlsJobKey(song, sourcePath, kbps)
const lookupKey = hlsLookupKey(song._id, quality, preferAtmos)
const existingJob = jobs.get(key)
if (existingJob) {
try {
await fs.access(existingJob.dir)
await touchHlsJob(existingJob)
return existingJob
} catch {
forgetJob(existingJob)
}
}
const metadata = await music.parseFile(sourcePath)
const duration = metadata.format.duration ?? song.length
const segmentCount = Math.max(1, Math.ceil(duration / HLS_SEGMENT_SECONDS))
const dir = path.join(hlsCacheRoot(), key)
await fs.mkdir(dir, { recursive: true })
const job: HlsJob = {
key,
lookupKey,
dir,
duration,
segmentCount,
lastTouchedAt: Date.now(),
processExited: false,
processExitCode: null,
}
jobs.set(key, job)
jobsByLookup.set(lookupKey, job)
await touchHlsJob(job)
function startTranscode(job: HlsJob, sourcePath: string, kbps: number) {
const ffmpegArgs = [ const ffmpegArgs = [
"-nostdin",
"-i", "-i",
sourcePath, sourcePath,
"-vn", "-vn",
@@ -197,126 +222,25 @@ function startTranscode(job: HlsJob, sourcePath: string, kbps: number) {
"0", "0",
"-hls_segment_type", "-hls_segment_type",
"mpegts", "mpegts",
"-hls_flags",
"temp_file",
"-hls_segment_filename", "-hls_segment_filename",
path.join(job.dir, "segment_%05d.ts"), path.join(dir, "segment_%05d.ts"),
path.join(job.dir, "index.m3u8"), path.join(dir, "index.m3u8"),
] ]
const ffmpegProcess = spawn("ffmpeg", ffmpegArgs)
spawnFfmpeg(ffmpegArgs, job.abort.signal).then( ffmpegProcess.stderr.on("data", (data) => {
async (ffmpeg) => { console.error(`FFmpeg HLS log: ${data.toString()}`)
job.process = ffmpeg })
if (job.evicted) {
ffmpeg.child.kill("SIGKILL")
}
const code = await ffmpeg.exited
job.process = null
job.processExited = true
job.processExitCode = code
if (job.evicted) {
return
}
if (code === 0) {
void pruneCache()
} else {
console.error(`ffmpeg HLS exited with code ${code}`, ffmpeg.stderrTail())
}
},
() => {
job.processExited = true
job.processExitCode = 1
}
)
}
async function createHlsJob( ffmpegProcess.on("close", (code) => {
song: SongSource, job.processExited = true
sourcePath: string, job.processExitCode = code
kbps: number, })
key: string,
lookupKey: string
): Promise<HlsJob> {
const info = await audioInfo(sourcePath)
const duration = info.duration ?? song.length
const segmentCount = Math.max(1, Math.ceil(duration / HLS_SEGMENT_SECONDS))
const dir = path.join(cacheDir("hls"), key)
pinCacheEntry(dir)
try { ffmpegProcess.on("error", () => {
const complete = await hasCompletePlaylist(dir) job.processExited = true
if (!complete) { job.processExitCode = 1
await fs.rm(dir, { recursive: true, force: true }) })
await fs.mkdir(dir, { recursive: true })
}
const job: HlsJob = {
key,
lookupKey,
dir,
duration,
segmentCount,
lastTouchedAt: Date.now(),
processExited: complete,
processExitCode: complete ? 0 : null,
process: null,
abort: new AbortController(),
evicted: false,
}
state.jobs.set(key, job)
await touchHlsJob(job)
if (!complete) {
startTranscode(job, sourcePath, kbps)
}
return job
} catch (error) {
unpinCacheEntry(dir)
throw error
}
}
export async function ensureHlsJob(
song: SongSource,
quality: string | null,
preferAtmos: boolean
): Promise<HlsJob> {
await cleanupIdleHlsJobs()
const plan = playbackStreamPlan(
song.files,
parsePlaybackQuality(quality),
preferAtmos
)
// HLS always transcodes, and lossless quality has no target bitrate.
const kbps = plan.kbps || qualityKbps("medium")
const sourcePath = song.files[plan.source]
const key = await hlsJobKey(song, sourcePath, kbps)
const lookupKey = hlsLookupKey(song._id, quality, preferAtmos)
let pending = state.pending.get(key)
if (!pending) {
pending = createHlsJob(song, sourcePath, kbps, key, lookupKey)
state.pending.set(key, pending)
const created = pending
created.catch(() => {
if (state.pending.get(key) === created) {
state.pending.delete(key)
}
})
}
const job = await pending
const exists = await fs.access(job.dir).then(
() => true,
() => false
)
if (job.evicted || !exists) {
await evictJob(job)
return ensureHlsJob(song, quality, preferAtmos)
}
state.jobsByLookup.set(lookupKey, job)
await touchHlsJob(job)
return job return job
} }
+43 -32
View File
@@ -1,15 +1,8 @@
import { spawn } from "node:child_process"
import { createHash } from "node:crypto" import { createHash } from "node:crypto"
import fs from "node:fs/promises" import fs from "node:fs/promises"
import os from "node:os"
import path from "node:path" import path from "node:path"
import {
CACHE_ORPHAN_PREFIX,
cacheDir,
pinCacheEntry,
pruneCache,
touchCacheEntry,
unpinCacheEntry,
} from "@/lib/server-cache"
import { spawnFfmpeg } from "@/lib/server-ffmpeg"
const conversions = new Map<string, Promise<string>>() const conversions = new Map<string, Promise<string>>()
@@ -34,38 +27,56 @@ export async function seekableLosslessFile(source: string): Promise<string> {
} }
async function convert(source: string, key: string): Promise<string> { async function convert(source: string, key: string): Promise<string> {
const dir = cacheDir("lossless") const dir = path.join(os.tmpdir(), "otunes-lossless")
await fs.mkdir(dir, { recursive: true }) await fs.mkdir(dir, { recursive: true })
const cutoff = Date.now() - 30 * 60 * 1000
await Promise.all(
(await fs.readdir(dir))
.filter((name) => name.endsWith(".flac"))
.map(async (name) => {
const file = path.join(dir, name)
const stat = await fs.stat(file).catch(() => null)
if (stat && stat.mtimeMs < cutoff) await fs.rm(file, { force: true })
})
)
const output = path.join(dir, `${key}.flac`) const output = path.join(dir, `${key}.flac`)
try { try {
// Every range request touches the file so it stays cached while playing. await fs.access(output)
await touchCacheEntry(output)
return output return output
} catch { } catch {
// Publish only completed conversions so range requests always see a complete file. // Publish only completed conversions so range requests always see a complete file.
} }
const temporaryDir = await fs.mkdtemp(path.join(dir, CACHE_ORPHAN_PREFIX)) const temporary = path.join(
const temporary = path.join(temporaryDir, "audio.flac") await fs.mkdtemp(path.join(dir, "convert-")),
pinCacheEntry(temporaryDir) "audio.flac"
)
try { try {
const ffmpeg = await spawnFfmpeg([ await new Promise<void>((resolve, reject) => {
"-i", const child = spawn(
source, "ffmpeg",
"-map", [
"0:a:0", "-nostdin",
"-c:a", "-v",
"flac", "error",
temporary, "-i",
]) source,
const code = await ffmpeg.exited "-map",
if (code !== 0) { "0:a:0",
throw new Error(`Lossless conversion failed: ${code}: ${ffmpeg.stderrTail()}`) "-c:a",
} "flac",
temporary,
],
{ stdio: "ignore" }
)
child.on("error", reject)
child.on("close", (code) => {
if (code === 0) resolve()
else reject(new Error(`Lossless conversion failed: ${code}`))
})
})
await fs.rename(temporary, output) await fs.rename(temporary, output)
return output
} finally { } finally {
unpinCacheEntry(temporaryDir) await fs.rm(path.dirname(temporary), { recursive: true, force: true })
await fs.rm(temporaryDir, { recursive: true, force: true })
} }
void pruneCache()
return output
} }
-23
View File
@@ -1,23 +0,0 @@
import { convexAuthNextjsToken } from "@convex-dev/auth/nextjs/server"
import { api } from "@otunes/convex/_generated/api"
import type { Id } from "@otunes/convex/_generated/dataModel"
import { fetchQuery } from "convex/nextjs"
import { convexServerOptions } from "@/lib/convex-server"
import type { SongSource } from "@/lib/server-hls"
/**
* Loads a song's file paths as the requesting listener, so Convex enforces auth
* even if the proxy is bypassed. Throws when signed out or the song is missing.
*/
export async function getSongSource(id: string): Promise<SongSource> {
const token = await convexAuthNextjsToken()
const song = await fetchQuery(
api.library.getSongSource,
{ id: id as Id<"songs"> },
convexServerOptions(token)
)
if (!song) {
throw new Error("Song not found")
}
return song
}
+3 -23
View File
@@ -2,13 +2,10 @@ import { useConvex } from "convex/react"
import { useEffect, useMemo, useSyncExternalStore } from "react" import { useEffect, useMemo, useSyncExternalStore } from "react"
import type { Id } from "@otunes/convex/_generated/dataModel" import type { Id } from "@otunes/convex/_generated/dataModel"
import type { BrowseSong } from "@otunes/convex/types"
import { import {
getCachedSong, getCachedSong,
getSongSnapshot,
getSongsVersion, getSongsVersion,
requestSongs, requestSongs,
songFromSnapshot,
subscribeSongs, subscribeSongs,
} from "@otunes/convex/client/song-cache" } from "@otunes/convex/client/song-cache"
import { isPersistentCacheLoaded } from "@/lib/persistent-cache" import { isPersistentCacheLoaded } from "@/lib/persistent-cache"
@@ -51,24 +48,7 @@ export function useSongs(songIds: readonly Id<"songs">[]) {
return songs return songs
} }
/** export function useSong(songId: Id<"songs"> | null) {
* Like `useSongs` for one song, but only re-renders when that song changes const songIds = useMemo(() => (songId ? [songId] : []), [songId])
* once it is cached. return useSongs(songIds)[0] ?? null
*/
export function useSong(songId: Id<"songs"> | null): BrowseSong | null {
const convex = useConvex()
const snapshot = useSyncExternalStore(
subscribeSongs,
() => getSongSnapshot(songId),
() => null
)
const song = songFromSnapshot(snapshot)
useEffect(() => {
if (songId && !song && isPersistentCacheLoaded()) {
requestSongs(convex, [songId])
}
}, [convex, songId, song, snapshot])
return song
} }
+33
View File
@@ -0,0 +1,33 @@
export type PlaybackQuality = "low" | "medium" | "high" | "lossless"
export function songPlayUrl(
songId: string,
quality: PlaybackQuality | undefined,
preferAtmos: boolean | undefined
) {
const params = new URLSearchParams()
if (quality) {
params.set("quality", quality)
}
if (preferAtmos) {
params.set("preferAtmos", "true")
}
const query = params.toString()
return `/api/song/${songId}/play${query ? `?${query}` : ""}`
}
export function songHlsPlaylistUrl(
songId: string,
quality: PlaybackQuality | undefined,
preferAtmos: boolean | undefined
) {
const params = new URLSearchParams()
if (quality) {
params.set("quality", quality)
}
if (preferAtmos) {
params.set("preferAtmos", "true")
}
const query = params.toString()
return `/api/song/${songId}/play/hls${query ? `?${query}` : ""}`
}
-1
View File
@@ -14,7 +14,6 @@
"@base-ui/react": "^1.5.0", "@base-ui/react": "^1.5.0",
"@convex-dev/auth": "^0.0.93", "@convex-dev/auth": "^0.0.93",
"@otunes/convex": "workspace:*", "@otunes/convex": "workspace:*",
"@tanstack/react-virtual": "^3.14.26",
"class-variance-authority": "^0.7.1", "class-variance-authority": "^0.7.1",
"clsx": "^2.1.1", "clsx": "^2.1.1",
"cmdk": "^1.1.1", "cmdk": "^1.1.1",
+1 -1
View File
@@ -12,7 +12,7 @@ const isPublic = createRouteMatcher([
"/api/playlist/:id/cover", "/api/playlist/:id/cover",
"/album/:id", "/album/:id",
"/artist/:id", "/artist/:id",
"/library/artists/:id", "/artists/:id",
"/playlist/:id", "/playlist/:id",
]) ])
-3
View File
@@ -97,9 +97,6 @@ admin_key=$(cd /convex && umask 077 && "${as_convex[@]}" ./generate_admin_key.sh
log "Deploying Convex functions" log "Deploying Convex functions"
convex_cli deploy --typecheck disable --codegen disable convex_cli deploy --typecheck disable --codegen disable
log "Running data migrations"
convex_cli run migrations:migrateUsers
# `env get` exits 0 with no output when the variable is unset. Any other failure # `env get` exits 0 with no output when the variable is unset. Any other failure
# must not be read as "no keys": regenerating them signs every user out. # must not be read as "no keys": regenerating them signs every user out.
if ! jwks=$(convex_cli env get JWKS); then if ! jwks=$(convex_cli env get JWKS); then
Loaded 100 of 133 files, more files were not shown because too many files have changed in this diff. Show more