Compare commits

..
55 changed files with 1875 additions and 2857 deletions

No files matched your search

@@ -26,7 +26,6 @@ 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 { 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"
@@ -769,7 +768,6 @@ function ProfileAvatar({
style?: StyleProp<ViewStyle> style?: StyleProp<ViewStyle>
}) { }) {
const colors = useThemeColors() const colors = useThemeColors()
const imageUrl = useProfileImageUrl(user.image)
const avatarStyle = [ const avatarStyle = [
styles.avatar, styles.avatar,
{ {
@@ -781,11 +779,11 @@ function ProfileAvatar({
style, style,
] ]
if (imageUrl) { if (user.image) {
return ( return (
<View style={avatarStyle}> <View style={avatarStyle}>
<Image <Image
source={{ uri: imageUrl }} source={{ uri: user.image }}
style={styles.avatarImage} style={styles.avatarImage}
contentFit="cover" contentFit="cover"
/> />
@@ -4,7 +4,6 @@ import { Image } from "expo-image"
import { Pressable, StyleSheet, Text, View } from "react-native" import { Pressable, StyleSheet, Text, View } from "react-native"
import { useCachedQuery } from "@/hooks/use-cached-query" import { useCachedQuery } from "@/hooks/use-cached-query"
import { useProfileImageUrl } from "@/hooks/use-profile-image-url"
import { initialsFromName } from "@/lib/format" import { initialsFromName } from "@/lib/format"
import { radius, useThemeColors } from "@/lib/theme" import { radius, useThemeColors } from "@/lib/theme"
import { api } from "@otunes/convex/_generated/api" import { api } from "@otunes/convex/_generated/api"
@@ -14,7 +13,6 @@ export function ProfileHeaderButton() {
const openSettings = useOpenSettings() const openSettings = useOpenSettings()
const colors = useThemeColors() const colors = useThemeColors()
const user = useCachedQuery(api.auth.currentUser) const user = useCachedQuery(api.auth.currentUser)
const imageUrl = useProfileImageUrl(user?.image)
if (tabletLayout) return null if (tabletLayout) return null
@@ -35,9 +33,9 @@ export function ProfileHeaderButton() {
}, },
]} ]}
> >
{imageUrl ? ( {user?.image ? (
<Image <Image
source={{ uri: imageUrl }} source={{ uri: user.image }}
style={styles.image} style={styles.image}
contentFit="cover" contentFit="cover"
/> />
+1 -3
View File
@@ -4,7 +4,6 @@ import { useIsFocused } from "expo-router"
import { Platform, type ViewProps } from "react-native" import { Platform, type ViewProps } from "react-native"
import { useCachedQuery } from "@/hooks/use-cached-query" import { useCachedQuery } from "@/hooks/use-cached-query"
import { useProfileImageUrl } from "@/hooks/use-profile-image-url"
import { initialsFromName } from "@/lib/format" import { initialsFromName } from "@/lib/format"
import { api } from "@otunes/convex/_generated/api" import { api } from "@otunes/convex/_generated/api"
@@ -23,7 +22,6 @@ const NativeSidebar =
export function TabletSidebar() { export function TabletSidebar() {
const user = useCachedQuery(api.auth.currentUser) const user = useCachedQuery(api.auth.currentUser)
const imageUrl = useProfileImageUrl(user?.image)
const openSettings = useOpenSettings() const openSettings = useOpenSettings()
const active = useIsFocused() const active = useIsFocused()
@@ -33,7 +31,7 @@ export function TabletSidebar() {
style={{ position: "absolute", width: 0, height: 0 }} style={{ position: "absolute", width: 0, height: 0 }}
accountName={user?.name ?? "Account"} accountName={user?.name ?? "Account"}
initials={initialsFromName(user?.name ?? "Me")} initials={initialsFromName(user?.name ?? "Me")}
imageURL={imageUrl} imageURL={user?.image}
active={active} active={active}
onProfilePress={openSettings} onProfilePress={openSettings}
/> />
+10 -12
View File
@@ -203,19 +203,17 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
useEffect(() => { useEffect(() => {
if (!isSignedIn) return if (!isSignedIn) return
store.setTransport({ store.setTransport((state) =>
sync: (state) => syncPlaybackStateMutation({
syncPlaybackStateMutation({ songQueue: state.queue,
songQueue: state.queue, queueHistory: state.history,
queueHistory: state.history, shuffleEnabled: state.shuffleEnabled,
shuffleEnabled: state.shuffleEnabled, repeatEnabled: state.repeatEnabled,
repeatEnabled: state.repeatEnabled, currentSongProgress: state.progressSeconds,
currentSongProgress: state.progressSeconds, })
}), )
loadProgress: () => convex.query(api.playback.getSongProgress, {}),
})
return () => store.setTransport(null) return () => store.setTransport(null)
}, [store, isSignedIn, syncPlaybackStateMutation, convex]) }, [store, isSignedIn, syncPlaybackStateMutation])
useEffect(() => { useEffect(() => {
if (!serverPlayback) return if (!serverPlayback) return
@@ -1,13 +0,0 @@
import { useServerConfig } from "@/contexts/server-config"
/**
* Resolves `currentUser.image` to a loadable URI. Stored avatars come back as
* paths on the oTunes web server; legacy ones are data URLs.
*/
export function useProfileImageUrl(image: string | undefined) {
const { config } = useServerConfig()
if (!image?.startsWith("/")) {
return image
}
return config ? `${config.serverUrl.replace(/\/+$/, "")}${image}` : undefined
}
@@ -1,7 +1,6 @@
import { fetchQuery } from "convex/nextjs" import { fetchQuery } from "convex/nextjs"
import { convexServerOptions } from "@/lib/convex-server" import { convexServerOptions } from "@/lib/convex-server"
import { api } from "@otunes/convex/_generated/api" import { api } from "@otunes/convex/_generated/api"
import type { Id } from "@otunes/convex/_generated/dataModel"
import { Metadata } from "next" import { Metadata } from "next"
interface PageProps { interface PageProps {
@@ -12,12 +11,12 @@ export async function generateMetadata({
params, params,
}: PageProps): Promise<Metadata> { }: PageProps): Promise<Metadata> {
const { id } = await params const { id } = await params
const detail = await fetchQuery( const artists = await fetchQuery(
api.library.browseArtistDetail, api.library.browseArtists,
{ id: id as Id<"artists"> }, {},
convexServerOptions() convexServerOptions()
).catch(() => null) )
const selectedArtist = detail?.artist const selectedArtist = artists.find((artist) => artist.id === id)
return { return {
title: `${selectedArtist ? `${selectedArtist.name}` : "oTunes"}`, title: `${selectedArtist ? `${selectedArtist.name}` : "oTunes"}`,
+2 -2
View File
@@ -10,10 +10,10 @@ export async function GET(
const { id } = await params const { id } = await params
try { try {
const cover = await getConvexClient().query(api.library.getAlbumCover, { const album = await getConvexClient().query(api.library.getAlbum, {
id: id as Id<"albums">, id: id as Id<"albums">,
}) })
return serveCoverFile(cover, request) return serveCoverFile(album?.cover, request)
} catch { } catch {
return new Response("Not found", { status: 404 }) return new Response("Not found", { status: 404 })
} }
+2 -2
View File
@@ -10,10 +10,10 @@ export async function GET(
const { id } = await params const { id } = await params
try { try {
const cover = await getConvexClient().query(api.library.getArtistCover, { const artist = await getConvexClient().query(api.library.getArtist, {
id: id as Id<"artists">, id: id as Id<"artists">,
}) })
return serveCoverFile(cover, request) return serveCoverFile(artist?.cover, request)
} catch { } catch {
return new Response("Not found", { status: 404 }) return new Response("Not found", { status: 404 })
} }
@@ -9,10 +9,10 @@ export async function GET(
) { ) {
const { id } = await params const { id } = await params
try { try {
const cover = await getConvexClient().query(api.library.getPlaylistCover, { const playlist = await getConvexClient().query(api.library.getPlaylist, {
id: id as Id<"playlists">, id: id as Id<"playlists">,
}) })
return serveCoverFile(cover, request) return serveCoverFile(playlist?.cover, request)
} catch { } catch {
return new Response("Not found", { status: 404 }) return new Response("Not found", { status: 404 })
} }
+6 -2
View File
@@ -1,4 +1,6 @@
import { getSongSource } from "@/lib/server-song" import { api } from "@otunes/convex/_generated/api"
import type { Id } from "@otunes/convex/_generated/dataModel"
import { getConvexClient } from "@/lib/convex-server"
import { ensureHlsJob, HLS_SEGMENT_SECONDS } from "@/lib/server-hls" import { ensureHlsJob, HLS_SEGMENT_SECONDS } from "@/lib/server-hls"
import { NextRequest } from "next/server" import { NextRequest } from "next/server"
@@ -15,7 +17,9 @@ export async function GET(
const { id } = await params const { id } = await params
try { try {
const song = await getSongSource(id) const song = (await getConvexClient().query(api.library.getSong, {
id: id as Id<"songs">,
}))!
const quality = request.nextUrl.searchParams.get("quality") const quality = request.nextUrl.searchParams.get("quality")
const preferAtmos = const preferAtmos =
@@ -1,4 +1,6 @@
import { getSongSource } from "@/lib/server-song" import { api } from "@otunes/convex/_generated/api"
import type { Id } from "@otunes/convex/_generated/dataModel"
import { getConvexClient } from "@/lib/convex-server"
import { import {
ensureHlsJob, ensureHlsJob,
getExistingHlsJob, getExistingHlsJob,
@@ -34,11 +36,16 @@ export async function GET(
const quality = request.nextUrl.searchParams.get("quality") const quality = request.nextUrl.searchParams.get("quality")
const preferAtmos = const preferAtmos =
request.nextUrl.searchParams.get("preferAtmos") === "true" request.nextUrl.searchParams.get("preferAtmos") === "true"
// Resolve the source even when a job is cached so every segment is authorized. const existingJob = getExistingHlsJob(id, quality, preferAtmos)
const song = await getSongSource(id)
const job = const job =
getExistingHlsJob(id, quality, preferAtmos) ?? existingJob ??
(await ensureHlsJob(song, quality, preferAtmos)) (await ensureHlsJob(
(await getConvexClient().query(api.library.getSong, {
id: id as Id<"songs">,
}))!,
quality,
preferAtmos
))
if (segmentIndex >= job.segmentCount) { if (segmentIndex >= job.segmentCount) {
return new Response("Segment not found", { status: 404 }) return new Response("Segment not found", { status: 404 })
} }
+19 -10
View File
@@ -1,11 +1,13 @@
import { api } from "@otunes/convex/_generated/api"
import type { Id } from "@otunes/convex/_generated/dataModel"
import { audioContentTypeForPath } from "@/lib/audio-content-type" import { audioContentTypeForPath } from "@/lib/audio-content-type"
import { seekableLosslessFile } from "@/lib/server-lossless" import { seekableLosslessFile } from "@/lib/server-lossless"
import { getSongSource } from "@/lib/server-song" import { getConvexClient } from "@/lib/convex-server"
import { audioInfo } from "@/lib/server-audio-info"
import { ffmpegToReadableStream, streamFile } from "@/lib/server-audio-stream" import { ffmpegToReadableStream, streamFile } from "@/lib/server-audio-stream"
import { spawnFfmpeg } from "@/lib/server-ffmpeg"
import { NextRequest, NextResponse, userAgent } from "next/server" import { NextRequest, NextResponse, userAgent } from "next/server"
import { spawn } from "node:child_process"
import fs from "node:fs/promises" import fs from "node:fs/promises"
import * as music from "music-metadata"
function parseByteRange(rangeHeader: string | null, fileSize: number) { function parseByteRange(rangeHeader: string | null, fileSize: number) {
if (!rangeHeader) { if (!rangeHeader) {
@@ -116,7 +118,9 @@ export async function GET(
const { browser } = userAgent(request) const { browser } = userAgent(request)
try { try {
const song = await getSongSource(id) const song = (await getConvexClient().query(api.library.getSong, {
id: id as Id<"songs">,
}))!
const quality = request.nextUrl.searchParams.get("quality") as const quality = request.nextUrl.searchParams.get("quality") as
"low" | "medium" | "high" | "lossless" | null "low" | "medium" | "high" | "lossless" | null
@@ -147,15 +151,14 @@ export async function GET(
transcodeNeeded = false transcodeNeeded = false
} }
const metadata = await music.parseFile(song.files[originalCodec])
if (!transcodeNeeded && originalCodec === "lossless") { if (!transcodeNeeded && originalCodec === "lossless") {
// Native iOS playback does not identify itself as Safari. // Native iOS playback does not identify itself as Safari.
const acceptsAlac = const acceptsAlac =
browser.name === "Safari" || browser.name === "Safari" ||
request.nextUrl.searchParams.get("losslessFormat") === "alac" request.nextUrl.searchParams.get("losslessFormat") === "alac"
if ( if (acceptsAlac && metadata.format.codec === "ALAC") {
acceptsAlac &&
(await audioInfo(song.files[originalCodec])).codec === "ALAC"
) {
try { try {
return await streamFileResponse( return await streamFileResponse(
request, request,
@@ -180,6 +183,11 @@ export async function GET(
(originalCodec === "atmos" || originalCodec === "normal") (originalCodec === "atmos" || originalCodec === "normal")
) { ) {
// TODO: Dolby Atmos doesn't work on Google Chrome // TODO: Dolby Atmos doesn't work on Google Chrome
console.log(
metadata.format.codec,
metadata.format.container,
metadata.format.codecProfile
)
try { try {
return await streamFileResponse( return await streamFileResponse(
request, request,
@@ -192,6 +200,7 @@ export async function GET(
} }
const ffmpegArgs = [ const ffmpegArgs = [
"-nostdin",
"-i", "-i",
song.files[originalCodec], song.files[originalCodec],
"-c:a", "-c:a",
@@ -205,8 +214,8 @@ export async function GET(
try { try {
// TODO: Fix seeking for this // TODO: Fix seeking for this
const ffmpeg = await spawnFfmpeg(ffmpegArgs, request.signal) const ffmpegProcess = spawn("ffmpeg", ffmpegArgs)
const stream = ffmpegToReadableStream(ffmpeg) const stream = ffmpegToReadableStream(ffmpegProcess)
return new NextResponse(stream, { return new NextResponse(stream, {
status: 200, status: 200,
@@ -1,55 +0,0 @@
import { api } from "@otunes/convex/_generated/api"
import type { Id } from "@otunes/convex/_generated/dataModel"
import sharp from "sharp"
import { getConvexClient, getConvexServerUrl } from "@/lib/convex-server"
const AVATAR_SIZE = 256
/**
* Serves a profile photo from Convex storage, downscaled. URLs carry the
* storage id (`?v=`), so a new photo gets a new URL and responses can be
* cached for good.
*/
export async function GET(
_request: Request,
{ params }: { params: Promise<{ id: string }> }
) {
const { id } = await params
try {
const storageUrl = await getConvexClient().query(
api.users.getProfileImageUrl,
{ userId: id as Id<"users"> }
)
if (!storageUrl) {
return new Response("Not found", { status: 404 })
}
// The backend builds storage URLs from its public origin, which may not
// be reachable from here. Fetch the same path from the internal URL.
const { pathname, search } = new URL(storageUrl)
const upstream = await fetch(
new URL(pathname + search, getConvexServerUrl())
)
if (!upstream.ok) {
return new Response("Not found", { status: 404 })
}
const data = await sharp(Buffer.from(await upstream.arrayBuffer()))
.rotate()
.resize(AVATAR_SIZE, AVATAR_SIZE, {
fit: "cover",
withoutEnlargement: true,
})
.webp({ quality: 85 })
.toBuffer()
return new Response(new Uint8Array(data), {
headers: {
"Content-Type": "image/webp",
"Cache-Control": "public, max-age=31536000, immutable",
},
})
} catch {
return new Response("Not found", { status: 404 })
}
}
+2 -2
View File
@@ -13,7 +13,7 @@ import {
MediaContextMenuItems, MediaContextMenuItems,
type MediaContextAction, type MediaContextAction,
} from "@/components/media-context-menu" } from "@/components/media-context-menu"
import { usePlaybackActions } from "@/components/playback-provider" import { usePlayback } from "@/components/playback-provider"
import { useQueueMediaActions } from "@/hooks/use-queue-media-actions" import { useQueueMediaActions } from "@/hooks/use-queue-media-actions"
import { api } from "@otunes/convex/_generated/api" import { api } from "@otunes/convex/_generated/api"
import { Button } from "@/components/ui/button" import { Button } from "@/components/ui/button"
@@ -48,7 +48,7 @@ export function AlbumCard({ album }: { album: BrowseAlbum }) {
const cacheScope = useCacheScope() const cacheScope = useCacheScope()
const { openAddAlbumToPlaylist } = useAddToPlaylist() const { openAddAlbumToPlaylist } = useAddToPlaylist()
const { isAlbumFavorite, toggleAlbumFavorite } = useFavorites() const { isAlbumFavorite, toggleAlbumFavorite } = useFavorites()
const { playAlbum } = usePlaybackActions() const { playAlbum } = usePlayback()
const { runQueueAction, createStation } = useQueueMediaActions() const { runQueueAction, createStation } = useQueueMediaActions()
const [menuOpen, setMenuOpen] = React.useState(false) const [menuOpen, setMenuOpen] = React.useState(false)
const [hovered, setHovered] = React.useState(false) const [hovered, setHovered] = React.useState(false)
+248 -78
View File
@@ -4,47 +4,47 @@ import { PageHeader } from "@/components/library-skeletons"
import * as React from "react" import * as React from "react"
import Image from "next/image" import Image from "next/image"
import Link from "next/link" import Link from "next/link"
import { Play, Share2, Shuffle } from "lucide-react" import { Play, Share2, Shuffle, Star } from "lucide-react"
import { AudioFormatBadge } from "@/components/audio-format-badge" import { AudioFormatBadge } from "@/components/audio-format-badge"
import { MediaCollectionFooter } from "@/components/media-collection-footer" import { MediaCollectionFooter } from "@/components/media-collection-footer"
import { TrackNumberPlayButton } from "@/components/track-number-play-button"
import { useAddToPlaylist } from "@/components/add-to-playlist-provider"
import { FavoriteMediaButton } from "@/components/favorite-media-button" import { FavoriteMediaButton } from "@/components/favorite-media-button"
import { useFavorites } from "@/components/favorites-provider" import { useFavorites } from "@/components/favorites-provider"
import { import { usePlayback } from "@/components/playback-provider"
useCurrentSongId,
usePlaybackActions,
} from "@/components/playback-provider"
import { copyAlbumLink } from "@/lib/media-links" import { copyAlbumLink } from "@/lib/media-links"
import { import {
MediaContextMenu, MediaContextMenu,
type MediaContextAction, type MediaContextAction,
} from "@/components/media-context-menu" } from "@/components/media-context-menu"
import { TrackRow } from "@/components/track-row"
import { Button } from "@/components/ui/button" import { Button } from "@/components/ui/button"
import { ScrollArea } from "@/components/ui/scroll-area" import { ScrollArea } from "@/components/ui/scroll-area"
import { 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 { import { useQueueMediaActions } from "@/hooks/use-queue-media-actions"
useMediaActions,
useTrackListMediaAction,
} from "@/hooks/use-media-actions"
import { useTrackSelection } from "@/hooks/use-track-selection" import { useTrackSelection } from "@/hooks/use-track-selection"
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils"
import type { Id } from "@otunes/convex/_generated/dataModel" import type { Id } from "@otunes/convex/_generated/dataModel"
import type { import type { BrowseAlbumDetail, BrowseAlbumTrack } from "@otunes/convex/types"
BrowseAlbumDetail,
BrowseAlbumTrack,
BrowseSong,
} from "@otunes/convex/types"
import { import {
getSelectionRangePositions, getSelectionRangePositions,
isInSelectionRange,
ALBUM_TRACK_ROW,
ALBUM_TRACK_TITLE,
SelectionRangeHighlight,
TRACK_LIST_CONTAINER, TRACK_LIST_CONTAINER,
TrackRowActiveHighlight,
TrackRowHoverHighlight,
TRACK_ROW_PADDING,
type SelectionRangePosition,
} from "@/lib/selection-range-styles" } from "@/lib/selection-range-styles"
import { albumCoverUrl } from "@/lib/cover-urls" import { albumCoverUrl } from "@/lib/cover-urls"
import { sumDurationSeconds } from "@/lib/media-summary" import { sumDurationSeconds } from "@/lib/media-summary"
import { albumDetailSongs, rememberSongs } from "@/lib/song-cache" import { albumDetailSongs, rememberSongs } from "@/lib/song-cache"
import { formatDuration } from "@/lib/format-duration"
function formatMetadata(genre: string | null, year: number | null): string | null { function formatMetadata(genre: string | null, year: number | null): string | null {
const parts: string[] = [] const parts: string[] = []
@@ -95,6 +95,159 @@ function groupAlbumTracksByDisk(tracks: BrowseAlbumTrack[]): AlbumTrackSection[]
return sections return sections
} }
function TrackRow({
track,
sectionIndex,
artist,
isActive,
isSelected,
selectionPosition,
isFavorite,
selectedCount,
onSelect,
onPointerDown,
onToggleFavorite,
onPrepareContextMenu,
onMediaAction,
isNowPlaying,
onPlay,
albumId,
}: {
track: BrowseAlbumTrack
sectionIndex: number
artist: BrowseAlbumDetail["artist"]
albumId: string
isActive: boolean
isSelected: boolean
selectionPosition: SelectionRangePosition
isFavorite: boolean
selectedCount: number
onSelect: (event: React.MouseEvent) => void
onPointerDown: (event: React.MouseEvent) => void
onToggleFavorite: () => void
onPrepareContextMenu: () => void
onMediaAction: (action: MediaContextAction, trackId: string) => void
isNowPlaying: boolean
onPlay: () => void
}) {
const displayTrack =
track.track > 0 ? track.track : sectionIndex + 1
const inRange = isInSelectionRange(selectionPosition)
return (
<div
role="button"
tabIndex={0}
onMouseDown={onPointerDown}
onClick={onSelect}
onDoubleClick={(event) => {
event.preventDefault()
onPlay()
}}
onKeyDown={(event) => {
if (event.key === "Enter" || event.key === " ") {
event.preventDefault()
onSelect(event as unknown as React.MouseEvent)
}
}}
className={cn(
"group relative w-full cursor-pointer select-none py-2.5 text-left text-sm transition-colors",
inRange && "text-primary-foreground"
)}
>
<SelectionRangeHighlight position={selectionPosition} />
{!inRange && isActive ? <TrackRowActiveHighlight /> : null}
{!inRange && !isActive ? <TrackRowHoverHighlight /> : null}
<div
className={cn("relative z-10", ALBUM_TRACK_ROW, TRACK_ROW_PADDING)}
>
<div className="flex shrink-0 items-center justify-center">
<Button
variant="ghost"
size="icon-sm"
className={cn(
"size-8 opacity-0 transition-opacity group-hover:opacity-100",
inRange
? "text-primary-foreground hover:bg-white/15 hover:text-primary-foreground"
: "text-primary hover:text-primary",
(isFavorite || isActive || isSelected) && "opacity-100"
)}
aria-label={
isFavorite
? `Remove ${track.title} from favorites`
: `Favorite ${track.title}`
}
onClick={(event) => {
event.stopPropagation()
onToggleFavorite()
}}
>
<Star
className={cn(
"size-4",
isFavorite && (inRange ? "fill-current" : "fill-primary")
)}
/>
</Button>
</div>
<TrackNumberPlayButton
displayTrack={displayTrack}
title={track.title}
isActive={isActive}
isNowPlaying={isNowPlaying}
inRange={inRange}
onPlay={onPlay}
/>
<div className="min-w-0 flex-1">
<div className={ALBUM_TRACK_TITLE}>{track.title}</div>
{track.artists ? (
<p
className={cn(
"truncate text-xs",
inRange
? "text-primary-foreground/80"
: "text-muted-foreground"
)}
>
{track.artists.join(", ")}
</p>
) : null}
</div>
<span
className={cn(
"shrink-0 text-right tabular-nums",
inRange ? "text-primary-foreground" : "text-muted-foreground"
)}
>
{formatDuration(track.durationSeconds)}
</span>
<MediaContextMenu
label={`More options for ${track.title}`}
stationArtistId={artist.id}
selectedCount={selectedCount}
inSelectionRange={inRange}
onOpenMenu={onPrepareContextMenu}
onAction={(action) => onMediaAction(action, track.id)}
favorited={isFavorite}
navigation={{
artist: { id: artist.id },
album: { id: albumId },
}}
share={{
type: "song",
albumId,
songId: track.id,
}}
/>
</div>
</div>
)
}
export function AlbumView({ export function AlbumView({
album, album,
highlightedSongId, highlightedSongId,
@@ -102,15 +255,17 @@ export function AlbumView({
album: BrowseAlbumDetail album: BrowseAlbumDetail
highlightedSongId?: string highlightedSongId?: string
}) { }) {
const { openAddToPlaylist } = useAddToPlaylist()
const { const {
isSongFavorite, isSongFavorite,
isAlbumFavorite, isAlbumFavorite,
toggleSongFavorite, toggleSongFavorite,
toggleAlbumFavorite, toggleAlbumFavorite,
favoriteSongs,
} = useFavorites() } = useFavorites()
const currentSongId = useCurrentSongId() const { currentSong, playFromSong, playAlbum, playAlbumShuffled } =
const { playFromSong, playAlbum, playAlbumShuffled } = usePlaybackActions() usePlayback()
const { runSongsAction } = useMediaActions() const { runQueueAction, createStation } = useQueueMediaActions()
const albumSongIds = React.useMemo( const albumSongIds = React.useMemo(
() => album.tracks.map((track) => track.id as Id<"songs">), () => album.tracks.map((track) => track.id as Id<"songs">),
[album.tracks] [album.tracks]
@@ -148,6 +303,7 @@ export function AlbumView({
const { const {
selectedIds, selectedIds,
selectedCount, selectedCount,
isSelected,
handleSelect, handleSelect,
handlePointerDown, handlePointerDown,
prepareContextMenu, prepareContextMenu,
@@ -175,55 +331,55 @@ export function AlbumView({
return indexById return indexById
}, [album.tracks]) }, [album.tracks])
const trackSongs = React.useMemo( function handleMediaAction(
() => action: MediaContextAction,
new Map<string, BrowseSong>( fallbackTrackId?: string
album.tracks.map((track) => [ ) {
track.id, const targetIds =
{ selectedIds.size > 0
id: track.id, ? Array.from(selectedIds)
title: track.title, : fallbackTrackId
durationSeconds: track.durationSeconds, ? [fallbackTrackId]
artist: album.artist, : activeTrackId
album: { id: album.id, title: album.title, cover: album.cover }, ? [activeTrackId]
}, : []
]) switch (action) {
), case "create-station":
[album.tracks, album.artist, album.id, album.title, album.cover] void createStation(album.artist.id)
) break
case "favorite":
const handleMediaAction = useTrackListMediaAction({ void favoriteSongs(targetIds as Id<"songs">[])
selectedIds, break
artistId: album.artist.id, case "playlist":
}) openAddToPlaylist(targetIds as Id<"songs">[])
break
const handleRowSelect = React.useCallback( case "play-next":
(index: number, event: React.MouseEvent) => { case "play-last":
const trackId = album.tracks[index].id case "shuffle":
handleSelect(trackId, index, event) void runQueueAction(action, targetIds as Id<"songs">[])
setActiveTrackId(trackId) break
}, }
[album.tracks, handleSelect] }
)
const handleRowPlay = React.useCallback(
(index: number) => {
void playFromSong(album.tracks[index].id, albumSongIds, `album:${album.id}`)
},
[album.tracks, album.id, albumSongIds, playFromSong]
)
const handleToggleFavorite = React.useCallback(
(songId: string) => void toggleSongFavorite(songId as Id<"songs">),
[toggleSongFavorite]
)
function handleAlbumMediaAction(action: MediaContextAction) { function handleAlbumMediaAction(action: MediaContextAction) {
if (action === "favorite") { const targetIds = album.tracks.map((track) => track.id as Id<"songs">)
void toggleAlbumFavorite(album.id as Id<"albums">)
return switch (action) {
case "create-station":
void createStation(album.artist.id)
break
case "favorite":
void toggleAlbumFavorite(album.id as Id<"albums">)
break
case "playlist":
openAddToPlaylist(targetIds)
break
case "play-next":
case "play-last":
case "shuffle":
void runQueueAction(action, targetIds)
break
} }
runSongsAction(action, albumSongIds, album.artist.id)
} }
return ( return (
@@ -357,25 +513,39 @@ export function AlbumView({
return ( return (
<TrackRow <TrackRow
key={track.id} key={track.id}
variant="album" track={track}
song={trackSongs.get(track.id)!} sectionIndex={sectionTrackIndex}
index={listIndex} artist={album.artist}
trackNumber={ albumId={album.id}
track.track > 0 ? track.track : sectionTrackIndex + 1
}
subtitle={track.artists?.join(", ")}
isActive={track.id === activeTrackId} isActive={track.id === activeTrackId}
isSelected={isSelected(track.id)}
selectionPosition={selectionPositions[listIndex]} selectionPosition={selectionPositions[listIndex]}
isFavorite={isSongFavorite(track.id)} isFavorite={isSongFavorite(track.id)}
selectedCount={selectedCount} selectedCount={
selectionStationArtistId={album.artist.id} isSelected(track.id) && selectedCount > 0
isNowPlaying={currentSongId === track.id} ? selectedCount
: 1
}
onPointerDown={handlePointerDown} onPointerDown={handlePointerDown}
onSelect={handleRowSelect} onSelect={(event) => {
onPlay={handleRowPlay} handleSelect(track.id, listIndex, event)
onToggleFavorite={handleToggleFavorite} setActiveTrackId(track.id)
onPrepareContextMenu={prepareContextMenu} }}
onToggleFavorite={() =>
void toggleSongFavorite(track.id as Id<"songs">)
}
onPrepareContextMenu={() =>
prepareContextMenu(track.id)
}
onMediaAction={handleMediaAction} onMediaAction={handleMediaAction}
isNowPlaying={currentSong?.id === track.id}
onPlay={() =>
void playFromSong(
track.id as Id<"songs">,
albumSongIds,
`album:${album.id}`
)
}
/> />
) )
})} })}
+40 -6
View File
@@ -4,19 +4,27 @@ import { PageHeader } from "@/components/library-skeletons"
import * as React from "react" import * as React from "react"
import Image from "next/image" import Image from "next/image"
import { Play, Shuffle } from "lucide-react" import { Play, Shuffle } from "lucide-react"
import { useConvex } from "convex/react"
import { useCacheScope } from "@/components/persistent-cache-provider"
import { useAddToPlaylist } from "@/components/add-to-playlist-provider"
import { useFavorites } from "@/components/favorites-provider" import { useFavorites } from "@/components/favorites-provider"
import { usePlaybackActions } from "@/components/playback-provider" import { usePlayback } from "@/components/playback-provider"
import { useMediaActions } from "@/hooks/use-media-actions" import { useQueueMediaActions } from "@/hooks/use-queue-media-actions"
import { AlbumCard } from "@/components/album-card" import { AlbumCard } from "@/components/album-card"
import { FavoriteMediaButton } from "@/components/favorite-media-button" import { FavoriteMediaButton } from "@/components/favorite-media-button"
import { MediaContextMenu } from "@/components/media-context-menu" import {
MediaContextMenu,
type MediaContextAction,
} from "@/components/media-context-menu"
import { Button } from "@/components/ui/button" import { Button } from "@/components/ui/button"
import { ScrollArea } from "@/components/ui/scroll-area" import { ScrollArea } from "@/components/ui/scroll-area"
import { api } from "@otunes/convex/_generated/api"
import type { Id } from "@otunes/convex/_generated/dataModel" import type { Id } from "@otunes/convex/_generated/dataModel"
import type { BrowseAlbum, BrowseArtist } from "@otunes/convex/types" import type { BrowseAlbum, BrowseArtist } from "@otunes/convex/types"
import { albumGridClassName } from "@/lib/album-grid-classes" import { albumGridClassName } from "@/lib/album-grid-classes"
import { artistCoverUrl } from "@/lib/cover-urls" import { artistCoverUrl } from "@/lib/cover-urls"
import { fetchCachedQuery } from "@otunes/convex/client/cached-query"
export function ArtistView({ export function ArtistView({
artist, artist,
@@ -26,8 +34,34 @@ export function ArtistView({
albums: BrowseAlbum[] albums: BrowseAlbum[]
}) { }) {
const { isArtistFavorite, toggleArtistFavorite } = useFavorites() const { isArtistFavorite, toggleArtistFavorite } = useFavorites()
const { playArtist, playArtistShuffled } = usePlaybackActions() const { openAddArtistToPlaylist } = useAddToPlaylist()
const { runArtistAction } = useMediaActions() const { playArtist, playArtistShuffled } = usePlayback()
const { runQueueAction } = useQueueMediaActions()
const convex = useConvex()
const cacheScope = useCacheScope()
async function handleMediaAction(action: MediaContextAction) {
switch (action) {
case "favorite":
void toggleArtistFavorite(artist.id as Id<"artists">)
break
case "playlist":
void openAddArtistToPlaylist(artist.id as Id<"artists">)
break
case "play-next":
case "play-last":
case "shuffle": {
const songIds = await fetchCachedQuery(
convex,
cacheScope,
api.playlists.getOrderedArtistSongIds,
{ artistId: artist.id as Id<"artists"> }
)
void runQueueAction(action, songIds)
break
}
}
}
return ( return (
<div className="flex h-svh flex-col"> <div className="flex h-svh flex-col">
@@ -84,7 +118,7 @@ export function ArtistView({
label={`More options for ${artist.name}`} label={`More options for ${artist.name}`}
selectedCount={albums.length} selectedCount={albums.length}
onOpenMenu={() => {}} onOpenMenu={() => {}}
onAction={(action) => void runArtistAction(action, artist.id)} onAction={handleMediaAction}
favorited={isArtistFavorite(artist.id)} favorited={isArtistFavorite(artist.id)}
trackRowTrigger={false} trackRowTrigger={false}
triggerVariant="secondary" triggerVariant="secondary"
+66 -40
View File
@@ -4,24 +4,27 @@ import * as React from "react"
import Image from "next/image" import Image from "next/image"
import Link from "next/link" import Link from "next/link"
import { ChevronRightIcon, Play, Shuffle } from "lucide-react" import { ChevronRightIcon, Play, Shuffle } from "lucide-react"
import { useConvex } from "convex/react"
import { useCacheScope } from "@/components/persistent-cache-provider"
import { AlbumCard } from "@/components/album-card" import { AlbumCard } from "@/components/album-card"
import { useAddToPlaylist } from "@/components/add-to-playlist-provider"
import { FavoriteMediaButton } from "@/components/favorite-media-button" import { FavoriteMediaButton } from "@/components/favorite-media-button"
import { useFavorites } from "@/components/favorites-provider" import { useFavorites } from "@/components/favorites-provider"
import { import {
MediaContextMenu, MediaContextMenu,
type MediaContextAction, type MediaContextAction,
MediaContextMenuArea,
type MediaContextMenuProps,
} from "@/components/media-context-menu" } from "@/components/media-context-menu"
import { usePlaybackActions } from "@/components/playback-provider" import { usePlayback } from "@/components/playback-provider"
import { useMediaActions } from "@/hooks/use-media-actions" import { useQueueMediaActions } from "@/hooks/use-queue-media-actions"
import { Button } from "@/components/ui/button" import { Button } from "@/components/ui/button"
import { ScrollArea } from "@/components/ui/scroll-area" import { ScrollArea } from "@/components/ui/scroll-area"
import { api } from "@otunes/convex/_generated/api"
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils"
import type { Id } from "@otunes/convex/_generated/dataModel" import type { Id } from "@otunes/convex/_generated/dataModel"
import type { BrowseAlbum, BrowseArtist } from "@otunes/convex/types" import type { BrowseAlbum, BrowseArtist } from "@otunes/convex/types"
import { artistCoverUrl } from "@/lib/cover-urls" import { artistCoverUrl } from "@/lib/cover-urls"
import { fetchCachedQuery } from "@otunes/convex/client/cached-query"
function ArtistAvatar({ artist }: { artist: BrowseArtist }) { function ArtistAvatar({ artist }: { artist: BrowseArtist }) {
return ( return (
@@ -52,42 +55,36 @@ function ArtistListItem({
onSelect: () => void onSelect: () => void
onMediaAction: (action: MediaContextAction) => void onMediaAction: (action: MediaContextAction) => void
}) { }) {
const menu: MediaContextMenuProps = {
label: `More options for ${artist.name}`,
selectedCount: albumCount,
inSelectionRange: isSelected,
onOpenMenu: () => {},
onAction: onMediaAction,
favorited: isFavorite,
share: { type: "artist", artistId: artist.id },
}
return ( return (
<MediaContextMenuArea menu={menu}> <div
<div className={cn(
"group flex w-full min-w-0 items-center gap-1 overflow-hidden pr-1",
isSelected ? "bg-primary text-primary-foreground" : "hover:bg-muted/50"
)}
>
<button
type="button"
onClick={onSelect}
className={cn( className={cn(
"group flex w-full min-w-0 items-center gap-1 overflow-hidden pr-1", "flex min-w-0 flex-1 items-center gap-3 overflow-hidden px-4 py-2.5 text-left text-sm transition-colors",
isSelected isSelected ? "text-primary-foreground" : ""
? "bg-primary text-primary-foreground"
: "hover:bg-muted/50"
)} )}
> >
<button <ArtistAvatar artist={artist} />
type="button" <span className="min-w-0 flex-1 truncate font-medium">
onClick={onSelect} {artist.name}
className={cn( </span>
"flex min-w-0 flex-1 items-center gap-3 overflow-hidden px-4 py-2.5 text-left text-sm transition-colors", </button>
isSelected ? "text-primary-foreground" : "" <MediaContextMenu
)} label={`More options for ${artist.name}`}
> selectedCount={albumCount}
<ArtistAvatar artist={artist} /> inSelectionRange={isSelected}
<span className="min-w-0 flex-1 truncate font-medium"> onOpenMenu={() => {}}
{artist.name} onAction={onMediaAction}
</span> favorited={isFavorite}
</button> share={{ type: "artist", artistId: artist.id }}
<MediaContextMenu {...menu} /> />
</div> </div>
</MediaContextMenuArea>
) )
} }
@@ -113,9 +110,12 @@ export function ArtistsView({
} }
return sortedArtists[0]?.id ?? "" return sortedArtists[0]?.id ?? ""
}, [artistId, sortedArtists]) }, [artistId, sortedArtists])
const convex = useConvex()
const cacheScope = useCacheScope()
const { openAddArtistToPlaylist } = useAddToPlaylist()
const { isArtistFavorite, toggleArtistFavorite } = useFavorites() const { isArtistFavorite, toggleArtistFavorite } = useFavorites()
const { playArtist, playArtistShuffled } = usePlaybackActions() const { playArtist, playArtistShuffled } = usePlayback()
const { runArtistAction } = useMediaActions() const { runQueueAction } = useQueueMediaActions()
const selectedArtist = sortedArtists.find( const selectedArtist = sortedArtists.find(
(artist) => artist.id === selectedId (artist) => artist.id === selectedId
@@ -130,6 +130,32 @@ export function ArtistsView({
return counts return counts
}, [albums]) }, [albums])
async function handleMediaAction(
artistId: string,
action: MediaContextAction
) {
switch (action) {
case "favorite":
void toggleArtistFavorite(artistId as Id<"artists">)
break
case "playlist":
void openAddArtistToPlaylist(artistId as Id<"artists">)
break
case "play-next":
case "play-last":
case "shuffle": {
const songIds = await fetchCachedQuery(
convex,
cacheScope,
api.playlists.getOrderedArtistSongIds,
{ artistId: artistId as Id<"artists"> }
)
void runQueueAction(action, songIds)
break
}
}
}
return ( return (
<div className="flex min-h-0 flex-1"> <div className="flex min-h-0 flex-1">
<ScrollArea className="w-72 shrink-0 border-r"> <ScrollArea className="w-72 shrink-0 border-r">
@@ -143,7 +169,7 @@ export function ArtistsView({
isFavorite={isArtistFavorite(artist.id)} isFavorite={isArtistFavorite(artist.id)}
onSelect={() => onSelectArtist(artist.id)} onSelect={() => onSelectArtist(artist.id)}
onMediaAction={(action) => onMediaAction={(action) =>
void runArtistAction(action, artist.id) void handleMediaAction(artist.id, action)
} }
/> />
))} ))}
@@ -199,7 +225,7 @@ export function ArtistsView({
selectedCount={artistAlbums.length} selectedCount={artistAlbums.length}
onOpenMenu={() => {}} onOpenMenu={() => {}}
onAction={(action) => onAction={(action) =>
void runArtistAction(action, selectedArtist.id) void handleMediaAction(selectedArtist.id, action)
} }
favorited={isArtistFavorite(selectedArtist.id)} favorited={isArtistFavorite(selectedArtist.id)}
trackRowTrigger={false} trackRowTrigger={false}
+42 -113
View File
@@ -15,13 +15,6 @@ import {
} from "lucide-react" } from "lucide-react"
import { Button } from "@/components/ui/button" import { Button } from "@/components/ui/button"
import {
ContextMenu,
ContextMenuContent,
ContextMenuItem,
ContextMenuSeparator,
ContextMenuTrigger,
} from "@/components/ui/context-menu"
import { import {
DropdownMenu, DropdownMenu,
DropdownMenuContent, DropdownMenuContent,
@@ -60,28 +53,6 @@ function shouldShowShare(
return true return true
} }
// Lets the same items render inside a dropdown or a right-click menu.
const MenuKindContext = React.createContext<"dropdown" | "context">("dropdown")
/** Menu item that works in both `MediaContextMenu` and `MediaContextMenuArea`. */
export function MediaMenuItem(
props: React.ComponentProps<typeof DropdownMenuItem>
) {
return React.use(MenuKindContext) === "context" ? (
<ContextMenuItem {...props} />
) : (
<DropdownMenuItem {...props} />
)
}
export function MediaMenuSeparator() {
return React.use(MenuKindContext) === "context" ? (
<ContextMenuSeparator />
) : (
<DropdownMenuSeparator />
)
}
function actionLabel(base: string, selectedCount: number) { function actionLabel(base: string, selectedCount: number) {
return selectedCount > 1 ? `${base} (${selectedCount})` : base return selectedCount > 1 ? `${base} (${selectedCount})` : base
} }
@@ -112,86 +83,86 @@ export function MediaContextMenuItems({
<> <>
{showShare ? ( {showShare ? (
<> <>
<MediaMenuItem <DropdownMenuItem
className="justify-between" className="justify-between"
onClick={() => void copyMediaShareLink(share!)} onClick={() => void copyMediaShareLink(share!)}
> >
Share Share
<Share2 /> <Share2 />
</MediaMenuItem> </DropdownMenuItem>
<MediaMenuSeparator /> <DropdownMenuSeparator />
</> </>
) : null} ) : null}
<MediaMenuItem <DropdownMenuItem
className="justify-between" className="justify-between"
onClick={() => onAction("playlist")} onClick={() => onAction("playlist")}
> >
{actionLabel(playlistLabel, selectedCount)} {actionLabel(playlistLabel, selectedCount)}
<ListPlus /> <ListPlus />
</MediaMenuItem> </DropdownMenuItem>
<MediaMenuSeparator /> <DropdownMenuSeparator />
<MediaMenuItem <DropdownMenuItem
className="justify-between" className="justify-between"
onClick={() => onAction("play-next")} onClick={() => onAction("play-next")}
> >
{actionLabel("Play Next", selectedCount)} {actionLabel("Play Next", selectedCount)}
<ListStart /> <ListStart />
</MediaMenuItem> </DropdownMenuItem>
<MediaMenuItem <DropdownMenuItem
className="justify-between" className="justify-between"
onClick={() => onAction("play-last")} onClick={() => onAction("play-last")}
> >
{actionLabel("Play Last", selectedCount)} {actionLabel("Play Last", selectedCount)}
<ListEnd /> <ListEnd />
</MediaMenuItem> </DropdownMenuItem>
<MediaMenuItem <DropdownMenuItem
className="justify-between" className="justify-between"
onClick={() => onAction("shuffle")} onClick={() => onAction("shuffle")}
> >
{actionLabel("Shuffle", selectedCount)} {actionLabel("Shuffle", selectedCount)}
<Shuffle /> <Shuffle />
</MediaMenuItem> </DropdownMenuItem>
{stationArtistId ? ( {stationArtistId ? (
<MediaMenuItem <DropdownMenuItem
className="justify-between" className="justify-between"
onClick={() => onAction("create-station")} onClick={() => onAction("create-station")}
> >
Create Station Create Station
<Shuffle /> <Shuffle />
</MediaMenuItem> </DropdownMenuItem>
) : null} ) : null}
{artist || album ? ( {artist || album ? (
<> <>
<MediaMenuSeparator /> <DropdownMenuSeparator />
{artist ? ( {artist ? (
<MediaMenuItem asChild className="justify-between"> <DropdownMenuItem asChild className="justify-between">
<Link href={`/artist/${artist.id}`}> <Link href={`/artist/${artist.id}`}>
Go to Artist Go to Artist
<MicVocal /> <MicVocal />
</Link> </Link>
</MediaMenuItem> </DropdownMenuItem>
) : null} ) : null}
{album ? ( {album ? (
<MediaMenuItem asChild className="justify-between"> <DropdownMenuItem asChild className="justify-between">
<Link href={`/album/${album.id}`}> <Link href={`/album/${album.id}`}>
Go to Album Go to Album
<GalleryVerticalEnd /> <GalleryVerticalEnd />
</Link> </Link>
</MediaMenuItem> </DropdownMenuItem>
) : null} ) : null}
</> </>
) : null} ) : null}
{showFavorite ? ( {showFavorite ? (
<> <>
<MediaMenuSeparator /> <DropdownMenuSeparator />
<MediaMenuItem <DropdownMenuItem
variant={favorited ? "destructive" : "default"} variant={favorited ? "destructive" : "default"}
className="justify-between" className="justify-between"
onClick={() => onAction("favorite")} onClick={() => onAction("favorite")}
> >
{actionLabel(favorited ? "Unfavorite" : "Favorite", selectedCount)} {actionLabel(favorited ? "Unfavorite" : "Favorite", selectedCount)}
<Star /> <Star />
</MediaMenuItem> </DropdownMenuItem>
</> </>
) : null} ) : null}
</> </>
@@ -223,67 +194,6 @@ export function mediaContextMenuTriggerClassName({
) )
} }
export type MediaContextMenuProps = {
label: string
selectedCount: number
onOpenMenu: () => void
onAction: (action: MediaContextAction) => void
playlistLabel?: string
showFavorite?: boolean
favorited?: boolean
stationArtistId?: string
navigation?: MediaContextNavigation
share?: MediaShareContext
inSelectionRange?: boolean
/** When false, the trigger uses default button/dropdown styling (page headers). */
trackRowTrigger?: boolean
triggerClassName?: string
triggerVariant?: "ghost" | "secondary"
triggerIconClassName?: string
align?: "start" | "end"
/** Extra items; use `MediaMenuItem` so they also work in the right-click menu. */
children?: React.ReactNode
}
/**
* Opens `menu` (the props given to the row's `MediaContextMenu`) when
* `children`, a single element such as a track row, is right-clicked.
*/
export function MediaContextMenuArea({
menu,
children,
}: {
menu: MediaContextMenuProps
children: React.ReactElement
}) {
return (
<ContextMenu
onOpenChange={(open) => {
if (open) {
menu.onOpenMenu()
}
}}
>
<ContextMenuTrigger asChild>{children}</ContextMenuTrigger>
<ContextMenuContent className="w-48">
<MenuKindContext value="context">
<MediaContextMenuItems
selectedCount={menu.selectedCount}
onAction={menu.onAction}
playlistLabel={menu.playlistLabel}
showFavorite={menu.showFavorite}
favorited={menu.favorited}
stationArtistId={menu.stationArtistId}
navigation={menu.navigation}
share={menu.share}
/>
{menu.children}
</MenuKindContext>
</ContextMenuContent>
</ContextMenu>
)
}
export function MediaContextMenu({ export function MediaContextMenu({
label, label,
selectedCount, selectedCount,
@@ -302,7 +212,26 @@ export function MediaContextMenu({
triggerIconClassName = "size-4", triggerIconClassName = "size-4",
align = "end", align = "end",
children, children,
}: MediaContextMenuProps) { }: {
label: string
selectedCount: number
onOpenMenu: () => void
onAction: (action: MediaContextAction) => void
playlistLabel?: string
showFavorite?: boolean
favorited?: boolean
stationArtistId?: string
navigation?: MediaContextNavigation
share?: MediaShareContext
inSelectionRange?: boolean
/** When false, the trigger uses default button/dropdown styling (page headers). */
trackRowTrigger?: boolean
triggerClassName?: string
triggerVariant?: "ghost" | "secondary"
triggerIconClassName?: string
align?: "start" | "end"
children?: React.ReactNode
}) {
return ( return (
<DropdownMenu <DropdownMenu
onOpenChange={(open) => { onOpenChange={(open) => {
+32 -84
View File
@@ -102,26 +102,7 @@ type PlaybackContextValue = {
dolbyAtmosSupported: boolean | null dolbyAtmosSupported: boolean | null
} }
type PlaybackActions = Omit<
PlaybackContextValue,
| "queueSongIds"
| "queueHistorySongIds"
| "currentFormat"
| "currentSong"
| "shuffleEnabled"
| "repeatEnabled"
| "queueOpen"
| "isPlaying"
| "volume"
| "dolbyAtmosSupported"
>
const PlaybackContext = createContext<PlaybackContextValue | null>(null) const PlaybackContext = createContext<PlaybackContextValue | null>(null)
// Long lists read these narrow contexts so playback state changes do not
// re-render every row.
const PlaybackActionsContext = createContext<PlaybackActions | null>(null)
const CurrentSongIdContext = createContext<Id<"songs"> | null>(null)
const IsPlayingContext = createContext(false)
const PlaybackProgressContext = createContext<{ const PlaybackProgressContext = createContext<{
currentTime: number currentTime: number
duration: number duration: number
@@ -320,22 +301,6 @@ export function usePlayback() {
return context return context
} }
export function usePlaybackActions() {
const context = useContext(PlaybackActionsContext)
if (!context) {
throw new Error("usePlaybackActions must be used within PlaybackProvider")
}
return context
}
export function useCurrentSongId() {
return useContext(CurrentSongIdContext)
}
export function useIsPlaying() {
return useContext(IsPlayingContext)
}
export function usePlaybackProgress() { export function usePlaybackProgress() {
const context = useContext(PlaybackProgressContext) const context = useContext(PlaybackProgressContext)
if (!context) { if (!context) {
@@ -374,19 +339,17 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
if (!isSignedIn) { if (!isSignedIn) {
return return
} }
store.setTransport({ store.setTransport((state) =>
sync: (state) => syncPlaybackStateMutation({
syncPlaybackStateMutation({ songQueue: state.queue,
songQueue: state.queue, queueHistory: state.history,
queueHistory: state.history, shuffleEnabled: state.shuffleEnabled,
shuffleEnabled: state.shuffleEnabled, repeatEnabled: state.repeatEnabled,
repeatEnabled: state.repeatEnabled, currentSongProgress: state.progressSeconds,
currentSongProgress: state.progressSeconds, })
}), )
loadProgress: () => convex.query(api.playback.getSongProgress, {}),
})
return () => store.setTransport(null) return () => store.setTransport(null)
}, [store, isSignedIn, syncPlaybackStateMutation, convex]) }, [store, isSignedIn, syncPlaybackStateMutation])
useEffect(() => { useEffect(() => {
if (!serverPlayback) { if (!serverPlayback) {
@@ -1398,8 +1361,17 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
) )
: null : null
const actions = useMemo<PlaybackActions>( const value = useMemo<PlaybackContextValue>(
() => ({ () => ({
queueSongIds: playback.queue,
queueHistorySongIds: playback.history,
currentSong,
currentFormat,
shuffleEnabled: playback.shuffleEnabled,
repeatEnabled: playback.repeatEnabled,
queueOpen,
isPlaying: isPlaybackActive,
volume,
setQueueOpen, setQueueOpen,
toggleQueueOpen, toggleQueueOpen,
setIsPlaying, setIsPlaying,
@@ -1423,8 +1395,15 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
skipToQueueIndex, skipToQueueIndex,
skipNext, skipNext,
skipPrevious, skipPrevious,
dolbyAtmosSupported,
}), }),
[ [
playback,
currentSong,
currentFormat,
queueOpen,
isPlaybackActive,
volume,
toggleQueueOpen, toggleQueueOpen,
setVolume, setVolume,
playInOrder, playInOrder,
@@ -1446,31 +1425,6 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
skipToQueueIndex, skipToQueueIndex,
skipNext, skipNext,
skipPrevious, skipPrevious,
]
)
const value = useMemo<PlaybackContextValue>(
() => ({
...actions,
queueSongIds: playback.queue,
queueHistorySongIds: playback.history,
currentSong,
currentFormat,
shuffleEnabled: playback.shuffleEnabled,
repeatEnabled: playback.repeatEnabled,
queueOpen,
isPlaying: isPlaybackActive,
volume,
dolbyAtmosSupported,
}),
[
actions,
playback,
currentSong,
currentFormat,
queueOpen,
isPlaybackActive,
volume,
dolbyAtmosSupported, dolbyAtmosSupported,
] ]
) )
@@ -1481,16 +1435,10 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
) )
return ( return (
<PlaybackActionsContext.Provider value={actions}> <PlaybackContext.Provider value={value}>
<CurrentSongIdContext.Provider value={currentSongId}> <PlaybackProgressContext.Provider value={progressValue}>
<IsPlayingContext.Provider value={isPlaybackActive}> {children}
<PlaybackContext.Provider value={value}> </PlaybackProgressContext.Provider>
<PlaybackProgressContext.Provider value={progressValue}> </PlaybackContext.Provider>
{children}
</PlaybackProgressContext.Provider>
</PlaybackContext.Provider>
</IsPlayingContext.Provider>
</CurrentSongIdContext.Provider>
</PlaybackActionsContext.Provider>
) )
} }
+27 -34
View File
@@ -33,39 +33,6 @@ import { albumCoverUrl } from "@/lib/cover-urls"
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils"
import { formatDuration } from "@/lib/format-duration" import { formatDuration } from "@/lib/format-duration"
function PlayerSeekBar({ hasActiveSong }: { hasActiveSong: boolean }) {
const { currentTime, duration, seekTo } = usePlaybackProgress()
const [isSeeking, setIsSeeking] = React.useState(false)
const [seekValue, setSeekValue] = React.useState(0)
const displayTime = hasActiveSong ? (isSeeking ? seekValue : currentTime) : 0
const maxDuration = Math.max(duration, 1)
return (
<Slider
className={cn(
"h-3 flex-1 [&_[data-slot=slider-range]]:bg-current/80 [&_[data-slot=slider-thumb]]:size-2 [&_[data-slot=slider-thumb]]:border-current [&_[data-slot=slider-thumb]]:bg-current [&_[data-slot=slider-thumb]]:opacity-0 focus-within:[&_[data-slot=slider-thumb]]:opacity-100 hover:[&_[data-slot=slider-thumb]]:opacity-100 [&_[data-slot=slider-track]]:h-[3px] [&_[data-slot=slider-track]]:bg-current/30 md:[&_[data-slot=slider-track]]:h-0.5",
!hasActiveSong && "[&_[data-slot=slider-thumb]]:hidden"
)}
min={0}
max={maxDuration}
step={0.1}
value={[displayTime]}
disabled={!hasActiveSong}
onValueChange={([value]) => {
setIsSeeking(true)
setSeekValue(value)
}}
onValueCommit={([value]) => {
seekTo(value)
setIsSeeking(false)
}}
aria-label="Seek"
aria-valuetext={`${formatDuration(displayTime)} of ${formatDuration(duration)}`}
/>
)
}
export function PlayerBar() { export function PlayerBar() {
const { const {
currentSong, currentSong,
@@ -84,10 +51,16 @@ export function PlayerBar() {
skipNext, skipNext,
skipPrevious, skipPrevious,
} = usePlayback() } = usePlayback()
const { currentTime, duration, seekTo } = usePlaybackProgress()
const { state, isMobile } = useSidebar() const { state, isMobile } = useSidebar()
const [isSeeking, setIsSeeking] = React.useState(false)
const [seekValue, setSeekValue] = React.useState(0)
const hasQueue = queueSongIds.length > 0 const hasQueue = queueSongIds.length > 0
const hasActiveSong = Boolean(currentSong)
const sidebarExpanded = !isMobile && state === "expanded" const sidebarExpanded = !isMobile && state === "expanded"
const displayTime = hasActiveSong ? (isSeeking ? seekValue : currentTime) : 0
const maxDuration = Math.max(duration, 1)
return ( return (
<div <div
@@ -219,7 +192,27 @@ export function PlayerBar() {
/> />
)} )}
<div className="absolute inset-x-0 -bottom-1"> <div className="absolute inset-x-0 -bottom-1">
<PlayerSeekBar hasActiveSong={Boolean(currentSong)} /> <Slider
className={cn(
"h-3 flex-1 [&_[data-slot=slider-range]]:bg-current/80 [&_[data-slot=slider-thumb]]:size-2 [&_[data-slot=slider-thumb]]:border-current [&_[data-slot=slider-thumb]]:bg-current [&_[data-slot=slider-thumb]]:opacity-0 focus-within:[&_[data-slot=slider-thumb]]:opacity-100 hover:[&_[data-slot=slider-thumb]]:opacity-100 [&_[data-slot=slider-track]]:h-[3px] [&_[data-slot=slider-track]]:bg-current/30 md:[&_[data-slot=slider-track]]:h-0.5",
!hasActiveSong && "[&_[data-slot=slider-thumb]]:hidden"
)}
min={0}
max={maxDuration}
step={0.1}
value={[displayTime]}
disabled={!hasActiveSong}
onValueChange={([value]) => {
setIsSeeking(true)
setSeekValue(value)
}}
onValueCommit={([value]) => {
seekTo(value)
setIsSeeking(false)
}}
aria-label="Seek"
aria-valuetext={`${formatDuration(displayTime)} of ${formatDuration(duration)}`}
/>
</div> </div>
</div> </div>
+2 -2
View File
@@ -15,7 +15,7 @@ import {
MediaContextMenuItems, MediaContextMenuItems,
type MediaContextAction, type MediaContextAction,
} from "@/components/media-context-menu" } from "@/components/media-context-menu"
import { usePlaybackActions } from "@/components/playback-provider" import { usePlayback } from "@/components/playback-provider"
import { Button } from "@/components/ui/button" import { Button } from "@/components/ui/button"
import { import {
DropdownMenu, DropdownMenu,
@@ -30,7 +30,7 @@ export function PlaylistCard({ playlist }: { playlist: PlaylistSummary }) {
const convex = useConvex() const convex = useConvex()
const cacheScope = useCacheScope() const cacheScope = useCacheScope()
const { openAddPlaylistToPlaylist } = useAddToPlaylist() const { openAddPlaylistToPlaylist } = useAddToPlaylist()
const { playPlaylist } = usePlaybackActions() const { playPlaylist } = usePlayback()
const { runQueueAction } = useQueueMediaActions() const { runQueueAction } = useQueueMediaActions()
async function handleCardAction(action: MediaContextAction) { async function handleCardAction(action: MediaContextAction) {
+373 -99
View File
@@ -9,18 +9,15 @@ import { useMutation } from "convex/react"
import { Play, SearchIcon, Share2, Shuffle, Star, Trash2 } from "lucide-react" import { Play, SearchIcon, Share2, Shuffle, Star, Trash2 } from "lucide-react"
import { toast } from "sonner" import { toast } from "sonner"
import { useAddToPlaylist } from "@/components/add-to-playlist-provider"
import { useFavorites } from "@/components/favorites-provider" import { useFavorites } from "@/components/favorites-provider"
import { import { usePlayback } from "@/components/playback-provider"
useCurrentSongId,
usePlaybackActions,
} from "@/components/playback-provider"
import { MediaCollectionFooter } from "@/components/media-collection-footer" import { MediaCollectionFooter } from "@/components/media-collection-footer"
import { TrackNumberPlayButton } from "@/components/track-number-play-button"
import { import {
MediaContextMenu, MediaContextMenu,
type MediaContextAction, type MediaContextAction,
} from "@/components/media-context-menu" } from "@/components/media-context-menu"
import { TrackRow } from "@/components/track-row"
import { VirtualList } from "@/components/virtual-list"
import { Button } from "@/components/ui/button" import { Button } from "@/components/ui/button"
import { import {
DropdownMenuItem, DropdownMenuItem,
@@ -28,22 +25,242 @@ import {
} from "@/components/ui/dropdown-menu" } from "@/components/ui/dropdown-menu"
import { ScrollArea } from "@/components/ui/scroll-area" import { ScrollArea } from "@/components/ui/scroll-area"
import { useCachedQuery } from "@/hooks/use-cached-query" import { useCachedQuery } from "@/hooks/use-cached-query"
import { import { useQueueMediaActions } from "@/hooks/use-queue-media-actions"
useMediaActions,
useTrackListMediaAction,
} from "@/hooks/use-media-actions"
import { useTrackSelection } from "@/hooks/use-track-selection" import { useTrackSelection } from "@/hooks/use-track-selection"
import { api } from "@otunes/convex/_generated/api" import { api } from "@otunes/convex/_generated/api"
import type { Id } from "@otunes/convex/_generated/dataModel" import type { Id } from "@otunes/convex/_generated/dataModel"
import type { BrowsePlaylistDetail, BrowseSong } from "@otunes/convex/types" import type { BrowsePlaylistDetail, BrowseSong } from "@otunes/convex/types"
import { playlistCoverUrl } from "@/lib/cover-urls" import { albumCoverUrl, playlistCoverUrl } from "@/lib/cover-urls"
import { copyPlaylistLink } from "@/lib/media-links" import { copyPlaylistLink } from "@/lib/media-links"
import { sumDurationSeconds } from "@/lib/media-summary" import { sumDurationSeconds } from "@/lib/media-summary"
import { rememberSongs } from "@/lib/song-cache" import { rememberSongs } from "@/lib/song-cache"
import { getSelectionRangePositions } from "@/lib/selection-range-styles" import { cn } from "@/lib/utils"
import {
getSelectionRangePositions,
isInSelectionRange,
ALBUM_TRACK_ROW,
ALBUM_TRACK_TITLE,
SelectionRangeHighlight,
TrackRowActiveHighlight,
TrackRowHoverHighlight,
TRACK_ROW_PADDING,
type SelectionRangePosition,
} from "@/lib/selection-range-styles"
import { formatDuration } from "@/lib/format-duration"
const ADD_TO_ANOTHER_PLAYLIST = "Add to Another Playlist" const ADD_TO_ANOTHER_PLAYLIST = "Add to Another Playlist"
const estimatePlaylistRowSize = () => 60
function PlaylistSongCover({
song,
inRange,
isFavorite,
onToggleFavorite,
}: {
song: BrowseSong
inRange: boolean
isFavorite: boolean
onToggleFavorite: () => void
}) {
return (
<div
className={cn(
"group/cover relative size-10 shrink-0 overflow-hidden rounded ring-1",
inRange ? "ring-white/25" : "ring-foreground/10"
)}
>
<Image
src={albumCoverUrl(song.album.id)}
alt={song.album.title}
fill
sizes="40px"
className="object-cover"
/>
<div
className={cn(
"absolute inset-0 flex items-center justify-center bg-black/0 opacity-0 transition-opacity group-hover/cover:opacity-100",
"group-hover/cover:bg-black/40"
)}
>
<Button
variant="ghost"
size="icon-sm"
className={cn(
"size-8",
inRange
? "text-primary-foreground hover:bg-white/15 hover:text-primary-foreground"
: "text-primary hover:text-primary"
)}
aria-label={
isFavorite
? `Remove ${song.title} from favorites`
: `Favorite ${song.title}`
}
onClick={(event) => {
event.stopPropagation()
onToggleFavorite()
}}
>
<Star
className={cn(
"size-4",
isFavorite && (inRange ? "fill-current" : "fill-primary")
)}
/>
</Button>
</div>
</div>
)
}
function PlaylistSongRow({
song,
index,
isOwner,
canRemove,
isActive,
selectionPosition,
isFavorite,
selectedCount,
stationArtist,
isDragging,
onSelect,
onPointerDown,
onToggleFavorite,
onPrepareContextMenu,
onMediaAction,
onRemove,
onDragStart,
onDragOver,
onDrop,
showFavoriteInMenu = true,
removeLabel = "Remove from Playlist",
isNowPlaying,
onPlay,
}: {
song: BrowseSong
index: number
isOwner: boolean
canRemove: boolean
isActive: boolean
selectionPosition: SelectionRangePosition
isFavorite: boolean
selectedCount: number
stationArtist?: string
isDragging: boolean
onSelect: (event: React.MouseEvent) => void
onPointerDown: (event: React.MouseEvent) => void
onToggleFavorite: () => void
onPrepareContextMenu: () => void
onMediaAction: (action: MediaContextAction, songId: string) => void
onRemove: () => void
onDragStart: (event: React.DragEvent) => void
onDragOver: (event: React.DragEvent) => void
onDrop: (event: React.DragEvent) => void
showFavoriteInMenu?: boolean
removeLabel?: string
isNowPlaying: boolean
onPlay: () => void
}) {
const displayTrack = index + 1
const inRange = isInSelectionRange(selectionPosition)
return (
<div
role="button"
tabIndex={0}
draggable={isOwner}
onDragStart={onDragStart}
onDragOver={onDragOver}
onDrop={onDrop}
onMouseDown={onPointerDown}
onClick={onSelect}
onDoubleClick={(event) => {
event.preventDefault()
onPlay()
}}
onKeyDown={(event) => {
if (event.key === "Enter" || event.key === " ") {
event.preventDefault()
onSelect(event as unknown as React.MouseEvent)
}
}}
className={cn(
"group relative w-full cursor-pointer select-none py-2.5 text-left text-sm transition-colors",
inRange && "text-primary-foreground",
isDragging && "opacity-50"
)}
>
<SelectionRangeHighlight position={selectionPosition} />
{!inRange && isActive ? <TrackRowActiveHighlight /> : null}
{!inRange && !isActive ? <TrackRowHoverHighlight /> : null}
<div
className={cn("relative z-10", ALBUM_TRACK_ROW, TRACK_ROW_PADDING)}
>
<PlaylistSongCover
song={song}
inRange={inRange}
isFavorite={isFavorite}
onToggleFavorite={onToggleFavorite}
/>
<TrackNumberPlayButton
displayTrack={displayTrack}
title={song.title}
isActive={isActive}
isNowPlaying={isNowPlaying}
inRange={inRange}
onPlay={onPlay}
/>
<span className={ALBUM_TRACK_TITLE}>{song.title}</span>
<span
className={cn(
"shrink-0 text-right tabular-nums",
inRange ? "text-primary-foreground" : "text-muted-foreground"
)}
>
{formatDuration(song.durationSeconds)}
</span>
<MediaContextMenu
label={`More options for ${song.title}`}
stationArtistId={stationArtist}
selectedCount={selectedCount}
inSelectionRange={inRange}
onOpenMenu={onPrepareContextMenu}
onAction={(action) => onMediaAction(action, song.id)}
playlistLabel={ADD_TO_ANOTHER_PLAYLIST}
showFavorite={showFavoriteInMenu}
favorited={isFavorite}
navigation={{
artist: { id: song.artist.id },
album: { id: song.album.id },
}}
share={{
type: "song",
albumId: song.album.id,
songId: song.id,
}}
>
{canRemove ? (
<>
<DropdownMenuSeparator />
<DropdownMenuItem
variant="destructive"
className="justify-between"
onClick={onRemove}
>
{removeLabel}
<Trash2 />
</DropdownMenuItem>
</>
) : null}
</MediaContextMenu>
</div>
</div>
)
}
export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) { export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
const router = useRouter() const router = useRouter()
@@ -53,17 +270,22 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
currentUser === undefined currentUser === undefined
? playlist.isOwner ? playlist.isOwner
: currentUser?._id === playlist.owner.id : currentUser?._id === playlist.owner.id
const { isSongFavorite, toggleSongFavorite, toggleSongsFavorite } = const { openAddToPlaylist } = useAddToPlaylist()
useFavorites()
const currentSongId = useCurrentSongId()
const { const {
isSongFavorite,
toggleSongFavorite,
toggleSongsFavorite,
favoriteSongs: addFavoriteSongs,
} = useFavorites()
const {
currentSong,
playInOrder, playInOrder,
playShuffled, playShuffled,
playPlaylist, playPlaylist,
playPlaylistShuffled, playPlaylistShuffled,
playFromSong, playFromSong,
} = usePlaybackActions() } = usePlayback()
const { runSongsAction } = useMediaActions() const { runQueueAction, createStation } = useQueueMediaActions()
const removeSongs = useMutation(api.playlists.removeSongsFromPlaylist) const removeSongs = useMutation(api.playlists.removeSongsFromPlaylist)
const reorderSongs = useMutation(api.playlists.reorderPlaylistSongs) const reorderSongs = useMutation(api.playlists.reorderPlaylistSongs)
const deletePlaylist = useMutation(api.playlists.deletePlaylist) const deletePlaylist = useMutation(api.playlists.deletePlaylist)
@@ -95,10 +317,6 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
() => songs.map((song) => song.id as Id<"songs">), () => songs.map((song) => song.id as Id<"songs">),
[songs] [songs]
) )
const playlistPositionById = React.useMemo(
() => new Map(songs.map((song, index) => [song.id, index + 1])),
[songs]
)
const [activeTrackId, setActiveTrackId] = React.useState("") const [activeTrackId, setActiveTrackId] = React.useState("")
const [dragIndex, setDragIndex] = React.useState<number | null>(null) const [dragIndex, setDragIndex] = React.useState<number | null>(null)
const [isSubscribed, setIsSubscribed] = React.useState(playlist.isSubscribed) const [isSubscribed, setIsSubscribed] = React.useState(playlist.isSubscribed)
@@ -113,6 +331,7 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
const { const {
selectedIds, selectedIds,
selectedCount, selectedCount,
isSelected,
handleSelect, handleSelect,
handlePointerDown, handlePointerDown,
prepareContextMenu, prepareContextMenu,
@@ -150,37 +369,57 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
} }
} }
const handleMediaAction = useTrackListMediaAction({ selectedIds, songs }) function resolveTargetIds(fallbackSongId?: string) {
return selectedIds.size > 0
? Array.from(selectedIds)
: fallbackSongId
? [fallbackSongId]
: activeTrackId
? [activeTrackId]
: []
}
function handleMediaAction(
action: MediaContextAction,
fallbackSongId?: string
) {
const targetIds = resolveTargetIds(fallbackSongId)
switch (action) {
case "create-station": {
const artistId = stationArtistId(songs, new Set(targetIds))
if (artistId) void createStation(artistId)
break
}
case "favorite":
void addFavoriteSongs(targetIds as Id<"songs">[])
break
case "playlist":
openAddToPlaylist(targetIds as Id<"songs">[])
break
case "play-next":
case "play-last":
case "shuffle":
void runQueueAction(action, targetIds as Id<"songs">[])
break
}
}
function handlePlaylistMediaAction(action: MediaContextAction) { function handlePlaylistMediaAction(action: MediaContextAction) {
runSongsAction(action, playlistSongIds) const targetIds = songs.map((song) => song.id as Id<"songs">)
}
const canReorder = isOwner && !isFavorites && !normalizedQuery switch (action) {
case "favorite":
function handleRowSelect(index: number, event: React.MouseEvent) { void addFavoriteSongs(targetIds)
const songId = filteredSongs[index].id break
handleSelect(songId, index, event) case "playlist":
setActiveTrackId(songId) openAddToPlaylist(targetIds)
} break
case "play-next":
function handleRowPlay(index: number) { case "play-last":
void playFromSong( case "shuffle":
filteredSongs[index].id, void runQueueAction(action, targetIds)
playlistSongIds, break
`playlist:${playlist.id}`
)
}
function handleToggleFavorite(songId: string) {
const wasFavorite = isSongFavorite(songId)
void toggleSongFavorite(songId as Id<"songs">)
if (isFavorites && wasFavorite) {
setHiddenFavoriteIds((current) => {
const next = new Set(current)
next.add(songId)
return next
})
} }
} }
@@ -191,7 +430,10 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
: [songId] : [songId]
if (isFavorites) { if (isFavorites) {
const succeeded = await toggleSongsFavorite(ids as Id<"songs">[], true) const succeeded = await toggleSongsFavorite(
ids as Id<"songs">[],
true
)
if (!succeeded) return if (!succeeded) return
return return
} }
@@ -204,9 +446,7 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
setPlaylistSongs((current) => setPlaylistSongs((current) =>
current.filter((song) => !ids.includes(song.id)) current.filter((song) => !ids.includes(song.id))
) )
toast.success( toast.success(ids.length > 1 ? `Removed ${ids.length} songs` : "Removed song")
ids.length > 1 ? `Removed ${ids.length} songs` : "Removed song"
)
} catch (error) { } catch (error) {
toast.error( toast.error(
error instanceof Error ? error.message : "Failed to remove song" error instanceof Error ? error.message : "Failed to remove song"
@@ -234,7 +474,13 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
} }
function handleDrop(targetIndex: number) { function handleDrop(targetIndex: number) {
if (!canReorder || dragIndex === null || dragIndex === targetIndex) { if (
normalizedQuery ||
isFavorites ||
!isOwner ||
dragIndex === null ||
dragIndex === targetIndex
) {
setDragIndex(null) setDragIndex(null)
return return
} }
@@ -295,7 +541,7 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
<PageHeader openApp /> <PageHeader openApp />
<ScrollArea className="min-h-0 flex-1"> <ScrollArea className="min-h-0 flex-1">
<div className="pb-28"> <div className="pb-28">
<div className="mx-auto w-full max-w-9/10 min-w-0"> <div className="mx-auto w-full min-w-0 max-w-9/10">
<div className="flex flex-col gap-8 px-6 pt-6 pb-8 sm:flex-row sm:items-end"> <div className="flex flex-col gap-8 px-6 pt-6 pb-8 sm:flex-row sm:items-end">
<div className="relative mx-auto aspect-square w-full max-w-60 shrink-0 overflow-hidden rounded-lg ring-1 ring-foreground/10 sm:mx-0"> <div className="relative mx-auto aspect-square w-full max-w-60 shrink-0 overflow-hidden rounded-lg ring-1 ring-foreground/10 sm:mx-0">
{isFavorites ? ( {isFavorites ? (
@@ -425,49 +671,77 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
</div> </div>
</div> </div>
{filteredSongs.length > 0 ? ( {filteredSongs.length > 0 ? (
<VirtualList filteredSongs.map((song, index) => (
count={filteredSongs.length} <PlaylistSongRow
estimateSize={estimatePlaylistRowSize} key={song.id}
getItemKey={(index) => filteredSongs[index].id} song={song}
// Keep the drag source mounted so its drop still lands. index={index}
keepMounted={dragIndex} isOwner={isOwner && !isFavorites && !normalizedQuery}
renderItem={(index) => { canRemove={isFavorites || isOwner}
const song = filteredSongs[index] showFavoriteInMenu={!isFavorites}
return ( removeLabel={
<TrackRow isFavorites ? "Unfavorite" : "Remove from Playlist"
variant="playlist" }
song={song} isActive={song.id === activeTrackId}
index={index} selectionPosition={selectionPositions[index]}
trackNumber={playlistPositionById.get(song.id)} isFavorite={isSongFavorite(song.id)}
isActive={song.id === activeTrackId} selectedCount={
isNowPlaying={currentSongId === song.id} isSelected(song.id) && selectedCount > 0
isFavorite={isSongFavorite(song.id)} ? selectedCount
isDragging={dragIndex === index} : 1
selectionPosition={selectionPositions[index]} }
selectedCount={selectedCount} stationArtist={
selectionStationArtistId={selectedStationArtistId} isSelected(song.id)
playlistLabel={ADD_TO_ANOTHER_PLAYLIST} ? selectedStationArtistId
showFavoriteInMenu={!isFavorites} : song.artist.id
removeLabel={ }
isFavorites isDragging={dragIndex === index}
? "Unfavorite" onPointerDown={handlePointerDown}
: isOwner onSelect={(event) => {
? "Remove from Playlist" handleSelect(song.id, index, event)
: undefined setActiveTrackId(song.id)
} }}
onPointerDown={handlePointerDown} onToggleFavorite={() => {
onSelect={handleRowSelect} const wasFavorite = isSongFavorite(song.id)
onPlay={handleRowPlay} void toggleSongFavorite(song.id as Id<"songs">)
onToggleFavorite={handleToggleFavorite} if (isFavorites && wasFavorite) {
onPrepareContextMenu={prepareContextMenu} setHiddenFavoriteIds((current) => {
onMediaAction={handleMediaAction} const next = new Set(current)
onRemove={handleRemoveSong} next.add(song.id)
onDragStart={canReorder ? setDragIndex : undefined} return next
onDrop={canReorder ? handleDrop : undefined} })
/> }
) }}
}} onPrepareContextMenu={() => prepareContextMenu(song.id)}
/> onMediaAction={handleMediaAction}
onRemove={() => handleRemoveSong(song.id)}
onDragStart={(event) => {
if (normalizedQuery || isFavorites || !isOwner) {
return
}
setDragIndex(index)
event.dataTransfer.effectAllowed = "move"
}}
onDragOver={(event) => {
if (normalizedQuery || isFavorites || !isOwner) {
return
}
event.preventDefault()
}}
onDrop={(event) => {
event.preventDefault()
handleDrop(index)
}}
isNowPlaying={currentSong?.id === song.id}
onPlay={() =>
void playFromSong(
song.id as Id<"songs">,
playlistSongIds,
`playlist:${playlist.id}`
)
}
/>
))
) : ( ) : (
<p className="px-6 py-8 text-sm text-muted-foreground"> <p className="px-6 py-8 text-sm text-muted-foreground">
{normalizedQuery {normalizedQuery
+170 -36
View File
@@ -1,10 +1,11 @@
"use client" "use client"
import * as React from "react" import * as React from "react"
import Image from "next/image"
import { Music2 } from "lucide-react"
import { PlaybackSongMeta } from "@/components/playback-song-meta" import { PlaybackSongMeta } from "@/components/playback-song-meta"
import { usePlayback } from "@/components/playback-provider" import { usePlayback } from "@/components/playback-provider"
import { TrackCover, TrackRow } from "@/components/track-row"
import { Button } from "@/components/ui/button" import { Button } from "@/components/ui/button"
import { ScrollArea } from "@/components/ui/scroll-area" import { ScrollArea } from "@/components/ui/scroll-area"
import { Skeleton } from "@/components/ui/skeleton" import { Skeleton } from "@/components/ui/skeleton"
@@ -12,11 +13,19 @@ import { Spinner } from "@/components/ui/spinner"
import { useTrackSelection } from "@/hooks/use-track-selection" import { useTrackSelection } from "@/hooks/use-track-selection"
import type { Id } from "@otunes/convex/_generated/dataModel" import type { Id } from "@otunes/convex/_generated/dataModel"
import type { BrowseSong, HistorySong, QueueSong } from "@otunes/convex/types" import type { BrowseSong, HistorySong, QueueSong } from "@otunes/convex/types"
import { albumCoverUrl } from "@/lib/cover-urls"
import { import {
getContiguousSelectedIndices, getContiguousSelectedIndices,
moveQueueBlock, moveQueueBlock,
} from "@/lib/move-queue-block" } from "@/lib/move-queue-block"
import { getSelectionRangePositions } from "@/lib/selection-range-styles" import {
getSelectionRangePositions,
isInSelectionRange,
QueueSelectionRangeHighlight,
QueueTrackRowActiveHighlight,
QueueTrackRowHoverHighlight,
type SelectionRangePosition,
} from "@/lib/selection-range-styles"
import { useSongs } from "@/lib/song-cache" import { useSongs } from "@/lib/song-cache"
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils"
import { formatDuration } from "@/lib/format-duration" import { formatDuration } from "@/lib/format-duration"
@@ -47,16 +56,48 @@ function toSelectableQueue(
}) })
} }
function QueueSongCover({
albumId,
title,
inRange,
}: {
albumId: string
title: string
inRange: boolean
}) {
return (
<div
className={cn(
"relative size-10 shrink-0 overflow-hidden ring-1",
inRange ? "ring-white/25" : "ring-foreground/10"
)}
>
<Image
src={albumCoverUrl(albumId)}
alt={title}
fill
sizes="40px"
className="object-cover"
/>
</div>
)
}
function HistorySongRow({ song }: { song: HistorySong }) { function HistorySongRow({ song }: { song: HistorySong }) {
return ( return (
<li className="relative w-full py-2 text-left text-sm opacity-60"> <li className="relative w-full py-2 text-left text-sm opacity-60">
<div className="relative z-10 flex items-center gap-3 px-2"> <div className="relative z-10 flex items-center gap-3 px-2">
<TrackCover {song.album.id ? (
albumId={song.album.id} <QueueSongCover
alt={song.album.title} albumId={song.album.id}
inRange={false} title={song.album.title}
square inRange={false}
/> />
) : (
<div className="flex size-10 shrink-0 items-center justify-center bg-muted ring-1 ring-foreground/10">
<Music2 className="size-4 text-muted-foreground" />
</div>
)}
<PlaybackSongMeta <PlaybackSongMeta
song={song} song={song}
@@ -74,6 +115,106 @@ function HistorySongRow({ song }: { song: HistorySong }) {
) )
} }
const QueueSongRow = React.forwardRef<
HTMLLIElement,
{
song: QueueSelectable
isNowPlaying: boolean
selectionPosition: SelectionRangePosition
isDragging: boolean
onSelect: (event: React.MouseEvent) => void
onPointerDown: (event: React.MouseEvent) => void
onSkipTo: () => void
onDragStart: (event: React.DragEvent) => void
onDragOver: (event: React.DragEvent) => void
onDrop: (event: React.DragEvent) => void
}
>(function QueueSongRow(
{
song,
isNowPlaying,
selectionPosition,
isDragging,
onSelect,
onPointerDown,
onSkipTo,
onDragStart,
onDragOver,
onDrop,
},
ref
) {
const inRange = isInSelectionRange(selectionPosition)
return (
<li
ref={ref}
role="button"
tabIndex={0}
draggable
onDragStart={onDragStart}
onDragOver={onDragOver}
onDrop={onDrop}
onMouseDown={onPointerDown}
onClick={onSelect}
onDoubleClick={(event) => {
event.preventDefault()
onSkipTo()
}}
onKeyDown={(event) => {
if (event.key === "Enter" || event.key === " ") {
event.preventDefault()
onSelect(event as unknown as React.MouseEvent)
}
}}
className={cn(
"group relative w-full cursor-pointer select-none py-2 text-left text-sm transition-colors",
inRange && "text-primary-foreground",
isDragging && "opacity-50"
)}
>
<QueueSelectionRangeHighlight position={selectionPosition} />
{!inRange && isNowPlaying ? <QueueTrackRowActiveHighlight /> : null}
{!inRange && !isNowPlaying ? <QueueTrackRowHoverHighlight /> : null}
<div className="relative z-10 flex items-center gap-3 px-2">
{song.album.id ? (
<QueueSongCover
albumId={song.album.id}
title={song.album.title}
inRange={inRange}
/>
) : (
<div
className={cn(
"flex size-10 shrink-0 items-center justify-center bg-muted ring-1",
inRange ? "ring-white/25" : "ring-foreground/10"
)}
>
<Music2 className="size-4 text-muted-foreground" />
</div>
)}
<PlaybackSongMeta
song={song}
isCurrent={isNowPlaying}
inRange={inRange}
align="start"
showAlbum={false}
/>
<span
className={cn(
"shrink-0 text-xs tabular-nums",
inRange ? "text-primary-foreground" : "text-muted-foreground"
)}
>
{formatDuration(song.durationSeconds)}
</span>
</div>
</li>
)
})
function QueueSongRowSkeleton() { function QueueSongRowSkeleton() {
return ( return (
<li className="flex items-center gap-3 px-2 py-2" aria-hidden> <li className="flex items-center gap-3 px-2 py-2" aria-hidden>
@@ -97,7 +238,7 @@ export function QueuePanel() {
skipToQueueIndex, skipToQueueIndex,
} = usePlayback() } = usePlayback()
const loadMoreRef = React.useRef<HTMLDivElement>(null) const loadMoreRef = React.useRef<HTMLDivElement>(null)
const nowPlayingRef = React.useRef<HTMLElement>(null) const nowPlayingRef = React.useRef<HTMLLIElement>(null)
const [visibleCount, setVisibleCount] = React.useState( const [visibleCount, setVisibleCount] = React.useState(
QUEUE_INITIAL_VISIBLE_COUNT QUEUE_INITIAL_VISIBLE_COUNT
) )
@@ -165,25 +306,12 @@ export function QueuePanel() {
return () => observer.disconnect() return () => observer.disconnect()
}, [hasMore]) }, [hasMore])
const selectionItems = React.useMemo( const {
() => selectableQueue.map((item) => ({ id: item.selectionId })), selectedIds,
[selectableQueue] handleSelect,
) handlePointerDown,
const { selectedIds, handleSelect, handlePointerDown } = } = useTrackSelection(
useTrackSelection(selectionItems) selectableQueue.map((item) => ({ id: item.selectionId }))
const handleRowSelect = React.useCallback(
(index: number, event: React.MouseEvent) => {
handleSelect(selectableQueue[index].selectionId, index, event)
},
[selectableQueue, handleSelect]
)
const handleRowPlay = React.useCallback(
(index: number) => {
void skipToQueueIndex(selectableQueue[index].queueIndex)
},
[selectableQueue, skipToQueueIndex]
) )
const selectionPositions = React.useMemo( const selectionPositions = React.useMemo(
@@ -270,21 +398,27 @@ export function QueuePanel() {
<ul className="flex flex-col py-1"> <ul className="flex flex-col py-1">
{selectableQueue.map((item, index) => {selectableQueue.map((item, index) =>
item.song ? ( item.song ? (
<TrackRow <QueueSongRow
key={item.selectionId} key={item.selectionId}
ref={item.queueIndex === 0 ? nowPlayingRef : undefined} ref={item.queueIndex === 0 ? nowPlayingRef : undefined}
variant="queue"
song={item.song} song={item.song}
index={index}
isActive={item.queueIndex === 0}
isNowPlaying={item.queueIndex === 0} isNowPlaying={item.queueIndex === 0}
selectionPosition={selectionPositions[index]} selectionPosition={selectionPositions[index]}
isDragging={draggingIndices.has(index)} isDragging={draggingIndices.has(index)}
onPointerDown={handlePointerDown} onPointerDown={handlePointerDown}
onSelect={handleRowSelect} onSelect={(event) => {
onPlay={handleRowPlay} handleSelect(item.selectionId, index, event)
onDragStart={setDragIndex} }}
onDrop={handleDrop} onSkipTo={() => void skipToQueueIndex(item.queueIndex)}
onDragStart={(event) => {
setDragIndex(index)
event.dataTransfer.effectAllowed = "move"
}}
onDragOver={(event) => event.preventDefault()}
onDrop={(event) => {
event.preventDefault()
handleDrop(index)
}}
/> />
) : ( ) : (
<QueueSongRowSkeleton key={item.selectionId} /> <QueueSongRowSkeleton key={item.selectionId} />
+42 -49
View File
@@ -8,8 +8,6 @@ import { useQueueMediaActions } from "@/hooks/use-queue-media-actions"
import { import {
MediaContextMenu, MediaContextMenu,
type MediaContextAction, type MediaContextAction,
MediaContextMenuArea,
type MediaContextMenuProps,
} from "@/components/media-context-menu" } from "@/components/media-context-menu"
import type { Id } from "@otunes/convex/_generated/dataModel" import type { Id } from "@otunes/convex/_generated/dataModel"
import type { BrowseSong } from "@otunes/convex/types" import type { BrowseSong } from "@otunes/convex/types"
@@ -40,57 +38,52 @@ export function SearchSongItem({ song }: { song: BrowseSong }) {
} }
} }
const menu: MediaContextMenuProps = {
label: `More options for ${song.title}`,
stationArtistId: song.artist.id,
selectedCount: 1,
onOpenMenu: () => {},
onAction: handleAction,
favorited: isSongFavorite(song.id),
navigation: {
artist: { id: song.artist.id },
album: { id: song.album.id },
},
share: {
type: "song",
albumId: song.album.id,
songId: song.id,
},
triggerClassName:
"size-8 shrink-0 opacity-0 transition-opacity group-hover:opacity-100 data-[state=open]:opacity-100",
triggerVariant: "ghost",
}
return ( return (
<MediaContextMenuArea menu={menu}> <div className="group flex items-center gap-3 rounded-lg px-1 py-1.5 transition-colors hover:bg-muted/50">
<div className="group flex items-center gap-3 rounded-lg px-1 py-1.5 transition-colors hover:bg-muted/50"> <Link
href={`/album/${song.album.id}`}
className="relative size-11 shrink-0 overflow-hidden rounded ring-1 ring-foreground/10"
>
<Image
src={albumCoverUrl(song.album.id)}
alt={song.album.title}
fill
sizes="44px"
className="object-cover"
/>
</Link>
<div className="min-w-0 flex-1">
<Link href={`/album/${song.album.id}`} className="hover:underline">
<p className="truncate text-sm font-medium">{song.title}</p>
</Link>
<Link <Link
href={`/album/${song.album.id}`} href={`/artist/${song.artist.id}`}
className="relative size-11 shrink-0 overflow-hidden rounded ring-1 ring-foreground/10" className="text-muted-foreground hover:text-foreground hover:underline"
> >
<Image <p className="truncate text-sm">{song.artist.name}</p>
src={albumCoverUrl(song.album.id)}
alt={song.album.title}
fill
sizes="44px"
className="object-cover"
/>
</Link> </Link>
<div className="min-w-0 flex-1">
<Link href={`/album/${song.album.id}`} className="hover:underline">
<p className="truncate text-sm font-medium">{song.title}</p>
</Link>
<Link
href={`/artist/${song.artist.id}`}
className="text-muted-foreground hover:text-foreground hover:underline"
>
<p className="truncate text-sm">{song.artist.name}</p>
</Link>
</div>
<MediaContextMenu {...menu} />
</div> </div>
</MediaContextMenuArea>
<MediaContextMenu
label={`More options for ${song.title}`}
stationArtistId={song.artist.id}
selectedCount={1}
onOpenMenu={() => {}}
onAction={handleAction}
favorited={isSongFavorite(song.id)}
navigation={{
artist: { id: song.artist.id },
album: { id: song.album.id },
}}
share={{
type: "song",
albumId: song.album.id,
songId: song.id,
}}
triggerClassName="size-8 shrink-0 opacity-0 transition-opacity group-hover:opacity-100 data-[state=open]:opacity-100"
triggerVariant="ghost"
/>
</div>
) )
} }
+323 -61
View File
@@ -2,20 +2,18 @@
import { MobileSidebarTrigger } from "@/components/mobile-sidebar-trigger" import { MobileSidebarTrigger } from "@/components/mobile-sidebar-trigger"
import { stationArtistId } from "@/lib/station-artist" import { stationArtistId } from "@/lib/station-artist"
import { import { useEffect, useMemo, useState, useRef, MouseEvent } from "react"
useCallback, import Image from "next/image"
useEffect, import Link from "next/link"
useMemo, import { ArrowUpDown, Play, Star } from "lucide-react"
useState,
useRef,
type MouseEvent,
} from "react"
import { ArrowUpDown } from "lucide-react"
import { useAddToPlaylist } from "@/components/add-to-playlist-provider"
import { useFavorites } from "@/components/favorites-provider" import { useFavorites } from "@/components/favorites-provider"
import { usePlaybackActions } from "@/components/playback-provider" import { usePlayback } from "@/components/playback-provider"
import { LibraryTrackListHeader, TrackRow } from "@/components/track-row" import {
import { VirtualList } from "@/components/virtual-list" MediaContextMenu,
type MediaContextAction,
} from "@/components/media-context-menu"
import { Button } from "@/components/ui/button" import { Button } from "@/components/ui/button"
import { import {
DropdownMenu, DropdownMenu,
@@ -27,28 +25,247 @@ import {
DropdownMenuTrigger, DropdownMenuTrigger,
} from "@/components/ui/dropdown-menu" } from "@/components/ui/dropdown-menu"
import { useCachedPaginatedQuery } from "@/hooks/use-cached-query" import { useCachedPaginatedQuery } from "@/hooks/use-cached-query"
import { useTrackListMediaAction } from "@/hooks/use-media-actions" import { useQueueMediaActions } from "@/hooks/use-queue-media-actions"
import { useTrackSelection } from "@/hooks/use-track-selection" import { useTrackSelection } from "@/hooks/use-track-selection"
import { SongListSkeleton } from "@/components/library-skeletons" import { SongListSkeleton } from "@/components/library-skeletons"
import { ScrollArea } from "@/components/ui/scroll-area" import { ScrollArea } from "@/components/ui/scroll-area"
import { Spinner } from "@/components/ui/spinner" import { Spinner } from "@/components/ui/spinner"
import { api } from "@otunes/convex/_generated/api" import { api } from "@otunes/convex/_generated/api"
import {
Table,
TableBody,
TableCell,
TableHead,
TableHeader,
TableRow,
} from "@/components/ui/table"
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils"
import type { Id } from "@otunes/convex/_generated/dataModel" import type { Id } from "@otunes/convex/_generated/dataModel"
import type { BrowseSong } from "@otunes/convex/types"
import { albumCoverUrl } from "@/lib/cover-urls"
import { import {
getSelectionRangePositions, getSelectionRangePositions,
isInSelectionRange,
ALBUM_TRACK_TITLE,
SongsSelectionRangeHighlight,
SongsTrackRowHoverHighlight,
TRACK_ROW_PADDING, TRACK_ROW_PADDING,
type SelectionRangePosition,
} from "@/lib/selection-range-styles" } from "@/lib/selection-range-styles"
import { formatDuration } from "@/lib/format-duration"
type SortKey = "title" | "artist" | "album" type SortKey = "title" | "artist" | "album"
type SortDirection = "asc" | "desc" type SortDirection = "asc" | "desc"
const SONGS_PAGE_SIZE = 50 const SONGS_PAGE_SIZE = 50
const estimateSongRowSize = () => 56
const songRowLayout =
"flex w-full items-center gap-x-4"
const nameColumnLayout =
"grid grid-cols-[2rem_2.5rem_minmax(0,10rem)] items-center gap-x-2"
const songColumnClass = "w-36 shrink-0 truncate"
function SongCover({
song,
inRange,
onPlay,
}: {
song: BrowseSong
inRange: boolean
onPlay: () => void
}) {
return (
<div
className={cn(
"relative size-10 shrink-0 overflow-hidden rounded ring-1",
inRange ? "ring-white/25" : "ring-foreground/10"
)}
>
<Image
src={albumCoverUrl(song.album.id)}
alt={song.album.title}
fill
sizes="40px"
className="object-cover"
/>
<div className="absolute inset-0 flex items-center justify-center bg-black/0 transition-colors group-hover:bg-black/40">
<Button
size="icon-sm"
className="size-7 rounded-full opacity-0 transition-opacity group-hover:opacity-100"
aria-label={`Play ${song.title}`}
onClick={(event) => {
event.preventDefault()
event.stopPropagation()
onPlay()
}}
>
<Play className="size-3 fill-current" />
</Button>
</div>
</div>
)
}
function SongRow({
song,
isSelected,
selectionPosition,
isFavorite,
selectedCount,
stationArtist,
onSelect,
onPointerDown,
onToggleFavorite,
onPrepareContextMenu,
onMediaAction,
onPlay,
}: {
song: BrowseSong
isSelected: boolean
selectionPosition: SelectionRangePosition
isFavorite: boolean
selectedCount: number
stationArtist?: string
onSelect: (event: MouseEvent) => void
onPointerDown: (event: MouseEvent) => void
onToggleFavorite: () => void
onPrepareContextMenu: () => void
onMediaAction: (action: MediaContextAction, songId: string) => void
onPlay: () => void
}) {
const inRange = isInSelectionRange(selectionPosition)
const linkClass = inRange
? "text-primary-foreground hover:text-primary-foreground/80 hover:underline"
: "text-muted-foreground hover:text-foreground hover:underline"
return (
<TableRow
onMouseDown={onPointerDown}
onClick={onSelect}
onDoubleClick={(event) => {
event.preventDefault()
onPlay()
}}
className="group cursor-pointer select-none border-none hover:bg-transparent"
>
<TableCell colSpan={4} className="p-0">
<div
className={cn(
"relative py-2",
inRange && "text-primary-foreground"
)}
>
<SongsSelectionRangeHighlight position={selectionPosition} />
{!inRange ? <SongsTrackRowHoverHighlight /> : null}
<div
className={cn("relative z-10", songRowLayout, TRACK_ROW_PADDING)}
>
<div className={nameColumnLayout}>
<div className="flex items-center justify-center">
<Button
variant="ghost"
size="icon-sm"
className={cn(
"size-8 opacity-0 transition-opacity group-hover:opacity-100",
inRange
? "text-primary-foreground hover:bg-white/15 hover:text-primary-foreground"
: "text-primary hover:text-primary",
(isFavorite || isSelected) && "opacity-100"
)}
aria-label={
isFavorite
? `Remove ${song.title} from favorites`
: `Favorite ${song.title}`
}
onClick={(event) => {
event.stopPropagation()
onToggleFavorite()
}}
>
<Star
className={cn(
"size-4",
isFavorite && (inRange ? "fill-current" : "fill-primary")
)}
/>
</Button>
</div>
<SongCover song={song} inRange={inRange} onPlay={onPlay} />
<span className={ALBUM_TRACK_TITLE}>
{song.title}
{song.explicit ? (
<span
className={cn(
"ml-1.5 inline-flex size-3.5 shrink-0 items-center justify-center rounded-sm text-[9px] font-semibold leading-none",
inRange
? "bg-white/20 text-primary-foreground"
: "bg-muted-foreground/20 text-muted-foreground"
)}
aria-label="Explicit"
>
E
</span>
) : null}
</span>
</div>
<div className={songColumnClass}>
<Link
href={"/artist/" + song.artist.id}
className={linkClass}
onClick={(event) => event.stopPropagation()}
>
{song.artist.name}
</Link>
</div>
<div className={songColumnClass}>
<Link
href={"/album/" + song.album.id}
className={linkClass}
onClick={(event) => event.stopPropagation()}
>
{song.album.title}
</Link>
</div>
<div className="min-w-4 flex-1" />
<span
className={cn(
"shrink-0 text-right tabular-nums",
inRange ? "text-primary-foreground" : "text-muted-foreground"
)}
>
{formatDuration(song.durationSeconds)}
</span>
<MediaContextMenu
label={`More options for ${song.title}`}
stationArtistId={stationArtist}
selectedCount={selectedCount}
align="end"
inSelectionRange={inRange}
onOpenMenu={onPrepareContextMenu}
onAction={(action) => onMediaAction(action, song.id)}
favorited={isFavorite}
navigation={{
artist: { id: song.artist.id },
album: { id: song.album.id },
}}
share={{
type: "song",
albumId: song.album.id,
songId: song.id,
}}
/>
</div>
</div>
</TableCell>
</TableRow>
)
}
export function SongsView() { export function SongsView() {
const { isSongFavorite, toggleSongFavorite } = useFavorites() const { openAddToPlaylist } = useAddToPlaylist()
const { playFromLibrarySong } = usePlaybackActions() const { isSongFavorite, toggleSongFavorite, favoriteSongs } = useFavorites()
const { playFromLibrarySong } = usePlayback()
const { runQueueAction, createStation } = useQueueMediaActions()
const [sortKey, setSortKey] = useState<SortKey>("title") const [sortKey, setSortKey] = useState<SortKey>("title")
const [sortDirection, setSortDirection] = const [sortDirection, setSortDirection] =
useState<SortDirection>("asc") useState<SortDirection>("asc")
@@ -89,6 +306,7 @@ export function SongsView() {
const { const {
selectedIds, selectedIds,
selectedCount, selectedCount,
isSelected,
handleSelect, handleSelect,
handlePointerDown, handlePointerDown,
prepareContextMenu, prepareContextMenu,
@@ -109,27 +327,32 @@ export function SongsView() {
[songs, selectedIds] [songs, selectedIds]
) )
const handleMediaAction = useTrackListMediaAction({ selectedIds, songs }) function handleMediaAction(action: MediaContextAction, fallbackSongId?: string) {
const targetIds =
const handleRowSelect = useCallback( selectedIds.size > 0
(index: number, event: MouseEvent) => { ? Array.from(selectedIds)
handleSelect(songs[index].id, index, event) : fallbackSongId
}, ? [fallbackSongId]
[songs, handleSelect] : []
) switch (action) {
case "create-station": {
const handleRowPlay = useCallback( const artistId = stationArtistId(songs, new Set(targetIds))
(index: number) => { if (artistId) void createStation(artistId)
void playFromLibrarySong(songs[index].id, { sortKey, sortDirection }) break
}, }
[songs, sortKey, sortDirection, playFromLibrarySong] case "favorite":
) void favoriteSongs(targetIds as Id<"songs">[])
break
const handleToggleFavorite = useCallback( case "playlist":
(songId: string) => void toggleSongFavorite(songId as Id<"songs">), openAddToPlaylist(targetIds as Id<"songs">[])
[toggleSongFavorite] break
) case "play-next":
const getSongKey = useCallback((index: number) => songs[index].id, [songs]) case "play-last":
case "shuffle":
void runQueueAction(action, targetIds as Id<"songs">[])
break
}
}
if (status === "LoadingFirstPage" && !isCached) { if (status === "LoadingFirstPage" && !isCached) {
return ( return (
@@ -200,7 +423,7 @@ export function SongsView() {
</p> </p>
) : null} ) : null}
<ScrollArea className="min-h-0 flex-1 [&_[data-slot=scroll-area-viewport]>div]:block!"> <ScrollArea className="min-h-0 flex-1">
<div <div
className="w-full pb-28" className="w-full pb-28"
onClick={(event) => { onClick={(event) => {
@@ -209,29 +432,68 @@ export function SongsView() {
} }
}} }}
> >
<LibraryTrackListHeader /> <Table>
<VirtualList <TableHeader>
count={songs.length} <TableRow className="border-none hover:bg-transparent">
estimateSize={estimateSongRowSize} <TableHead colSpan={4} className="h-9 p-0 font-normal">
getItemKey={getSongKey} <div className={cn(songRowLayout, TRACK_ROW_PADDING)}>
renderItem={(index) => ( <div className={nameColumnLayout}>
<TrackRow <span aria-hidden />
variant="library" <span aria-hidden />
song={songs[index]} <span className="text-xs text-muted-foreground">Name</span>
index={index} </div>
selectionPosition={selectionPositions[index]} <span className={cn(songColumnClass, "text-xs text-muted-foreground")}>
isFavorite={isSongFavorite(songs[index].id)} Artist
selectedCount={selectedCount} </span>
selectionStationArtistId={selectedStationArtistId} <span className={cn(songColumnClass, "text-xs text-muted-foreground")}>
onPointerDown={handlePointerDown} Album
onSelect={handleRowSelect} </span>
onPlay={handleRowPlay} <div className="min-w-4 flex-1" />
onToggleFavorite={handleToggleFavorite} <span className="shrink-0 text-right text-xs text-muted-foreground">
onPrepareContextMenu={prepareContextMenu} Time
onMediaAction={handleMediaAction} </span>
/> <span className="size-8 shrink-0" aria-hidden />
)} </div>
/> </TableHead>
</TableRow>
</TableHeader>
<TableBody>
{songs.map((song, index) => (
<SongRow
key={song.id}
song={song}
isSelected={isSelected(song.id)}
selectionPosition={selectionPositions[index]}
isFavorite={isSongFavorite(song.id)}
stationArtist={
isSelected(song.id)
? selectedStationArtistId
: song.artist.id
}
selectedCount={
isSelected(song.id) && selectedCount > 0
? selectedCount
: 1
}
onPointerDown={handlePointerDown}
onSelect={(event) => {
handleSelect(song.id, index, event)
}}
onToggleFavorite={() =>
void toggleSongFavorite(song.id as Id<"songs">)
}
onPrepareContextMenu={() => prepareContextMenu(song.id)}
onMediaAction={handleMediaAction}
onPlay={() =>
void playFromLibrarySong(song.id as Id<"songs">, {
sortKey,
sortDirection,
})
}
/>
))}
</TableBody>
</Table>
<div <div
ref={loadMoreRef} ref={loadMoreRef}
className="flex items-center justify-center py-4" className="flex items-center justify-center py-4"
@@ -3,62 +3,10 @@
import type { MouseEvent } from "react" import type { MouseEvent } from "react"
import { AudioLines, Pause, Play } from "lucide-react" import { AudioLines, Pause, Play } from "lucide-react"
import { import { usePlayback } from "@/components/playback-provider"
useIsPlaying,
usePlaybackActions,
} from "@/components/playback-provider"
import { Button } from "@/components/ui/button" import { Button } from "@/components/ui/button"
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils"
function trackButtonClassName(showPlay: boolean, inRange: boolean) {
return cn(
"absolute size-8 opacity-0 transition-opacity group-hover:opacity-100",
showPlay && "opacity-100",
inRange
? "text-primary-foreground hover:bg-white/15 hover:text-primary-foreground"
: "text-primary hover:text-primary"
)
}
function NowPlayingButton({
title,
inRange,
}: {
title: string
inRange: boolean
}) {
const isPlaying = useIsPlaying()
const { setIsPlaying } = usePlaybackActions()
return (
<Button
variant="ghost"
size="icon-sm"
className={trackButtonClassName(true, inRange)}
aria-label={isPlaying ? `Pause ${title}` : `Play ${title}`}
onClick={(event: MouseEvent) => {
event.stopPropagation()
setIsPlaying(!isPlaying)
}}
>
<span className="absolute inset-0 flex items-center justify-center transition-opacity group-hover:opacity-0">
{isPlaying ? (
<AudioLines className="size-4" />
) : (
<Play className="size-4 fill-current" />
)}
</span>
<span className="absolute inset-0 flex items-center justify-center opacity-0 transition-opacity group-hover:opacity-100">
{isPlaying ? (
<Pause className="size-4" />
) : (
<Play className="size-4 fill-current" />
)}
</span>
</Button>
)
}
export function TrackNumberPlayButton({ export function TrackNumberPlayButton({
displayTrack, displayTrack,
title, title,
@@ -74,7 +22,26 @@ export function TrackNumberPlayButton({
inRange: boolean inRange: boolean
onPlay: () => void onPlay: () => void
}) { }) {
const { isPlaying, setIsPlaying } = usePlayback()
const showPlay = isActive || isNowPlaying const showPlay = isActive || isNowPlaying
const isCurrentlyPlaying = isNowPlaying && isPlaying
const buttonClassName = cn(
"absolute size-8 opacity-0 transition-opacity group-hover:opacity-100",
showPlay && "opacity-100",
inRange
? "text-primary-foreground hover:bg-white/15 hover:text-primary-foreground"
: "text-primary hover:text-primary"
)
const handleClick = (event: MouseEvent) => {
event.stopPropagation()
if (isNowPlaying) {
setIsPlaying(!isPlaying)
return
}
onPlay()
}
return ( return (
<div <div
@@ -92,17 +59,35 @@ export function TrackNumberPlayButton({
{displayTrack} {displayTrack}
</span> </span>
{isNowPlaying ? ( {isNowPlaying ? (
<NowPlayingButton title={title} inRange={inRange} /> <Button
variant="ghost"
size="icon-sm"
className={buttonClassName}
aria-label={isCurrentlyPlaying ? `Pause ${title}` : `Play ${title}`}
onClick={handleClick}
>
<span className="absolute inset-0 flex items-center justify-center transition-opacity group-hover:opacity-0">
{isCurrentlyPlaying ? (
<AudioLines className="size-4" />
) : (
<Play className="size-4 fill-current" />
)}
</span>
<span className="absolute inset-0 flex items-center justify-center opacity-0 transition-opacity group-hover:opacity-100">
{isCurrentlyPlaying ? (
<Pause className="size-4" />
) : (
<Play className="size-4 fill-current" />
)}
</span>
</Button>
) : ( ) : (
<Button <Button
variant="ghost" variant="ghost"
size="icon-sm" size="icon-sm"
className={trackButtonClassName(showPlay, inRange)} className={buttonClassName}
aria-label={`Play ${title}`} aria-label={`Play ${title}`}
onClick={(event) => { onClick={handleClick}
event.stopPropagation()
onPlay()
}}
> >
<Play className="size-4 fill-current" /> <Play className="size-4 fill-current" />
</Button> </Button>
-518
View File
@@ -1,518 +0,0 @@
"use client"
import * as React from "react"
import Image from "next/image"
import Link from "next/link"
import { Music2, Play, Star, Trash2 } from "lucide-react"
import {
MediaContextMenu,
MediaContextMenuArea,
MediaMenuItem,
MediaMenuSeparator,
type MediaContextAction,
type MediaContextMenuProps,
} from "@/components/media-context-menu"
import { PlaybackSongMeta } from "@/components/playback-song-meta"
import { TrackNumberPlayButton } from "@/components/track-number-play-button"
import { Button } from "@/components/ui/button"
import { albumCoverUrl } from "@/lib/cover-urls"
import {
ALBUM_TRACK_ROW,
ALBUM_TRACK_TITLE,
isInSelectionRange,
SelectionRangeHighlight,
TrackRowActiveHighlight,
TrackRowHoverHighlight,
TRACK_ROW_PADDING,
type SelectionRangePosition,
} from "@/lib/selection-range-styles"
import { formatDuration } from "@/lib/format-duration"
import { cn } from "@/lib/utils"
import type { BrowseSong } from "@otunes/convex/types"
/**
* - `library`: favorite star, cover with play overlay, title, artist and album
* columns (use with `LibraryTrackListHeader`).
* - `album`: favorite star, track number, title with optional credits.
* - `playlist`: cover with favorite overlay, track number, title.
* - `queue`: square cover, title and artist, no menu.
*/
export type TrackRowVariant = "library" | "album" | "playlist" | "queue"
export type TrackRowProps = {
variant: TrackRowVariant
song: BrowseSong
/** Position in the list the selection hook was given. */
index: number
/** Number shown in the track number column (`album` and `playlist`). */
trackNumber?: number
/** Secondary line under the title, e.g. album track credits. */
subtitle?: string
selectionPosition: SelectionRangePosition
isActive?: boolean
isNowPlaying?: boolean
isFavorite?: boolean
isDragging?: boolean
/** Total selected songs; the menu acts on these when this row is selected. */
selectedCount?: number
/** Station artist for the selection when this row is selected. */
selectionStationArtistId?: string
playlistLabel?: string
showFavoriteInMenu?: boolean
/** Adds a destructive menu item calling `onRemove`. */
removeLabel?: string
ref?: React.Ref<HTMLElement>
onSelect: (index: number, event: React.MouseEvent) => void
onPointerDown: (event: React.MouseEvent) => void
onPlay: (index: number) => void
onToggleFavorite?: (songId: string) => void
onPrepareContextMenu?: (songId: string) => void
/** Renders the "more options" and right-click menus when provided. */
onMediaAction?: (action: MediaContextAction, songId: string) => void
onRemove?: (songId: string) => void
/** Makes the row draggable when provided. */
onDragStart?: (index: number) => void
onDrop?: (index: number) => void
}
const LIBRARY_ROW_LAYOUT = "flex w-full items-center gap-x-4"
const LIBRARY_NAME_COLUMNS =
"grid grid-cols-[2rem_2.5rem_minmax(0,10rem)] items-center gap-x-2"
const LIBRARY_COLUMN = "w-36 shrink-0 truncate"
export function TrackCover({
albumId,
alt,
inRange,
square = false,
children,
}: {
albumId: string | undefined
alt: string
inRange: boolean
square?: boolean
/** Overlay shown above the cover image. */
children?: React.ReactNode
}) {
const ringClass = inRange ? "ring-white/25" : "ring-foreground/10"
if (!albumId) {
return (
<div
className={cn(
"flex size-10 shrink-0 items-center justify-center bg-muted ring-1",
!square && "rounded",
ringClass
)}
>
<Music2 className="size-4 text-muted-foreground" />
</div>
)
}
return (
<div
className={cn(
"group/cover relative size-10 shrink-0 overflow-hidden ring-1",
!square && "rounded",
ringClass
)}
>
<Image
src={albumCoverUrl(albumId)}
alt={alt}
fill
sizes="40px"
className="object-cover"
/>
{children}
</div>
)
}
function FavoriteStarButton({
title,
isFavorite,
inRange,
className,
onToggle,
}: {
title: string
isFavorite: boolean
inRange: boolean
className?: string
onToggle: () => void
}) {
return (
<Button
variant="ghost"
size="icon-sm"
className={cn(
"size-8",
inRange
? "text-primary-foreground hover:bg-white/15 hover:text-primary-foreground"
: "text-primary hover:text-primary",
className
)}
aria-label={isFavorite ? `Remove ${title} from favorites` : `Favorite ${title}`}
onClick={(event) => {
event.stopPropagation()
onToggle()
}}
>
<Star
className={cn(
"size-4",
isFavorite && (inRange ? "fill-current" : "fill-primary")
)}
/>
</Button>
)
}
function ExplicitBadge({ inRange }: { inRange: boolean }) {
return (
<span
className={cn(
"ml-1.5 inline-flex size-3.5 shrink-0 items-center justify-center rounded-sm text-[9px] font-semibold leading-none",
inRange
? "bg-white/20 text-primary-foreground"
: "bg-muted-foreground/20 text-muted-foreground"
)}
aria-label="Explicit"
>
E
</span>
)
}
function TrackTitle({
song,
subtitle,
inRange,
}: {
song: BrowseSong
subtitle?: string
inRange: boolean
}) {
return (
<div className="min-w-0 flex-1">
<div className={ALBUM_TRACK_TITLE}>
{song.title}
{song.explicit ? <ExplicitBadge inRange={inRange} /> : null}
</div>
{subtitle ? (
<p
className={cn(
"truncate text-xs",
inRange ? "text-primary-foreground/80" : "text-muted-foreground"
)}
>
{subtitle}
</p>
) : null}
</div>
)
}
export function LibraryTrackListHeader() {
const labelClass = "text-xs text-muted-foreground"
return (
<div className={cn("flex h-9 items-center", LIBRARY_ROW_LAYOUT, TRACK_ROW_PADDING)}>
<div className={LIBRARY_NAME_COLUMNS}>
<span aria-hidden />
<span aria-hidden />
<span className={labelClass}>Name</span>
</div>
<span className={cn(LIBRARY_COLUMN, labelClass)}>Artist</span>
<span className={cn(LIBRARY_COLUMN, labelClass)}>Album</span>
<div className="min-w-4 flex-1" />
<span className={cn("shrink-0 text-right", labelClass)}>Time</span>
<span className="size-8 shrink-0" aria-hidden />
</div>
)
}
function TrackRowComponent({
variant,
song,
index,
trackNumber,
subtitle,
selectionPosition,
isActive = false,
isNowPlaying = false,
isFavorite = false,
isDragging = false,
selectedCount = 0,
selectionStationArtistId,
playlistLabel,
showFavoriteInMenu = true,
removeLabel,
ref,
onSelect,
onPointerDown,
onPlay,
onToggleFavorite,
onPrepareContextMenu,
onMediaAction,
onRemove,
onDragStart,
onDrop,
}: TrackRowProps) {
const inRange = isInSelectionRange(selectionPosition)
const flush = variant === "library" || variant === "queue"
const play = () => onPlay(index)
const toggleFavorite = () => onToggleFavorite?.(song.id)
const favoriteStar = (
<div className="flex shrink-0 items-center justify-center">
<FavoriteStarButton
title={song.title}
isFavorite={isFavorite}
inRange={inRange}
className={cn(
"opacity-0 transition-opacity group-hover:opacity-100",
(isFavorite || isActive || inRange) && "opacity-100"
)}
onToggle={toggleFavorite}
/>
</div>
)
const trackNumberButton = (
<TrackNumberPlayButton
displayTrack={trackNumber ?? index + 1}
title={song.title}
isActive={isActive}
isNowPlaying={isNowPlaying}
inRange={inRange}
onPlay={play}
/>
)
const duration = (
<span
className={cn(
"shrink-0 text-right tabular-nums",
variant === "queue" && "text-xs",
inRange ? "text-primary-foreground" : "text-muted-foreground"
)}
>
{formatDuration(song.durationSeconds)}
</span>
)
// Shared by the "more options" button and the right-click menu.
const menuProps: MediaContextMenuProps | null = onMediaAction
? {
label: `More options for ${song.title}`,
stationArtistId: inRange ? selectionStationArtistId : song.artist.id,
selectedCount: inRange && selectedCount > 0 ? selectedCount : 1,
inSelectionRange: inRange,
onOpenMenu: () => onPrepareContextMenu?.(song.id),
onAction: (action) => onMediaAction(action, song.id),
playlistLabel,
showFavorite: showFavoriteInMenu,
favorited: isFavorite,
navigation: {
artist: { id: song.artist.id },
album: { id: song.album.id },
},
share: { type: "song", albumId: song.album.id, songId: song.id },
children:
removeLabel && onRemove ? (
<>
<MediaMenuSeparator />
<MediaMenuItem
variant="destructive"
className="justify-between"
onClick={() => onRemove(song.id)}
>
{removeLabel}
<Trash2 />
</MediaMenuItem>
</>
) : null,
}
: null
const menu = menuProps ? <MediaContextMenu {...menuProps} /> : null
let content: React.ReactNode
switch (variant) {
case "library": {
const linkClass = inRange
? "text-primary-foreground hover:text-primary-foreground/80 hover:underline"
: "text-muted-foreground hover:text-foreground hover:underline"
content = (
<div className={cn("relative z-10", LIBRARY_ROW_LAYOUT, TRACK_ROW_PADDING)}>
<div className={LIBRARY_NAME_COLUMNS}>
{favoriteStar}
<TrackCover albumId={song.album.id} alt={song.album.title} inRange={inRange}>
<div className="absolute inset-0 flex items-center justify-center bg-black/0 transition-colors group-hover:bg-black/40">
<Button
size="icon-sm"
className="size-7 rounded-full opacity-0 transition-opacity group-hover:opacity-100"
aria-label={`Play ${song.title}`}
onClick={(event) => {
event.preventDefault()
event.stopPropagation()
play()
}}
>
<Play className="size-3 fill-current" />
</Button>
</div>
</TrackCover>
<TrackTitle song={song} inRange={inRange} />
</div>
<div className={LIBRARY_COLUMN}>
<Link
href={"/artist/" + song.artist.id}
className={linkClass}
onClick={(event) => event.stopPropagation()}
>
{song.artist.name}
</Link>
</div>
<div className={LIBRARY_COLUMN}>
<Link
href={"/album/" + song.album.id}
className={linkClass}
onClick={(event) => event.stopPropagation()}
>
{song.album.title}
</Link>
</div>
<div className="min-w-4 flex-1" />
{duration}
{menu}
</div>
)
break
}
case "album":
content = (
<div className={cn("relative z-10", ALBUM_TRACK_ROW, TRACK_ROW_PADDING)}>
{favoriteStar}
{trackNumberButton}
<TrackTitle song={song} subtitle={subtitle} inRange={inRange} />
{duration}
{menu}
</div>
)
break
case "playlist":
content = (
<div className={cn("relative z-10", ALBUM_TRACK_ROW, TRACK_ROW_PADDING)}>
<TrackCover albumId={song.album.id} alt={song.album.title} inRange={inRange}>
<div className="absolute inset-0 flex items-center justify-center bg-black/0 opacity-0 transition-opacity group-hover/cover:bg-black/40 group-hover/cover:opacity-100">
<FavoriteStarButton
title={song.title}
isFavorite={isFavorite}
inRange={inRange}
onToggle={toggleFavorite}
/>
</div>
</TrackCover>
{trackNumberButton}
<TrackTitle song={song} subtitle={subtitle} inRange={inRange} />
{duration}
{menu}
</div>
)
break
case "queue":
content = (
<div className="relative z-10 flex items-center gap-3 px-2">
<TrackCover
albumId={song.album.id}
alt={song.album.title}
inRange={inRange}
square
/>
<PlaybackSongMeta
song={song}
isCurrent={isNowPlaying}
inRange={inRange}
align="start"
showAlbum={false}
/>
{duration}
</div>
)
break
}
const shellProps = {
role: "button",
tabIndex: 0,
draggable: onDragStart ? true : undefined,
onDragStart: onDragStart
? (event: React.DragEvent) => {
event.dataTransfer.effectAllowed = "move"
onDragStart(index)
}
: undefined,
onDragOver: onDragStart
? (event: React.DragEvent) => event.preventDefault()
: undefined,
onDrop: onDrop
? (event: React.DragEvent) => {
event.preventDefault()
onDrop(index)
}
: undefined,
onMouseDown: onPointerDown,
onClick: (event: React.MouseEvent) => onSelect(index, event),
onDoubleClick: (event: React.MouseEvent) => {
event.preventDefault()
play()
},
onKeyDown: (event: React.KeyboardEvent) => {
if (event.key === "Enter" || event.key === " ") {
event.preventDefault()
onSelect(index, event as unknown as React.MouseEvent)
}
},
className: cn(
"group relative w-full cursor-pointer select-none text-left text-sm transition-colors",
flush ? "py-2" : "py-2.5",
inRange && "text-primary-foreground",
isDragging && "opacity-50"
),
}
const children = (
<>
<SelectionRangeHighlight position={selectionPosition} flush={flush} />
{!inRange && isActive ? <TrackRowActiveHighlight flush={flush} /> : null}
{!inRange && !isActive ? <TrackRowHoverHighlight flush={flush} /> : null}
{content}
</>
)
const shell =
variant === "queue" ? (
<li ref={ref as React.Ref<HTMLLIElement>} {...shellProps}>
{children}
</li>
) : (
<div ref={ref as React.Ref<HTMLDivElement>} {...shellProps}>
{children}
</div>
)
return menuProps ? (
<MediaContextMenuArea menu={menuProps}>{shell}</MediaContextMenuArea>
) : (
shell
)
}
/**
* Pass stable callbacks: they receive the row's `index` or song id, so one
* handler can serve every row.
*/
export const TrackRow = React.memo(TrackRowComponent)
-120
View File
@@ -1,120 +0,0 @@
"use client"
import * as React from "react"
import {
defaultRangeExtractor,
useVirtualizer,
type Range,
} from "@tanstack/react-virtual"
import { cn } from "@/lib/utils"
const scrollViewportSelector = '[data-slot="scroll-area-viewport"]'
/**
* Renders only the visible items of a list placed inside a `ScrollArea`.
* The list may sit below other content in the same viewport.
*/
export function VirtualList({
count,
estimateSize,
getItemKey,
renderItem,
overscan = 10,
keepMounted = null,
className,
}: {
count: number
estimateSize: (index: number) => number
getItemKey: (index: number) => string
renderItem: (index: number) => React.ReactNode
overscan?: number
/** Index rendered even when off screen, e.g. the source of a drag. */
keepMounted?: number | null
className?: string
}) {
const listRef = React.useRef<HTMLDivElement>(null)
const [scrollMargin, setScrollMargin] = React.useState(0)
React.useLayoutEffect(() => {
const list = listRef.current
const viewport = list?.closest<HTMLElement>(scrollViewportSelector)
if (!list || !viewport) return
const measure = () => {
setScrollMargin(
Math.round(
list.getBoundingClientRect().top -
viewport.getBoundingClientRect().top +
viewport.scrollTop
)
)
}
const observer = new ResizeObserver(measure)
observer.observe(viewport)
if (viewport.firstElementChild) {
observer.observe(viewport.firstElementChild)
}
return () => observer.disconnect()
}, [])
const getScrollElement = () =>
listRef.current?.closest<HTMLElement>(scrollViewportSelector) ?? null
const virtualizer = useVirtualizer({
count,
getScrollElement,
// The virtualizer scrolls to this offset on attach. Keep the viewport's
// current position so `ScrollRestoration` is not reset to the top.
initialOffset: () => getScrollElement()?.scrollTop ?? 0,
estimateSize,
getItemKey,
overscan,
scrollMargin,
rangeExtractor: React.useCallback(
(range: Range) => {
const indexes = defaultRangeExtractor(range)
if (
keepMounted !== null &&
keepMounted < range.count &&
!indexes.includes(keepMounted)
) {
indexes.push(keepMounted)
indexes.sort((a, b) => a - b)
}
return indexes
},
[keepMounted]
),
})
// The virtualizer caches its offset across a detach. Clear it so a
// re-attach (e.g. StrictMode's effect replay) re-reads `initialOffset`
// instead of scrolling back to a stale position.
React.useLayoutEffect(
() => () => {
virtualizer.scrollOffset = null
},
[virtualizer]
)
return (
<div
ref={listRef}
className={cn("relative w-full", className)}
style={{ height: virtualizer.getTotalSize() }}
>
{virtualizer.getVirtualItems().map((item) => (
<div
key={item.key}
data-index={item.index}
ref={virtualizer.measureElement}
className="absolute top-0 left-0 w-full"
style={{ transform: `translateY(${item.start - scrollMargin}px)` }}
>
{renderItem(item.index)}
</div>
))}
</div>
)
}
+2 -21
View File
@@ -9,18 +9,13 @@ import {
type PaginatedQueryReference, type PaginatedQueryReference,
} from "convex/react" } from "convex/react"
import type { FunctionReference } from "convex/server" import type { FunctionReference } from "convex/server"
import { useCallback, useEffect, useMemo, useSyncExternalStore } from "react" import { useCallback, useEffect, useSyncExternalStore } from "react"
import { useCacheScope } from "@/components/persistent-cache-provider" import { useCacheScope } from "@/components/persistent-cache-provider"
import { queryCacheKey } from "@otunes/convex/client/cached-query" import { queryCacheKey } from "@otunes/convex/client/cached-query"
import { readCache, subscribeCache, writeCache } from "@/lib/persistent-cache" import { readCache, subscribeCache, writeCache } from "@/lib/persistent-cache"
const MAX_CACHED_PAGINATED_ITEMS = 200 const MAX_CACHED_PAGINATED_ITEMS = 200
const MAX_RESTORED_PAGINATED_ITEMS = 1000
// Items loaded per paginated query this session, so a remount (e.g. back
// navigation) loads as much as before and scroll restoration can reach it.
const loadedItemCounts = new Map<string, number>()
const noopUnsubscribe = () => {} const noopUnsubscribe = () => {}
@@ -70,7 +65,6 @@ export function useCachedQuery<Query extends FunctionReference<"query">>(
/** /**
* `usePaginatedQuery` that shows the first persisted pages while the first live * `usePaginatedQuery` that shows the first persisted pages while the first live
* page loads. `isCached` is true while those persisted results are shown. * page loads. `isCached` is true while those persisted results are shown.
* Remounts start with as many items as were last loaded this session.
*/ */
export function useCachedPaginatedQuery<Query extends PaginatedQueryReference>( export function useCachedPaginatedQuery<Query extends PaginatedQueryReference>(
query: Query, query: Query,
@@ -78,28 +72,15 @@ export function useCachedPaginatedQuery<Query extends PaginatedQueryReference>(
options: { initialNumItems: number } options: { initialNumItems: number }
) { ) {
const scope = useCacheScope() const scope = useCacheScope()
const result = usePaginatedQuery(query, args, options)
const key = const key =
args === "skip" args === "skip"
? null ? null
: `${queryCacheKey(scope, query, args as Record<string, unknown>)}:pages` : `${queryCacheKey(scope, query, args as Record<string, unknown>)}:pages`
// Fixed per key: `usePaginatedQuery` restarts when this changes.
const initialNumItems = useMemo(
() =>
Math.max(
options.initialNumItems,
Math.min(
(key && loadedItemCounts.get(key)) || 0,
MAX_RESTORED_PAGINATED_ITEMS
)
),
[key, options.initialNumItems]
)
const result = usePaginatedQuery(query, args, { initialNumItems })
const cached = useCachedValue<PaginatedQueryItem<Query>[]>(key) const cached = useCachedValue<PaginatedQueryItem<Query>[]>(key)
useEffect(() => { useEffect(() => {
if (key && result.status !== "LoadingFirstPage") { if (key && result.status !== "LoadingFirstPage") {
loadedItemCounts.set(key, result.results.length)
writeCache(key, result.results.slice(0, MAX_CACHED_PAGINATED_ITEMS)) writeCache(key, result.results.slice(0, MAX_CACHED_PAGINATED_ITEMS))
} }
}, [key, result.status, result.results]) }, [key, result.status, result.results])
-104
View File
@@ -1,104 +0,0 @@
"use client"
import * as React from "react"
import { useConvex } from "convex/react"
import { useAddToPlaylist } from "@/components/add-to-playlist-provider"
import { useFavorites } from "@/components/favorites-provider"
import type { MediaContextAction } from "@/components/media-context-menu"
import { useCacheScope } from "@/components/persistent-cache-provider"
import { useQueueMediaActions } from "@/hooks/use-queue-media-actions"
import { stationArtistId } from "@/lib/station-artist"
import { api } from "@otunes/convex/_generated/api"
import type { Id } from "@otunes/convex/_generated/dataModel"
import { fetchCachedQuery } from "@otunes/convex/client/cached-query"
export function useMediaActions() {
const { openAddToPlaylist, openAddArtistToPlaylist } = useAddToPlaylist()
const { favoriteSongs, toggleArtistFavorite } = useFavorites()
const { runQueueAction, createStation } = useQueueMediaActions()
const convex = useConvex()
const cacheScope = useCacheScope()
const runSongsAction = React.useCallback(
(
action: MediaContextAction,
songIds: Id<"songs">[],
stationArtist?: string
) => {
switch (action) {
case "create-station":
if (stationArtist) void createStation(stationArtist)
break
case "favorite":
void favoriteSongs(songIds)
break
case "playlist":
openAddToPlaylist(songIds)
break
case "play-next":
case "play-last":
case "shuffle":
void runQueueAction(action, songIds)
break
}
},
[createStation, favoriteSongs, openAddToPlaylist, runQueueAction]
)
const runArtistAction = React.useCallback(
async (action: MediaContextAction, artistId: string) => {
switch (action) {
case "favorite":
void toggleArtistFavorite(artistId as Id<"artists">)
break
case "playlist":
void openAddArtistToPlaylist(artistId as Id<"artists">)
break
case "play-next":
case "play-last":
case "shuffle": {
const songIds = await fetchCachedQuery(
convex,
cacheScope,
api.playlists.getOrderedArtistSongIds,
{ artistId: artistId as Id<"artists"> }
)
void runQueueAction(action, songIds)
break
}
}
},
[convex, cacheScope, toggleArtistFavorite, openAddArtistToPlaylist, runQueueAction]
)
return { runSongsAction, runArtistAction }
}
/**
* Handles a track row menu action, targeting the current selection or else the
* row's song. The station artist is `artistId` when given, otherwise the artist
* every targeted song in `songs` shares.
*/
export function useTrackListMediaAction({
selectedIds,
songs,
artistId,
}: {
selectedIds: ReadonlySet<string>
songs?: { id: string; artist: { id: string } }[]
artistId?: string
}) {
const { runSongsAction } = useMediaActions()
return React.useCallback(
(action: MediaContextAction, songId: string) => {
const targetIds = selectedIds.size > 0 ? Array.from(selectedIds) : [songId]
const stationArtist =
artistId ??
(songs ? stationArtistId(songs, new Set(targetIds)) : undefined)
runSongsAction(action, targetIds as Id<"songs">[], stationArtist)
},
[selectedIds, songs, artistId, runSongsAction]
)
}
+2 -2
View File
@@ -3,7 +3,7 @@
import * as React from "react" import * as React from "react"
import { toast } from "sonner" import { toast } from "sonner"
import { usePlaybackActions } from "@/components/playback-provider" import { usePlayback } from "@/components/playback-provider"
import type { MediaContextAction } from "@/components/media-context-menu" import type { MediaContextAction } from "@/components/media-context-menu"
import type { Id } from "@otunes/convex/_generated/dataModel" import type { Id } from "@otunes/convex/_generated/dataModel"
@@ -29,7 +29,7 @@ function queueActionMessage(action: QueueMediaAction, count: number) {
export function useQueueMediaActions() { export function useQueueMediaActions() {
const { addToQueueNext, addToQueueLast, playShuffled, playArtistShuffled } = const { addToQueueNext, addToQueueLast, playShuffled, playArtistShuffled } =
usePlaybackActions() usePlayback()
const runQueueAction = React.useCallback( const runQueueAction = React.useCallback(
async (action: QueueMediaAction, songIds: Id<"songs">[]) => { async (action: QueueMediaAction, songIds: Id<"songs">[]) => {
-19
View File
@@ -1,19 +0,0 @@
"use client"
import * as React from "react"
/**
* Returns a function with a stable identity that always calls the latest
* `callback`. Only call it from event handlers, never during render.
*/
export function useStableCallback<Args extends unknown[], Result>(
callback: (...args: Args) => Result
): (...args: Args) => Result {
const callbackRef = React.useRef(callback)
React.useLayoutEffect(() => {
callbackRef.current = callback
})
return React.useCallback((...args: Args) => callbackRef.current(...args), [])
}
+95 -21
View File
@@ -46,7 +46,7 @@ export function getSelectionRangePositions(
return positions return positions
} }
export function selectionHighlightRadiusClass( function selectionHighlightRadiusClass(
position: SelectionRangePosition position: SelectionRangePosition
) { ) {
switch (position) { switch (position) {
@@ -61,21 +61,12 @@ export function selectionHighlightRadiusClass(
} }
} }
export const TRACK_ROW_HIGHLIGHT_INSET = "absolute inset-y-0 left-2 right-2" const TRACK_ROW_HIGHLIGHT_INSET = "absolute inset-y-0 left-2 right-2"
/** Full-width, square-corner highlight used by the library and queue lists. */
export const FLUSH_ROW_HIGHLIGHT_INSET = "absolute inset-0"
/**
* Track row highlights are inset rounded pills by default; `flush` makes them
* full-width with square corners.
*/
export function SelectionRangeHighlight({ export function SelectionRangeHighlight({
position, position,
flush = false,
}: { }: {
position: SelectionRangePosition position: SelectionRangePosition
flush?: boolean
}) { }) {
if (position === "none") { if (position === "none") {
return null return null
@@ -86,34 +77,34 @@ export function SelectionRangeHighlight({
aria-hidden aria-hidden
className={cn( className={cn(
"pointer-events-none bg-primary", "pointer-events-none bg-primary",
flush TRACK_ROW_HIGHLIGHT_INSET,
? FLUSH_ROW_HIGHLIGHT_INSET selectionHighlightRadiusClass(position)
: [TRACK_ROW_HIGHLIGHT_INSET, selectionHighlightRadiusClass(position)]
)} )}
/> />
) )
} }
export function TrackRowHoverHighlight({ flush = false }: { flush?: boolean }) { /** Inset rounded hover background matching the selection pill shape. */
export function TrackRowHoverHighlight() {
return ( return (
<div <div
aria-hidden aria-hidden
className={cn( className={cn(
"pointer-events-none bg-muted/60 opacity-0 transition-opacity group-hover:opacity-100", "pointer-events-none rounded-lg bg-muted/60 opacity-0 transition-opacity group-hover:opacity-100",
flush ? FLUSH_ROW_HIGHLIGHT_INSET : [TRACK_ROW_HIGHLIGHT_INSET, "rounded-lg"] TRACK_ROW_HIGHLIGHT_INSET
)} )}
/> />
) )
} }
/** Background for the active (focused or now playing) row. */ /** Inset rounded background for the active (now playing) row. */
export function TrackRowActiveHighlight({ flush = false }: { flush?: boolean }) { export function TrackRowActiveHighlight() {
return ( return (
<div <div
aria-hidden aria-hidden
className={cn( className={cn(
"pointer-events-none bg-muted/60", "pointer-events-none rounded-lg bg-muted/60",
flush ? FLUSH_ROW_HIGHLIGHT_INSET : [TRACK_ROW_HIGHLIGHT_INSET, "rounded-lg"] TRACK_ROW_HIGHLIGHT_INSET
)} )}
/> />
) )
@@ -125,6 +116,42 @@ export const TRACK_ROW_PADDING = "pl-8 pr-10"
/** Centers the track list in the main content area. */ /** Centers the track list in the main content area. */
export const TRACK_LIST_CONTAINER = "mx-auto w-full max-w-9/10" export const TRACK_LIST_CONTAINER = "mx-auto w-full max-w-9/10"
/** Full-width highlight for library song rows (no horizontal inset). */
const SONGS_ROW_HIGHLIGHT_INSET = "absolute inset-0"
export function SongsSelectionRangeHighlight({
position,
}: {
position: SelectionRangePosition
}) {
if (position === "none") {
return null
}
return (
<div
aria-hidden
className={cn(
"pointer-events-none bg-primary",
SONGS_ROW_HIGHLIGHT_INSET
)}
/>
)
}
/** Full-width hover background for library song rows (not rounded). */
export function SongsTrackRowHoverHighlight() {
return (
<div
aria-hidden
className={cn(
"pointer-events-none bg-muted/60 opacity-0 transition-opacity group-hover:opacity-100",
SONGS_ROW_HIGHLIGHT_INSET
)}
/>
)
}
/** Album track row: star, track #, title (flex), duration, menu. */ /** Album track row: star, track #, title (flex), duration, menu. */
export const ALBUM_TRACK_ROW = "flex w-full min-w-0 items-center gap-x-3" export const ALBUM_TRACK_ROW = "flex w-full min-w-0 items-center gap-x-3"
@@ -133,3 +160,50 @@ export const ALBUM_TRACK_TITLE = "min-w-0 flex-1 truncate font-normal"
export function isInSelectionRange(position: SelectionRangePosition) { export function isInSelectionRange(position: SelectionRangePosition) {
return position !== "none" return position !== "none"
} }
/** Full-width, square-corner highlights for the queue sidebar. */
const QUEUE_ROW_HIGHLIGHT_INSET = "absolute inset-0"
export function QueueSelectionRangeHighlight({
position,
}: {
position: SelectionRangePosition
}) {
if (position === "none") {
return null
}
return (
<div
aria-hidden
className={cn(
"pointer-events-none bg-primary",
QUEUE_ROW_HIGHLIGHT_INSET
)}
/>
)
}
export function QueueTrackRowHoverHighlight() {
return (
<div
aria-hidden
className={cn(
"pointer-events-none bg-muted/60 opacity-0 transition-opacity group-hover:opacity-100",
QUEUE_ROW_HIGHLIGHT_INSET
)}
/>
)
}
export function QueueTrackRowActiveHighlight() {
return (
<div
aria-hidden
className={cn(
"pointer-events-none bg-muted/60",
QUEUE_ROW_HIGHLIGHT_INSET
)}
/>
)
}
-41
View File
@@ -1,41 +0,0 @@
import fs from "node:fs/promises"
import * as music from "music-metadata"
const MAX_ENTRIES = 1000
export type AudioInfo = {
codec: string | undefined
duration: number | undefined
}
const cache = new Map<string, Promise<AudioInfo>>()
/** Codec info for a file, parsed once per file version. */
export async function audioInfo(file: string): Promise<AudioInfo> {
const stat = await fs.stat(file)
const key = `${file}\0${stat.size}\0${stat.mtimeMs}`
const cached = cache.get(key)
if (cached) {
cache.delete(key)
cache.set(key, cached)
return cached
}
const info = music.parseFile(file).then(({ format }) => ({
codec: format.codec,
duration: format.duration,
}))
cache.set(key, info)
info.catch(() => {
if (cache.get(key) === info) {
cache.delete(key)
}
})
if (cache.size > MAX_ENTRIES) {
cache.delete(cache.keys().next().value!)
}
return info
}
+84 -84
View File
@@ -1,96 +1,96 @@
import { createReadStream } from "node:fs" import { type ChildProcessWithoutNullStreams } from "node:child_process"
import type { Readable } from "node:stream" import { createReadStream, ReadStream } from "node:fs"
import type { FfmpegProcess } from "@/lib/server-ffmpeg"
const HIGH_WATER_MARK_BYTES = 256 * 1024
export type ByteRange = { export type ByteRange = {
start: number start: number
end: number end: number
} }
/** async function* nodeStreamToIterator(stream: ReadStream) {
* Wraps a Node stream, pausing it while the consumer is behind. `cancel` runs for await (const chunk of stream) {
* when the consumer goes away (seek, track change, disconnect). `finish` runs yield new Uint8Array(chunk)
* when the source ends and may reject to error the stream. }
*/
function toWebStream(
source: Readable,
{
cancel,
finish,
}: { cancel: () => void; finish?: () => Promise<void> }
): ReadableStream<Uint8Array> {
let done = false
return new ReadableStream<Uint8Array>(
{
start(controller) {
const fail = (error: unknown) => {
if (done) {
return
}
done = true
controller.error(error)
cancel()
}
source.on("data", (chunk: Buffer) => {
if (done) {
return
}
controller.enqueue(new Uint8Array(chunk))
if ((controller.desiredSize ?? 0) <= 0) {
source.pause()
}
})
source.once("error", fail)
source.once("end", () => {
if (done) {
return
}
void (finish?.() ?? Promise.resolve()).then(() => {
if (!done) {
done = true
controller.close()
}
}, fail)
})
},
pull() {
source.resume()
},
cancel() {
if (done) {
return
}
done = true
cancel()
},
},
new ByteLengthQueuingStrategy({ highWaterMark: HIGH_WATER_MARK_BYTES })
)
} }
export function streamFile(path: string, range?: ByteRange) { // @ts-expect-error trust me bro
const file = createReadStream(path, range) function iteratorToStream(iterator) {
return toWebStream(file, { cancel: () => file.destroy() }) return new ReadableStream({
} async pull(controller) {
const { value, done } = await iterator.next()
/** Streams ffmpeg stdout and kills ffmpeg when the consumer goes away. */ if (done) {
export function ffmpegToReadableStream({ controller.close()
child, } else {
exited, controller.enqueue(value)
stderrTail,
}: FfmpegProcess) {
return toWebStream(child.stdout, {
cancel: () => child.kill("SIGKILL"),
finish: async () => {
const code = await exited
if (code !== 0) {
console.error(`ffmpeg transcode exited with code ${code}`, stderrTail())
throw new Error(`ffmpeg exited with code ${code}`)
} }
}, },
}) })
} }
export function streamFile(path: string, range?: ByteRange): ReadableStream {
const nodeStream = createReadStream(path, range)
return iteratorToStream(nodeStreamToIterator(nodeStream))
}
export function ffmpegToReadableStream(
ffmpegProcess: ChildProcessWithoutNullStreams
) {
let closed = false
return new ReadableStream({
start(controller) {
const finalize = (err?: Error) => {
if (closed) {
return
}
closed = true
try {
if (err) {
controller.error(err)
} else {
controller.close()
}
} catch {
// Consumer may have already closed the stream (e.g. track change).
}
}
ffmpegProcess.stdout.on("data", (chunk: Buffer) => {
if (closed) {
return
}
try {
controller.enqueue(new Uint8Array(chunk))
} catch {
closed = true
ffmpegProcess.kill("SIGKILL")
}
})
ffmpegProcess.stderr.on("data", (data) => {
console.error(`FFmpeg log: ${data.toString()}`)
})
ffmpegProcess.stdout.on("end", () => finalize())
ffmpegProcess.stdout.on("error", (err) => finalize(err))
ffmpegProcess.on("close", (code) => {
if (code !== 0 && !closed) {
finalize(new Error(`ffmpeg exited with code ${code}`))
} else {
finalize()
}
})
ffmpegProcess.on("error", (err) => finalize(err))
},
cancel() {
if (closed) {
return
}
closed = true
ffmpegProcess.kill("SIGKILL")
},
})
}
-132
View File
@@ -1,132 +0,0 @@
import fs from "node:fs/promises"
import os from "node:os"
import path from "node:path"
const DEFAULT_MAX_MB = 2048
const ORPHAN_MAX_AGE_MS = 60 * 60 * 1000
/** Prefix for in-progress entries. Pruning removes old unpinned ones as abandoned. */
export const CACHE_ORPHAN_PREFIX = "convert-"
type CacheState = {
pinned: Map<string, number>
pruning: Promise<void> | null
}
const globalState = globalThis as typeof globalThis & {
__otunesCache?: CacheState
}
const state = (globalState.__otunesCache ??= {
pinned: new Map(),
pruning: null,
})
/**
* Transcode cache root. Set OTUNES_CACHE_DIR to a persistent volume to keep
* transcodes across restarts.
*/
export function cacheRoot() {
return process.env.OTUNES_CACHE_DIR || path.join(os.tmpdir(), "otunes-cache")
}
export function cacheDir(kind: "hls" | "lossless") {
return path.join(cacheRoot(), kind)
}
function maxCacheBytes() {
const configured = Number(process.env.OTUNES_CACHE_MAX_MB)
const mb = Number.isFinite(configured) && configured > 0 ? configured : DEFAULT_MAX_MB
return mb * 1024 * 1024
}
/** Pinned entries are never pruned. Pins are reference counted. */
export function pinCacheEntry(entry: string) {
state.pinned.set(entry, (state.pinned.get(entry) ?? 0) + 1)
}
export function unpinCacheEntry(entry: string) {
const count = state.pinned.get(entry) ?? 0
if (count <= 1) {
state.pinned.delete(entry)
} else {
state.pinned.set(entry, count - 1)
}
}
/** Marks an entry as recently used so pruning removes it last. */
export async function touchCacheEntry(entry: string) {
const now = new Date()
await fs.utimes(entry, now, now)
}
async function entrySize(entry: string): Promise<number> {
const stat = await fs.stat(entry).catch(() => null)
if (!stat) {
return 0
}
if (!stat.isDirectory()) {
return stat.size
}
const names = await fs.readdir(entry).catch(() => [])
const sizes = await Promise.all(
names.map((name) => entrySize(path.join(entry, name)))
)
return sizes.reduce((total, size) => total + size, 0)
}
async function prune() {
const entries: {
path: string
size: number
mtimeMs: number
orphan: boolean
}[] = []
for (const kind of ["hls", "lossless"] as const) {
const dir = cacheDir(kind)
const names = await fs.readdir(dir).catch(() => [])
for (const name of names) {
const entry = path.join(dir, name)
const stat = await fs.stat(entry).catch(() => null)
if (!stat) {
continue
}
entries.push({
path: entry,
size: await entrySize(entry),
mtimeMs: stat.mtimeMs,
orphan: name.startsWith(CACHE_ORPHAN_PREFIX),
})
}
}
const maxBytes = maxCacheBytes()
const now = Date.now()
let total = entries.reduce((sum, entry) => sum + entry.size, 0)
entries.sort((a, b) => a.mtimeMs - b.mtimeMs)
for (const entry of entries) {
if (state.pinned.has(entry.path)) {
continue
}
const remove = entry.orphan
? now - entry.mtimeMs > ORPHAN_MAX_AGE_MS
: total > maxBytes
if (remove) {
await fs.rm(entry.path, { recursive: true, force: true }).catch(() => {})
total -= entry.size
}
}
}
/**
* Removes least recently used entries until the cache fits under
* OTUNES_CACHE_MAX_MB, plus abandoned in-progress entries.
*/
export function pruneCache() {
state.pruning ??= prune()
.catch((error) => console.error("Transcode cache prune failed", error))
.finally(() => {
state.pruning = null
})
return state.pruning
}
-113
View File
@@ -1,113 +0,0 @@
import { spawn, type ChildProcessWithoutNullStreams } from "node:child_process"
import os from "node:os"
const STDERR_TAIL_BYTES = 4096
export type FfmpegProcess = {
child: ChildProcessWithoutNullStreams
/** Resolves with the exit code, or null when killed by a signal. */
exited: Promise<number | null>
stderrTail: () => string
}
type Limiter = {
running: number
waiting: (() => void)[]
}
// Kept on globalThis so dev reloads share one limit with processes they spawned.
const globalState = globalThis as typeof globalThis & {
__otunesFfmpegLimiter?: Limiter
}
const limiter = (globalState.__otunesFfmpegLimiter ??= {
running: 0,
waiting: [],
})
function maxConcurrentFfmpeg() {
const configured = Number(process.env.OTUNES_MAX_FFMPEG)
if (Number.isInteger(configured) && configured > 0) {
return configured
}
return Math.max(2, os.availableParallelism())
}
async function acquireSlot(signal?: AbortSignal) {
signal?.throwIfAborted()
if (limiter.running < maxConcurrentFfmpeg()) {
limiter.running += 1
return
}
await new Promise<void>((resolve, reject) => {
const grant = () => {
signal?.removeEventListener("abort", onAbort)
resolve()
}
const onAbort = () => {
const index = limiter.waiting.indexOf(grant)
if (index !== -1) {
limiter.waiting.splice(index, 1)
}
reject(signal?.reason)
}
limiter.waiting.push(grant)
signal?.addEventListener("abort", onAbort, { once: true })
})
}
function releaseSlot() {
const next = limiter.waiting.shift()
if (next) {
// The slot passes straight to the next waiter.
next()
} else {
limiter.running -= 1
}
}
/**
* Spawns ffmpeg once a slot under the concurrency cap is free. The slot is
* held until the process exits. Rejects if `signal` aborts while queued.
*/
export async function spawnFfmpeg(
args: string[],
signal?: AbortSignal
): Promise<FfmpegProcess> {
await acquireSlot(signal)
let child: ChildProcessWithoutNullStreams
try {
child = spawn("ffmpeg", [
"-nostdin",
"-hide_banner",
"-loglevel",
"error",
...args,
])
} catch (error) {
releaseSlot()
throw error
}
// stderr must be drained or ffmpeg blocks once the pipe buffer fills.
let stderr = ""
child.stderr.on("data", (data: Buffer) => {
stderr = (stderr + data.toString()).slice(-STDERR_TAIL_BYTES)
})
const exited = new Promise<number | null>((resolve) => {
let released = false
const finish = (code: number | null) => {
if (!released) {
released = true
releaseSlot()
}
resolve(code)
}
child.once("error", () => finish(1))
child.once("close", (code) => finish(code))
})
return { child, exited, stderrTail: () => stderr.trim() }
}
+95 -188
View File
@@ -2,22 +2,12 @@ import type { Doc } from "@otunes/convex/_generated/dataModel"
import crypto from "node:crypto" import crypto from "node:crypto"
import fs from "node:fs/promises" import fs from "node:fs/promises"
import path from "node:path" import path from "node:path"
import { audioInfo } from "@/lib/server-audio-info" import { spawn } from "node:child_process"
import { import * as music from "music-metadata"
cacheDir,
pinCacheEntry,
pruneCache,
touchCacheEntry,
unpinCacheEntry,
} from "@/lib/server-cache"
import { spawnFfmpeg, type FfmpegProcess } from "@/lib/server-ffmpeg"
export const HLS_SEGMENT_SECONDS = 6 export const HLS_SEGMENT_SECONDS = 6
const HLS_MAX_IDLE_MS = 30 * 60 * 1000 const HLS_MAX_IDLE_MS = 30 * 60 * 1000
/** The server-only slice of a song needed to transcode it. */
export type SongSource = Pick<Doc<"songs">, "_id" | "files" | "length">
type HlsJob = { type HlsJob = {
key: string key: string
lookupKey: string lookupKey: string
@@ -27,28 +17,11 @@ type HlsJob = {
lastTouchedAt: number lastTouchedAt: number
processExited: boolean processExited: boolean
processExitCode: number | null processExitCode: number | null
process: FfmpegProcess | null
abort: AbortController
evicted: boolean
} }
type HlsState = { const jobs = new Map<string, HlsJob>()
/** In-flight and ready jobs by cache key, so overlapping requests share one ffmpeg. */ const jobsByLookup = new Map<string, HlsJob>()
pending: Map<string, Promise<HlsJob>> let lastCleanupAt = 0
jobs: Map<string, HlsJob>
jobsByLookup: Map<string, HlsJob>
lastCleanupAt: number
}
const globalState = globalThis as typeof globalThis & {
__otunesHls?: HlsState
}
const state = (globalState.__otunesHls ??= {
pending: new Map(),
jobs: new Map(),
jobsByLookup: new Map(),
lastCleanupAt: 0,
})
export function qualityKbps(quality: string | null) { export function qualityKbps(quality: string | null) {
if (quality === "low") { if (quality === "low") {
@@ -63,7 +36,7 @@ export function qualityKbps(quality: string | null) {
} }
export function selectHlsSourceCodec( export function selectHlsSourceCodec(
song: SongSource, song: Doc<"songs">,
quality: string | null, quality: string | null,
preferAtmos: boolean preferAtmos: boolean
) { ) {
@@ -77,6 +50,10 @@ export function selectHlsSourceCodec(
return sourceCodec return sourceCodec
} }
function hlsCacheRoot() {
return "/tmp/otunes"
}
function hlsLookupKey( function hlsLookupKey(
songId: string, songId: string,
quality: string | null, quality: string | null,
@@ -86,7 +63,7 @@ function hlsLookupKey(
} }
async function hlsJobKey( async function hlsJobKey(
song: SongSource, song: Doc<"songs">,
sourcePath: string, sourcePath: string,
kbps: number kbps: number
) { ) {
@@ -111,38 +88,31 @@ export function hlsSegmentPath(job: HlsJob, segmentIndex: number) {
async function touchHlsJob(job: HlsJob) { async function touchHlsJob(job: HlsJob) {
job.lastTouchedAt = Date.now() job.lastTouchedAt = Date.now()
await touchCacheEntry(job.dir).catch(() => {}) await fs.utimes(job.dir, new Date(job.lastTouchedAt), new Date(job.lastTouchedAt)).catch(
() => {}
)
}
function forgetJob(job: HlsJob) {
jobs.delete(job.key)
if (jobsByLookup.get(job.lookupKey) === job) {
jobsByLookup.delete(job.lookupKey)
}
} }
async function evictJob(job: HlsJob) { async function evictJob(job: HlsJob) {
if (job.evicted) { forgetJob(job)
return await fs.rm(job.dir, { recursive: true, force: true }).catch(() => {})
}
job.evicted = true
state.pending.delete(job.key)
state.jobs.delete(job.key)
if (state.jobsByLookup.get(job.lookupKey) === job) {
state.jobsByLookup.delete(job.lookupKey)
}
job.abort.abort()
job.process?.child.kill("SIGKILL")
const complete = job.processExited && job.processExitCode === 0
if (!complete) {
await job.process?.exited
await fs.rm(job.dir, { recursive: true, force: true }).catch(() => {})
}
unpinCacheEntry(job.dir)
} }
async function cleanupIdleHlsJobs() { async function cleanupIdleHlsJobs() {
const now = Date.now() const now = Date.now()
if (now - state.lastCleanupAt < 60_000) { if (now - lastCleanupAt < 60_000) {
return return
} }
state.lastCleanupAt = now lastCleanupAt = now
for (const job of [...state.jobs.values()]) { for (const job of [...jobs.values()]) {
if (now - job.lastTouchedAt > HLS_MAX_IDLE_MS) { if (now - job.lastTouchedAt > HLS_MAX_IDLE_MS) {
await evictJob(job) await evictJob(job)
} }
@@ -154,7 +124,7 @@ export function getExistingHlsJob(
quality: string | null, quality: string | null,
preferAtmos: boolean preferAtmos: boolean
) { ) {
return state.jobsByLookup.get(hlsLookupKey(songId, quality, preferAtmos)) ?? null return jobsByLookup.get(hlsLookupKey(songId, quality, preferAtmos)) ?? null
} }
export async function waitForHlsSegment( export async function waitForHlsSegment(
@@ -167,22 +137,18 @@ export async function waitForHlsSegment(
const startedAt = Date.now() const startedAt = Date.now()
while (Date.now() - startedAt < timeoutMs) { while (Date.now() - startedAt < timeoutMs) {
// Read before checking the file so a segment renamed just before exit is found.
const exited = job.processExited
try { try {
// ffmpeg writes to a .tmp file and renames it when complete. const firstStat = await fs.stat(segmentPath)
await fs.access(segmentPath) if (firstStat.size > 0) {
return segmentPath await new Promise((resolve) => setTimeout(resolve, 100))
} catch { const secondStat = await fs.stat(segmentPath)
if (job.evicted) { if (firstStat.size === secondStat.size) {
throw new Error("HLS job was evicted") return segmentPath
}
} }
if (exited) { } catch {
throw new Error( if (job.processExited && job.processExitCode !== 0) {
job.processExitCode === 0 throw new Error(`HLS transcode failed with code ${job.processExitCode}`)
? "HLS segment does not exist"
: `HLS transcode failed with code ${job.processExitCode}`
)
} }
} }
await new Promise((resolve) => setTimeout(resolve, 100)) await new Promise((resolve) => setTimeout(resolve, 100))
@@ -191,15 +157,52 @@ export async function waitForHlsSegment(
throw new Error("Timed out waiting for HLS segment") throw new Error("Timed out waiting for HLS segment")
} }
async function hasCompletePlaylist(dir: string) { export async function ensureHlsJob(
const playlist = await fs song: Doc<"songs">,
.readFile(path.join(dir, "index.m3u8"), "utf8") quality: string | null,
.catch(() => "") preferAtmos: boolean
return playlist.includes("#EXT-X-ENDLIST") ) {
} await cleanupIdleHlsJobs()
const kbps = qualityKbps(quality)
const sourceCodec = selectHlsSourceCodec(song, quality, preferAtmos)
const sourcePath = song.files[sourceCodec]
const key = await hlsJobKey(song, sourcePath, kbps)
const lookupKey = hlsLookupKey(song._id, quality, preferAtmos)
const existingJob = jobs.get(key)
if (existingJob) {
try {
await fs.access(existingJob.dir)
await touchHlsJob(existingJob)
return existingJob
} catch {
forgetJob(existingJob)
}
}
const metadata = await music.parseFile(sourcePath)
const duration = metadata.format.duration ?? song.length
const segmentCount = Math.max(1, Math.ceil(duration / HLS_SEGMENT_SECONDS))
const dir = path.join(hlsCacheRoot(), key)
await fs.mkdir(dir, { recursive: true })
const job: HlsJob = {
key,
lookupKey,
dir,
duration,
segmentCount,
lastTouchedAt: Date.now(),
processExited: false,
processExitCode: null,
}
jobs.set(key, job)
jobsByLookup.set(lookupKey, job)
await touchHlsJob(job)
function startTranscode(job: HlsJob, sourcePath: string, kbps: number) {
const ffmpegArgs = [ const ffmpegArgs = [
"-nostdin",
"-i", "-i",
sourcePath, sourcePath,
"-vn", "-vn",
@@ -219,121 +222,25 @@ function startTranscode(job: HlsJob, sourcePath: string, kbps: number) {
"0", "0",
"-hls_segment_type", "-hls_segment_type",
"mpegts", "mpegts",
"-hls_flags",
"temp_file",
"-hls_segment_filename", "-hls_segment_filename",
path.join(job.dir, "segment_%05d.ts"), path.join(dir, "segment_%05d.ts"),
path.join(job.dir, "index.m3u8"), path.join(dir, "index.m3u8"),
] ]
const ffmpegProcess = spawn("ffmpeg", ffmpegArgs)
spawnFfmpeg(ffmpegArgs, job.abort.signal).then( ffmpegProcess.stderr.on("data", (data) => {
async (ffmpeg) => { console.error(`FFmpeg HLS log: ${data.toString()}`)
job.process = ffmpeg })
if (job.evicted) {
ffmpeg.child.kill("SIGKILL")
}
const code = await ffmpeg.exited
job.process = null
job.processExited = true
job.processExitCode = code
if (job.evicted) {
return
}
if (code === 0) {
void pruneCache()
} else {
console.error(`ffmpeg HLS exited with code ${code}`, ffmpeg.stderrTail())
}
},
() => {
job.processExited = true
job.processExitCode = 1
}
)
}
async function createHlsJob( ffmpegProcess.on("close", (code) => {
song: SongSource, job.processExited = true
sourcePath: string, job.processExitCode = code
kbps: number, })
key: string,
lookupKey: string
): Promise<HlsJob> {
const info = await audioInfo(sourcePath)
const duration = info.duration ?? song.length
const segmentCount = Math.max(1, Math.ceil(duration / HLS_SEGMENT_SECONDS))
const dir = path.join(cacheDir("hls"), key)
pinCacheEntry(dir)
try { ffmpegProcess.on("error", () => {
const complete = await hasCompletePlaylist(dir) job.processExited = true
if (!complete) { job.processExitCode = 1
await fs.rm(dir, { recursive: true, force: true }) })
await fs.mkdir(dir, { recursive: true })
}
const job: HlsJob = {
key,
lookupKey,
dir,
duration,
segmentCount,
lastTouchedAt: Date.now(),
processExited: complete,
processExitCode: complete ? 0 : null,
process: null,
abort: new AbortController(),
evicted: false,
}
state.jobs.set(key, job)
await touchHlsJob(job)
if (!complete) {
startTranscode(job, sourcePath, kbps)
}
return job
} catch (error) {
unpinCacheEntry(dir)
throw error
}
}
export async function ensureHlsJob(
song: SongSource,
quality: string | null,
preferAtmos: boolean
): Promise<HlsJob> {
await cleanupIdleHlsJobs()
const kbps = qualityKbps(quality)
const sourceCodec = selectHlsSourceCodec(song, quality, preferAtmos)
const sourcePath = song.files[sourceCodec]
const key = await hlsJobKey(song, sourcePath, kbps)
const lookupKey = hlsLookupKey(song._id, quality, preferAtmos)
let pending = state.pending.get(key)
if (!pending) {
pending = createHlsJob(song, sourcePath, kbps, key, lookupKey)
state.pending.set(key, pending)
const created = pending
created.catch(() => {
if (state.pending.get(key) === created) {
state.pending.delete(key)
}
})
}
const job = await pending
const exists = await fs.access(job.dir).then(
() => true,
() => false
)
if (job.evicted || !exists) {
await evictJob(job)
return ensureHlsJob(song, quality, preferAtmos)
}
state.jobsByLookup.set(lookupKey, job)
await touchHlsJob(job)
return job return job
} }
+43 -32
View File
@@ -1,15 +1,8 @@
import { spawn } from "node:child_process"
import { createHash } from "node:crypto" import { createHash } from "node:crypto"
import fs from "node:fs/promises" import fs from "node:fs/promises"
import os from "node:os"
import path from "node:path" import path from "node:path"
import {
CACHE_ORPHAN_PREFIX,
cacheDir,
pinCacheEntry,
pruneCache,
touchCacheEntry,
unpinCacheEntry,
} from "@/lib/server-cache"
import { spawnFfmpeg } from "@/lib/server-ffmpeg"
const conversions = new Map<string, Promise<string>>() const conversions = new Map<string, Promise<string>>()
@@ -34,38 +27,56 @@ export async function seekableLosslessFile(source: string): Promise<string> {
} }
async function convert(source: string, key: string): Promise<string> { async function convert(source: string, key: string): Promise<string> {
const dir = cacheDir("lossless") const dir = path.join(os.tmpdir(), "otunes-lossless")
await fs.mkdir(dir, { recursive: true }) await fs.mkdir(dir, { recursive: true })
const cutoff = Date.now() - 30 * 60 * 1000
await Promise.all(
(await fs.readdir(dir))
.filter((name) => name.endsWith(".flac"))
.map(async (name) => {
const file = path.join(dir, name)
const stat = await fs.stat(file).catch(() => null)
if (stat && stat.mtimeMs < cutoff) await fs.rm(file, { force: true })
})
)
const output = path.join(dir, `${key}.flac`) const output = path.join(dir, `${key}.flac`)
try { try {
// Every range request touches the file so it stays cached while playing. await fs.access(output)
await touchCacheEntry(output)
return output return output
} catch { } catch {
// Publish only completed conversions so range requests always see a complete file. // Publish only completed conversions so range requests always see a complete file.
} }
const temporaryDir = await fs.mkdtemp(path.join(dir, CACHE_ORPHAN_PREFIX)) const temporary = path.join(
const temporary = path.join(temporaryDir, "audio.flac") await fs.mkdtemp(path.join(dir, "convert-")),
pinCacheEntry(temporaryDir) "audio.flac"
)
try { try {
const ffmpeg = await spawnFfmpeg([ await new Promise<void>((resolve, reject) => {
"-i", const child = spawn(
source, "ffmpeg",
"-map", [
"0:a:0", "-nostdin",
"-c:a", "-v",
"flac", "error",
temporary, "-i",
]) source,
const code = await ffmpeg.exited "-map",
if (code !== 0) { "0:a:0",
throw new Error(`Lossless conversion failed: ${code}: ${ffmpeg.stderrTail()}`) "-c:a",
} "flac",
temporary,
],
{ stdio: "ignore" }
)
child.on("error", reject)
child.on("close", (code) => {
if (code === 0) resolve()
else reject(new Error(`Lossless conversion failed: ${code}`))
})
})
await fs.rename(temporary, output) await fs.rename(temporary, output)
return output
} finally { } finally {
unpinCacheEntry(temporaryDir) await fs.rm(path.dirname(temporary), { recursive: true, force: true })
await fs.rm(temporaryDir, { recursive: true, force: true })
} }
void pruneCache()
return output
} }
-23
View File
@@ -1,23 +0,0 @@
import { convexAuthNextjsToken } from "@convex-dev/auth/nextjs/server"
import { api } from "@otunes/convex/_generated/api"
import type { Id } from "@otunes/convex/_generated/dataModel"
import { fetchQuery } from "convex/nextjs"
import { convexServerOptions } from "@/lib/convex-server"
import type { SongSource } from "@/lib/server-hls"
/**
* Loads a song's file paths as the requesting listener, so Convex enforces auth
* even if the proxy is bypassed. Throws when signed out or the song is missing.
*/
export async function getSongSource(id: string): Promise<SongSource> {
const token = await convexAuthNextjsToken()
const song = await fetchQuery(
api.library.getSongSource,
{ id: id as Id<"songs"> },
convexServerOptions(token)
)
if (!song) {
throw new Error("Song not found")
}
return song
}
-1
View File
@@ -14,7 +14,6 @@
"@base-ui/react": "^1.5.0", "@base-ui/react": "^1.5.0",
"@convex-dev/auth": "^0.0.93", "@convex-dev/auth": "^0.0.93",
"@otunes/convex": "workspace:*", "@otunes/convex": "workspace:*",
"@tanstack/react-virtual": "^3.14.26",
"class-variance-authority": "^0.7.1", "class-variance-authority": "^0.7.1",
"clsx": "^2.1.1", "clsx": "^2.1.1",
"cmdk": "^1.1.1", "cmdk": "^1.1.1",
+1 -1
View File
@@ -12,7 +12,7 @@ const isPublic = createRouteMatcher([
"/api/playlist/:id/cover", "/api/playlist/:id/cover",
"/album/:id", "/album/:id",
"/artist/:id", "/artist/:id",
"/library/artists/:id", "/artists/:id",
"/playlist/:id", "/playlist/:id",
]) ])
-3
View File
@@ -97,9 +97,6 @@ admin_key=$(cd /convex && umask 077 && "${as_convex[@]}" ./generate_admin_key.sh
log "Deploying Convex functions" log "Deploying Convex functions"
convex_cli deploy --typecheck disable --codegen disable convex_cli deploy --typecheck disable --codegen disable
log "Running data migrations"
convex_cli run migrations:migrateUsers
# `env get` exits 0 with no output when the variable is unset. Any other failure # `env get` exits 0 with no output when the variable is unset. Any other failure
# must not be read as "no keys": regenerating them signs every user out. # must not be read as "no keys": regenerating them signs every user out.
if ! jwks=$(convex_cli env get JWKS); then if ! jwks=$(convex_cli env get JWKS); then
+18 -66
View File
@@ -1,5 +1,4 @@
import type { Id } from "../convex/_generated/dataModel" import type { Id } from "../convex/_generated/dataModel"
import { MAX_QUEUE_LENGTH } from "../convex/limits"
import { import {
EMPTY_PLAYBACK_QUEUE, EMPTY_PLAYBACK_QUEUE,
type PlaybackQueueState, type PlaybackQueueState,
@@ -8,11 +7,6 @@ import {
import { loadPersistentCache, readCache, writeCache } from "./persistent-cache" import { loadPersistentCache, readCache, writeCache } from "./persistent-cache"
const SYNC_DELAY_MS = 300 const SYNC_DELAY_MS = 300
/**
* Backoff for failed syncs. Convex queues mutations while offline, so a
* rejection means the server refused the state; after the last retry the
* change is dropped until the next local edit instead of retrying forever.
*/
const RETRY_DELAYS_MS = [1_000, 3_000, 10_000, 30_000] const RETRY_DELAYS_MS = [1_000, 3_000, 10_000, 30_000]
export type ServerPlaybackState = { export type ServerPlaybackState = {
@@ -20,6 +14,7 @@ export type ServerPlaybackState = {
queueHistorySongIds: Id<"songs">[] queueHistorySongIds: Id<"songs">[]
shuffleEnabled: boolean shuffleEnabled: boolean
repeatEnabled: RepeatMode repeatEnabled: RepeatMode
currentSongProgress: number
revision: number revision: number
} }
@@ -35,12 +30,9 @@ type PersistedPlayback = PlaybackQueueState & {
dirty: boolean dirty: boolean
} }
export type PlaybackSyncTransport = { export type PlaybackSyncTransport = (
/** Saves the state and resolves with the new server revision. */ state: PlaybackQueueState
sync: (state: PlaybackQueueState) => Promise<number> ) => Promise<number>
/** One-shot read of the server's saved progress for its current song. */
loadProgress: () => Promise<number>
}
/** /**
* Client-owned playback queue. Changes apply locally (and persist on this * Client-owned playback queue. Changes apply locally (and persist on this
@@ -57,7 +49,6 @@ export class PlaybackStore {
private retryAttempt = 0 private retryAttempt = 0
private syncTimer: ReturnType<typeof setTimeout> | null = null private syncTimer: ReturnType<typeof setTimeout> | null = null
private latestServerState: ServerPlaybackState | null = null private latestServerState: ServerPlaybackState | null = null
private adopting = false
private transport: PlaybackSyncTransport | null = null private transport: PlaybackSyncTransport | null = null
private readonly listeners = new Set<() => void>() private readonly listeners = new Set<() => void>()
@@ -88,7 +79,7 @@ export class PlaybackStore {
} }
update(recipe: (state: PlaybackQueueState) => PlaybackQueueState) { update(recipe: (state: PlaybackQueueState) => PlaybackQueueState) {
const next = capQueue(recipe(this.state)) const next = recipe(this.state)
if (next === this.state) { if (next === this.state) {
return return
} }
@@ -111,7 +102,7 @@ export class PlaybackStore {
receiveServerState(serverState: ServerPlaybackState) { receiveServerState(serverState: ServerPlaybackState) {
this.latestServerState = serverState this.latestServerState = serverState
if (this.snapshot.hydrated) { if (this.snapshot.hydrated) {
void this.adoptServerState() this.adoptServerState()
} }
} }
@@ -125,52 +116,23 @@ export class PlaybackStore {
const { revision, dirty, ...state } = persisted const { revision, dirty, ...state } = persisted
this.revision = revision this.revision = revision
this.dirty = dirty this.dirty = dirty
this.state = capQueue({ ...EMPTY_PLAYBACK_QUEUE, ...state }) this.state = { ...EMPTY_PLAYBACK_QUEUE, ...state }
} }
this.snapshot = toSnapshot(this.state, true) this.snapshot = toSnapshot(this.state, true)
this.emit() this.emit()
void this.adoptServerState() this.adoptServerState()
if (this.dirty) { if (this.dirty) {
this.scheduleSync(0) this.scheduleSync(0)
} }
} }
private canAdopt(serverState: ServerPlaybackState | null) { private adoptServerState() {
return (
serverState !== null &&
!this.dirty &&
!this.inFlight &&
(this.revision === null || serverState.revision > this.revision)
)
}
/**
* Adopts the latest server queue. Progress is not part of the queue query
* (it changes every few seconds), so it is fetched once here.
*/
private async adoptServerState() {
const serverState = this.latestServerState const serverState = this.latestServerState
if (this.adopting || !serverState || !this.canAdopt(serverState)) { if (!serverState || this.dirty || this.inFlight) {
return return
} }
if (this.revision !== null && serverState.revision <= this.revision) {
this.adopting = true
let progressSeconds = 0
try {
progressSeconds = (await this.transport?.loadProgress()) ?? 0
} catch {
// Starting from 0 beats not adopting the queue at all.
} finally {
this.adopting = false
}
// Newer server state or local edits may have arrived while loading.
if (this.latestServerState !== serverState) {
void this.adoptServerState()
return
}
if (!this.canAdopt(serverState)) {
return return
} }
@@ -180,7 +142,7 @@ export class PlaybackStore {
history: serverState.queueHistorySongIds, history: serverState.queueHistorySongIds,
shuffleEnabled: serverState.shuffleEnabled, shuffleEnabled: serverState.shuffleEnabled,
repeatEnabled: serverState.repeatEnabled, repeatEnabled: serverState.repeatEnabled,
progressSeconds, progressSeconds: serverState.currentSongProgress,
}) })
} }
@@ -205,7 +167,7 @@ export class PlaybackStore {
let failed = false let failed = false
try { try {
const revision = await transport.sync(this.state) const revision = await transport(this.state)
this.revision = Math.max(revision, this.revision ?? 0) this.revision = Math.max(revision, this.revision ?? 0)
this.retryAttempt = 0 this.retryAttempt = 0
if (this.changeCount === changeCountAtStart) { if (this.changeCount === changeCountAtStart) {
@@ -219,17 +181,15 @@ export class PlaybackStore {
this.persist() this.persist()
if (failed && this.retryAttempt < RETRY_DELAYS_MS.length) { if (failed) {
this.scheduleSync(RETRY_DELAYS_MS[this.retryAttempt]) const delay =
RETRY_DELAYS_MS[Math.min(this.retryAttempt, RETRY_DELAYS_MS.length - 1)]
this.retryAttempt += 1 this.retryAttempt += 1
} else if (failed) { this.scheduleSync(delay)
this.retryAttempt = 0
this.dirty = false
this.persist()
} else if (this.dirty) { } else if (this.dirty) {
this.scheduleSync(SYNC_DELAY_MS) this.scheduleSync(SYNC_DELAY_MS)
} else { } else {
void this.adoptServerState() this.adoptServerState()
} }
} }
@@ -267,14 +227,6 @@ export class PlaybackStore {
} }
} }
/** Mirrors the server's queue cap so local and synced state agree. */
function capQueue(state: PlaybackQueueState): PlaybackQueueState {
if (state.queue.length <= MAX_QUEUE_LENGTH) {
return state
}
return { ...state, queue: state.queue.slice(0, MAX_QUEUE_LENGTH) }
}
function toSnapshot( function toSnapshot(
state: PlaybackQueueState, state: PlaybackQueueState,
hydrated: boolean hydrated: boolean
-6
View File
@@ -14,10 +14,7 @@ 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 library from "../library.js"; import type * as library from "../library.js";
import type * as limits from "../limits.js";
import type * as migrations from "../migrations.js";
import type * as playback from "../playback.js"; import type * as playback from "../playback.js";
import type * as playbackState from "../playbackState.js";
import type * as playlists from "../playlists.js"; import type * as playlists from "../playlists.js";
import type * as types from "../types.js"; import type * as types from "../types.js";
import type * as users from "../users.js"; import type * as users from "../users.js";
@@ -35,10 +32,7 @@ declare const fullApi: ApiFromModules<{
favorites: typeof favorites; favorites: typeof favorites;
http: typeof http; http: typeof http;
library: typeof library; library: typeof library;
limits: typeof limits;
migrations: typeof migrations;
playback: typeof playback; playback: typeof playback;
playbackState: typeof playbackState;
playlists: typeof playlists; playlists: typeof playlists;
types: typeof types; types: typeof types;
users: typeof users; users: typeof users;
+1 -2
View File
@@ -3,7 +3,6 @@ import { ConvexError } from "convex/values"
import { Password } from "@convex-dev/auth/providers/Password" import { Password } from "@convex-dev/auth/providers/Password"
import { query } from "./_generated/server" import { query } from "./_generated/server"
import type { MutationCtx } from "./_generated/server" import type { MutationCtx } from "./_generated/server"
import { profileImagePath } from "./users"
export const { auth, signIn, signOut, store, isAuthenticated } = convexAuth({ export const { auth, signIn, signOut, store, isAuthenticated } = convexAuth({
providers: [ providers: [
@@ -73,7 +72,7 @@ export const currentUser = query({
return { return {
_id: user._id, _id: user._id,
name: user.name, name: user.name,
image: profileImagePath(user), image: user.image,
email: user.email, email: user.email,
isAdmin: user.isAdmin, isAdmin: user.isAdmin,
playbackQuality: user.playbackQuality, playbackQuality: user.playbackQuality,
+8 -69
View File
@@ -39,20 +39,6 @@ export type {
SidebarPlaylists, SidebarPlaylists,
} from "./types" } from "./types"
const EMPTY_PAGE = { page: [], isDone: true, continueCursor: "" }
/** Reactive queries return empty data when signed out so sign-out doesn't throw mid-render. */
export async function isSignedIn(ctx: QueryCtx) {
return (await getAuthUserId(ctx)) !== null
}
/** Imperative lookups throw instead, so callers that cache results don't cache an empty one. */
export async function requireSignedIn(ctx: QueryCtx) {
if (!(await isSignedIn(ctx))) {
throw new ConvexError("Not authenticated")
}
}
function getSongArtistNames(artist: string | string[]): string[] { 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)
@@ -214,9 +200,6 @@ function toBrowseSong(
export const browseAlbums = query({ export const browseAlbums = query({
args: {}, args: {},
handler: async (ctx) => { handler: async (ctx) => {
if (!(await isSignedIn(ctx))) {
return []
}
const artistMap = await loadArtistMap(ctx) const artistMap = await loadArtistMap(ctx)
const albums = await ctx.db.query("albums").collect() const albums = await ctx.db.query("albums").collect()
@@ -232,9 +215,6 @@ export const browseAlbums = query({
export const browseArtists = query({ export const browseArtists = query({
args: {}, args: {},
handler: async (ctx) => { handler: async (ctx) => {
if (!(await isSignedIn(ctx))) {
return []
}
const artists = await ctx.db.query("artists").collect() const artists = await ctx.db.query("artists").collect()
return artists return artists
.map(toBrowseArtist) .map(toBrowseArtist)
@@ -262,9 +242,6 @@ function paginateSlice<T>(
export const browseArtistsPaginated = query({ export const browseArtistsPaginated = query({
args: { paginationOpts: paginationOptsValidator }, args: { paginationOpts: paginationOptsValidator },
handler: async (ctx, args) => { handler: async (ctx, args) => {
if (!(await isSignedIn(ctx))) {
return EMPTY_PAGE
}
const result = await ctx.db const result = await ctx.db
.query("artists") .query("artists")
.withIndex("by_name") .withIndex("by_name")
@@ -281,9 +258,6 @@ export const browseArtistsPaginated = query({
export const browseAlbumsPaginated = query({ export const browseAlbumsPaginated = query({
args: { paginationOpts: paginationOptsValidator }, args: { paginationOpts: paginationOptsValidator },
handler: async (ctx, args) => { handler: async (ctx, args) => {
if (!(await isSignedIn(ctx))) {
return EMPTY_PAGE
}
const result = await ctx.db const result = await ctx.db
.query("albums") .query("albums")
.withIndex("by_name") .withIndex("by_name")
@@ -484,9 +458,6 @@ export const browseSongsPaginated = query({
sortDirection: songsSortDirectionValidator, sortDirection: songsSortDirectionValidator,
}, },
handler: async (ctx, args) => { handler: async (ctx, args) => {
if (!(await isSignedIn(ctx))) {
return EMPTY_PAGE
}
if (args.sortKey === "title") { if (args.sortKey === "title") {
return paginateSongsByTitle(ctx, args.paginationOpts, args.sortDirection) return paginateSongsByTitle(ctx, args.paginationOpts, args.sortDirection)
} }
@@ -506,7 +477,6 @@ export const browseSortedSongIds = query({
sortDirection: songsSortDirectionValidator, sortDirection: songsSortDirectionValidator,
}, },
handler: async (ctx, args) => { handler: async (ctx, args) => {
await requireSignedIn(ctx)
return getSortedLibrarySongIds(ctx, args.sortKey, args.sortDirection) return getSortedLibrarySongIds(ctx, args.sortKey, args.sortDirection)
}, },
}) })
@@ -516,7 +486,6 @@ const MAX_SONGS_BY_IDS = 200
export const browseSongsByIds = query({ export const browseSongsByIds = query({
args: { ids: v.array(v.id("songs")) }, args: { ids: v.array(v.id("songs")) },
handler: async (ctx, args): Promise<BrowseSong[]> => { handler: async (ctx, args): Promise<BrowseSong[]> => {
await requireSignedIn(ctx)
if (args.ids.length > MAX_SONGS_BY_IDS) { if (args.ids.length > MAX_SONGS_BY_IDS) {
throw new ConvexError(`Request at most ${MAX_SONGS_BY_IDS} songs`) throw new ConvexError(`Request at most ${MAX_SONGS_BY_IDS} songs`)
} }
@@ -524,7 +493,6 @@ export const browseSongsByIds = query({
}, },
}) })
/** Public: shared /album links render this without a session. */
export const browseAlbumDetail = query({ export const browseAlbumDetail = query({
args: { id: v.id("albums") }, args: { id: v.id("albums") },
handler: async (ctx, args): Promise<BrowseAlbumDetail | null> => { handler: async (ctx, args): Promise<BrowseAlbumDetail | null> => {
@@ -554,7 +522,6 @@ export const browseAlbumDetail = query({
}, },
}) })
/** Public: shared /artist links render this without a session. */
export const browseArtistDetail = query({ export const browseArtistDetail = query({
args: { id: v.id("artists") }, args: { id: v.id("artists") },
handler: async (ctx, args) => { handler: async (ctx, args) => {
@@ -608,7 +575,7 @@ export const searchLibrary = query({
args: { query: v.string() }, args: { query: v.string() },
handler: async (ctx, args) => { handler: async (ctx, args) => {
const queryText = args.query.trim().toLowerCase() const queryText = args.query.trim().toLowerCase()
if (!queryText || !(await isSignedIn(ctx))) { if (!queryText) {
return { return {
topResults: [], topResults: [],
artists: [], artists: [],
@@ -710,9 +677,6 @@ export const searchLibrary = query({
export const browseRecentlyAdded = query({ export const browseRecentlyAdded = query({
args: { limit: v.optional(v.number()) }, args: { limit: v.optional(v.number()) },
handler: async (ctx, args) => { handler: async (ctx, args) => {
if (!(await isSignedIn(ctx))) {
return []
}
const albumQuery = ctx.db.query("albums").order("desc") const albumQuery = ctx.db.query("albums").order("desc")
const albums = args.limit const albums = args.limit
? await albumQuery.take(args.limit) ? await albumQuery.take(args.limit)
@@ -732,9 +696,6 @@ export const browseRecentlyAdded = query({
export const browseRecentlyAddedPaginated = query({ export const browseRecentlyAddedPaginated = query({
args: { paginationOpts: paginationOptsValidator }, args: { paginationOpts: paginationOptsValidator },
handler: async (ctx, args) => { handler: async (ctx, args) => {
if (!(await isSignedIn(ctx))) {
return EMPTY_PAGE
}
const result = await ctx.db const result = await ctx.db
.query("albums") .query("albums")
.order("desc") .order("desc")
@@ -865,53 +826,31 @@ export const getSongs = internalQuery({
}, },
}) })
/** Public: share-link previews load covers without a session. */ export const getArtist = query({
export const getArtistCover = query({
args: { id: v.id("artists") }, args: { id: v.id("artists") },
handler: async (ctx, args) => { handler: async (ctx, args) => {
return (await ctx.db.get("artists", args.id))?.cover ?? null return await ctx.db.get("artists", args.id)
}, },
}) })
/** Public: share-link previews load covers without a session. */ export const getAlbum = query({
export const getAlbumCover = query({
args: { id: v.id("albums") }, args: { id: v.id("albums") },
handler: async (ctx, args) => { handler: async (ctx, args) => {
return (await ctx.db.get("albums", args.id))?.cover ?? null return await ctx.db.get("albums", args.id)
}, },
}) })
/** Public: share-link previews load covers without a session. */ export const getPlaylist = query({
export const getPlaylistCover = query({
args: { id: v.id("playlists") }, args: { id: v.id("playlists") },
handler: async (ctx, args) => { handler: async (ctx, args) => {
return (await ctx.db.get("playlists", args.id))?.cover ?? null return await ctx.db.get("playlists", args.id)
}, },
}) })
/** Public: share-link previews read song metadata without a session. Never returns file paths. */
export const getSong = query({ export const getSong = query({
args: { id: v.id("songs") }, args: { id: v.id("songs") },
handler: async (ctx, args) => { handler: async (ctx, args) => {
const song = await ctx.db.get("songs", args.id) return await ctx.db.get("songs", args.id)
if (!song) {
return null
}
const { files: _files, ...clientSong } = song
return clientSong
},
})
/** Returns absolute file paths. Only the web streaming routes call this, as the listener. */
export const getSongSource = query({
args: { id: v.id("songs") },
handler: async (ctx, args) => {
await requireSignedIn(ctx)
const song = await ctx.db.get("songs", args.id)
if (!song) {
return null
}
return { _id: song._id, files: song.files, length: song.length }
}, },
}) })
-10
View File
@@ -1,10 +0,0 @@
/**
* Limits shared by Convex functions and clients. Convex rejects arrays longer
* than 8,192 values in documents, arguments, and return values.
*/
/** Songs kept in the playback queue, including the current song. */
export const MAX_QUEUE_LENGTH = 5_000
/** Largest profile photo accepted, in bytes after base64 decoding. */
export const MAX_PROFILE_IMAGE_BYTES = 2 * 1024 * 1024
-39
View File
@@ -1,39 +0,0 @@
import { v } from "convex/values"
import { internal } from "./_generated/api"
import { internalMutation } from "./_generated/server"
import { hasLegacyPlayback, migrateUserPlayback } from "./playbackState"
const BATCH_SIZE = 25
/**
* Moves playback state off `users` into `playbackStates`/`playbackProgress`
* and legacy data URL avatars into file storage. Idempotent; the Docker
* entrypoint runs it on every boot. Run manually with
* `npx convex run migrations:migrateUsers`.
*/
export const migrateUsers = internalMutation({
args: { cursor: v.optional(v.union(v.string(), v.null())) },
handler: async (ctx, { cursor }) => {
const page = await ctx.db
.query("users")
.paginate({ cursor: cursor ?? null, numItems: BATCH_SIZE })
for (const user of page.page) {
if (hasLegacyPlayback(user)) {
await migrateUserPlayback(ctx, user)
}
if (!user.imageStorageId && user.image?.startsWith("data:")) {
await ctx.scheduler.runAfter(0, internal.users.storeProfileImage, {
userId: user._id,
image: user.image,
})
}
}
if (!page.isDone) {
await ctx.scheduler.runAfter(0, internal.migrations.migrateUsers, {
cursor: page.continueCursor,
})
}
},
})
+42 -53
View File
@@ -1,19 +1,13 @@
import { getAuthUserId } from "@convex-dev/auth/server" import { getAuthUserId } from "@convex-dev/auth/server"
import { ConvexError, v } from "convex/values" import { ConvexError, v } from "convex/values"
import type { Id } from "./_generated/dataModel" import type { Doc, Id } from "./_generated/dataModel"
import type { MutationCtx } from "./_generated/server" import type { MutationCtx } from "./_generated/server"
import { mutation, query } from "./_generated/server" import { mutation, query } from "./_generated/server"
import { browseSongsFromIds } from "./library" import { browseSongsFromIds } from "./library"
import {
loadPlaybackForWrite,
readPlaybackProgress,
readPlaybackState,
writePlayback,
writeProgress,
} from "./playbackState"
export type { HistorySong, QueueSong } from "./types" export type { HistorySong, QueueSong } from "./types"
const MAX_QUEUE_HISTORY = 30
const MAX_RECENTLY_PLAYED = 30 const MAX_RECENTLY_PLAYED = 30
type RecentlyPlayedItem = Id<"albums"> | Id<"playlists"> type RecentlyPlayedItem = Id<"albums"> | Id<"playlists">
@@ -65,15 +59,30 @@ async function requireAuth(ctx: MutationCtx) {
return userId return userId
} }
async function requirePlayback(ctx: MutationCtx, userId: Id<"users">) { async function patchPlayback(
const playback = await loadPlaybackForWrite(ctx, userId) ctx: MutationCtx,
if (!playback) { userId: Id<"users">,
patch: Partial<
Pick<
Doc<"users">,
| "songQueue"
| "queueHistory"
| "currentSongProgress"
| "shuffleEnabled"
| "repeatEnabled"
>
>
) {
const user = await ctx.db.get(userId)
if (!user) {
throw new ConvexError("User not found") throw new ConvexError("User not found")
} }
return playback
const playbackRevision = (user.playbackRevision ?? 0) + 1
await ctx.db.patch(userId, { ...patch, playbackRevision })
return playbackRevision
} }
/** Queue state without progress; progress comes from `getSongProgress`. */
export const getPlaybackState = query({ export const getPlaybackState = query({
args: {}, args: {},
handler: async (ctx) => { handler: async (ctx) => {
@@ -82,8 +91,12 @@ export const getPlaybackState = query({
return null return null
} }
const playback = await readPlaybackState(ctx, userId) const user = await ctx.db.get(userId)
const songIds = playback.songQueue if (!user) {
return null
}
const songIds = user.songQueue ?? []
const currentSong = const currentSong =
songIds.length > 0 songIds.length > 0
? ((await browseSongsFromIds(ctx, [songIds[0]]))[0] ?? null) ? ((await browseSongsFromIds(ctx, [songIds[0]]))[0] ?? null)
@@ -91,16 +104,12 @@ export const getPlaybackState = query({
return { return {
queueSongIds: songIds, queueSongIds: songIds,
queueHistorySongIds: playback.queueHistory, queueHistorySongIds: user.queueHistory ?? [],
currentSong, currentSong,
shuffleEnabled: playback.shuffleEnabled, shuffleEnabled: user.shuffleEnabled ?? false,
repeatEnabled: playback.repeatEnabled, repeatEnabled: user.repeatEnabled ?? ("none" as const),
/** currentSongProgress: user.currentSongProgress ?? 0,
* @deprecated Always 0. Reading progress here would rerun this query on revision: user.playbackRevision ?? 0,
* every progress save. Kept for app builds that predate `getSongProgress`.
*/
currentSongProgress: 0,
revision: playback.revision,
} }
}, },
}) })
@@ -125,12 +134,12 @@ export const syncPlaybackState = mutation({
}, },
handler: async (ctx, args) => { handler: async (ctx, args) => {
const userId = await requireAuth(ctx) const userId = await requireAuth(ctx)
return await writePlayback(ctx, userId, { return await patchPlayback(ctx, userId, {
songQueue: args.songQueue, songQueue: args.songQueue,
queueHistory: args.queueHistory, queueHistory: args.queueHistory.slice(-MAX_QUEUE_HISTORY),
shuffleEnabled: args.shuffleEnabled, shuffleEnabled: args.shuffleEnabled,
repeatEnabled: args.repeatEnabled, repeatEnabled: args.repeatEnabled,
progressSeconds: args.currentSongProgress, currentSongProgress: Math.max(0, Math.floor(args.currentSongProgress)),
}) })
}, },
}) })
@@ -150,26 +159,6 @@ export const recordPlay = mutation({
}, },
}) })
/**
* Saved position of the current song. Subscribing reruns every few seconds
* during playback, so clients fetch it once when adopting a new queue.
*/
export const getSongProgress = query({
args: {},
handler: async (ctx) => {
const userId = await getAuthUserId(ctx)
if (userId === null) {
throw new ConvexError("User not logged in")
}
const [{ songQueue }, progress] = await Promise.all([
readPlaybackState(ctx, userId),
readPlaybackProgress(ctx, userId),
])
return progress.songId === songQueue[0] ? progress.progressSeconds : 0
},
})
export const updateSongProgress = mutation({ export const updateSongProgress = mutation({
args: { args: {
songId: v.id("songs"), songId: v.id("songs"),
@@ -177,15 +166,15 @@ export const updateSongProgress = mutation({
}, },
handler: async (ctx, args) => { handler: async (ctx, args) => {
const userId = await requireAuth(ctx) const userId = await requireAuth(ctx)
const playback = await requirePlayback(ctx, userId) const user = await ctx.db.get(userId)
if (!user) {
throw new ConvexError("User not found")
}
if (playback.songQueue[0] !== args.songId) { if ((user.songQueue ?? [])[0] !== args.songId) {
return return
} }
await writeProgress(ctx, userId, { await ctx.db.patch(userId, { currentSongProgress: args.progressSeconds })
songId: args.songId,
progressSeconds: args.progressSeconds,
})
}, },
}) })
-236
View File
@@ -1,236 +0,0 @@
import { ConvexError } from "convex/values"
import type { Doc, Id } from "./_generated/dataModel"
import type { MutationCtx, QueryCtx } from "./_generated/server"
import { MAX_QUEUE_LENGTH } from "./limits"
const MAX_QUEUE_HISTORY = 30
export type RepeatMode = Doc<"playbackStates">["repeatEnabled"]
export type PlaybackState = Pick<
Doc<"playbackStates">,
"songQueue" | "queueHistory" | "shuffleEnabled" | "repeatEnabled" | "revision"
>
export type PlaybackProgress = {
songId: Id<"songs"> | null
progressSeconds: number
}
export type PlaybackPatch = Partial<
Pick<
PlaybackState,
"songQueue" | "queueHistory" | "shuffleEnabled" | "repeatEnabled"
>
> & {
/** Saved position of the new `songQueue[0]`. */
progressSeconds?: number
}
const LEGACY_PLAYBACK_FIELDS = [
"songQueue",
"queueHistory",
"currentSongProgress",
"playbackRevision",
"shuffleEnabled",
"repeatEnabled",
] as const
const EMPTY_STATE: PlaybackState = {
songQueue: [],
queueHistory: [],
shuffleEnabled: false,
repeatEnabled: "none",
revision: 0,
}
function legacyState(user: Doc<"users"> | null): PlaybackState {
if (!user) {
return EMPTY_STATE
}
return {
songQueue: (user.songQueue ?? []).slice(0, MAX_QUEUE_LENGTH),
queueHistory: (user.queueHistory ?? []).slice(-MAX_QUEUE_HISTORY),
shuffleEnabled: user.shuffleEnabled ?? false,
repeatEnabled: user.repeatEnabled ?? "none",
revision: user.playbackRevision ?? 0,
}
}
function legacyProgress(user: Doc<"users"> | null): PlaybackProgress {
return {
songId: user?.songQueue?.[0] ?? null,
progressSeconds: user?.currentSongProgress ?? 0,
}
}
export function hasLegacyPlayback(user: Doc<"users">) {
return LEGACY_PLAYBACK_FIELDS.some((field) => user[field] !== undefined)
}
function stateDoc(ctx: QueryCtx, userId: Id<"users">) {
return ctx.db
.query("playbackStates")
.withIndex("by_user", (q) => q.eq("userId", userId))
.unique()
}
function progressDoc(ctx: QueryCtx, userId: Id<"users">) {
return ctx.db
.query("playbackProgress")
.withIndex("by_user", (q) => q.eq("userId", userId))
.unique()
}
/**
* Reads the queue without touching progress, so progress saves do not rerun
* the caller. Users that have not been migrated yet fall back to `users`.
*/
export async function readPlaybackState(
ctx: QueryCtx,
userId: Id<"users">
): Promise<PlaybackState> {
const doc = await stateDoc(ctx, userId)
if (doc) {
return doc
}
return legacyState(await ctx.db.get(userId))
}
export async function readPlaybackProgress(
ctx: QueryCtx,
userId: Id<"users">
): Promise<PlaybackProgress> {
const doc = await progressDoc(ctx, userId)
if (doc) {
return { songId: doc.songId ?? null, progressSeconds: doc.progressSeconds }
}
return legacyProgress(await ctx.db.get(userId))
}
/**
* Moves a user's playback fields from `users` into `playbackStates` and
* `playbackProgress`. Safe to call repeatedly.
*/
export async function migrateUserPlayback(
ctx: MutationCtx,
user: Doc<"users">
) {
const [existingState, existingProgress] = await Promise.all([
stateDoc(ctx, user._id),
progressDoc(ctx, user._id),
])
let state = existingState
if (!state) {
const stateId = await ctx.db.insert("playbackStates", {
userId: user._id,
...legacyState(user),
})
state = (await ctx.db.get(stateId))!
}
if (!existingProgress) {
const progress = legacyProgress(user)
await ctx.db.insert("playbackProgress", {
userId: user._id,
progressSeconds: progress.progressSeconds,
...(progress.songId ? { songId: progress.songId } : {}),
})
}
if (hasLegacyPlayback(user)) {
await ctx.db.patch(user._id, {
songQueue: undefined,
queueHistory: undefined,
currentSongProgress: undefined,
playbackRevision: undefined,
shuffleEnabled: undefined,
repeatEnabled: undefined,
})
}
return state
}
/** Loads the queue in a mutation, migrating the user first if needed. */
export async function loadPlaybackForWrite(
ctx: MutationCtx,
userId: Id<"users">
) {
const doc = await stateDoc(ctx, userId)
if (doc) {
return doc
}
const user = await ctx.db.get(userId)
if (!user) {
return null
}
return await migrateUserPlayback(ctx, user)
}
/** Applies `patch`, bumps the revision, and returns the new revision. */
export async function writePlayback(
ctx: MutationCtx,
userId: Id<"users">,
patch: PlaybackPatch
): Promise<number> {
const doc = await loadPlaybackForWrite(ctx, userId)
if (!doc) {
throw new ConvexError("User not found")
}
const { progressSeconds, ...fields } = patch
const revision = doc.revision + 1
const songQueue = fields.songQueue?.slice(0, MAX_QUEUE_LENGTH)
const queueHistory = fields.queueHistory?.slice(-MAX_QUEUE_HISTORY)
await ctx.db.patch(doc._id, {
...fields,
...(songQueue ? { songQueue } : {}),
...(queueHistory ? { queueHistory } : {}),
revision,
})
if (progressSeconds !== undefined) {
await writeProgress(ctx, userId, {
songId: (songQueue ?? doc.songQueue)[0] ?? null,
progressSeconds,
})
}
return revision
}
export async function writeProgress(
ctx: MutationCtx,
userId: Id<"users">,
progress: PlaybackProgress
) {
const value = {
songId: progress.songId ?? undefined,
progressSeconds: Math.max(0, Math.floor(progress.progressSeconds)),
}
const doc = await progressDoc(ctx, userId)
if (!doc) {
await ctx.db.insert("playbackProgress", { userId, ...value })
} else if (
doc.songId !== value.songId ||
doc.progressSeconds !== value.progressSeconds
) {
await ctx.db.patch(doc._id, value)
}
}
export async function deleteUserPlayback(
ctx: MutationCtx,
userId: Id<"users">
) {
const [state, progress] = await Promise.all([
stateDoc(ctx, userId),
progressDoc(ctx, userId),
])
if (state) {
await ctx.db.delete(state._id)
}
if (progress) {
await ctx.db.delete(progress._id)
}
}
+1 -10
View File
@@ -10,11 +10,7 @@ import type {
PlaylistSummary, PlaylistSummary,
SidebarPlaylists, SidebarPlaylists,
} from "./library" } from "./library"
import { import { browseSongsFromIds, compareAlbumSongs } from "./library"
browseSongsFromIds,
compareAlbumSongs,
requireSignedIn,
} from "./library"
function toPlaylistSummary( function toPlaylistSummary(
playlist: Doc<"playlists">, playlist: Doc<"playlists">,
@@ -112,7 +108,6 @@ async function browsePlaylistSummaryHandler(
} }
} }
/** Public: shared /playlist links render this without a session. */
export const browsePlaylistDetail = query({ export const browsePlaylistDetail = query({
args: { id: v.id("playlists") }, args: { id: v.id("playlists") },
handler: async (ctx, args): Promise<BrowsePlaylistDetail | null> => { handler: async (ctx, args): Promise<BrowsePlaylistDetail | null> => {
@@ -272,7 +267,6 @@ export const listAllPlaylists = query({
export const getAlbumSongIds = query({ export const getAlbumSongIds = query({
args: { albumId: v.id("albums") }, args: { albumId: v.id("albums") },
handler: async (ctx, args) => { handler: async (ctx, args) => {
await requireSignedIn(ctx)
const songs = await ctx.db const songs = await ctx.db
.query("songs") .query("songs")
.withIndex("by_album", (q) => q.eq("album", args.albumId)) .withIndex("by_album", (q) => q.eq("album", args.albumId))
@@ -285,7 +279,6 @@ export const getAlbumSongIds = query({
export const getArtistSongIds = query({ export const getArtistSongIds = query({
args: { artistId: v.id("artists") }, args: { artistId: v.id("artists") },
handler: async (ctx, args) => { handler: async (ctx, args) => {
await requireSignedIn(ctx)
const songs = await ctx.db const songs = await ctx.db
.query("songs") .query("songs")
.withIndex("by_artist", (q) => q.eq("albumArtist", args.artistId)) .withIndex("by_artist", (q) => q.eq("albumArtist", args.artistId))
@@ -297,7 +290,6 @@ export const getArtistSongIds = query({
export const getOrderedArtistSongIds = query({ export const getOrderedArtistSongIds = query({
args: { artistId: v.id("artists") }, args: { artistId: v.id("artists") },
handler: async (ctx, args) => { handler: async (ctx, args) => {
await requireSignedIn(ctx)
const songs = await ctx.db const songs = await ctx.db
.query("songs") .query("songs")
.withIndex("by_artist", (q) => q.eq("albumArtist", args.artistId)) .withIndex("by_artist", (q) => q.eq("albumArtist", args.artistId))
@@ -328,7 +320,6 @@ export const getOrderedArtistSongIds = query({
export const getPlaylistSongIds = query({ export const getPlaylistSongIds = query({
args: { playlistId: v.id("playlists") }, args: { playlistId: v.id("playlists") },
handler: async (ctx, args) => { handler: async (ctx, args) => {
await requireSignedIn(ctx)
const playlist = await ctx.db.get("playlists", args.playlistId) const playlist = await ctx.db.get("playlists", args.playlistId)
return playlist?.songs ?? [] return playlist?.songs ?? []
}, },
+5 -29
View File
@@ -2,19 +2,11 @@ import { defineSchema, defineTable } from "convex/server"
import { v } from "convex/values" import { v } from "convex/values"
import { authTables } from "@convex-dev/auth/server" import { authTables } from "@convex-dev/auth/server"
const repeatModeValidator = v.union(
v.literal("always"),
v.literal("once"),
v.literal("none")
)
export default defineSchema({ export default defineSchema({
...authTables, ...authTables,
users: defineTable({ users: defineTable({
name: v.string(), name: v.string(),
/** Legacy base64 data URL; `migrations.migrateUsers` moves it to storage. */
image: v.optional(v.string()), image: v.optional(v.string()),
imageStorageId: v.optional(v.id("_storage")),
email: v.string(), email: v.string(),
isAdmin: v.optional(v.boolean()), isAdmin: v.optional(v.boolean()),
playbackQuality: v.optional( playbackQuality: v.optional(
@@ -30,34 +22,18 @@ export default defineSchema({
favoriteArtists: v.optional(v.array(v.id("artists"))), favoriteArtists: v.optional(v.array(v.id("artists"))),
favoriteAlbums: v.optional(v.array(v.id("albums"))), favoriteAlbums: v.optional(v.array(v.id("albums"))),
favoriteSongs: v.optional(v.array(v.id("songs"))), favoriteSongs: v.optional(v.array(v.id("songs"))),
songQueue: v.optional(v.array(v.id("songs"))),
queueHistory: v.optional(v.array(v.id("songs"))),
recentlyPlayed: v.optional( recentlyPlayed: v.optional(
v.array(v.union(v.id("playlists"), v.id("albums"))) v.array(v.union(v.id("playlists"), v.id("albums")))
), ),
// Legacy playback fields, now in `playbackStates` and `playbackProgress`.
// `migrations.migrateUsers` clears them; drop them once every deployment
// has run it.
songQueue: v.optional(v.array(v.id("songs"))),
queueHistory: v.optional(v.array(v.id("songs"))),
currentSongProgress: v.optional(v.number()), currentSongProgress: v.optional(v.number()),
playbackRevision: v.optional(v.number()), playbackRevision: v.optional(v.number()),
shuffleEnabled: v.optional(v.boolean()), shuffleEnabled: v.optional(v.boolean()),
repeatEnabled: v.optional(repeatModeValidator), repeatEnabled: v.optional(
v.union(v.literal("always"), v.literal("once"), v.literal("none"))
),
}).index("email", ["email"]), }).index("email", ["email"]),
playbackStates: defineTable({
userId: v.id("users"),
songQueue: v.array(v.id("songs")),
queueHistory: v.array(v.id("songs")),
shuffleEnabled: v.boolean(),
repeatEnabled: repeatModeValidator,
revision: v.number(),
}).index("by_user", ["userId"]),
// Saved every few seconds during playback, so it lives apart from the queue
// to keep those writes from rerunning queue queries.
playbackProgress: defineTable({
userId: v.id("users"),
songId: v.optional(v.id("songs")),
progressSeconds: v.number(),
}).index("by_user", ["userId"]),
authVerifiers: defineTable({ authVerifiers: defineTable({
sessionId: v.optional(v.id("authSessions")), sessionId: v.optional(v.id("authSessions")),
signature: v.optional(v.string()), signature: v.optional(v.string()),
+4 -111
View File
@@ -5,18 +5,9 @@ import {
} from "@convex-dev/auth/server" } from "@convex-dev/auth/server"
import { ConvexError, v } from "convex/values" import { ConvexError, v } from "convex/values"
import { api, internal } from "./_generated/api" import { api, internal } from "./_generated/api"
import { import { action, internalQuery, mutation, query } from "./_generated/server"
action, import type { Id } from "./_generated/dataModel"
internalAction,
internalMutation,
internalQuery,
mutation,
query,
} from "./_generated/server"
import type { Doc, Id } from "./_generated/dataModel"
import type { ActionCtx, MutationCtx } from "./_generated/server" import type { ActionCtx, MutationCtx } from "./_generated/server"
import { MAX_PROFILE_IMAGE_BYTES } from "./limits"
import { deleteUserPlayback } from "./playbackState"
const playbackQualityValidator = v.union( const playbackQualityValidator = v.union(
v.literal("low"), v.literal("low"),
@@ -187,114 +178,18 @@ export const listUsers = query({
}, },
}) })
const DATA_URL_PATTERN = /^data:(image\/[\w.+-]+);base64,([A-Za-z0-9+/=]+)$/
/** Splits an image data URL, rejecting anything over the size cap. */
function parseImageDataUrl(image: string) {
const match = DATA_URL_PATTERN.exec(image)
if (!match) {
throw new ConvexError("Profile photo must be an image")
}
const [, contentType, base64] = match
if (Math.floor((base64.length * 3) / 4) > MAX_PROFILE_IMAGE_BYTES) {
throw new ConvexError(
`Profile photo must be ${MAX_PROFILE_IMAGE_BYTES / 1024 / 1024} MB or smaller`
)
}
return { contentType, base64 }
}
/**
* Path clients load the avatar from. The web server proxies it from Convex
* storage, since the backend's storage URLs are not reachable from browsers
* in every deployment. Legacy data URLs are returned as is until migrated.
*/
export function profileImagePath(user: Doc<"users">) {
if (user.imageStorageId) {
return `/api/user/${user._id}/avatar?v=${user.imageStorageId}`
}
return user.image
}
/**
* Takes a data URL so existing clients keep working. The image is moved into
* file storage in the background; `currentUser` updates once it lands.
*/
export const updateProfileImage = mutation({ export const updateProfileImage = mutation({
args: { args: {
image: v.union(v.string(), v.null()), image: v.union(v.string(), v.null()),
}, },
handler: async (ctx, { image }) => { handler: async (ctx, { image }) => {
const userId = await requireAuth(ctx) const userId = await requireAuth(ctx)
if (image === null) { await ctx.db.patch(userId, {
await setProfileImage(ctx, userId, null) image: image === null ? undefined : image,
return
}
parseImageDataUrl(image)
await ctx.scheduler.runAfter(0, internal.users.storeProfileImage, {
userId,
image,
}) })
}, },
}) })
/** Decodes a data URL into file storage and points the user at it. */
export const storeProfileImage = internalAction({
args: { userId: v.id("users"), image: v.string() },
handler: async (ctx, { userId, image }) => {
const { contentType, base64 } = parseImageDataUrl(image)
const bytes = Uint8Array.from(atob(base64), (char) => char.charCodeAt(0))
const storageId = await ctx.storage.store(
new Blob([bytes], { type: contentType })
)
await ctx.runMutation(internal.users.attachProfileImage, {
userId,
storageId,
})
},
})
export const attachProfileImage = internalMutation({
args: { userId: v.id("users"), storageId: v.id("_storage") },
handler: async (ctx, { userId, storageId }) => {
await setProfileImage(ctx, userId, storageId)
},
})
/** Replaces the avatar, deleting the previous file. Clears it for `null`. */
async function setProfileImage(
ctx: MutationCtx,
userId: Id<"users">,
storageId: Id<"_storage"> | null
) {
const user = await ctx.db.get(userId)
if (!user) {
if (storageId) {
await ctx.storage.delete(storageId)
}
return
}
if (user.imageStorageId && user.imageStorageId !== storageId) {
await ctx.storage.delete(user.imageStorageId)
}
await ctx.db.patch(userId, {
image: undefined,
imageStorageId: storageId ?? undefined,
})
}
/** Storage URL behind `profileImagePath`, for the web server's proxy route. */
export const getProfileImageUrl = query({
args: { userId: v.id("users") },
handler: async (ctx, { userId }) => {
const user = await ctx.db.get(userId)
if (!user?.imageStorageId) {
return null
}
return await ctx.storage.getUrl(user.imageStorageId)
},
})
export const updateProfileName = mutation({ export const updateProfileName = mutation({
args: { name: v.string() }, args: { name: v.string() },
handler: async (ctx, { name }) => { handler: async (ctx, { name }) => {
@@ -399,8 +294,6 @@ export const deleteUser = mutation({
throw new ConvexError("You cannot delete your own account") throw new ConvexError("You cannot delete your own account")
} }
await deleteOwnedPlaylists(ctx, userId) await deleteOwnedPlaylists(ctx, userId)
await deleteUserPlayback(ctx, userId)
await setProfileImage(ctx, userId, null)
await deleteUserAuthData(ctx, userId) await deleteUserAuthData(ctx, userId)
}, },
}) })
-20
View File
@@ -179,9 +179,6 @@ importers:
'@otunes/convex': '@otunes/convex':
specifier: workspace:* specifier: workspace:*
version: link:../../packages/convex version: link:../../packages/convex
'@tanstack/react-virtual':
specifier: ^3.14.26
version: 3.14.26(react-dom@19.3.1(react@19.3.1))(react@19.3.1)
class-variance-authority: class-variance-authority:
specifier: ^0.7.1 specifier: ^0.7.1
version: 0.7.1 version: 0.7.1
@@ -2660,15 +2657,6 @@ packages:
'@tailwindcss/postcss@4.3.2': '@tailwindcss/postcss@4.3.2':
resolution: {integrity: sha512-rjVWYCa7Ngbi5AarT6k8TkxUG3Wl1QKzHdIZVsjZSzf36Jmo2IKZt/NHRAwly8oDkbBOH0YTu+CHuf9jPxMc+g==} resolution: {integrity: sha512-rjVWYCa7Ngbi5AarT6k8TkxUG3Wl1QKzHdIZVsjZSzf36Jmo2IKZt/NHRAwly8oDkbBOH0YTu+CHuf9jPxMc+g==}
'@tanstack/react-virtual@3.14.26':
resolution: {integrity: sha512-HUDlfsrYH6ko5xH56L62Mcl/uzT+AGVNMHFuDNqDJMdZWc1AQa2oeVKNUvZ/RWBZQ4TYtyQerFrNvLnp39h65A==}
peerDependencies:
react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
'@tanstack/virtual-core@3.19.11':
resolution: {integrity: sha512-/5iHb0RHBvj8Di59FDs4ESNm45jls33aZAi4zccVXZjc/6ZvwQP6nzEYeT6weXjTf9E6/vrp2JhYWRyO+ZP13A==}
'@tokenizer/inflate@0.4.1': '@tokenizer/inflate@0.4.1':
resolution: {integrity: sha512-2mAv+8pkG6GIZiF1kNg1jAjh27IDxEPKwdGul3snfztFerfPGI1LjDezZp3i7BElXompqEtPmoPx6c2wgtWsOA==} resolution: {integrity: sha512-2mAv+8pkG6GIZiF1kNg1jAjh27IDxEPKwdGul3snfztFerfPGI1LjDezZp3i7BElXompqEtPmoPx6c2wgtWsOA==}
engines: {node: '>=18'} engines: {node: '>=18'}
@@ -9476,14 +9464,6 @@ snapshots:
postcss: 8.5.16 postcss: 8.5.16
tailwindcss: 4.3.2 tailwindcss: 4.3.2
'@tanstack/react-virtual@3.14.26(react-dom@19.3.1(react@19.3.1))(react@19.3.1)':
dependencies:
'@tanstack/virtual-core': 3.19.11
react: 19.3.1
react-dom: 19.3.1(react@19.3.1)
'@tanstack/virtual-core@3.19.11': {}
'@tokenizer/inflate@0.4.1': '@tokenizer/inflate@0.4.1':
dependencies: dependencies:
debug: 4.4.3 debug: 4.4.3