diff --git a/apps/web/app/(app)/recently-played/page.tsx b/apps/web/app/(app)/recently-played/page.tsx
index 380be14..3fd0a4f 100644
--- a/apps/web/app/(app)/recently-played/page.tsx
+++ b/apps/web/app/(app)/recently-played/page.tsx
@@ -5,8 +5,8 @@ import { useQuery } from "convex/react"
import { AlbumCard } from "@/components/album-card"
import { LibraryLoading } from "@/components/library-loading"
import { PlaylistCard } from "@/components/playlist-card"
-import { api } from "@/convex/_generated/api"
-import type { BrowseAlbum, PlaylistSummary } from "@/convex/library"
+import { api } from "@otunes/convex/_generated/api"
+import type { BrowseAlbum, PlaylistSummary } from "@otunes/convex/types"
function RecentlyPlayedCard({
item,
@@ -20,7 +20,7 @@ function RecentlyPlayedCard({
}
export default function Page() {
- const recentlyPlayed = useQuery(api.library.browseRecentlyPlayed)
+ const recentlyPlayed = useQuery(api.library.browseRecentlyPlayed, {})
return (
diff --git a/apps/web/app/(app)/search/page.tsx b/apps/web/app/(app)/search/page.tsx
index 7a4d703..ae5874a 100644
--- a/apps/web/app/(app)/search/page.tsx
+++ b/apps/web/app/(app)/search/page.tsx
@@ -9,7 +9,7 @@ import { ContentCarousel } from "@/components/content-carousel"
import { LibraryLoading } from "@/components/library-loading"
import { SearchSongItem } from "@/components/search-song-item"
import { SearchTopResultCard, type TopResult } from "@/components/search-top-result-card"
-import { api } from "@/convex/_generated/api"
+import { api } from "@otunes/convex/_generated/api"
const SEARCH_DEBOUNCE_MS = 300
@@ -170,6 +170,10 @@ function SearchPageContent() {
useEffect(() => {
function onPopState() {
+ if (debounceRef.current) {
+ clearTimeout(debounceRef.current)
+ debounceRef.current = null
+ }
const nextQuery = readUrlQuery()
urlQueryRef.current = nextQuery
setQuery(nextQuery)
@@ -186,6 +190,7 @@ function SearchPageContent() {
if (debounceRef.current) {
clearTimeout(debounceRef.current)
+ debounceRef.current = null
}
debounceRef.current = setTimeout(() => {
@@ -203,6 +208,7 @@ function SearchPageContent() {
if (debounceRef.current) {
clearTimeout(debounceRef.current)
+ debounceRef.current = null
}
commitSearch(query, "push")
},
diff --git a/apps/web/app/api/album/[id]/cover/route.ts b/apps/web/app/api/album/[id]/cover/route.ts
index 016d2d3..358cbf5 100644
--- a/apps/web/app/api/album/[id]/cover/route.ts
+++ b/apps/web/app/api/album/[id]/cover/route.ts
@@ -1,10 +1,10 @@
-import { api } from "@/convex/_generated/api"
-import type { Id } from "@/convex/_generated/dataModel"
+import { api } from "@otunes/convex/_generated/api"
+import type { Id } from "@otunes/convex/_generated/dataModel"
import { getConvexClient } from "@/lib/convex-server"
import { serveCoverFile } from "@/lib/serve-cover"
export async function GET(
- _request: Request,
+ request: Request,
{ params }: { params: Promise<{ id: string }> }
) {
const { id } = await params
@@ -13,7 +13,7 @@ export async function GET(
const album = await getConvexClient().query(api.library.getAlbum, {
id: id as Id<"albums">,
})
- return serveCoverFile(album?.cover)
+ return serveCoverFile(album?.cover, request)
} catch {
return new Response("Not found", { status: 404 })
}
diff --git a/apps/web/app/api/artist/[id]/cover/route.ts b/apps/web/app/api/artist/[id]/cover/route.ts
index 78acbc7..5cc988f 100644
--- a/apps/web/app/api/artist/[id]/cover/route.ts
+++ b/apps/web/app/api/artist/[id]/cover/route.ts
@@ -1,10 +1,10 @@
-import { api } from "@/convex/_generated/api"
-import type { Id } from "@/convex/_generated/dataModel"
+import { api } from "@otunes/convex/_generated/api"
+import type { Id } from "@otunes/convex/_generated/dataModel"
import { getConvexClient } from "@/lib/convex-server"
import { serveCoverFile } from "@/lib/serve-cover"
export async function GET(
- _request: Request,
+ request: Request,
{ params }: { params: Promise<{ id: string }> }
) {
const { id } = await params
@@ -13,7 +13,7 @@ export async function GET(
const artist = await getConvexClient().query(api.library.getArtist, {
id: id as Id<"artists">,
})
- return serveCoverFile(artist?.cover)
+ return serveCoverFile(artist?.cover, request)
} catch {
return new Response("Not found", { status: 404 })
}
diff --git a/apps/web/app/api/playlist/[id]/cover/route.ts b/apps/web/app/api/playlist/[id]/cover/route.ts
index faf0488..1fab4b8 100644
--- a/apps/web/app/api/playlist/[id]/cover/route.ts
+++ b/apps/web/app/api/playlist/[id]/cover/route.ts
@@ -1,10 +1,10 @@
-import { api } from "@/convex/_generated/api"
-import type { Id } from "@/convex/_generated/dataModel"
+import { api } from "@otunes/convex/_generated/api"
+import type { Id } from "@otunes/convex/_generated/dataModel"
import { getConvexClient } from "@/lib/convex-server"
import { serveCoverFile } from "@/lib/serve-cover"
export async function GET(
- _request: Request,
+ request: Request,
{ params }: { params: Promise<{ id: string }> }
) {
const { id } = await params
@@ -12,7 +12,7 @@ export async function GET(
const playlist = await getConvexClient().query(api.library.getPlaylist, {
id: id as Id<"playlists">,
})
- return serveCoverFile(playlist?.cover)
+ return serveCoverFile(playlist?.cover, request)
} catch {
return new Response("Not found", { status: 404 })
}
diff --git a/apps/web/app/api/song/[id]/play/hls/route.ts b/apps/web/app/api/song/[id]/play/hls/route.ts
index 0ff0ae4..103b9f0 100644
--- a/apps/web/app/api/song/[id]/play/hls/route.ts
+++ b/apps/web/app/api/song/[id]/play/hls/route.ts
@@ -1,5 +1,5 @@
-import { api } from "@/convex/_generated/api"
-import type { Id } from "@/convex/_generated/dataModel"
+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 { NextRequest } from "next/server"
diff --git a/apps/web/app/api/song/[id]/play/hls/segment/[segment]/route.ts b/apps/web/app/api/song/[id]/play/hls/segment/[segment]/route.ts
index cbc3d58..0346b57 100644
--- a/apps/web/app/api/song/[id]/play/hls/segment/[segment]/route.ts
+++ b/apps/web/app/api/song/[id]/play/hls/segment/[segment]/route.ts
@@ -1,7 +1,11 @@
-import { api } from "@/convex/_generated/api"
-import type { Id } from "@/convex/_generated/dataModel"
+import { api } from "@otunes/convex/_generated/api"
+import type { Id } from "@otunes/convex/_generated/dataModel"
import { getConvexClient } from "@/lib/convex-server"
-import { ensureHlsJob, waitForHlsSegment } from "@/lib/server-hls"
+import {
+ ensureHlsJob,
+ getExistingHlsJob,
+ waitForHlsSegment,
+} from "@/lib/server-hls"
import { streamFile } from "@/lib/server-audio-stream"
import { NextRequest, NextResponse } from "next/server"
import fs from "node:fs/promises"
@@ -29,14 +33,19 @@ export async function GET(
}
try {
- const song = (await getConvexClient().query(api.library.getSong, {
- id: id as Id<"songs">,
- }))!
-
const quality = request.nextUrl.searchParams.get("quality")
const preferAtmos =
request.nextUrl.searchParams.get("preferAtmos") === "true"
- const job = await ensureHlsJob(song, quality, preferAtmos)
+ const existingJob = getExistingHlsJob(id, quality, preferAtmos)
+ const job =
+ existingJob ??
+ (await ensureHlsJob(
+ (await getConvexClient().query(api.library.getSong, {
+ id: id as Id<"songs">,
+ }))!,
+ quality,
+ preferAtmos
+ ))
if (segmentIndex >= job.segmentCount) {
return new Response("Segment not found", { status: 404 })
}
@@ -47,7 +56,7 @@ export async function GET(
return new NextResponse(streamFile(segmentPath), {
status: 200,
headers: {
- "Cache-Control": "no-cache",
+ "Cache-Control": "private, max-age=86400, immutable",
"Content-Length": String(size),
"Content-Type": "video/mp2t",
},
diff --git a/apps/web/app/api/song/[id]/play/route.ts b/apps/web/app/api/song/[id]/play/route.ts
index 942b3be..603b319 100644
--- a/apps/web/app/api/song/[id]/play/route.ts
+++ b/apps/web/app/api/song/[id]/play/route.ts
@@ -1,5 +1,5 @@
-import { api } from "@/convex/_generated/api"
-import type { Id } from "@/convex/_generated/dataModel"
+import { api } from "@otunes/convex/_generated/api"
+import type { Id } from "@otunes/convex/_generated/dataModel"
import { audioContentTypeForPath } from "@/lib/audio-content-type"
import { getConvexClient } from "@/lib/convex-server"
import { ffmpegToReadableStream, streamFile } from "@/lib/server-audio-stream"
diff --git a/apps/web/app/favicon.ico b/apps/web/app/favicon.ico
deleted file mode 100644
index 5cb9707..0000000
Binary files a/apps/web/app/favicon.ico and /dev/null differ
diff --git a/apps/web/app/favicon.png b/apps/web/app/favicon.png
new file mode 100644
index 0000000..1cc9ca1
Binary files /dev/null and b/apps/web/app/favicon.png differ
diff --git a/apps/web/app/layout.tsx b/apps/web/app/layout.tsx
index eab7c69..2b6e2b0 100644
--- a/apps/web/app/layout.tsx
+++ b/apps/web/app/layout.tsx
@@ -1,4 +1,4 @@
-import { Geist, Geist_Mono, Inter } from "next/font/google"
+import { Geist_Mono, Inter } from "next/font/google"
import "./globals.css"
import { ConvexAuthNextjsServerProvider } from "@convex-dev/auth/nextjs/server"
@@ -21,9 +21,7 @@ export const metadata: Metadata = {
appleWebApp: {
capable: true,
title: "oTunes",
- startupImage:
- process.env.HOSTED_URL + "/logo-dark.png" ||
- "http://localhost:3000/logo-dark.png",
+ startupImage: "/logo-dark.png",
statusBarStyle: "default",
},
openGraph: {
@@ -34,9 +32,7 @@ export const metadata: Metadata = {
siteName: "oTunes",
images: [
{
- url:
- process.env.HOSTED_URL + "/logo-dark.png" ||
- "http://localhost:3000/logo-dark.png",
+ url: "/logo-dark.png",
},
],
},
diff --git a/apps/web/components/add-to-playlist-provider.tsx b/apps/web/components/add-to-playlist-provider.tsx
index 26a926c..abdfb8d 100644
--- a/apps/web/components/add-to-playlist-provider.tsx
+++ b/apps/web/components/add-to-playlist-provider.tsx
@@ -17,8 +17,8 @@ import {
} from "@/components/ui/dialog"
import { Input } from "@/components/ui/input"
import { ScrollArea } from "@/components/ui/scroll-area"
-import { api } from "@/convex/_generated/api"
-import type { Id } from "@/convex/_generated/dataModel"
+import { api } from "@otunes/convex/_generated/api"
+import type { Id } from "@otunes/convex/_generated/dataModel"
function countSongsToAdd(
playlistSongIds: Id<"songs">[],
@@ -81,7 +81,6 @@ export function AddToPlaylistProvider({
}) {
const convex = useConvex()
const router = useRouter()
- const ownedPlaylists = useQuery(api.playlists.listOwnedPlaylists)
const addSongs = useMutation(api.playlists.addSongsToPlaylist)
const createPlaylist = useMutation(api.playlists.createPlaylist)
@@ -90,8 +89,13 @@ export function AddToPlaylistProvider({
const [newPlaylistName, setNewPlaylistName] = React.useState("")
const [pendingSongIds, setPendingSongIds] = React.useState[]>([])
const [isSubmitting, setIsSubmitting] = React.useState(false)
+ const selectionRequestRef = React.useRef(0)
+ const ownedPlaylists = useQuery(
+ api.playlists.listOwnedPlaylists,
+ open ? {} : "skip"
+ )
- const openAddToPlaylist = React.useCallback((songIds: Id<"songs">[]) => {
+ const showAddToPlaylist = React.useCallback((songIds: Id<"songs">[]) => {
const unique = [...new Set(songIds)]
if (unique.length === 0) {
toast.error("No songs selected")
@@ -101,37 +105,79 @@ export function AddToPlaylistProvider({
setOpen(true)
}, [])
+ const openAddToPlaylist = React.useCallback(
+ (songIds: Id<"songs">[]) => {
+ selectionRequestRef.current += 1
+ showAddToPlaylist(songIds)
+ },
+ [showAddToPlaylist]
+ )
+
const openAddAlbumToPlaylist = React.useCallback(
async (albumId: Id<"albums">) => {
- const songIds = await convex.query(api.playlists.getAlbumSongIds, {
- albumId,
- })
- openAddToPlaylist(songIds)
+ const requestId = ++selectionRequestRef.current
+ try {
+ const songIds = await convex.query(api.playlists.getAlbumSongIds, {
+ albumId,
+ })
+ if (requestId === selectionRequestRef.current) {
+ showAddToPlaylist(songIds)
+ }
+ } catch (error) {
+ if (requestId === selectionRequestRef.current) {
+ toast.error(
+ error instanceof Error ? error.message : "Failed to load album"
+ )
+ }
+ }
},
- [convex, openAddToPlaylist]
+ [convex, showAddToPlaylist]
)
const openAddPlaylistToPlaylist = React.useCallback(
async (playlistId: Id<"playlists">) => {
- const songIds = await convex.query(api.playlists.getPlaylistSongIds, {
- playlistId,
- })
- openAddToPlaylist(songIds)
+ const requestId = ++selectionRequestRef.current
+ try {
+ const songIds = await convex.query(api.playlists.getPlaylistSongIds, {
+ playlistId,
+ })
+ if (requestId === selectionRequestRef.current) {
+ showAddToPlaylist(songIds)
+ }
+ } catch (error) {
+ if (requestId === selectionRequestRef.current) {
+ toast.error(
+ error instanceof Error ? error.message : "Failed to load playlist"
+ )
+ }
+ }
},
- [convex, openAddToPlaylist]
+ [convex, showAddToPlaylist]
)
const openAddArtistToPlaylist = React.useCallback(
async (artistId: Id<"artists">) => {
- const songIds = await convex.query(api.playlists.getArtistSongIds, {
- artistId,
- })
- openAddToPlaylist(songIds)
+ const requestId = ++selectionRequestRef.current
+ try {
+ const songIds = await convex.query(api.playlists.getArtistSongIds, {
+ artistId,
+ })
+ if (requestId === selectionRequestRef.current) {
+ showAddToPlaylist(songIds)
+ }
+ } catch (error) {
+ if (requestId === selectionRequestRef.current) {
+ toast.error(
+ error instanceof Error ? error.message : "Failed to load artist"
+ )
+ }
+ }
},
- [convex, openAddToPlaylist]
+ [convex, showAddToPlaylist]
)
const openCreatePlaylist = React.useCallback(() => {
+ selectionRequestRef.current += 1
setPendingSongIds([])
setNewPlaylistName("")
setCreateOpen(true)
@@ -214,6 +260,7 @@ export function AddToPlaylistProvider({
onOpenChange={(next) => {
setOpen(next)
if (!next) {
+ selectionRequestRef.current += 1
setPendingSongIds([])
}
}}
diff --git a/apps/web/components/album-card.tsx b/apps/web/components/album-card.tsx
index b9fde70..1b044f3 100644
--- a/apps/web/components/album-card.tsx
+++ b/apps/web/components/album-card.tsx
@@ -14,15 +14,15 @@ import {
} from "@/components/media-context-menu"
import { usePlayback } from "@/components/playback-provider"
import { useQueueMediaActions } from "@/hooks/use-queue-media-actions"
-import { api } from "@/convex/_generated/api"
+import { api } from "@otunes/convex/_generated/api"
import { Button } from "@/components/ui/button"
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuTrigger,
} from "@/components/ui/dropdown-menu"
-import type { BrowseAlbum } from "@/convex/library"
-import type { Id } from "@/convex/_generated/dataModel"
+import type { BrowseAlbum } from "@otunes/convex/types"
+import type { Id } from "@otunes/convex/_generated/dataModel"
import { albumCoverUrl } from "@/lib/cover-urls"
import { cn } from "@/lib/utils"
diff --git a/apps/web/components/album-view.tsx b/apps/web/components/album-view.tsx
index b09aaf7..aa0ed38 100644
--- a/apps/web/components/album-view.tsx
+++ b/apps/web/components/album-view.tsx
@@ -23,8 +23,8 @@ import { ScrollArea } from "@/components/ui/scroll-area"
import { useQueueMediaActions } from "@/hooks/use-queue-media-actions"
import { useTrackSelection } from "@/hooks/use-track-selection"
import { cn } from "@/lib/utils"
-import type { Id } from "@/convex/_generated/dataModel"
-import type { BrowseAlbumDetail, BrowseAlbumTrack } from "@/convex/library"
+import type { Id } from "@otunes/convex/_generated/dataModel"
+import type { BrowseAlbumDetail, BrowseAlbumTrack } from "@otunes/convex/types"
import {
getSelectionRangePositions,
isInSelectionRange,
@@ -287,7 +287,6 @@ export function AlbumView({
handleSelect,
handlePointerDown,
prepareContextMenu,
- clearSelection,
} = useTrackSelection(album.tracks, validHighlightedSongId)
const selectionPositions = React.useMemo(
@@ -370,7 +369,7 @@ export function AlbumView({
fill
sizes="240px"
className="object-cover"
- priority
+ preload
/>
diff --git a/apps/web/components/app-sidebar.tsx b/apps/web/components/app-sidebar.tsx
index 2056ec4..30cd612 100644
--- a/apps/web/components/app-sidebar.tsx
+++ b/apps/web/components/app-sidebar.tsx
@@ -14,6 +14,7 @@ import {
} from "lucide-react"
import { usePathname, useRouter } from "next/navigation"
+import dynamic from "next/dynamic"
import { useAuthActions } from "@convex-dev/auth/react"
import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar"
@@ -23,7 +24,6 @@ import {
DropdownMenuItem,
DropdownMenuTrigger,
} from "@/components/ui/dropdown-menu"
-import { OptionsModal } from "@/components/options-modal"
import {
Sidebar,
SidebarContent,
@@ -42,7 +42,12 @@ import Link from "next/link"
import { useTheme } from "next-themes"
import * as React from "react"
import { useQuery } from "convex/react"
-import { api } from "@/convex/_generated/api"
+import { api } from "@otunes/convex/_generated/api"
+import { useMounted } from "@/hooks/use-mounted"
+
+const OptionsModal = dynamic(() =>
+ import("@/components/options-modal").then((module) => module.OptionsModal)
+)
const browse = [
{ title: "Home", path: "/", icon: House },
@@ -61,10 +66,10 @@ export function AppSidebar() {
const { signOut } = useAuthActions()
const user = useQuery(api.auth.currentUser)
const sidebarPlaylists = useQuery(api.playlists.listSidebarPlaylists)
- const fallbackLetters = user?.name?.match(/\b(\w)/g)!.join('') || "NA"
+ const fallbackLetters = user?.name?.match(/\b(\w)/g)?.join("") || "NA"
const { resolvedTheme } = useTheme()
- const [mounted, setMounted] = React.useState(false)
+ const mounted = useMounted()
const [optionsOpen, setOptionsOpen] = React.useState(false)
async function handleSignOut() {
@@ -72,10 +77,6 @@ export function AppSidebar() {
router.push("/signin")
}
- React.useEffect(() => {
- setMounted(true)
- }, [])
-
const isDark = mounted && resolvedTheme === "dark"
const playlistNav = [
@@ -202,7 +203,9 @@ export function AppSidebar() {
-
+ {optionsOpen ? (
+
+ ) : null}
diff --git a/apps/web/components/artist-card.tsx b/apps/web/components/artist-card.tsx
index add6f93..c66a788 100644
--- a/apps/web/components/artist-card.tsx
+++ b/apps/web/components/artist-card.tsx
@@ -3,7 +3,7 @@
import Image from "next/image"
import Link from "next/link"
-import type { BrowseArtist } from "@/convex/library"
+import type { BrowseArtist } from "@otunes/convex/types"
import { artistCoverUrl } from "@/lib/cover-urls"
export function ArtistCard({ artist }: { artist: BrowseArtist }) {
diff --git a/apps/web/components/artist-view.tsx b/apps/web/components/artist-view.tsx
index 2f8ca4a..c8a3b99 100644
--- a/apps/web/components/artist-view.tsx
+++ b/apps/web/components/artist-view.tsx
@@ -11,33 +11,24 @@ import { usePlayback } from "@/components/playback-provider"
import { useQueueMediaActions } from "@/hooks/use-queue-media-actions"
import { AlbumCard } from "@/components/album-card"
import { FavoriteMediaButton } from "@/components/favorite-media-button"
-import { ContentCarousel } from "@/components/content-carousel"
import {
MediaContextMenu,
type MediaContextAction,
} from "@/components/media-context-menu"
import { Button } from "@/components/ui/button"
import { ScrollArea } from "@/components/ui/scroll-area"
-import { api } from "@/convex/_generated/api"
-import type { Id } from "@/convex/_generated/dataModel"
-import type { BrowseAlbum, BrowseArtist } from "@/convex/library"
-import {
- albumGridCarouselContentClassName,
- albumGridCarouselSlideClassName,
- albumGridClassName,
-} from "@/lib/album-grid-classes"
+import { api } from "@otunes/convex/_generated/api"
+import type { Id } from "@otunes/convex/_generated/dataModel"
+import type { BrowseAlbum, BrowseArtist } from "@otunes/convex/types"
+import { albumGridClassName } from "@/lib/album-grid-classes"
import { artistCoverUrl } from "@/lib/cover-urls"
export function ArtistView({
artist,
albums,
- recentlyAdded,
- recentlyPlayed,
}: {
artist: BrowseArtist
albums: BrowseAlbum[]
- recentlyAdded: BrowseAlbum[]
- recentlyPlayed: BrowseAlbum[]
}) {
const { isArtistFavorite, toggleArtistFavorite } = useFavorites()
const { openAddArtistToPlaylist } = useAddToPlaylist()
@@ -78,7 +69,7 @@ export function ArtistView({
fill
sizes="160px"
className="object-cover"
- priority
+ preload
/>
@@ -133,31 +124,6 @@ export function ArtistView({