diff --git a/.gitea/workflows/desktop-build.yml b/.gitea/workflows/desktop-build.yml new file mode 100644 index 0000000..15b2b28 --- /dev/null +++ b/.gitea/workflows/desktop-build.yml @@ -0,0 +1,70 @@ +name: Desktop builds + +on: + workflow_dispatch: + push: + tags: + - "v*" + +jobs: + build: + # Both targets build in electronuserland/builder:wine. Wine lets + # electron-builder stamp the Windows executable; the Flatpak job adds + # flatpak-builder and needs a privileged container for its sandbox. + # See apps/desktop/README.md for the runner setup. + name: Desktop ${{ matrix.target }} + runs-on: ubuntu-latest + timeout-minutes: 90 + strategy: + fail-fast: false + matrix: + include: + - target: windows + options: "" + - target: linux + options: --privileged + container: + image: electronuserland/builder:wine + options: ${{ matrix.options }} + env: + OTUNES_DESKTOP_REF: ${{ gitea.ref }} + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Set up pnpm + uses: pnpm/action-setup@v4 + with: + version: 10.1.0 + run_install: false + + - name: Set up Node.js + uses: actions/setup-node@v4 + with: + node-version: "24" + + - name: Install Flatpak tools + if: matrix.target == 'linux' + run: | + apt-get update + apt-get install -y flatpak flatpak-builder + flatpak remote-add --user --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo + + - name: Install desktop and web dependencies + run: pnpm --filter @otunes/desktop --filter @otunes/web... install --frozen-lockfile + + - name: Check desktop scripts + run: pnpm --filter @otunes/desktop typecheck + + - name: Build x64 and ARM64 installers + run: pnpm --filter @otunes/desktop build:${{ matrix.target }} + + # Gitea's artifact service uses the v3 protocol, not GitHub's v4 service. + - name: Upload installers + uses: actions/upload-artifact@v3 + with: + name: otunes-desktop-${{ matrix.target }} + path: | + apps/desktop/dist/*.exe + apps/desktop/dist/*.flatpak + if-no-files-found: error diff --git a/.gitignore b/.gitignore index a2c0ae6..daf0f2d 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,9 @@ docker-compose.yml **/credentials/ **/*.ipa **/*.apk + +# Electron desktop build artifacts +apps/desktop/.package/ +apps/desktop/dist/ +apps/web/.next-desktop/ +apps/desktop/web/ diff --git a/README.md b/README.md index ab4d1e2..3d4f0ad 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,7 @@ This project uses [pnpm workspaces](https://pnpm.io/workspaces): | Package | Path | Description | | --- | --- | --- | | `@otunes/web` | `apps/web` | Next.js web app | +| `@otunes/desktop` | `apps/desktop` | Electron client for Windows and Linux | | `@otunes/mobile` | `apps/mobile` | Expo React Native mobile app | | `@otunes/convex` | `packages/convex` | Shared Convex backend and client types | @@ -94,3 +95,7 @@ If Convex has to live somewhere else, set `PUBLIC_CONVEX_URL` on the container t ## Downloads Check the releases tab for the latest downloads for apps: [Releases](https://git.abunchofknowitalls.com/joshuafhiggins/otunes/releases) + +## Desktop builds + +See [the desktop build guide](apps/desktop/README.md) to package the web player for Windows or Linux. The UI is bundled locally, and users choose their oTunes server before signing in. diff --git a/apps/desktop/README.md b/apps/desktop/README.md new file mode 100644 index 0000000..94b52ee --- /dev/null +++ b/apps/desktop/README.md @@ -0,0 +1,38 @@ +# oTunes desktop + +The Windows and Linux desktop app. It runs stock Electron and serves the web app's static export (`pnpm --filter @otunes/web build:export`) from `http://127.0.0.1:47836`. There is no bundled Node.js server: the UI talks to the selected oTunes server and its Convex backend directly. On first launch, enter the oTunes server domain, then sign in. The address and session are saved in the app's local storage, not compiled into the package. + +For `music.example.com`, Convex connects to `https://convex.music.example.com`. Local hosts follow the mobile convention and use port 3210. The selected server streams audio and serves cover art and avatars. Streams and avatars pass the session token as a `token` query parameter, since the app is on another origin and has no cookie there. The desktop app does not bundle Convex, FFmpeg or a music library. + +Use **Server > Change server** or **Change Server** in the account menu to select another server. Sessions are kept per server; switching clears the cached library data. + +Stock Chromium cannot decode EAC-3, so the player's codec check reports no Dolby Atmos support and the server streams the regular track instead. + +## Run and package + +```sh +pnpm install +pnpm dev:desktop +# Or create installers for this OS, x64 and ARM64: +pnpm build:desktop +# Or a specific target from a Linux host: +pnpm --filter @otunes/desktop build:windows +pnpm --filter @otunes/desktop build:linux +``` + +All of these first build the static export and copy it to `apps/desktop/web`. `pnpm --filter @otunes/desktop build:web` does that step alone. A single instance owns port 47836, so the app's local storage keeps the same origin between launches. + +Packaging writes to `apps/desktop/dist`: an NSIS installer per architecture for Windows, a Flatpak per architecture for Linux. To pick one architecture, pass it after the target: `node scripts/package.mjs linux x64`. Building Windows installers on Linux needs Wine. Flatpaks need flatpak-builder with Flathub added, and ARM64 Flatpaks on an x64 host need `qemu-user-static` registered with binfmt. Installers are unsigned unless you configure electron-builder's signing environment. + +Flatpaks pin `org.freedesktop.Platform`, its SDK and `org.electronjs.Electron2.BaseApp` to `25.08`. Network, audio, graphics and display access are enabled. Home-directory access is not needed. + +## Gitea builds + +`.gitea/workflows/desktop-build.yml` runs manually and on `v*` tags, matching the Docker workflow. Both jobs run on the `ubuntu-latest` Docker runner and upload installers with `actions/upload-artifact@v3`. Tags set the installer version, so use semantic version tags such as `v1.2.3`. Manual runs use the desktop package version. Nothing is published. + +Both jobs use the `electronuserland/builder:wine` container: `windows` builds x64 and ARM64 NSIS installers, and `linux` installs flatpak-builder from apt and builds x64 and ARM64 Flatpaks. + +The Linux job needs two things from the runner host: + +- Privileged job containers, since flatpak-builder sandboxes its build. Set `container.privileged: true` in the runner's config. +- An ARM64 binfmt handler. Register it once with `apt install qemu-user-static` on Debian/Ubuntu, which persists across reboots. diff --git a/apps/desktop/main.cjs b/apps/desktop/main.cjs new file mode 100644 index 0000000..49f5bab --- /dev/null +++ b/apps/desktop/main.cjs @@ -0,0 +1,144 @@ +const { app, BrowserWindow, Menu, nativeTheme, session } = require("electron") +const { createServer } = require("node:http") +const { readFile } = require("node:fs/promises") +const path = require("node:path") + +// The UI is the web app's static export, served on a fixed loopback origin so +// its localStorage (picked server, session) persists between launches. An +// http://127.0.0.1 page is a secure context that can still reach http servers +// on the local network. +const host = "127.0.0.1:47836" +const origin = `http://${host}` +const webRoot = path.join( + app.isPackaged ? process.resourcesPath : __dirname, + "web" +) +const contentTypes = { + ".html": "text/html; charset=utf-8", + ".txt": "text/plain; charset=utf-8", + ".js": "text/javascript; charset=utf-8", + ".css": "text/css; charset=utf-8", + ".json": "application/json", + ".webmanifest": "application/manifest+json", + ".png": "image/png", + ".svg": "image/svg+xml", + ".ico": "image/x-icon", + ".woff2": "font/woff2", +} +let window, server + +// Resolves paths the way static hosts serve a Next.js export: /album is +// album.html, / is index.html, and anything missing is 404.html. +async function serveStatic(request, response) { + if (request.headers.host !== host) return response.writeHead(403).end() + if (request.method !== "GET" && request.method !== "HEAD") + return response.writeHead(405).end() + let pathname + try { + pathname = decodeURIComponent(new URL(request.url, origin).pathname) + } catch { + return response.writeHead(400).end() + } + const relative = pathname.replace(/^\/+|\/+$/g, "") + const candidates = relative + ? [relative, `${relative}.html`, `${relative}/index.html`] + : ["index.html"] + for (const candidate of [...candidates, "404.html"]) { + const file = path.resolve(webRoot, candidate) + if (!file.startsWith(webRoot + path.sep)) continue + try { + const body = await readFile(file) + response.writeHead(candidate === "404.html" ? 404 : 200, { + "Content-Type": + contentTypes[path.extname(file)] ?? "application/octet-stream", + "Cache-Control": file.includes(`${path.sep}_next${path.sep}static`) + ? "public, max-age=31536000, immutable" + : "no-cache", + }) + return response.end(request.method === "HEAD" ? undefined : body) + } catch { + // Try the next candidate. + } + } + response.writeHead(404).end() +} + +function openWindow() { + window = new BrowserWindow({ + title: "oTunes", + width: 1280, + height: 850, + backgroundColor: nativeTheme.shouldUseDarkColors ? "#000000" : "#ffffff", + webPreferences: { + nodeIntegration: false, + contextIsolation: true, + sandbox: true, + webSecurity: true, + }, + }) + window.webContents.setWindowOpenHandler(() => ({ action: "deny" })) + const restrictNavigation = (event, target) => { + if (new URL(target).origin !== origin) event.preventDefault() + } + window.webContents.on("will-navigate", restrictNavigation) + window.webContents.on("will-redirect", restrictNavigation) + session.defaultSession.setPermissionRequestHandler( + (_contents, _permission, callback) => callback(false) + ) + session.defaultSession.setPermissionCheckHandler(() => false) + window.loadURL(`${origin}/`).catch(console.error) + window.on("closed", () => { + window = undefined + }) +} + +if (!app.requestSingleInstanceLock()) app.quit() +else { + app.on("second-instance", () => { + window?.show() + window?.focus() + }) + app + .whenReady() + .then(async () => { + server = createServer((request, response) => { + serveStatic(request, response).catch(() => { + if (!response.headersSent) response.writeHead(500) + response.end() + }) + }) + await new Promise((resolve, reject) => { + server.once("error", reject) + server.listen(47836, "127.0.0.1", resolve) + }) + Menu.setApplicationMenu( + Menu.buildFromTemplate([ + ...(process.platform === "darwin" ? [{ role: "appMenu" }] : []), + { + label: "Server", + submenu: [ + { + label: "Change server…", + click: () => window?.loadURL(`${origin}/server`), + }, + ], + }, + { role: "editMenu" }, + { role: "viewMenu" }, + { role: "windowMenu" }, + ]) + ) + openWindow() + app.on("activate", () => { + if (BrowserWindow.getAllWindows().length === 0) openWindow() + }) + }) + .catch((error) => { + console.error(error) + app.quit() + }) +} +app.on("before-quit", () => server?.close()) +app.on("window-all-closed", () => { + if (process.platform !== "darwin") app.quit() +}) diff --git a/apps/desktop/package.json b/apps/desktop/package.json new file mode 100644 index 0000000..66ce465 --- /dev/null +++ b/apps/desktop/package.json @@ -0,0 +1,20 @@ +{ + "name": "@otunes/desktop", + "version": "0.0.1", + "private": true, + "description": "oTunes desktop client for Windows and Linux", + "author": "oTunes contributors", + "main": "main.cjs", + "scripts": { + "start": "pnpm build:web && electron .", + "build": "pnpm build:web && node scripts/package.mjs", + "build:windows": "pnpm build:web && node scripts/package.mjs windows", + "build:linux": "pnpm build:web && node scripts/package.mjs linux", + "build:web": "node scripts/build-web.mjs", + "typecheck": "node --check main.cjs && node --check scripts/build-web.mjs && node --check scripts/package.mjs" + }, + "devDependencies": { + "electron": "45.3.4", + "electron-builder": "26.18.0" + } +} diff --git a/apps/desktop/scripts/build-web.mjs b/apps/desktop/scripts/build-web.mjs new file mode 100644 index 0000000..fe1aba4 --- /dev/null +++ b/apps/desktop/scripts/build-web.mjs @@ -0,0 +1,24 @@ +import { execFileSync } from "node:child_process" +import { createRequire } from "node:module" +import { cp, rm } from "node:fs/promises" +import path from "node:path" +import { fileURLToPath } from "node:url" + +// Builds the web app's static export and copies it to apps/desktop/web, +// which main.cjs serves and package.mjs ships. +const desktopRoot = fileURLToPath(new URL("../", import.meta.url)) +const web = path.resolve(desktopRoot, "../web") +const webRequire = createRequire(path.join(web, "package.json")) +execFileSync( + process.execPath, + [webRequire.resolve("next/dist/bin/next"), "build"], + { + cwd: web, + stdio: "inherit", + env: { ...process.env, OTUNES_STATIC_EXPORT: "1" }, + } +) + +const destination = path.join(desktopRoot, "web") +await rm(destination, { recursive: true, force: true }) +await cp(path.join(web, "out"), destination, { recursive: true }) diff --git a/apps/desktop/scripts/package.mjs b/apps/desktop/scripts/package.mjs new file mode 100644 index 0000000..b10b005 --- /dev/null +++ b/apps/desktop/scripts/package.mjs @@ -0,0 +1,77 @@ +import { build, Platform, Arch } from "electron-builder" +import { mkdir, copyFile, writeFile, rm, readFile } from "node:fs/promises" +import { createRequire } from "node:module" +import path from "node:path" +import { fileURLToPath } from "node:url" + +// Packages stock Electron with the bundled UI from build-web.mjs. +// Usage: node scripts/package.mjs [windows|linux] [x64|arm64] +// Defaults to the host OS and both architectures. Linux hosts can build both +// targets: Windows needs Wine, ARM64 Flatpaks need qemu-user binfmt. +const desktopRoot = fileURLToPath(new URL("../", import.meta.url)) +const hostTarget = { win32: "windows", linux: "linux" }[process.platform] +const [target = hostTarget, onlyArch] = process.argv.slice(2) +const platform = { windows: Platform.WINDOWS, linux: Platform.LINUX }[target] +if (!platform) throw new Error("Targets are windows or linux") +const architectures = onlyArch ? [onlyArch] : ["x64", "arm64"] +if (!architectures.every((arch) => arch === "x64" || arch === "arm64")) + throw new Error("Architectures are x64 or arm64") + +const staging = path.join(desktopRoot, ".package") +await rm(staging, { recursive: true, force: true }) +await mkdir(staging, { recursive: true }) +await copyFile( + path.join(desktopRoot, "main.cjs"), + path.join(staging, "main.cjs") +) +const pkg = JSON.parse( + await readFile(path.join(desktopRoot, "package.json"), "utf8") +) +const ref = process.env.OTUNES_DESKTOP_REF ?? "" +if (ref.startsWith("refs/tags/")) + pkg.version = ref.slice("refs/tags/".length).replace(/^v/, "") +delete pkg.devDependencies +delete pkg.scripts +await writeFile( + path.join(staging, "package.json"), + JSON.stringify(pkg, null, 2) +) + +const { version: electronVersion } = createRequire(import.meta.url)( + "electron/package.json" +) +// One build per architecture: a multi-arch NSIS build merges both into one installer. +for (const arch of architectures) { + await build({ + targets: platform.createTarget(undefined, Arch[arch]), + config: { + appId: "com.otunes.desktop", + productName: "oTunes", + electronVersion, + artifactName: "oTunes-${version}-${os}-${arch}.${ext}", + icon: path.resolve(desktopRoot, "../web/public/logo.png"), + directories: { app: staging, output: path.join(desktopRoot, "dist") }, + files: ["main.cjs", "package.json"], + extraResources: [ + { from: path.join(desktopRoot, "web"), to: "web", filter: ["**/*"] }, + ], + npmRebuild: false, + win: { target: ["nsis"] }, + linux: { category: "AudioVideo", target: ["flatpak"] }, + flatpak: { + runtimeVersion: "25.08", + baseVersion: "25.08", + finishArgs: [ + "--socket=wayland", + "--socket=fallback-x11", + "--share=ipc", + "--device=dri", + "--socket=pulseaudio", + "--share=network", + ], + }, + publish: null, + }, + publish: "never", + }) +} diff --git a/apps/mobile/lib/server-config.ts b/apps/mobile/lib/server-config.ts index ffa4aa2..692bfb7 100644 --- a/apps/mobile/lib/server-config.ts +++ b/apps/mobile/lib/server-config.ts @@ -1,44 +1,13 @@ -import { buildConvexUrl, isLocalHost } from "@otunes/convex/server-url" +import type { ServerConfig } from "@otunes/convex/server-url" -export type ServerConfig = { - /** Raw hostname the user entered, e.g. `music.example.com` or `192.168.86.25:3000` */ - hostname: string - /** Base URL for the Next.js server, e.g. `https://music.example.com` */ - serverUrl: string - /** Convex deployment URL, e.g. `https://convex.music.example.com` */ - convexUrl: string -} +export { + parseServerHostname, + type ServerConfig, +} from "@otunes/convex/server-url" const SERVER_CONFIG_KEY = "otunes.server-config" const LEGACY_SERVER_CONFIG_KEY = "otunes:server-config" -function normalizeHostnameInput(input: string): string { - return input - .trim() - .replace(/^https?:\/\//i, "") - .replace(/\/+$/, "") -} - -function buildServerUrl(hostname: string): string { - const protocol = isLocalHost(hostname) ? "http" : "https" - return `${protocol}://${hostname}` -} - -export function parseServerHostname(input: string): ServerConfig | null { - const hostname = normalizeHostnameInput(input) - if (!hostname) return null - - try { - const serverUrl = buildServerUrl(hostname) - const convexUrl = buildConvexUrl(hostname) - new URL(serverUrl) - new URL(convexUrl) - return { hostname, serverUrl, convexUrl } - } catch { - return null - } -} - export async function loadServerConfig( getItem: (key: string) => Promise ): Promise { diff --git a/apps/web/app/(app)/[...not-found]/page.tsx b/apps/web/app/(app)/[...not-found]/page.server.tsx similarity index 97% rename from apps/web/app/(app)/[...not-found]/page.tsx rename to apps/web/app/(app)/[...not-found]/page.server.tsx index e31dd2b..a0d3783 100644 --- a/apps/web/app/(app)/[...not-found]/page.tsx +++ b/apps/web/app/(app)/[...not-found]/page.server.tsx @@ -23,7 +23,7 @@ export default function Page() {

