Compare commits
11
Commits
No files matched your search
@@ -73,10 +73,15 @@ 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.
|
||||||
|
|
||||||
The Catalyst plugin enables the Xcode target and React Native's CocoaPods
|
Don't enable Catalyst by hand in Xcode; the plugin configures everything during
|
||||||
patches. It disables precompiled React Native and Expo modules so dependencies
|
prebuild. It enables the Xcode target and React Native's CocoaPods patches,
|
||||||
can compile for Catalyst. The Mac app derives a separate bundle identifier with
|
raises pod deployment targets to the app's, and disables precompiled React
|
||||||
Apple's `maccatalyst.` prefix. System volume stays under macOS control.
|
Native and Expo modules so dependencies can compile for Catalyst. System volume
|
||||||
|
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.
|
||||||
@@ -4,7 +4,9 @@ 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. 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.
|
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.
|
||||||
|
|
||||||
|
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.
|
||||||
|
|
||||||
@@ -14,7 +16,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:
|
||||||
|
|
||||||
- `library.intentCatalogPage` supplies authenticated, paginated entity records.
|
- `intentCatalog.head`, `intentCatalog.page` and `intentCatalog.playlists` supply the entity catalog. Library mutations record renames and deletions in `intentCatalogChanges`, pruned daily.
|
||||||
- `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.
|
||||||
|
|
||||||
|
|||||||
@@ -26,6 +26,8 @@ export default ({ config }: ConfigContext): ExpoConfig => {
|
|||||||
production: "oTunes",
|
production: "oTunes",
|
||||||
}[variant]
|
}[variant]
|
||||||
|
|
||||||
|
const bundleIdentifier = `${config.ios!.bundleIdentifier}${suffix}`
|
||||||
|
|
||||||
return {
|
return {
|
||||||
...config,
|
...config,
|
||||||
plugins: [
|
plugins: [
|
||||||
@@ -40,11 +42,12 @@ export default ({ config }: ConfigContext): ExpoConfig => {
|
|||||||
icon: `./assets/icon${iconSuffix}.png`,
|
icon: `./assets/icon${iconSuffix}.png`,
|
||||||
ios: {
|
ios: {
|
||||||
...config.ios,
|
...config.ios,
|
||||||
bundleIdentifier: `${config.ios!.bundleIdentifier}${suffix}`,
|
bundleIdentifier,
|
||||||
icon: `./assets/${composer}.icon`,
|
icon: `./assets/${composer}.icon`,
|
||||||
infoPlist: {
|
infoPlist: {
|
||||||
...config.ios?.infoPlist,
|
...config.ios?.infoPlist,
|
||||||
NSUserActivityTypes: [`com.abunchofknowitalls.otunes${suffix}.media`],
|
// HandoffModule publishes this `.media` type; Catalyst shares this bundle ID.
|
||||||
|
NSUserActivityTypes: [`${bundleIdentifier}.media`],
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
android: {
|
android: {
|
||||||
|
|||||||
@@ -54,6 +54,7 @@
|
|||||||
"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",
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -6,8 +6,8 @@ import { NavigationBar } from "expo-navigation-bar"
|
|||||||
import {
|
import {
|
||||||
ScreenPaletteProvider,
|
ScreenPaletteProvider,
|
||||||
useAndroidTabPalette,
|
useAndroidTabPalette,
|
||||||
useAndroidTabBackgroundStyle,
|
useAndroidTabHasArtworkPalette,
|
||||||
useAndroidNativeTabColors,
|
useTabletBackgroundStyle,
|
||||||
} 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,12 +46,13 @@ 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 = colors.dark
|
const androidPalette = useAndroidTabPalette()
|
||||||
const artworkPalette = useAndroidTabPalette()
|
const hasArtworkPalette = useAndroidTabHasArtworkPalette()
|
||||||
const isDark = Platform.OS === "android" ? artworkPalette.isDark : themeIsDark
|
const selectedColor = hasArtworkPalette
|
||||||
|
? androidPalette.foreground
|
||||||
|
: androidPalette.accentText
|
||||||
|
const isDark = Platform.OS === "android" ? androidPalette.isDark : themeIsDark
|
||||||
const inactive = appleMusic.tabInactive
|
const inactive = appleMusic.tabInactive
|
||||||
|
|
||||||
const iconColor =
|
const iconColor =
|
||||||
@@ -61,14 +62,14 @@ function useNativeTabColors() {
|
|||||||
selected: appleMusic.pink,
|
selected: appleMusic.pink,
|
||||||
}
|
}
|
||||||
: {
|
: {
|
||||||
default: androidPalette.mutedForeground,
|
default: androidPalette.secondaryForeground,
|
||||||
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.mutedForeground
|
: androidPalette.secondaryForeground
|
||||||
|
|
||||||
return {
|
return {
|
||||||
isDark,
|
isDark,
|
||||||
@@ -85,20 +86,17 @@ function useNativeTabColors() {
|
|||||||
blurEffect: isDark
|
blurEffect: isDark
|
||||||
? "systemChromeMaterialDark"
|
? "systemChromeMaterialDark"
|
||||||
: "systemChromeMaterialLight",
|
: "systemChromeMaterialLight",
|
||||||
// Reveal the shared UI-thread background beneath the native tab bar.
|
backgroundColor:
|
||||||
backgroundColor: Platform.OS === "ios" ? undefined : "transparent",
|
Platform.OS === "ios" ? undefined : androidPalette.background,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
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 = useAndroidTabBackgroundStyle()
|
const backgroundStyle = useTabletBackgroundStyle()
|
||||||
const { currentSong, queueSongIds } = usePlaybackQueue()
|
const { currentSong, queueSongIds } = usePlaybackQueue()
|
||||||
const showBottomAccessory = Boolean(currentSong && queueSongIds.length > 0)
|
const showBottomAccessory = Boolean(currentSong && queueSongIds.length > 0)
|
||||||
|
|
||||||
@@ -140,9 +138,6 @@ function TabsContent() {
|
|||||||
|
|
||||||
<NativeTabs.Trigger
|
<NativeTabs.Trigger
|
||||||
name="home"
|
name="home"
|
||||||
unstable_nativeProps={
|
|
||||||
Platform.OS === "android" ? homeColors : undefined
|
|
||||||
}
|
|
||||||
disableTransparentOnScrollEdge
|
disableTransparentOnScrollEdge
|
||||||
contentStyle={androidContentStyle}
|
contentStyle={androidContentStyle}
|
||||||
>
|
>
|
||||||
@@ -152,9 +147,6 @@ function TabsContent() {
|
|||||||
|
|
||||||
<NativeTabs.Trigger
|
<NativeTabs.Trigger
|
||||||
name="library"
|
name="library"
|
||||||
unstable_nativeProps={
|
|
||||||
Platform.OS === "android" ? libraryColors : undefined
|
|
||||||
}
|
|
||||||
disableTransparentOnScrollEdge
|
disableTransparentOnScrollEdge
|
||||||
contentStyle={androidContentStyle}
|
contentStyle={androidContentStyle}
|
||||||
>
|
>
|
||||||
@@ -169,9 +161,6 @@ function TabsContent() {
|
|||||||
|
|
||||||
<NativeTabs.Trigger
|
<NativeTabs.Trigger
|
||||||
name="search"
|
name="search"
|
||||||
unstable_nativeProps={
|
|
||||||
Platform.OS === "android" ? searchColors : undefined
|
|
||||||
}
|
|
||||||
disableTransparentOnScrollEdge
|
disableTransparentOnScrollEdge
|
||||||
contentStyle={androidContentStyle}
|
contentStyle={androidContentStyle}
|
||||||
>
|
>
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import { Ionicons } from "@expo/vector-icons"
|
||||||
import { SongSwipeRow } from "@/components/song-swipe-row"
|
import { SongSwipeRow } from "@/components/song-swipe-row"
|
||||||
import {
|
import {
|
||||||
useSwipeRowGroup,
|
useSwipeRowGroup,
|
||||||
@@ -7,21 +8,13 @@ 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 { useScreenPalette } from "@/contexts/android-tab-theme"
|
||||||
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, View } from "react-native"
|
import { Platform, Pressable, StyleSheet, Text, View } from "react-native"
|
||||||
|
|
||||||
import {
|
import {
|
||||||
CollectionDivider,
|
CollectionDivider,
|
||||||
@@ -89,20 +82,6 @@ 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))
|
||||||
@@ -111,6 +90,12 @@ 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") {
|
||||||
@@ -125,9 +110,7 @@ export default function AlbumScreen() {
|
|||||||
songIds={songIds}
|
songIds={songIds}
|
||||||
palette={palette}
|
palette={palette}
|
||||||
favorited={isSongFavorite(item.track.id)}
|
favorited={isSongFavorite(item.track.id)}
|
||||||
onPlay={(songId, ids) =>
|
onPlay={playTrack}
|
||||||
playFromSong(songId, ids, `album:${album.id}`)
|
|
||||||
}
|
|
||||||
onAction={handleAlbumTrackAction}
|
onAction={handleAlbumTrackAction}
|
||||||
/>
|
/>
|
||||||
) : null
|
) : null
|
||||||
@@ -137,7 +120,7 @@ export default function AlbumScreen() {
|
|||||||
handleAlbumTrackAction,
|
handleAlbumTrackAction,
|
||||||
isSongFavorite,
|
isSongFavorite,
|
||||||
palette,
|
palette,
|
||||||
playFromSong,
|
playTrack,
|
||||||
songIds,
|
songIds,
|
||||||
swipeGroup,
|
swipeGroup,
|
||||||
]
|
]
|
||||||
@@ -152,17 +135,14 @@ export default function AlbumScreen() {
|
|||||||
headerLargeTitle: false,
|
headerLargeTitle: false,
|
||||||
...(Platform.OS === "android"
|
...(Platform.OS === "android"
|
||||||
? {
|
? {
|
||||||
headerStyle: { backgroundColor: "transparent" },
|
headerStyle: { backgroundColor: palette.background },
|
||||||
headerBackground: renderAndroidArtworkBackground,
|
|
||||||
headerBackVisible: false,
|
|
||||||
headerLeft: renderArtworkBackButton,
|
|
||||||
headerTintColor: palette.foreground,
|
headerTintColor: palette.foreground,
|
||||||
}
|
}
|
||||||
: {}),
|
: {}),
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
<CollectionDetailSkeleton
|
<CollectionDetailSkeleton
|
||||||
zoomCoverSize={220}
|
variant="album"
|
||||||
onLayout={onLayout}
|
onLayout={onLayout}
|
||||||
style={backgroundStyle}
|
style={backgroundStyle}
|
||||||
backgroundColor={
|
backgroundColor={
|
||||||
@@ -183,9 +163,9 @@ export default function AlbumScreen() {
|
|||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
<View style={[styles.empty, { backgroundColor: colors.background }]}>
|
<View style={[styles.empty, { backgroundColor: colors.background }]}>
|
||||||
<PaletteText style={{ color: colors.mutedForeground }}>
|
<Text style={{ color: colors.mutedForeground }}>
|
||||||
Album not found.
|
Album not found.
|
||||||
</PaletteText>
|
</Text>
|
||||||
</View>
|
</View>
|
||||||
</>
|
</>
|
||||||
)
|
)
|
||||||
@@ -206,10 +186,7 @@ export default function AlbumScreen() {
|
|||||||
headerTintColor: palette.foreground,
|
headerTintColor: palette.foreground,
|
||||||
...(Platform.OS === "android"
|
...(Platform.OS === "android"
|
||||||
? {
|
? {
|
||||||
headerStyle: { backgroundColor: "transparent" },
|
headerStyle: { backgroundColor: palette.background },
|
||||||
headerBackground: renderAndroidArtworkBackground,
|
|
||||||
headerBackVisible: false,
|
|
||||||
headerLeft: renderArtworkBackButton,
|
|
||||||
statusBarStyle: palette.isDark
|
statusBarStyle: palette.isDark
|
||||||
? ("light" as const)
|
? ("light" as const)
|
||||||
: ("dark" as const),
|
: ("dark" as const),
|
||||||
@@ -231,11 +208,10 @@ export default function AlbumScreen() {
|
|||||||
}
|
}
|
||||||
>
|
>
|
||||||
<Pressable hitSlop={8}>
|
<Pressable hitSlop={8}>
|
||||||
<PaletteIcon
|
<Ionicons
|
||||||
tone="foreground"
|
|
||||||
name="ellipsis-horizontal"
|
name="ellipsis-horizontal"
|
||||||
size={22}
|
size={22}
|
||||||
color={palette.isDark ? "#fff" : "#000"}
|
color={colors.foreground}
|
||||||
/>
|
/>
|
||||||
</Pressable>
|
</Pressable>
|
||||||
</MediaActionMenu>
|
</MediaActionMenu>
|
||||||
@@ -293,8 +269,7 @@ export default function AlbumScreen() {
|
|||||||
{ backgroundColor: palette.surface },
|
{ backgroundColor: palette.surface },
|
||||||
]}
|
]}
|
||||||
>
|
>
|
||||||
<PaletteIcon
|
<Ionicons
|
||||||
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}
|
||||||
@@ -320,8 +295,7 @@ export default function AlbumScreen() {
|
|||||||
{ backgroundColor: palette.surface },
|
{ backgroundColor: palette.surface },
|
||||||
]}
|
]}
|
||||||
>
|
>
|
||||||
<PaletteIcon
|
<Ionicons
|
||||||
tone="foreground"
|
|
||||||
name="shuffle"
|
name="shuffle"
|
||||||
size={24}
|
size={24}
|
||||||
color={palette.foreground}
|
color={palette.foreground}
|
||||||
@@ -330,8 +304,7 @@ export default function AlbumScreen() {
|
|||||||
</View>
|
</View>
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
<PaletteText
|
<Text
|
||||||
tone="foreground"
|
|
||||||
style={[
|
style={[
|
||||||
styles.title,
|
styles.title,
|
||||||
heroLayout.landscape && styles.titleLandscape,
|
heroLayout.landscape && styles.titleLandscape,
|
||||||
@@ -339,13 +312,12 @@ export default function AlbumScreen() {
|
|||||||
]}
|
]}
|
||||||
>
|
>
|
||||||
{album.title}
|
{album.title}
|
||||||
</PaletteText>
|
</Text>
|
||||||
<Pressable
|
<Pressable
|
||||||
onPress={() => push(`/artist/${album.artist.id}`)}
|
onPress={() => push(`/artist/${album.artist.id}`)}
|
||||||
style={styles.artistPressable}
|
style={styles.artistPressable}
|
||||||
>
|
>
|
||||||
<PaletteText
|
<Text
|
||||||
tone="accentText"
|
|
||||||
style={[
|
style={[
|
||||||
styles.artist,
|
styles.artist,
|
||||||
heroLayout.landscape && styles.artistLandscape,
|
heroLayout.landscape && styles.artistLandscape,
|
||||||
@@ -353,7 +325,7 @@ export default function AlbumScreen() {
|
|||||||
]}
|
]}
|
||||||
>
|
>
|
||||||
{album.artist.name}
|
{album.artist.name}
|
||||||
</PaletteText>
|
</Text>
|
||||||
</Pressable>
|
</Pressable>
|
||||||
<View
|
<View
|
||||||
style={{
|
style={{
|
||||||
@@ -367,43 +339,32 @@ export default function AlbumScreen() {
|
|||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{metadata ? (
|
{metadata ? (
|
||||||
<PaletteText
|
<Text style={{ color: palette.secondaryForeground }}>
|
||||||
tone="secondaryForeground"
|
|
||||||
style={{ color: palette.secondaryForeground }}
|
|
||||||
>
|
|
||||||
{metadata}
|
{metadata}
|
||||||
</PaletteText>
|
</Text>
|
||||||
) : null}
|
) : null}
|
||||||
{hasLossless ? (
|
{album.hasLossless ? (
|
||||||
<>
|
<>
|
||||||
{metadata ? (
|
{metadata ? (
|
||||||
<PaletteText
|
<Text style={{ color: palette.secondaryForeground }}>
|
||||||
tone="secondaryForeground"
|
|
||||||
style={{ color: palette.secondaryForeground }}
|
|
||||||
>
|
|
||||||
·
|
·
|
||||||
</PaletteText>
|
</Text>
|
||||||
) : null}
|
) : null}
|
||||||
<AudioFormatBadge
|
<AudioFormatBadge
|
||||||
artwork
|
|
||||||
format="lossless"
|
format="lossless"
|
||||||
color={palette.secondaryForeground}
|
color={palette.secondaryForeground}
|
||||||
backgroundColor={palette.background}
|
backgroundColor={palette.background}
|
||||||
/>
|
/>
|
||||||
</>
|
</>
|
||||||
) : null}
|
) : null}
|
||||||
{hasAtmos ? (
|
{album.hasAtmos ? (
|
||||||
<>
|
<>
|
||||||
{metadata || hasLossless ? (
|
{metadata || album.hasLossless ? (
|
||||||
<PaletteText
|
<Text style={{ color: palette.secondaryForeground }}>
|
||||||
tone="secondaryForeground"
|
|
||||||
style={{ color: palette.secondaryForeground }}
|
|
||||||
>
|
|
||||||
·
|
·
|
||||||
</PaletteText>
|
</Text>
|
||||||
) : null}
|
) : null}
|
||||||
<AudioFormatBadge
|
<AudioFormatBadge
|
||||||
artwork
|
|
||||||
format="atmos"
|
format="atmos"
|
||||||
color={palette.secondaryForeground}
|
color={palette.secondaryForeground}
|
||||||
backgroundColor={palette.background}
|
backgroundColor={palette.background}
|
||||||
@@ -527,12 +488,11 @@ 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)}
|
||||||
>
|
>
|
||||||
<PaletteText
|
<Text
|
||||||
tone="secondaryForeground"
|
|
||||||
style={[styles.trackNumber, { color: palette.secondaryForeground }]}
|
style={[styles.trackNumber, { color: palette.secondaryForeground }]}
|
||||||
>
|
>
|
||||||
{number}
|
{number}
|
||||||
</PaletteText>
|
</Text>
|
||||||
<View
|
<View
|
||||||
style={[
|
style={[
|
||||||
styles.trackContent,
|
styles.trackContent,
|
||||||
@@ -540,29 +500,24 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
|
|||||||
]}
|
]}
|
||||||
>
|
>
|
||||||
<View style={styles.trackMeta}>
|
<View style={styles.trackMeta}>
|
||||||
<PaletteText
|
<Text
|
||||||
tone="foreground"
|
|
||||||
style={[styles.trackTitle, { color: palette.foreground }]}
|
style={[styles.trackTitle, { color: palette.foreground }]}
|
||||||
numberOfLines={1}
|
numberOfLines={1}
|
||||||
>
|
>
|
||||||
{track.title}
|
{track.title}
|
||||||
</PaletteText>
|
</Text>
|
||||||
{track.artists ? (
|
{track.artists ? (
|
||||||
<PaletteText
|
<Text
|
||||||
tone="secondaryForeground"
|
|
||||||
style={{ color: palette.secondaryForeground }}
|
style={{ color: palette.secondaryForeground }}
|
||||||
numberOfLines={1}
|
numberOfLines={1}
|
||||||
>
|
>
|
||||||
{track.artists.join(", ")}
|
{track.artists.join(", ")}
|
||||||
</PaletteText>
|
</Text>
|
||||||
) : null}
|
) : null}
|
||||||
</View>
|
</View>
|
||||||
<PaletteText
|
<Text style={{ color: palette.secondaryForeground }}>
|
||||||
tone="secondaryForeground"
|
|
||||||
style={{ color: palette.secondaryForeground }}
|
|
||||||
>
|
|
||||||
{formatDuration(track.durationSeconds)}
|
{formatDuration(track.durationSeconds)}
|
||||||
</PaletteText>
|
</Text>
|
||||||
</View>
|
</View>
|
||||||
</Row>
|
</Row>
|
||||||
</MusicEntityView>
|
</MusicEntityView>
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ export default function ArtistScreen() {
|
|||||||
headerLargeTitle: false,
|
headerLargeTitle: false,
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
<CollectionDetailSkeleton round />
|
<CollectionDetailSkeleton variant="artist" />
|
||||||
</>
|
</>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,21 +1,14 @@
|
|||||||
|
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 {
|
import { useScreenPalette } from "@/contexts/android-tab-theme"
|
||||||
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"
|
||||||
@@ -31,6 +24,7 @@ import {
|
|||||||
Platform,
|
Platform,
|
||||||
Pressable,
|
Pressable,
|
||||||
StyleSheet,
|
StyleSheet,
|
||||||
|
Text,
|
||||||
View,
|
View,
|
||||||
type ListRenderItemInfo,
|
type ListRenderItemInfo,
|
||||||
} from "react-native"
|
} from "react-native"
|
||||||
@@ -111,17 +105,14 @@ export default function PlaylistScreen() {
|
|||||||
headerLargeTitle: false,
|
headerLargeTitle: false,
|
||||||
...(Platform.OS === "android"
|
...(Platform.OS === "android"
|
||||||
? {
|
? {
|
||||||
headerStyle: { backgroundColor: "transparent" },
|
headerStyle: { backgroundColor: palette.background },
|
||||||
headerBackground: renderAndroidArtworkBackground,
|
|
||||||
headerBackVisible: false,
|
|
||||||
headerLeft: renderArtworkBackButton,
|
|
||||||
headerTintColor: palette.foreground,
|
headerTintColor: palette.foreground,
|
||||||
}
|
}
|
||||||
: {}),
|
: {}),
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
<CollectionDetailSkeleton
|
<CollectionDetailSkeleton
|
||||||
zoomCoverSize={200}
|
variant="playlist"
|
||||||
onLayout={onLayout}
|
onLayout={onLayout}
|
||||||
style={backgroundStyle}
|
style={backgroundStyle}
|
||||||
backgroundColor={
|
backgroundColor={
|
||||||
@@ -142,9 +133,9 @@ export default function PlaylistScreen() {
|
|||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
<View style={[styles.empty, { backgroundColor: colors.background }]}>
|
<View style={[styles.empty, { backgroundColor: colors.background }]}>
|
||||||
<PaletteText style={{ color: colors.mutedForeground }}>
|
<Text style={{ color: colors.mutedForeground }}>
|
||||||
Playlist not found.
|
Playlist not found.
|
||||||
</PaletteText>
|
</Text>
|
||||||
</View>
|
</View>
|
||||||
</>
|
</>
|
||||||
)
|
)
|
||||||
@@ -179,6 +170,7 @@ 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()
|
||||||
@@ -202,12 +194,6 @@ 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
|
||||||
@@ -226,6 +212,14 @@ 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])
|
||||||
@@ -277,10 +271,7 @@ function PlaylistContent({
|
|||||||
headerTintColor: palette.foreground,
|
headerTintColor: palette.foreground,
|
||||||
...(Platform.OS === "android"
|
...(Platform.OS === "android"
|
||||||
? {
|
? {
|
||||||
headerStyle: { backgroundColor: "transparent" },
|
headerStyle: { backgroundColor: palette.background },
|
||||||
headerBackground: renderAndroidArtworkBackground,
|
|
||||||
headerBackVisible: false,
|
|
||||||
headerLeft: renderArtworkBackButton,
|
|
||||||
statusBarStyle: palette.isDark
|
statusBarStyle: palette.isDark
|
||||||
? ("light" as const)
|
? ("light" as const)
|
||||||
: ("dark" as const),
|
: ("dark" as const),
|
||||||
@@ -299,11 +290,10 @@ function PlaylistContent({
|
|||||||
onAction={handlePlaylistMenuAction}
|
onAction={handlePlaylistMenuAction}
|
||||||
>
|
>
|
||||||
<Pressable hitSlop={8}>
|
<Pressable hitSlop={8}>
|
||||||
<PaletteIcon
|
<Ionicons
|
||||||
tone="foreground"
|
|
||||||
name="ellipsis-horizontal"
|
name="ellipsis-horizontal"
|
||||||
size={22}
|
size={22}
|
||||||
color={palette.isDark ? "#fff" : "#000"}
|
color={colors.foreground}
|
||||||
/>
|
/>
|
||||||
</Pressable>
|
</Pressable>
|
||||||
</MediaActionMenu>
|
</MediaActionMenu>
|
||||||
@@ -311,6 +301,7 @@ function PlaylistContent({
|
|||||||
}
|
}
|
||||||
}, [
|
}, [
|
||||||
canEdit,
|
canEdit,
|
||||||
|
colors.foreground,
|
||||||
deletePlaylist,
|
deletePlaylist,
|
||||||
handlePlaylistDetailAction,
|
handlePlaylistDetailAction,
|
||||||
palette.foreground,
|
palette.foreground,
|
||||||
@@ -370,15 +361,14 @@ function PlaylistContent({
|
|||||||
contentInsetAdjustmentBehavior="automatic"
|
contentInsetAdjustmentBehavior="automatic"
|
||||||
onScrollBeginDrag={swipeGroup.closeOpenRow}
|
onScrollBeginDrag={swipeGroup.closeOpenRow}
|
||||||
ListEmptyComponent={
|
ListEmptyComponent={
|
||||||
<PaletteText
|
<Text
|
||||||
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."}
|
||||||
</PaletteText>
|
</Text>
|
||||||
}
|
}
|
||||||
ListHeaderComponent={
|
ListHeaderComponent={
|
||||||
<PlaylistHero
|
<PlaylistHero
|
||||||
@@ -432,6 +422,7 @@ 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"
|
||||||
? {
|
? {
|
||||||
@@ -439,12 +430,7 @@ 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:
|
onRemove: removable ? () => void handleRemove() : undefined,
|
||||||
Platform.OS === "android" && removable
|
|
||||||
? () => {
|
|
||||||
void onRemove(song.id)
|
|
||||||
}
|
|
||||||
: undefined,
|
|
||||||
}
|
}
|
||||||
: undefined
|
: undefined
|
||||||
}
|
}
|
||||||
@@ -475,19 +461,15 @@ const PlaylistSongRow = memo(function PlaylistSongRow({
|
|||||||
}}
|
}}
|
||||||
style={[styles.removeAction, { backgroundColor: colors.destructive }]}
|
style={[styles.removeAction, { backgroundColor: colors.destructive }]}
|
||||||
>
|
>
|
||||||
<PaletteIcon
|
<Ionicons name="trash" size={22} color={colors.primaryForeground} />
|
||||||
name="trash"
|
<Text
|
||||||
size={22}
|
|
||||||
color={colors.primaryForeground}
|
|
||||||
/>
|
|
||||||
<PaletteText
|
|
||||||
style={[
|
style={[
|
||||||
styles.removeActionText,
|
styles.removeActionText,
|
||||||
{ color: colors.primaryForeground },
|
{ color: colors.primaryForeground },
|
||||||
]}
|
]}
|
||||||
>
|
>
|
||||||
Remove
|
Remove
|
||||||
</PaletteText>
|
</Text>
|
||||||
</Pressable>
|
</Pressable>
|
||||||
)}
|
)}
|
||||||
>
|
>
|
||||||
@@ -567,8 +549,7 @@ const PlaylistHero = memo(function PlaylistHero({
|
|||||||
},
|
},
|
||||||
]}
|
]}
|
||||||
>
|
>
|
||||||
<PaletteIcon
|
<Ionicons
|
||||||
tone={isSubscribed ? "foreground" : "accentForeground"}
|
|
||||||
name={isSubscribed ? "checkmark" : "add"}
|
name={isSubscribed ? "checkmark" : "add"}
|
||||||
size={24}
|
size={24}
|
||||||
color={
|
color={
|
||||||
@@ -594,18 +575,12 @@ const PlaylistHero = memo(function PlaylistHero({
|
|||||||
onPress={onShuffle}
|
onPress={onShuffle}
|
||||||
style={[styles.iconAction, { backgroundColor: palette.surface }]}
|
style={[styles.iconAction, { backgroundColor: palette.surface }]}
|
||||||
>
|
>
|
||||||
<PaletteIcon
|
<Ionicons name="shuffle" size={24} color={palette.foreground} />
|
||||||
tone="foreground"
|
|
||||||
name="shuffle"
|
|
||||||
size={24}
|
|
||||||
color={palette.foreground}
|
|
||||||
/>
|
|
||||||
</Pressable>
|
</Pressable>
|
||||||
</View>
|
</View>
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
<PaletteText
|
<Text
|
||||||
tone="foreground"
|
|
||||||
style={[
|
style={[
|
||||||
styles.title,
|
styles.title,
|
||||||
heroLayout.landscape && styles.titleLandscape,
|
heroLayout.landscape && styles.titleLandscape,
|
||||||
@@ -613,16 +588,15 @@ const PlaylistHero = memo(function PlaylistHero({
|
|||||||
]}
|
]}
|
||||||
>
|
>
|
||||||
{title}
|
{title}
|
||||||
</PaletteText>
|
</Text>
|
||||||
<PaletteText
|
<Text
|
||||||
tone="foreground"
|
|
||||||
style={{
|
style={{
|
||||||
color: palette.foreground,
|
color: palette.foreground,
|
||||||
fontSize: heroLayout.landscape ? 22 : 16,
|
fontSize: heroLayout.landscape ? 22 : 16,
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{ownerName}
|
{ownerName}
|
||||||
</PaletteText>
|
</Text>
|
||||||
</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 />
|
<CollectionDetailSkeleton variant="favorites" />
|
||||||
</>
|
</>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { dolbyAtmosSupported } from "@/lib/playback-capabilities"
|
import { atmosEnabled, 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,11 +26,12 @@ 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 { 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 "@/lib/urls"
|
import type { PlaybackQuality } from "@otunes/convex/playback-stream"
|
||||||
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"
|
||||||
|
|
||||||
@@ -185,6 +186,7 @@ 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 {
|
||||||
@@ -418,7 +420,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={dolbyAtmosSupported && (user.preferAtmos ?? false)}
|
value={atmosEnabled(user)}
|
||||||
onValueChange={(checked) =>
|
onValueChange={(checked) =>
|
||||||
void updateAtmos({ preferAtmos: checked }).catch((error: Error) =>
|
void updateAtmos({ preferAtmos: checked }).catch((error: Error) =>
|
||||||
showError(error.message)
|
showError(error.message)
|
||||||
|
|||||||
@@ -118,12 +118,7 @@ export default function LibraryScreen() {
|
|||||||
)
|
)
|
||||||
|
|
||||||
if (status === "LoadingFirstPage" && !isCached) {
|
if (status === "LoadingFirstPage" && !isCached) {
|
||||||
return (
|
return <MediaGridSkeleton contentInset={false} header={listHeader} />
|
||||||
<View style={{ flex: 1, backgroundColor: colors.background }}>
|
|
||||||
{listHeader}
|
|
||||||
<MediaGridSkeleton contentInset={false} />
|
|
||||||
</View>
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
|||||||
@@ -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)"
|
||||||
|
|||||||
+119
-142
@@ -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 { dolbyAtmosSupported } from "@/lib/playback-capabilities"
|
import { atmosEnabled } 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 { useEffect, useRef, useState } from "react"
|
import { useCallback, useEffect, useMemo, 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 { usePlayback } from "@/contexts/playback"
|
import { usePlaybackActions, usePlaybackQueue } 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,20 +90,13 @@ export default function PlayerScreen() {
|
|||||||
isPlaying,
|
isPlaying,
|
||||||
shuffleEnabled,
|
shuffleEnabled,
|
||||||
repeatEnabled,
|
repeatEnabled,
|
||||||
currentTime,
|
|
||||||
duration,
|
|
||||||
queueSongIds,
|
queueSongIds,
|
||||||
setIsPlaying,
|
} = usePlaybackQueue()
|
||||||
seekTo,
|
const { setIsPlaying, skipNext, skipPrevious } = usePlaybackActions()
|
||||||
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,
|
||||||
@@ -114,7 +107,7 @@ export default function PlayerScreen() {
|
|||||||
? playbackFormat(
|
? playbackFormat(
|
||||||
playbackInfo.files,
|
playbackInfo.files,
|
||||||
user.playbackQuality,
|
user.playbackQuality,
|
||||||
dolbyAtmosSupported && (user.preferAtmos ?? false)
|
atmosEnabled(user)
|
||||||
)
|
)
|
||||||
: null
|
: null
|
||||||
|
|
||||||
@@ -126,7 +119,7 @@ export default function PlayerScreen() {
|
|||||||
coverUri,
|
coverUri,
|
||||||
currentSong ? currentSong.album.cover != null : undefined
|
currentSong ? currentSong.album.cover != null : undefined
|
||||||
)
|
)
|
||||||
const colors = nowPlayingColors(palette)
|
const colors = useMemo(() => nowPlayingColors(palette), [palette])
|
||||||
|
|
||||||
const background = useSharedValue(colors.background)
|
const background = useSharedValue(colors.background)
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@@ -159,33 +152,65 @@ 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.
|
// swipe to dismiss. Each GestureDetector needs its own gesture instance.
|
||||||
function dismissGesture() {
|
const makeDismissGesture = useCallback(
|
||||||
return Gesture.Pan()
|
() =>
|
||||||
.activeOffsetY(12)
|
Gesture.Pan()
|
||||||
.failOffsetY(-12)
|
.activeOffsetY(12)
|
||||||
.failOffsetX([-20, 20])
|
.failOffsetY(-12)
|
||||||
.onUpdate((event) => {
|
.failOffsetX([-20, 20])
|
||||||
dismissY.value = Math.max(0, event.translationY)
|
.onUpdate((event) => {
|
||||||
})
|
dismissY.value = Math.max(0, event.translationY)
|
||||||
.onEnd((event) => {
|
})
|
||||||
if (
|
.onEnd((event) => {
|
||||||
event.translationY > DISMISS_DISTANCE ||
|
if (
|
||||||
event.velocityY > DISMISS_VELOCITY
|
event.translationY > DISMISS_DISTANCE ||
|
||||||
) {
|
event.velocityY > DISMISS_VELOCITY
|
||||||
scheduleOnRN(setIsDismissing, true)
|
) {
|
||||||
dismissY.value = withTiming(
|
scheduleOnRN(setIsDismissing, true)
|
||||||
windowHeight,
|
dismissY.value = withTiming(
|
||||||
{ duration: 220 },
|
windowHeight,
|
||||||
(finished) => {
|
{ duration: 220 },
|
||||||
if (finished) scheduleOnRN(router.back)
|
(finished) => {
|
||||||
}
|
if (finished) scheduleOnRN(router.back)
|
||||||
)
|
}
|
||||||
} else {
|
)
|
||||||
dismissY.value = withSpring(0, { duration: 350, dampingRatio: 0.85 })
|
} else {
|
||||||
}
|
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
|
||||||
|
|
||||||
@@ -204,7 +229,6 @@ 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,
|
||||||
@@ -213,9 +237,6 @@ 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)
|
||||||
@@ -234,10 +255,10 @@ export default function PlayerScreen() {
|
|||||||
colors={colors}
|
colors={colors}
|
||||||
backgroundStyle={backgroundStyle}
|
backgroundStyle={backgroundStyle}
|
||||||
dismissStyle={dismissStyle}
|
dismissStyle={dismissStyle}
|
||||||
dismissGesture={dismissGesture}
|
dismissGestures={{ handle: handleGesture, artwork: controlsGesture }}
|
||||||
showQueue={showQueue}
|
showQueue={showQueue}
|
||||||
toggleQueue={toggleQueue}
|
toggleQueue={toggleQueue}
|
||||||
metadata={<SongMeta song={currentSong} colors={colors} />}
|
metadata={songMeta}
|
||||||
/>
|
/>
|
||||||
</MusicEntityView>
|
</MusicEntityView>
|
||||||
)
|
)
|
||||||
@@ -264,7 +285,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={dismissGesture()}>
|
<GestureDetector gesture={handleGesture}>
|
||||||
<Pressable
|
<Pressable
|
||||||
onPress={() => router.back()}
|
onPress={() => router.back()}
|
||||||
hitSlop={12}
|
hitSlop={12}
|
||||||
@@ -278,7 +299,7 @@ export default function PlayerScreen() {
|
|||||||
</Pressable>
|
</Pressable>
|
||||||
</GestureDetector>
|
</GestureDetector>
|
||||||
|
|
||||||
<GestureDetector gesture={dismissGesture().enabled(!showQueue)}>
|
<GestureDetector gesture={stageGesture}>
|
||||||
<View
|
<View
|
||||||
style={styles.stage}
|
style={styles.stage}
|
||||||
onLayout={(event) =>
|
onLayout={(event) =>
|
||||||
@@ -297,20 +318,7 @@ export default function PlayerScreen() {
|
|||||||
<NowPlayingQueue
|
<NowPlayingQueue
|
||||||
colors={colors}
|
colors={colors}
|
||||||
viewportHeight={stageHeight}
|
viewportHeight={stageHeight}
|
||||||
currentHeader={
|
currentHeader={queueHeader}
|
||||||
<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
|
||||||
@@ -334,50 +342,28 @@ export default function PlayerScreen() {
|
|||||||
/>
|
/>
|
||||||
</Animated.View>
|
</Animated.View>
|
||||||
</View>
|
</View>
|
||||||
<View style={styles.meta}>
|
<View style={styles.meta}>{songMeta}</View>
|
||||||
<SongMeta song={currentSong} colors={colors} />
|
|
||||||
</View>
|
|
||||||
</Animated.View>
|
</Animated.View>
|
||||||
)}
|
)}
|
||||||
</LayoutAnimationConfig>
|
</LayoutAnimationConfig>
|
||||||
</View>
|
</View>
|
||||||
</GestureDetector>
|
</GestureDetector>
|
||||||
|
|
||||||
<GestureDetector gesture={dismissGesture()}>
|
<GestureDetector gesture={controlsGesture}>
|
||||||
<View style={[styles.controls, { paddingBottom: bottomInset }]}>
|
<View style={[styles.controls, { paddingBottom: bottomInset }]}>
|
||||||
<PlayerSlider
|
<PlayerProgress
|
||||||
accessibilityLabel="Playback position"
|
colors={colors}
|
||||||
value={displayedTime}
|
timeStyle={styles.time}
|
||||||
maximumValue={duration}
|
center={
|
||||||
fillColor={colors.sliderFill}
|
format ? (
|
||||||
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}
|
||||||
/>
|
/>
|
||||||
</View>
|
) : null
|
||||||
) : null}
|
}
|
||||||
<Text style={[styles.time, { color: timeColor }]}>
|
/>
|
||||||
{formatRemainingDuration(displayedTime, duration).replace(
|
|
||||||
"-",
|
|
||||||
"\u2212"
|
|
||||||
)}
|
|
||||||
</Text>
|
|
||||||
</View>
|
|
||||||
|
|
||||||
<View style={styles.transport}>
|
<View style={styles.transport}>
|
||||||
<TransportButton
|
<TransportButton
|
||||||
@@ -419,35 +405,7 @@ export default function PlayerScreen() {
|
|||||||
</TransportButton>
|
</TransportButton>
|
||||||
</View>
|
</View>
|
||||||
|
|
||||||
{volumeAvailable ? (
|
<VolumeSlider colors={colors} />
|
||||||
<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
|
||||||
@@ -517,6 +475,41 @@ 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,
|
||||||
@@ -739,23 +732,7 @@ const styles = StyleSheet.create({
|
|||||||
paddingHorizontal: HORIZONTAL_INSET,
|
paddingHorizontal: HORIZONTAL_INSET,
|
||||||
paddingTop: spacing.md,
|
paddingTop: spacing.md,
|
||||||
},
|
},
|
||||||
timeRow: {
|
time: { fontWeight: "600" },
|
||||||
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",
|
||||||
|
|||||||
@@ -1,147 +1,21 @@
|
|||||||
import { useConvex, useQuery } from "convex/react"
|
import { useQuery } from "convex/react"
|
||||||
import * as AppIntents from "expo-app-intents"
|
import * as AppIntents from "expo-app-intents"
|
||||||
import type { AppIntentEntity, AppIntentInvocation } from "expo-app-intents"
|
import { useMemo, useSyncExternalStore } from "react"
|
||||||
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(
|
||||||
@@ -154,669 +28,8 @@ export function AppIntentBridge() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function ReadyAppIntentBridge() {
|
function ReadyAppIntentBridge() {
|
||||||
const convex = useConvex()
|
useMusicCatalogSync()
|
||||||
const cacheScope = useCacheScope()
|
useNowPlayingCatalog()
|
||||||
const playback = usePlayback()
|
useIntentDispatch()
|
||||||
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
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,198 @@
|
|||||||
|
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])
|
||||||
|
}
|
||||||
@@ -0,0 +1,631 @@
|
|||||||
|
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.")
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
@@ -0,0 +1,59 @@
|
|||||||
|
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])
|
||||||
|
}
|
||||||
@@ -1,40 +1,33 @@
|
|||||||
import { PaletteText } from "@/components/palette-text"
|
import { StyleSheet, Text, View } from "react-native"
|
||||||
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
|
<Svg width={DOLBY_WIDTH} height={MARK_HEIGHT} viewBox={DOLBY_VIEW_BOX}>
|
||||||
width={(MARK_HEIGHT * 23) / 16}
|
{DOLBY_PATHS.map((d) => (
|
||||||
height={MARK_HEIGHT}
|
<Path key={d} d={d} fill={color} />
|
||||||
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.
|
||||||
@@ -48,9 +41,9 @@ function LosslessMark({
|
|||||||
}) {
|
}) {
|
||||||
return (
|
return (
|
||||||
<Svg
|
<Svg
|
||||||
width={(MARK_HEIGHT * 544) / 271}
|
width={LOSSLESS_WIDTH}
|
||||||
height={MARK_HEIGHT}
|
height={MARK_HEIGHT}
|
||||||
viewBox="28 154 544 271"
|
viewBox={LOSSLESS_VIEW_BOX}
|
||||||
>
|
>
|
||||||
{LOSSLESS_STROKES.map(([peak, d], index) => (
|
{LOSSLESS_STROKES.map(([peak, d], index) => (
|
||||||
<Path
|
<Path
|
||||||
@@ -75,12 +68,10 @@ 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
|
||||||
@@ -93,12 +84,7 @@ export function AudioFormatBadge({
|
|||||||
) : (
|
) : (
|
||||||
<LosslessMark color={color} backgroundColor={backgroundColor} />
|
<LosslessMark color={color} backgroundColor={backgroundColor} />
|
||||||
)}
|
)}
|
||||||
<PaletteText
|
<Text style={[styles.label, { color }]}>{label}</Text>
|
||||||
tone={artwork ? "secondaryForeground" : undefined}
|
|
||||||
style={[styles.label, { color }]}
|
|
||||||
>
|
|
||||||
{label}
|
|
||||||
</PaletteText>
|
|
||||||
</View>
|
</View>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
import { PaletteText } from "@/components/palette-text"
|
|
||||||
import { memo } from "react"
|
import { memo } from "react"
|
||||||
import { StyleSheet, View } from "react-native"
|
import { StyleSheet, Text, View } from "react-native"
|
||||||
|
|
||||||
import { useThemeColors } from "@/lib/theme"
|
import { useThemeColors } from "@/lib/theme"
|
||||||
|
|
||||||
@@ -26,12 +25,9 @@ export const DiscHeader = memo(function DiscHeader({
|
|||||||
}) {
|
}) {
|
||||||
const colors = useThemeColors()
|
const colors = useThemeColors()
|
||||||
return (
|
return (
|
||||||
<PaletteText
|
<Text style={[styles.discHeader, { color: color ?? colors.foreground }]}>
|
||||||
tone={color ? "foreground" : undefined}
|
|
||||||
style={[styles.discHeader, { color: color ?? colors.foreground }]}
|
|
||||||
>
|
|
||||||
{label}
|
{label}
|
||||||
</PaletteText>
|
</Text>
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
@@ -35,7 +35,11 @@ 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 || source.origin !== new URL(config.serverUrl).origin) {
|
if (!config) {
|
||||||
|
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,6 +32,7 @@ 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 = {
|
||||||
@@ -54,6 +55,7 @@ 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
|
||||||
@@ -76,6 +78,7 @@ 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",
|
||||||
@@ -119,6 +122,12 @@ 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",
|
||||||
@@ -134,6 +143,10 @@ 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)
|
||||||
}
|
}
|
||||||
@@ -190,6 +203,7 @@ 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 } } : {}),
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -324,6 +338,7 @@ 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"
|
||||||
@@ -377,6 +392,7 @@ 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,6 +25,7 @@ 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"]>
|
||||||
|
|
||||||
|
|||||||
@@ -1,13 +1,11 @@
|
|||||||
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, View } from "react-native"
|
import { Platform, Pressable, StyleSheet, Text, View } from "react-native"
|
||||||
|
|
||||||
import { useSafeAreaInsets } from "react-native-safe-area-context"
|
import { useSafeAreaInsets } from "react-native-safe-area-context"
|
||||||
|
|
||||||
@@ -67,8 +65,7 @@ function MiniPlayerContent({
|
|||||||
<View
|
<View
|
||||||
style={isAccessory ? styles.accessoryInlineMeta : styles.inlineMeta}
|
style={isAccessory ? styles.accessoryInlineMeta : styles.inlineMeta}
|
||||||
>
|
>
|
||||||
<PaletteText
|
<Text
|
||||||
tone="foreground"
|
|
||||||
style={[
|
style={[
|
||||||
isAccessory ? styles.accessoryTitle : styles.title,
|
isAccessory ? styles.accessoryTitle : styles.title,
|
||||||
{ color: colors.foreground },
|
{ color: colors.foreground },
|
||||||
@@ -76,7 +73,7 @@ function MiniPlayerContent({
|
|||||||
numberOfLines={1}
|
numberOfLines={1}
|
||||||
>
|
>
|
||||||
{currentSong.title}
|
{currentSong.title}
|
||||||
</PaletteText>
|
</Text>
|
||||||
</View>
|
</View>
|
||||||
<Pressable
|
<Pressable
|
||||||
style={styles.controlButton}
|
style={styles.controlButton}
|
||||||
@@ -86,8 +83,7 @@ function MiniPlayerContent({
|
|||||||
}}
|
}}
|
||||||
hitSlop={6}
|
hitSlop={6}
|
||||||
>
|
>
|
||||||
<PaletteIcon
|
<Ionicons
|
||||||
tone="foreground"
|
|
||||||
name={isPlaying ? "pause" : "play"}
|
name={isPlaying ? "pause" : "play"}
|
||||||
size={20}
|
size={20}
|
||||||
color={colors.foreground}
|
color={colors.foreground}
|
||||||
@@ -105,8 +101,7 @@ function MiniPlayerContent({
|
|||||||
style={artworkStyle}
|
style={artworkStyle}
|
||||||
/>
|
/>
|
||||||
<View style={isAccessory ? styles.accessoryMeta : styles.meta}>
|
<View style={isAccessory ? styles.accessoryMeta : styles.meta}>
|
||||||
<PaletteText
|
<Text
|
||||||
tone="foreground"
|
|
||||||
style={[
|
style={[
|
||||||
isAccessory ? styles.accessoryTitle : styles.title,
|
isAccessory ? styles.accessoryTitle : styles.title,
|
||||||
{ color: colors.foreground },
|
{ color: colors.foreground },
|
||||||
@@ -114,9 +109,8 @@ function MiniPlayerContent({
|
|||||||
numberOfLines={1}
|
numberOfLines={1}
|
||||||
>
|
>
|
||||||
{currentSong.title}
|
{currentSong.title}
|
||||||
</PaletteText>
|
</Text>
|
||||||
<PaletteText
|
<Text
|
||||||
tone="secondaryForeground"
|
|
||||||
style={[
|
style={[
|
||||||
isAccessory ? styles.accessoryArtist : styles.artist,
|
isAccessory ? styles.accessoryArtist : styles.artist,
|
||||||
{ color: colors.mutedForeground },
|
{ color: colors.mutedForeground },
|
||||||
@@ -124,7 +118,7 @@ function MiniPlayerContent({
|
|||||||
numberOfLines={1}
|
numberOfLines={1}
|
||||||
>
|
>
|
||||||
{currentSong.artist.name}
|
{currentSong.artist.name}
|
||||||
</PaletteText>
|
</Text>
|
||||||
</View>
|
</View>
|
||||||
<View style={styles.controls}>
|
<View style={styles.controls}>
|
||||||
{Platform.OS === "android" && !isAccessory ? (
|
{Platform.OS === "android" && !isAccessory ? (
|
||||||
@@ -138,12 +132,7 @@ function MiniPlayerContent({
|
|||||||
}}
|
}}
|
||||||
hitSlop={6}
|
hitSlop={6}
|
||||||
>
|
>
|
||||||
<PaletteIcon
|
<Ionicons name="play-back" size={24} color={colors.foreground} />
|
||||||
tone="foreground"
|
|
||||||
name="play-back"
|
|
||||||
size={24}
|
|
||||||
color={colors.foreground}
|
|
||||||
/>
|
|
||||||
</Pressable>
|
</Pressable>
|
||||||
) : null}
|
) : null}
|
||||||
<Pressable
|
<Pressable
|
||||||
@@ -154,8 +143,7 @@ function MiniPlayerContent({
|
|||||||
}}
|
}}
|
||||||
hitSlop={6}
|
hitSlop={6}
|
||||||
>
|
>
|
||||||
<PaletteIcon
|
<Ionicons
|
||||||
tone="foreground"
|
|
||||||
name={isPlaying ? "pause" : "play"}
|
name={isPlaying ? "pause" : "play"}
|
||||||
size={24}
|
size={24}
|
||||||
color={colors.foreground}
|
color={colors.foreground}
|
||||||
@@ -169,12 +157,7 @@ function MiniPlayerContent({
|
|||||||
}}
|
}}
|
||||||
hitSlop={6}
|
hitSlop={6}
|
||||||
>
|
>
|
||||||
<PaletteIcon
|
<Ionicons name="play-forward" size={24} color={colors.foreground} />
|
||||||
tone="foreground"
|
|
||||||
name="play-forward"
|
|
||||||
size={24}
|
|
||||||
color={colors.foreground}
|
|
||||||
/>
|
|
||||||
</Pressable>
|
</Pressable>
|
||||||
</View>
|
</View>
|
||||||
</Pressable>
|
</Pressable>
|
||||||
@@ -184,10 +167,9 @@ 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 (
|
||||||
<Animated.View style={[styles.androidBar, backgroundStyle]}>
|
<View style={[styles.androidBar, { backgroundColor: palette.background }]}>
|
||||||
{children}
|
{children}
|
||||||
{hasArtworkPalette ? (
|
{hasArtworkPalette ? (
|
||||||
<View
|
<View
|
||||||
@@ -205,7 +187,7 @@ function MiniPlayerChrome({ children }: { children: React.ReactNode }) {
|
|||||||
{ backgroundColor: palette.secondaryForeground },
|
{ backgroundColor: palette.secondaryForeground },
|
||||||
]}
|
]}
|
||||||
/>
|
/>
|
||||||
</Animated.View>
|
</View>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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 { usePlayback } from "@/contexts/playback"
|
import { usePlaybackActions, usePlaybackQueue } 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,18 +110,16 @@ 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,
|
||||||
} = usePlayback()
|
} = usePlaybackActions()
|
||||||
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)
|
||||||
@@ -307,100 +305,126 @@ export function NowPlayingQueue({
|
|||||||
[drag]
|
[drag]
|
||||||
)
|
)
|
||||||
|
|
||||||
const renderItem = ({ item }: { item: QueueListItem }) => {
|
const lastIndex = queueSongIds.length - 1
|
||||||
switch (item.type) {
|
const renderItem = useCallback(
|
||||||
case "history-header":
|
({ item }: { item: QueueListItem }) => {
|
||||||
return (
|
switch (item.type) {
|
||||||
<View style={styles.historyHeader}>
|
case "history-header":
|
||||||
<Text style={[styles.sectionTitle, { color: colors.foreground }]}>
|
return (
|
||||||
History
|
<View style={styles.historyHeader}>
|
||||||
</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 }]}>
|
<Text style={[styles.sectionTitle, { color: colors.foreground }]}>
|
||||||
Continue Playing
|
History
|
||||||
</Text>
|
</Text>
|
||||||
) : null}
|
<Pressable onPress={() => void clearHistory()} hitSlop={10}>
|
||||||
</View>
|
<Text
|
||||||
)
|
style={[styles.clear, { color: colors.secondaryForeground }]}
|
||||||
case "upcoming":
|
>
|
||||||
return (
|
Clear
|
||||||
<UpcomingRow
|
</Text>
|
||||||
songId={item.songId}
|
</Pressable>
|
||||||
queueIndex={item.queueIndex}
|
</View>
|
||||||
lastIndex={queueSongIds.length - 1}
|
)
|
||||||
tablet={tablet}
|
case "history":
|
||||||
colors={colors}
|
return (
|
||||||
drag={drag}
|
<HistoryRow
|
||||||
swipeGroup={swipeGroup}
|
songId={item.songId}
|
||||||
onPress={skipToQueueIndex}
|
historyIndex={item.historyIndex}
|
||||||
onRemove={handleRemove}
|
colors={colors}
|
||||||
onDragStart={handleDragStart}
|
onPress={skipToHistoryIndex}
|
||||||
onDrop={handleDrop}
|
/>
|
||||||
/>
|
)
|
||||||
)
|
case "current":
|
||||||
case "empty":
|
return <View style={styles.current}>{currentHeader}</View>
|
||||||
return (
|
case "controls":
|
||||||
<View style={[styles.empty, { height: item.height }]}>
|
return (
|
||||||
<Text
|
<View
|
||||||
style={[styles.emptyText, { color: colors.secondaryForeground }]}
|
style={[
|
||||||
|
styles.controls,
|
||||||
|
{
|
||||||
|
height: itemHeight(item),
|
||||||
|
backgroundColor: tablet ? "transparent" : colors.background,
|
||||||
|
},
|
||||||
|
]}
|
||||||
>
|
>
|
||||||
Nothing else is queued.
|
{!tablet ? (
|
||||||
</Text>
|
<View style={styles.toggles}>
|
||||||
</View>
|
<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
|
||||||
|
style={[
|
||||||
|
styles.emptyText,
|
||||||
|
{ color: colors.secondaryForeground },
|
||||||
|
]}
|
||||||
|
>
|
||||||
|
Nothing else is queued.
|
||||||
|
</Text>
|
||||||
|
</View>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
},
|
||||||
|
[
|
||||||
|
clearHistory,
|
||||||
|
colors,
|
||||||
|
currentHeader,
|
||||||
|
cycleRepeat,
|
||||||
|
drag,
|
||||||
|
handleDragStart,
|
||||||
|
handleDrop,
|
||||||
|
handleRemove,
|
||||||
|
lastIndex,
|
||||||
|
repeatEnabled,
|
||||||
|
shuffleEnabled,
|
||||||
|
skipToHistoryIndex,
|
||||||
|
skipToQueueIndex,
|
||||||
|
swipeGroup,
|
||||||
|
tablet,
|
||||||
|
toggleShuffle,
|
||||||
|
]
|
||||||
|
)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<View
|
<View
|
||||||
|
|||||||
@@ -1,49 +0,0 @@
|
|||||||
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 />
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,83 @@
|
|||||||
|
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"] },
|
||||||
|
})
|
||||||
@@ -1,6 +1,5 @@
|
|||||||
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"
|
||||||
@@ -16,7 +15,7 @@ import {
|
|||||||
useThemeColors,
|
useThemeColors,
|
||||||
} from "@/lib/theme"
|
} from "@/lib/theme"
|
||||||
import { memo, useCallback } from "react"
|
import { memo, useCallback } from "react"
|
||||||
import { Platform, Pressable, StyleSheet, View } from "react-native"
|
import { Platform, Pressable, StyleSheet, Text, View } from "react-native"
|
||||||
|
|
||||||
import {
|
import {
|
||||||
MediaContextMenu,
|
MediaContextMenu,
|
||||||
@@ -64,27 +63,22 @@ export const SongRow = memo(function SongRow({
|
|||||||
const content = (
|
const content = (
|
||||||
<>
|
<>
|
||||||
<View style={styles.rowMeta}>
|
<View style={styles.rowMeta}>
|
||||||
<PaletteText
|
<Text
|
||||||
tone={palette ? "foreground" : undefined}
|
|
||||||
style={[styles.rowTitle, { color: foreground }]}
|
style={[styles.rowTitle, { color: foreground }]}
|
||||||
numberOfLines={1}
|
numberOfLines={1}
|
||||||
>
|
>
|
||||||
{song.title}
|
{song.title}
|
||||||
</PaletteText>
|
</Text>
|
||||||
<PaletteText
|
<Text
|
||||||
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}
|
||||||
</PaletteText>
|
</Text>
|
||||||
</View>
|
</View>
|
||||||
<PaletteText
|
<Text style={[styles.duration, { color: secondaryForeground }]}>
|
||||||
tone={palette ? "secondaryForeground" : undefined}
|
|
||||||
style={[styles.duration, { color: secondaryForeground }]}
|
|
||||||
>
|
|
||||||
{formatDuration(song.durationSeconds)}
|
{formatDuration(song.durationSeconds)}
|
||||||
</PaletteText>
|
</Text>
|
||||||
{trailing}
|
{trailing}
|
||||||
</>
|
</>
|
||||||
)
|
)
|
||||||
@@ -160,6 +154,7 @@ export const SongListRow = memo(function SongListRow({
|
|||||||
palette,
|
palette,
|
||||||
inset,
|
inset,
|
||||||
swipe,
|
swipe,
|
||||||
|
removable,
|
||||||
onPlay,
|
onPlay,
|
||||||
onAction,
|
onAction,
|
||||||
}: {
|
}: {
|
||||||
@@ -175,6 +170,8 @@ 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
|
||||||
}) {
|
}) {
|
||||||
@@ -202,6 +199,7 @@ 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,19 +4,15 @@ 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(
|
||||||
const query = search.searchQuery.toLowerCase()
|
() => filterSongs(songs, search.searchQuery),
|
||||||
if (!query) return songs
|
[songs, search.searchQuery]
|
||||||
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 }
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,15 +1,20 @@
|
|||||||
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 ReactNode, type ComponentProps } from "react"
|
import { type ComponentProps, type ReactNode } from "react"
|
||||||
import {
|
import {
|
||||||
Platform,
|
Platform,
|
||||||
ScrollView,
|
|
||||||
StyleSheet,
|
StyleSheet,
|
||||||
View,
|
View,
|
||||||
type DimensionValue,
|
type DimensionValue,
|
||||||
@@ -17,34 +22,42 @@ 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. */
|
/**
|
||||||
function SkeletonContent({
|
* Loading screens never scroll, so they cannot rely on scroll-view inset
|
||||||
|
* adjustment. iOS headers are transparent and overlap the screen; Android
|
||||||
|
* headers are opaque and already sit above it.
|
||||||
|
*/
|
||||||
|
function SkeletonScreen({
|
||||||
children,
|
children,
|
||||||
embedded = false,
|
style,
|
||||||
|
backgroundColor,
|
||||||
|
onLayout,
|
||||||
}: {
|
}: {
|
||||||
children: ReactNode
|
children: ReactNode
|
||||||
embedded?: boolean
|
style?: ComponentProps<typeof Reanimated.View>["style"]
|
||||||
|
backgroundColor?: string
|
||||||
|
onLayout?: () => void
|
||||||
}) {
|
}) {
|
||||||
const colors = useThemeColors()
|
const colors = useThemeColors()
|
||||||
const headerHeight = useHeaderHeight()
|
const headerHeight = useHeaderHeight()
|
||||||
if (embedded) return <>{children}</>
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ScrollView
|
<Reanimated.View
|
||||||
style={{ flex: 1, backgroundColor: colors.background }}
|
onLayout={onLayout}
|
||||||
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}
|
||||||
</ScrollView>
|
</Reanimated.View>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -61,56 +74,103 @@ 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,
|
||||||
height = 14,
|
fontSize,
|
||||||
}: {
|
}: {
|
||||||
width: DimensionValue
|
width: DimensionValue
|
||||||
height?: number
|
fontSize: number
|
||||||
}) {
|
}) {
|
||||||
return <Skeleton style={{ width, height, borderRadius: 4 }} />
|
return (
|
||||||
|
<View
|
||||||
|
style={{
|
||||||
|
width,
|
||||||
|
height: Math.round(fontSize * 1.2),
|
||||||
|
justifyContent: "center",
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Skeleton
|
||||||
|
style={{ height: Math.round(fontSize * 0.8), borderRadius: 4 }}
|
||||||
|
/>
|
||||||
|
</View>
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
export function SongRowSkeleton() {
|
/** Mirrors `SongRow`, including its `inset` album/playlist layout. */
|
||||||
|
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} />
|
||||||
<View style={styles.songMeta}>
|
{meta}
|
||||||
<TextLine width="60%" height={16} />
|
</View>
|
||||||
<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>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
export function SongListSkeleton({
|
function SongRows({ rows, inset }: { rows: number; inset?: boolean }) {
|
||||||
rows = 10,
|
return Array.from({ length: rows }, (_, index) => (
|
||||||
embedded = false,
|
<SongRowSkeleton key={index} inset={inset} />
|
||||||
}: {
|
))
|
||||||
rows?: number
|
}
|
||||||
embedded?: boolean
|
|
||||||
}) {
|
export function SongListSkeleton({ rows = 10 }: { rows?: number }) {
|
||||||
return (
|
return (
|
||||||
<SkeletonContent embedded={embedded}>
|
<SkeletonScreen>
|
||||||
<View accessibilityLabel="Loading" accessibilityRole="progressbar">
|
<SongRows rows={rows} />
|
||||||
{Array.from({ length: rows }, (_, index) => (
|
</SkeletonScreen>
|
||||||
<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 }]}>
|
<View style={[styles.card, { width, minHeight }]}>
|
||||||
<Skeleton
|
<Skeleton
|
||||||
style={{
|
style={{
|
||||||
width,
|
width,
|
||||||
@@ -118,35 +178,37 @@ function CardSkeleton({
|
|||||||
borderRadius: round ? width / 2 : radius.md,
|
borderRadius: round ? width / 2 : radius.md,
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
<TextLine width="80%" />
|
<TextLine width="80%" fontSize={14} />
|
||||||
{round ? null : <TextLine width="50%" height={12} />}
|
{round ? null : <TextLine width="50%" fontSize={12} />}
|
||||||
</View>
|
</View>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
export function MediaGridSkeleton({
|
/** Mirrors `MediaGridList`: a `FlatList` on phones, `TabletMediaGrid` on iPad. */
|
||||||
items = 6,
|
function MediaGridContent({
|
||||||
contentInset = true,
|
items,
|
||||||
embedded = false,
|
contentInset,
|
||||||
|
header,
|
||||||
}: {
|
}: {
|
||||||
items?: number
|
items: number
|
||||||
contentInset?: boolean
|
contentInset: boolean
|
||||||
embedded?: boolean
|
header?: ReactNode
|
||||||
}) {
|
}) {
|
||||||
|
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,
|
||||||
},
|
},
|
||||||
]}
|
]}
|
||||||
@@ -154,20 +216,47 @@ export function MediaGridSkeleton({
|
|||||||
{Array.from(
|
{Array.from(
|
||||||
{ length: ready ? Math.max(items, columns * 3) : 0 },
|
{ length: ready ? Math.max(items, columns * 3) : 0 },
|
||||||
(_, index) => (
|
(_, index) => (
|
||||||
<CardSkeleton key={index} width={cardWidth} />
|
<CardSkeleton
|
||||||
|
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} height={22} />
|
<TextLine width={160} fontSize={22} />
|
||||||
<View style={styles.carouselRow}>
|
<View style={styles.carouselRow}>
|
||||||
{Array.from({ length: 3 }, (_, index) => (
|
{Array.from({ length: 8 }, (_, index) => (
|
||||||
<CardSkeleton key={index} width={carouselCardWidth} />
|
<CardSkeleton key={index} width={carouselCardWidth} />
|
||||||
))}
|
))}
|
||||||
</View>
|
</View>
|
||||||
@@ -176,140 +265,148 @@ export function CarouselSkeleton() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function HomeSkeleton() {
|
export function HomeSkeleton() {
|
||||||
const headerHeight = useHeaderHeight()
|
|
||||||
const colors = useThemeColors()
|
|
||||||
return (
|
return (
|
||||||
<ScrollView
|
<SkeletonScreen>
|
||||||
style={{ flex: 1, backgroundColor: colors.background }}
|
<View style={styles.home}>
|
||||||
contentContainerStyle={[
|
<CarouselSkeleton />
|
||||||
styles.home,
|
<CarouselSkeleton />
|
||||||
{ paddingTop: (Platform.OS === "ios" ? headerHeight : 0) + spacing.lg },
|
</View>
|
||||||
]}
|
</SkeletonScreen>
|
||||||
contentInsetAdjustmentBehavior="never"
|
)
|
||||||
scrollEnabled={false}
|
}
|
||||||
accessibilityLabel="Loading"
|
|
||||||
>
|
function HeroActions({
|
||||||
<CarouselSkeleton />
|
favorite = true,
|
||||||
<CarouselSkeleton />
|
reverse = false,
|
||||||
</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({
|
||||||
zoomCoverSize,
|
variant,
|
||||||
style,
|
style,
|
||||||
round = false,
|
|
||||||
backgroundColor,
|
backgroundColor,
|
||||||
onLayout,
|
onLayout,
|
||||||
}: {
|
}: {
|
||||||
zoomCoverSize?: number
|
variant: "album" | "playlist" | "favorites" | "artist"
|
||||||
style?: ComponentProps<typeof Reanimated.ScrollView>["style"]
|
style?: ComponentProps<typeof Reanimated.View>["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 =
|
|
||||||
!round && landscape
|
if (variant === "artist" || variant === "favorites") {
|
||||||
? tabletCoverSize!
|
const artist = variant === "artist"
|
||||||
: (zoomCoverSize ?? (round ? 180 : 210))
|
const coverSize = artist ? 180 : 200
|
||||||
const actions = (
|
const hero = (
|
||||||
<View style={styles.actions}>
|
<View style={styles.centeredHero}>
|
||||||
<Skeleton style={styles.iconAction} />
|
<Skeleton
|
||||||
<Skeleton style={styles.playButton} />
|
style={{
|
||||||
<Skeleton style={styles.iconAction} />
|
width: coverSize,
|
||||||
</View>
|
height: coverSize,
|
||||||
)
|
borderRadius: artist ? coverSize / 2 : radius.lg,
|
||||||
const artwork = (
|
}}
|
||||||
<Skeleton
|
/>
|
||||||
style={{
|
<TextLine width={200} fontSize={artist ? 28 : 24} />
|
||||||
width: coverSize,
|
<HeroActions favorite={artist} />
|
||||||
height: coverSize,
|
</View>
|
||||||
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 (
|
||||||
<Reanimated.ScrollView
|
<SkeletonScreen
|
||||||
|
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"
|
|
||||||
>
|
>
|
||||||
{round ? (
|
<CollectionHero
|
||||||
<View style={styles.artistHero}>
|
artwork={
|
||||||
{zoomCoverSize ? (
|
<Link.AppleZoomTarget>
|
||||||
<Link.AppleZoomTarget>
|
<View collapsable={false}>
|
||||||
<View collapsable={false}>{artwork}</View>
|
<Skeleton
|
||||||
</Link.AppleZoomTarget>
|
style={{
|
||||||
) : (
|
width: coverSize,
|
||||||
artwork
|
height: coverSize,
|
||||||
)}
|
borderRadius: radius.lg,
|
||||||
<TextLine width={200} height={24} />
|
}}
|
||||||
<TextLine width={120} height={16} />
|
/>
|
||||||
{actions}
|
</View>
|
||||||
</View>
|
</Link.AppleZoomTarget>
|
||||||
|
}
|
||||||
|
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} />
|
||||||
|
))
|
||||||
) : (
|
) : (
|
||||||
<CollectionHero
|
<SongRows rows={8} inset />
|
||||||
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>
|
|
||||||
)}
|
)}
|
||||||
{round ? (
|
</SkeletonScreen>
|
||||||
<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 (
|
||||||
<SkeletonContent>
|
<SkeletonScreen>
|
||||||
<View accessibilityLabel="Loading" accessibilityRole="progressbar">
|
{Array.from({ length: rows }, (_, index) => (
|
||||||
{Array.from({ length: rows }, (_, index) => (
|
<View
|
||||||
<View
|
key={index}
|
||||||
key={index}
|
style={[styles.artistRow, { borderBottomColor: colors.border }]}
|
||||||
style={[styles.artistRow, { borderBottomColor: colors.border }]}
|
>
|
||||||
>
|
<Skeleton style={styles.artistAvatar} />
|
||||||
<Skeleton style={styles.artistAvatar} />
|
<TextLine width="50%" fontSize={16} />
|
||||||
<TextLine width="50%" height={16} />
|
</View>
|
||||||
</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",
|
||||||
@@ -319,22 +416,55 @@ 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, gap: 6 },
|
songMeta: { flex: 1 },
|
||||||
card: { gap: spacing.xs },
|
songSubtitle: { marginTop: 3 },
|
||||||
grid: { flexDirection: "row", flexWrap: "wrap", gap: spacing.md },
|
trackRow: {
|
||||||
gridInset: { padding: spacing.lg },
|
|
||||||
gridRowInset: { paddingHorizontal: spacing.lg },
|
|
||||||
carousel: { gap: spacing.md, overflow: "hidden" },
|
|
||||||
carouselRow: { flexDirection: "row", gap: spacing.md },
|
|
||||||
home: { padding: spacing.lg, gap: spacing.xl },
|
|
||||||
artistHero: { alignItems: "center", padding: spacing.lg, gap: spacing.sm },
|
|
||||||
actions: {
|
|
||||||
flexDirection: "row",
|
flexDirection: "row",
|
||||||
alignItems: "center",
|
alignItems: "center",
|
||||||
gap: spacing.sm,
|
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 },
|
||||||
|
grid: { flexDirection: "row", flexWrap: "wrap" },
|
||||||
|
carousel: { gap: spacing.md, overflow: "hidden" },
|
||||||
|
carouselRow: { flexDirection: "row", gap: spacing.md },
|
||||||
|
home: { padding: spacing.lg, gap: spacing.xl },
|
||||||
|
centeredHero: { alignItems: "center", padding: spacing.lg, gap: spacing.sm },
|
||||||
|
actions: {
|
||||||
|
flexDirection: "row",
|
||||||
|
alignItems: "center",
|
||||||
|
justifyContent: "center",
|
||||||
|
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: {
|
||||||
|
|||||||
@@ -31,14 +31,19 @@ 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
|
||||||
const LEADING_ACTION_WIDTH = 72
|
/** Width of each action when two share a side. */
|
||||||
|
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,
|
||||||
@@ -58,7 +63,8 @@ export function SongSwipeRow({
|
|||||||
onAddToQueue: () => void
|
onAddToQueue: () => void
|
||||||
onRemove?: () => void
|
onRemove?: () => void
|
||||||
}) {
|
}) {
|
||||||
const hasRemove = IS_ANDROID && !!onRemove
|
const hasRemove = !!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)
|
||||||
@@ -89,9 +95,10 @@ export function SongSwipeRow({
|
|||||||
(side: number) => {
|
(side: number) => {
|
||||||
close()
|
close()
|
||||||
if (side > 0) onAddToQueue()
|
if (side > 0) onAddToQueue()
|
||||||
// Download is intentionally a placeholder.
|
// Without Remove, the trailing action is the Download placeholder.
|
||||||
|
else onRemove?.()
|
||||||
},
|
},
|
||||||
[close, onAddToQueue]
|
[close, onAddToQueue, onRemove]
|
||||||
)
|
)
|
||||||
const tapRow = useCallback(() => {
|
const tapRow = useCallback(() => {
|
||||||
if (open) close()
|
if (open) close()
|
||||||
@@ -117,9 +124,7 @@ export function SongSwipeRow({
|
|||||||
const commit =
|
const commit =
|
||||||
Math.abs(x.value) >
|
Math.abs(x.value) >
|
||||||
Math.max(
|
Math.max(
|
||||||
x.value > 0
|
x.value > 0 ? PAIRED_ACTION_WIDTH * 2 : trailingWidth,
|
||||||
? 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) {
|
||||||
@@ -141,10 +146,7 @@ export function SongSwipeRow({
|
|||||||
? side
|
? side
|
||||||
: 0
|
: 0
|
||||||
x.value = withSpring(
|
x.value = withSpring(
|
||||||
target *
|
target * (target > 0 ? PAIRED_ACTION_WIDTH * 2 : trailingWidth),
|
||||||
(target > 0
|
|
||||||
? LEADING_ACTION_WIDTH * 2
|
|
||||||
: ACTION_WIDTH * (hasRemove ? 2 : 1)),
|
|
||||||
{
|
{
|
||||||
...SPRING,
|
...SPRING,
|
||||||
velocity: event.velocityX,
|
velocity: event.velocityX,
|
||||||
@@ -167,7 +169,6 @@ export function SongSwipeRow({
|
|||||||
return Gesture.Exclusive(pan, tap)
|
return Gesture.Exclusive(pan, tap)
|
||||||
}, [
|
}, [
|
||||||
activate,
|
activate,
|
||||||
hasRemove,
|
|
||||||
begin,
|
begin,
|
||||||
close,
|
close,
|
||||||
commitProgress,
|
commitProgress,
|
||||||
@@ -175,6 +176,7 @@ export function SongSwipeRow({
|
|||||||
settle,
|
settle,
|
||||||
startX,
|
startX,
|
||||||
tapRow,
|
tapRow,
|
||||||
|
trailingWidth,
|
||||||
width,
|
width,
|
||||||
x,
|
x,
|
||||||
])
|
])
|
||||||
@@ -227,31 +229,28 @@ 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
|
||||||
@@ -266,10 +265,7 @@ export function SongSwipeRow({
|
|||||||
: []),
|
: []),
|
||||||
]}
|
]}
|
||||||
onAccessibilityAction={(event) => {
|
onAccessibilityAction={(event) => {
|
||||||
if (event.nativeEvent.actionName === "remove" && hasRemove) {
|
if (event.nativeEvent.actionName === "remove") activate(-1)
|
||||||
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()
|
||||||
@@ -337,10 +333,10 @@ function SwipeAction({
|
|||||||
const resting = Math.max(
|
const resting = Math.max(
|
||||||
0,
|
0,
|
||||||
Math.min(
|
Math.min(
|
||||||
revealed - (side > 0 ? 10 : 20),
|
revealed - (paired ? 10 : 20),
|
||||||
interpolate(
|
interpolate(
|
||||||
revealed,
|
revealed,
|
||||||
[24, side > 0 ? LEADING_ACTION_WIDTH : ACTION_WIDTH, 220],
|
[24, paired ? PAIRED_ACTION_WIDTH : ACTION_WIDTH, 220],
|
||||||
[0, 62, 200]
|
[0, 62, 200]
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
@@ -404,7 +400,9 @@ function SwipeAction({
|
|||||||
styles.pill,
|
styles.pill,
|
||||||
{
|
{
|
||||||
backgroundColor: remove
|
backgroundColor: remove
|
||||||
? "#d32f2f"
|
? IS_ANDROID
|
||||||
|
? "#d32f2f"
|
||||||
|
: "#ff3b30"
|
||||||
: side > 0
|
: side > 0
|
||||||
? secondary
|
? secondary
|
||||||
? "#6b5bff"
|
? "#6b5bff"
|
||||||
@@ -432,11 +430,13 @@ function SwipeAction({
|
|||||||
) : (
|
) : (
|
||||||
<SymbolView
|
<SymbolView
|
||||||
name={
|
name={
|
||||||
side > 0
|
remove
|
||||||
? secondary
|
? "trash"
|
||||||
? "text.line.first.and.arrowtriangle.forward"
|
: side > 0
|
||||||
: "text.line.last.and.arrowtriangle.forward"
|
? secondary
|
||||||
: "arrow.down"
|
? "text.line.first.and.arrowtriangle.forward"
|
||||||
|
: "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 { useAndroidTabBackgroundStyle } from "@/contexts/android-tab-theme"
|
import { useTabletBackgroundStyle } 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 = useAndroidTabBackgroundStyle()
|
const backgroundStyle = useTabletBackgroundStyle()
|
||||||
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]}>
|
||||||
|
|||||||
@@ -19,6 +19,9 @@ 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
|
||||||
@@ -48,7 +51,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 + 48 + gap
|
const rowHeight = cardWidth + tabletCardTextHeight + gap
|
||||||
const firstRow = Math.max(
|
const firstRow = Math.max(
|
||||||
0,
|
0,
|
||||||
Math.floor((scrollY - headerHeight) / rowHeight) - 2
|
Math.floor((scrollY - headerHeight) / rowHeight) - 2
|
||||||
|
|||||||
@@ -1,11 +1,5 @@
|
|||||||
import { useEffect, useState, type ComponentProps, type ReactNode } from "react"
|
import { useEffect, useState, type ComponentProps, type ReactNode } from "react"
|
||||||
import {
|
import { Pressable, StyleSheet, View, useWindowDimensions } from "react-native"
|
||||||
Pressable,
|
|
||||||
StyleSheet,
|
|
||||||
Text,
|
|
||||||
View,
|
|
||||||
useWindowDimensions,
|
|
||||||
} from "react-native"
|
|
||||||
import Animated, {
|
import Animated, {
|
||||||
Easing,
|
Easing,
|
||||||
ReduceMotion,
|
ReduceMotion,
|
||||||
@@ -14,7 +8,7 @@ import Animated, {
|
|||||||
useSharedValue,
|
useSharedValue,
|
||||||
withTiming,
|
withTiming,
|
||||||
} from "react-native-reanimated"
|
} from "react-native-reanimated"
|
||||||
import { GestureDetector, Gesture } from "react-native-gesture-handler"
|
import { GestureDetector, type 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"
|
||||||
@@ -22,12 +16,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 { usePlayback } from "@/contexts/playback"
|
import { usePlaybackActions, usePlaybackQueue } 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"
|
||||||
|
|
||||||
@@ -42,7 +36,7 @@ export function TabletNowPlaying({
|
|||||||
colors,
|
colors,
|
||||||
backgroundStyle,
|
backgroundStyle,
|
||||||
dismissStyle,
|
dismissStyle,
|
||||||
dismissGesture,
|
dismissGestures,
|
||||||
showQueue,
|
showQueue,
|
||||||
toggleQueue,
|
toggleQueue,
|
||||||
metadata,
|
metadata,
|
||||||
@@ -50,7 +44,10 @@ 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"]
|
||||||
dismissGesture: () => ReturnType<typeof Gesture.Pan>
|
dismissGestures: {
|
||||||
|
handle: ReturnType<typeof Gesture.Pan>
|
||||||
|
artwork: ReturnType<typeof Gesture.Pan>
|
||||||
|
}
|
||||||
showQueue: boolean
|
showQueue: boolean
|
||||||
toggleQueue: () => void
|
toggleQueue: () => void
|
||||||
metadata: ReactNode
|
metadata: ReactNode
|
||||||
@@ -59,22 +56,11 @@ export function TabletNowPlaying({
|
|||||||
const insets = useSafeAreaInsets()
|
const insets = useSafeAreaInsets()
|
||||||
const { width, height } = useWindowDimensions()
|
const { width, height } = useWindowDimensions()
|
||||||
const { config } = useServerConfig()
|
const { config } = useServerConfig()
|
||||||
const {
|
const { currentSong, isPlaying, shuffleEnabled, repeatEnabled } =
|
||||||
currentSong,
|
usePlaybackQueue()
|
||||||
currentTime,
|
const { setIsPlaying, skipNext, skipPrevious, toggleShuffle, cycleRepeat } =
|
||||||
duration,
|
usePlaybackActions()
|
||||||
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
|
||||||
@@ -113,7 +99,6 @@ 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,
|
||||||
@@ -150,7 +135,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={dismissGesture()}>
|
<GestureDetector gesture={dismissGestures.handle}>
|
||||||
<Pressable
|
<Pressable
|
||||||
onPress={() => router.back()}
|
onPress={() => router.back()}
|
||||||
accessibilityRole="button"
|
accessibilityRole="button"
|
||||||
@@ -164,7 +149,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={dismissGesture()}>
|
<GestureDetector gesture={dismissGestures.artwork}>
|
||||||
<View style={styles.artworkArea}>
|
<View style={styles.artworkArea}>
|
||||||
<Animated.View style={artworkMotion}>
|
<Animated.View style={artworkMotion}>
|
||||||
<CoverImage
|
<CoverImage
|
||||||
@@ -177,31 +162,7 @@ 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>
|
||||||
<PlayerSlider
|
<PlayerProgress colors={colors} />
|
||||||
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",
|
||||||
@@ -376,12 +337,6 @@ 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,4 +1,3 @@
|
|||||||
import { PaletteText, PaletteIcon } from "@/components/palette-text"
|
|
||||||
import {
|
import {
|
||||||
ActivityIndicator,
|
ActivityIndicator,
|
||||||
Platform,
|
Platform,
|
||||||
@@ -74,20 +73,8 @@ export function Button({
|
|||||||
<ActivityIndicator color={textColor} />
|
<ActivityIndicator color={textColor} />
|
||||||
) : (
|
) : (
|
||||||
<View style={styles.buttonContent}>
|
<View style={styles.buttonContent}>
|
||||||
{icon ? (
|
{icon ? <Ionicons name={icon} size={18} color={textColor} /> : null}
|
||||||
<PaletteIcon
|
<Text style={[styles.buttonText, { color: textColor }]}>{title}</Text>
|
||||||
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>
|
||||||
|
|||||||
@@ -14,14 +14,10 @@ import {
|
|||||||
useState,
|
useState,
|
||||||
type PropsWithChildren,
|
type PropsWithChildren,
|
||||||
} from "react"
|
} from "react"
|
||||||
import { Platform, StyleSheet, type HostInstance } from "react-native"
|
import { Platform } from "react-native"
|
||||||
import Reanimated, {
|
import {
|
||||||
useSharedValue,
|
useSharedValue,
|
||||||
useAnimatedStyle,
|
useAnimatedStyle,
|
||||||
useAnimatedReaction,
|
|
||||||
useAnimatedRef,
|
|
||||||
setNativeProps,
|
|
||||||
processColor,
|
|
||||||
withTiming,
|
withTiming,
|
||||||
type SharedValue,
|
type SharedValue,
|
||||||
} from "react-native-reanimated"
|
} from "react-native-reanimated"
|
||||||
@@ -29,19 +25,17 @@ import Reanimated, {
|
|||||||
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()
|
||||||
@@ -60,52 +54,37 @@ 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 { isDark: _defaultIsDark, ...defaultColors } = defaultPalette
|
const tabletBackground = useSharedValue(defaultPalette.background)
|
||||||
const animatedColors = useSharedValue<PaletteColors>({
|
|
||||||
...defaultColors,
|
|
||||||
selectedColor: defaultPalette.accentText,
|
|
||||||
})
|
|
||||||
useLayoutEffect(() => {
|
useLayoutEffect(() => {
|
||||||
const { isDark: _isDark, ...colors } = palette
|
if (!isTablet) return
|
||||||
animatedColors.value = withTiming(
|
tabletBackground.value = withTiming(palette.background, {
|
||||||
{
|
duration: TABLET_FADE_MS,
|
||||||
...colors,
|
})
|
||||||
selectedColor: hasArtwork
|
}, [tabletBackground, palette.background])
|
||||||
? 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
|
||||||
// Start on the UI thread immediately. React may defer commits while
|
if (isTablet) {
|
||||||
// the native stack is animating, including transitionStart state updates.
|
// React may defer commits while the iPad stack is animating.
|
||||||
const target = palette ?? defaultPalette
|
tabletBackground.value = withTiming(
|
||||||
const { isDark: _isDark, ...colors } = target
|
(palette ?? defaultPalette).background,
|
||||||
animatedColors.value = withTiming(
|
{ duration: TABLET_FADE_MS }
|
||||||
{
|
)
|
||||||
...colors,
|
}
|
||||||
selectedColor: palette ? target.foreground : target.accentText,
|
|
||||||
},
|
|
||||||
{ duration: PALETTE_FADE_MS }
|
|
||||||
)
|
|
||||||
setScreen(palette ? { palette, owner } : null)
|
setScreen(palette ? { palette, owner } : null)
|
||||||
},
|
},
|
||||||
[animatedColors, defaultPalette]
|
[tabletBackground, defaultPalette]
|
||||||
)
|
)
|
||||||
const artworkPalette = hasArtwork ? palette : null
|
|
||||||
const value = useMemo(
|
const value = useMemo(
|
||||||
() => ({
|
() => ({
|
||||||
palette: artworkPalette ?? defaultPalette,
|
palette: hasArtwork ? palette : defaultPalette,
|
||||||
colors: animatedColors,
|
hasArtworkPalette: hasArtwork,
|
||||||
hasArtworkPalette: artworkPalette !== null,
|
tabletBackground,
|
||||||
setPalette,
|
setPalette,
|
||||||
}),
|
}),
|
||||||
[defaultPalette, artworkPalette, setPalette, animatedColors]
|
[defaultPalette, hasArtwork, palette, setPalette, tabletBackground]
|
||||||
)
|
)
|
||||||
return (
|
return (
|
||||||
<AndroidTabTheme.Provider value={value}>
|
<AndroidTabTheme.Provider value={value}>
|
||||||
@@ -114,50 +93,6 @@ 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()
|
||||||
@@ -168,53 +103,29 @@ export function useAndroidTabHasArtworkPalette() {
|
|||||||
return useContext(AndroidTabTheme)?.hasArtworkPalette ?? false
|
return useContext(AndroidTabTheme)?.hasArtworkPalette ?? false
|
||||||
}
|
}
|
||||||
|
|
||||||
export function useAndroidTabBackgroundStyle() {
|
/** iPad fades the sidebar and content pane together; other layouts skip it. */
|
||||||
const theme = useContext(AndroidTabTheme)
|
export function useTabletBackgroundStyle() {
|
||||||
const fallback = useDefaultPalette().background
|
const background = useContext(AndroidTabTheme)?.tabletBackground
|
||||||
const colors = theme?.colors
|
|
||||||
return useAnimatedStyle(() =>
|
return useAnimatedStyle(() =>
|
||||||
Platform.OS === "android" || (Platform.OS === "ios" && Platform.isPad)
|
isTablet && background ? { backgroundColor: background.value } : {}
|
||||||
? { backgroundColor: colors?.value.background ?? fallback }
|
|
||||||
: {}
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Color tokens share the background's UI-thread timing. */
|
const TABLET_FADE_MS = 400
|
||||||
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. */
|
/**
|
||||||
function AndroidArtworkBackground() {
|
* Artwork screens always paint their own palette so it slides with the page.
|
||||||
const style = useAndroidTabBackgroundStyle()
|
* Shared chrome (tab bar, mini player) switches when the transition starts.
|
||||||
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 theme = useContext(AndroidTabTheme)
|
const setPalette = useContext(AndroidTabTheme)?.setPalette
|
||||||
const setPalette = theme?.setPalette
|
|
||||||
useLayoutEffect(() => {
|
useLayoutEffect(() => {
|
||||||
if (!sharesPalette) return
|
if (!sharesPalette) return
|
||||||
const start = navigation.addListener("transitionStart", ({ data }) => {
|
const start = navigation.addListener("transitionStart", ({ data }) => {
|
||||||
@@ -230,20 +141,18 @@ export function useScreenPalette(palette: CoverPalette) {
|
|||||||
start()
|
start()
|
||||||
cancel()
|
cancel()
|
||||||
}
|
}
|
||||||
}, [navigation, sharesPalette, setPalette, owner, palette])
|
}, [navigation, setPalette, owner, palette])
|
||||||
const defaultPalette = useDefaultPalette()
|
|
||||||
const ready = laidOut || isTablet
|
const ready = laidOut || isTablet
|
||||||
const target = isFocused && ready && !closing ? palette : defaultPalette
|
const backgroundStyle = useTabletBackgroundStyle()
|
||||||
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, sharesPalette])
|
}, [closing, ready, isFocused, owner, palette, setPalette])
|
||||||
|
|
||||||
return {
|
return {
|
||||||
palette: Platform.OS === "android" ? target : palette,
|
palette,
|
||||||
backgroundStyle,
|
backgroundStyle,
|
||||||
onLayout: sharesPalette ? onLayout : undefined,
|
onLayout: sharesPalette ? onLayout : undefined,
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,22 +12,28 @@ 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. The
|
* `useMutation(...).withOptimisticUpdate(...)` with a stable identity. Pass a
|
||||||
* update is captured on first render, so it must not close over render state.
|
* module-level update so it does not change between renders.
|
||||||
*/
|
*/
|
||||||
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)
|
||||||
const updateRef = useRef(optimisticUpdate)
|
return useMemo(
|
||||||
return useMemo(() => base.withOptimisticUpdate(updateRef.current), [base])
|
() => base.withOptimisticUpdate(optimisticUpdate),
|
||||||
|
[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
|
||||||
@@ -36,6 +42,20 @@ 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)
|
||||||
@@ -52,110 +72,31 @@ 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,
|
||||||
(store, { songId }) => {
|
favoriteOptimisticUpdates.favoriteSong
|
||||||
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,
|
||||||
(store, { songId }) => {
|
favoriteOptimisticUpdates.unfavoriteSong
|
||||||
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,
|
||||||
(store, { albumId }) => {
|
favoriteOptimisticUpdates.favoriteAlbum
|
||||||
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,
|
||||||
(store, { albumId }) => {
|
favoriteOptimisticUpdates.unfavoriteAlbum
|
||||||
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,
|
||||||
(store, { artistId }) => {
|
favoriteOptimisticUpdates.favoriteArtist
|
||||||
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,
|
||||||
(store, { artistId }) => {
|
favoriteOptimisticUpdates.unfavoriteArtist
|
||||||
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,
|
||||||
(store, { songIds }) => {
|
favoriteOptimisticUpdates.favoriteSongs
|
||||||
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(
|
||||||
@@ -173,70 +114,72 @@ 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 toggleSongFavorite = useCallback(
|
const setFavorite = useCallback(
|
||||||
async (songId: Id<"songs">) => {
|
async <Kind extends FavoriteKind>(
|
||||||
try {
|
kind: Kind,
|
||||||
if (idsRef.current.songIds.has(songId)) {
|
id: Id<FavoriteTables[Kind]>,
|
||||||
await unfavoriteSong({ songId })
|
favorite: boolean
|
||||||
} else {
|
) => {
|
||||||
await favoriteSong({ songId })
|
if (kind === "song") {
|
||||||
}
|
const songId = id as Id<"songs">
|
||||||
} catch (error) {
|
await (favorite ? favoriteSong : unfavoriteSong)({ songId })
|
||||||
showError(
|
} else if (kind === "album") {
|
||||||
error instanceof Error ? error.message : "Failed to update favorites"
|
const albumId = id as Id<"albums">
|
||||||
)
|
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(
|
||||||
async (albumId: Id<"albums">) => {
|
(albumId: Id<"albums">) =>
|
||||||
try {
|
setFavorite(
|
||||||
if (idsRef.current.albumIds.has(albumId)) {
|
"album",
|
||||||
await unfavoriteAlbum({ albumId })
|
albumId,
|
||||||
} else {
|
!idsRef.current.albumIds.has(albumId)
|
||||||
await favoriteAlbum({ albumId })
|
).catch(showFavoritesError),
|
||||||
}
|
[setFavorite]
|
||||||
} catch (error) {
|
|
||||||
showError(
|
|
||||||
error instanceof Error ? error.message : "Failed to update favorites"
|
|
||||||
)
|
|
||||||
}
|
|
||||||
},
|
|
||||||
[favoriteAlbum, unfavoriteAlbum]
|
|
||||||
)
|
)
|
||||||
|
|
||||||
const toggleArtistFavorite = useCallback(
|
const toggleArtistFavorite = useCallback(
|
||||||
async (artistId: Id<"artists">) => {
|
(artistId: Id<"artists">) =>
|
||||||
try {
|
setFavorite(
|
||||||
if (idsRef.current.artistIds.has(artistId)) {
|
"artist",
|
||||||
await unfavoriteArtist({ artistId })
|
artistId,
|
||||||
} else {
|
!idsRef.current.artistIds.has(artistId)
|
||||||
await favoriteArtist({ artistId })
|
).catch(showFavoritesError),
|
||||||
}
|
[setFavorite]
|
||||||
} catch (error) {
|
)
|
||||||
showError(
|
|
||||||
error instanceof Error ? error.message : "Failed to update favorites"
|
const addFavoriteSongs = useCallback(
|
||||||
)
|
async (ids: Id<"songs">[]) => {
|
||||||
}
|
const unique = [...new Set(ids)]
|
||||||
|
if (unique.length > 0) await favoriteSongsMutation({ songIds: unique })
|
||||||
},
|
},
|
||||||
[favoriteArtist, unfavoriteArtist]
|
[favoriteSongsMutation]
|
||||||
)
|
)
|
||||||
|
|
||||||
const favoriteSongs = useCallback(
|
const favoriteSongs = useCallback(
|
||||||
async (ids: Id<"songs">[]) => {
|
(ids: Id<"songs">[]) => addFavoriteSongs(ids).catch(showFavoritesError),
|
||||||
const unique = [...new Set(ids)]
|
[addFavoriteSongs]
|
||||||
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(
|
||||||
@@ -248,6 +191,8 @@ export function FavoritesProvider({ children }: { children: ReactNode }) {
|
|||||||
toggleAlbumFavorite,
|
toggleAlbumFavorite,
|
||||||
toggleArtistFavorite,
|
toggleArtistFavorite,
|
||||||
favoriteSongs,
|
favoriteSongs,
|
||||||
|
setFavorite,
|
||||||
|
addFavoriteSongs,
|
||||||
}),
|
}),
|
||||||
[
|
[
|
||||||
songIds,
|
songIds,
|
||||||
@@ -257,6 +202,8 @@ export function FavoritesProvider({ children }: { children: ReactNode }) {
|
|||||||
toggleAlbumFavorite,
|
toggleAlbumFavorite,
|
||||||
toggleArtistFavorite,
|
toggleArtistFavorite,
|
||||||
favoriteSongs,
|
favoriteSongs,
|
||||||
|
setFavorite,
|
||||||
|
addFavoriteSongs,
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
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"
|
||||||
@@ -9,21 +10,6 @@ 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,
|
||||||
|
|||||||
@@ -97,6 +97,8 @@ type PlaybackContextValue = {
|
|||||||
|
|
||||||
type PlaybackActionsValue = Pick<
|
type PlaybackActionsValue = Pick<
|
||||||
PlaybackContextValue,
|
PlaybackContextValue,
|
||||||
|
| "seekTo"
|
||||||
|
| "waitForPlaybackReady"
|
||||||
| "setIsPlaying"
|
| "setIsPlaying"
|
||||||
| "playInOrder"
|
| "playInOrder"
|
||||||
| "playShuffled"
|
| "playShuffled"
|
||||||
@@ -136,6 +138,11 @@ type PlaybackQueueValue = Pick<
|
|||||||
| "repeatEnabled"
|
| "repeatEnabled"
|
||||||
>
|
>
|
||||||
|
|
||||||
|
type PlaybackProgressValue = Pick<
|
||||||
|
PlaybackContextValue,
|
||||||
|
"currentTime" | "duration"
|
||||||
|
>
|
||||||
|
|
||||||
type CollectionPlayers = Pick<
|
type CollectionPlayers = Pick<
|
||||||
PlaybackActionsValue,
|
PlaybackActionsValue,
|
||||||
| "playAlbum"
|
| "playAlbum"
|
||||||
@@ -157,14 +164,17 @@ 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
|
||||||
|
)
|
||||||
|
|
||||||
export function usePlayback() {
|
/** Ticks while audio plays. Keep consumers small (slider and time labels). */
|
||||||
const context = useContext(PlaybackContext)
|
export function usePlaybackProgress() {
|
||||||
|
const context = useContext(PlaybackProgressContext)
|
||||||
if (!context) {
|
if (!context) {
|
||||||
throw new Error("usePlayback must be used within PlaybackProvider")
|
throw new Error("usePlaybackProgress must be used within PlaybackProvider")
|
||||||
}
|
}
|
||||||
return context
|
return context
|
||||||
}
|
}
|
||||||
@@ -631,6 +641,8 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
|||||||
|
|
||||||
const actionsValue = useMemo<PlaybackActionsValue>(
|
const actionsValue = useMemo<PlaybackActionsValue>(
|
||||||
() => ({
|
() => ({
|
||||||
|
seekTo,
|
||||||
|
waitForPlaybackReady,
|
||||||
...collectionPlayers,
|
...collectionPlayers,
|
||||||
setIsPlaying,
|
setIsPlaying,
|
||||||
playInOrder,
|
playInOrder,
|
||||||
@@ -671,12 +683,14 @@ 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,
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -701,41 +715,17 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
|||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
|
||||||
const value = useMemo<PlaybackContextValue>(
|
const progressValue = useMemo<PlaybackProgressValue>(
|
||||||
() => ({
|
() => ({ currentTime, duration }),
|
||||||
...actionsValue,
|
[currentTime, duration]
|
||||||
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}>
|
||||||
<PlaybackContext.Provider value={value}>
|
<PlaybackProgressContext.Provider value={progressValue}>
|
||||||
{children}
|
{children}
|
||||||
</PlaybackContext.Provider>
|
</PlaybackProgressContext.Provider>
|
||||||
</PlaybackQueueContext.Provider>
|
</PlaybackQueueContext.Provider>
|
||||||
</PlaybackActionsContext.Provider>
|
</PlaybackActionsContext.Provider>
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -134,7 +134,13 @@ export function createCoverPaletteSource<Swatches>({
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return { prefetch, usePalette }
|
/** Forget in-memory swatches so covers are re-extracted. */
|
||||||
|
function clear() {
|
||||||
|
swatchesByKey.clear()
|
||||||
|
pending.clear()
|
||||||
|
}
|
||||||
|
|
||||||
|
return { prefetch, usePalette, clear }
|
||||||
}
|
}
|
||||||
|
|
||||||
function sameSwatches(a: unknown, b: unknown) {
|
function sameSwatches(a: unknown, b: unknown) {
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ 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"
|
||||||
@@ -12,6 +13,7 @@ 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"
|
||||||
|
|
||||||
@@ -21,6 +23,16 @@ 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,3 +65,5 @@ 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
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import { dolbyAtmosSupported } from "@/lib/playback-capabilities"
|
import { atmosEnabled } from "@/lib/playback-capabilities"
|
||||||
import {
|
import {
|
||||||
createAudioPlaylist,
|
createAudioPlaylist,
|
||||||
setAudioModeAsync,
|
setAudioModeAsync,
|
||||||
@@ -113,6 +113,8 @@ 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]
|
||||||
@@ -132,11 +134,7 @@ export function useNativePlaylistSync({
|
|||||||
])
|
])
|
||||||
: ""
|
: ""
|
||||||
const userPlaybackKey = user
|
const userPlaybackKey = user
|
||||||
? JSON.stringify([
|
? JSON.stringify([user._id, user.playbackQuality, atmosEnabled(user)])
|
||||||
user._id,
|
|
||||||
user.playbackQuality,
|
|
||||||
dolbyAtmosSupported && (user.preferAtmos ?? false),
|
|
||||||
])
|
|
||||||
: ""
|
: ""
|
||||||
|
|
||||||
const settleWaiters = useCallback(() => {
|
const settleWaiters = useCallback(() => {
|
||||||
@@ -413,18 +411,17 @@ export function useNativePlaylistSync({
|
|||||||
[startPlayer]
|
[startPlayer]
|
||||||
)
|
)
|
||||||
|
|
||||||
const seekTo = useCallback(
|
// Reads duration from a ref so seekTo, and every action built on it, stays
|
||||||
async (seconds: number) => {
|
// stable across track changes.
|
||||||
const playlist = playlistRef.current
|
const seekTo = useCallback(async (seconds: number) => {
|
||||||
if (!playlist) return
|
const playlist = playlistRef.current
|
||||||
const maxDuration = playlist.duration || duration || 0
|
if (!playlist) return
|
||||||
const clamped = Math.max(0, Math.min(seconds, maxDuration))
|
const maxDuration = playlist.duration || durationRef.current || 0
|
||||||
await playlist.seekTo(clamped)
|
const clamped = Math.max(0, Math.min(seconds, maxDuration))
|
||||||
currentTimeRef.current = clamped
|
await playlist.seekTo(clamped)
|
||||||
setCurrentTime(clamped)
|
currentTimeRef.current = clamped
|
||||||
},
|
setCurrentTime(clamped)
|
||||||
[duration]
|
}, [])
|
||||||
)
|
|
||||||
|
|
||||||
const handlePlaybackLoadFailure = useCallback(() => {
|
const handlePlaybackLoadFailure = useCallback(() => {
|
||||||
autoPlayNextRef.current = false
|
autoPlayNextRef.current = false
|
||||||
@@ -462,7 +459,7 @@ export function useNativePlaylistSync({
|
|||||||
}
|
}
|
||||||
if (!isCurrentLoad()) return
|
if (!isCurrentLoad()) return
|
||||||
|
|
||||||
const loadKey = `${user.playbackQuality}:${dolbyAtmosSupported && (user.preferAtmos ?? false)}:${cookieHeader}`
|
const loadKey = `${user.playbackQuality}:${atmosEnabled(user)}:${cookieHeader}`
|
||||||
const needsRebuild =
|
const needsRebuild =
|
||||||
loadedLoadKeyRef.current !== loadKey ||
|
loadedLoadKeyRef.current !== loadKey ||
|
||||||
nativePlaylistNeedsRebuild(
|
nativePlaylistNeedsRebuild(
|
||||||
@@ -503,7 +500,7 @@ export function useNativePlaylistSync({
|
|||||||
const plan = playbackStreamPlan(
|
const plan = playbackStreamPlan(
|
||||||
song.files,
|
song.files,
|
||||||
user.playbackQuality,
|
user.playbackQuality,
|
||||||
dolbyAtmosSupported && (user.preferAtmos ?? false)
|
atmosEnabled(user)
|
||||||
)
|
)
|
||||||
sources.set(
|
sources.set(
|
||||||
song.id,
|
song.id,
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ 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 = [
|
||||||
@@ -20,6 +21,7 @@ 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, [])),
|
||||||
@@ -28,6 +30,39 @@ 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) {
|
||||||
|
|||||||
@@ -50,6 +50,13 @@ 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
|
||||||
|
|||||||
@@ -1,40 +1,9 @@
|
|||||||
export type MediaShareContext = (
|
import type { MediaShareTarget } from "@otunes/convex/client/media-links"
|
||||||
| { type: "album"; albumId: string }
|
|
||||||
| { type: "song"; albumId: string; songId: string }
|
|
||||||
| { type: "playlist"; playlistId: string; isFavorites?: boolean }
|
|
||||||
| { type: "artist"; artistId: string }
|
|
||||||
) & { title: string }
|
|
||||||
|
|
||||||
export function shouldShowShare(
|
export {
|
||||||
share: MediaShareContext | undefined,
|
mediaShareUrl,
|
||||||
selectedCount: number
|
shouldShowShare,
|
||||||
) {
|
} from "@otunes/convex/client/media-links"
|
||||||
if (!share) {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
if (share.type === "song") {
|
|
||||||
return selectedCount === 1
|
|
||||||
}
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
export function mediaShareUrl(
|
/** A share target plus the title shown in the native share sheet. */
|
||||||
serverUrl: string,
|
export type MediaShareContext = MediaShareTarget & { title: 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}`
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -28,7 +28,7 @@ export function useStackScreenOptions(
|
|||||||
headerBackButtonDisplayMode: "minimal",
|
headerBackButtonDisplayMode: "minimal",
|
||||||
...(Platform.OS === "android"
|
...(Platform.OS === "android"
|
||||||
? {
|
? {
|
||||||
animation: "slide_from_right",
|
animation: "fade",
|
||||||
headerLargeTitle: false,
|
headerLargeTitle: false,
|
||||||
headerTransparent: false,
|
headerTransparent: false,
|
||||||
headerStyle: { backgroundColor: theme.background },
|
headerStyle: { backgroundColor: theme.background },
|
||||||
|
|||||||
@@ -2,3 +2,8 @@ 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)
|
||||||
|
}
|
||||||
@@ -5,8 +5,10 @@ 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"
|
||||||
@@ -50,12 +52,10 @@ 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, () =>
|
||||||
songId ? (getCachedSong(songId) ?? getSongsVersion()) : null
|
getSongSnapshot(songId)
|
||||||
)
|
)
|
||||||
const song = typeof snapshot === "object" ? snapshot : null
|
const song = songFromSnapshot(snapshot)
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (songId && !song && isPersistentCacheLoaded()) {
|
if (songId && !song && isPersistentCacheLoaded()) {
|
||||||
|
|||||||
+11
-33
@@ -1,9 +1,11 @@
|
|||||||
import { dolbyAtmosSupported } from "@/lib/playback-capabilities"
|
import {
|
||||||
|
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]
|
||||||
@@ -45,33 +47,6 @@ 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,
|
||||||
@@ -80,9 +55,12 @@ export function songAudioSource(
|
|||||||
useHls: boolean,
|
useHls: boolean,
|
||||||
options?: { cookieHeader?: string | null; songTitle?: string }
|
options?: { cookieHeader?: string | null; songTitle?: string }
|
||||||
): AudioSource {
|
): AudioSource {
|
||||||
const uri = useHls
|
const path = useHls
|
||||||
? songHlsPlaylistUrl(serverUrl, songId, quality, preferAtmos)
|
? songHlsPlaylistPath(songId, quality, preferAtmos)
|
||||||
: songPlayUrl(serverUrl, songId, quality, preferAtmos)
|
: songPlayPath(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,11 +7,15 @@ private enum HandoffState {
|
|||||||
static var pending: [String: String]?
|
static var pending: [String: String]?
|
||||||
static var notify: (() -> Void)?
|
static var notify: (() -> Void)?
|
||||||
|
|
||||||
static var activityType: String {
|
// app.config.ts declares the one `.media` type per build profile; iOS and
|
||||||
"\(Bundle.main.bundleIdentifier!).media"
|
// Catalyst must publish the same string for Handoff to pair them. Other
|
||||||
}
|
// 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,
|
||||||
|
|||||||
@@ -0,0 +1,36 @@
|
|||||||
|
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
|
||||||
|
},
|
||||||
|
])
|
||||||
@@ -4,6 +4,20 @@ 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) => {
|
||||||
@@ -13,14 +27,15 @@ module.exports = (config) => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
config = withPodfile(config, (config) => {
|
config = withPodfile(config, (config) => {
|
||||||
const pattern = /:mac_catalyst_enabled\s*=>\s*(?:false|true)/
|
const flag = /:mac_catalyst_enabled\s*=>\s*(?:false|true)/
|
||||||
if (!pattern.test(config.modResults.contents)) {
|
const postInstall = /(react_native_post_install\([\s\S]*?\n {4}\)\n)/
|
||||||
|
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")
|
||||||
}
|
}
|
||||||
config.modResults.contents = config.modResults.contents.replace(
|
contents = contents.replace(flag, ":mac_catalyst_enabled => true")
|
||||||
pattern,
|
contents = contents.replace(postInstall, `$1${raisePodDeploymentTargets}`)
|
||||||
":mac_catalyst_enabled => true"
|
config.modResults.contents = contents
|
||||||
)
|
|
||||||
return config
|
return config
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -32,7 +47,8 @@ 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"
|
||||||
settings.DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = "YES"
|
// Share the iOS bundle ID so Handoff and the App ID match across devices.
|
||||||
|
settings.DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = "NO"
|
||||||
settings.TARGETED_DEVICE_FAMILY = '"1,2"'
|
settings.TARGETED_DEVICE_FAMILY = '"1,2"'
|
||||||
}
|
}
|
||||||
return config
|
return config
|
||||||
|
|||||||
@@ -1,3 +1,7 @@
|
|||||||
|
import {
|
||||||
|
parsePlaybackQuality,
|
||||||
|
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 { getSongSource } from "@/lib/server-song"
|
||||||
@@ -118,34 +122,17 @@ export async function GET(
|
|||||||
try {
|
try {
|
||||||
const song = await getSongSource(id)
|
const song = await getSongSource(id)
|
||||||
|
|
||||||
const quality = request.nextUrl.searchParams.get("quality") as
|
const {
|
||||||
"low" | "medium" | "high" | "lossless" | null
|
source: originalCodec,
|
||||||
|
kbps,
|
||||||
const preferAtmos =
|
transcodeNeeded,
|
||||||
|
} = 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
|
|
||||||
}
|
|
||||||
|
|
||||||
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.
|
||||||
|
|||||||
@@ -24,8 +24,6 @@ import {
|
|||||||
import { TrackRow } from "@/components/track-row"
|
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 { useCachedQuery } from "@/hooks/use-cached-query"
|
|
||||||
import { api } from "@otunes/convex/_generated/api"
|
|
||||||
import {
|
import {
|
||||||
useMediaActions,
|
useMediaActions,
|
||||||
useTrackListMediaAction,
|
useTrackListMediaAction,
|
||||||
@@ -116,20 +114,6 @@ export function AlbumView({
|
|||||||
[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])
|
||||||
@@ -260,15 +244,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}
|
||||||
{hasLossless ? (
|
{album.hasLossless ? (
|
||||||
<>
|
<>
|
||||||
{metadata ? <span aria-hidden>·</span> : null}
|
{metadata ? <span aria-hidden>·</span> : null}
|
||||||
<AudioFormatBadge format="lossless" />
|
<AudioFormatBadge format="lossless" />
|
||||||
</>
|
</>
|
||||||
) : null}
|
) : null}
|
||||||
{hasAtmos ? (
|
{album.hasAtmos ? (
|
||||||
<>
|
<>
|
||||||
{metadata || hasLossless ? (
|
{metadata || album.hasLossless ? (
|
||||||
<span aria-hidden>·</span>
|
<span aria-hidden>·</span>
|
||||||
) : null}
|
) : null}
|
||||||
<AudioFormatBadge format="atmos" />
|
<AudioFormatBadge format="atmos" />
|
||||||
|
|||||||
@@ -1,35 +1,28 @@
|
|||||||
|
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
|
<svg width={DOLBY_WIDTH} height={MARK_HEIGHT} viewBox={DOLBY_VIEW_BOX}>
|
||||||
width={(MARK_HEIGHT * 23) / 16}
|
{DOLBY_PATHS.map((d) => (
|
||||||
height={MARK_HEIGHT}
|
<path key={d} d={d} fill={color} />
|
||||||
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.
|
||||||
@@ -43,9 +36,9 @@ function LosslessMark({
|
|||||||
}) {
|
}) {
|
||||||
return (
|
return (
|
||||||
<svg
|
<svg
|
||||||
width={(MARK_HEIGHT * 544) / 271}
|
width={LOSSLESS_WIDTH}
|
||||||
height={MARK_HEIGHT}
|
height={MARK_HEIGHT}
|
||||||
viewBox="28 154 544 271"
|
viewBox={LOSSLESS_VIEW_BOX}
|
||||||
>
|
>
|
||||||
{LOSSLESS_STROKES.map(([peak, d], index) => (
|
{LOSSLESS_STROKES.map(([peak, d], index) => (
|
||||||
<path
|
<path
|
||||||
|
|||||||
@@ -1,13 +1,31 @@
|
|||||||
"use client"
|
"use client"
|
||||||
|
|
||||||
import * as React from "react"
|
import * as React from "react"
|
||||||
import { useMutation } from "convex/react"
|
import type { OptimisticUpdate } from "convex/browser"
|
||||||
|
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
|
||||||
@@ -34,97 +52,38 @@ 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 = useMutation(api.favorites.favoriteSong).withOptimisticUpdate(
|
const favoriteSong = useOptimisticMutation(
|
||||||
(store, { songId }) => {
|
api.favorites.favoriteSong,
|
||||||
const current = store.getQuery(api.favorites.getUserFavorites, {})
|
favoriteOptimisticUpdates.favoriteSong
|
||||||
if (current && !current.favoriteSongs.includes(songId)) {
|
)
|
||||||
store.setQuery(api.favorites.getUserFavorites, {}, {
|
const favoriteSongsMutation = useOptimisticMutation(
|
||||||
...current,
|
api.favorites.favoriteSongs,
|
||||||
favoriteSongs: [...current.favoriteSongs, songId],
|
favoriteOptimisticUpdates.favoriteSongs
|
||||||
})
|
)
|
||||||
}
|
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) ?? []),
|
||||||
@@ -288,6 +247,8 @@ export function FavoritesProvider({ children }: { children: React.ReactNode }) {
|
|||||||
)
|
)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<FavoritesContext.Provider value={value}>{children}</FavoritesContext.Provider>
|
<FavoritesContext.Provider value={value}>
|
||||||
|
{children}
|
||||||
|
</FavoritesContext.Provider>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
@@ -30,6 +30,7 @@ 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 =
|
||||||
@@ -47,19 +48,6 @@ export type MediaContextNavigation = {
|
|||||||
|
|
||||||
export type { MediaShareContext } from "@/lib/media-links"
|
export type { MediaShareContext } from "@/lib/media-links"
|
||||||
|
|
||||||
function shouldShowShare(
|
|
||||||
share: MediaShareContext | undefined,
|
|
||||||
selectedCount: number
|
|
||||||
) {
|
|
||||||
if (!share) {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
if (share.type === "song") {
|
|
||||||
return selectedCount === 1
|
|
||||||
}
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
// Lets the same items render inside a dropdown or a right-click menu.
|
// Lets the same items render inside a dropdown or a right-click menu.
|
||||||
const MenuKindContext = React.createContext<"dropdown" | "context">("dropdown")
|
const MenuKindContext = React.createContext<"dropdown" | "context">("dropdown")
|
||||||
|
|
||||||
|
|||||||
@@ -47,13 +47,12 @@ 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,6 +1,7 @@
|
|||||||
"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"
|
||||||
@@ -13,21 +14,6 @@ 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()
|
||||||
|
|||||||
@@ -22,7 +22,10 @@ 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,
|
||||||
@@ -40,7 +43,6 @@ 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
|
||||||
@@ -183,14 +185,14 @@ function readStoredVolume(): number {
|
|||||||
|
|
||||||
type PlaybackLoadSettings = {
|
type PlaybackLoadSettings = {
|
||||||
preferAtmos: boolean
|
preferAtmos: boolean
|
||||||
playbackQuality: "low" | "medium" | "high" | "lossless"
|
playbackQuality: PlaybackQuality
|
||||||
useHls: boolean
|
useHls: boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
function playbackLoadSettings(
|
function playbackLoadSettings(
|
||||||
user: {
|
user: {
|
||||||
preferAtmos?: boolean
|
preferAtmos?: boolean
|
||||||
playbackQuality?: "low" | "medium" | "high" | "lossless"
|
playbackQuality?: PlaybackQuality
|
||||||
},
|
},
|
||||||
dolbyAtmosSupported: boolean | null,
|
dolbyAtmosSupported: boolean | null,
|
||||||
files: Record<string, unknown>
|
files: Record<string, unknown>
|
||||||
@@ -245,12 +247,12 @@ function loadAudioSource(
|
|||||||
): AudioSourceCleanup {
|
): AudioSourceCleanup {
|
||||||
let disposed = false
|
let disposed = false
|
||||||
let hlsInstance: Hls | null = null
|
let hlsInstance: Hls | null = null
|
||||||
const directUrl = songPlayUrl(
|
const directUrl = songPlayPath(
|
||||||
songId,
|
songId,
|
||||||
settings.playbackQuality,
|
settings.playbackQuality,
|
||||||
settings.preferAtmos
|
settings.preferAtmos
|
||||||
)
|
)
|
||||||
const hlsUrl = songHlsPlaylistUrl(
|
const hlsUrl = songHlsPlaylistPath(
|
||||||
songId,
|
songId,
|
||||||
settings.playbackQuality,
|
settings.playbackQuality,
|
||||||
settings.preferAtmos
|
settings.preferAtmos
|
||||||
|
|||||||
@@ -40,6 +40,7 @@ import { 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 { getSelectionRangePositions } from "@/lib/selection-range-styles"
|
import { getSelectionRangePositions } from "@/lib/selection-range-styles"
|
||||||
|
|
||||||
const ADD_TO_ANOTHER_PLAYLIST = "Add to Another Playlist"
|
const ADD_TO_ANOTHER_PLAYLIST = "Add to Another Playlist"
|
||||||
@@ -79,17 +80,10 @@ 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 normalizedQuery = searchQuery.trim().toLowerCase()
|
const isSearching = searchQuery.trim() !== ""
|
||||||
const filteredSongs = React.useMemo(
|
const filteredSongs = React.useMemo(
|
||||||
() =>
|
() => filterSongs(songs, searchQuery),
|
||||||
normalizedQuery
|
[songs, searchQuery]
|
||||||
? 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">),
|
||||||
@@ -156,7 +150,7 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
|
|||||||
runSongsAction(action, playlistSongIds)
|
runSongsAction(action, playlistSongIds)
|
||||||
}
|
}
|
||||||
|
|
||||||
const canReorder = isOwner && !isFavorites && !normalizedQuery
|
const canReorder = isOwner && !isFavorites && !isSearching
|
||||||
|
|
||||||
function handleRowSelect(index: number, event: React.MouseEvent) {
|
function handleRowSelect(index: number, event: React.MouseEvent) {
|
||||||
const songId = filteredSongs[index].id
|
const songId = filteredSongs[index].id
|
||||||
@@ -470,7 +464,7 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
|
|||||||
/>
|
/>
|
||||||
) : (
|
) : (
|
||||||
<p className="px-6 py-8 text-sm text-muted-foreground">
|
<p className="px-6 py-8 text-sm text-muted-foreground">
|
||||||
{normalizedQuery
|
{isSearching
|
||||||
? "No songs found."
|
? "No songs found."
|
||||||
: "This playlist has no songs yet."}
|
: "This playlist has no songs yet."}
|
||||||
</p>
|
</p>
|
||||||
|
|||||||
@@ -1,62 +1,16 @@
|
|||||||
import { toast } from "sonner"
|
import { toast } from "sonner"
|
||||||
|
import {
|
||||||
|
mediaShareUrl,
|
||||||
|
type MediaShareTarget,
|
||||||
|
} from "@otunes/convex/client/media-links"
|
||||||
|
|
||||||
export type MediaShareContext =
|
export type MediaShareContext = MediaShareTarget
|
||||||
| { 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 copyTextToClipboard(mediaShareUrl(share))
|
await navigator.clipboard.writeText(
|
||||||
|
mediaShareUrl(window.location.origin, share)
|
||||||
|
)
|
||||||
|
toast.success("Link Copied")
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function copyAlbumLink(albumId: string) {
|
export async function copyAlbumLink(albumId: string) {
|
||||||
|
|||||||
+13
-30
@@ -1,4 +1,9 @@
|
|||||||
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"
|
||||||
@@ -50,33 +55,6 @@ const state = (globalState.__otunesHls ??= {
|
|||||||
lastCleanupAt: 0,
|
lastCleanupAt: 0,
|
||||||
})
|
})
|
||||||
|
|
||||||
export function qualityKbps(quality: string | null) {
|
|
||||||
if (quality === "low") {
|
|
||||||
return 64
|
|
||||||
}
|
|
||||||
|
|
||||||
if (quality === "high") {
|
|
||||||
return 256
|
|
||||||
}
|
|
||||||
|
|
||||||
return 128
|
|
||||||
}
|
|
||||||
|
|
||||||
export function selectHlsSourceCodec(
|
|
||||||
song: SongSource,
|
|
||||||
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 hlsLookupKey(
|
function hlsLookupKey(
|
||||||
songId: string,
|
songId: string,
|
||||||
quality: string | null,
|
quality: string | null,
|
||||||
@@ -305,9 +283,14 @@ export async function ensureHlsJob(
|
|||||||
): Promise<HlsJob> {
|
): Promise<HlsJob> {
|
||||||
await cleanupIdleHlsJobs()
|
await cleanupIdleHlsJobs()
|
||||||
|
|
||||||
const kbps = qualityKbps(quality)
|
const plan = playbackStreamPlan(
|
||||||
const sourceCodec = selectHlsSourceCodec(song, quality, preferAtmos)
|
song.files,
|
||||||
const sourcePath = song.files[sourceCodec]
|
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 key = await hlsJobKey(song, sourcePath, kbps)
|
||||||
const lookupKey = hlsLookupKey(song._id, quality, preferAtmos)
|
const lookupKey = hlsLookupKey(song._id, quality, preferAtmos)
|
||||||
|
|
||||||
|
|||||||
@@ -2,10 +2,13 @@ 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"
|
||||||
@@ -48,7 +51,24 @@ export function useSongs(songIds: readonly Id<"songs">[]) {
|
|||||||
return songs
|
return songs
|
||||||
}
|
}
|
||||||
|
|
||||||
export function useSong(songId: Id<"songs"> | null) {
|
/**
|
||||||
const songIds = useMemo(() => (songId ? [songId] : []), [songId])
|
* Like `useSongs` for one song, but only re-renders when that song changes
|
||||||
return useSongs(songIds)[0] ?? null
|
* once it is cached.
|
||||||
|
*/
|
||||||
|
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
|
||||||
}
|
}
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
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}` : ""}`
|
|
||||||
}
|
|
||||||
+5
-1
@@ -22,7 +22,11 @@
|
|||||||
"pnpm": {
|
"pnpm": {
|
||||||
"patchedDependencies": {
|
"patchedDependencies": {
|
||||||
"expo-audio@58.0.10": "patches/expo-audio@58.0.10.patch",
|
"expo-audio@58.0.10": "patches/expo-audio@58.0.10.patch",
|
||||||
"react-native-screens@4.30.0": "patches/react-native-screens@4.30.0.patch"
|
"react-native-screens@4.30.0": "patches/react-native-screens@4.30.0.patch",
|
||||||
|
"react-native-reanimated@4.7.1": "patches/react-native-reanimated@4.7.1.patch",
|
||||||
|
"expo-modules-core@58.0.24": "patches/expo-modules-core@58.0.24.patch",
|
||||||
|
"expo-file-system@58.0.10": "patches/expo-file-system@58.0.10.patch",
|
||||||
|
"@react-native-community/slider@5.2.1": "patches/@react-native-community__slider@5.2.1.patch"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
/**
|
||||||
|
* Path data for the Dolby Atmos and Lossless badge marks, drawn with each
|
||||||
|
* platform's own SVG primitives.
|
||||||
|
*/
|
||||||
|
|
||||||
|
export const MARK_HEIGHT = 11
|
||||||
|
|
||||||
|
export const DOLBY_VIEW_BOX = "0 0 23 16"
|
||||||
|
export const DOLBY_WIDTH = (MARK_HEIGHT * 23) / 16
|
||||||
|
export const DOLBY_PATHS = [
|
||||||
|
"M0 0H2.5A8 8 0 0 1 2.5 16H0Z",
|
||||||
|
"M23 0H20.5A8 8 0 0 0 20.5 16H23Z",
|
||||||
|
]
|
||||||
|
|
||||||
|
export const LOSSLESS_VIEW_BOX = "28 154 544 271"
|
||||||
|
export const LOSSLESS_WIDTH = (MARK_HEIGHT * 544) / 271
|
||||||
|
export const LOSSLESS_PEAKS = [110, 215, 320]
|
||||||
|
export const LOSSLESS_THIN_WIDTH = 24
|
||||||
|
export 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"],
|
||||||
|
]
|
||||||
|
export 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"
|
||||||
|
export 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"
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
/** Reads the user id from a Convex Auth JWT without verifying it, for scoping client caches. */
|
||||||
|
export function userIdFromToken(token: string | null | undefined) {
|
||||||
|
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
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,96 @@
|
|||||||
|
import type { OptimisticLocalStore, OptimisticUpdate } from "convex/browser"
|
||||||
|
import type { FunctionArgs, FunctionReference } from "convex/server"
|
||||||
|
|
||||||
|
import { api } from "../convex/_generated/api"
|
||||||
|
import type { Id } from "../convex/_generated/dataModel"
|
||||||
|
|
||||||
|
type FavoriteIds = {
|
||||||
|
favoriteSongs: Id<"songs">[]
|
||||||
|
favoriteAlbums: Id<"albums">[]
|
||||||
|
favoriteArtists: Id<"artists">[]
|
||||||
|
}
|
||||||
|
|
||||||
|
type FavoriteList = keyof FavoriteIds
|
||||||
|
|
||||||
|
function patchFavorites<List extends FavoriteList>(
|
||||||
|
store: OptimisticLocalStore,
|
||||||
|
list: List,
|
||||||
|
update: (ids: FavoriteIds[List]) => FavoriteIds[List]
|
||||||
|
) {
|
||||||
|
const current = store.getQuery(api.favorites.getUserFavorites, {})
|
||||||
|
if (!current) return
|
||||||
|
const next = update(current[list])
|
||||||
|
if (next !== current[list]) {
|
||||||
|
store.setQuery(
|
||||||
|
api.favorites.getUserFavorites,
|
||||||
|
{},
|
||||||
|
{
|
||||||
|
...current,
|
||||||
|
[list]: next,
|
||||||
|
}
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function addFavorites<List extends FavoriteList>(
|
||||||
|
store: OptimisticLocalStore,
|
||||||
|
list: List,
|
||||||
|
ids: FavoriteIds[List]
|
||||||
|
) {
|
||||||
|
patchFavorites(store, list, (current) => {
|
||||||
|
const added = ids.filter((id) => !(current as string[]).includes(id))
|
||||||
|
return added.length === 0
|
||||||
|
? current
|
||||||
|
: ([...new Set([...current, ...added])] as FavoriteIds[List])
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
function removeFavorites<List extends FavoriteList>(
|
||||||
|
store: OptimisticLocalStore,
|
||||||
|
list: List,
|
||||||
|
ids: FavoriteIds[List]
|
||||||
|
) {
|
||||||
|
const removed = new Set<string>(ids)
|
||||||
|
patchFavorites(
|
||||||
|
store,
|
||||||
|
list,
|
||||||
|
(current) =>
|
||||||
|
(current as string[]).filter(
|
||||||
|
(id) => !removed.has(id)
|
||||||
|
) as FavoriteIds[List]
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
type FavoritesApi = typeof api.favorites
|
||||||
|
type FavoriteMutation = {
|
||||||
|
[
|
||||||
|
Name in keyof FavoritesApi
|
||||||
|
]: FavoritesApi[Name] extends FunctionReference<"mutation"> ? Name : never
|
||||||
|
}[keyof FavoritesApi]
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Optimistic updates for the favorites mutations, so toggles show instantly.
|
||||||
|
* Pass them to `useMutation(...).withOptimisticUpdate(...)`.
|
||||||
|
*/
|
||||||
|
export const favoriteOptimisticUpdates = {
|
||||||
|
favoriteSong: (store, { songId }) =>
|
||||||
|
addFavorites(store, "favoriteSongs", [songId]),
|
||||||
|
favoriteSongs: (store, { songIds }) =>
|
||||||
|
addFavorites(store, "favoriteSongs", songIds),
|
||||||
|
unfavoriteSong: (store, { songId }) =>
|
||||||
|
removeFavorites(store, "favoriteSongs", [songId]),
|
||||||
|
unfavoriteSongs: (store, { songIds }) =>
|
||||||
|
removeFavorites(store, "favoriteSongs", songIds),
|
||||||
|
favoriteAlbum: (store, { albumId }) =>
|
||||||
|
addFavorites(store, "favoriteAlbums", [albumId]),
|
||||||
|
unfavoriteAlbum: (store, { albumId }) =>
|
||||||
|
removeFavorites(store, "favoriteAlbums", [albumId]),
|
||||||
|
favoriteArtist: (store, { artistId }) =>
|
||||||
|
addFavorites(store, "favoriteArtists", [artistId]),
|
||||||
|
unfavoriteArtist: (store, { artistId }) =>
|
||||||
|
removeFavorites(store, "favoriteArtists", [artistId]),
|
||||||
|
} satisfies {
|
||||||
|
[Name in FavoriteMutation]?: OptimisticUpdate<
|
||||||
|
FunctionArgs<FavoritesApi[Name]>
|
||||||
|
>
|
||||||
|
}
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
/** A piece of media that has a shareable page on the web app. */
|
||||||
|
export type MediaShareTarget =
|
||||||
|
| { type: "album"; albumId: string }
|
||||||
|
| { type: "song"; albumId: string; songId: string }
|
||||||
|
| { type: "playlist"; playlistId: string; isFavorites?: boolean }
|
||||||
|
| { type: "artist"; artistId: string }
|
||||||
|
|
||||||
|
/** Builds the web app URL for `share`, relative to `origin` (no trailing slash needed). */
|
||||||
|
export function mediaShareUrl(origin: string, share: MediaShareTarget) {
|
||||||
|
const base = origin.replace(/\/+$/, "")
|
||||||
|
switch (share.type) {
|
||||||
|
case "album":
|
||||||
|
return `${base}/album/${share.albumId}`
|
||||||
|
case "song":
|
||||||
|
return `${base}/album/${share.albumId}?s=${share.songId}`
|
||||||
|
case "playlist":
|
||||||
|
return share.isFavorites
|
||||||
|
? `${base}/playlist/favorites`
|
||||||
|
: `${base}/playlist/${share.playlistId}`
|
||||||
|
case "artist":
|
||||||
|
return `${base}/artist/${share.artistId}`
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Songs are shared one at a time; collections are shared whatever is selected. */
|
||||||
|
export function shouldShowShare(
|
||||||
|
share: MediaShareTarget | undefined,
|
||||||
|
selectedCount: number
|
||||||
|
) {
|
||||||
|
if (!share) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
return share.type !== "song" || selectedCount === 1
|
||||||
|
}
|
||||||
@@ -198,6 +198,15 @@ export async function clearPersistentCache() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Deletes every entry whose key starts with `<prefix>:`. */
|
||||||
|
export function clearCachePrefix(prefix: string) {
|
||||||
|
for (const key of [...memory.keys()]) {
|
||||||
|
if (entryPrefix(key) !== prefix) continue
|
||||||
|
removeFromMemory(key)
|
||||||
|
scheduleWrite(key, null)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
export function subscribeCache(key: string, listener: () => void) {
|
export function subscribeCache(key: string, listener: () => void) {
|
||||||
let keyListeners = listeners.get(key)
|
let keyListeners = listeners.get(key)
|
||||||
if (!keyListeners) {
|
if (!keyListeners) {
|
||||||
|
|||||||
@@ -1,6 +1,9 @@
|
|||||||
import type { Id } from "../convex/_generated/dataModel"
|
import type { Id } from "../convex/_generated/dataModel"
|
||||||
|
|
||||||
/** Mirrors the queue rules in `packages/convex/convex/playback.ts`. */
|
/**
|
||||||
|
* Queue rules shared by the clients, which apply them locally, and the Convex
|
||||||
|
* playback mutations.
|
||||||
|
*/
|
||||||
|
|
||||||
function shuffleArray<T>(items: T[]): T[] {
|
function shuffleArray<T>(items: T[]): T[] {
|
||||||
const next = [...items]
|
const next = [...items]
|
||||||
@@ -30,7 +33,7 @@ export const EMPTY_PLAYBACK_QUEUE: PlaybackQueueState = {
|
|||||||
progressSeconds: 0,
|
progressSeconds: 0,
|
||||||
}
|
}
|
||||||
|
|
||||||
const MAX_QUEUE_HISTORY = 30
|
export const MAX_QUEUE_HISTORY = 30
|
||||||
|
|
||||||
function uniqueSongIds(songIds: Id<"songs">[]) {
|
function uniqueSongIds(songIds: Id<"songs">[]) {
|
||||||
return [...new Set(songIds)]
|
return [...new Set(songIds)]
|
||||||
|
|||||||
@@ -59,6 +59,19 @@ export function getCachedSong(songId: string) {
|
|||||||
return readCache<BrowseSong>(songKey(songId))
|
return readCache<BrowseSong>(songKey(songId))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* `useSyncExternalStore` snapshot for one song: the song once cached, else the
|
||||||
|
* cache version, so a missing song re-renders on every cache change (to retry
|
||||||
|
* the fetch) and a cached one only when it changes.
|
||||||
|
*/
|
||||||
|
export function getSongSnapshot(songId: string | null) {
|
||||||
|
return songId ? (getCachedSong(songId) ?? version) : null
|
||||||
|
}
|
||||||
|
|
||||||
|
export function songFromSnapshot(snapshot: ReturnType<typeof getSongSnapshot>) {
|
||||||
|
return typeof snapshot === "object" ? snapshot : null
|
||||||
|
}
|
||||||
|
|
||||||
/** Stores song metadata so the player and queue can render it offline. */
|
/** Stores song metadata so the player and queue can render it offline. */
|
||||||
export function rememberSongs(songs: readonly BrowseSong[]) {
|
export function rememberSongs(songs: readonly BrowseSong[]) {
|
||||||
let changed = false
|
let changed = false
|
||||||
|
|||||||
@@ -0,0 +1,21 @@
|
|||||||
|
type SearchableSong = {
|
||||||
|
title: string
|
||||||
|
artist: { name: string }
|
||||||
|
album: { title: string }
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Case-insensitive match on title, artist, or album. A blank query keeps every song. */
|
||||||
|
export function filterSongs<T extends SearchableSong>(
|
||||||
|
songs: T[],
|
||||||
|
query: string
|
||||||
|
) {
|
||||||
|
const normalized = query.trim().toLowerCase()
|
||||||
|
if (!normalized) {
|
||||||
|
return songs
|
||||||
|
}
|
||||||
|
return songs.filter((song) =>
|
||||||
|
[song.title, song.artist.name, song.album.title].some((value) =>
|
||||||
|
value.toLowerCase().includes(normalized)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
}
|
||||||
+4
@@ -13,6 +13,8 @@ import type * as auth from "../auth.js";
|
|||||||
import type * as crons from "../crons.js";
|
import type * as crons from "../crons.js";
|
||||||
import type * as favorites from "../favorites.js";
|
import type * as favorites from "../favorites.js";
|
||||||
import type * as http from "../http.js";
|
import type * as http from "../http.js";
|
||||||
|
import type * as intentCatalog from "../intentCatalog.js";
|
||||||
|
import type * as intentCatalogChanges from "../intentCatalogChanges.js";
|
||||||
import type * as library from "../library.js";
|
import type * as library from "../library.js";
|
||||||
import type * as limits from "../limits.js";
|
import type * as limits from "../limits.js";
|
||||||
import type * as migrations from "../migrations.js";
|
import type * as migrations from "../migrations.js";
|
||||||
@@ -34,6 +36,8 @@ declare const fullApi: ApiFromModules<{
|
|||||||
crons: typeof crons;
|
crons: typeof crons;
|
||||||
favorites: typeof favorites;
|
favorites: typeof favorites;
|
||||||
http: typeof http;
|
http: typeof http;
|
||||||
|
intentCatalog: typeof intentCatalog;
|
||||||
|
intentCatalogChanges: typeof intentCatalogChanges;
|
||||||
library: typeof library;
|
library: typeof library;
|
||||||
limits: typeof limits;
|
limits: typeof limits;
|
||||||
migrations: typeof migrations;
|
migrations: typeof migrations;
|
||||||
|
|||||||
+454
-466
@@ -61,512 +61,494 @@ async function cleanHlsStreamsOlderThan(maxIdleMs: number) {
|
|||||||
return { checked, removed, failed }
|
return { checked, removed, failed }
|
||||||
}
|
}
|
||||||
|
|
||||||
async function coverPathIfExists(path: string): Promise<string | null> {
|
const SCAN_PAGE_SIZE = 2000
|
||||||
return fs
|
/** Outlives the 10 minute action timeout so a crashed scan frees the lock. */
|
||||||
.access(path)
|
const SCAN_LOCK_LEASE_MS = 15 * 60 * 1000
|
||||||
.then(() => path)
|
/** New files left unparsed after this are picked up by the next scan. */
|
||||||
.catch(() => null)
|
const SCAN_PARSE_BUDGET_MS = 6 * 60 * 1000
|
||||||
}
|
const SCAN_BATCH_SIZE = 200
|
||||||
|
const FS_CONCURRENCY = 16
|
||||||
|
|
||||||
async function syncArtistCover(
|
type Page<T> = { page: T[]; isDone: boolean; continueCursor: string }
|
||||||
ctx: ActionCtx,
|
|
||||||
codec: string,
|
/** Reads every page of an internal paginated query. */
|
||||||
dbCover: string | null,
|
async function collectPages<T>(
|
||||||
diskPath: string,
|
load: (cursor: string | null) => Promise<Page<T>>
|
||||||
id: Id<"artists">
|
): Promise<T[]> {
|
||||||
) {
|
const items: T[] = []
|
||||||
const onDisk = await coverPathIfExists(diskPath)
|
let cursor: string | null = null
|
||||||
if (onDisk !== null) {
|
for (;;) {
|
||||||
if (dbCover !== onDisk) {
|
const result = await load(cursor)
|
||||||
await ctx.runMutation(internal.library.updateArtistCover, {
|
items.push(...result.page)
|
||||||
id,
|
if (result.isDone) {
|
||||||
cover: onDisk,
|
return items
|
||||||
})
|
|
||||||
}
|
}
|
||||||
} else if (dbCover !== null && dbCover.includes(codec)) {
|
cursor = result.continueCursor
|
||||||
await ctx.runMutation(internal.library.updateArtistCover, {
|
|
||||||
id,
|
|
||||||
cover: null,
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function syncAlbumCover(
|
/** Like `Promise.all(items.map(fn))` with at most `limit` calls in flight. */
|
||||||
ctx: ActionCtx,
|
async function mapLimit<T, R>(
|
||||||
codec: string,
|
items: T[],
|
||||||
dbCover: string | null,
|
limit: number,
|
||||||
diskPath: string,
|
fn: (item: T) => Promise<R>
|
||||||
id: Id<"albums">
|
): Promise<R[]> {
|
||||||
) {
|
const results = new Array<R>(items.length)
|
||||||
const onDisk = await coverPathIfExists(diskPath)
|
let next = 0
|
||||||
if (onDisk !== null) {
|
const worker = async () => {
|
||||||
if (dbCover !== onDisk) {
|
while (next < items.length) {
|
||||||
await ctx.runMutation(internal.library.updateAlbumCover, {
|
const index = next++
|
||||||
id,
|
results[index] = await fn(items[index])
|
||||||
cover: onDisk,
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
} else if (dbCover !== null && dbCover.includes(codec)) {
|
}
|
||||||
await ctx.runMutation(internal.library.updateAlbumCover, {
|
await Promise.all(
|
||||||
id,
|
Array.from({ length: Math.min(limit, items.length) }, worker)
|
||||||
cover: null,
|
)
|
||||||
})
|
return results
|
||||||
|
}
|
||||||
|
|
||||||
|
function chunk<T>(items: T[], size: number): T[][] {
|
||||||
|
const chunks: T[][] = []
|
||||||
|
for (let i = 0; i < items.length; i += size) {
|
||||||
|
chunks.push(items.slice(i, i + size))
|
||||||
|
}
|
||||||
|
return chunks
|
||||||
|
}
|
||||||
|
|
||||||
|
async function readDirents(dir: string): Promise<fsSync.Dirent[]> {
|
||||||
|
try {
|
||||||
|
return await fs.readdir(dir, { withFileTypes: true })
|
||||||
|
} catch (error) {
|
||||||
|
if ((error as NodeJS.ErrnoException).code === "ENOENT") {
|
||||||
|
return []
|
||||||
|
}
|
||||||
|
throw error
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function purgeRemovedSongs(ctx: ActionCtx, ids: Id<"songs">[]) {
|
type DiskAlbum = {
|
||||||
if (ids.length === 0) {
|
codec: string
|
||||||
return
|
artistFolder: string
|
||||||
}
|
albumFolder: string
|
||||||
await ctx.runMutation(internal.library.purgeSongsFromUsersAndPlaylists, {
|
files: string[]
|
||||||
ids,
|
}
|
||||||
|
|
||||||
|
type DiskLibrary = {
|
||||||
|
/** Every audio file path. */
|
||||||
|
files: Set<string>
|
||||||
|
/** Every `folder.jpg` / `cover.jpg` path. */
|
||||||
|
covers: Set<string>
|
||||||
|
albums: DiskAlbum[]
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Lists `DATA_DIR/<codec>/<artist>/<album>/<file>` with one readdir per directory. */
|
||||||
|
async function walkLibrary(codecs: string[]): Promise<DiskLibrary> {
|
||||||
|
const files = new Set<string>()
|
||||||
|
const covers = new Set<string>()
|
||||||
|
|
||||||
|
const artistDirs = (
|
||||||
|
await Promise.all(
|
||||||
|
codecs.map(async (codec) =>
|
||||||
|
(await readDirents(`${DATA_DIR}/${codec}`))
|
||||||
|
.filter((dirent) => dirent.isDirectory())
|
||||||
|
.map((dirent) => ({ codec, artistFolder: dirent.name }))
|
||||||
|
)
|
||||||
|
)
|
||||||
|
).flat()
|
||||||
|
|
||||||
|
const albumDirs = (
|
||||||
|
await mapLimit(
|
||||||
|
artistDirs,
|
||||||
|
FS_CONCURRENCY,
|
||||||
|
async ({ codec, artistFolder }) => {
|
||||||
|
const artistPath = `${DATA_DIR}/${codec}/${artistFolder}`
|
||||||
|
const dirents = await readDirents(artistPath)
|
||||||
|
if (dirents.some((d) => !d.isDirectory() && d.name === "folder.jpg")) {
|
||||||
|
covers.add(`${artistPath}/folder.jpg`)
|
||||||
|
}
|
||||||
|
return dirents
|
||||||
|
.filter((dirent) => dirent.isDirectory())
|
||||||
|
.map((dirent) => ({ codec, artistFolder, albumFolder: dirent.name }))
|
||||||
|
}
|
||||||
|
)
|
||||||
|
).flat()
|
||||||
|
|
||||||
|
const albums = await mapLimit(albumDirs, FS_CONCURRENCY, async (album) => {
|
||||||
|
const albumPath = `${DATA_DIR}/${album.codec}/${album.artistFolder}/${album.albumFolder}`
|
||||||
|
const albumFiles: string[] = []
|
||||||
|
for (const dirent of await readDirents(albumPath)) {
|
||||||
|
if (dirent.isDirectory()) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
const filePath = `${albumPath}/${dirent.name}`
|
||||||
|
if (dirent.name === "cover.jpg") {
|
||||||
|
covers.add(filePath)
|
||||||
|
} else {
|
||||||
|
files.add(filePath)
|
||||||
|
albumFiles.push(filePath)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return { ...album, files: albumFiles }
|
||||||
})
|
})
|
||||||
|
|
||||||
|
return { files, covers, albums }
|
||||||
}
|
}
|
||||||
|
|
||||||
async function purgeRemovedAlbums(ctx: ActionCtx, ids: Id<"albums">[]) {
|
/**
|
||||||
if (ids.length === 0) {
|
* Keeps the current cover while its file exists, otherwise the first codec's
|
||||||
return
|
* cover on disk. Covers outside the data directory are left alone.
|
||||||
|
*/
|
||||||
|
function pickCover(
|
||||||
|
current: string | null,
|
||||||
|
candidates: string[],
|
||||||
|
covers: Set<string>
|
||||||
|
): string | null {
|
||||||
|
if (
|
||||||
|
current !== null &&
|
||||||
|
(covers.has(current) || !current.startsWith(`${DATA_DIR}/`))
|
||||||
|
) {
|
||||||
|
return current
|
||||||
}
|
}
|
||||||
await ctx.runMutation(internal.library.purgeAlbumsFromUsers, { ids })
|
return candidates.find((candidate) => covers.has(candidate)) ?? null
|
||||||
}
|
}
|
||||||
|
|
||||||
async function purgeRemovedArtists(ctx: ActionCtx, ids: Id<"artists">[]) {
|
/** Untagged years are stored as 0 / "", which both clients treat as unknown. */
|
||||||
if (ids.length === 0) {
|
function releaseDate(common: music.ICommonTagsResult) {
|
||||||
return
|
if (common.date) {
|
||||||
|
return common.date
|
||||||
}
|
}
|
||||||
await ctx.runMutation(internal.library.purgeArtistsFromUsers, { ids })
|
return common.year ? `01-01-${common.year}` : ""
|
||||||
}
|
}
|
||||||
|
|
||||||
async function removeCodecFromDatabase(ctx: ActionCtx, codec: string) {
|
type NewSong = {
|
||||||
const allSongs = await ctx.runQuery(internal.library.getSongs)
|
name: string
|
||||||
|
files: Record<string, string>
|
||||||
|
artist: string | string[]
|
||||||
|
length: number
|
||||||
|
diskNumber: number | null
|
||||||
|
track: number
|
||||||
|
year: number
|
||||||
|
date: string
|
||||||
|
genres: string[]
|
||||||
|
}
|
||||||
|
|
||||||
const songsToRemove: Id<"songs">[] = []
|
type ImportEntry = {
|
||||||
const songsToUpdate: { id: Id<"songs">; files: Record<string, string> }[] = []
|
artist: { name: string; folder: string; cover: string | null }
|
||||||
for (const song of allSongs) {
|
album: {
|
||||||
if (!(codec in song.files)) {
|
name: string
|
||||||
|
folder: string
|
||||||
|
cover: string | null
|
||||||
|
year: number
|
||||||
|
date: string
|
||||||
|
}
|
||||||
|
songs: Map<string, NewSong>
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reconciles the database with the files on disk. Reads the library once in
|
||||||
|
* pages, walks the disk once, parses only untracked files and writes only
|
||||||
|
* what changed, so re-scanning an unchanged library makes no writes.
|
||||||
|
*/
|
||||||
|
async function scanLibrary(ctx: ActionCtx) {
|
||||||
|
const startedAt = Date.now()
|
||||||
|
const codecs = (await fs.readdir(DATA_DIR, { withFileTypes: true }))
|
||||||
|
.filter((dirent) => dirent.isDirectory())
|
||||||
|
.map((dirent) => dirent.name)
|
||||||
|
|
||||||
|
const [artists, albums, songs, disk] = await Promise.all([
|
||||||
|
collectPages((cursor) =>
|
||||||
|
ctx.runQuery(internal.library.scanArtistsPage, {
|
||||||
|
paginationOpts: { numItems: SCAN_PAGE_SIZE, cursor },
|
||||||
|
})
|
||||||
|
),
|
||||||
|
collectPages((cursor) =>
|
||||||
|
ctx.runQuery(internal.library.scanAlbumsPage, {
|
||||||
|
paginationOpts: { numItems: SCAN_PAGE_SIZE, cursor },
|
||||||
|
})
|
||||||
|
),
|
||||||
|
collectPages((cursor) =>
|
||||||
|
ctx.runQuery(internal.library.scanSongsPage, {
|
||||||
|
paginationOpts: { numItems: SCAN_PAGE_SIZE, cursor },
|
||||||
|
})
|
||||||
|
),
|
||||||
|
walkLibrary(codecs),
|
||||||
|
])
|
||||||
|
|
||||||
|
if (disk.files.size === 0 && songs.length > 0) {
|
||||||
|
throw new Error(
|
||||||
|
`No audio files found under ${DATA_DIR}; refusing to empty the library`
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Drop file paths that are gone from disk (including removed codecs). Songs
|
||||||
|
// left without files are deleted below unless a new file matches them.
|
||||||
|
const songFiles = new Map<Id<"songs">, Record<string, string>>()
|
||||||
|
const changedSongs = new Set<Id<"songs">>()
|
||||||
|
const songsByAlbum = new Map<Id<"albums">, Map<string, Id<"songs">>>()
|
||||||
|
const tracked = new Set<string>()
|
||||||
|
for (const song of songs) {
|
||||||
|
const entries = Object.entries(song.files)
|
||||||
|
const kept = entries.filter(([, filePath]) => disk.files.has(filePath))
|
||||||
|
if (kept.length !== entries.length) {
|
||||||
|
changedSongs.add(song._id)
|
||||||
|
}
|
||||||
|
songFiles.set(song._id, Object.fromEntries(kept))
|
||||||
|
for (const [, filePath] of kept) {
|
||||||
|
tracked.add(filePath)
|
||||||
|
}
|
||||||
|
const byName = songsByAlbum.get(song.album) ?? new Map()
|
||||||
|
if (!byName.has(song.name)) {
|
||||||
|
byName.set(song.name, song._id)
|
||||||
|
}
|
||||||
|
songsByAlbum.set(song.album, byName)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Parse untracked files only.
|
||||||
|
const untracked = disk.albums.flatMap((album) =>
|
||||||
|
album.files
|
||||||
|
.filter((filePath) => !tracked.has(filePath))
|
||||||
|
.map((filePath) => ({ ...album, filePath }))
|
||||||
|
)
|
||||||
|
const deadline = startedAt + SCAN_PARSE_BUDGET_MS
|
||||||
|
const parsed = await mapLimit(untracked, FS_CONCURRENCY, async (file) => {
|
||||||
|
if (Date.now() > deadline) {
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
const metadata = await music.parseFile(file.filePath, {
|
||||||
|
skipCovers: true,
|
||||||
|
})
|
||||||
|
return { ...file, metadata }
|
||||||
|
} catch {
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
})
|
||||||
|
const skipped = parsed.filter((file) => file === null).length
|
||||||
|
|
||||||
|
const artistByFolder = new Map(
|
||||||
|
artists.map((artist) => [artist.folder, artist])
|
||||||
|
)
|
||||||
|
const albumByKey = new Map(
|
||||||
|
albums.map((album) => [`${album.artist}/${album.folder}`, album])
|
||||||
|
)
|
||||||
|
const imports = new Map<string, ImportEntry>()
|
||||||
|
for (const file of parsed) {
|
||||||
|
if (file === null) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
const { codec, artistFolder, albumFolder, filePath, metadata } = file
|
||||||
|
const common = metadata.common
|
||||||
|
const title = common.title || path.parse(filePath).name
|
||||||
|
|
||||||
|
const dbArtist = artistByFolder.get(artistFolder)
|
||||||
|
const dbAlbum = dbArtist
|
||||||
|
? albumByKey.get(`${dbArtist._id}/${albumFolder}`)
|
||||||
|
: undefined
|
||||||
|
const existingId = dbAlbum && songsByAlbum.get(dbAlbum._id)?.get(title)
|
||||||
|
if (existingId) {
|
||||||
|
// A same-titled sibling must not steal a path that still exists.
|
||||||
|
const files = songFiles.get(existingId)!
|
||||||
|
if (!(codec in files)) {
|
||||||
|
songFiles.set(existingId, { ...files, [codec]: filePath })
|
||||||
|
changedSongs.add(existingId)
|
||||||
|
}
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
const { [codec]: _, ...update } = song.files
|
const key = `${artistFolder}/${albumFolder}`
|
||||||
if (Object.keys(update).length === 0) {
|
let entry = imports.get(key)
|
||||||
songsToRemove.push(song._id)
|
if (!entry) {
|
||||||
} else {
|
entry = {
|
||||||
songsToUpdate.push({
|
artist: {
|
||||||
id: song._id,
|
name: common.albumartist || artistFolder,
|
||||||
files: update,
|
folder: artistFolder,
|
||||||
})
|
cover: pickCover(
|
||||||
|
null,
|
||||||
|
codecs.map((c) => `${DATA_DIR}/${c}/${artistFolder}/folder.jpg`),
|
||||||
|
disk.covers
|
||||||
|
),
|
||||||
|
},
|
||||||
|
album: {
|
||||||
|
name: common.album || albumFolder,
|
||||||
|
folder: albumFolder,
|
||||||
|
cover: pickCover(
|
||||||
|
null,
|
||||||
|
codecs.map(
|
||||||
|
(c) => `${DATA_DIR}/${c}/${artistFolder}/${albumFolder}/cover.jpg`
|
||||||
|
),
|
||||||
|
disk.covers
|
||||||
|
),
|
||||||
|
year: common.year || 0,
|
||||||
|
date: releaseDate(common),
|
||||||
|
},
|
||||||
|
songs: new Map(),
|
||||||
|
}
|
||||||
|
imports.set(key, entry)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const pending = entry.songs.get(title)
|
||||||
|
if (pending) {
|
||||||
|
pending.files[codec] ??= filePath
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
entry.songs.set(title, {
|
||||||
|
name: title,
|
||||||
|
files: { [codec]: filePath },
|
||||||
|
artist:
|
||||||
|
common.artist ?? common.artists ?? dbArtist?.name ?? entry.artist.name,
|
||||||
|
length: Math.round(metadata.format.duration || 0),
|
||||||
|
diskNumber: common.disk.of === 1 ? null : common.disk.no,
|
||||||
|
track: common.track.no || 0,
|
||||||
|
year: common.year || 0,
|
||||||
|
date: releaseDate(common),
|
||||||
|
genres: common.genre || [],
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
await ctx.runMutation(internal.library.changeFilesForSongs, {
|
const deletedSongs = songs.flatMap((song) =>
|
||||||
songs: songsToUpdate,
|
Object.keys(songFiles.get(song._id)!).length === 0 ? [song._id] : []
|
||||||
})
|
|
||||||
await purgeRemovedSongs(ctx, songsToRemove)
|
|
||||||
await ctx.runMutation(internal.library.removeSongs, { ids: songsToRemove })
|
|
||||||
|
|
||||||
const allAlbums = await ctx.runQuery(internal.library.getAlbums)
|
|
||||||
const removedSongIds = new Set(songsToRemove)
|
|
||||||
const albumsWithSongs = new Set(
|
|
||||||
allSongs.flatMap((song) =>
|
|
||||||
removedSongIds.has(song._id) ? [] : [song.album]
|
|
||||||
)
|
|
||||||
)
|
)
|
||||||
const albumsToRemove = allAlbums
|
const deletedSongSet = new Set(deletedSongs)
|
||||||
|
const updatedSongs = [...changedSongs].filter((id) => !deletedSongSet.has(id))
|
||||||
|
|
||||||
|
const albumsWithSongs = new Set(
|
||||||
|
songs.flatMap((song) => (deletedSongSet.has(song._id) ? [] : [song.album]))
|
||||||
|
)
|
||||||
|
const emptyAlbums = albums
|
||||||
.filter((album) => !albumsWithSongs.has(album._id))
|
.filter((album) => !albumsWithSongs.has(album._id))
|
||||||
.map((album) => album._id)
|
.map((album) => album._id)
|
||||||
await purgeRemovedAlbums(ctx, albumsToRemove)
|
const emptyAlbumSet = new Set(emptyAlbums)
|
||||||
await ctx.runMutation(internal.library.removeAlbums, { ids: albumsToRemove })
|
|
||||||
|
|
||||||
const allArtists = await ctx.runQuery(internal.library.getArtists)
|
|
||||||
const removedAlbumIds = new Set(albumsToRemove)
|
|
||||||
const artistsWithAlbums = new Set(
|
const artistsWithAlbums = new Set(
|
||||||
allAlbums.flatMap((album) =>
|
albums.flatMap((album) =>
|
||||||
removedAlbumIds.has(album._id) ? [] : [album.artist]
|
emptyAlbumSet.has(album._id) ? [] : [album.artist]
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
const artistsToRemove = allArtists
|
const emptyArtists = artists
|
||||||
.filter((artist) => !artistsWithAlbums.has(artist._id))
|
.filter((artist) => !artistsWithAlbums.has(artist._id))
|
||||||
.map((artist) => artist._id)
|
.map((artist) => artist._id)
|
||||||
await purgeRemovedArtists(ctx, artistsToRemove)
|
const emptyArtistSet = new Set(emptyArtists)
|
||||||
await ctx.runMutation(internal.library.removeArtists, {
|
|
||||||
ids: artistsToRemove,
|
// Albums and artists about to be deleted keep their cover.
|
||||||
|
const artistById = new Map(artists.map((artist) => [artist._id, artist]))
|
||||||
|
const artistCovers = artists.flatMap((artist) => {
|
||||||
|
if (emptyArtistSet.has(artist._id)) {
|
||||||
|
return []
|
||||||
|
}
|
||||||
|
const cover = pickCover(
|
||||||
|
artist.cover,
|
||||||
|
codecs.map((c) => `${DATA_DIR}/${c}/${artist.folder}/folder.jpg`),
|
||||||
|
disk.covers
|
||||||
|
)
|
||||||
|
return cover === artist.cover ? [] : [{ id: artist._id, cover }]
|
||||||
})
|
})
|
||||||
|
const albumCovers = albums.flatMap((album) => {
|
||||||
|
const artist = artistById.get(album.artist)
|
||||||
|
if (!artist || emptyAlbumSet.has(album._id)) {
|
||||||
|
return []
|
||||||
|
}
|
||||||
|
const cover = pickCover(
|
||||||
|
album.cover,
|
||||||
|
codecs.map(
|
||||||
|
(c) => `${DATA_DIR}/${c}/${artist.folder}/${album.folder}/cover.jpg`
|
||||||
|
),
|
||||||
|
disk.covers
|
||||||
|
)
|
||||||
|
return cover === album.cover ? [] : [{ id: album._id, cover }]
|
||||||
|
})
|
||||||
|
|
||||||
|
// Writes. Imports run before the empty-album/artist sweeps, and those
|
||||||
|
// mutations re-check emptiness, so nothing that gained songs is deleted.
|
||||||
|
for (const batch of chunk(updatedSongs, SCAN_BATCH_SIZE)) {
|
||||||
|
await ctx.runMutation(internal.library.changeFilesForSongs, {
|
||||||
|
songs: batch.map((id) => ({ id, files: songFiles.get(id)! })),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
for (const batch of chunk(deletedSongs, SCAN_BATCH_SIZE)) {
|
||||||
|
await ctx.runMutation(internal.library.deleteSongs, { ids: batch })
|
||||||
|
}
|
||||||
|
|
||||||
|
let importBatch: ImportEntry[] = []
|
||||||
|
let importBatchSongs = 0
|
||||||
|
const flushImports = async () => {
|
||||||
|
if (importBatch.length === 0) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
await ctx.runMutation(internal.library.importAlbums, {
|
||||||
|
albums: importBatch.map((entry) => ({
|
||||||
|
...entry,
|
||||||
|
songs: [...entry.songs.values()],
|
||||||
|
})),
|
||||||
|
})
|
||||||
|
importBatch = []
|
||||||
|
importBatchSongs = 0
|
||||||
|
}
|
||||||
|
for (const entry of imports.values()) {
|
||||||
|
importBatch.push(entry)
|
||||||
|
importBatchSongs += entry.songs.size
|
||||||
|
if (importBatchSongs >= SCAN_BATCH_SIZE) {
|
||||||
|
await flushImports()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
await flushImports()
|
||||||
|
|
||||||
|
for (const batch of chunk(artistCovers, SCAN_BATCH_SIZE)) {
|
||||||
|
await ctx.runMutation(internal.library.updateArtistCovers, {
|
||||||
|
artists: batch,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
for (const batch of chunk(albumCovers, SCAN_BATCH_SIZE)) {
|
||||||
|
await ctx.runMutation(internal.library.updateAlbumCovers, {
|
||||||
|
albums: batch,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
let removedAlbums = 0
|
||||||
|
for (const batch of chunk(emptyAlbums, SCAN_BATCH_SIZE)) {
|
||||||
|
removedAlbums += await ctx.runMutation(internal.library.deleteEmptyAlbums, {
|
||||||
|
ids: batch,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
let removedArtists = 0
|
||||||
|
for (const batch of chunk(emptyArtists, SCAN_BATCH_SIZE)) {
|
||||||
|
removedArtists += await ctx.runMutation(
|
||||||
|
internal.library.deleteEmptyArtists,
|
||||||
|
{ ids: batch }
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
const importedSongs = [...imports.values()].reduce(
|
||||||
|
(total, entry) => total + entry.songs.size,
|
||||||
|
0
|
||||||
|
)
|
||||||
|
const summary =
|
||||||
|
`songs: ${importedSongs} added, ${updatedSongs.length} updated, ` +
|
||||||
|
`${deletedSongs.length} removed; albums removed: ${removedAlbums}; ` +
|
||||||
|
`artists removed: ${removedArtists}; covers updated: ` +
|
||||||
|
`${artistCovers.length + albumCovers.length}; ` +
|
||||||
|
`files deferred: ${skipped}; ${Date.now() - startedAt}ms`
|
||||||
|
console.log(`library scan: ${summary}`)
|
||||||
|
return summary
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Runs one scan under the library scan lock; `null` if one is already running. */
|
||||||
export const scheduledUpdateLibrary = internalAction({
|
export const scheduledUpdateLibrary = internalAction({
|
||||||
args: {},
|
args: {},
|
||||||
handler: async (ctx) => {
|
handler: async (ctx): Promise<string | null> => {
|
||||||
const codecs = (await fs.readdir(DATA_DIR, { withFileTypes: true }))
|
const token = crypto.randomUUID()
|
||||||
.filter((dirent) => dirent.isDirectory())
|
const acquired: boolean = await ctx.runMutation(
|
||||||
.map((dirent) => dirent.name)
|
internal.library.acquireLibraryScanLock,
|
||||||
|
{ token, leaseMs: SCAN_LOCK_LEASE_MS }
|
||||||
const dbCodecs = Array.from(
|
|
||||||
new Map(
|
|
||||||
(await ctx.runQuery(internal.library.getSongs))
|
|
||||||
.map((song) => {
|
|
||||||
return Object.keys(song.files)
|
|
||||||
})
|
|
||||||
.flat()
|
|
||||||
.map((codec) => [codec, codec])
|
|
||||||
).values()
|
|
||||||
)
|
)
|
||||||
|
if (!acquired) {
|
||||||
for (const dbCodec of dbCodecs) {
|
console.log("library scan: already running, skipped")
|
||||||
if (!codecs.includes(dbCodec)) {
|
return null
|
||||||
await removeCodecFromDatabase(ctx, dbCodec)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
try {
|
||||||
// Removals
|
return await scanLibrary(ctx)
|
||||||
for (const codec of codecs) {
|
} finally {
|
||||||
const dbArtists = await ctx.runQuery(internal.library.getArtists)
|
await ctx.runMutation(internal.library.releaseLibraryScanLock, { token })
|
||||||
const dbAlbums = await ctx.runQuery(internal.library.getAlbums)
|
|
||||||
const dbSongs = await ctx.runQuery(internal.library.getSongs)
|
|
||||||
|
|
||||||
const dirtySongs = dbSongs
|
|
||||||
.filter((song) => {
|
|
||||||
return codec in song.files && !fsSync.existsSync(song.files[codec])
|
|
||||||
})
|
|
||||||
.map((song) => {
|
|
||||||
const { [codec]: _, ...update } = song.files
|
|
||||||
return { id: song._id, files: update }
|
|
||||||
})
|
|
||||||
|
|
||||||
const songsToDelete = dirtySongs.filter(
|
|
||||||
(song) => Object.keys(song.files).length === 0
|
|
||||||
)
|
|
||||||
const songsToUpdate = dirtySongs.filter(
|
|
||||||
(song) => Object.keys(song.files).length !== 0
|
|
||||||
)
|
|
||||||
const songsToDeleteIDs = songsToDelete.map((song) => song.id)
|
|
||||||
|
|
||||||
await purgeRemovedSongs(ctx, songsToDeleteIDs)
|
|
||||||
await ctx.runMutation(internal.library.removeSongs, {
|
|
||||||
ids: songsToDeleteIDs,
|
|
||||||
})
|
|
||||||
await ctx.runMutation(internal.library.changeFilesForSongs, {
|
|
||||||
songs: songsToUpdate,
|
|
||||||
})
|
|
||||||
|
|
||||||
const deletedSongIds = new Set(songsToDeleteIDs)
|
|
||||||
const albumsWithSongs = new Set(
|
|
||||||
dbSongs.flatMap((song) =>
|
|
||||||
deletedSongIds.has(song._id) ? [] : [song.album]
|
|
||||||
)
|
|
||||||
)
|
|
||||||
const albumsToDelete = dbAlbums
|
|
||||||
.filter((album) => !albumsWithSongs.has(album._id))
|
|
||||||
.map((album) => album._id)
|
|
||||||
await purgeRemovedAlbums(ctx, albumsToDelete)
|
|
||||||
await ctx.runMutation(internal.library.removeAlbums, {
|
|
||||||
ids: albumsToDelete,
|
|
||||||
})
|
|
||||||
|
|
||||||
const deletedAlbumIds = new Set(albumsToDelete)
|
|
||||||
const artistsWithAlbums = new Set(
|
|
||||||
dbAlbums.flatMap((album) =>
|
|
||||||
deletedAlbumIds.has(album._id) ? [] : [album.artist]
|
|
||||||
)
|
|
||||||
)
|
|
||||||
const artistsToDelete = dbArtists
|
|
||||||
.filter((artist) => !artistsWithAlbums.has(artist._id))
|
|
||||||
.map((artist) => artist._id)
|
|
||||||
await purgeRemovedArtists(ctx, artistsToDelete)
|
|
||||||
await ctx.runMutation(internal.library.removeArtists, {
|
|
||||||
ids: artistsToDelete,
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Additions
|
|
||||||
for (const codec of codecs) {
|
|
||||||
// Artists
|
|
||||||
console.log(`${codec}: artists`)
|
|
||||||
let dbArtists = await ctx.runQuery(internal.library.getArtists)
|
|
||||||
const dbArtistFolders = dbArtists.map((artist) => artist.folder)
|
|
||||||
const artists = (
|
|
||||||
await fs.readdir(`${DATA_DIR}/${codec}`, { withFileTypes: true })
|
|
||||||
)
|
|
||||||
.filter((dirent) => dirent.isDirectory())
|
|
||||||
.map((dirent) => dirent.name)
|
|
||||||
const potentialArtists = artists.filter(
|
|
||||||
(artist) => !dbArtistFolders.includes(artist)
|
|
||||||
)
|
|
||||||
|
|
||||||
const newArtists = []
|
|
||||||
for (const folder of potentialArtists) {
|
|
||||||
const albums = (
|
|
||||||
await fs.readdir(`${DATA_DIR}/${codec}/${folder}`, {
|
|
||||||
withFileTypes: true,
|
|
||||||
})
|
|
||||||
)
|
|
||||||
.filter((dirent) => dirent.isDirectory())
|
|
||||||
.map((dirent) => dirent.name)
|
|
||||||
|
|
||||||
if (albums.length === 0) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
for (let i = 0; i < albums.length; i++) {
|
|
||||||
const songs = (
|
|
||||||
await fs.readdir(`${DATA_DIR}/${codec}/${folder}/${albums[i]}`, {
|
|
||||||
withFileTypes: true,
|
|
||||||
})
|
|
||||||
)
|
|
||||||
.filter(
|
|
||||||
(dirent) => !dirent.isDirectory() && dirent.name !== "cover.jpg"
|
|
||||||
)
|
|
||||||
.map((dirent) => dirent.name)
|
|
||||||
|
|
||||||
if (songs.length === 0) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
const metadata = await music.parseFile(
|
|
||||||
`${DATA_DIR}/${codec}/${folder}/${albums[i]}/${songs[0]}`,
|
|
||||||
{ skipCovers: true }
|
|
||||||
)
|
|
||||||
|
|
||||||
const artistCoverPath = `${DATA_DIR}/${codec}/${folder}/folder.jpg`
|
|
||||||
const cover = await coverPathIfExists(artistCoverPath)
|
|
||||||
|
|
||||||
newArtists.push({
|
|
||||||
name: metadata.common.albumartist || folder,
|
|
||||||
folder,
|
|
||||||
cover,
|
|
||||||
})
|
|
||||||
break
|
|
||||||
} catch {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
await ctx.runMutation(internal.library.createArtists, {
|
|
||||||
artists: newArtists,
|
|
||||||
})
|
|
||||||
dbArtists = await ctx.runQuery(internal.library.getArtists)
|
|
||||||
|
|
||||||
// Albums
|
|
||||||
console.log(`${codec}: albums`)
|
|
||||||
let dbAlbums = await ctx.runQuery(internal.library.getAlbums)
|
|
||||||
const newAlbums = []
|
|
||||||
for (const dbArtist of dbArtists) {
|
|
||||||
const dbAlbumsInArtist = dbAlbums.filter(
|
|
||||||
(album) => album.artist === dbArtist._id
|
|
||||||
)
|
|
||||||
const dbAlbumFolders = dbAlbumsInArtist.map((album) => album.folder)
|
|
||||||
|
|
||||||
if (!fsSync.existsSync(`${DATA_DIR}/${codec}/${dbArtist.folder}`)) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
const albums = (
|
|
||||||
await fs.readdir(`${DATA_DIR}/${codec}/${dbArtist.folder}`, {
|
|
||||||
withFileTypes: true,
|
|
||||||
})
|
|
||||||
)
|
|
||||||
.filter((dirent) => dirent.isDirectory())
|
|
||||||
.map((dirent) => dirent.name)
|
|
||||||
const potentialAlbums = albums.filter(
|
|
||||||
(album) => !dbAlbumFolders.includes(album)
|
|
||||||
)
|
|
||||||
|
|
||||||
for (const potentialAlbum of potentialAlbums) {
|
|
||||||
const potentialAlbumPath = `${DATA_DIR}/${codec}/${dbArtist.folder}/${potentialAlbum}`
|
|
||||||
if (!fsSync.existsSync(potentialAlbumPath)) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
const songs = (
|
|
||||||
await fs.readdir(potentialAlbumPath, {
|
|
||||||
withFileTypes: true,
|
|
||||||
})
|
|
||||||
)
|
|
||||||
.filter(
|
|
||||||
(dirent) => !dirent.isDirectory() && dirent.name !== "cover.jpg"
|
|
||||||
)
|
|
||||||
.map((dirent) => dirent.name)
|
|
||||||
|
|
||||||
if (songs.length === 0) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
const metadata = await music.parseFile(
|
|
||||||
`${potentialAlbumPath}/${songs[0]}`,
|
|
||||||
{ skipCovers: true }
|
|
||||||
)
|
|
||||||
|
|
||||||
const albumCoverPath = `${DATA_DIR}/${codec}/${dbArtist.folder}/${potentialAlbum}/cover.jpg`
|
|
||||||
const cover = await coverPathIfExists(albumCoverPath)
|
|
||||||
|
|
||||||
newAlbums.push({
|
|
||||||
name: metadata.common.album || potentialAlbum,
|
|
||||||
folder: potentialAlbum,
|
|
||||||
cover,
|
|
||||||
year: metadata.common.year || 2026,
|
|
||||||
date:
|
|
||||||
metadata.common.date || `01-01-${metadata.common.year || 2026}`,
|
|
||||||
artist: dbArtist._id,
|
|
||||||
})
|
|
||||||
} catch {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
await ctx.runMutation(internal.library.createAlbums, {
|
|
||||||
albums: newAlbums,
|
|
||||||
})
|
|
||||||
dbAlbums = await ctx.runQuery(internal.library.getAlbums)
|
|
||||||
const dbSongs = await ctx.runQuery(internal.library.getSongs)
|
|
||||||
|
|
||||||
const dbAlbumsArtists = dbAlbums.map((album) => {
|
|
||||||
return {
|
|
||||||
...album,
|
|
||||||
artist: dbArtists.find((artist) => artist._id === album.artist)!,
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
// Covers
|
|
||||||
console.log(`${codec}: covers`)
|
|
||||||
for (const dbArtist of dbArtists) {
|
|
||||||
const artistPath = `${DATA_DIR}/${codec}/${dbArtist.folder}`
|
|
||||||
if (!fsSync.existsSync(artistPath)) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
await syncArtistCover(
|
|
||||||
ctx,
|
|
||||||
codec,
|
|
||||||
dbArtist.cover,
|
|
||||||
`${artistPath}/folder.jpg`,
|
|
||||||
dbArtist._id
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
for (const dbAlbum of dbAlbumsArtists) {
|
|
||||||
const artistPath = `${DATA_DIR}/${codec}/${dbAlbum.artist.folder}`
|
|
||||||
const albumPath = `${artistPath}/${dbAlbum.folder}`
|
|
||||||
if (!fsSync.existsSync(artistPath) || !fsSync.existsSync(albumPath)) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
await syncAlbumCover(
|
|
||||||
ctx,
|
|
||||||
codec,
|
|
||||||
dbAlbum.cover,
|
|
||||||
`${albumPath}/cover.jpg`,
|
|
||||||
dbAlbum._id
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Songs
|
|
||||||
console.log(`${codec}: songs`)
|
|
||||||
|
|
||||||
const newSongs = []
|
|
||||||
const updateSongs = []
|
|
||||||
for (const dbAlbum of dbAlbumsArtists) {
|
|
||||||
const dbSongsInAlbum = dbSongs.filter(
|
|
||||||
(song) => song.album === dbAlbum._id
|
|
||||||
)
|
|
||||||
const dbAlreadyTracked = dbSongsInAlbum
|
|
||||||
.filter((song) => codec in song.files)
|
|
||||||
.map((song) => song.files[codec])
|
|
||||||
|
|
||||||
const artistPath = `${DATA_DIR}/${codec}/${dbAlbum.artist.folder}`
|
|
||||||
const albumPath = `${artistPath}/${dbAlbum.folder}`
|
|
||||||
if (!fsSync.existsSync(artistPath) || !fsSync.existsSync(albumPath)) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
const songs = (await fs.readdir(albumPath, { withFileTypes: true }))
|
|
||||||
.filter(
|
|
||||||
(dirent) => !dirent.isDirectory() && dirent.name !== "cover.jpg"
|
|
||||||
)
|
|
||||||
.map((dirent) => dirent.name)
|
|
||||||
.filter((song) => !dbAlreadyTracked.includes(`${albumPath}/${song}`))
|
|
||||||
|
|
||||||
for (const song of songs) {
|
|
||||||
try {
|
|
||||||
const path = `${DATA_DIR}/${codec}/${dbAlbum.artist.folder}/${dbAlbum.folder}/${song}`
|
|
||||||
const metadata = await music.parseFile(path, { skipCovers: true })
|
|
||||||
|
|
||||||
if (!metadata.common.title) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
const existingSong = dbSongsInAlbum.find(
|
|
||||||
(dbSong) => dbSong.name === metadata.common.title
|
|
||||||
)
|
|
||||||
|
|
||||||
if (existingSong) {
|
|
||||||
if (
|
|
||||||
!(codec in existingSong.files) ||
|
|
||||||
existingSong.files[codec] !== path
|
|
||||||
) {
|
|
||||||
const update = { [codec]: path, ...existingSong.files }
|
|
||||||
updateSongs.push({
|
|
||||||
id: existingSong._id,
|
|
||||||
files: update,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
let files = { [codec]: path }
|
|
||||||
|
|
||||||
if (codec !== "atmos") {
|
|
||||||
const artistPath = `${DATA_DIR}/atmos/${dbAlbum.artist.folder}`
|
|
||||||
const albumPath = `${artistPath}/${dbAlbum.folder}`
|
|
||||||
const path = `${albumPath}/${song}`
|
|
||||||
|
|
||||||
if (fsSync.existsSync(path)) {
|
|
||||||
files = { atmos: path, ...files }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (codec !== "lossless") {
|
|
||||||
const artistPath = `${DATA_DIR}/lossless/${dbAlbum.artist.folder}`
|
|
||||||
const albumPath = `${artistPath}/${dbAlbum.folder}`
|
|
||||||
const path = `${albumPath}/${song}`
|
|
||||||
|
|
||||||
if (fsSync.existsSync(path)) {
|
|
||||||
files = { lossless: path, ...files }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (codec !== "normal") {
|
|
||||||
const artistPath = `${DATA_DIR}/normal/${dbAlbum.artist.folder}`
|
|
||||||
const albumPath = `${artistPath}/${dbAlbum.folder}`
|
|
||||||
const path = `${albumPath}/${song}`
|
|
||||||
|
|
||||||
if (fsSync.existsSync(path)) {
|
|
||||||
files = { normal: path, ...files }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
newSongs.push({
|
|
||||||
name: metadata.common.title,
|
|
||||||
files,
|
|
||||||
album: dbAlbum._id,
|
|
||||||
artist:
|
|
||||||
metadata.common.artist ??
|
|
||||||
metadata.common.artists ??
|
|
||||||
dbAlbum.artist.name,
|
|
||||||
albumArtist: dbAlbum.artist._id,
|
|
||||||
length: Math.round(metadata.format.duration || 0),
|
|
||||||
diskNumber:
|
|
||||||
metadata.common.disk.of === 1
|
|
||||||
? null
|
|
||||||
: metadata.common.disk.no,
|
|
||||||
track: metadata.common.track.no || 0,
|
|
||||||
year: metadata.common.year || 2026,
|
|
||||||
date:
|
|
||||||
metadata.common.date ||
|
|
||||||
`01-01-${metadata.common.year || 2026}`,
|
|
||||||
genres: metadata.common.genre || [],
|
|
||||||
})
|
|
||||||
}
|
|
||||||
} catch {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
await ctx.runMutation(internal.library.createSongs, { songs: newSongs })
|
|
||||||
await ctx.runMutation(internal.library.changeFilesForSongs, {
|
|
||||||
songs: updateSongs,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
return "success"
|
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -574,7 +556,13 @@ export const updateLibrary = action({
|
|||||||
args: {},
|
args: {},
|
||||||
handler: async (ctx): Promise<string> => {
|
handler: async (ctx): Promise<string> => {
|
||||||
await requireAdmin(ctx)
|
await requireAdmin(ctx)
|
||||||
return ctx.runAction(internal.actions.scheduledUpdateLibrary)
|
const result: string | null = await ctx.runAction(
|
||||||
|
internal.actions.scheduledUpdateLibrary
|
||||||
|
)
|
||||||
|
if (result === null) {
|
||||||
|
throw new ConvexError("A library scan is already running")
|
||||||
|
}
|
||||||
|
return result
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
@@ -9,4 +9,10 @@ crons.interval(
|
|||||||
internal.actions.scheduledUpdateLibrary
|
internal.actions.scheduledUpdateLibrary
|
||||||
)
|
)
|
||||||
|
|
||||||
|
crons.daily(
|
||||||
|
"prune Siri catalog change log",
|
||||||
|
{ hourUTC: 9, minuteUTC: 0 },
|
||||||
|
internal.intentCatalogChanges.pruneIntentCatalogChanges
|
||||||
|
)
|
||||||
|
|
||||||
export default crons
|
export default crons
|
||||||
@@ -0,0 +1,337 @@
|
|||||||
|
import { getAuthUserId } from "@convex-dev/auth/server"
|
||||||
|
import { paginationOptsValidator } from "convex/server"
|
||||||
|
import { ConvexError, v } from "convex/values"
|
||||||
|
import type { Doc, Id } from "./_generated/dataModel"
|
||||||
|
import { query, type QueryCtx } from "./_generated/server"
|
||||||
|
import {
|
||||||
|
INTENT_CATALOG_CHANGE_RETENTION_MS,
|
||||||
|
type LibraryCatalogKind,
|
||||||
|
} from "./intentCatalogChanges"
|
||||||
|
import { getSongArtistNames, songArtistsMatchAlbum } from "./library"
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Siri/App Intents entity catalog. Library records carry no per-user state, so
|
||||||
|
* clients sync them incrementally and overlay favorites locally.
|
||||||
|
*/
|
||||||
|
|
||||||
|
const FAVORITES_PLAYLIST_ID = "otunes:favorites"
|
||||||
|
/** More changes than this since a client's cursor and it rebuilds instead. */
|
||||||
|
const MAX_CHANGES_PER_SYNC = 2000
|
||||||
|
|
||||||
|
const libraryKindValidator = v.union(
|
||||||
|
v.literal("song"),
|
||||||
|
v.literal("album"),
|
||||||
|
v.literal("artist")
|
||||||
|
)
|
||||||
|
|
||||||
|
type IntentEntity = {
|
||||||
|
id: string
|
||||||
|
title: string
|
||||||
|
subtitle?: string
|
||||||
|
synonyms?: string[]
|
||||||
|
metadata: Record<string, string>
|
||||||
|
}
|
||||||
|
|
||||||
|
async function requireUser(ctx: QueryCtx) {
|
||||||
|
const userId = await getAuthUserId(ctx)
|
||||||
|
if (!userId) throw new ConvexError("Not authenticated")
|
||||||
|
return userId
|
||||||
|
}
|
||||||
|
|
||||||
|
function unique<T>(values: T[]) {
|
||||||
|
return [...new Set(values)]
|
||||||
|
}
|
||||||
|
|
||||||
|
async function getMany<Table extends "albums" | "artists" | "users">(
|
||||||
|
ctx: QueryCtx,
|
||||||
|
table: Table,
|
||||||
|
ids: Id<Table>[]
|
||||||
|
) {
|
||||||
|
const docs = await Promise.all(unique(ids).map((id) => ctx.db.get(table, id)))
|
||||||
|
return new Map(
|
||||||
|
docs.flatMap((doc) => (doc ? [[doc._id as Id<Table>, doc] as const] : []))
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
async function songEntities(ctx: QueryCtx, songs: Doc<"songs">[]) {
|
||||||
|
const [albums, artists] = await Promise.all([
|
||||||
|
getMany(
|
||||||
|
ctx,
|
||||||
|
"albums",
|
||||||
|
songs.map((song) => song.album)
|
||||||
|
),
|
||||||
|
getMany(
|
||||||
|
ctx,
|
||||||
|
"artists",
|
||||||
|
songs.map((song) => song.albumArtist)
|
||||||
|
),
|
||||||
|
])
|
||||||
|
return songs.flatMap((song): IntentEntity[] => {
|
||||||
|
const album = albums.get(song.album)
|
||||||
|
const artist = artists.get(song.albumArtist)
|
||||||
|
if (!album || !artist || !song.name.trim()) return []
|
||||||
|
const credits = getSongArtistNames(song.artist)
|
||||||
|
const artistName = songArtistsMatchAlbum(credits, artist.name)
|
||||||
|
? artist.name
|
||||||
|
: credits.join(", ") || artist.name
|
||||||
|
return [
|
||||||
|
{
|
||||||
|
id: song._id,
|
||||||
|
title: song.name,
|
||||||
|
subtitle: artistName,
|
||||||
|
metadata: {
|
||||||
|
artistName,
|
||||||
|
artistId: artist._id,
|
||||||
|
albumTitle: album.name,
|
||||||
|
albumId: album._id,
|
||||||
|
duration: String(Math.max(0, Math.round(song.length))),
|
||||||
|
genres: song.genres.join(", "),
|
||||||
|
year: song.year ? String(song.year) : "",
|
||||||
|
track: String(song.track),
|
||||||
|
disk: String(song.diskNumber ?? ""),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
]
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
async function albumEntities(ctx: QueryCtx, albums: Doc<"albums">[]) {
|
||||||
|
const artists = await getMany(
|
||||||
|
ctx,
|
||||||
|
"artists",
|
||||||
|
albums.map((album) => album.artist)
|
||||||
|
)
|
||||||
|
return albums.flatMap((album): IntentEntity[] => {
|
||||||
|
const artist = artists.get(album.artist)
|
||||||
|
if (!artist || !album.name.trim()) return []
|
||||||
|
return [
|
||||||
|
{
|
||||||
|
id: album._id,
|
||||||
|
title: album.name,
|
||||||
|
subtitle: artist.name,
|
||||||
|
metadata: {
|
||||||
|
artistName: artist.name,
|
||||||
|
artistId: artist._id,
|
||||||
|
year: album.year ? String(album.year) : "",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
]
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
function artistEntities(artists: Doc<"artists">[]) {
|
||||||
|
return artists.flatMap((artist): IntentEntity[] =>
|
||||||
|
artist.name.trim()
|
||||||
|
? [{ id: artist._id, title: artist.name, metadata: {} }]
|
||||||
|
: []
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Rows in `ids` not already in `rows`, so renamed records are re-sent. */
|
||||||
|
async function withUpdatedRows<Row extends { _id: string }>(
|
||||||
|
rows: Row[],
|
||||||
|
ids: string[],
|
||||||
|
load: (id: string) => Promise<Row | null>
|
||||||
|
) {
|
||||||
|
const seen = new Set(rows.map((row) => row._id))
|
||||||
|
const updated: (Row | null)[] = await Promise.all(
|
||||||
|
ids.filter((id) => !seen.has(id)).map(load)
|
||||||
|
)
|
||||||
|
return [...rows, ...updated.flatMap((row) => (row ? [row] : []))]
|
||||||
|
}
|
||||||
|
|
||||||
|
async function newestCreationTime(ctx: QueryCtx, kind: LibraryCatalogKind) {
|
||||||
|
const table =
|
||||||
|
kind === "song" ? "songs" : kind === "album" ? "albums" : "artists"
|
||||||
|
const [row, change] = await Promise.all([
|
||||||
|
ctx.db.query(table).order("desc").first(),
|
||||||
|
ctx.db
|
||||||
|
.query("intentCatalogChanges")
|
||||||
|
.withIndex("by_kind", (q) => q.eq("kind", kind))
|
||||||
|
.order("desc")
|
||||||
|
.first(),
|
||||||
|
])
|
||||||
|
return Math.max(row?._creationTime ?? 0, change?._creationTime ?? 0)
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Newest insert, rename or deletion per kind. Clients subscribe to this and
|
||||||
|
* fetch a kind only after it moves past their cursor.
|
||||||
|
*/
|
||||||
|
export const head = query({
|
||||||
|
args: {},
|
||||||
|
handler: async (ctx) => {
|
||||||
|
await requireUser(ctx)
|
||||||
|
const [song, album, artist] = await Promise.all([
|
||||||
|
newestCreationTime(ctx, "song"),
|
||||||
|
newestCreationTime(ctx, "album"),
|
||||||
|
newestCreationTime(ctx, "artist"),
|
||||||
|
])
|
||||||
|
return { song, album, artist }
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
/**
|
||||||
|
* One page of catalog records. Without `since` it walks the whole library;
|
||||||
|
* with it, only records created, renamed or removed after `since`. The first
|
||||||
|
* page reports `head`, the cursor to resume from once every page is read, and
|
||||||
|
* `reset` when the change log no longer covers `since` (stale or too many
|
||||||
|
* changes); the client then rebuilds without `since`.
|
||||||
|
*/
|
||||||
|
export const page = query({
|
||||||
|
args: {
|
||||||
|
kind: libraryKindValidator,
|
||||||
|
since: v.optional(v.number()),
|
||||||
|
paginationOpts: paginationOptsValidator,
|
||||||
|
},
|
||||||
|
handler: async (ctx, { kind, since, paginationOpts }) => {
|
||||||
|
await requireUser(ctx)
|
||||||
|
const firstPage = paginationOpts.cursor === null
|
||||||
|
let removed: string[] = []
|
||||||
|
let updatedIds: string[] = []
|
||||||
|
if (firstPage && since !== undefined) {
|
||||||
|
const changes = await ctx.db
|
||||||
|
.query("intentCatalogChanges")
|
||||||
|
.withIndex("by_kind", (q) =>
|
||||||
|
q.eq("kind", kind).gt("_creationTime", since)
|
||||||
|
)
|
||||||
|
.take(MAX_CHANGES_PER_SYNC + 1)
|
||||||
|
// Pruning may have dropped deletions older than the retention window.
|
||||||
|
const expired = since < Date.now() - INTENT_CATALOG_CHANGE_RETENTION_MS
|
||||||
|
if (expired || changes.length > MAX_CHANGES_PER_SYNC) {
|
||||||
|
return {
|
||||||
|
page: [],
|
||||||
|
isDone: true,
|
||||||
|
continueCursor: "",
|
||||||
|
head: await newestCreationTime(ctx, kind),
|
||||||
|
removed,
|
||||||
|
reset: true,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
removed = unique(
|
||||||
|
changes.filter((change) => change.removed).map((c) => c.entityId)
|
||||||
|
)
|
||||||
|
const removedIds = new Set(removed)
|
||||||
|
updatedIds = unique(
|
||||||
|
changes
|
||||||
|
.filter((change) => !removedIds.has(change.entityId))
|
||||||
|
.map((change) => change.entityId)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
const head = firstPage ? await newestCreationTime(ctx, kind) : undefined
|
||||||
|
|
||||||
|
const respond = (
|
||||||
|
rows: { isDone: boolean; continueCursor: string },
|
||||||
|
page: IntentEntity[]
|
||||||
|
) => ({
|
||||||
|
page,
|
||||||
|
isDone: rows.isDone,
|
||||||
|
continueCursor: rows.continueCursor,
|
||||||
|
head,
|
||||||
|
removed,
|
||||||
|
reset: false,
|
||||||
|
})
|
||||||
|
// Rows created after `since`, or every row when it is omitted.
|
||||||
|
if (kind === "song") {
|
||||||
|
const query = ctx.db.query("songs")
|
||||||
|
const rows = await (
|
||||||
|
since === undefined
|
||||||
|
? query
|
||||||
|
: query.withIndex("by_creation_time", (q) =>
|
||||||
|
q.gt("_creationTime", since)
|
||||||
|
)
|
||||||
|
).paginate(paginationOpts)
|
||||||
|
const docs = await withUpdatedRows(rows.page, updatedIds, (id) => {
|
||||||
|
const songId = ctx.db.normalizeId("songs", id)
|
||||||
|
return songId ? ctx.db.get("songs", songId) : Promise.resolve(null)
|
||||||
|
})
|
||||||
|
return respond(rows, await songEntities(ctx, docs))
|
||||||
|
}
|
||||||
|
if (kind === "album") {
|
||||||
|
const query = ctx.db.query("albums")
|
||||||
|
const rows = await (
|
||||||
|
since === undefined
|
||||||
|
? query
|
||||||
|
: query.withIndex("by_creation_time", (q) =>
|
||||||
|
q.gt("_creationTime", since)
|
||||||
|
)
|
||||||
|
).paginate(paginationOpts)
|
||||||
|
const docs = await withUpdatedRows(rows.page, updatedIds, (id) => {
|
||||||
|
const albumId = ctx.db.normalizeId("albums", id)
|
||||||
|
return albumId ? ctx.db.get("albums", albumId) : Promise.resolve(null)
|
||||||
|
})
|
||||||
|
return respond(rows, await albumEntities(ctx, docs))
|
||||||
|
}
|
||||||
|
const query = ctx.db.query("artists")
|
||||||
|
const rows = await (
|
||||||
|
since === undefined
|
||||||
|
? query
|
||||||
|
: query.withIndex("by_creation_time", (q) =>
|
||||||
|
q.gt("_creationTime", since)
|
||||||
|
)
|
||||||
|
).paginate(paginationOpts)
|
||||||
|
const docs = await withUpdatedRows(rows.page, updatedIds, (id) => {
|
||||||
|
const artistId = ctx.db.normalizeId("artists", id)
|
||||||
|
return artistId ? ctx.db.get("artists", artistId) : Promise.resolve(null)
|
||||||
|
})
|
||||||
|
return respond(rows, artistEntities(docs))
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
/** The signed-in user's own and subscribed playlists, plus Favorites. */
|
||||||
|
export const playlists = query({
|
||||||
|
args: {},
|
||||||
|
handler: async (ctx) => {
|
||||||
|
const userId = await requireUser(ctx)
|
||||||
|
const user = await ctx.db.get("users", userId)
|
||||||
|
if (!user) throw new ConvexError("Not authenticated")
|
||||||
|
const [owned, subscribed] = await Promise.all([
|
||||||
|
ctx.db
|
||||||
|
.query("playlists")
|
||||||
|
.withIndex("by_owner", (q) => q.eq("owner", userId))
|
||||||
|
.collect(),
|
||||||
|
Promise.all(
|
||||||
|
unique(user.subscribedPlaylists ?? []).map((id) =>
|
||||||
|
ctx.db.get("playlists", id)
|
||||||
|
)
|
||||||
|
),
|
||||||
|
])
|
||||||
|
const others = subscribed.filter(
|
||||||
|
(playlist): playlist is Doc<"playlists"> =>
|
||||||
|
playlist !== null && playlist.owner !== userId
|
||||||
|
)
|
||||||
|
const owners = await getMany(
|
||||||
|
ctx,
|
||||||
|
"users",
|
||||||
|
others.map((playlist) => playlist.owner)
|
||||||
|
)
|
||||||
|
owners.set(userId, user)
|
||||||
|
const entities: IntentEntity[] = [
|
||||||
|
{
|
||||||
|
id: FAVORITES_PLAYLIST_ID,
|
||||||
|
title: "Favorites",
|
||||||
|
synonyms: [
|
||||||
|
"favorites",
|
||||||
|
"favourite songs",
|
||||||
|
"liked songs",
|
||||||
|
"loved songs",
|
||||||
|
],
|
||||||
|
metadata: { ownerName: user.name, createdByMe: "1" },
|
||||||
|
},
|
||||||
|
]
|
||||||
|
for (const playlist of [...owned, ...others]) {
|
||||||
|
if (!playlist.name.trim()) continue
|
||||||
|
const ownerName = owners.get(playlist.owner)?.name ?? ""
|
||||||
|
entities.push({
|
||||||
|
id: playlist._id,
|
||||||
|
title: playlist.name,
|
||||||
|
subtitle: ownerName,
|
||||||
|
metadata: {
|
||||||
|
ownerName,
|
||||||
|
createdByMe: playlist.owner === userId ? "1" : "0",
|
||||||
|
},
|
||||||
|
})
|
||||||
|
}
|
||||||
|
return entities
|
||||||
|
},
|
||||||
|
})
|
||||||
@@ -0,0 +1,40 @@
|
|||||||
|
import { internal } from "./_generated/api"
|
||||||
|
import { internalMutation, type MutationCtx } from "./_generated/server"
|
||||||
|
|
||||||
|
export type LibraryCatalogKind = "song" | "album" | "artist"
|
||||||
|
|
||||||
|
/** Clients that last synced before this must rebuild their catalog from scratch. */
|
||||||
|
export const INTENT_CATALOG_CHANGE_RETENTION_MS = 30 * 24 * 60 * 60_000
|
||||||
|
const PRUNE_BATCH = 500
|
||||||
|
|
||||||
|
export async function recordIntentCatalogChanges(
|
||||||
|
ctx: MutationCtx,
|
||||||
|
kind: LibraryCatalogKind,
|
||||||
|
entityIds: string[],
|
||||||
|
removed: boolean
|
||||||
|
) {
|
||||||
|
for (const entityId of entityIds) {
|
||||||
|
await ctx.db.insert("intentCatalogChanges", { kind, entityId, removed })
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export const pruneIntentCatalogChanges = internalMutation({
|
||||||
|
args: {},
|
||||||
|
handler: async (ctx) => {
|
||||||
|
const cutoff = Date.now() - INTENT_CATALOG_CHANGE_RETENTION_MS
|
||||||
|
const stale = await ctx.db
|
||||||
|
.query("intentCatalogChanges")
|
||||||
|
.withIndex("by_creation_time", (q) => q.lt("_creationTime", cutoff))
|
||||||
|
.take(PRUNE_BATCH)
|
||||||
|
for (const change of stale) {
|
||||||
|
await ctx.db.delete("intentCatalogChanges", change._id)
|
||||||
|
}
|
||||||
|
if (stale.length === PRUNE_BATCH) {
|
||||||
|
await ctx.scheduler.runAfter(
|
||||||
|
0,
|
||||||
|
internal.intentCatalogChanges.pruneIntentCatalogChanges,
|
||||||
|
{}
|
||||||
|
)
|
||||||
|
}
|
||||||
|
},
|
||||||
|
})
|
||||||
@@ -0,0 +1,138 @@
|
|||||||
|
const { test } = require("node:test")
|
||||||
|
const assert = require("node:assert/strict")
|
||||||
|
const fs = require("node:fs/promises")
|
||||||
|
const path = require("node:path")
|
||||||
|
const os = require("node:os")
|
||||||
|
const vm = require("node:vm")
|
||||||
|
const ts = require("typescript")
|
||||||
|
|
||||||
|
// Exercise the action against real directory listings without a backend or
|
||||||
|
// audio decoder. Metadata is fixed so renames and same-title copies match.
|
||||||
|
async function scanner(root) {
|
||||||
|
const module = { exports: {} }
|
||||||
|
const source = ts.transpileModule(
|
||||||
|
await fs.readFile(`${__dirname}/actions.ts`, "utf8"),
|
||||||
|
{
|
||||||
|
compilerOptions: {
|
||||||
|
module: ts.ModuleKind.CommonJS,
|
||||||
|
target: ts.ScriptTarget.ES2022,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
).outputText
|
||||||
|
const library = new Proxy({}, { get: (_, name) => name })
|
||||||
|
vm.runInNewContext(source, {
|
||||||
|
module,
|
||||||
|
exports: module.exports,
|
||||||
|
process: { env: { DATA: root } },
|
||||||
|
crypto: require("node:crypto"),
|
||||||
|
console: { log() {} },
|
||||||
|
require(name) {
|
||||||
|
if (name.startsWith("node:")) return require(name)
|
||||||
|
if (name === "convex/values") return require(name)
|
||||||
|
if (name === "./_generated/api") return { api: {}, internal: { library } }
|
||||||
|
if (name === "./_generated/server")
|
||||||
|
return { action: (x) => x, internalAction: (x) => x }
|
||||||
|
if (name === "music-metadata")
|
||||||
|
return {
|
||||||
|
parseFile: async () => ({
|
||||||
|
common: { title: "Song", disk: {}, track: {} },
|
||||||
|
format: { duration: 60 },
|
||||||
|
}),
|
||||||
|
}
|
||||||
|
throw new Error(`Unexpected import ${name}`)
|
||||||
|
},
|
||||||
|
})
|
||||||
|
return module.exports.scheduledUpdateLibrary.handler
|
||||||
|
}
|
||||||
|
|
||||||
|
test("rescans keep tracked songs and covers stable, and a rename keeps the song ID", async (t) => {
|
||||||
|
const root = await fs.mkdtemp(path.join(os.tmpdir(), "otunes-scan-"))
|
||||||
|
t.after(() => fs.rm(root, { recursive: true, force: true }))
|
||||||
|
const folder = (codec) => path.join(root, codec, "The Abnormals", "Album")
|
||||||
|
for (const codec of ["normal", "lossless"]) {
|
||||||
|
await fs.mkdir(folder(codec), { recursive: true })
|
||||||
|
await fs.writeFile(path.join(folder(codec), "song.mp3"), "audio")
|
||||||
|
await fs.writeFile(path.join(folder(codec), "cover.jpg"), "cover")
|
||||||
|
await fs.writeFile(path.join(folder(codec), "..", "folder.jpg"), "cover")
|
||||||
|
}
|
||||||
|
const artists = [
|
||||||
|
{
|
||||||
|
_id: "artist",
|
||||||
|
name: "The Abnormals",
|
||||||
|
folder: "The Abnormals",
|
||||||
|
cover: path.join(root, "lossless", "The Abnormals", "folder.jpg"),
|
||||||
|
},
|
||||||
|
]
|
||||||
|
const albums = [
|
||||||
|
{
|
||||||
|
_id: "album",
|
||||||
|
artist: "artist",
|
||||||
|
folder: "Album",
|
||||||
|
cover: path.join(folder("lossless"), "cover.jpg"),
|
||||||
|
},
|
||||||
|
]
|
||||||
|
const songs = [
|
||||||
|
{
|
||||||
|
_id: "song",
|
||||||
|
name: "Song",
|
||||||
|
album: "album",
|
||||||
|
files: Object.fromEntries(
|
||||||
|
["normal", "lossless"].map((c) => [c, path.join(folder(c), "song.mp3")])
|
||||||
|
),
|
||||||
|
},
|
||||||
|
]
|
||||||
|
const writes = []
|
||||||
|
let locked = false
|
||||||
|
const ctx = {
|
||||||
|
async runQuery(name) {
|
||||||
|
const page = {
|
||||||
|
scanArtistsPage: artists,
|
||||||
|
scanAlbumsPage: albums,
|
||||||
|
scanSongsPage: songs,
|
||||||
|
}[name]
|
||||||
|
assert.ok(page, name)
|
||||||
|
return { page, isDone: true, continueCursor: "" }
|
||||||
|
},
|
||||||
|
async runMutation(name, args) {
|
||||||
|
if (name === "acquireLibraryScanLock") return !locked
|
||||||
|
if (name === "releaseLibraryScanLock") return
|
||||||
|
writes.push({ name, args })
|
||||||
|
if (name === "changeFilesForSongs") {
|
||||||
|
for (const update of args.songs)
|
||||||
|
songs.find((s) => s._id === update.id).files = update.files
|
||||||
|
return
|
||||||
|
}
|
||||||
|
throw new Error(`Unexpected write ${name}`)
|
||||||
|
},
|
||||||
|
}
|
||||||
|
const scan = await scanner(root)
|
||||||
|
await scan(ctx)
|
||||||
|
assert.equal(writes.length, 0)
|
||||||
|
await fs.writeFile(path.join(folder("normal"), "copy.mp3"), "audio")
|
||||||
|
await scan(ctx)
|
||||||
|
await scan(ctx)
|
||||||
|
assert.equal(writes.length, 0)
|
||||||
|
await fs.rm(path.join(folder("normal"), "copy.mp3"))
|
||||||
|
await fs.rename(
|
||||||
|
path.join(folder("normal"), "song.mp3"),
|
||||||
|
path.join(folder("normal"), "renamed.mp3")
|
||||||
|
)
|
||||||
|
await scan(ctx)
|
||||||
|
assert.equal(writes.length, 1)
|
||||||
|
assert.equal(writes[0].args.songs[0].id, "song")
|
||||||
|
assert.equal(
|
||||||
|
songs[0].files.normal,
|
||||||
|
path.join(folder("normal"), "renamed.mp3")
|
||||||
|
)
|
||||||
|
await scan(ctx)
|
||||||
|
assert.equal(writes.length, 1)
|
||||||
|
locked = true
|
||||||
|
assert.equal(await scan(ctx), null)
|
||||||
|
assert.equal(writes.length, 1)
|
||||||
|
locked = false
|
||||||
|
for (const codec of ["normal", "lossless"]) {
|
||||||
|
await fs.rm(folder(codec), { recursive: true })
|
||||||
|
}
|
||||||
|
await assert.rejects(scan(ctx), /refusing to empty the library/)
|
||||||
|
assert.equal(writes.length, 1)
|
||||||
|
})
|
||||||
+313
-332
@@ -3,7 +3,7 @@ import { getAuthUserId } from "@convex-dev/auth/server"
|
|||||||
import { internalMutation, internalQuery, query } from "./_generated/server"
|
import { internalMutation, internalQuery, query } from "./_generated/server"
|
||||||
import { ConvexError, v } from "convex/values"
|
import { ConvexError, v } from "convex/values"
|
||||||
import type { Doc, Id } from "./_generated/dataModel"
|
import type { Doc, Id } from "./_generated/dataModel"
|
||||||
import type { QueryCtx } from "./_generated/server"
|
import type { MutationCtx, QueryCtx } from "./_generated/server"
|
||||||
import type { PaginationOptions, PaginationResult } from "convex/server"
|
import type { PaginationOptions, PaginationResult } from "convex/server"
|
||||||
import type {
|
import type {
|
||||||
BrowseAlbum,
|
BrowseAlbum,
|
||||||
@@ -21,6 +21,7 @@ import type {
|
|||||||
SearchTopResultItem,
|
SearchTopResultItem,
|
||||||
SidebarPlaylists,
|
SidebarPlaylists,
|
||||||
} from "./types"
|
} from "./types"
|
||||||
|
import { recordIntentCatalogChanges } from "./intentCatalogChanges"
|
||||||
|
|
||||||
export type {
|
export type {
|
||||||
BrowseAlbum,
|
BrowseAlbum,
|
||||||
@@ -53,7 +54,7 @@ export async function requireSignedIn(ctx: QueryCtx) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function getSongArtistNames(artist: string | string[]): string[] {
|
export function getSongArtistNames(artist: string | string[]): string[] {
|
||||||
if (Array.isArray(artist)) {
|
if (Array.isArray(artist)) {
|
||||||
return artist.map((name) => name.trim()).filter((name) => name.length > 0)
|
return artist.map((name) => name.trim()).filter((name) => name.length > 0)
|
||||||
}
|
}
|
||||||
@@ -61,7 +62,7 @@ function getSongArtistNames(artist: string | string[]): string[] {
|
|||||||
return trimmed.length > 0 ? [trimmed] : []
|
return trimmed.length > 0 ? [trimmed] : []
|
||||||
}
|
}
|
||||||
|
|
||||||
function songArtistsMatchAlbum(
|
export function songArtistsMatchAlbum(
|
||||||
songArtists: string[],
|
songArtists: string[],
|
||||||
albumArtistName: string
|
albumArtistName: string
|
||||||
): boolean {
|
): boolean {
|
||||||
@@ -544,7 +545,7 @@ export const browseAlbumDetail = query({
|
|||||||
|
|
||||||
return {
|
return {
|
||||||
...toBrowseAlbum(album, artist),
|
...toBrowseAlbum(album, artist),
|
||||||
year: primarySong?.year ?? null,
|
year: primarySong?.year || null,
|
||||||
genre: primarySong?.genres[0] ?? null,
|
genre: primarySong?.genres[0] ?? null,
|
||||||
releaseDate: album.date,
|
releaseDate: album.date,
|
||||||
hasLossless: songs.some((song) => "lossless" in song.files),
|
hasLossless: songs.some((song) => "lossless" in song.files),
|
||||||
@@ -844,27 +845,55 @@ export const browseRecentlyPlayedPaginated = query({
|
|||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
export const getArtists = internalQuery({
|
export const scanArtistsPage = internalQuery({
|
||||||
args: {},
|
args: { paginationOpts: paginationOptsValidator },
|
||||||
handler: async (ctx) => {
|
handler: async (ctx, args) => {
|
||||||
return await ctx.db.query("artists").collect()
|
const result = await ctx.db.query("artists").paginate(args.paginationOpts)
|
||||||
|
return {
|
||||||
|
...result,
|
||||||
|
page: result.page.map(({ _id, name, folder, cover }) => ({
|
||||||
|
_id,
|
||||||
|
name,
|
||||||
|
folder,
|
||||||
|
cover,
|
||||||
|
})),
|
||||||
|
}
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
export const getAlbums = internalQuery({
|
export const scanAlbumsPage = internalQuery({
|
||||||
args: {},
|
args: { paginationOpts: paginationOptsValidator },
|
||||||
handler: async (ctx) => {
|
handler: async (ctx, args) => {
|
||||||
return await ctx.db.query("albums").collect()
|
const result = await ctx.db.query("albums").paginate(args.paginationOpts)
|
||||||
|
return {
|
||||||
|
...result,
|
||||||
|
page: result.page.map(({ _id, folder, cover, artist }) => ({
|
||||||
|
_id,
|
||||||
|
folder,
|
||||||
|
cover,
|
||||||
|
artist,
|
||||||
|
})),
|
||||||
|
}
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
export const getSongs = internalQuery({
|
export const scanSongsPage = internalQuery({
|
||||||
args: {},
|
args: { paginationOpts: paginationOptsValidator },
|
||||||
handler: async (ctx) => {
|
handler: async (ctx, args) => {
|
||||||
return await ctx.db.query("songs").collect()
|
const result = await ctx.db.query("songs").paginate(args.paginationOpts)
|
||||||
|
return {
|
||||||
|
...result,
|
||||||
|
page: result.page.map(({ _id, name, files, album }) => ({
|
||||||
|
_id,
|
||||||
|
name,
|
||||||
|
files,
|
||||||
|
album,
|
||||||
|
})),
|
||||||
|
}
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
/** Public: share-link previews load covers without a session. */
|
/** Public: share-link previews load covers without a session. */
|
||||||
export const getArtistCover = query({
|
export const getArtistCover = query({
|
||||||
args: { id: v.id("artists") },
|
args: { id: v.id("artists") },
|
||||||
@@ -961,347 +990,260 @@ export const getSongsForPlayback = query({
|
|||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
const FAVORITES_PLAYLIST_ID = "otunes:favorites"
|
/**
|
||||||
|
* Creates (or reuses, matched by folder) the artist and album for each entry
|
||||||
/** Bounded pages for the device's disk-backed Siri catalog. */
|
* together with its songs, so an album never exists without songs.
|
||||||
export const intentCatalogPage = query({
|
*/
|
||||||
args: {
|
export const importAlbums = internalMutation({
|
||||||
kind: v.union(
|
|
||||||
v.literal("song"),
|
|
||||||
v.literal("album"),
|
|
||||||
v.literal("artist"),
|
|
||||||
v.literal("playlist")
|
|
||||||
),
|
|
||||||
paginationOpts: paginationOptsValidator,
|
|
||||||
},
|
|
||||||
handler: async (ctx, { kind, paginationOpts }) => {
|
|
||||||
const userId = await getAuthUserId(ctx)
|
|
||||||
if (!userId) throw new ConvexError("Not authenticated")
|
|
||||||
const user = await ctx.db.get("users", userId)
|
|
||||||
if (!user) throw new ConvexError("Not authenticated")
|
|
||||||
type Entity = {
|
|
||||||
id: string
|
|
||||||
title: string
|
|
||||||
subtitle?: string
|
|
||||||
synonyms?: string[]
|
|
||||||
metadata: Record<string, string>
|
|
||||||
}
|
|
||||||
const page: Entity[] = []
|
|
||||||
if (kind === "song") {
|
|
||||||
const result = await ctx.db.query("songs").paginate(paginationOpts)
|
|
||||||
for (const song of result.page) {
|
|
||||||
const album = await ctx.db.get("albums", song.album)
|
|
||||||
const artist = await ctx.db.get("artists", song.albumArtist)
|
|
||||||
if (!album || !artist || !song.name.trim()) continue
|
|
||||||
const credits = getSongArtistNames(song.artist)
|
|
||||||
const artistName = songArtistsMatchAlbum(credits, artist.name)
|
|
||||||
? artist.name
|
|
||||||
: credits.join(", ") || artist.name
|
|
||||||
page.push({
|
|
||||||
id: song._id,
|
|
||||||
title: song.name,
|
|
||||||
subtitle: artistName,
|
|
||||||
metadata: {
|
|
||||||
artistName,
|
|
||||||
artistId: artist._id,
|
|
||||||
albumTitle: album.name,
|
|
||||||
albumId: album._id,
|
|
||||||
duration: String(Math.max(0, Math.round(song.length))),
|
|
||||||
genres: song.genres.join(", "),
|
|
||||||
year: String(song.year),
|
|
||||||
track: String(song.track),
|
|
||||||
disk: String(song.diskNumber ?? ""),
|
|
||||||
favorite: user.favoriteSongs?.includes(song._id) ? "1" : "0",
|
|
||||||
},
|
|
||||||
})
|
|
||||||
}
|
|
||||||
return { ...result, page }
|
|
||||||
}
|
|
||||||
if (kind === "album") {
|
|
||||||
const result = await ctx.db.query("albums").paginate(paginationOpts)
|
|
||||||
for (const album of result.page) {
|
|
||||||
const artist = await ctx.db.get("artists", album.artist)
|
|
||||||
if (!artist || !album.name.trim()) continue
|
|
||||||
page.push({
|
|
||||||
id: album._id,
|
|
||||||
title: album.name,
|
|
||||||
subtitle: artist.name,
|
|
||||||
metadata: {
|
|
||||||
artistName: artist.name,
|
|
||||||
artistId: artist._id,
|
|
||||||
year: String(album.year),
|
|
||||||
favorite: user.favoriteAlbums?.includes(album._id) ? "1" : "0",
|
|
||||||
},
|
|
||||||
})
|
|
||||||
}
|
|
||||||
return { ...result, page }
|
|
||||||
}
|
|
||||||
if (kind === "artist") {
|
|
||||||
const result = await ctx.db.query("artists").paginate(paginationOpts)
|
|
||||||
for (const artist of result.page) {
|
|
||||||
if (artist.name.trim())
|
|
||||||
page.push({
|
|
||||||
id: artist._id,
|
|
||||||
title: artist.name,
|
|
||||||
metadata: {
|
|
||||||
favorite: user.favoriteArtists?.includes(artist._id) ? "1" : "0",
|
|
||||||
},
|
|
||||||
})
|
|
||||||
}
|
|
||||||
return { ...result, page }
|
|
||||||
}
|
|
||||||
const result = await ctx.db.query("playlists").paginate(paginationOpts)
|
|
||||||
for (const playlist of result.page) {
|
|
||||||
if (
|
|
||||||
playlist.owner !== userId &&
|
|
||||||
!user.subscribedPlaylists?.includes(playlist._id)
|
|
||||||
)
|
|
||||||
continue
|
|
||||||
if (!playlist.name.trim()) continue
|
|
||||||
const owner = await ctx.db.get("users", playlist.owner)
|
|
||||||
page.push({
|
|
||||||
id: playlist._id,
|
|
||||||
title: playlist.name,
|
|
||||||
subtitle: owner?.name ?? "",
|
|
||||||
metadata: {
|
|
||||||
ownerName: owner?.name ?? "",
|
|
||||||
createdByMe: playlist.owner === userId ? "1" : "0",
|
|
||||||
},
|
|
||||||
})
|
|
||||||
}
|
|
||||||
if (paginationOpts.cursor === null)
|
|
||||||
page.unshift({
|
|
||||||
id: FAVORITES_PLAYLIST_ID,
|
|
||||||
title: "Favorites",
|
|
||||||
synonyms: [
|
|
||||||
"favorites",
|
|
||||||
"favourite songs",
|
|
||||||
"liked songs",
|
|
||||||
"loved songs",
|
|
||||||
],
|
|
||||||
metadata: { ownerName: user.name, createdByMe: "1" },
|
|
||||||
})
|
|
||||||
return { ...result, page }
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
export const createArtists = internalMutation({
|
|
||||||
args: {
|
|
||||||
artists: v.array(
|
|
||||||
v.object({
|
|
||||||
name: v.string(),
|
|
||||||
folder: v.string(),
|
|
||||||
cover: v.nullable(v.string()),
|
|
||||||
})
|
|
||||||
),
|
|
||||||
},
|
|
||||||
handler: async (ctx, args) => {
|
|
||||||
for (const artist of args.artists) {
|
|
||||||
const existing = await ctx.db
|
|
||||||
.query("artists")
|
|
||||||
.withIndex("by_folder", (q) => q.eq("folder", artist.folder))
|
|
||||||
.first()
|
|
||||||
if (existing) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
await ctx.db.insert("artists", artist)
|
|
||||||
}
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
export const createAlbums = internalMutation({
|
|
||||||
args: {
|
args: {
|
||||||
albums: v.array(
|
albums: v.array(
|
||||||
v.object({
|
v.object({
|
||||||
name: v.string(),
|
artist: v.object({
|
||||||
folder: v.string(),
|
name: v.string(),
|
||||||
cover: v.nullable(v.string()),
|
folder: v.string(),
|
||||||
year: v.number(),
|
cover: v.nullable(v.string()),
|
||||||
date: v.string(),
|
}),
|
||||||
artist: v.id("artists"),
|
album: v.object({
|
||||||
|
name: v.string(),
|
||||||
|
folder: v.string(),
|
||||||
|
cover: v.nullable(v.string()),
|
||||||
|
year: v.number(),
|
||||||
|
date: v.string(),
|
||||||
|
}),
|
||||||
|
songs: v.array(
|
||||||
|
v.object({
|
||||||
|
name: v.string(),
|
||||||
|
files: v.record(v.string(), v.string()),
|
||||||
|
artist: v.union(v.string(), v.array(v.string())),
|
||||||
|
length: v.number(),
|
||||||
|
diskNumber: v.nullable(v.number()),
|
||||||
|
track: v.number(),
|
||||||
|
year: v.number(),
|
||||||
|
date: v.string(),
|
||||||
|
genres: v.array(v.string()),
|
||||||
|
})
|
||||||
|
),
|
||||||
})
|
})
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
handler: async (ctx, args) => {
|
handler: async (ctx, args) => {
|
||||||
for (const album of args.albums) {
|
for (const entry of args.albums) {
|
||||||
const existing = await ctx.db
|
if (entry.songs.length === 0) {
|
||||||
.query("albums")
|
|
||||||
.withIndex("by_all", (q) =>
|
|
||||||
q.eq("artist", album.artist).eq("folder", album.folder)
|
|
||||||
)
|
|
||||||
.first()
|
|
||||||
if (existing) {
|
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
await ctx.db.insert("albums", album)
|
|
||||||
}
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
export const createSongs = internalMutation({
|
const artistId =
|
||||||
args: {
|
(
|
||||||
songs: v.array(
|
await ctx.db
|
||||||
v.object({
|
.query("artists")
|
||||||
name: v.string(),
|
.withIndex("by_folder", (q) => q.eq("folder", entry.artist.folder))
|
||||||
files: v.record(v.string(), v.string()),
|
.first()
|
||||||
album: v.id("albums"),
|
)?._id ?? (await ctx.db.insert("artists", entry.artist))
|
||||||
artist: v.union(v.string(), v.array(v.string())),
|
|
||||||
albumArtist: v.id("artists"),
|
const albumId =
|
||||||
length: v.number(),
|
(
|
||||||
diskNumber: v.nullable(v.number()),
|
await ctx.db
|
||||||
track: v.number(),
|
.query("albums")
|
||||||
year: v.number(),
|
.withIndex("by_all", (q) =>
|
||||||
date: v.string(),
|
q.eq("artist", artistId).eq("folder", entry.album.folder)
|
||||||
genres: v.array(v.string()),
|
)
|
||||||
})
|
.first()
|
||||||
),
|
)?._id ??
|
||||||
},
|
(await ctx.db.insert("albums", { ...entry.album, artist: artistId }))
|
||||||
handler: async (ctx, args) => {
|
|
||||||
for (const song of args.songs) {
|
for (const song of entry.songs) {
|
||||||
const existing = await ctx.db
|
const existing = await ctx.db
|
||||||
.query("songs")
|
.query("songs")
|
||||||
.withIndex("by_all", (q) =>
|
.withIndex("by_all", (q) =>
|
||||||
q
|
q
|
||||||
.eq("name", song.name)
|
.eq("name", song.name)
|
||||||
.eq("albumArtist", song.albumArtist)
|
.eq("albumArtist", artistId)
|
||||||
.eq("album", song.album)
|
.eq("album", albumId)
|
||||||
)
|
)
|
||||||
.first()
|
.first()
|
||||||
if (existing) {
|
if (existing) {
|
||||||
await ctx.db.patch(existing._id, {
|
await ctx.db.patch(existing._id, {
|
||||||
files: { ...existing.files, ...song.files },
|
files: { ...existing.files, ...song.files },
|
||||||
|
})
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
await ctx.db.insert("songs", {
|
||||||
|
...song,
|
||||||
|
album: albumId,
|
||||||
|
albumArtist: artistId,
|
||||||
})
|
})
|
||||||
continue
|
|
||||||
}
|
}
|
||||||
await ctx.db.insert("songs", song)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return
|
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
export const purgeSongsFromUsersAndPlaylists = internalMutation({
|
/** Deletes songs and removes them from every playlist, favorite and queue. */
|
||||||
|
export const deleteSongs = internalMutation({
|
||||||
args: { ids: v.array(v.id("songs")) },
|
args: { ids: v.array(v.id("songs")) },
|
||||||
handler: async (ctx, args) => {
|
handler: async (ctx, args) => {
|
||||||
const remove = new Set(args.ids)
|
for (const id of args.ids) {
|
||||||
if (remove.size === 0) {
|
await ctx.db.delete("songs", id)
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
for (const playlist of await ctx.db.query("playlists").collect()) {
|
|
||||||
if (playlist.songs.some((songId) => remove.has(songId))) {
|
|
||||||
await ctx.db.patch(playlist._id, {
|
|
||||||
songs: playlist.songs.filter((songId) => !remove.has(songId)),
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
for (const user of await ctx.db.query("users").collect()) {
|
|
||||||
const favoriteSongs = user.favoriteSongs
|
|
||||||
const songQueue = user.songQueue
|
|
||||||
const queueHistory = user.queueHistory
|
|
||||||
const patch: Partial<
|
|
||||||
Pick<
|
|
||||||
Doc<"users">,
|
|
||||||
"favoriteSongs" | "songQueue" | "queueHistory" | "currentSongProgress"
|
|
||||||
>
|
|
||||||
> = {}
|
|
||||||
|
|
||||||
if (favoriteSongs?.some((songId) => remove.has(songId))) {
|
|
||||||
patch.favoriteSongs = favoriteSongs.filter(
|
|
||||||
(songId) => !remove.has(songId)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
if (songQueue?.some((songId) => remove.has(songId))) {
|
|
||||||
const currentRemoved = remove.has(songQueue[0])
|
|
||||||
patch.songQueue = songQueue.filter((songId) => !remove.has(songId))
|
|
||||||
if (currentRemoved) {
|
|
||||||
patch.currentSongProgress = 0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (queueHistory?.some((songId) => remove.has(songId))) {
|
|
||||||
patch.queueHistory = queueHistory.filter(
|
|
||||||
(songId) => !remove.has(songId)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
if (Object.keys(patch).length > 0) {
|
|
||||||
await ctx.db.patch(user._id, patch)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
await purgeSongsFromUsersAndPlaylists(ctx, new Set(args.ids))
|
||||||
|
await recordIntentCatalogChanges(ctx, "song", args.ids, true)
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
export const purgeAlbumsFromUsers = internalMutation({
|
/** Deletes the albums that still have no songs when this mutation runs. */
|
||||||
|
export const deleteEmptyAlbums = internalMutation({
|
||||||
args: { ids: v.array(v.id("albums")) },
|
args: { ids: v.array(v.id("albums")) },
|
||||||
handler: async (ctx, args) => {
|
handler: async (ctx, args) => {
|
||||||
const remove = new Set(args.ids)
|
const deleted = new Set<Id<"albums">>()
|
||||||
if (remove.size === 0) {
|
for (const id of args.ids) {
|
||||||
return
|
const song = await ctx.db
|
||||||
}
|
.query("songs")
|
||||||
|
.withIndex("by_album", (q) => q.eq("album", id))
|
||||||
for (const user of await ctx.db.query("users").collect()) {
|
.first()
|
||||||
const favoriteAlbums = user.favoriteAlbums
|
if (song === null && (await ctx.db.get("albums", id)) !== null) {
|
||||||
const recentlyPlayed = user.recentlyPlayed
|
await ctx.db.delete("albums", id)
|
||||||
const patch: Partial<
|
deleted.add(id)
|
||||||
Pick<Doc<"users">, "favoriteAlbums" | "recentlyPlayed">
|
|
||||||
> = {}
|
|
||||||
if (favoriteAlbums?.some((albumId) => remove.has(albumId))) {
|
|
||||||
patch.favoriteAlbums = favoriteAlbums.filter(
|
|
||||||
(albumId) => !remove.has(albumId)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
if (
|
|
||||||
recentlyPlayed?.some((itemId) => remove.has(itemId as Id<"albums">))
|
|
||||||
) {
|
|
||||||
patch.recentlyPlayed = recentlyPlayed.filter(
|
|
||||||
(itemId) => !remove.has(itemId as Id<"albums">)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
if (Object.keys(patch).length > 0) {
|
|
||||||
await ctx.db.patch(user._id, patch)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
await purgeAlbumsFromUsers(ctx, deleted)
|
||||||
|
await recordIntentCatalogChanges(ctx, "album", [...deleted], true)
|
||||||
|
return deleted.size
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
export const purgeArtistsFromUsers = internalMutation({
|
/** Deletes the artists that still have no albums when this mutation runs. */
|
||||||
|
export const deleteEmptyArtists = internalMutation({
|
||||||
args: { ids: v.array(v.id("artists")) },
|
args: { ids: v.array(v.id("artists")) },
|
||||||
handler: async (ctx, args) => {
|
handler: async (ctx, args) => {
|
||||||
const remove = new Set(args.ids)
|
const deleted = new Set<Id<"artists">>()
|
||||||
if (remove.size === 0) {
|
for (const id of args.ids) {
|
||||||
return
|
const album = await ctx.db
|
||||||
}
|
.query("albums")
|
||||||
|
.withIndex("by_artist", (q) => q.eq("artist", id))
|
||||||
for (const user of await ctx.db.query("users").collect()) {
|
.first()
|
||||||
const favoriteArtists = user.favoriteArtists
|
if (album === null && (await ctx.db.get("artists", id)) !== null) {
|
||||||
if (favoriteArtists?.some((artistId) => remove.has(artistId))) {
|
await ctx.db.delete("artists", id)
|
||||||
await ctx.db.patch(user._id, {
|
deleted.add(id)
|
||||||
favoriteArtists: favoriteArtists.filter(
|
|
||||||
(artistId) => !remove.has(artistId)
|
|
||||||
),
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
await purgeArtistsFromUsers(ctx, deleted)
|
||||||
|
await recordIntentCatalogChanges(ctx, "artist", [...deleted], true)
|
||||||
|
return deleted.size
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
export const removeArtists = internalMutation({
|
async function purgeSongsFromUsersAndPlaylists(
|
||||||
args: { ids: v.array(v.id("artists")) },
|
ctx: MutationCtx,
|
||||||
handler: async (ctx, args) => {
|
remove: Set<Id<"songs">>
|
||||||
for (const id of args.ids) {
|
) {
|
||||||
await ctx.db.delete("artists", id)
|
if (remove.size === 0) {
|
||||||
}
|
return
|
||||||
},
|
}
|
||||||
})
|
|
||||||
|
|
||||||
export const removeAlbums = internalMutation({
|
for (const playlist of await ctx.db.query("playlists").collect()) {
|
||||||
args: { ids: v.array(v.id("albums")) },
|
if (playlist.songs.some((songId) => remove.has(songId))) {
|
||||||
handler: async (ctx, args) => {
|
await ctx.db.patch(playlist._id, {
|
||||||
for (const id of args.ids) {
|
songs: playlist.songs.filter((songId) => !remove.has(songId)),
|
||||||
await ctx.db.delete("albums", id)
|
})
|
||||||
}
|
}
|
||||||
},
|
}
|
||||||
})
|
|
||||||
|
for (const state of await ctx.db.query("playbackStates").collect()) {
|
||||||
|
if (
|
||||||
|
state.songQueue.some((songId) => remove.has(songId)) ||
|
||||||
|
state.queueHistory.some((songId) => remove.has(songId))
|
||||||
|
) {
|
||||||
|
await ctx.db.patch(state._id, {
|
||||||
|
songQueue: state.songQueue.filter((songId) => !remove.has(songId)),
|
||||||
|
queueHistory: state.queueHistory.filter(
|
||||||
|
(songId) => !remove.has(songId)
|
||||||
|
),
|
||||||
|
revision: state.revision + 1,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Legacy queue fields stay until `migrations.migrateUsers` clears them.
|
||||||
|
for (const user of await ctx.db.query("users").collect()) {
|
||||||
|
const favoriteSongs = user.favoriteSongs
|
||||||
|
const songQueue = user.songQueue
|
||||||
|
const queueHistory = user.queueHistory
|
||||||
|
const patch: Partial<
|
||||||
|
Pick<
|
||||||
|
Doc<"users">,
|
||||||
|
"favoriteSongs" | "songQueue" | "queueHistory" | "currentSongProgress"
|
||||||
|
>
|
||||||
|
> = {}
|
||||||
|
|
||||||
|
if (favoriteSongs?.some((songId) => remove.has(songId))) {
|
||||||
|
patch.favoriteSongs = favoriteSongs.filter(
|
||||||
|
(songId) => !remove.has(songId)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
if (songQueue?.some((songId) => remove.has(songId))) {
|
||||||
|
const currentRemoved = remove.has(songQueue[0])
|
||||||
|
patch.songQueue = songQueue.filter((songId) => !remove.has(songId))
|
||||||
|
if (currentRemoved) {
|
||||||
|
patch.currentSongProgress = 0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (queueHistory?.some((songId) => remove.has(songId))) {
|
||||||
|
patch.queueHistory = queueHistory.filter((songId) => !remove.has(songId))
|
||||||
|
}
|
||||||
|
if (Object.keys(patch).length > 0) {
|
||||||
|
await ctx.db.patch(user._id, patch)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function purgeAlbumsFromUsers(
|
||||||
|
ctx: MutationCtx,
|
||||||
|
remove: Set<Id<"albums">>
|
||||||
|
) {
|
||||||
|
if (remove.size === 0) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
for (const user of await ctx.db.query("users").collect()) {
|
||||||
|
const favoriteAlbums = user.favoriteAlbums
|
||||||
|
const recentlyPlayed = user.recentlyPlayed
|
||||||
|
const patch: Partial<
|
||||||
|
Pick<Doc<"users">, "favoriteAlbums" | "recentlyPlayed">
|
||||||
|
> = {}
|
||||||
|
if (favoriteAlbums?.some((albumId) => remove.has(albumId))) {
|
||||||
|
patch.favoriteAlbums = favoriteAlbums.filter(
|
||||||
|
(albumId) => !remove.has(albumId)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
if (recentlyPlayed?.some((itemId) => remove.has(itemId as Id<"albums">))) {
|
||||||
|
patch.recentlyPlayed = recentlyPlayed.filter(
|
||||||
|
(itemId) => !remove.has(itemId as Id<"albums">)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
if (Object.keys(patch).length > 0) {
|
||||||
|
await ctx.db.patch(user._id, patch)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function purgeArtistsFromUsers(
|
||||||
|
ctx: MutationCtx,
|
||||||
|
remove: Set<Id<"artists">>
|
||||||
|
) {
|
||||||
|
if (remove.size === 0) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
for (const user of await ctx.db.query("users").collect()) {
|
||||||
|
const favoriteArtists = user.favoriteArtists
|
||||||
|
if (favoriteArtists?.some((artistId) => remove.has(artistId))) {
|
||||||
|
await ctx.db.patch(user._id, {
|
||||||
|
favoriteArtists: favoriteArtists.filter(
|
||||||
|
(artistId) => !remove.has(artistId)
|
||||||
|
),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
export const changeFilesForSongs = internalMutation({
|
export const changeFilesForSongs = internalMutation({
|
||||||
args: {
|
args: {
|
||||||
@@ -1317,25 +1259,64 @@ export const changeFilesForSongs = internalMutation({
|
|||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
export const updateArtistCover = internalMutation({
|
export const updateArtistCovers = internalMutation({
|
||||||
args: { id: v.id("artists"), cover: v.nullable(v.string()) },
|
args: {
|
||||||
handler: async (ctx, args) => {
|
artists: v.array(
|
||||||
return await ctx.db.patch("artists", args.id, { cover: args.cover })
|
v.object({ id: v.id("artists"), cover: v.nullable(v.string()) })
|
||||||
|
),
|
||||||
},
|
},
|
||||||
})
|
|
||||||
|
|
||||||
export const updateAlbumCover = internalMutation({
|
|
||||||
args: { id: v.id("albums"), cover: v.nullable(v.string()) },
|
|
||||||
handler: async (ctx, args) => {
|
handler: async (ctx, args) => {
|
||||||
return await ctx.db.patch("albums", args.id, { cover: args.cover })
|
for (const { id, cover } of args.artists) {
|
||||||
|
if ((await ctx.db.get("artists", id)) !== null) {
|
||||||
|
await ctx.db.patch("artists", id, { cover })
|
||||||
|
}
|
||||||
|
}
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
export const removeSongs = internalMutation({
|
export const updateAlbumCovers = internalMutation({
|
||||||
args: { ids: v.array(v.id("songs")) },
|
args: {
|
||||||
|
albums: v.array(
|
||||||
|
v.object({ id: v.id("albums"), cover: v.nullable(v.string()) })
|
||||||
|
),
|
||||||
|
},
|
||||||
|
handler: async (ctx, args) => {
|
||||||
|
for (const { id, cover } of args.albums) {
|
||||||
|
if ((await ctx.db.get("albums", id)) !== null) {
|
||||||
|
await ctx.db.patch("albums", id, { cover })
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Takes the single library scan lease if it is free or expired. The lease
|
||||||
|
* outlives the action timeout so a crashed scan cannot hold it forever.
|
||||||
|
*/
|
||||||
|
export const acquireLibraryScanLock = internalMutation({
|
||||||
|
args: { token: v.string(), leaseMs: v.number() },
|
||||||
|
handler: async (ctx, args) => {
|
||||||
|
const now = Date.now()
|
||||||
|
const lock = await ctx.db.query("libraryScanLock").first()
|
||||||
|
if (lock && lock.token !== args.token && lock.expiresAt > now) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
const expiresAt = now + args.leaseMs
|
||||||
|
if (lock) {
|
||||||
|
await ctx.db.patch(lock._id, { token: args.token, expiresAt })
|
||||||
|
} else {
|
||||||
|
await ctx.db.insert("libraryScanLock", { token: args.token, expiresAt })
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
export const releaseLibraryScanLock = internalMutation({
|
||||||
|
args: { token: v.string() },
|
||||||
handler: async (ctx, args) => {
|
handler: async (ctx, args) => {
|
||||||
for (const id of args.ids) {
|
const lock = await ctx.db.query("libraryScanLock").first()
|
||||||
await ctx.db.delete("songs", id)
|
if (lock?.token === args.token) {
|
||||||
|
await ctx.db.delete(lock._id)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
@@ -1,10 +1,9 @@
|
|||||||
import { ConvexError } from "convex/values"
|
import { ConvexError } from "convex/values"
|
||||||
import type { Doc, Id } from "./_generated/dataModel"
|
import type { Doc, Id } from "./_generated/dataModel"
|
||||||
import type { MutationCtx, QueryCtx } from "./_generated/server"
|
import type { MutationCtx, QueryCtx } from "./_generated/server"
|
||||||
|
import { MAX_QUEUE_HISTORY } from "../client/playback-queue"
|
||||||
import { MAX_QUEUE_LENGTH } from "./limits"
|
import { MAX_QUEUE_LENGTH } from "./limits"
|
||||||
|
|
||||||
const MAX_QUEUE_HISTORY = 30
|
|
||||||
|
|
||||||
export type RepeatMode = Doc<"playbackStates">["repeatEnabled"]
|
export type RepeatMode = Doc<"playbackStates">["repeatEnabled"]
|
||||||
|
|
||||||
export type PlaybackState = Pick<
|
export type PlaybackState = Pick<
|
||||||
|
|||||||
@@ -69,9 +69,19 @@ export default defineSchema({
|
|||||||
invocationId: v.string(),
|
invocationId: v.string(),
|
||||||
playlistId: v.id("playlists"),
|
playlistId: v.id("playlists"),
|
||||||
}).index("by_user_invocation", ["userId", "invocationId"]),
|
}).index("by_user_invocation", ["userId", "invocationId"]),
|
||||||
|
/** Renames and deletions; Siri catalog clients find inserts by `_creationTime`. */
|
||||||
|
intentCatalogChanges: defineTable({
|
||||||
|
kind: v.union(v.literal("song"), v.literal("album"), v.literal("artist")),
|
||||||
|
entityId: v.string(),
|
||||||
|
removed: v.boolean(),
|
||||||
|
}).index("by_kind", ["kind"]),
|
||||||
appSettings: defineTable({
|
appSettings: defineTable({
|
||||||
disableAccountCreation: v.boolean(),
|
disableAccountCreation: v.boolean(),
|
||||||
}),
|
}),
|
||||||
|
libraryScanLock: defineTable({
|
||||||
|
token: v.string(),
|
||||||
|
expiresAt: v.number(),
|
||||||
|
}),
|
||||||
artists: defineTable({
|
artists: defineTable({
|
||||||
name: v.string(),
|
name: v.string(),
|
||||||
folder: v.string(),
|
folder: v.string(),
|
||||||
|
|||||||
@@ -33,8 +33,10 @@ export type BrowseAlbumTrack = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export type BrowseAlbumDetail = BrowseAlbum & {
|
export type BrowseAlbumDetail = BrowseAlbum & {
|
||||||
|
/** `null` when the files have no year tag; clients hide it. */
|
||||||
year: number | null
|
year: number | null
|
||||||
genre: string | null
|
genre: string | null
|
||||||
|
/** Empty when unknown; clients hide it. */
|
||||||
releaseDate: string
|
releaseDate: string
|
||||||
hasLossless: boolean
|
hasLossless: boolean
|
||||||
hasAtmos: boolean
|
hasAtmos: boolean
|
||||||
|
|||||||
@@ -23,10 +23,26 @@
|
|||||||
"types": "./server-url.ts",
|
"types": "./server-url.ts",
|
||||||
"default": "./server-url.ts"
|
"default": "./server-url.ts"
|
||||||
},
|
},
|
||||||
|
"./client/audio-format-marks": {
|
||||||
|
"types": "./client/audio-format-marks.ts",
|
||||||
|
"default": "./client/audio-format-marks.ts"
|
||||||
|
},
|
||||||
|
"./client/auth-token": {
|
||||||
|
"types": "./client/auth-token.ts",
|
||||||
|
"default": "./client/auth-token.ts"
|
||||||
|
},
|
||||||
"./client/cached-query": {
|
"./client/cached-query": {
|
||||||
"types": "./client/cached-query.ts",
|
"types": "./client/cached-query.ts",
|
||||||
"default": "./client/cached-query.ts"
|
"default": "./client/cached-query.ts"
|
||||||
},
|
},
|
||||||
|
"./client/favorites": {
|
||||||
|
"types": "./client/favorites.ts",
|
||||||
|
"default": "./client/favorites.ts"
|
||||||
|
},
|
||||||
|
"./client/media-links": {
|
||||||
|
"types": "./client/media-links.ts",
|
||||||
|
"default": "./client/media-links.ts"
|
||||||
|
},
|
||||||
"./client/persistent-cache": {
|
"./client/persistent-cache": {
|
||||||
"types": "./client/persistent-cache.ts",
|
"types": "./client/persistent-cache.ts",
|
||||||
"default": "./client/persistent-cache.ts"
|
"default": "./client/persistent-cache.ts"
|
||||||
@@ -42,6 +58,10 @@
|
|||||||
"./client/song-cache": {
|
"./client/song-cache": {
|
||||||
"types": "./client/song-cache.ts",
|
"types": "./client/song-cache.ts",
|
||||||
"default": "./client/song-cache.ts"
|
"default": "./client/song-cache.ts"
|
||||||
|
},
|
||||||
|
"./client/song-search": {
|
||||||
|
"types": "./client/song-search.ts",
|
||||||
|
"default": "./client/song-search.ts"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
@@ -1,5 +1,21 @@
|
|||||||
export type PlaybackQuality = "low" | "medium" | "high" | "lossless"
|
export type PlaybackQuality = "low" | "medium" | "high" | "lossless"
|
||||||
|
|
||||||
|
const PLAYBACK_QUALITIES: readonly string[] = [
|
||||||
|
"low",
|
||||||
|
"medium",
|
||||||
|
"high",
|
||||||
|
"lossless",
|
||||||
|
] satisfies PlaybackQuality[]
|
||||||
|
|
||||||
|
/** Reads a `quality` request parameter; anything unknown means the default. */
|
||||||
|
export function parsePlaybackQuality(
|
||||||
|
value: string | null | undefined
|
||||||
|
): PlaybackQuality | undefined {
|
||||||
|
return value && PLAYBACK_QUALITIES.includes(value)
|
||||||
|
? (value as PlaybackQuality)
|
||||||
|
: undefined
|
||||||
|
}
|
||||||
|
|
||||||
export function qualityKbps(quality: PlaybackQuality | null | undefined) {
|
export function qualityKbps(quality: PlaybackQuality | null | undefined) {
|
||||||
if (quality === "low") {
|
if (quality === "low") {
|
||||||
return 64
|
return 64
|
||||||
@@ -16,9 +32,15 @@ export function qualityKbps(quality: PlaybackQuality | null | undefined) {
|
|||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export type PlaybackSource = "atmos" | "lossless" | "normal"
|
||||||
|
|
||||||
export type PlaybackStreamPlan = {
|
export type PlaybackStreamPlan = {
|
||||||
playbackQuality: PlaybackQuality
|
playbackQuality: PlaybackQuality
|
||||||
preferAtmos: boolean
|
preferAtmos: boolean
|
||||||
|
/** The file that is streamed as-is, or transcoded when `transcodeNeeded`. */
|
||||||
|
source: PlaybackSource
|
||||||
|
/** AAC bitrate to transcode to; 0 for lossless quality. */
|
||||||
|
kbps: number
|
||||||
transcodeNeeded: boolean
|
transcodeNeeded: boolean
|
||||||
useHls: boolean
|
useHls: boolean
|
||||||
}
|
}
|
||||||
@@ -29,27 +51,70 @@ export function playbackStreamPlan(
|
|||||||
preferAtmos: boolean
|
preferAtmos: boolean
|
||||||
): PlaybackStreamPlan {
|
): PlaybackStreamPlan {
|
||||||
const playbackQuality = quality ?? "medium"
|
const playbackQuality = quality ?? "medium"
|
||||||
const kbps = playbackQuality === "lossless" ? 0 : qualityKbps(playbackQuality)
|
const kbps = qualityKbps(playbackQuality)
|
||||||
const effectivePreferAtmos = preferAtmos && "atmos" in files
|
const effectivePreferAtmos = preferAtmos && "atmos" in files
|
||||||
|
|
||||||
|
let source: PlaybackSource = "lossless" in files ? "lossless" : "normal"
|
||||||
let transcodeNeeded = true
|
let transcodeNeeded = true
|
||||||
|
|
||||||
if (effectivePreferAtmos) {
|
if (effectivePreferAtmos) {
|
||||||
|
source = "atmos"
|
||||||
transcodeNeeded = false
|
transcodeNeeded = false
|
||||||
} else if (kbps === 0 && "lossless" in files) {
|
} else if (kbps === 0 && "lossless" in files) {
|
||||||
|
source = "lossless"
|
||||||
transcodeNeeded = false
|
transcodeNeeded = false
|
||||||
} else if (kbps === 0 || (kbps === 256 && "normal" in files)) {
|
} else if (kbps === 0 || (kbps === 256 && "normal" in files)) {
|
||||||
|
source = "normal"
|
||||||
transcodeNeeded = false
|
transcodeNeeded = false
|
||||||
}
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
playbackQuality,
|
playbackQuality,
|
||||||
preferAtmos: effectivePreferAtmos,
|
preferAtmos: effectivePreferAtmos,
|
||||||
|
source,
|
||||||
|
kbps,
|
||||||
transcodeNeeded,
|
transcodeNeeded,
|
||||||
useHls: transcodeNeeded,
|
useHls: transcodeNeeded,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function songStreamQuery(
|
||||||
|
params: URLSearchParams,
|
||||||
|
quality: PlaybackQuality | undefined,
|
||||||
|
preferAtmos: boolean | undefined
|
||||||
|
) {
|
||||||
|
if (quality) {
|
||||||
|
params.set("quality", quality)
|
||||||
|
}
|
||||||
|
if (preferAtmos) {
|
||||||
|
params.set("preferAtmos", "true")
|
||||||
|
}
|
||||||
|
const query = params.toString()
|
||||||
|
return query ? `?${query}` : ""
|
||||||
|
}
|
||||||
|
|
||||||
|
export function songPlayPath(
|
||||||
|
songId: string,
|
||||||
|
quality: PlaybackQuality | undefined,
|
||||||
|
preferAtmos: boolean | undefined,
|
||||||
|
options?: { losslessFormat?: "alac" }
|
||||||
|
) {
|
||||||
|
const params = new URLSearchParams()
|
||||||
|
if (options?.losslessFormat) {
|
||||||
|
params.set("losslessFormat", options.losslessFormat)
|
||||||
|
}
|
||||||
|
return `/api/song/${songId}/play${songStreamQuery(params, quality, preferAtmos)}`
|
||||||
|
}
|
||||||
|
|
||||||
|
export function songHlsPlaylistPath(
|
||||||
|
songId: string,
|
||||||
|
quality: PlaybackQuality | undefined,
|
||||||
|
preferAtmos: boolean | undefined
|
||||||
|
) {
|
||||||
|
const query = songStreamQuery(new URLSearchParams(), quality, preferAtmos)
|
||||||
|
return `/api/song/${songId}/play/hls${query}`
|
||||||
|
}
|
||||||
|
|
||||||
export type PlaybackFormat = "atmos" | "lossless"
|
export type PlaybackFormat = "atmos" | "lossless"
|
||||||
|
|
||||||
/** The labeled format a song streams in under the plan, if any. */
|
/** The labeled format a song streams in under the plan, if any. */
|
||||||
|
|||||||
@@ -0,0 +1,14 @@
|
|||||||
|
diff --git a/ios/RNCSliderComponentView.mm b/ios/RNCSliderComponentView.mm
|
||||||
|
index aa9eb66a486a53762490ed720c5dd2f3a618a166..feb786dce183fff6ee326aa949ee90820cf80c96 100644
|
||||||
|
--- a/ios/RNCSliderComponentView.mm
|
||||||
|
+++ b/ios/RNCSliderComponentView.mm
|
||||||
|
@@ -24,7 +24,8 @@ using namespace facebook::react;
|
||||||
|
{
|
||||||
|
RNCSlider *slider;
|
||||||
|
UIImage *_image;
|
||||||
|
- BOOL _isSliding;
|
||||||
|
+ // Match the protocol's C++ bool; BOOL is signed char on x86_64 Catalyst.
|
||||||
|
+ bool _isSliding;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ (ComponentDescriptorProvider)componentDescriptorProvider
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
diff --git a/ios/FileSystemModule.swift b/ios/FileSystemModule.swift
|
||||||
|
index 3bc078d127da36062b3df214ca92db981793cf12..dd1c89213260e21b3b3e4021cb8b8b7a5562f758 100644
|
||||||
|
--- a/ios/FileSystemModule.swift
|
||||||
|
+++ b/ios/FileSystemModule.swift
|
||||||
|
@@ -61,12 +61,21 @@ public final class FileSystemModule: Module {
|
||||||
|
}
|
||||||
|
|
||||||
|
#if os(iOS)
|
||||||
|
+ // canPreview is unavailable on Mac Catalyst; Quick Look reports unsupported files itself.
|
||||||
|
+ private func isPreviewable(_ item: QLPreviewItem) -> Bool {
|
||||||
|
+ #if targetEnvironment(macCatalyst)
|
||||||
|
+ return true
|
||||||
|
+ #else
|
||||||
|
+ return QLPreviewController.canPreview(item)
|
||||||
|
+ #endif
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
private func canPreview(file: FileSystemFile) throws -> Bool {
|
||||||
|
return try file.withCorrectTypeAndScopedAccess(permission: .read) {
|
||||||
|
guard file.exists else {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
- return QLPreviewController.canPreview(FileSystemPreviewItem(url: file.url, title: nil))
|
||||||
|
+ return isPreviewable(FileSystemPreviewItem(url: file.url, title: nil))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -98,7 +107,7 @@ public final class FileSystemModule: Module {
|
||||||
|
throw FilePreviewFileNotFoundException(file.url)
|
||||||
|
}
|
||||||
|
let item = FileSystemPreviewItem(url: file.url, title: options?.title)
|
||||||
|
- guard QLPreviewController.canPreview(item) else {
|
||||||
|
+ guard isPreviewable(item) else {
|
||||||
|
throw FilePreviewUnsupportedException(file.url)
|
||||||
|
}
|
||||||
|
items.append(item)
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
diff --git a/ios/Core/Functions/AsyncFunctionDefinition.swift b/ios/Core/Functions/AsyncFunctionDefinition.swift
|
||||||
|
index 48ee585ff3c7c5f71eceda36a3384619834e6e6e..81ca378035663da2db30ab6007daa2546189507b 100644
|
||||||
|
--- a/ios/Core/Functions/AsyncFunctionDefinition.swift
|
||||||
|
+++ b/ios/Core/Functions/AsyncFunctionDefinition.swift
|
||||||
|
@@ -197,7 +197,8 @@ public class AsyncFunctionDefinition<Args, FirstArgType, ReturnType>: AnyAsyncFu
|
||||||
|
switch consume result {
|
||||||
|
case .success(let value):
|
||||||
|
promise.resolve(value)
|
||||||
|
- case .failure(let error as any Error):
|
||||||
|
+ // Swift 6.4.2 crashes lowering `let error as any Error` when compiled from source.
|
||||||
|
+ case .failure(let error):
|
||||||
|
promise.reject(error)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
diff --git a/apple/reanimated/apple/REAReducedMotion.h b/apple/reanimated/apple/REAReducedMotion.h
|
||||||
|
index 5e22e18c7abe91f6ca6b1a58a5ff14a0f4e97647..7eabe9952af372982eb24595f999321b966996f7 100644
|
||||||
|
--- a/apple/reanimated/apple/REAReducedMotion.h
|
||||||
|
+++ b/apple/reanimated/apple/REAReducedMotion.h
|
||||||
|
@@ -1,10 +1,9 @@
|
||||||
|
#import <Foundation/Foundation.h>
|
||||||
|
|
||||||
|
+// Mac Catalyst can see AppKit too, but its Quickdraw types clash with React's.
|
||||||
|
#if __has_include(<UIKit/UIAccessibility.h>)
|
||||||
|
#import <UIKit/UIAccessibility.h>
|
||||||
|
-#endif
|
||||||
|
-
|
||||||
|
-#if __has_include(<AppKit/AppKit.h>)
|
||||||
|
+#elif __has_include(<AppKit/AppKit.h>)
|
||||||
|
#import <AppKit/AppKit.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
Generated
+31
-19
@@ -5,9 +5,21 @@ settings:
|
|||||||
excludeLinksFromLockfile: false
|
excludeLinksFromLockfile: false
|
||||||
|
|
||||||
patchedDependencies:
|
patchedDependencies:
|
||||||
|
'@react-native-community/slider@5.2.1':
|
||||||
|
hash: 73deacaea9aae000a42050d343517da9e16e736e92a4fff3f61f81dba093a1c4
|
||||||
|
path: patches/@react-native-community__slider@5.2.1.patch
|
||||||
expo-audio@58.0.10:
|
expo-audio@58.0.10:
|
||||||
hash: f7f102c0f17b28e763d828acd4f138d62809f5be576e316a13008c27e84968c5
|
hash: f7f102c0f17b28e763d828acd4f138d62809f5be576e316a13008c27e84968c5
|
||||||
path: patches/expo-audio@58.0.10.patch
|
path: patches/expo-audio@58.0.10.patch
|
||||||
|
expo-file-system@58.0.10:
|
||||||
|
hash: 8e68fafb653077a9ba74fe6c33a742af88e3299ce9470723f8c2ec97fe86073c
|
||||||
|
path: patches/expo-file-system@58.0.10.patch
|
||||||
|
expo-modules-core@58.0.24:
|
||||||
|
hash: c6fb26bed9ccbc12a81ff69ff56d98af89bacc0a3e44770950f9addf302657ed
|
||||||
|
path: patches/expo-modules-core@58.0.24.patch
|
||||||
|
react-native-reanimated@4.7.1:
|
||||||
|
hash: badfed6babfff7fa495b3a06ba8f324be0e5ff82cedb6084f9f4d1dad65984d3
|
||||||
|
path: patches/react-native-reanimated@4.7.1.patch
|
||||||
react-native-screens@4.30.0:
|
react-native-screens@4.30.0:
|
||||||
hash: f79520899c22be4c5109cdeacfecb373c9116181b7be338d898899bfcf0b262d
|
hash: f79520899c22be4c5109cdeacfecb373c9116181b7be338d898899bfcf0b262d
|
||||||
path: patches/react-native-screens@4.30.0.patch
|
path: patches/react-native-screens@4.30.0.patch
|
||||||
@@ -48,7 +60,7 @@ importers:
|
|||||||
version: 2.2.0(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))
|
version: 2.2.0(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))
|
||||||
'@react-native-community/slider':
|
'@react-native-community/slider':
|
||||||
specifier: 5.2.1
|
specifier: 5.2.1
|
||||||
version: 5.2.1
|
version: 5.2.1(patch_hash=73deacaea9aae000a42050d343517da9e16e736e92a4fff3f61f81dba093a1c4)
|
||||||
'@react-native/metro-config':
|
'@react-native/metro-config':
|
||||||
specifier: 0.88.0
|
specifier: 0.88.0
|
||||||
version: 0.88.0(@babel/core@7.29.7)
|
version: 0.88.0(@babel/core@7.29.7)
|
||||||
@@ -99,7 +111,7 @@ importers:
|
|||||||
version: 58.0.4(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
version: 58.0.4(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
||||||
expo-router:
|
expo-router:
|
||||||
specifier: ~58.0.25
|
specifier: ~58.0.25
|
||||||
version: 58.0.25(88877fdcf2b70b064063b5f62591c4ab)
|
version: 58.0.25(8aefb264c8a29c1f36eeb4f71100c585)
|
||||||
expo-secure-store:
|
expo-secure-store:
|
||||||
specifier: ~58.0.2
|
specifier: ~58.0.2
|
||||||
version: 58.0.2(expo@58.0.17)
|
version: 58.0.2(expo@58.0.17)
|
||||||
@@ -135,7 +147,7 @@ importers:
|
|||||||
version: 2.6.0(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
version: 2.6.0(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
||||||
react-native-reanimated:
|
react-native-reanimated:
|
||||||
specifier: 4.7.1
|
specifier: 4.7.1
|
||||||
version: 4.7.1(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
version: 4.7.1(patch_hash=badfed6babfff7fa495b3a06ba8f324be0e5ff82cedb6084f9f4d1dad65984d3)(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
||||||
react-native-safe-area-context:
|
react-native-safe-area-context:
|
||||||
specifier: ~5.10.1
|
specifier: ~5.10.1
|
||||||
version: 5.10.1(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
version: 5.10.1(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
||||||
@@ -150,7 +162,7 @@ importers:
|
|||||||
version: 0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
version: 0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
||||||
sonner-native:
|
sonner-native:
|
||||||
specifier: ^0.26.2
|
specifier: ^0.26.2
|
||||||
version: 0.26.4(5bf7f10fae9db32d21c97f8e81e5bd9a)
|
version: 0.26.4(9d30290a128c046b3db5fe7a9d46b005)
|
||||||
devDependencies:
|
devDependencies:
|
||||||
'@types/node':
|
'@types/node':
|
||||||
specifier: ^20
|
specifier: ^20
|
||||||
@@ -7550,7 +7562,7 @@ snapshots:
|
|||||||
ws: 8.21.0
|
ws: 8.21.0
|
||||||
zod: 3.25.76
|
zod: 3.25.76
|
||||||
optionalDependencies:
|
optionalDependencies:
|
||||||
expo-router: 58.0.25(88877fdcf2b70b064063b5f62591c4ab)
|
expo-router: 58.0.25(8aefb264c8a29c1f36eeb4f71100c585)
|
||||||
react-native: 0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0)
|
react-native: 0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0)
|
||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
- '@expo/dom-webview'
|
- '@expo/dom-webview'
|
||||||
@@ -7851,7 +7863,7 @@ snapshots:
|
|||||||
react: 19.3.0
|
react: 19.3.0
|
||||||
optionalDependencies:
|
optionalDependencies:
|
||||||
'@expo/metro-runtime': 58.0.15(@expo/log-box@58.0.13)(expo@58.0.17)(react-dom@19.3.0(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
'@expo/metro-runtime': 58.0.15(@expo/log-box@58.0.13)(expo@58.0.17)(react-dom@19.3.0(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
||||||
expo-router: 58.0.25(88877fdcf2b70b064063b5f62591c4ab)
|
expo-router: 58.0.25(8aefb264c8a29c1f36eeb4f71100c585)
|
||||||
react-dom: 19.3.0(react@19.3.0)
|
react-dom: 19.3.0(react@19.3.0)
|
||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
- supports-color
|
- supports-color
|
||||||
@@ -9235,7 +9247,7 @@ snapshots:
|
|||||||
merge-options: 3.0.4
|
merge-options: 3.0.4
|
||||||
react-native: 0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0)
|
react-native: 0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0)
|
||||||
|
|
||||||
'@react-native-community/slider@5.2.1': {}
|
'@react-native-community/slider@5.2.1(patch_hash=73deacaea9aae000a42050d343517da9e16e736e92a4fff3f61f81dba093a1c4)': {}
|
||||||
|
|
||||||
'@react-native-masked-view/masked-view@0.3.2(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)':
|
'@react-native-masked-view/masked-view@0.3.2(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)':
|
||||||
dependencies:
|
dependencies:
|
||||||
@@ -11155,7 +11167,7 @@ snapshots:
|
|||||||
expo-dev-menu-interface: 58.0.1(expo@58.0.17)
|
expo-dev-menu-interface: 58.0.1(expo@58.0.17)
|
||||||
react-native: 0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0)
|
react-native: 0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0)
|
||||||
|
|
||||||
expo-file-system@58.0.10(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0)):
|
expo-file-system@58.0.10(patch_hash=8e68fafb653077a9ba74fe6c33a742af88e3299ce9470723f8c2ec97fe86073c)(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0)):
|
||||||
dependencies:
|
dependencies:
|
||||||
expo: 58.0.17(@babel/core@7.29.7)(@expo/dom-webview@58.0.2)(@expo/metro-runtime@58.0.15)(expo-router@58.0.25)(react-dom@19.3.0(react@19.3.0))(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)(typescript@6.0.3)
|
expo: 58.0.17(@babel/core@7.29.7)(@expo/dom-webview@58.0.2)(@expo/metro-runtime@58.0.15)(expo-router@58.0.25)(react-dom@19.3.0(react@19.3.0))(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)(typescript@6.0.3)
|
||||||
react-native: 0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0)
|
react-native: 0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0)
|
||||||
@@ -11230,7 +11242,7 @@ snapshots:
|
|||||||
dependencies:
|
dependencies:
|
||||||
arg: 5.0.2
|
arg: 5.0.2
|
||||||
|
|
||||||
expo-modules-core@58.0.24(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0):
|
expo-modules-core@58.0.24(patch_hash=c6fb26bed9ccbc12a81ff69ff56d98af89bacc0a3e44770950f9addf302657ed)(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0):
|
||||||
dependencies:
|
dependencies:
|
||||||
expo-modules-jsi: 58.0.17(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))
|
expo-modules-jsi: 58.0.17(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))
|
||||||
expo-modules-macros: 0.22.0
|
expo-modules-macros: 0.22.0
|
||||||
@@ -11260,7 +11272,7 @@ snapshots:
|
|||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
- supports-color
|
- supports-color
|
||||||
|
|
||||||
expo-router@58.0.25(88877fdcf2b70b064063b5f62591c4ab):
|
expo-router@58.0.25(8aefb264c8a29c1f36eeb4f71100c585):
|
||||||
dependencies:
|
dependencies:
|
||||||
'@expo/log-box': 58.0.13(@expo/dom-webview@58.0.2)(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
'@expo/log-box': 58.0.13(@expo/dom-webview@58.0.2)(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
||||||
'@expo/metro-runtime': 58.0.15(@expo/log-box@58.0.13)(expo@58.0.17)(react-dom@19.3.0(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
'@expo/metro-runtime': 58.0.15(@expo/log-box@58.0.13)(expo@58.0.17)(react-dom@19.3.0(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
||||||
@@ -11280,7 +11292,7 @@ snapshots:
|
|||||||
react-fast-compare: 3.2.2
|
react-fast-compare: 3.2.2
|
||||||
react-is: 19.2.7
|
react-is: 19.2.7
|
||||||
react-native: 0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0)
|
react-native: 0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0)
|
||||||
react-native-drawer-layout: 4.2.12(react-native-gesture-handler@3.3.0(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native-reanimated@4.7.1(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
react-native-drawer-layout: 4.2.12(react-native-gesture-handler@3.3.0(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native-reanimated@4.7.1(patch_hash=badfed6babfff7fa495b3a06ba8f324be0e5ff82cedb6084f9f4d1dad65984d3)(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
||||||
react-native-safe-area-context: 5.10.1(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
react-native-safe-area-context: 5.10.1(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
||||||
react-native-screens: 4.30.0(patch_hash=f79520899c22be4c5109cdeacfecb373c9116181b7be338d898899bfcf0b262d)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
react-native-screens: 4.30.0(patch_hash=f79520899c22be4c5109cdeacfecb373c9116181b7be338d898899bfcf0b262d)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
||||||
server-only: 0.0.1
|
server-only: 0.0.1
|
||||||
@@ -11291,7 +11303,7 @@ snapshots:
|
|||||||
expo-symbols: 58.0.4(expo-font@58.0.9)(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
expo-symbols: 58.0.4(expo-font@58.0.9)(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
||||||
react-dom: 19.3.0(react@19.3.0)
|
react-dom: 19.3.0(react@19.3.0)
|
||||||
react-native-gesture-handler: 3.3.0(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
react-native-gesture-handler: 3.3.0(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
||||||
react-native-reanimated: 4.7.1(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
react-native-reanimated: 4.7.1(patch_hash=badfed6babfff7fa495b3a06ba8f324be0e5ff82cedb6084f9f4d1dad65984d3)(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
||||||
react-native-worklets: 0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
react-native-worklets: 0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
- '@types/react'
|
- '@types/react'
|
||||||
@@ -11370,12 +11382,12 @@ snapshots:
|
|||||||
babel-preset-expo: 58.0.19(@babel/core@7.29.7)(@babel/runtime@7.29.7)(expo@58.0.17)(react-refresh@0.14.2)
|
babel-preset-expo: 58.0.19(@babel/core@7.29.7)(@babel/runtime@7.29.7)(expo@58.0.17)(react-refresh@0.14.2)
|
||||||
expo-asset: 58.0.18(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)(typescript@6.0.3)
|
expo-asset: 58.0.18(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)(typescript@6.0.3)
|
||||||
expo-constants: 58.0.13(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(typescript@6.0.3)
|
expo-constants: 58.0.13(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(typescript@6.0.3)
|
||||||
expo-file-system: 58.0.10(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))
|
expo-file-system: 58.0.10(patch_hash=8e68fafb653077a9ba74fe6c33a742af88e3299ce9470723f8c2ec97fe86073c)(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))
|
||||||
expo-font: 58.0.9(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
expo-font: 58.0.9(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
||||||
expo-keep-awake: 58.0.3(expo@58.0.17)(react@19.3.0)
|
expo-keep-awake: 58.0.3(expo@58.0.17)(react@19.3.0)
|
||||||
expo-modules-autolinking: 58.0.14(typescript@6.0.3)
|
expo-modules-autolinking: 58.0.14(typescript@6.0.3)
|
||||||
expo-modules-cli: 0.3.1
|
expo-modules-cli: 0.3.1
|
||||||
expo-modules-core: 58.0.24(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
expo-modules-core: 58.0.24(patch_hash=c6fb26bed9ccbc12a81ff69ff56d98af89bacc0a3e44770950f9addf302657ed)(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
||||||
pretty-format: 29.7.0
|
pretty-format: 29.7.0
|
||||||
react: 19.3.0
|
react: 19.3.0
|
||||||
react-native: 0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0)
|
react-native: 0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0)
|
||||||
@@ -12941,13 +12953,13 @@ snapshots:
|
|||||||
|
|
||||||
react-is@19.2.7: {}
|
react-is@19.2.7: {}
|
||||||
|
|
||||||
react-native-drawer-layout@4.2.12(react-native-gesture-handler@3.3.0(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native-reanimated@4.7.1(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0):
|
react-native-drawer-layout@4.2.12(react-native-gesture-handler@3.3.0(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native-reanimated@4.7.1(patch_hash=badfed6babfff7fa495b3a06ba8f324be0e5ff82cedb6084f9f4d1dad65984d3)(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0):
|
||||||
dependencies:
|
dependencies:
|
||||||
color: 4.2.3
|
color: 4.2.3
|
||||||
react: 19.3.0
|
react: 19.3.0
|
||||||
react-native: 0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0)
|
react-native: 0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0)
|
||||||
react-native-gesture-handler: 3.3.0(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
react-native-gesture-handler: 3.3.0(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
||||||
react-native-reanimated: 4.7.1(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
react-native-reanimated: 4.7.1(patch_hash=badfed6babfff7fa495b3a06ba8f324be0e5ff82cedb6084f9f4d1dad65984d3)(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
||||||
use-latest-callback: 0.2.6(react@19.3.0)
|
use-latest-callback: 0.2.6(react@19.3.0)
|
||||||
|
|
||||||
react-native-gesture-handler@3.3.0(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0):
|
react-native-gesture-handler@3.3.0(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0):
|
||||||
@@ -12971,7 +12983,7 @@ snapshots:
|
|||||||
react: 19.3.0
|
react: 19.3.0
|
||||||
react-native: 0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0)
|
react-native: 0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0)
|
||||||
|
|
||||||
react-native-reanimated@4.7.1(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0):
|
react-native-reanimated@4.7.1(patch_hash=badfed6babfff7fa495b3a06ba8f324be0e5ff82cedb6084f9f4d1dad65984d3)(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0):
|
||||||
dependencies:
|
dependencies:
|
||||||
react: 19.3.0
|
react: 19.3.0
|
||||||
react-native: 0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0)
|
react-native: 0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0)
|
||||||
@@ -13533,12 +13545,12 @@ snapshots:
|
|||||||
|
|
||||||
slugify@1.6.9: {}
|
slugify@1.6.9: {}
|
||||||
|
|
||||||
sonner-native@0.26.4(5bf7f10fae9db32d21c97f8e81e5bd9a):
|
sonner-native@0.26.4(9d30290a128c046b3db5fe7a9d46b005):
|
||||||
dependencies:
|
dependencies:
|
||||||
react: 19.3.0
|
react: 19.3.0
|
||||||
react-native: 0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0)
|
react-native: 0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0)
|
||||||
react-native-gesture-handler: 3.3.0(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
react-native-gesture-handler: 3.3.0(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
||||||
react-native-reanimated: 4.7.1(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
react-native-reanimated: 4.7.1(patch_hash=badfed6babfff7fa495b3a06ba8f324be0e5ff82cedb6084f9f4d1dad65984d3)(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
||||||
react-native-safe-area-context: 5.10.1(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
react-native-safe-area-context: 5.10.1(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
||||||
react-native-screens: 4.30.0(patch_hash=f79520899c22be4c5109cdeacfecb373c9116181b7be338d898899bfcf0b262d)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
react-native-screens: 4.30.0(patch_hash=f79520899c22be4c5109cdeacfecb373c9116181b7be338d898899bfcf0b262d)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
||||||
react-native-svg: 15.16.0(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
react-native-svg: 15.16.0(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
||||||
|
|||||||
Reference in new issue
Block a user