diff --git a/README.md b/README.md index be49736..34b5a45 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,9 @@ # Sonda +**This repository has moved.** Development continues at +[git.kmalloc.org/squid/sonda](https://git.kmalloc.org/squid/sonda); this +Codeberg mirror is archived and read-only. + Sonda is a privacy-first, self-hosted music server written in Go. It streams the music you already own, from your own disks, and keeps everything it knows about you on your own machine. It is a single executable, one database (SQLite by default, PostgreSQL if you prefer) and the folders that hold your music. There is no Redis, no message broker and no cloud account. @@ -390,7 +394,7 @@ Back up the database and `sonda.toml`. Your music stays wherever you keep it. ## Web app -A web client lives in `web/` (React, Vite and shadcn/ui). It talks only to the Sonda server: no CDN, no external fonts, no analytics. With the app built into the binary (`make build`, or the Docker image) `sondad` serves it: open the address of the server, for example `http://127.0.0.1:8080`, and sign in. The page carries a strict Content-Security-Policy (only resources of the server itself, no inline scripts), cannot be framed and sends no referrer, and a link inside the app (`/admin/users`) works when you reload it. The player draws a live picture of what is playing, in the browser, from the sound itself (Web Audio). Settings has a choice for it, kept on the device: a spectrogram (the last seconds, low notes at the bottom, the default), the classic bars with falling caps, an oscilloscope, Milkdrop, or nothing. The bars, the oscilloscope and the spectrogram take the colour of this server or, for a friend's song, the colour of the friend. Milkdrop fills the background of the full-screen player with the pictures Winamp made famous, drawn on the device with [butterchurn](https://github.com/jberg/butterchurn) (MIT) and its presets, which are part of the app: nothing is fetched from outside. It is loaded only when chosen, and anyone who asked the system for less motion gets the spectrogram instead, because the pictures flash. The player listens to the sound and changes nothing of it, and draws only while something plays. +A web client lives in `web/` (React, Vite and shadcn/ui). It talks only to the Sonda server: no CDN, no external fonts, no analytics. With the app built into the binary (`make build`, or the Docker image) `sondad` serves it: open the address of the server, for example `http://127.0.0.1:8080`, and sign in. The page carries a strict Content-Security-Policy (only resources of the server itself, no inline scripts), cannot be framed and sends no referrer, and a link inside the app (`/admin/users`) works when you reload it. The player draws a live picture of what is playing, in the browser, from the sound itself (Web Audio). Settings has a choice for it, kept on the device: a spectrogram (the last seconds, low notes at the bottom, the default), the classic bars with falling caps, an oscilloscope, Milkdrop, or nothing. The bars, the oscilloscope and the spectrogram take the colour of this server or, for a friend's song, the colour of the friend. Milkdrop fills the background of the full-screen player with the pictures Winamp made famous, drawn on the device with [butterchurn](https://github.com/jberg/butterchurn) (MIT) and its presets, which are part of the app: nothing is fetched from outside. It is loaded only when chosen, and anyone who asked the system for less motion gets the spectrogram instead, because the pictures flash. The player listens to the sound and changes nothing of it, and draws only while something plays. On a phone the player is one row at the foot of the page (and is not there while nothing plays); a tap or a swipe up opens the full-screen player, a swipe down or the Back gesture closes it, and the lock screen shows the song with its seek bar and follows play and pause. The queue is kept in the browser, so a page that is reloaded, or a tab that Android throws away, comes back paused on the same song at the same second. To work on the interface itself, run the Vite dev server next to a running `sondad` (set `SONDA_URL` to where it listens: the default is `http://127.0.0.1:8080`): diff --git a/web/index.html b/web/index.html index b6c7099..243714a 100644 --- a/web/index.html +++ b/web/index.html @@ -9,7 +9,7 @@ - + Sonda diff --git a/web/src/auth/AuthGate.tsx b/web/src/auth/AuthGate.tsx index 7f5fe51..7b24792 100644 --- a/web/src/auth/AuthGate.tsx +++ b/web/src/auth/AuthGate.tsx @@ -9,7 +9,7 @@ export default function AuthGate({ children }: { children: ReactNode }) { const { t } = useTranslation() if (status === 'loading') { - return
+ return
} if (status === 'anonymous') return return <>{children} diff --git a/web/src/auth/LoginPage.tsx b/web/src/auth/LoginPage.tsx index 3f225b9..1ad513e 100644 --- a/web/src/auth/LoginPage.tsx +++ b/web/src/auth/LoginPage.tsx @@ -31,7 +31,7 @@ export default function LoginPage() { } return ( -
+

{creating ? t('auth.registerTitle') : t('auth.signInTitle')}

diff --git a/web/src/components/Cover.test.tsx b/web/src/components/Cover.test.tsx index 7b610e0..207f55a 100644 --- a/web/src/components/Cover.test.tsx +++ b/web/src/components/Cover.test.tsx @@ -16,7 +16,7 @@ function placeholder(container: HTMLElement) { test('a cover asks for the album cover of the API', () => { const { container } = render() const img = container.querySelector('img')! - expect(img.getAttribute('src')).toBe('/api/v1/albums/12/cover') + expect(img.getAttribute('src')).toBe('/api/v1/albums/12/cover?size=small') expect(img).toHaveAttribute('loading', 'lazy') expect(img).toHaveAttribute('alt', '') expect(placeholder(container)).toBeNull() @@ -25,9 +25,9 @@ test('a cover asks for the album cover of the API', () => { test('the cover URL carries the access token and follows it when it changes', () => { sessionStore.setState({ accessToken: 'tok1' }) const { container } = render() - expect(container.querySelector('img')!.getAttribute('src')).toBe('/api/v1/albums/12/cover?access_token=tok1') + expect(container.querySelector('img')!.getAttribute('src')).toBe('/api/v1/albums/12/cover?size=small&access_token=tok1') act(() => sessionStore.setState({ accessToken: 'tok2' })) - expect(container.querySelector('img')!.getAttribute('src')).toBe('/api/v1/albums/12/cover?access_token=tok2') + expect(container.querySelector('img')!.getAttribute('src')).toBe('/api/v1/albums/12/cover?size=small&access_token=tok2') }) test('a cover that fails to load is replaced by the placeholder', () => { @@ -116,3 +116,10 @@ test('a cover that cannot be loaded falls back to the rings, and the picture hid expect(placeholder(container)).not.toBeNull() expect(container.querySelector('img')).toBeNull() }) + +test('a big cover asks for the full picture, a friend’s cover for the only one the friend has', () => { + const big = render() + expect(big.container.querySelector('img')!.getAttribute('src')).toBe('/api/v1/albums/12/cover') + const friend = render() + expect(friend.container.querySelector('img')!.getAttribute('src')).toBe('/api/v1/friends/3/albums/12/cover') +}) diff --git a/web/src/components/Cover.tsx b/web/src/components/Cover.tsx index 1ce7bca..92e1d1c 100644 --- a/web/src/components/Cover.tsx +++ b/web/src/components/Cover.tsx @@ -19,10 +19,14 @@ const RINGS = [ { size: '68%', opacity: 0.3 }, ] as const +/** Up to this size (CSS pixels) a cover is drawn from the small picture. */ +const SMALL_UP_TO = 150 + /** The cover of an album, or the rings of Sonda when there is none (or it cannot be loaded). */ export default function Cover({ albumId, friend, size, fluid = false }: CoverProps) { useAccessToken() // the URL carries the token, so it has to follow a renewal - const src = albumId === null ? null : mediaUrl(coverPath(friend, albumId)) + // A thumbnail asks for the small picture: a phone does not need to fetch 1000 pixels to draw 56. + const src = albumId === null ? null : mediaUrl(coverPath(friend, albumId, size <= SMALL_UP_TO)) // A failure is remembered for this URL only: a renewed token makes a new URL, which is tried again. const [failed, setFailed] = useState(null) const showImage = src !== null && failed !== src @@ -36,7 +40,16 @@ export default function Cover({ albumId, friend, size, fluid = false }: CoverPro className="relative shrink-0 overflow-hidden rounded-sm bg-muted" > {showImage ? ( - setFailed(src)} /> + window.matchMedia?.('(pointer: coarse)').matches && e.preventDefault()} + className="size-full object-cover" + onError={() => setFailed(src)} + /> ) : (