+ + ) } diff --git a/apps/web/app/api/album/[id]/cover/route.ts b/apps/web/app/api/album/[id]/cover/route.server.ts similarity index 100% rename from apps/web/app/api/album/[id]/cover/route.ts rename to apps/web/app/api/album/[id]/cover/route.server.ts diff --git a/apps/web/app/api/artist/[id]/cover/route.ts b/apps/web/app/api/artist/[id]/cover/route.server.ts similarity index 100% rename from apps/web/app/api/artist/[id]/cover/route.ts rename to apps/web/app/api/artist/[id]/cover/route.server.ts diff --git a/apps/web/app/api/download/options/route.ts b/apps/web/app/api/download/options/route.server.ts similarity index 98% rename from apps/web/app/api/download/options/route.ts rename to apps/web/app/api/download/options/route.server.ts index 78a27bc..bd2e273 100644 --- a/apps/web/app/api/download/options/route.ts +++ b/apps/web/app/api/download/options/route.server.ts @@ -37,7 +37,7 @@ export async function POST(request: NextRequest) { let songs: Awaited> try { - songs = await getSongSources(songIds) + songs = await getSongSources(songIds, 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.server.ts similarity index 100% rename from apps/web/app/api/playlist/[id]/cover/route.ts rename to apps/web/app/api/playlist/[id]/cover/route.server.ts diff --git a/apps/web/app/api/song/[id]/download/route.ts b/apps/web/app/api/song/[id]/download/route.server.ts similarity index 95% rename from apps/web/app/api/song/[id]/download/route.ts rename to apps/web/app/api/song/[id]/download/route.server.ts index d57d0d0..8c73536 100644 --- a/apps/web/app/api/song/[id]/download/route.ts +++ b/apps/web/app/api/song/[id]/download/route.server.ts @@ -53,9 +53,10 @@ async function transcodeResponse( songId: string, source: string, kbps: number, - signal: AbortSignal + request: NextRequest ) { - const lyrics = await getSongLyrics(songId) + const { signal } = request + const lyrics = await getSongLyrics(songId, request) const lyricsArgs = lyrics && Buffer.byteLength(lyrics) <= MAX_LYRICS_ARGUMENT_BYTES ? ["-metadata", `lyrics=${lyrics}`] @@ -115,7 +116,7 @@ export async function GET( let song: Awaited> try { - song = await getSongSource(id) + song = await getSongSource(id, request) } catch { return new Response("Not found", { status: 404 }) } @@ -128,12 +129,7 @@ export async function GET( try { if (plan.kbps > 0) { - return await transcodeResponse( - song._id, - sourceFile, - plan.kbps, - request.signal - ) + return await transcodeResponse(song._id, sourceFile, plan.kbps, request) } if (plan.source === "lossless") { diff --git a/apps/web/app/api/song/[id]/play/hls/route.ts b/apps/web/app/api/song/[id]/play/hls/route.server.ts similarity index 97% rename from apps/web/app/api/song/[id]/play/hls/route.ts rename to apps/web/app/api/song/[id]/play/hls/route.server.ts index b256834..9459ac5 100644 --- a/apps/web/app/api/song/[id]/play/hls/route.ts +++ b/apps/web/app/api/song/[id]/play/hls/route.server.ts @@ -15,7 +15,7 @@ export async function GET( const { id } = await params try { - const song = await getSongSource(id) + const song = await getSongSource(id, request) const quality = request.nextUrl.searchParams.get("quality") const preferAtmos = 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.server.ts similarity index 97% rename from apps/web/app/api/song/[id]/play/hls/segment/[segment]/route.ts rename to apps/web/app/api/song/[id]/play/hls/segment/[segment]/route.server.ts index 597f68d..a89ee07 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.server.ts @@ -35,7 +35,7 @@ export async function GET( const preferAtmos = request.nextUrl.searchParams.get("preferAtmos") === "true" // Resolve the source even when a job is cached so every segment is authorized. - const song = await getSongSource(id) + const song = await getSongSource(id, request) const job = getExistingHlsJob(id, quality, preferAtmos) ?? (await ensureHlsJob(song, quality, preferAtmos)) diff --git a/apps/web/app/api/song/[id]/play/route.ts b/apps/web/app/api/song/[id]/play/route.server.ts similarity index 99% rename from apps/web/app/api/song/[id]/play/route.ts rename to apps/web/app/api/song/[id]/play/route.server.ts index d1f7bac..093a658 100644 --- a/apps/web/app/api/song/[id]/play/route.ts +++ b/apps/web/app/api/song/[id]/play/route.server.ts @@ -120,7 +120,7 @@ export async function GET( const { browser } = userAgent(request) try { - const song = await getSongSource(id) + const song = await getSongSource(id, request) const { source: originalCodec, diff --git a/apps/web/app/api/user/[id]/avatar/route.ts b/apps/web/app/api/user/[id]/avatar/route.server.ts similarity index 100% rename from apps/web/app/api/user/[id]/avatar/route.ts rename to apps/web/app/api/user/[id]/avatar/route.server.ts diff --git a/apps/web/app/layout.tsx b/apps/web/app/layout.tsx index 27199c8..37a5dae 100644 --- a/apps/web/app/layout.tsx +++ b/apps/web/app/layout.tsx @@ -37,8 +37,11 @@ async function hostedUrl() { } } +const staticExport = process.env.OTUNES_STATIC_EXPORT === "1" + export async function generateMetadata(): Promise { - const url = await hostedUrl() + // Static exports have no request to read the host from. + const url = staticExport ? undefined : await hostedUrl() return { title: "oTunes", @@ -70,6 +73,13 @@ export default function RootLayout({ }: Readonly<{ children: React.ReactNode }>) { + const content = ( + + {children} + + + ) + return ( - - - - {children} - - - - + {staticExport ? ( + {content} + ) : ( + + {content} + + )} ) diff --git a/apps/web/app/manifest.ts b/apps/web/app/manifest.ts index 8388694..34d8c30 100644 --- a/apps/web/app/manifest.ts +++ b/apps/web/app/manifest.ts @@ -1,5 +1,7 @@ import type { MetadataRoute } from "next" +export const dynamic = "force-static" + export default function manifest(): MetadataRoute.Manifest { return { name: "oTunes", diff --git a/apps/web/app/server/page.tsx b/apps/web/app/server/page.tsx new file mode 100644 index 0000000..589e14e --- /dev/null +++ b/apps/web/app/server/page.tsx @@ -0,0 +1,9 @@ +import { notFound } from "next/navigation" + +import { ServerForm } from "@/components/server-form" + +export default function ServerPage() { + // The server build is the server; only desktop apps pick one. + if (process.env.OTUNES_STATIC_EXPORT !== "1") notFound() + return +} diff --git a/apps/web/components/add-to-playlist-provider.tsx b/apps/web/components/add-to-playlist-provider.tsx index 5cc1ad8..d81133c 100644 --- a/apps/web/components/add-to-playlist-provider.tsx +++ b/apps/web/components/add-to-playlist-provider.tsx @@ -1,5 +1,7 @@ "use client" +import { playlistPath } from "@/lib/routes" + import * as React from "react" import { useConvex, useMutation, useQuery } from "convex/react" import { useRouter } from "next/navigation" @@ -256,7 +258,7 @@ export function AddToPlaylistProvider({ setNewPlaylistName("") setPendingSongIds([]) if (count === 0) { - router.push(`/playlist/${playlistId}`) + router.push(playlistPath(playlistId)) } } catch (error) { toast.error( diff --git a/apps/web/components/album-card.tsx b/apps/web/components/album-card.tsx index 082516a..28b4987 100644 --- a/apps/web/components/album-card.tsx +++ b/apps/web/components/album-card.tsx @@ -1,5 +1,7 @@ "use client" +import { albumPath, artistPath } from "@/lib/routes" + import * as React from "react" import Image from "next/image" import Link from "next/link" @@ -123,7 +125,7 @@ export function AlbumCard({ album }: { album: BrowseAlbum }) { onMouseEnter={() => setHovered(true)} onMouseLeave={() => setHovered(false)} > - + {album.title}
- +

{album.title}

{album.artist.name}

diff --git a/apps/web/components/album-view.tsx b/apps/web/components/album-view.tsx index 34ec288..cfaa3e7 100644 --- a/apps/web/components/album-view.tsx +++ b/apps/web/components/album-view.tsx @@ -1,5 +1,7 @@ "use client" +import { artistPath } from "@/lib/routes" + import { PageHeader } from "@/components/library-skeletons" import * as React from "react" import Image from "next/image" @@ -287,7 +289,7 @@ export function AlbumView({ {album.title} {album.artist.name} diff --git a/apps/web/components/app-sidebar.tsx b/apps/web/components/app-sidebar.tsx index e8c9729..f309127 100644 --- a/apps/web/components/app-sidebar.tsx +++ b/apps/web/components/app-sidebar.tsx @@ -1,5 +1,8 @@ "use client" +import { playlistPath } from "@/lib/routes" +import { serverUrl, staticExport } from "@/lib/server" + import { ArrowDownToLine, Disc3, @@ -10,11 +13,12 @@ import { Mic, Music2, Search, + Server, Settings, Star, } from "lucide-react" -import { usePathname, useRouter } from "next/navigation" +import { usePathname, useRouter, useSearchParams } from "next/navigation" import dynamic from "next/dynamic" import { useAuthActions } from "@convex-dev/auth/react" @@ -43,6 +47,7 @@ import Image from "next/image" import Link from "next/link" import { useTheme } from "next-themes" import * as React from "react" +import { Suspense } from "react" import { api } from "@otunes/convex/_generated/api" import { playlistCoverUrl } from "@/lib/cover-urls" import { useCachedQuery } from "@/hooks/use-cached-query" @@ -109,7 +114,7 @@ export function AppSidebar() { ...(sidebarPlaylists?.subscribed ?? []), ].map((playlist) => ({ title: playlist.title, - path: `/playlist/${playlist.id}`, + path: playlistPath(playlist.id), icon: playlist.cover ? ( // eslint-disable-next-line @next/next/no-img-element -- versioned cover, already sized by the route Playlists - - {playlistNav.map((item) => ( - - - setOpenMobile(false)}> - {item.icon} - {item.title} - - - - ))} - + setOpenMobile(false)} + /> + } + > + setOpenMobile(false)} + /> + @@ -220,7 +227,10 @@ export function AppSidebar() { {user?.image ? ( - + ) : null} {fallbackLetters} @@ -243,6 +253,15 @@ export function AppSidebar() { Options + {staticExport ? ( + router.push("/server")} + > + Change Server + + + ) : null} {optionsOpen ? ( @@ -255,3 +274,46 @@ export function AppSidebar() { ) } + +type NavItem = { title: string; path: string; icon: React.ReactNode } + +// Playlist routes differ only by `?id=`. Reading the query needs a Suspense +// boundary in static exports, so the fallback matches on the path alone. +function CurrentPlaylistMenu(props: { + items: NavItem[] + onNavigate: () => void +}) { + const pathname = usePathname() + const query = useSearchParams().toString() + return ( + + ) +} + +function PlaylistMenu({ + items, + route, + onNavigate, +}: { + items: NavItem[] + route: string + onNavigate: () => void +}) { + return ( + + {items.map((item) => ( + + + + {item.icon} + {item.title} + + + + ))} + + ) +} diff --git a/apps/web/components/artist-card.tsx b/apps/web/components/artist-card.tsx index c66a788..d5d9c11 100644 --- a/apps/web/components/artist-card.tsx +++ b/apps/web/components/artist-card.tsx @@ -1,5 +1,7 @@ "use client" +import { artistPath } from "@/lib/routes" + import Image from "next/image" import Link from "next/link" @@ -11,7 +13,7 @@ export function ArtistCard({ artist }: { artist: BrowseArtist }) {
- +

{artist.name}

diff --git a/apps/web/components/artists-page.tsx b/apps/web/components/artists-page.tsx index 744ab95..ae89d11 100644 --- a/apps/web/components/artists-page.tsx +++ b/apps/web/components/artists-page.tsx @@ -1,6 +1,6 @@ "use client" -import { usePathname } from "next/navigation" +import { useSearchParams } from "next/navigation" import { useCallback } from "react" import { ArtistsView } from "@/components/artists-view" @@ -8,20 +8,17 @@ import { ArtistsSkeleton, PageHeader } from "@/components/library-skeletons" import { useCachedQuery } from "@/hooks/use-cached-query" import { api } from "@otunes/convex/_generated/api" -const ARTISTS_PATH = "/library/artists" - -function artistIdFromPathname(pathname: string) { - const [, id] = pathname.slice(ARTISTS_PATH.length).split("/") - return id ? decodeURIComponent(id) : undefined -} - export function ArtistsPage() { - const pathname = usePathname() + const artistId = useSearchParams().get("id") ?? undefined const artists = useCachedQuery(api.library.browseArtists) const albums = useCachedQuery(api.library.browseAlbums) const selectArtist = useCallback((artistId: string) => { - window.history.pushState(null, "", `${ARTISTS_PATH}/${artistId}`) + window.history.pushState( + null, + "", + `/library/artists?${new URLSearchParams({ id: artistId })}` + ) }, []) return ( @@ -34,7 +31,7 @@ export function ArtistsPage() { )} diff --git a/apps/web/components/artists-view.tsx b/apps/web/components/artists-view.tsx index f10b361..46e71df 100644 --- a/apps/web/components/artists-view.tsx +++ b/apps/web/components/artists-view.tsx @@ -1,5 +1,7 @@ "use client" +import { artistPath } from "@/lib/routes" + import * as React from "react" import Image from "next/image" import Link from "next/link" @@ -155,7 +157,7 @@ export function ArtistsView({
{selectedArtist.name} diff --git a/apps/web/components/auth-form.tsx b/apps/web/components/auth-form.tsx index 65d6a38..bcab4be 100644 --- a/apps/web/components/auth-form.tsx +++ b/apps/web/components/auth-form.tsx @@ -53,27 +53,16 @@ const copy: Record< }, } -export function AuthForm({ - flow, - accountCreationDisabled, -}: { - flow: AuthFlow - accountCreationDisabled: boolean -}) { +export function AuthForm({ flow }: { flow: AuthFlow }) { const { signIn } = useAuthActions() const router = useRouter() const [error, setError] = useState(null) const [submitting, setSubmitting] = useState(false) const text = copy[flow] - const signupsDisabled = flow === "signUp" && accountCreationDisabled - const hideSignUpLink = flow === "signIn" && accountCreationDisabled async function handleSubmit(event: React.FormEvent) { event.preventDefault() - if (signupsDisabled) { - return - } setError(null) setSubmitting(true) @@ -100,71 +89,62 @@ export function AuthForm({ {text.description} - {signupsDisabled ? ( -

- New account registration is currently disabled. Contact an - administrator if you need access. -

- ) : ( -
- - {flow === "signUp" && ( - - Name - - - )} + + + {flow === "signUp" && ( - Email + Name - - Password - - - {error && {error}} - - - - {!hideSignUpLink ? ( -

- {text.switchPrompt}{" "} - - {text.switchLabel} - -

- ) : null} -
- - )} + )} + + Email + + + + Password + + + {error && {error}} + + + +

+ {text.switchPrompt}{" "} + + {text.switchLabel} + +

+
+
) diff --git a/apps/web/components/auth-redirect.tsx b/apps/web/components/auth-redirect.tsx new file mode 100644 index 0000000..e10d668 --- /dev/null +++ b/apps/web/components/auth-redirect.tsx @@ -0,0 +1,27 @@ +"use client" + +import { useConvexAuth } from "convex/react" +import { usePathname, useRouter } from "next/navigation" +import { useEffect } from "react" + +// Media pages that signed-out visitors can open from share links. +const PUBLIC_PATHS = new Set(["/album", "/artist", "/playlist"]) + +/** + * Static exports have no proxy, so this keeps signed-out users on the auth + * pages and signed-in users off them. Server builds redirect in proxy.server.ts. + */ +export function AuthRedirect({ area }: { area: "app" | "auth" }) { + const { isAuthenticated, isLoading } = useConvexAuth() + const pathname = usePathname() + const router = useRouter() + + useEffect(() => { + if (isLoading) return + if (area === "auth" && isAuthenticated) router.replace("/") + if (area === "app" && !isAuthenticated && !PUBLIC_PATHS.has(pathname)) + router.replace("/signin") + }, [area, isAuthenticated, isLoading, pathname, router]) + + return null +} diff --git a/apps/web/components/convex-client-provider.tsx b/apps/web/components/convex-client-provider.tsx index 5f9416c..ea18356 100644 --- a/apps/web/components/convex-client-provider.tsx +++ b/apps/web/components/convex-client-provider.tsx @@ -1,11 +1,19 @@ "use client" import { ConvexAuthNextjsProvider } from "@convex-dev/auth/nextjs" +import { ConvexAuthProvider, useAuthToken } from "@convex-dev/auth/react" import { buildConvexUrl } from "@otunes/convex/server-url" import { ConvexReactClient } from "convex/react" -import { ReactNode } from "react" +import { usePathname, useRouter } from "next/navigation" +import { ReactNode, useEffect } from "react" import { PersistentCacheProvider } from "@/components/persistent-cache-provider" +import { + selectedServer, + setMediaToken, + staticExport, + useSelectedServer, +} from "@/lib/server" // Server rendering never runs Convex queries, so this URL is never contacted. const SSR_CONVEX_URL = "http://127.0.0.1:3210" @@ -17,29 +25,50 @@ function browserConvexUrl() { return buildConvexUrl(host, protocol === "https:" ? "https" : "http") } -function getConvexClient(convexUrl: string | undefined) { - if (!client) { - client = new ConvexReactClient( - typeof window === "undefined" - ? SSR_CONVEX_URL - : (convexUrl ?? - process.env.NEXT_PUBLIC_CONVEX_URL ?? - browserConvexUrl()) - ) - } +function getConvexClient(convexUrl: string) { + client ??= new ConvexReactClient(convexUrl) return client } -export function ConvexClientProvider({ - convexUrl, - children, -}: { - convexUrl?: string - children: ReactNode -}) { +export function ConvexClientProvider({ children }: { children: ReactNode }) { + if (staticExport) return {children} + const url = + typeof window === "undefined" + ? SSR_CONVEX_URL + : (process.env.NEXT_PUBLIC_CONVEX_URL ?? browserConvexUrl()) return ( - - {children}{" "} + + {children} ) } + +// Static exports pick a server at /server first. With no Next.js server to +// hold the session in cookies, tokens live in localStorage, keyed by the +// Convex URL, as in the mobile app. Changing servers reloads the page. +function ExportProviders({ children }: { children: ReactNode }) { + const server = useSelectedServer() + const pathname = usePathname() + const router = useRouter() + const onServerPage = pathname === "/server" + + useEffect(() => { + if (!onServerPage && !selectedServer()) router.replace("/server") + }, [onServerPage, router]) + + if (onServerPage) return children + if (!server) return null + return ( + + + {children} + + ) +} + +function MediaTokenSync() { + const token = useAuthToken() + // Set during render so players created in this commit see the new token. + setMediaToken(token) + return null +} diff --git a/apps/web/components/downloads-provider.tsx b/apps/web/components/downloads-provider.tsx index 802c119..0e177ff 100644 --- a/apps/web/components/downloads-provider.tsx +++ b/apps/web/components/downloads-provider.tsx @@ -18,6 +18,7 @@ import { Label } from "@/components/ui/label" import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group" import { useCachedQuery } from "@/hooks/use-cached-query" import { useDownloadsVersion } from "@/hooks/use-downloads" +import { authedUrl } from "@/lib/server" import { downloadQueue, readRememberedDownloadQuality, @@ -78,7 +79,7 @@ export function useDownloads() { } async function fetchDownloadOptions(songIds: string[]) { - const response = await fetch(DOWNLOAD_OPTIONS_PATH, { + const response = await fetch(authedUrl(DOWNLOAD_OPTIONS_PATH), { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify({ songIds }), diff --git a/apps/web/components/media-context-menu.tsx b/apps/web/components/media-context-menu.tsx index aa1610b..5e8b77a 100644 --- a/apps/web/components/media-context-menu.tsx +++ b/apps/web/components/media-context-menu.tsx @@ -1,5 +1,7 @@ "use client" +import { albumPath, artistPath } from "@/lib/routes" + import * as React from "react" import Link from "next/link" import { @@ -165,7 +167,7 @@ export function MediaContextMenuItems({ {artist ? ( - + Go to Artist @@ -173,7 +175,7 @@ export function MediaContextMenuItems({ ) : null} {album ? ( - + Go to Album diff --git a/apps/web/components/open-app-button.tsx b/apps/web/components/open-app-button.tsx index 32fff6f..0c8d24c 100644 --- a/apps/web/components/open-app-button.tsx +++ b/apps/web/components/open-app-button.tsx @@ -2,10 +2,20 @@ import { ArrowUpRight } from "lucide-react" +import { serverOrigin } from "@/lib/server" + export function OpenAppButton() { function openApp() { const link = new URL("otunes://open") - link.searchParams.set("url", window.location.href) + // The app understands share links (/album/), not in-app /album?id=. + const { pathname, search } = window.location + const page = new URL(`${pathname}${search}`, serverOrigin()) + const id = page.searchParams.get("id") + if (id && /^\/(album|artist|playlist)$/.test(page.pathname)) { + page.pathname += `/${encodeURIComponent(id)}` + page.searchParams.delete("id") + } + link.searchParams.set("url", page.href) window.location.assign(link.href) } diff --git a/apps/web/components/options-modal.tsx b/apps/web/components/options-modal.tsx index 36f12df..2cb67ff 100644 --- a/apps/web/components/options-modal.tsx +++ b/apps/web/components/options-modal.tsx @@ -1,5 +1,7 @@ "use client" +import { serverUrl } from "@/lib/server" + import { useAction, useMutation, useQuery } from "convex/react" import { MoreHorizontal, Trash2, Upload, UserPlus } from "lucide-react" import { useCallback, useEffect, useRef, useState } from "react" @@ -149,7 +151,9 @@ function UserAvatar({ key={user.image ?? "fallback"} size={size === "sm" ? "sm" : "default"} > - {user.image ? : null} + {user.image ? ( + + ) : null} {initials} ) diff --git a/apps/web/components/playback-provider.tsx b/apps/web/components/playback-provider.tsx index c1cbe71..0c38da6 100644 --- a/apps/web/components/playback-provider.tsx +++ b/apps/web/components/playback-provider.tsx @@ -1,5 +1,7 @@ "use client" +import { authedUrl } from "@/lib/server" + import { useState, useEffect, @@ -354,15 +356,11 @@ function loadAudioSource( } const { settings } = source - const directUrl = songPlayPath( - songId, - settings.playbackQuality, - settings.preferAtmos + const directUrl = authedUrl( + songPlayPath(songId, settings.playbackQuality, settings.preferAtmos) ) - const hlsUrl = songHlsPlaylistPath( - songId, - settings.playbackQuality, - settings.preferAtmos + const hlsUrl = authedUrl( + songHlsPlaylistPath(songId, settings.playbackQuality, settings.preferAtmos) ) const loadDirectSource = () => { diff --git a/apps/web/components/playback-song-meta.tsx b/apps/web/components/playback-song-meta.tsx index 4e10831..6de3566 100644 --- a/apps/web/components/playback-song-meta.tsx +++ b/apps/web/components/playback-song-meta.tsx @@ -1,3 +1,4 @@ +import { albumPath, artistPath } from "@/lib/routes" import Link from "next/link" import type { BrowseSong } from "@otunes/convex/types" @@ -24,7 +25,7 @@ export function PlaybackSongMeta({ )} > {song.album.title} diff --git a/apps/web/components/player-bar.tsx b/apps/web/components/player-bar.tsx index 764bca0..ed5ec8e 100644 --- a/apps/web/components/player-bar.tsx +++ b/apps/web/components/player-bar.tsx @@ -1,5 +1,7 @@ "use client" +import { albumPath, artistPath } from "@/lib/routes" + import * as React from "react" import Image from "next/image" import Link from "next/link" @@ -184,21 +186,21 @@ export function PlayerBar() {
{currentSong.title}

{currentSong.artist.name} · {currentSong.album.title} diff --git a/apps/web/components/playlist-card.tsx b/apps/web/components/playlist-card.tsx index 2b1e71c..d815064 100644 --- a/apps/web/components/playlist-card.tsx +++ b/apps/web/components/playlist-card.tsx @@ -1,5 +1,7 @@ "use client" +import { playlistPath } from "@/lib/routes" + import Image from "next/image" import Link from "next/link" @@ -79,7 +81,7 @@ export function PlaylistCard({ playlist }: { playlist: PlaylistSummary }) { return (

- + {playlist.title}
- +

{playlist.title}

diff --git a/apps/web/components/search-song-item.tsx b/apps/web/components/search-song-item.tsx index 94100c1..30cfc78 100644 --- a/apps/web/components/search-song-item.tsx +++ b/apps/web/components/search-song-item.tsx @@ -2,6 +2,8 @@ import { useDownloads } from "@/components/downloads-provider" import { useSongDownloadState } from "@/hooks/use-downloads" +import { albumPath, artistPath } from "@/lib/routes" + import Image from "next/image" import Link from "next/link" import { useAddToPlaylist } from "@/components/add-to-playlist-provider" @@ -81,7 +83,7 @@ export function SearchSongItem({ song }: { song: SearchSong }) {

- +

{song.title}

{song.artist.name}

diff --git a/apps/web/components/search-top-result-card.tsx b/apps/web/components/search-top-result-card.tsx index 0d9065c..a3bcc8b 100644 --- a/apps/web/components/search-top-result-card.tsx +++ b/apps/web/components/search-top-result-card.tsx @@ -1,5 +1,7 @@ "use client" +import { albumPath, artistPath } from "@/lib/routes" + import Image from "next/image" import Link from "next/link" @@ -12,11 +14,11 @@ export type TopResult = SearchTopResultItem function resultHref(result: TopResult) { switch (result.kind) { case "song": - return `/album/${result.item.album.id}` + return albumPath(result.item.album.id) case "album": - return `/album/${result.item.id}` + return albumPath(result.item.id) case "artist": - return `/artist/${result.item.id}` + return artistPath(result.item.id) } } diff --git a/apps/web/components/server-form.tsx b/apps/web/components/server-form.tsx new file mode 100644 index 0000000..64e99c6 --- /dev/null +++ b/apps/web/components/server-form.tsx @@ -0,0 +1,115 @@ +"use client" + +import { useState, type FormEvent } from "react" +import Image from "next/image" +import { Button } from "@/components/ui/button" +import { Input } from "@/components/ui/input" +import { + Field, + FieldError, + FieldGroup, + FieldLabel, +} from "@/components/ui/field" +import { clearPersistentCache } from "@/lib/persistent-cache" +import { saveServer, selectedServer } from "@/lib/server" +import { parseServerHostname } from "@otunes/convex/server-url" + +// Picks the oTunes server for static exports (desktop apps). Saving reloads +// the app so Convex connects to the new server. +export function ServerForm() { + const [address, setAddress] = useState(() => selectedServer()?.hostname ?? "") + const [error, setError] = useState(null) + const [submitting, setSubmitting] = useState(false) + + async function connect(event: FormEvent) { + event.preventDefault() + const server = parseServerHostname(address) + if (!server) { + setError("Enter a hostname, like music.example.com.") + return + } + setError(null) + setSubmitting(true) + try { + // Opaque, but it fails when the Convex server cannot be reached. + await fetch(`${server.convexUrl}/version`, { + mode: "no-cors", + signal: AbortSignal.timeout(10000), + }) + } catch { + setError("Could not reach the server. Check the address and try again.") + setSubmitting(false) + return + } + if (server.convexUrl !== selectedServer()?.convexUrl) + await clearPersistentCache() + saveServer(server) + window.location.replace("/signin") + } + + return ( +
+ +
+
+

+ Connect to a server +

+ + + Server address + setAddress(event.target.value)} + placeholder="music.example.com" + autoCapitalize="none" + autoCorrect="off" + spellCheck={false} + autoComplete="url" + required + disabled={submitting} + aria-invalid={!!error} + aria-describedby={error ? "server-error" : undefined} + /> + {error && ( + + {error} + + )} + + + +
+
+
+ ) +} diff --git a/apps/web/components/track-row.tsx b/apps/web/components/track-row.tsx index c732512..d8ae7a8 100644 --- a/apps/web/components/track-row.tsx +++ b/apps/web/components/track-row.tsx @@ -1,5 +1,7 @@ "use client" +import { albumPath, artistPath } from "@/lib/routes" + import * as React from "react" import Image from "next/image" import Link from "next/link" @@ -398,7 +400,7 @@ function TrackRowComponent({
event.stopPropagation()} > @@ -407,7 +409,7 @@ function TrackRowComponent({
event.stopPropagation()} > diff --git a/apps/web/lib/cover-urls.ts b/apps/web/lib/cover-urls.ts index 8585295..9027ea3 100644 --- a/apps/web/lib/cover-urls.ts +++ b/apps/web/lib/cover-urls.ts @@ -1,7 +1,9 @@ +import { serverUrl } from "@/lib/server" + export type CoverImageSize = 64 | 128 | 192 | 256 | 384 | 512 | 768 | 1024 function withCoverImageSize(uri: string, size?: CoverImageSize) { - return size ? `${uri}?size=${size}` : uri + return serverUrl(size ? `${uri}?size=${size}` : uri) } export function artistCoverUrl(artistId: string, size?: CoverImageSize) { diff --git a/apps/web/lib/dolby-atmos-support.ts b/apps/web/lib/dolby-atmos-support.ts index bc633e4..6dc4b7f 100644 --- a/apps/web/lib/dolby-atmos-support.ts +++ b/apps/web/lib/dolby-atmos-support.ts @@ -1,4 +1,4 @@ -const EC3_MIME = 'audio/x-m4a; codecs="ec-3"' +const EC3_MIMES = ['audio/mp4; codecs="ec-3"', 'audio/x-m4a; codecs="ec-3"'] const AC4_MIME = 'audio/x-m4a; codecs="ac-4"' function canPlayMime(audio: HTMLAudioElement, mime: string): boolean { @@ -6,5 +6,8 @@ function canPlayMime(audio: HTMLAudioElement, mime: string): boolean { } export function supportsDolbyAtmosPlayback(audio: HTMLAudioElement): boolean { - return canPlayMime(audio, EC3_MIME) || canPlayMime(audio, AC4_MIME) + return ( + EC3_MIMES.some((mime) => canPlayMime(audio, mime)) || + canPlayMime(audio, AC4_MIME) + ) } diff --git a/apps/web/lib/downloads.ts b/apps/web/lib/downloads.ts index 06c6c99..925388b 100644 --- a/apps/web/lib/downloads.ts +++ b/apps/web/lib/downloads.ts @@ -12,6 +12,8 @@ import { songDownloadPath, type DownloadQuality, } from "@otunes/convex/download-quality" +import { albumPath, playlistPath } from "@/lib/routes" +import { authedUrl, serverUrl, staticExport } from "@/lib/server" // Like YouTube Music on the web, downloads live in this browser's IndexedDB // and only play inside the app. Clearing site data removes them. @@ -38,21 +40,22 @@ export const OTHER_DOWNLOADS_PATH = "/library/downloads/other" export const FROM_DOWNLOADS_PARAM = "from=downloads" export function downloadedCollectionPath({ kind, id }: DownloadedCollection) { - if (kind === "album") return `/album/${id}?${FROM_DOWNLOADS_PARAM}` if (id === FAVORITES_ID) return `/playlist/favorites?${FROM_DOWNLOADS_PARAM}` - return `/playlist/${id}?${FROM_DOWNLOADS_PARAM}` + const path = kind === "album" ? albumPath(id) : playlistPath(id) + return `${path}&${FROM_DOWNLOADS_PARAM}` } // Saved pages are specific to the signed-in user (public/downloads-sw.js). const OFFLINE_PAGE_CACHE = "otunes-offline-pages" /** - * Lets downloaded covers show offline. In production builds the worker also - * keeps pages and app code so the app opens offline. + * Lets downloaded covers show offline. In production server builds the worker + * also keeps pages and app code so the app opens offline. Static exports are + * served locally, so they always open. */ export function registerDownloadsServiceWorker() { const url = - process.env.NODE_ENV === "production" + process.env.NODE_ENV === "production" && !staticExport ? "/downloads-sw.js?offline-app" : "/downloads-sw.js" void navigator.serviceWorker?.register(url, { scope: "/" }).catch(() => {}) @@ -123,9 +126,12 @@ const storage: DownloadStorage = { ) }, async save({ songId, requested, quality, albumId }, signal) { - const response = await fetch(songDownloadPath(songId, requested), { - signal, - }) + const response = await fetch( + authedUrl(songDownloadPath(songId, requested)), + { + signal, + } + ) if (!response.ok) { throw new Error(`Download failed with ${response.status}`) } @@ -142,7 +148,7 @@ const storage: DownloadStorage = { const cache = await caches.open(COVER_CACHE) const key = coverPath(cover) if (await cache.match(key)) return - const response = await fetch(`${key}?size=${COVER_SIZE}`) + const response = await fetch(serverUrl(`${key}?size=${COVER_SIZE}`)) if (!response.ok) throw new Error(`Cover failed with ${response.status}`) await cache.put(key, response) }, diff --git a/apps/web/lib/media-links.ts b/apps/web/lib/media-links.ts index cb112c8..ebe9089 100644 --- a/apps/web/lib/media-links.ts +++ b/apps/web/lib/media-links.ts @@ -1,4 +1,5 @@ import { toast } from "sonner" +import { serverOrigin } from "@/lib/server" import { mediaShareUrl, type MediaShareTarget, @@ -7,9 +8,7 @@ import { export type MediaShareContext = MediaShareTarget export async function copyMediaShareLink(share: MediaShareContext) { - await navigator.clipboard.writeText( - mediaShareUrl(window.location.origin, share) - ) + await navigator.clipboard.writeText(mediaShareUrl(serverOrigin(), share)) toast.success("Link Copied") } diff --git a/apps/web/lib/routes.ts b/apps/web/lib/routes.ts new file mode 100644 index 0000000..c040b66 --- /dev/null +++ b/apps/web/lib/routes.ts @@ -0,0 +1,17 @@ +// In-app routes pass ids as query parameters so the UI can be a static export. +// Share links keep the `/album/` form (see mediaShareUrl), which only the +// server build serves, with link-preview metadata. + +export function albumPath(albumId: string, songId?: string) { + const query = new URLSearchParams({ id: albumId }) + if (songId) query.set("s", songId) + return `/album?${query}` +} + +export function artistPath(artistId: string) { + return `/artist?${new URLSearchParams({ id: artistId })}` +} + +export function playlistPath(playlistId: string) { + return `/playlist?${new URLSearchParams({ id: playlistId })}` +} diff --git a/apps/web/lib/server-song.ts b/apps/web/lib/server-song.ts index 1a2bc8b..9294201 100644 --- a/apps/web/lib/server-song.ts +++ b/apps/web/lib/server-song.ts @@ -2,15 +2,29 @@ import { convexAuthNextjsToken } from "@convex-dev/auth/nextjs/server" import { api } from "@otunes/convex/_generated/api" import type { Doc, Id } from "@otunes/convex/_generated/dataModel" import { fetchQuery } from "convex/nextjs" +import type { NextRequest } from "next/server" 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. + * The listener's session, from the cookie or from a `token` query parameter + * (static exports on another origin). */ -export async function getSongSource(id: string): Promise { - const token = await convexAuthNextjsToken() +async function sessionToken(request: NextRequest) { + return ( + request.nextUrl.searchParams.get("token") ?? (await convexAuthNextjsToken()) + ) +} + +/** + * Loads a song's file paths as the requesting listener, so Convex enforces + * auth. Throws when signed out or missing. + */ +export async function getSongSource( + id: string, + request: NextRequest +): Promise { + const token = await sessionToken(request) const song = await fetchQuery( api.library.getSongSource, { id: id as Id<"songs"> }, @@ -23,8 +37,11 @@ export async function getSongSource(id: string): Promise { } /** The song's stored lyrics tag, or null without lyrics. */ -export async function getSongLyrics(id: string): Promise { - const token = await convexAuthNextjsToken() +export async function getSongLyrics( + id: string, + request: NextRequest +): Promise { + const token = await sessionToken(request) return await fetchQuery( api.lyrics.forSong, { id: id as Id<"songs"> }, @@ -36,9 +53,10 @@ const SOURCE_BATCH_SIZE = 200 /** `getSongSource` for many songs, in batches. Missing songs are left out. */ export async function getSongSources( - ids: string[] + ids: string[], + request: NextRequest ): Promise<(SongSource & Pick, "album">)[]> { - const token = await convexAuthNextjsToken() + const token = await sessionToken(request) const batches: string[][] = [] for (let start = 0; start < ids.length; start += SOURCE_BATCH_SIZE) { batches.push(ids.slice(start, start + SOURCE_BATCH_SIZE)) diff --git a/apps/web/lib/server.ts b/apps/web/lib/server.ts new file mode 100644 index 0000000..8717088 --- /dev/null +++ b/apps/web/lib/server.ts @@ -0,0 +1,65 @@ +import type { ServerConfig } from "@otunes/convex/server-url" +import { useSyncExternalStore } from "react" + +// The server build is served by the oTunes server, so media paths stay +// relative and the session cookie authenticates them. Static exports (desktop +// apps) are served locally and talk to a server the user picks at runtime. +export const staticExport = process.env.OTUNES_STATIC_EXPORT === "1" + +const SERVER_KEY = "otunes.server" + +function readServer(): ServerConfig | null { + if (!staticExport || typeof window === "undefined") return null + try { + return JSON.parse(localStorage.getItem(SERVER_KEY) ?? "null") + } catch { + return null + } +} + +let server = readServer() + +export function selectedServer() { + return server +} + +export function saveServer(config: ServerConfig) { + localStorage.setItem(SERVER_KEY, JSON.stringify(config)) + server = config +} + +const noop = () => () => {} + +/** The picked server in static exports. `null` while prerendering. */ +export function useSelectedServer() { + return useSyncExternalStore(noop, selectedServer, () => null) +} + +/** Origin of the oTunes server, for share links. */ +export function serverOrigin() { + return server?.serverUrl ?? window.location.origin +} + +/** Resolves an `/api/...` path against the oTunes server. */ +export function serverUrl(path: string) { + return server ? `${server.serverUrl}${path}` : path +} + +let mediaToken: string | null = null + +/** Kept current by the auth provider in static exports. */ +export function setMediaToken(token: string | null) { + mediaToken = token +} + +/** + * URL for a route that needs a session (songs, downloads). `