forked from Furumi/furumi-web
Compare commits
17
Commits
No files matched your search
@@ -48,4 +48,5 @@ jobs:
|
||||
push: ${{ github.event_name != 'pull_request' }}
|
||||
tags: ${{ steps.meta.outputs.docker_tags }}
|
||||
cache-from: type=registry,ref=${{ env.IMAGE_NAME }}:buildcache
|
||||
# Export intermediate stages, including cargo-chef's compiled dependencies.
|
||||
cache-to: type=registry,ref=${{ env.IMAGE_NAME }}:buildcache,mode=max
|
||||
@@ -1,5 +1,32 @@
|
||||
# Changelog
|
||||
|
||||
## v0.13.0 — 2026-11-19
|
||||
|
||||
- Use the shared `music-dht` 0.6 device-sync types and announce device-sync
|
||||
protocol 4. Podcast operations and snapshot sections from other devices are
|
||||
kept and relayed; devices below protocol 4 never receive them.
|
||||
- Keep podcast episodes and other non-library queue items through the web
|
||||
player, with their explicit source. The player labels and skips them; the
|
||||
typed queue is stored next to `queue_json` (migrations `m_0054`, `m_0055`).
|
||||
A handoff through the web player keeps the position of the current episode.
|
||||
- Refuse a playback transfer of a queue with podcast episodes to a device that
|
||||
needs an update, and ignore its playback commands while the queue has them.
|
||||
- Store the protocol version each device reports itself instead of this
|
||||
server's version; invites carry the inviter's version.
|
||||
- An episode that the web player selects without knowing its position (Next,
|
||||
auto-advance, a click) resumes from its synchronized progress on the next
|
||||
device instead of restarting at 0. Repeat all and shuffle continue past
|
||||
episodes; Prev and seeking work on them.
|
||||
- Jam guests see podcast episodes of the host as private items, without their
|
||||
duration, and cannot add, remove or clear them; the host browser enforces
|
||||
this on its own queue. Guests do not keep the placeholders after the Jam.
|
||||
- Metadata Repair can still undo deletions recorded before the typed queue
|
||||
column was added.
|
||||
- Rolling back to 0.12 requires removing the relayed podcast operations first;
|
||||
see "Rolling back to 0.12" in `docs/administration.md`. After a rollback, the
|
||||
typed queue is used again only if 0.12 left the queue and its current track
|
||||
unchanged.
|
||||
|
||||
## v0.10.6 — 2026-09-02
|
||||
|
||||
- Recover federation automatically after sleep, prolonged idle, or a degraded rendezvous transport.
|
||||
Generated
+4
-6
@@ -1843,8 +1843,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "federation-net"
|
||||
version = "0.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "01e5c2e6e5af020dc202d4924125ef57719aa21f8d2567e2d943914386bc8980"
|
||||
source = "git+https://gt.hexor.cy/Sanapach/frid.git?branch=podcasts%2Fcontract#65d6ca2f14a1324dc129b90694da83ceb55c60dc"
|
||||
dependencies = [
|
||||
"blake3",
|
||||
"data-encoding",
|
||||
@@ -1988,7 +1987,7 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
|
||||
|
||||
[[package]]
|
||||
name = "furumusic"
|
||||
version = "0.12.2"
|
||||
version = "0.13.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-stream",
|
||||
@@ -3900,9 +3899,8 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "music-dht"
|
||||
version = "0.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4c3f75d49d3a742a6777a1c4cc53f397399dfc9ddb70034c57aeb44d75d2ee4f"
|
||||
version = "0.6.0"
|
||||
source = "git+https://gt.hexor.cy/Sanapach/frid.git?branch=podcasts%2Fcontract#65d6ca2f14a1324dc129b90694da83ceb55c60dc"
|
||||
dependencies = [
|
||||
"async-trait",
|
||||
"blake3",
|
||||
|
||||
+12
-2
@@ -1,9 +1,15 @@
|
||||
[package]
|
||||
name = "furumusic"
|
||||
version = "0.12.2"
|
||||
version = "0.13.0"
|
||||
edition = "2024"
|
||||
description = "Reusable web-app boilerplate: auth, OIDC/SSO, admin panel, user management, i18n, PostgreSQL"
|
||||
|
||||
# Unoptimized dependencies overflow macOS compact unwind's 24-bit DWARF offset
|
||||
# (16 MiB of __eh_frame). Keep dependency code small while leaving application
|
||||
# code unoptimized and retaining debug symbols, assertions and panic unwinding.
|
||||
[profile.dev.package."*"]
|
||||
opt-level = 1
|
||||
|
||||
# macOS 27 rejects some stripped proc-macro dylibs with a misaligned LINKEDIT
|
||||
# string pool. Build scripts and proc macros are compile-time artifacts only.
|
||||
[profile.release.build-override]
|
||||
@@ -50,4 +56,8 @@ uuid = "1"
|
||||
librqbit = { version = "8.1.1", features = ["disable-upload"] }
|
||||
# P2P federation: publishes the library into a shared DHT and serves audio /
|
||||
# catalogs to furumi peers (TUI clients) over the frid stack.
|
||||
music-dht = "0.5.0"
|
||||
music-dht = "0.6.0"
|
||||
|
||||
[patch.crates-io]
|
||||
# Unpublished frid (MR-F1); remove once music-dht 0.6.0 is on crates.io.
|
||||
music-dht = { git = "https://gt.hexor.cy/Sanapach/frid.git", branch = "podcasts/contract" }
|
||||
+16
-3
@@ -1,18 +1,31 @@
|
||||
FROM rust:1-bookworm AS builder
|
||||
FROM rust:1.97.0-bookworm AS chef
|
||||
|
||||
RUN apt-get update \
|
||||
&& apt-get install -y --no-install-recommends pkg-config libssl-dev ca-certificates \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
RUN cargo install cargo-chef --version 0.1.74 --locked
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
COPY Cargo.toml Cargo.lock* ./
|
||||
FROM chef AS planner
|
||||
COPY Cargo.toml Cargo.lock ./
|
||||
COPY build.rs ./build.rs
|
||||
COPY src ./src
|
||||
RUN cargo chef prepare --recipe-path recipe.json
|
||||
|
||||
FROM chef AS builder
|
||||
COPY --from=planner /app/recipe.json ./recipe.json
|
||||
# Keep compiled dependencies in an ordinary layer exported by CI's registry cache.
|
||||
RUN cargo chef cook --release --locked --recipe-path recipe.json
|
||||
|
||||
COPY Cargo.toml Cargo.lock ./
|
||||
COPY build.rs ./build.rs
|
||||
COPY prompts ./prompts
|
||||
COPY src ./src
|
||||
COPY templates ./templates
|
||||
|
||||
RUN cargo build --release
|
||||
RUN cargo build --release --locked --bin furumusic
|
||||
|
||||
FROM denoland/deno:bin-2.8.3 AS deno
|
||||
|
||||
|
||||
@@ -2,229 +2,52 @@
|
||||
|
||||
**Your library. Your users. Your network.**
|
||||
|
||||
Furumusic is a self-hosted, multi-user music server with a full web player and
|
||||
support for the Furumi federated network. It turns a collection of music files
|
||||
into a shared library that is available from any modern browser, while every
|
||||
user keeps their own playlists, likes, listening history, and playback state.
|
||||
Furumusic is a self-hosted music server with a full web player. Bring your music,
|
||||
share a library with friends, and keep your own playlists, likes, and listening
|
||||
history. Listen from a desktop or phone, or connect independent servers through
|
||||
the Furumi federated network.
|
||||
|
||||
Music can be uploaded directly, imported from a `.torrent` file, or downloaded
|
||||
from a magnet link. An optional AI-assisted import pipeline reads the available
|
||||
tags and path information, reconstructs inconsistent metadata, finds artwork,
|
||||
and organizes the result into artists, releases, and tracks. Uncertain matches
|
||||
are kept for review instead of silently entering the library with bad data.
|
||||
## What you can do
|
||||
|
||||
## Why Furumusic?
|
||||
- **Listen anywhere.** Browse artists and releases, search your collection, build
|
||||
queues, and manage playlists in a responsive web player.
|
||||
- **Bring your collection.** Upload files and folders, or import music from
|
||||
YouTube, torrents, and magnet links directly into your library or a playlist.
|
||||
- **Organize your music.** Optional AI assistance recognizes metadata, finds
|
||||
artwork, and helps repair messy releases. Review proposed changes before
|
||||
applying them.
|
||||
- **Share a song.** Send a track or queue link that anyone can play and download
|
||||
without creating an account.
|
||||
- **Welcome your people.** Use password login or SSO. Instance admins can approve
|
||||
new users without needing access to the identity provider.
|
||||
- **Discover more.** Find similar tracks and connect Last.fm for scrobbling.
|
||||
- **Connect your players.** Pair trusted Furumi devices to synchronize playlists,
|
||||
likes, playback state, and playback controls.
|
||||
- **Join a network.** Discover and stream music from other participating peers
|
||||
while keeping your own library independent.
|
||||
- **Manage from any screen.** Review imports, manage users and background tasks,
|
||||
and explore listening statistics in a desktop and mobile admin console.
|
||||
|
||||
Furumusic is for a household, a small community, or anyone who wants one music
|
||||
library without handing it to a subscription service. The server owns the
|
||||
catalog and media files; the browser is only the player.
|
||||
AI assistance, federation, similarity search, Last.fm, and SSO are optional.
|
||||
You choose which features to enable.
|
||||
|
||||
- one shared library with separate user accounts;
|
||||
- a responsive web player with artists, releases, search, queue, and playlists;
|
||||
- direct file uploads and imports from YouTube, torrent files, or magnet links;
|
||||
- optional AI-assisted recognition and normalization of metadata;
|
||||
- password login or OIDC/SSO with group-based access control;
|
||||
- optional federation without a central catalog or search service;
|
||||
- trusted-device pairing, playback handoff, and synchronization between Furumi
|
||||
players;
|
||||
- Last.fm scrobbling and similarity-based discovery when configured.
|
||||
## Quick start
|
||||
|
||||
Furumusic does not include music. Import only media you are allowed to store and
|
||||
share.
|
||||
|
||||
## Importing music
|
||||
|
||||
Users can add audio files from the web interface or ask the server to download
|
||||
selected files from a torrent. Both routes feed the same import pipeline, so a
|
||||
library remains consistent regardless of where its files came from.
|
||||
|
||||
The importer combines embedded tags, filenames, folder structure, and existing
|
||||
catalog context. With an OpenAI-compatible language model configured, it can
|
||||
normalize artist and release names, separate featured artists, recover track
|
||||
numbers and release types, and flag ambiguous results for a user to approve.
|
||||
Cover art is taken from nearby image files or embedded artwork when available.
|
||||
|
||||
The inbox and permanent library are separate directories. New files are first
|
||||
processed in the inbox and are moved into the organized library only after
|
||||
their metadata has been accepted.
|
||||
|
||||
## Federation
|
||||
|
||||
Federation is optional. Independent Furumusic and Furumi players that use the
|
||||
same Network ID discover one another as a logical network. Each peer keeps its
|
||||
own library and can continue working alone.
|
||||
|
||||
When federation is enabled, local and remote artists, releases, and tracks can
|
||||
appear in the same search and library views. Missing audio is streamed from an
|
||||
available peer and can optionally be retained locally. Similarity search also
|
||||
stays decentralized: embeddings and exact ranking remain on the instance that
|
||||
owns the music.
|
||||
|
||||
Trusted-device pairing is separate from public catalog discovery. It connects
|
||||
a user's own Furumi players so likes, playlists, playback state, and control can
|
||||
move between approved devices.
|
||||
|
||||
## Build and run
|
||||
|
||||
Furumusic requires PostgreSQL and a Rust toolchain with Rust 2024 edition
|
||||
support. Create an empty database, provide its connection URL, and start the
|
||||
server:
|
||||
With Rust and PostgreSQL installed, create an empty database and start the server:
|
||||
|
||||
```bash
|
||||
export FURU_DATABASE_URL='postgresql://furumusic:password@127.0.0.1/furumusic'
|
||||
cargo run --release --locked
|
||||
```
|
||||
|
||||
Open <http://127.0.0.1:8000/admin/setup> to create the first administrator.
|
||||
After setup, configure the inbox and library directories under **Admin →
|
||||
Settings** before importing music.
|
||||
Open <http://127.0.0.1:8000/admin/setup> to create your administrator account,
|
||||
then configure the inbox and music library directories in **Admin → Settings**.
|
||||
|
||||
To listen on another address or port:
|
||||
## Documentation
|
||||
|
||||
```bash
|
||||
cargo run --release --locked -- -l 0.0.0.0:8000
|
||||
```
|
||||
- [Installation and configuration](docs/setup.md)
|
||||
- [Using and administering Furumusic](docs/administration.md)
|
||||
- [Development, architecture, and tests](docs/development.md)
|
||||
- [Admin UI conventions](docs/admin-ui.md)
|
||||
|
||||
A Nix development shell is included for Linux and macOS:
|
||||
|
||||
```bash
|
||||
nix develop
|
||||
cargo run --locked
|
||||
```
|
||||
|
||||
The repository also contains a multi-stage `Dockerfile` for building a small
|
||||
runtime image. A deployment must provide PostgreSQL plus persistent, writable
|
||||
volumes for the inbox and music library.
|
||||
|
||||
## Admin statistics
|
||||
|
||||
The only admin interface is `/admin/v2`, also reachable from `/admin/`.
|
||||
**Statistics** shows listening totals, a timeline, artist/track/release rankings,
|
||||
and paginated history. Select an artist or track to see its listeners, then a
|
||||
listener to see their history within the same filters. The **Users** list links
|
||||
to each user's full statistics.
|
||||
|
||||
Periods use UTC. Counts come from the synchronized `listen_event` history: a
|
||||
natural finish, half of a track, or four minutes qualifies as a play. Interrupted
|
||||
sessions under five seconds are not retained. Short retained sessions contribute
|
||||
to listened time but not play counts. The source filter separates this instance
|
||||
from synchronized devices. Artist rankings use recorded artist names, including
|
||||
featured credits; the same artist is counted once per event. Existing history
|
||||
remains available when its local audio file is deleted. Library and service
|
||||
cards show current instance totals, independently of the listening filters.
|
||||
|
||||
Migration `m_0051_add_listen_statistics_indexes` adds time and content indexes.
|
||||
The old admin pages and `/admin/debug` are removed; first-run setup remains at
|
||||
`/admin/setup`.
|
||||
|
||||
Regression checks:
|
||||
|
||||
```bash
|
||||
node --test tests/*.test.cjs
|
||||
cargo test admin:: -- --skip postgres_statistics_drilldown_and_pagination
|
||||
# Use a disposable PostgreSQL; this test creates connection-local temporary tables.
|
||||
FURU_STATISTICS_TEST_DATABASE_URL=postgresql://... cargo test postgres_statistics_drilldown_and_pagination -- --ignored
|
||||
```
|
||||
|
||||
`tests/browser-statistics.cjs` additionally exercises a fresh disposable instance
|
||||
at `FURU_TEST_URL` (default `http://127.0.0.1:3018`) and seeds the disposable Docker
|
||||
container `furumi-statistics-test-pg`. It requires Playwright (or
|
||||
`PLAYWRIGHT_MODULE`) and Chrome (or `CHROME_PATH`). Never point this test at a
|
||||
live service.
|
||||
|
||||
## Importing into playlists
|
||||
|
||||
The player's download manager offers **Add downloads to a playlist** for file
|
||||
and folder uploads and torrents, as well as YouTube. Choose an existing owned
|
||||
playlist or create one before starting; leaving the choice empty imports only
|
||||
into the library. Selected audio tracks are appended after processing or manual
|
||||
approval, including files resolved to tracks already in the library.
|
||||
|
||||
Migration `m_0052_add_import_playlist_destinations` persists the destination and
|
||||
completion receipts. Retries and restarts retain the choice, avoid duplicates,
|
||||
and do not re-add tracks subsequently removed by the user. A started batch keeps
|
||||
its destination for its remaining files.
|
||||
|
||||
```bash
|
||||
node --test tests/import_playlists.test.cjs
|
||||
# Disposable PostgreSQL; both tests use temporary tables.
|
||||
FURU_IMPORT_TEST_DATABASE_URL=postgresql://... cargo test import_destinations -- --ignored
|
||||
FURU_IMPORT_TEST_DATABASE_URL=postgresql://... cargo test torrent_playlist -- --ignored
|
||||
```
|
||||
|
||||
`tests/browser-import-playlists.cjs` checks the file upload flow, database
|
||||
reconciliation and the torrent picker on desktop and mobile. It requires a fresh
|
||||
migrated instance with the import agent disabled at `FURU_TEST_URL` (default
|
||||
`http://127.0.0.1:3019`), the disposable PostgreSQL container
|
||||
`furumi-import-playlist-test-pg` with database `furumi_import_test`, and Playwright
|
||||
and Chrome configured as above. It uses a local torrent preview fixture and
|
||||
simulated imported tracks, without downloading external torrents.
|
||||
|
||||
## Configuration
|
||||
|
||||
Most settings can be changed from the administration interface. Every setting
|
||||
also has a `FURU_`-prefixed environment variable; environment values take
|
||||
priority over values stored in PostgreSQL.
|
||||
|
||||
The settings needed for a useful first installation are:
|
||||
|
||||
| Setting | Purpose |
|
||||
| --- | --- |
|
||||
| `FURU_DATABASE_URL` | PostgreSQL connection URL; required to run the service |
|
||||
| `FURU_AGENT_INBOX_DIR` | Temporary inbox for uploads and downloaded files |
|
||||
| `FURU_AGENT_STORAGE_DIR` | Permanent, organized music library |
|
||||
| `FURU_AGENT_ENABLED` | Enables the background metadata import pipeline |
|
||||
| `FURU_AGENT_LLM_URL` | Base URL of an OpenAI-compatible model server |
|
||||
| `FURU_AGENT_LLM_MODEL` | Model used to recognize and normalize metadata |
|
||||
| `FURU_FEDERATION_ENABLED` | Publishes the library and enables peer discovery |
|
||||
| `FURU_FEDERATION_NETWORK_ID` | Joins peers with the same value into one logical network |
|
||||
|
||||
AI recognition, federation, similarity search, Last.fm, and OIDC are optional.
|
||||
A local password-authenticated server can be used without any of them.
|
||||
|
||||
## Architecture
|
||||
|
||||
Furumusic is written in Rust on the
|
||||
[Cot](https://cot.rs) web framework. PostgreSQL stores the catalog, accounts,
|
||||
playlists, configuration, and background-job state. Audio inspection uses
|
||||
Symphonia, torrent downloads use librqbit, and the shared `music-dht`/Frid
|
||||
protocol stack provides decentralized catalog search, media transfer, and
|
||||
connected-device synchronization.
|
||||
|
||||
The browser interface and JSON API are served by the same application. Import,
|
||||
artwork, metadata enrichment, similarity indexing, and maintenance run as
|
||||
durable background jobs rather than blocking playback requests.
|
||||
|
||||
The `lastfm_popularity` job defaults to **light** mode: it requests popularity
|
||||
only for tracks without a completed lookup or with a changed title or primary
|
||||
artist. Both matches (including zero counts) and explicit Last.fm “Track not
|
||||
found” results are skipped on subsequent light runs. HTTP errors, timeouts,
|
||||
invalid responses, and other API errors remain eligible for retry. A failed
|
||||
full refresh also makes that track eligible for the next light run.
|
||||
|
||||
Choose **Full: refresh all visible tracks** in the task's admin parameters to
|
||||
refresh existing statistics and retry previous misses. The options endpoint
|
||||
`POST /admin/v2/api/jobs/lastfm_popularity/run-options` accepts
|
||||
`{"refresh_existing": true}`; an empty object, scheduled runs, and the ordinary
|
||||
run endpoint use light mode. Neither mode limits the number of tracks processed.
|
||||
An authoritative miss clears current statistics while preserving their history.
|
||||
The migration preserves existing popularity; legacy misses need one more lookup
|
||||
because older versions did not persist them.
|
||||
|
||||
## Contributing
|
||||
|
||||
Bug reports, design discussions, and patches are welcome. Before submitting a
|
||||
change, run:
|
||||
|
||||
```bash
|
||||
cargo fmt --all -- --check
|
||||
cargo clippy --all-targets -- -D warnings
|
||||
cargo test --all-targets
|
||||
```
|
||||
|
||||
Last.fm database tests use temporary tables on a disposable PostgreSQL database:
|
||||
|
||||
```bash
|
||||
FURUMUSIC_LASTFM_TEST_DATABASE_URL=postgres://user:pass@localhost/test_db \
|
||||
cargo test lastfm_popularity -- --include-ignored
|
||||
```
|
||||
Bug reports, ideas, and contributions are welcome.
|
||||
@@ -0,0 +1,100 @@
|
||||
# Admin interface conventions
|
||||
|
||||
[Project overview](../README.md) · [Development](development.md)
|
||||
|
||||
The admin UI uses one Alpine application and shared layout primitives for every
|
||||
section. Add features to this model rather than introducing a separate mobile
|
||||
page or section-specific navigation.
|
||||
|
||||
## Ownership
|
||||
|
||||
- `templates/admin/navigation.html`: the single navigation tree, grouped into
|
||||
Operations (reviews/tasks), Music (library/tools/statistics), and Instance
|
||||
(users/settings). Existing hash routes remain the source of navigation state.
|
||||
- `templates/admin/styles.html`: colors, typography and component appearance.
|
||||
- `templates/admin/responsive.html`: shared layout, breakpoints, touch targets,
|
||||
scroll regions, table cards and dialog sizing. Put responsive rules here.
|
||||
- `templates/admin/ui.html`: viewport state, task tabs, settings navigation and
|
||||
the shared overlay lifecycle. Business data and API actions remain in
|
||||
`adminV2()` in `v2.html`.
|
||||
|
||||
## Layout
|
||||
|
||||
| Width | Navigation | Workspaces | Lists and dialogs |
|
||||
| --- | --- | --- | --- |
|
||||
| 1280 px and above | Persistent sidebar | Task list/detail/log side by side | Tables, centered bounded dialogs |
|
||||
| 1024–1279 px | Persistent sidebar | Task tabs; settings in one column | Tables, bounded dialogs |
|
||||
| 768–1023 px | Drawer | Task tabs; settings section picker | Tables in contained scroll areas |
|
||||
| Below 768 px | Drawer | Single column | Table cards, full viewport dialogs |
|
||||
|
||||
Keep CSS and `matchMedia` breakpoints in `ui.html` synchronized. The main panel
|
||||
owns page scrolling. Use `minmax(0, 1fr)` and `min-width:0` for grid/flex children;
|
||||
never restore a global minimum page width. The top bar stays available while
|
||||
content scrolls. Navigation closes after route changes and when switching to
|
||||
the desktop layout. It retains the active section and the existing URL routes.
|
||||
|
||||
Use `.panel`, `.panel-head`, `.panel-title`, `.toolbar`, `.action-strip`, `.field`
|
||||
and `.editor-grid` for new content. Toolbars wrap, inputs fill available space,
|
||||
and mobile controls use 44 px touch targets and 16 px input text. Long identifiers,
|
||||
paths and names must wrap. Avoid fixed column widths and inline grid definitions.
|
||||
|
||||
For tabular lists, add `.responsive-table`, a `data-label` to every cell, and
|
||||
`data-primary` to its identifying cell. Mobile CSS presents the same DOM as cards;
|
||||
do not duplicate rows or hide actions. Give clickable row titles real buttons
|
||||
using `.row-link`, so the operation also works with a keyboard. Dense comparisons,
|
||||
charts and logs may scroll inside a named, keyboard-focusable region; horizontal
|
||||
scrolling must never propagate to the page. Keep these exceptions intentional.
|
||||
|
||||
Task tabs change presentation only: configuration and selected run stay in memory
|
||||
when switching tabs or rotating the device. In settings, add a section ID and a
|
||||
matching entry to the section picker. Put related controls in `.settings-grid`.
|
||||
|
||||
## Dialogs
|
||||
|
||||
Every dialog uses the same hierarchy and lifecycle:
|
||||
|
||||
```html
|
||||
<div class="modal-backdrop" x-show="exampleOpen"
|
||||
x-effect="adminOverlay.sync($el, !!exampleOpen)"
|
||||
@keydown="adminOverlay.keydown($event, $el)"
|
||||
@click.self="closeExample()">
|
||||
<section class="modal" role="dialog" aria-modal="true"
|
||||
aria-labelledby="example-title" tabindex="-1">
|
||||
<div class="modal-head">
|
||||
<strong id="example-title">Edit item</strong>
|
||||
<button class="icon-btn" data-dialog-close
|
||||
aria-label="Close dialog" @click="closeExample()">…</button>
|
||||
</div>
|
||||
<form class="modal-body" @submit.prevent="saveExample()">
|
||||
<!-- .field and .editor-grid -->
|
||||
<div class="dialog-actions"><button type="submit" class="btn primary">Save</button></div>
|
||||
</form>
|
||||
</section>
|
||||
</div>
|
||||
```
|
||||
|
||||
The helper locks the background with `inert`, moves focus into the dialog, traps
|
||||
Tab/Shift+Tab, handles Escape through the existing close button, and restores
|
||||
focus on close. Keep business rules in the close handler and disable that button
|
||||
when closing is not allowed (for example, while merging). Nested pickers consume
|
||||
Escape with `.stop` before the dialog handles it. Headers remain fixed while the
|
||||
body scrolls; `.dialog-actions` keeps actions available at the bottom. On mobile,
|
||||
dialogs use `100dvh` and safe-area padding. Reuse the helper for new overlays.
|
||||
|
||||
For content gated by an asynchronous load inside an animated dialog, use
|
||||
`:hidden="loading"` instead of nesting competing `x-show` transitions. Loading
|
||||
and content should not both stay hidden when a response arrives during opening.
|
||||
|
||||
## Verification
|
||||
|
||||
Run `node --test tests/*.test.cjs` and build the Rust application (templates are
|
||||
compiled into the binary). `tests/browser-admin-responsive.cjs` checks all seven
|
||||
sections at 320, 390, 768, 1024 and 1440 px, navigation focus, task state retention,
|
||||
settings jumps, all five dialogs, long content and landscape geometry. It uses a
|
||||
disposable running instance with an admin and at least one release containing a
|
||||
track; browser fixtures do not modify server data. Supply `FURU_TEST_URL`,
|
||||
`FURU_TEST_USERNAME`, `FURU_TEST_PASSWORD`, `PLAYWRIGHT_MODULE`, and `CHROME_PATH`
|
||||
as appropriate. Set `FURU_TEST_SCREENSHOTS` to inspect screenshots visually.
|
||||
|
||||
Check both populated and empty views, long names/paths, loading states, keyboard
|
||||
navigation, reachable Save/Close controls, and resize while an overlay is open.
|
||||
@@ -0,0 +1,156 @@
|
||||
# Using and administering Furumusic
|
||||
|
||||
[Project overview](../README.md) · [Installation](setup.md) · [Development and tests](development.md)
|
||||
|
||||
## Access and public sharing
|
||||
|
||||
OIDC identifies accounts by issuer and subject. Matching admin groups take
|
||||
precedence over matching user groups, and either SSO grant takes precedence over
|
||||
a local role. Without matching groups (including an empty group configuration),
|
||||
a new account waits for approval in **Admin → Users**. Any instance administrator
|
||||
can approve it as a user or administrator. The waiting page updates automatically.
|
||||
On subsequent SSO logins the group grant is refreshed: if it disappears, only an
|
||||
independently assigned local role preserves access. Existing password accounts
|
||||
keep their local roles; existing OIDC-only accounts retain their last SSO grant
|
||||
until the next login, without receiving an implicit local approval.
|
||||
|
||||
Sharing creates an unguessable `/share/{token}` link to a snapshot of track IDs,
|
||||
including their order and repetitions. Guests and accounts awaiting approval can
|
||||
play and download only the tracks in that snapshot, using the regular player.
|
||||
They cannot browse the library, search, use recommendations, or write personal
|
||||
history. Signing in from a share returns to that share; signing in from the root
|
||||
shows only the approval page until access is granted. Track info offers a browser
|
||||
download of the original audio file. The old radio implementation is removed.
|
||||
|
||||
Migration `m_0053_local_approval_and_public_shares` deletes the old share records.
|
||||
Old track/release/playlist URL routes are removed, with no compatibility layer.
|
||||
Link expiry, cleanup, and revocation are not part of this implementation.
|
||||
|
||||
## Importing music
|
||||
|
||||
Users can add audio files from the web interface or ask the server to download
|
||||
selected files from a torrent. Both routes feed the same import pipeline, so a
|
||||
library remains consistent regardless of where its files came from.
|
||||
|
||||
The importer combines embedded tags, filenames, folder structure, and existing
|
||||
catalog context. With an OpenAI-compatible language model configured, it can
|
||||
normalize artist and release names, separate featured artists, recover track
|
||||
numbers and release types, and flag ambiguous results for a user to approve.
|
||||
Cover art is taken from nearby image files or embedded artwork when available.
|
||||
|
||||
The inbox and permanent library are separate directories. New files are first
|
||||
processed in the inbox and are moved into the organized library only after
|
||||
their metadata has been accepted.
|
||||
|
||||
## Importing into playlists
|
||||
|
||||
The player's download manager offers **Add downloads to a playlist** for file
|
||||
and folder uploads and torrents, as well as YouTube. Choose an existing owned
|
||||
playlist or create one before starting; leaving the choice empty imports only
|
||||
into the library. Selected audio tracks are appended after processing or manual
|
||||
approval, including files resolved to tracks already in the library.
|
||||
|
||||
Migration `m_0052_add_import_playlist_destinations` persists the destination and
|
||||
completion receipts. Retries and restarts retain the choice, avoid duplicates,
|
||||
and do not re-add tracks subsequently removed by the user. A started batch keeps
|
||||
its destination for its remaining files.
|
||||
|
||||
## Federation
|
||||
|
||||
Federation is optional. Independent Furumusic and Furumi players that use the
|
||||
same Network ID discover one another as a logical network. Each peer keeps its
|
||||
own library and can continue working alone.
|
||||
|
||||
When federation is enabled, local and remote artists, releases, and tracks can
|
||||
appear in the same search and library views. Missing audio is streamed from an
|
||||
available peer and can optionally be retained locally. Similarity search also
|
||||
stays decentralized: embeddings and exact ranking remain on the instance that
|
||||
owns the music.
|
||||
|
||||
Trusted-device pairing is separate from public catalog discovery. It connects
|
||||
a user's own Furumi players so likes, playlists, playback state, and control can
|
||||
move between approved devices.
|
||||
|
||||
Queues synchronized from other Furumi players can contain podcast episodes. The
|
||||
web player keeps them in the queue, in order and with their position, and shows
|
||||
them as **Podcast · not playable in the web player yet**; local playback skips
|
||||
them. A device that does not support podcasts yet (device-sync protocol below
|
||||
4, for example an older terminal player) cannot receive such a queue: selecting
|
||||
it as the playback device shows that it needs an update, and the episodes stay
|
||||
in the queue. Jam guests see podcast episodes of the host only as private items.
|
||||
|
||||
### Rolling back to 0.12
|
||||
|
||||
Release 0.13 relays podcast synchronization operations from other Furumi
|
||||
players. Release 0.12 cannot read them: device synchronization would fail for
|
||||
every device that has not received them yet. Before you start a 0.12 release
|
||||
on a database that 0.13 used, stop the server and remove those operations:
|
||||
|
||||
```sql
|
||||
DELETE FROM furumusic__fed_sync_ops WHERE kind LIKE 'podcast\_%';
|
||||
```
|
||||
|
||||
Devices that support podcasts keep their own podcast state. The relay table
|
||||
`furumusic__fed_podcast_relay` and the typed queue column can stay: 0.12
|
||||
ignores them, and after the next upgrade 0.13 returns the relayed podcast state
|
||||
in its snapshots again and uses the typed queue only while it matches the
|
||||
queue, current track and position that 0.12 saved.
|
||||
|
||||
## Admin statistics
|
||||
|
||||
The only admin interface is `/admin/v2`, also reachable from `/admin/`.
|
||||
**Statistics** shows listening totals, a timeline, artist/track/release rankings,
|
||||
and paginated history. Select an artist or track to see its listeners, then a
|
||||
listener to see their history within the same filters. The **Users** list links
|
||||
to each user's full statistics.
|
||||
|
||||
Periods use UTC. Counts come from the synchronized `listen_event` history: a
|
||||
natural finish, half of a track, or four minutes qualifies as a play. Interrupted
|
||||
sessions under five seconds are not retained. Short retained sessions contribute
|
||||
to listened time but not play counts. The source filter separates this instance
|
||||
from synchronized devices. Artist rankings use recorded artist names, including
|
||||
featured credits; the same artist is counted once per event. Existing history
|
||||
remains available when its local audio file is deleted. Library and service
|
||||
cards show current instance totals, independently of the listening filters.
|
||||
|
||||
Migration `m_0051_add_listen_statistics_indexes` adds time and content indexes.
|
||||
The old admin pages and `/admin/debug` are removed; first-run setup remains at
|
||||
`/admin/setup`.
|
||||
|
||||
## Metadata Repair
|
||||
|
||||
Admin → Library Tools provides a chat for editing the selected library resources.
|
||||
Use **Show related**, then **Deselect all** to choose only the resources needed
|
||||
for the task. Selecting a release includes its tracks; individual tracks can
|
||||
then be unchecked to exclude them. Unselected artists remain read-only context
|
||||
and their IDs can still be used in credits. Releases show their years; tracks
|
||||
show their source release.
|
||||
|
||||
The assistant sees the complete selected scope and replaces the proposed plan
|
||||
after every clarification. Expand **Proposed changes** in the chat to review or
|
||||
edit it before applying. Plans support moving tracks, creating releases, merging
|
||||
releases, and deleting artists, releases, or tracks. Release deletion requires
|
||||
explicit moves or deletion of all its tracks. Artist deletion detaches credits
|
||||
and requires all credited releases and tracks to be included.
|
||||
|
||||
Applied plans are transactional and can be undone from History. Metadata Repair
|
||||
retains audio and artwork files for Undo. Undo refuses to overwrite subsequent
|
||||
metadata, playback, or federation changes.
|
||||
|
||||
## Last.fm popularity updates
|
||||
|
||||
The `lastfm_popularity` job defaults to **light** mode: it requests popularity
|
||||
only for tracks without a completed lookup or with a changed title or primary
|
||||
artist. Both matches (including zero counts) and explicit Last.fm “Track not
|
||||
found” results are skipped on subsequent light runs. HTTP errors, timeouts,
|
||||
invalid responses, and other API errors remain eligible for retry. A failed
|
||||
full refresh also makes that track eligible for the next light run.
|
||||
|
||||
Choose **Full: refresh all visible tracks** in the task's admin parameters to
|
||||
refresh existing statistics and retry previous misses. The options endpoint
|
||||
`POST /admin/v2/api/jobs/lastfm_popularity/run-options` accepts
|
||||
`{"refresh_existing": true}`; an empty object, scheduled runs, and the ordinary
|
||||
run endpoint use light mode. Neither mode limits the number of tracks processed.
|
||||
An authoritative miss clears current statistics while preserving their history.
|
||||
The migration preserves existing popularity; legacy misses need one more lookup
|
||||
because older versions did not persist them.
|
||||
@@ -0,0 +1,167 @@
|
||||
# Development
|
||||
|
||||
[Project overview](../README.md) · [Installation](setup.md) · [Admin UI conventions](admin-ui.md)
|
||||
|
||||
## Architecture
|
||||
|
||||
Furumusic is written in Rust on the
|
||||
[Cot](https://cot.rs) web framework. PostgreSQL stores the catalog, accounts,
|
||||
playlists, configuration, and background-job state. Audio inspection uses
|
||||
Symphonia, torrent downloads use librqbit, and the shared `music-dht`/Frid
|
||||
protocol stack provides decentralized catalog search, media transfer, and
|
||||
connected-device synchronization.
|
||||
|
||||
The browser interface and JSON API are served by the same application. Import,
|
||||
artwork, metadata enrichment, similarity indexing, and maintenance run as
|
||||
durable background jobs rather than blocking playback requests.
|
||||
|
||||
## Build profiles
|
||||
|
||||
Development and test builds use basic optimization (`opt-level = 1`) for
|
||||
dependencies to keep macOS unwind tables below the compact-unwind size limit.
|
||||
Application code stays unoptimized; debug symbols, assertions and panic
|
||||
unwinding remain enabled. The first build compiles dependencies with these
|
||||
settings, then reuses them from Cargo's cache. Dependency stepping in a debugger
|
||||
can be less exact because of optimization. Release settings are independent.
|
||||
|
||||
See the [Cargo profile override documentation](https://doc.rust-lang.org/cargo/reference/profiles.html#overrides) for dependency-specific settings.
|
||||
|
||||
## Container builds and CI
|
||||
|
||||
CI uses Rust 1.97.0 and cargo-chef 0.1.74 to cache compiled dependencies separately
|
||||
from application sources. Buildx imports and exports intermediate layers through
|
||||
`ultradesu/furumusic:buildcache` (`mode=max`). After the first build, changes to
|
||||
source code, templates or prompts reuse the dependency layer when its recipe and
|
||||
toolchain are unchanged. Both dependency and application builds use `--locked`.
|
||||
Update the pinned build tools in `Dockerfile`; changing them rebuilds the cache.
|
||||
|
||||
## Connected devices and podcast queue items
|
||||
|
||||
Trusted-device sync uses the shared `music_dht::device_sync` types (no local
|
||||
copies) and announces protocol version 4. The web player has no podcast
|
||||
features yet, but it keeps every v4 element it receives:
|
||||
|
||||
- podcast operations stay in the operation log and are relayed to v4 devices
|
||||
only; their registers and the podcast snapshot sections are merged with the
|
||||
shared `music_dht::podcast` rules into `furumusic__fed_podcast_relay`
|
||||
(opaque contract JSON) and returned in this server's snapshots;
|
||||
- queue items that are not library tracks become external browser items
|
||||
(`source` plus the verbatim `wire_track`), so podcast episodes and Jam
|
||||
placeholders survive peer → server → browser → server → peer unchanged;
|
||||
- `furumusic__playback_state.queue_items_json` stores the typed queue next to
|
||||
`queue_json`. `queue_json` (library ids) is still written for rollback; the
|
||||
typed value is used only while the legacy columns it recorded
|
||||
(`queue_json`, `current_track_id`, `queue_position`) match the row. Jam
|
||||
placeholders are never stored in a user's own queue.
|
||||
- a browser that selects a podcast episode it cannot play does not know the
|
||||
episode's position. It reports `position_unknown`, and the server sends the
|
||||
resume position of the relayed progress register instead of 0. Jam
|
||||
participant commands carry `jam_participant`; the host browser checks them
|
||||
against its own queue.
|
||||
|
||||
Rolling back to 0.12 needs the podcast operations removed from the operation
|
||||
log first; see "Rolling back to 0.12" in `administration.md`.
|
||||
|
||||
Everything sent to a device is gated by the version that device reported itself
|
||||
(`profile_protocol_version`; relayed profiles only raise it). See the podcast
|
||||
contract (`PODCASTS.md`) and `PLAYBACK_PROTOCOL.md` in the Frid repository.
|
||||
|
||||
```bash
|
||||
cargo test devices:: queue_items podcast_relay queue_persistence
|
||||
node --test tests/player_queue_sources.test.cjs
|
||||
# Migrated disposable PostgreSQL (start the server against it once):
|
||||
FURU_DEVICE_SYNC_TEST_DATABASE_URL=postgresql://... \
|
||||
cargo test devices::postgres_tests -- --ignored
|
||||
FURU_METADATA_FIX_TEST_DATABASE_URL=postgresql://... \
|
||||
cargo test undo_accepts_playback_archives_written_before_the_typed_queue -- --ignored
|
||||
```
|
||||
|
||||
`wire_compat_tests` compares the shared types with the private copies of
|
||||
0.12.x byte for byte; `fixtures/v3_hello.golden.json` is the v3 shape. Rewrite
|
||||
it only for a deliberate change, with `FURUMUSIC_BLESS_GOLDEN=1`.
|
||||
|
||||
## Contributing
|
||||
|
||||
Bug reports, design discussions, and patches are welcome. Before submitting a
|
||||
change, run:
|
||||
|
||||
```bash
|
||||
cargo fmt --all -- --check
|
||||
cargo clippy --all-targets -- -D warnings
|
||||
cargo test --all-targets
|
||||
```
|
||||
|
||||
Last.fm database tests use temporary tables on a disposable PostgreSQL database:
|
||||
|
||||
```bash
|
||||
FURUMUSIC_LASTFM_TEST_DATABASE_URL=postgres://user:pass@localhost/test_db \
|
||||
cargo test lastfm_popularity -- --include-ignored
|
||||
```
|
||||
|
||||
## Access and sharing tests
|
||||
|
||||
The access regression suite uses a disposable migrated database and a local OIDC
|
||||
provider with signed tokens and PKCE:
|
||||
|
||||
```bash
|
||||
node --test tests/*.test.cjs
|
||||
FURU_ACCESS_TEST_DATABASE_URL=postgresql://... cargo test postgres_approval_survives_sso_changes_without_implicit_grants -- --ignored
|
||||
# Fresh disposable instance on :18048, media root /tmp/furumi-access-media,
|
||||
# PostgreSQL container furumi-access-test-pg, database furumi_access_test:
|
||||
node tests/browser-access-sharing.cjs
|
||||
```
|
||||
|
||||
The browser test requires Playwright (`PLAYWRIGHT_MODULE`) and Chrome
|
||||
(`CHROME_PATH`), and uses local port 18049 for its OIDC provider. It checks
|
||||
approval, SSO precedence and group removal, guest playback and downloads,
|
||||
unauthorized track substitution, and desktop/mobile player behavior.
|
||||
|
||||
## Statistics tests
|
||||
|
||||
```bash
|
||||
node --test tests/*.test.cjs
|
||||
cargo test admin:: -- --skip postgres_statistics_drilldown_and_pagination
|
||||
# Use a disposable PostgreSQL; this test creates connection-local temporary tables.
|
||||
FURU_STATISTICS_TEST_DATABASE_URL=postgresql://... cargo test postgres_statistics_drilldown_and_pagination -- --ignored
|
||||
```
|
||||
|
||||
`tests/browser-statistics.cjs` additionally exercises a fresh disposable instance
|
||||
at `FURU_TEST_URL` (default `http://127.0.0.1:3018`) and seeds the disposable Docker
|
||||
container `furumi-statistics-test-pg`. It requires Playwright (or
|
||||
`PLAYWRIGHT_MODULE`) and Chrome (or `CHROME_PATH`). Never point this test at a
|
||||
live service.
|
||||
|
||||
## Metadata Repair tests
|
||||
|
||||
```bash
|
||||
node --test tests/admin_metadata_repair.test.cjs
|
||||
cargo test admin::metadata_fix::tests
|
||||
```
|
||||
|
||||
`tests/browser-metadata-repair.cjs` checks the chat and plan updates, a four-release
|
||||
merge, deletion and restoration of tracks and artist credits, playlists, playback
|
||||
queues, and undo conflicts. Run it only against a disposable instance and a
|
||||
PostgreSQL container named `furumi-repair-test-pg`, with database
|
||||
`furumi_repair_test`. Set `FURU_TEST_URL`, `FURU_REPAIR_TEST_PG`, `CHROME_PATH`, and
|
||||
`PLAYWRIGHT_MODULE` as needed. It seeds `tests/metadata_repair_fixture.sql` after
|
||||
creating the test administrator. Set `FURU_REPAIR_SKIP_SEED=1` for a seeded database.
|
||||
With `FURU_REPAIR_TEST_MODEL=1`, it additionally checks the reported release-only
|
||||
selection and full ordered tracklist against the configured model, applies and
|
||||
undoes that plan, and verifies individual track exclusions.
|
||||
|
||||
## Import destination tests
|
||||
|
||||
```bash
|
||||
node --test tests/import_playlists.test.cjs
|
||||
# Disposable PostgreSQL; both tests use temporary tables.
|
||||
FURU_IMPORT_TEST_DATABASE_URL=postgresql://... cargo test import_destinations -- --ignored
|
||||
FURU_IMPORT_TEST_DATABASE_URL=postgresql://... cargo test torrent_playlist -- --ignored
|
||||
```
|
||||
|
||||
`tests/browser-import-playlists.cjs` checks the file upload flow, database
|
||||
reconciliation and the torrent picker on desktop and mobile. It requires a fresh
|
||||
migrated instance with the import agent disabled at `FURU_TEST_URL` (default
|
||||
`http://127.0.0.1:3019`), the disposable PostgreSQL container
|
||||
`furumi-import-playlist-test-pg` with database `furumi_import_test`, and Playwright
|
||||
and Chrome configured as above. It uses a local torrent preview fixture and
|
||||
simulated imported tracks, without downloading external torrents.
|
||||
@@ -0,0 +1,57 @@
|
||||
# Installation and configuration
|
||||
|
||||
[Project overview](../README.md) · [Administration guide](administration.md)
|
||||
|
||||
## Build and run
|
||||
|
||||
Furumusic requires PostgreSQL and a Rust toolchain with Rust 2024 edition
|
||||
support. Create an empty database, provide its connection URL, and start the
|
||||
server:
|
||||
|
||||
```bash
|
||||
export FURU_DATABASE_URL='postgresql://furumusic:password@127.0.0.1/furumusic'
|
||||
cargo run --release --locked
|
||||
```
|
||||
|
||||
Open <http://127.0.0.1:8000/admin/setup> to create the first administrator.
|
||||
After setup, configure the inbox and library directories under **Admin →
|
||||
Settings** before importing music.
|
||||
|
||||
To listen on another address or port:
|
||||
|
||||
```bash
|
||||
cargo run --release --locked -- -l 0.0.0.0:8000
|
||||
```
|
||||
|
||||
A Nix development shell is included for Linux and macOS:
|
||||
|
||||
```bash
|
||||
nix develop
|
||||
cargo run --locked
|
||||
```
|
||||
|
||||
The repository also contains a multi-stage `Dockerfile` for building a small
|
||||
runtime image. A deployment must provide PostgreSQL plus persistent, writable
|
||||
volumes for the inbox and music library.
|
||||
|
||||
## Configuration
|
||||
|
||||
Most settings can be changed from the administration interface. Every setting
|
||||
also has a `FURU_`-prefixed environment variable; environment values take
|
||||
priority over values stored in PostgreSQL.
|
||||
|
||||
The settings needed for a useful first installation are:
|
||||
|
||||
| Setting | Purpose |
|
||||
| --- | --- |
|
||||
| `FURU_DATABASE_URL` | PostgreSQL connection URL; required to run the service |
|
||||
| `FURU_AGENT_INBOX_DIR` | Temporary inbox for uploads and downloaded files |
|
||||
| `FURU_AGENT_STORAGE_DIR` | Permanent, organized music library |
|
||||
| `FURU_AGENT_ENABLED` | Enables the background metadata import pipeline |
|
||||
| `FURU_AGENT_LLM_URL` | Base URL of an OpenAI-compatible model server |
|
||||
| `FURU_AGENT_LLM_MODEL` | Model used to recognize and normalize metadata |
|
||||
| `FURU_FEDERATION_ENABLED` | Publishes the library and enables peer discovery |
|
||||
| `FURU_FEDERATION_NETWORK_ID` | Joins peers with the same value into one logical network |
|
||||
|
||||
AI recognition, federation, similarity search, Last.fm, and OIDC are optional.
|
||||
A local password-authenticated server can be used without any of them.
|
||||
+18
-6
@@ -28,7 +28,18 @@ pub(super) async fn manage_user(
|
||||
Ok(u) => u,
|
||||
Err(r) => return Ok(r),
|
||||
};
|
||||
if body.action == "delete" {
|
||||
if body.action == "approve" {
|
||||
let Some(id) = body.id.filter(|id| *id > 0) else {
|
||||
return Ok(json_error(StatusCode::BAD_REQUEST, "Invalid user"));
|
||||
};
|
||||
if Role::from_code(&body.role).is_none() || (id == admin.id && body.role != "admin") {
|
||||
return Ok(json_error(StatusCode::BAD_REQUEST, "Invalid role"));
|
||||
}
|
||||
let Some(mut user) = User::get_by_id(&db, id).await? else {
|
||||
return Ok(json_error(StatusCode::NOT_FOUND, "User not found"));
|
||||
};
|
||||
user.approve(&db, &body.role, admin.id).await?;
|
||||
} else if body.action == "delete" {
|
||||
let Some(id) = body.id.filter(|id| *id > 0) else {
|
||||
return Ok(json_error(StatusCode::BAD_REQUEST, "Invalid user"));
|
||||
};
|
||||
@@ -43,7 +54,8 @@ pub(super) async fn manage_user(
|
||||
if !["create", "update"].contains(&body.action.as_str())
|
||||
|| body.username.trim().is_empty()
|
||||
|| body.username.chars().count() > 255
|
||||
|| Role::from_code(&body.role).is_none()
|
||||
|| (Role::from_code(&body.role).is_none()
|
||||
&& !(body.action == "update" && body.role.is_empty()))
|
||||
|| (body.action == "create" && body.password.is_empty())
|
||||
{
|
||||
return Ok(json_error(
|
||||
@@ -74,15 +86,15 @@ pub(super) async fn manage_user(
|
||||
let Some(id) = body.id.filter(|id| *id > 0) else {
|
||||
return Ok(json_error(StatusCode::BAD_REQUEST, "Invalid user"));
|
||||
};
|
||||
if id == admin.id && body.role != "admin" {
|
||||
let Some(mut user) = User::get_by_id(&db, id).await? else {
|
||||
return Ok(json_error(StatusCode::NOT_FOUND, "User not found"));
|
||||
};
|
||||
if id == admin.id && body.role != "admin" && !user.has_sso_admin_role() {
|
||||
return Ok(json_error(
|
||||
StatusCode::BAD_REQUEST,
|
||||
"You cannot remove your own administrator role",
|
||||
));
|
||||
}
|
||||
let Some(mut user) = User::get_by_id(&db, id).await? else {
|
||||
return Ok(json_error(StatusCode::NOT_FOUND, "User not found"));
|
||||
};
|
||||
if User::get_by_username(&db, body.username.trim())
|
||||
.await?
|
||||
.is_some_and(|u| u.id_val() != id)
|
||||
|
||||
+782
-182
File diff suppressed because it is too large.
Load diff
+9
-3
@@ -230,6 +230,8 @@ struct AdminUserRowDto {
|
||||
email: Option<String>,
|
||||
role: String,
|
||||
is_active: bool,
|
||||
local_role: Option<String>,
|
||||
sso_role: Option<String>,
|
||||
is_online: bool,
|
||||
last_seen_ms: Option<i64>,
|
||||
plays: i64,
|
||||
@@ -2667,6 +2669,8 @@ struct AdminUserSqlRow {
|
||||
email: Option<String>,
|
||||
role: String,
|
||||
is_active: bool,
|
||||
local_role: Option<String>,
|
||||
sso_role: Option<String>,
|
||||
plays: i64,
|
||||
listened_seconds: i64,
|
||||
last_play_ms: Option<i64>,
|
||||
@@ -2700,7 +2704,7 @@ async fn load_admin_users_page(
|
||||
let total: i64 = count_qb.build_query_scalar().fetch_one(pool).await?;
|
||||
|
||||
let mut qb = QueryBuilder::<Postgres>::new(
|
||||
"SELECT id, username::text, display_name, email, role::text, is_active, \
|
||||
"SELECT id, username::text, display_name, email, role::text, is_active, local_role, sso_role, \
|
||||
(SELECT COUNT(*) FROM furumusic__listen_event le WHERE le.user_id = furumusic__user.id AND qualified) AS plays, \
|
||||
(SELECT (COALESCE(SUM(listened_ms), 0) / 1000)::bigint FROM furumusic__listen_event le WHERE le.user_id = furumusic__user.id) AS listened_seconds, \
|
||||
(SELECT MAX(started_at_ms) FROM furumusic__listen_event le WHERE le.user_id = furumusic__user.id AND qualified) AS last_play_ms \
|
||||
@@ -2715,7 +2719,7 @@ async fn load_admin_users_page(
|
||||
qb.push_bind(pattern);
|
||||
qb.push(")");
|
||||
}
|
||||
qb.push(" ORDER BY username ASC LIMIT ");
|
||||
qb.push(" ORDER BY is_active ASC, username ASC LIMIT ");
|
||||
qb.push_bind(limit);
|
||||
qb.push(" OFFSET ");
|
||||
qb.push_bind(offset);
|
||||
@@ -2747,7 +2751,7 @@ async fn load_admin_user_detail(
|
||||
user_id: i64,
|
||||
) -> anyhow::Result<Option<AdminUserDetailDto>> {
|
||||
let row = sqlx::query_as::<_, AdminUserSqlRow>(
|
||||
"SELECT id, username::text, display_name, email, role::text, is_active, \
|
||||
"SELECT id, username::text, display_name, email, role::text, is_active, local_role, sso_role, \
|
||||
(SELECT COUNT(*) FROM furumusic__listen_event le WHERE le.user_id = furumusic__user.id AND qualified) AS plays, \
|
||||
(SELECT (COALESCE(SUM(listened_ms), 0) / 1000)::bigint FROM furumusic__listen_event le WHERE le.user_id = furumusic__user.id) AS listened_seconds, \
|
||||
(SELECT MAX(started_at_ms) FROM furumusic__listen_event le WHERE le.user_id = furumusic__user.id AND qualified) AS last_play_ms \
|
||||
@@ -2939,6 +2943,8 @@ fn admin_user_row(
|
||||
email: row.email,
|
||||
role: row.role,
|
||||
is_active: row.is_active,
|
||||
local_role: row.local_role,
|
||||
sso_role: row.sso_role,
|
||||
plays: row.plays,
|
||||
listened_seconds: row.listened_seconds,
|
||||
last_play_ms: row.last_play_ms,
|
||||
|
||||
+7
-2
@@ -72,8 +72,13 @@ fn authenticated_user_from_user(user: User) -> Option<AuthenticatedUser> {
|
||||
})
|
||||
}
|
||||
|
||||
/// Read `user_id` from the session, fetch the `User` from DB, return
|
||||
/// `AuthenticatedUser` if the user exists and is active.
|
||||
/// Return the signed-in identity, including an account awaiting approval.
|
||||
pub async fn get_session_identity(session: &Session, db: &Database) -> Option<User> {
|
||||
let user_id: i64 = session.get(SESSION_USER_ID).await.ok()??;
|
||||
User::get_by_id(db, user_id).await.ok()?
|
||||
}
|
||||
|
||||
/// Return a session user only when access to the instance has been granted.
|
||||
pub async fn get_session_user(session: &Session, db: &Database) -> Option<AuthenticatedUser> {
|
||||
let user_id: i64 = session.get(SESSION_USER_ID).await.ok()??;
|
||||
let user = User::get_by_id(db, user_id).await.ok()??;
|
||||
|
||||
+569
-640
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1 @@
|
||||
{"type":"hello","group_id":"grp_1","profile":{"device_id":"tui_a","name":"TUI","client_version":"0.3.4","protocol_version":3,"endpoint_id":"e","endpoint_ticket":"t","revoked":false,"revoke_cutoff_seq":null,"updated_at_ms":5},"devices":[{"device_id":"tui_a","name":"TUI","client_version":"0.3.4","protocol_version":3,"endpoint_id":"e","endpoint_ticket":"t","revoked":false,"revoke_cutoff_seq":null,"updated_at_ms":5},{"device_id":"web_b","name":"TUI","client_version":"0.3.4","protocol_version":3,"endpoint_id":"e","endpoint_ticket":"t","revoked":false,"revoke_cutoff_seq":null,"updated_at_ms":5}],"vector":{"tui_a":12,"web_b":4},"ops":[{"op_id":"tui_a:1","origin_device_id":"tui_a","seq":1,"hlc_ms":1700000000001,"payload":{"kind":"track_like_set","content_id":"b3:1111111111111111111111111111111111111111111111111111111111111111","liked":true,"fed":{"item_id":"item","owner":"owner","title":"Song","artist_names":["A"],"featured_artist_names":[],"year":2001,"duration_seconds":180,"content_id":"b3:1111111111111111111111111111111111111111111111111111111111111111","release_title":"Album","track_number":1,"disc_number":1}}},{"op_id":"tui_a:2","origin_device_id":"tui_a","seq":2,"hlc_ms":1700000000002,"payload":{"kind":"playlist_created","playlist_id":"pl","title":"Mix"}},{"op_id":"tui_a:3","origin_device_id":"tui_a","seq":3,"hlc_ms":1700000000003,"payload":{"kind":"playlist_renamed","playlist_id":"pl","title":"Mix 2"}},{"op_id":"tui_a:4","origin_device_id":"tui_a","seq":4,"hlc_ms":1700000000004,"payload":{"kind":"playlist_track_added","playlist_id":"pl","content_id":"b3:1111111111111111111111111111111111111111111111111111111111111111","position":0,"fed":null}},{"op_id":"tui_a:5","origin_device_id":"tui_a","seq":5,"hlc_ms":1700000000005,"payload":{"kind":"playlist_track_removed","playlist_id":"pl","content_id":"b3:1111111111111111111111111111111111111111111111111111111111111111"}},{"op_id":"tui_a:6","origin_device_id":"tui_a","seq":6,"hlc_ms":1700000000006,"payload":{"kind":"playlist_deleted","playlist_id":"pl"}},{"op_id":"tui_a:7","origin_device_id":"tui_a","seq":7,"hlc_ms":1700000000007,"payload":{"kind":"device_profile_set","name":"TUI","client_version":"0.3.4","endpoint_ticket":"t","endpoint_id":"e"}},{"op_id":"tui_a:8","origin_device_id":"tui_a","seq":8,"hlc_ms":1700000000008,"payload":{"kind":"device_trusted","target_device_id":"web_b"}},{"op_id":"tui_a:9","origin_device_id":"tui_a","seq":9,"hlc_ms":1700000000009,"payload":{"kind":"device_revoked","target_device_id":"old","target_max_seq_seen":3}},{"op_id":"tui_a:10","origin_device_id":"tui_a","seq":10,"hlc_ms":1700000000010,"payload":{"kind":"playback_command","target_device_id":"web_b","command":{"kind":"set_state","state":{"queue":[{"id":7,"title":"Song","track_number":1,"disc_number":null,"duration_seconds":180.5,"artist_names":["A"],"featured_artist_names":["B"],"release_id":3,"release_title":"Album","release_year":2001,"file_path":"","content_id":"b3:1111111111111111111111111111111111111111111111111111111111111111","audio_format":"flac","audio_bitrate":900,"audio_sample_rate":44100,"audio_bit_depth":16,"file_size_bytes":12345,"play_count":2,"fed":{"item_id":"item","owner":"owner","title":"Song","artist_names":["A"],"featured_artist_names":[],"year":2001,"duration_seconds":180,"content_id":"b3:1111111111111111111111111111111111111111111111111111111111111111","release_title":"Album","track_number":1,"disc_number":1}},{"id":0,"title":"Remote","track_number":null,"disc_number":null,"duration_seconds":0.0,"artist_names":[],"featured_artist_names":[],"release_id":0,"release_title":"","release_year":null,"file_path":"","content_id":null,"audio_format":null,"audio_bitrate":null,"audio_sample_rate":null,"audio_bit_depth":null,"file_size_bytes":null,"play_count":0,"fed":null}],"queue_pos":1,"playing":true,"paused":false,"idle_since_ms":null,"position_secs":42.5,"volume":73,"shuffle":true,"repeat":"all"},"seek":true},"authority":{"version":1,"claim":{"counter":3,"issuer":"tui_a","owner":"tui_a"},"sequence":9}}},{"op_id":"tui_a:11","origin_device_id":"tui_a","seq":11,"hlc_ms":1700000000011,"payload":{"kind":"playback_command","target_device_id":"web_b","command":{"kind":"active_changed","active_device_id":"web_b","active_device_name":"WEB","state":{"queue":[{"id":7,"title":"Song","track_number":1,"disc_number":null,"duration_seconds":180.5,"artist_names":["A"],"featured_artist_names":["B"],"release_id":3,"release_title":"Album","release_year":2001,"file_path":"","content_id":"b3:1111111111111111111111111111111111111111111111111111111111111111","audio_format":"flac","audio_bitrate":900,"audio_sample_rate":44100,"audio_bit_depth":16,"file_size_bytes":12345,"play_count":2,"fed":{"item_id":"item","owner":"owner","title":"Song","artist_names":["A"],"featured_artist_names":[],"year":2001,"duration_seconds":180,"content_id":"b3:1111111111111111111111111111111111111111111111111111111111111111","release_title":"Album","track_number":1,"disc_number":1}},{"id":0,"title":"Remote","trackLine truncated
|
||||
@@ -0,0 +1,575 @@
|
||||
//! Version gating and lossless queue bridge (device-sync protocol v4).
|
||||
|
||||
use super::*;
|
||||
use crate::player::queue_items::{self, test_episode};
|
||||
use music_dht::podcast::{
|
||||
EpisodeId, FeedUrl, ListenSession, PodcastId, PodcastMeta, ProgressStatus,
|
||||
};
|
||||
|
||||
const CONTENT_ID: &str = "b3:2222222222222222222222222222222222222222222222222222222222222222";
|
||||
|
||||
fn podcast_id() -> PodcastId {
|
||||
PodcastId::from_feed_url(&FeedUrl::parse("https://podcasts.example/feed.xml").unwrap())
|
||||
}
|
||||
|
||||
fn episode_id() -> EpisodeId {
|
||||
EpisodeId::from_guid(&podcast_id(), "ep-1").unwrap()
|
||||
}
|
||||
|
||||
fn music_track(id: i64) -> PlaybackTrack {
|
||||
let mut track = PlaybackTrack::private_placeholder();
|
||||
track.source = None;
|
||||
track.id = id;
|
||||
track.title = format!("Song {id}");
|
||||
track
|
||||
}
|
||||
|
||||
fn state(queue: Vec<PlaybackTrack>) -> PlaybackStateWire {
|
||||
PlaybackStateWire {
|
||||
queue,
|
||||
queue_pos: 0,
|
||||
playing: true,
|
||||
paused: false,
|
||||
idle_since_ms: None,
|
||||
position_secs: 12.5,
|
||||
volume: 70,
|
||||
shuffle: false,
|
||||
repeat: PlaybackRepeat::Off,
|
||||
playback_rate: None,
|
||||
}
|
||||
}
|
||||
|
||||
fn podcast_state() -> PlaybackStateWire {
|
||||
state(vec![
|
||||
music_track(1),
|
||||
PlaybackTrack::podcast_episode(test_episode()),
|
||||
])
|
||||
}
|
||||
|
||||
/// One payload of every operation kind (music-only playback commands).
|
||||
fn every_payload(playback: PlaybackStateWire) -> Vec<SyncOpPayload> {
|
||||
let session = ListenSession {
|
||||
session_id: "s1".into(),
|
||||
episode_id: episode_id(),
|
||||
podcast_id: podcast_id(),
|
||||
device_id: "tui_a".into(),
|
||||
started_at_ms: 1,
|
||||
ended_at_ms: 2,
|
||||
start_position_ms: 0,
|
||||
end_position_ms: 1,
|
||||
listened_ms: 1,
|
||||
completed: false,
|
||||
};
|
||||
let meta: PodcastMeta = serde_json::from_value(serde_json::json!({
|
||||
"feed_url": "https://podcasts.example/feed.xml", "title": "Cast"
|
||||
}))
|
||||
.unwrap();
|
||||
vec![
|
||||
SyncOpPayload::TrackLikeSet {
|
||||
content_id: CONTENT_ID.into(),
|
||||
liked: true,
|
||||
fed: None,
|
||||
},
|
||||
SyncOpPayload::PlaylistCreated {
|
||||
playlist_id: "p".into(),
|
||||
title: "t".into(),
|
||||
},
|
||||
SyncOpPayload::PlaylistRenamed {
|
||||
playlist_id: "p".into(),
|
||||
title: "t".into(),
|
||||
},
|
||||
SyncOpPayload::PlaylistDeleted {
|
||||
playlist_id: "p".into(),
|
||||
},
|
||||
SyncOpPayload::PlaylistTrackAdded {
|
||||
playlist_id: "p".into(),
|
||||
content_id: CONTENT_ID.into(),
|
||||
position: 0,
|
||||
fed: None,
|
||||
},
|
||||
SyncOpPayload::PlaylistTrackRemoved {
|
||||
playlist_id: "p".into(),
|
||||
content_id: CONTENT_ID.into(),
|
||||
},
|
||||
SyncOpPayload::DeviceProfileSet {
|
||||
name: "n".into(),
|
||||
client_version: "v".into(),
|
||||
endpoint_ticket: "t".into(),
|
||||
endpoint_id: "e".into(),
|
||||
protocol_version: Some(4),
|
||||
},
|
||||
SyncOpPayload::DeviceTrusted {
|
||||
target_device_id: "d".into(),
|
||||
},
|
||||
SyncOpPayload::DeviceRevoked {
|
||||
target_device_id: "d".into(),
|
||||
target_max_seq_seen: 1,
|
||||
},
|
||||
SyncOpPayload::PlaybackCommand {
|
||||
target_device_id: "d".into(),
|
||||
command: PlaybackCommand::SetState {
|
||||
state: playback,
|
||||
seek: false,
|
||||
},
|
||||
authority: None,
|
||||
},
|
||||
SyncOpPayload::ListenRecorded {
|
||||
event: ListenEvent {
|
||||
listen_id: "l".into(),
|
||||
content_id: CONTENT_ID.into(),
|
||||
started_at_ms: 1,
|
||||
listened_ms: 1,
|
||||
track_duration_ms: None,
|
||||
ended_reason: ListenEndReason::Finished,
|
||||
track: ListenTrackMetadata {
|
||||
title: "t".into(),
|
||||
artist_names: vec!["a".into()],
|
||||
featured_artist_names: vec![],
|
||||
release_title: None,
|
||||
},
|
||||
},
|
||||
},
|
||||
SyncOpPayload::PodcastSubscriptionSet {
|
||||
podcast_id: podcast_id(),
|
||||
subscribed: true,
|
||||
podcast: meta,
|
||||
feed_aliases: vec![],
|
||||
generation: 1,
|
||||
},
|
||||
SyncOpPayload::PodcastShareSet {
|
||||
podcast_id: podcast_id(),
|
||||
shared: false,
|
||||
generation: 1,
|
||||
},
|
||||
SyncOpPayload::PodcastFeedAliasesAdded {
|
||||
podcast_id: podcast_id(),
|
||||
feed_aliases: vec![FeedUrl::parse("https://podcasts.example/new.xml").unwrap()],
|
||||
},
|
||||
SyncOpPayload::PodcastProgressSet {
|
||||
episode_id: episode_id(),
|
||||
podcast_id: podcast_id(),
|
||||
position_ms: 1,
|
||||
status: ProgressStatus::InProgress,
|
||||
generation: 1,
|
||||
session_id: "s1".into(),
|
||||
episode: None,
|
||||
},
|
||||
SyncOpPayload::PodcastListenRecorded {
|
||||
session,
|
||||
episode: None,
|
||||
},
|
||||
]
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn stored_kind_is_the_wire_tag() {
|
||||
for payload in every_payload(state(vec![])) {
|
||||
let value = serde_json::to_value(&payload).unwrap();
|
||||
assert_eq!(payload_kind(&payload), value["kind"].as_str().unwrap());
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn op_gating_matrix_matches_the_shared_helper() {
|
||||
// The SQL kind filter must hide exactly what `op_allowed_for_peer`
|
||||
// rejects (playback commands are content-dependent and checked in Rust).
|
||||
for version in 1..=PROTOCOL_VERSION {
|
||||
let hidden = op_kinds_hidden_from(version);
|
||||
for payload in every_payload(state(vec![music_track(1)])) {
|
||||
let kind = payload_kind(&payload);
|
||||
assert_eq!(
|
||||
hidden.contains(&kind),
|
||||
!op_allowed_for_peer(&payload, version),
|
||||
"{kind} for v{version}"
|
||||
);
|
||||
}
|
||||
}
|
||||
assert!(
|
||||
op_kinds_hidden_from(3)
|
||||
.iter()
|
||||
.all(|kind| kind.starts_with("podcast_"))
|
||||
);
|
||||
assert_eq!(op_kinds_hidden_from(3).len(), 5);
|
||||
assert!(op_kinds_hidden_from(4).is_empty());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn playback_gating_matrix() {
|
||||
let music = state(vec![music_track(1), music_track(2)]);
|
||||
let podcasts = podcast_state();
|
||||
let private = state(vec![PlaybackTrack::private_placeholder()]);
|
||||
for version in 1..=PROTOCOL_VERSION {
|
||||
let v4 = version >= 4;
|
||||
// Snapshots and handoffs.
|
||||
assert!(playback_allowed_for_peer(&music, version));
|
||||
assert_eq!(playback_allowed_for_peer(&podcasts, version), v4);
|
||||
assert_eq!(playback_allowed_for_peer(&private, version), v4);
|
||||
// Commands from the peer.
|
||||
assert!(playback_command_allowed_from_peer(&music, version));
|
||||
assert_eq!(playback_command_allowed_from_peer(&podcasts, version), v4);
|
||||
// Stamped playback command operations.
|
||||
let command = |state: &PlaybackStateWire| SyncOpPayload::PlaybackCommand {
|
||||
target_device_id: "d".into(),
|
||||
command: PlaybackCommand::ActiveChanged {
|
||||
active_device_id: "d".into(),
|
||||
active_device_name: "D".into(),
|
||||
state: state.clone(),
|
||||
},
|
||||
authority: None,
|
||||
};
|
||||
assert!(op_allowed_for_peer(&command(&music), version));
|
||||
assert_eq!(op_allowed_for_peer(&command(&podcasts), version), v4);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn browser_state_gating_sees_podcast_items() {
|
||||
let with_podcast = serde_json::json!({
|
||||
"tracks": [
|
||||
{"id": 5, "title": "Library song"},
|
||||
queue_items::external_track_json(&PlaybackTrack::podcast_episode(test_episode()), 1, None),
|
||||
],
|
||||
"index": 0,
|
||||
});
|
||||
let shadow = browser_state_shadow(&with_podcast);
|
||||
assert!(!playback_command_allowed_from_peer(&shadow, 3));
|
||||
assert!(playback_command_allowed_from_peer(&shadow, 4));
|
||||
let music_only = serde_json::json!({"tracks": [{"id": 5}], "index": 0});
|
||||
assert!(playback_command_allowed_from_peer(
|
||||
&browser_state_shadow(&music_only),
|
||||
3
|
||||
));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn relayed_versions_never_downgrade_and_self_reports_replace() {
|
||||
let profile = |id: &str, version: u16| DeviceProfileWire {
|
||||
device_id: id.into(),
|
||||
name: "D".into(),
|
||||
client_version: "x".into(),
|
||||
protocol_version: version,
|
||||
endpoint_id: String::new(),
|
||||
endpoint_ticket: String::new(),
|
||||
revoked: false,
|
||||
revoke_cutoff_seq: None,
|
||||
updated_at_ms: 0,
|
||||
};
|
||||
// A v3 relay lists every device with its own constant.
|
||||
let relayed = VersionReport::for_listed(&profile("tui_b", 3), Some("tui_a"));
|
||||
assert_eq!(relayed, VersionReport::Relayed(3));
|
||||
assert_eq!(relayed.resolve(Some(4)), 4);
|
||||
assert_eq!(relayed.resolve(None), 3);
|
||||
assert_eq!(VersionReport::Relayed(4).resolve(Some(3)), 4);
|
||||
// The sender's own entry is a self-report and may lower the version.
|
||||
let own = VersionReport::for_listed(&profile("tui_a", 3), Some("tui_a"));
|
||||
assert_eq!(own, VersionReport::SelfReported(Some(3)));
|
||||
assert_eq!(own.resolve(Some(4)), 3);
|
||||
// Profiles without a version (pending pairing, pre-v4 DeviceProfileSet)
|
||||
// keep the stored value, or the unreported version 1.
|
||||
assert_eq!(VersionReport::SelfReported(None).resolve(Some(4)), 4);
|
||||
assert_eq!(VersionReport::SelfReported(None).resolve(None), 1);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn podcast_snapshot_sections_are_bounded_per_message() {
|
||||
let mut snapshot = SyncSnapshot::default();
|
||||
let progress = music_dht::podcast::ProgressRecord {
|
||||
episode_id: episode_id(),
|
||||
podcast_id: podcast_id(),
|
||||
position_ms: 1,
|
||||
status: ProgressStatus::InProgress,
|
||||
generation: 1,
|
||||
session_id: "s".into(),
|
||||
hlc_ms: 1,
|
||||
device_id: "tui_a".into(),
|
||||
op_id: "tui_a:1".into(),
|
||||
};
|
||||
snapshot.podcast_progress = vec![progress; 10];
|
||||
// Large other parts leave (almost) no budget for podcast sections.
|
||||
let big_title = "x".repeat(music_dht::device_sync::MAX_SYNC_LINE - 16 * 1024);
|
||||
let mut message = WireMessage::Hello {
|
||||
group_id: "g".into(),
|
||||
profile: DeviceProfileWire {
|
||||
device_id: "web".into(),
|
||||
name: big_title,
|
||||
client_version: String::new(),
|
||||
protocol_version: PROTOCOL_VERSION,
|
||||
endpoint_id: String::new(),
|
||||
endpoint_ticket: String::new(),
|
||||
revoked: false,
|
||||
revoke_cutoff_seq: None,
|
||||
updated_at_ms: 0,
|
||||
},
|
||||
devices: vec![],
|
||||
vector: BTreeMap::new(),
|
||||
ops: vec![],
|
||||
snapshot: snapshot.clone(),
|
||||
playback: None,
|
||||
};
|
||||
fit_podcast_snapshot(&mut message);
|
||||
let WireMessage::Hello {
|
||||
snapshot: fitted, ..
|
||||
} = &message
|
||||
else {
|
||||
unreachable!()
|
||||
};
|
||||
assert!(fitted.podcast_progress.is_empty());
|
||||
|
||||
let mut small = WireMessage::SyncResponse {
|
||||
accepted: true,
|
||||
error: None,
|
||||
devices: vec![],
|
||||
vector: BTreeMap::new(),
|
||||
ops: vec![],
|
||||
snapshot,
|
||||
playback: None,
|
||||
};
|
||||
fit_podcast_snapshot(&mut small);
|
||||
let WireMessage::SyncResponse { snapshot, .. } = &small else {
|
||||
unreachable!()
|
||||
};
|
||||
assert_eq!(snapshot.podcast_progress.len(), 10);
|
||||
}
|
||||
|
||||
/// Pool that is never connected: the bridge paths under test resolve
|
||||
/// podcast items, placeholders and inline content ids without queries.
|
||||
fn offline_pool() -> sqlx::PgPool {
|
||||
sqlx::postgres::PgPoolOptions::new()
|
||||
.connect_lazy("postgres://offline@127.0.0.1:1/offline")
|
||||
.unwrap()
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn podcast_queue_survives_server_browser_server_round_trip() {
|
||||
let pool = offline_pool();
|
||||
let mut other = test_episode();
|
||||
other.episode_title = "Episode 43".into();
|
||||
other.episode_id = EpisodeId::from_guid(&other.podcast_id, "episode-43").unwrap();
|
||||
let mut unresolved = music_track(0);
|
||||
unresolved.title = "Remote song".into();
|
||||
let queue = vec![
|
||||
PlaybackTrack::podcast_episode(test_episode()),
|
||||
PlaybackTrack::private_placeholder(),
|
||||
unresolved,
|
||||
PlaybackTrack::podcast_episode(other),
|
||||
];
|
||||
let mut incoming = state(queue.clone());
|
||||
incoming.queue_pos = 3;
|
||||
incoming.paused = true;
|
||||
incoming.position_secs = 1200.0;
|
||||
|
||||
// peer -> server -> browser
|
||||
let payload = web_playback_payload(&pool, &incoming).await.unwrap();
|
||||
let tracks = payload["tracks"].as_array().unwrap();
|
||||
assert_eq!(tracks.len(), 4, "no item is dropped");
|
||||
assert_eq!(payload["index"], 3);
|
||||
assert_eq!(payload["position_seconds"], 1200.0);
|
||||
assert_eq!(tracks[0]["source"]["kind"], "podcast_episode");
|
||||
assert_eq!(tracks[0]["unavailable"], true);
|
||||
assert_eq!(tracks[1]["source"]["kind"], "private");
|
||||
|
||||
// The browser keeps its queue and sends it back (plus a library track
|
||||
// it added at the end, with its content id inline).
|
||||
let mut browser: serde_json::Value = serde_json::from_str(&payload.to_string()).unwrap();
|
||||
browser["tracks"]
|
||||
.as_array_mut()
|
||||
.unwrap()
|
||||
.push(serde_json::json!({
|
||||
"id": 77, "title": "Library song", "content_id": CONTENT_ID,
|
||||
"duration_seconds": 100.0, "artists": [{"id": 1, "name": "A"}],
|
||||
"release_id": 9, "release_title": "Album",
|
||||
}));
|
||||
|
||||
// browser -> server -> peer
|
||||
let outgoing = playback_state_from_browser_json(&pool, 1, browser)
|
||||
.await
|
||||
.unwrap();
|
||||
assert_eq!(outgoing.queue[..4], queue[..]);
|
||||
assert_eq!(outgoing.queue_pos, 3);
|
||||
assert!(outgoing.paused);
|
||||
// The episode position goes back to the peer (handoff web -> TUI).
|
||||
assert_eq!(outgoing.position_secs, 1200.0);
|
||||
let library = &outgoing.queue[4];
|
||||
assert_eq!(library.id, 77);
|
||||
assert_eq!(library.content_id.as_deref(), Some(CONTENT_ID));
|
||||
assert_eq!(library.source, None);
|
||||
// Library music keeps the v3 shape.
|
||||
assert!(!serde_json::to_string(library).unwrap().contains("source"));
|
||||
// Peers below v4 get no playback snapshot with these items.
|
||||
assert!(!playback_allowed_for_peer(&outgoing, 3));
|
||||
assert!(playback_allowed_for_peer(&outgoing, 4));
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn malformed_browser_items_keep_the_position_on_its_item() {
|
||||
let pool = offline_pool();
|
||||
let browser = serde_json::json!({
|
||||
"tracks": [
|
||||
{"title": "no id"},
|
||||
{"id": 5, "content_id": CONTENT_ID},
|
||||
{"id": 6, "content_id": CONTENT_ID},
|
||||
],
|
||||
"index": 2,
|
||||
"track": {"id": 6},
|
||||
});
|
||||
let wire = playback_state_from_browser_json(&pool, 1, browser)
|
||||
.await
|
||||
.unwrap();
|
||||
assert_eq!(wire.queue.len(), 2);
|
||||
assert_eq!(wire.queue[wire.queue_pos].id, 6);
|
||||
}
|
||||
|
||||
fn progress_record(position_ms: i64, status: ProgressStatus, generation: u64) -> ProgressRecord {
|
||||
let episode = test_episode();
|
||||
ProgressRecord {
|
||||
episode_id: episode.episode_id,
|
||||
podcast_id: episode.podcast_id,
|
||||
position_ms,
|
||||
status,
|
||||
generation,
|
||||
session_id: "session-1".into(),
|
||||
hlc_ms: 1_700_000_000_000,
|
||||
device_id: "tui".into(),
|
||||
op_id: "op-1".into(),
|
||||
}
|
||||
}
|
||||
|
||||
/// Browser state of `[library song, episode]` with the song current at 200 s.
|
||||
fn song_then_episode() -> serde_json::Value {
|
||||
let episode = PlaybackTrack::podcast_episode(test_episode());
|
||||
let song = serde_json::json!({
|
||||
"id": 77, "title": "Library song", "content_id": CONTENT_ID,
|
||||
"duration_seconds": 300.0, "stream_url": "/api/player/stream/77",
|
||||
});
|
||||
serde_json::json!({
|
||||
"tracks": [song.clone(), queue_items::external_track_json(&episode, 1, None)],
|
||||
"index": 0,
|
||||
"track": song,
|
||||
"position_seconds": 200.0,
|
||||
"paused": false,
|
||||
"repeat_mode": "off",
|
||||
})
|
||||
}
|
||||
|
||||
fn position_unknown(state: &serde_json::Value) -> bool {
|
||||
state[queue_items::POSITION_UNKNOWN_KEY] == true
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn commands_that_select_an_item_do_not_know_its_position() {
|
||||
let current = song_then_episode();
|
||||
// Next and Prev onto another item, and play commands (which the browser
|
||||
// always sends with position 0), leave the position to the server.
|
||||
let next =
|
||||
browser_state_for_command("next", serde_json::json!({}), Some(current.clone())).unwrap();
|
||||
assert_eq!(next["index"], 1);
|
||||
assert_eq!(next["position_seconds"], 0.0);
|
||||
assert!(position_unknown(&next));
|
||||
let mut play = current.clone();
|
||||
play["index"] = serde_json::json!(1);
|
||||
let played = browser_state_for_command("play_from_index", play.clone(), None).unwrap();
|
||||
assert!(position_unknown(&played));
|
||||
let prev =
|
||||
browser_state_for_command("prev", serde_json::json!({}), Some(next.clone())).unwrap();
|
||||
assert_eq!(prev["index"], 0);
|
||||
assert!(position_unknown(&prev));
|
||||
|
||||
// Restarting the same item and seeking are explicit positions.
|
||||
let mut late = next.clone();
|
||||
late["position_seconds"] = serde_json::json!(900.0);
|
||||
let restart = browser_state_for_command("prev", serde_json::json!({}), Some(late)).unwrap();
|
||||
assert_eq!(restart["index"], 1);
|
||||
assert!(!position_unknown(&restart));
|
||||
let repeat = browser_state_for_command(
|
||||
"next",
|
||||
serde_json::json!({"repeat_mode": "one"}),
|
||||
Some(next.clone()),
|
||||
)
|
||||
.unwrap();
|
||||
assert!(!position_unknown(&repeat));
|
||||
let seek =
|
||||
browser_state_for_command("seek", serde_json::json!({"time": 60.0}), Some(next)).unwrap();
|
||||
assert_eq!(seek["position_seconds"], 60.0);
|
||||
assert!(!position_unknown(&seek));
|
||||
|
||||
// A transfer keeps what the sender knew.
|
||||
let mut handed_off = play;
|
||||
handed_off["position_seconds"] = serde_json::json!(1200.0);
|
||||
let transfer = browser_state_for_command("transfer_state", handed_off.clone(), None).unwrap();
|
||||
assert_eq!(transfer["position_seconds"], 1200.0);
|
||||
assert!(!position_unknown(&transfer));
|
||||
handed_off[queue_items::POSITION_UNKNOWN_KEY] = serde_json::json!(true);
|
||||
let transfer = browser_state_for_command("transfer_state", handed_off, None).unwrap();
|
||||
assert!(position_unknown(&transfer));
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn unknown_episode_position_resumes_from_the_progress_register() {
|
||||
let pool = offline_pool();
|
||||
let next = browser_state_for_command("next", serde_json::json!({}), Some(song_then_episode()))
|
||||
.unwrap();
|
||||
let mut wire = browser_json_to_wire(&pool, next).await.unwrap();
|
||||
assert_eq!(wire.queue_pos, 1);
|
||||
assert_eq!(wire.position_secs, 0.0);
|
||||
|
||||
// In progress at 1200 s, generation 9 (the queue item has seen 7).
|
||||
let mut resumed = wire.clone();
|
||||
apply_resume_position(
|
||||
&mut resumed,
|
||||
Some(&progress_record(1_200_000, ProgressStatus::InProgress, 9)),
|
||||
);
|
||||
assert_eq!(resumed.position_secs, 1200.0);
|
||||
let episode = resumed.queue[1].podcast_episode_ref().unwrap();
|
||||
assert_eq!(episode.progress_generation, Some(9));
|
||||
// The receiver's explicit write then orders after the register.
|
||||
assert_eq!(
|
||||
ProgressRecord::explicit_generation(episode.progress_generation),
|
||||
10
|
||||
);
|
||||
|
||||
// Completed: ordinary Play starts from the beginning; an older register
|
||||
// does not lower the generation the item has seen.
|
||||
let mut completed = wire.clone();
|
||||
apply_resume_position(
|
||||
&mut completed,
|
||||
Some(&progress_record(1_790_000, ProgressStatus::Completed, 3)),
|
||||
);
|
||||
assert_eq!(completed.position_secs, 0.0);
|
||||
assert_eq!(
|
||||
completed.queue[1]
|
||||
.podcast_episode_ref()
|
||||
.unwrap()
|
||||
.progress_generation,
|
||||
Some(7)
|
||||
);
|
||||
|
||||
// Music keeps the position it has.
|
||||
wire.queue_pos = 0;
|
||||
wire.position_secs = 5.0;
|
||||
let before = wire.clone();
|
||||
apply_resume_position(
|
||||
&mut wire,
|
||||
Some(&progress_record(1_200_000, ProgressStatus::InProgress, 9)),
|
||||
);
|
||||
assert_eq!(wire, before);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn known_positions_and_music_never_read_the_progress_register() {
|
||||
// The offline pool fails any query, so these conversions must not query.
|
||||
let pool = offline_pool();
|
||||
let mut handed_off = song_then_episode();
|
||||
handed_off["index"] = serde_json::json!(1);
|
||||
handed_off["position_seconds"] = serde_json::json!(1200.0);
|
||||
let wire = playback_state_from_browser_json(&pool, 1, handed_off)
|
||||
.await
|
||||
.unwrap();
|
||||
assert_eq!(wire.position_secs, 1200.0);
|
||||
|
||||
let mut music = song_then_episode();
|
||||
music[queue_items::POSITION_UNKNOWN_KEY] = serde_json::json!(true);
|
||||
let wire = playback_state_from_browser_json(&pool, 1, music)
|
||||
.await
|
||||
.unwrap();
|
||||
assert_eq!(wire.position_secs, 200.0);
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
//! Cross-binary protocol contract; the peer is the TUI's production adapter.
|
||||
use super::*;
|
||||
use music_dht::device_sync::read_line;
|
||||
use tokio::io::AsyncWriteExt;
|
||||
|
||||
#[tokio::test]
|
||||
@@ -34,7 +35,8 @@ async fn localhost_tui_peer() {
|
||||
else {
|
||||
panic!("expected TUI hello")
|
||||
};
|
||||
assert_eq!(profile.protocol_version, PROTOCOL_VERSION);
|
||||
// TUI 0.3.x reports v3; podcast-capable TUI releases report v4.
|
||||
assert!((3..=PROTOCOL_VERSION).contains(&profile.protocol_version));
|
||||
assert_eq!(snapshot.device_id, profile.device_id);
|
||||
let announcement = snapshot
|
||||
.coordination
|
||||
|
||||
@@ -0,0 +1,478 @@
|
||||
//! Device-sync v4 storage paths against PostgreSQL.
|
||||
//!
|
||||
//! Requires a migrated disposable database (start the server once against
|
||||
//! it); the test writes rows for a random user id and removes them again.
|
||||
|
||||
use super::*;
|
||||
use crate::player::queue_items::test_episode;
|
||||
use music_dht::podcast::{
|
||||
EpisodeId, FeedUrl, PodcastId, PodcastMeta, ProgressRecord, ProgressStatus, ShareRecord,
|
||||
};
|
||||
|
||||
fn profile(device_id: &str, protocol_version: u16) -> DeviceProfileWire {
|
||||
DeviceProfileWire {
|
||||
device_id: device_id.into(),
|
||||
name: device_id.to_uppercase(),
|
||||
client_version: "test".into(),
|
||||
protocol_version,
|
||||
endpoint_id: String::new(),
|
||||
endpoint_ticket: String::new(),
|
||||
revoked: false,
|
||||
revoke_cutoff_seq: None,
|
||||
updated_at_ms: now_ms(),
|
||||
}
|
||||
}
|
||||
|
||||
fn op(origin: &str, seq: i64, hlc_ms: i64, payload: SyncOpPayload) -> SyncOpWire {
|
||||
SyncOpWire {
|
||||
op_id: format!("{origin}:{seq}"),
|
||||
origin_device_id: origin.into(),
|
||||
seq,
|
||||
hlc_ms,
|
||||
payload,
|
||||
}
|
||||
}
|
||||
|
||||
async fn cleanup(pool: &sqlx::PgPool, user_id: i64) {
|
||||
for table in [
|
||||
"furumusic__fed_device_identity",
|
||||
"furumusic__fed_device",
|
||||
"furumusic__fed_device_invite",
|
||||
"furumusic__fed_peer_ack",
|
||||
"furumusic__fed_pending_pairing",
|
||||
"furumusic__fed_playback_applied",
|
||||
"furumusic__fed_podcast_relay",
|
||||
"furumusic__fed_state_like",
|
||||
"furumusic__fed_state_playlist",
|
||||
"furumusic__fed_state_playlist_item",
|
||||
"furumusic__fed_sync_ops",
|
||||
"furumusic__fed_sync_vector",
|
||||
"furumusic__playback_state",
|
||||
] {
|
||||
sqlx::query(&format!("DELETE FROM {table} WHERE user_id = $1"))
|
||||
.bind(user_id)
|
||||
.execute(pool)
|
||||
.await
|
||||
.unwrap();
|
||||
}
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
#[ignore = "requires a migrated disposable database in FURU_DEVICE_SYNC_TEST_DATABASE_URL"]
|
||||
async fn postgres_podcast_relay_gating_and_peer_versions() {
|
||||
let pool = sqlx::PgPool::connect(&std::env::var("FURU_DEVICE_SYNC_TEST_DATABASE_URL").unwrap())
|
||||
.await
|
||||
.unwrap();
|
||||
let user_id = 8_000_000_000 + i64::from(rand_suffix());
|
||||
cleanup(&pool, user_id).await;
|
||||
let new = format!("tui_new_{user_id}");
|
||||
let old = format!("tui_old_{user_id}");
|
||||
let other = format!("tui_other_{user_id}");
|
||||
let identity = ensure_identity(&pool, user_id, "tester").await.unwrap();
|
||||
|
||||
// Peer versions: self-reports replace, relayed profiles only raise.
|
||||
for (device, version) in [(&new, 4), (&old, 3), (&other, 4)] {
|
||||
apply_device_profile(
|
||||
&pool,
|
||||
user_id,
|
||||
&profile(device, version),
|
||||
VersionReport::SelfReported(Some(version)),
|
||||
true,
|
||||
)
|
||||
.await
|
||||
.unwrap();
|
||||
}
|
||||
// A v3 relay lists everyone with its own constant.
|
||||
apply_device_profiles(
|
||||
&pool,
|
||||
user_id,
|
||||
&[profile(&new, 3), profile(&old, 3)],
|
||||
Some(old.as_str()),
|
||||
)
|
||||
.await
|
||||
.unwrap();
|
||||
assert_eq!(
|
||||
stored_protocol_version(&pool, user_id, &new).await.unwrap(),
|
||||
4
|
||||
);
|
||||
assert_eq!(
|
||||
stored_protocol_version(&pool, user_id, &old).await.unwrap(),
|
||||
3
|
||||
);
|
||||
|
||||
// Podcast and music operations from the v4 device.
|
||||
let feed = FeedUrl::parse("https://podcasts.example/feed.xml").unwrap();
|
||||
let podcast_id = PodcastId::from_feed_url(&feed);
|
||||
let episode_id = EpisodeId::from_guid(&podcast_id, "ep-1").unwrap();
|
||||
let meta: PodcastMeta = serde_json::from_value(serde_json::json!({
|
||||
"feed_url": feed.as_str(), "title": "Example Cast"
|
||||
}))
|
||||
.unwrap();
|
||||
let progress = |seq, generation, hlc_ms, position_ms| {
|
||||
op(
|
||||
&new,
|
||||
seq,
|
||||
hlc_ms,
|
||||
SyncOpPayload::PodcastProgressSet {
|
||||
episode_id: episode_id.clone(),
|
||||
podcast_id: podcast_id.clone(),
|
||||
position_ms,
|
||||
status: ProgressStatus::InProgress,
|
||||
generation,
|
||||
session_id: format!("s{generation}"),
|
||||
episode: None,
|
||||
},
|
||||
)
|
||||
};
|
||||
let mut invalid = progress(5, 9, 50, 1);
|
||||
if let SyncOpPayload::PodcastProgressSet { session_id, .. } = &mut invalid.payload {
|
||||
session_id.clear();
|
||||
}
|
||||
let hub = Arc::new(PlayerDeviceHub::default());
|
||||
apply_ops(
|
||||
&pool,
|
||||
Arc::clone(&hub),
|
||||
user_id,
|
||||
vec![
|
||||
op(
|
||||
&new,
|
||||
1,
|
||||
10,
|
||||
SyncOpPayload::PodcastSubscriptionSet {
|
||||
podcast_id: podcast_id.clone(),
|
||||
subscribed: true,
|
||||
podcast: meta,
|
||||
feed_aliases: vec![],
|
||||
generation: 1,
|
||||
},
|
||||
),
|
||||
// Newer generation first, then a late checkpoint of an older one.
|
||||
progress(2, 4, 20, 10_000),
|
||||
progress(3, 3, 90_000, 600_000),
|
||||
op(
|
||||
&new,
|
||||
4,
|
||||
40,
|
||||
SyncOpPayload::TrackLikeSet {
|
||||
content_id: format!("b3:{}", "3".repeat(64)),
|
||||
liked: false,
|
||||
fed: None,
|
||||
},
|
||||
),
|
||||
invalid,
|
||||
],
|
||||
)
|
||||
.await
|
||||
.unwrap();
|
||||
// The invalid operation is not stored but acknowledged.
|
||||
assert_eq!(vector(&pool, user_id).await.unwrap().get(&new), Some(&5));
|
||||
let stored: i64 = sqlx::query_scalar(
|
||||
"SELECT COUNT(*) FROM furumusic__fed_sync_ops WHERE user_id = $1 AND origin_device_id = $2",
|
||||
)
|
||||
.bind(user_id)
|
||||
.bind(&new)
|
||||
.fetch_one(&pool)
|
||||
.await
|
||||
.unwrap();
|
||||
assert_eq!(stored, 4);
|
||||
|
||||
// Relay: the v3 peer gets only music, a v4 peer gets everything.
|
||||
let kinds = |ops: Vec<SyncOpWire>| {
|
||||
ops.iter()
|
||||
.map(|op| payload_kind(&op.payload))
|
||||
.collect::<Vec<_>>()
|
||||
};
|
||||
let to_old = kinds(ops_for_peer(&pool, user_id, &old, 3).await.unwrap());
|
||||
assert!(to_old.iter().all(|kind| !kind.starts_with("podcast_")));
|
||||
assert!(to_old.contains(&"track_like_set"));
|
||||
let to_other = kinds(ops_for_peer(&pool, user_id, &other, 4).await.unwrap());
|
||||
assert_eq!(
|
||||
to_other
|
||||
.iter()
|
||||
.filter(|kind| kind.starts_with("podcast_"))
|
||||
.count(),
|
||||
3
|
||||
);
|
||||
|
||||
// Snapshot recovery: registers merged with the shared rules.
|
||||
apply_snapshot(
|
||||
&pool,
|
||||
user_id,
|
||||
SyncSnapshot {
|
||||
podcast_shares: vec![ShareRecord {
|
||||
podcast_id: podcast_id.clone(),
|
||||
shared: false,
|
||||
generation: 2,
|
||||
hlc_ms: 60,
|
||||
op_id: format!("{other}:1"),
|
||||
}],
|
||||
podcast_progress: vec![ProgressRecord {
|
||||
episode_id: episode_id.clone(),
|
||||
podcast_id: podcast_id.clone(),
|
||||
position_ms: 1,
|
||||
status: ProgressStatus::InProgress,
|
||||
generation: 2,
|
||||
session_id: "old".into(),
|
||||
hlc_ms: 999_999,
|
||||
device_id: other.clone(),
|
||||
op_id: format!("{other}:2"),
|
||||
}],
|
||||
..SyncSnapshot::default()
|
||||
},
|
||||
)
|
||||
.await
|
||||
.unwrap();
|
||||
let full = snapshot(&pool, user_id).await.unwrap();
|
||||
assert_eq!(full.podcast_subscriptions.len(), 1);
|
||||
assert_eq!(full.podcast_shares.len(), 1);
|
||||
assert_eq!(full.podcast_progress.len(), 1);
|
||||
assert_eq!(full.podcast_progress[0].position_ms, 10_000);
|
||||
assert_eq!(full.podcast_progress[0].generation, 4);
|
||||
assert!(!full.for_peer(3).has_podcast_state());
|
||||
assert_eq!(full.for_peer(4), full);
|
||||
|
||||
// A DeviceProfileSet with a version is a self-report of its origin.
|
||||
apply_ops(
|
||||
&pool,
|
||||
Arc::clone(&hub),
|
||||
user_id,
|
||||
vec![op(
|
||||
&old,
|
||||
1,
|
||||
70,
|
||||
SyncOpPayload::DeviceProfileSet {
|
||||
name: "OLD".into(),
|
||||
client_version: "0.4.0".into(),
|
||||
endpoint_ticket: String::new(),
|
||||
endpoint_id: String::new(),
|
||||
protocol_version: Some(4),
|
||||
},
|
||||
)],
|
||||
)
|
||||
.await
|
||||
.unwrap();
|
||||
assert_eq!(
|
||||
stored_protocol_version(&pool, user_id, &old).await.unwrap(),
|
||||
4
|
||||
);
|
||||
|
||||
// First start after the upgrade announces the new version once.
|
||||
sqlx::query(
|
||||
"UPDATE furumusic__fed_device SET protocol_version = 3
|
||||
WHERE user_id = $1 AND device_id = $2",
|
||||
)
|
||||
.bind(user_id)
|
||||
.bind(&identity.device_id)
|
||||
.execute(&pool)
|
||||
.await
|
||||
.unwrap();
|
||||
own_profile(&pool, user_id, "", "").await.unwrap();
|
||||
own_profile(&pool, user_id, "", "").await.unwrap();
|
||||
let announced: Vec<serde_json::Value> = sqlx::query_scalar(
|
||||
"SELECT payload_json FROM furumusic__fed_sync_ops
|
||||
WHERE user_id = $1 AND origin_device_id = $2 AND kind = 'device_profile_set'",
|
||||
)
|
||||
.bind(user_id)
|
||||
.bind(&identity.device_id)
|
||||
.fetch_all(&pool)
|
||||
.await
|
||||
.unwrap();
|
||||
assert_eq!(announced.len(), 1);
|
||||
assert_eq!(announced[0]["protocol_version"], 4);
|
||||
|
||||
// Handoff gating: refused for the v3 device, allowed for v4.
|
||||
let queue = PlaybackStateWire {
|
||||
queue: vec![PlaybackTrack::podcast_episode(test_episode())],
|
||||
queue_pos: 0,
|
||||
playing: true,
|
||||
paused: false,
|
||||
idle_since_ms: None,
|
||||
position_secs: 0.0,
|
||||
volume: 50,
|
||||
shuffle: false,
|
||||
repeat: PlaybackRepeat::Off,
|
||||
playback_rate: None,
|
||||
};
|
||||
sqlx::query(
|
||||
"UPDATE furumusic__fed_device SET protocol_version = 3
|
||||
WHERE user_id = $1 AND device_id = $2",
|
||||
)
|
||||
.bind(user_id)
|
||||
.bind(&old)
|
||||
.execute(&pool)
|
||||
.await
|
||||
.unwrap();
|
||||
let refused = ensure_playback_supported_by(&pool, user_id, &old, &queue)
|
||||
.await
|
||||
.unwrap_err();
|
||||
assert!(refused.to_string().contains("needs an update"));
|
||||
ensure_playback_supported_by(&pool, user_id, &other, &queue)
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
// The typed queue column exists next to queue_json.
|
||||
sqlx::query("SELECT queue_json, queue_items_json FROM furumusic__playback_state LIMIT 0")
|
||||
.execute(&pool)
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
cleanup(&pool, user_id).await;
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
#[ignore = "requires a migrated disposable database in FURU_DEVICE_SYNC_TEST_DATABASE_URL"]
|
||||
async fn postgres_unknown_episode_position_and_rollback_cleanup() {
|
||||
let pool = sqlx::PgPool::connect(&std::env::var("FURU_DEVICE_SYNC_TEST_DATABASE_URL").unwrap())
|
||||
.await
|
||||
.unwrap();
|
||||
let user_id = 8_000_000_000 + i64::from(rand_suffix());
|
||||
cleanup(&pool, user_id).await;
|
||||
let tui = format!("tui_{user_id}");
|
||||
ensure_identity(&pool, user_id, "tester").await.unwrap();
|
||||
apply_device_profile(
|
||||
&pool,
|
||||
user_id,
|
||||
&profile(&tui, 4),
|
||||
VersionReport::SelfReported(Some(4)),
|
||||
true,
|
||||
)
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
// The TUI left the episode at 1200 s (generation 9; queue items saw 7).
|
||||
let episode = test_episode();
|
||||
let hub = Arc::new(PlayerDeviceHub::default());
|
||||
apply_ops(
|
||||
&pool,
|
||||
Arc::clone(&hub),
|
||||
user_id,
|
||||
vec![op(
|
||||
&tui,
|
||||
1,
|
||||
10,
|
||||
SyncOpPayload::PodcastProgressSet {
|
||||
episode_id: episode.episode_id.clone(),
|
||||
podcast_id: episode.podcast_id.clone(),
|
||||
position_ms: 1_200_000,
|
||||
status: ProgressStatus::InProgress,
|
||||
generation: 9,
|
||||
session_id: "s9".into(),
|
||||
episode: None,
|
||||
},
|
||||
)],
|
||||
)
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
// The web player reached the episode by Next and does not know where it
|
||||
// was left; it hands playback to the TUI.
|
||||
let song = serde_json::json!({
|
||||
"id": 77, "title": "Library song", "content_id": format!("b3:{}", "4".repeat(64)),
|
||||
"duration_seconds": 300.0,
|
||||
});
|
||||
let item = crate::player::queue_items::external_track_json(
|
||||
&PlaybackTrack::podcast_episode(episode.clone()),
|
||||
1,
|
||||
None,
|
||||
);
|
||||
let browser = serde_json::json!({
|
||||
"tracks": [song.clone(), item.clone()], "index": 1, "track": item.clone(),
|
||||
"position_seconds": 0.0, "paused": true, "position_unknown": true,
|
||||
});
|
||||
record_web_active_transfer(&pool, user_id, &tui, None, browser)
|
||||
.await
|
||||
.unwrap();
|
||||
let sent: serde_json::Value = sqlx::query_scalar(
|
||||
"SELECT payload_json FROM furumusic__fed_sync_ops
|
||||
WHERE user_id = $1 AND kind = 'playback_command' ORDER BY seq DESC LIMIT 1",
|
||||
)
|
||||
.bind(user_id)
|
||||
.fetch_one(&pool)
|
||||
.await
|
||||
.unwrap();
|
||||
let SyncOpPayload::PlaybackCommand {
|
||||
command: PlaybackCommand::ActiveChanged { state, .. },
|
||||
..
|
||||
} = serde_json::from_value(sent).unwrap()
|
||||
else {
|
||||
panic!("expected ActiveChanged");
|
||||
};
|
||||
assert_eq!(state.position_secs, 1200.0, "never 0");
|
||||
assert_eq!(
|
||||
state.queue[1]
|
||||
.podcast_episode_ref()
|
||||
.unwrap()
|
||||
.progress_generation,
|
||||
Some(9)
|
||||
);
|
||||
|
||||
// Remote Next onto the episode while the TUI plays the song.
|
||||
let current = serde_json::json!({
|
||||
"tracks": [song, item], "index": 0, "track": song,
|
||||
"position_seconds": 200.0, "paused": false,
|
||||
});
|
||||
let next = record_web_playback_command(
|
||||
&pool,
|
||||
user_id,
|
||||
&tui,
|
||||
"next",
|
||||
serde_json::json!({}),
|
||||
Some(current),
|
||||
)
|
||||
.await
|
||||
.unwrap();
|
||||
assert_eq!(next["index"], 1);
|
||||
assert_eq!(next["position_seconds"], 1200.0);
|
||||
assert!(
|
||||
next.get(crate::player::queue_items::POSITION_UNKNOWN_KEY)
|
||||
.is_none()
|
||||
);
|
||||
|
||||
// Rollback to 0.12: its types fail on the relayed podcast operation, and
|
||||
// parse everything once the documented cleanup ran.
|
||||
let parse_like_0_12 = |rows: Vec<serde_json::Value>| {
|
||||
rows.into_iter()
|
||||
.map(serde_json::from_value::<super::wire_compat_tests::legacy::SyncOpPayload>)
|
||||
.collect::<Result<Vec<_>, _>>()
|
||||
};
|
||||
let rows = || async {
|
||||
sqlx::query_scalar::<_, serde_json::Value>(
|
||||
"SELECT payload_json FROM furumusic__fed_sync_ops WHERE user_id = $1",
|
||||
)
|
||||
.bind(user_id)
|
||||
.fetch_all(&pool)
|
||||
.await
|
||||
.unwrap()
|
||||
};
|
||||
assert!(parse_like_0_12(rows().await).is_err());
|
||||
sqlx::query(&format!(
|
||||
"{} AND user_id = $1",
|
||||
crate::music::db_migrations::DELETE_PODCAST_SYNC_OPS_SQL
|
||||
))
|
||||
.bind(user_id)
|
||||
.execute(&pool)
|
||||
.await
|
||||
.unwrap();
|
||||
let remaining = parse_like_0_12(rows().await).unwrap();
|
||||
// The playback commands (with the episode's `source`) stay readable.
|
||||
assert_eq!(
|
||||
remaining
|
||||
.iter()
|
||||
.filter(|payload| matches!(
|
||||
payload,
|
||||
super::wire_compat_tests::legacy::SyncOpPayload::PlaybackCommand { .. }
|
||||
))
|
||||
.count(),
|
||||
2
|
||||
);
|
||||
|
||||
cleanup(&pool, user_id).await;
|
||||
}
|
||||
|
||||
fn rand_suffix() -> u32 {
|
||||
u32::from_le_bytes(
|
||||
blake3::hash(random_hex(8).as_bytes()).as_bytes()[..4]
|
||||
.try_into()
|
||||
.unwrap(),
|
||||
) % 1_000_000_000
|
||||
}
|
||||
@@ -0,0 +1,524 @@
|
||||
//! Golden wire-compatibility tests: the shared `music_dht::device_sync`
|
||||
//! types must serialize v3 content byte-for-byte like the private copies that
|
||||
//! furumi-web 0.12.x used (kept verbatim in `legacy` below), so TUI 0.3.x and
|
||||
//! older web servers keep interoperating.
|
||||
|
||||
use super::*;
|
||||
|
||||
/// Private wire types of furumi-web 0.12.4 (`src/federation/devices.rs`),
|
||||
/// copied verbatim apart from visibility and `PartialEq`.
|
||||
#[allow(dead_code)]
|
||||
pub(super) mod legacy {
|
||||
use music_dht::device_sync::ListenEvent;
|
||||
use music_dht::playback::CommandStamp;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use std::collections::BTreeMap;
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
||||
pub struct InviteWire {
|
||||
pub v: u16,
|
||||
#[serde(rename = "t")]
|
||||
pub ticket: String,
|
||||
#[serde(rename = "d")]
|
||||
pub device_id: String,
|
||||
#[serde(rename = "i")]
|
||||
pub invite_id: String,
|
||||
#[serde(rename = "s")]
|
||||
pub secret: String,
|
||||
#[serde(rename = "e")]
|
||||
pub expires_at_ms: i64,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
||||
pub struct DeviceProfileWire {
|
||||
pub device_id: String,
|
||||
pub name: String,
|
||||
pub client_version: String,
|
||||
pub protocol_version: u16,
|
||||
pub endpoint_id: String,
|
||||
pub endpoint_ticket: String,
|
||||
#[serde(default)]
|
||||
pub revoked: bool,
|
||||
#[serde(default)]
|
||||
pub revoke_cutoff_seq: Option<i64>,
|
||||
#[serde(default)]
|
||||
pub updated_at_ms: i64,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
||||
pub struct SyncedFedTrack {
|
||||
pub item_id: String,
|
||||
pub owner: String,
|
||||
pub title: String,
|
||||
#[serde(default)]
|
||||
pub artist_names: Vec<String>,
|
||||
#[serde(default)]
|
||||
pub featured_artist_names: Vec<String>,
|
||||
pub year: Option<i32>,
|
||||
pub duration_seconds: Option<i64>,
|
||||
pub content_id: String,
|
||||
pub release_title: Option<String>,
|
||||
pub track_number: Option<i32>,
|
||||
pub disc_number: Option<i32>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
||||
pub struct PlaybackTrack {
|
||||
pub id: i64,
|
||||
pub title: String,
|
||||
pub track_number: Option<i32>,
|
||||
pub disc_number: Option<i32>,
|
||||
pub duration_seconds: f64,
|
||||
#[serde(default)]
|
||||
pub artist_names: Vec<String>,
|
||||
#[serde(default)]
|
||||
pub featured_artist_names: Vec<String>,
|
||||
pub release_id: i64,
|
||||
pub release_title: String,
|
||||
pub release_year: Option<i32>,
|
||||
#[serde(default)]
|
||||
pub file_path: String,
|
||||
pub content_id: Option<String>,
|
||||
pub audio_format: Option<String>,
|
||||
pub audio_bitrate: Option<i32>,
|
||||
pub audio_sample_rate: Option<i32>,
|
||||
pub audio_bit_depth: Option<i32>,
|
||||
pub file_size_bytes: Option<i64>,
|
||||
#[serde(default)]
|
||||
pub play_count: i64,
|
||||
#[serde(default)]
|
||||
pub fed: Option<SyncedFedTrack>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize, Default)]
|
||||
#[serde(rename_all = "snake_case")]
|
||||
pub enum PlaybackRepeat {
|
||||
#[default]
|
||||
Off,
|
||||
One,
|
||||
All,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
||||
pub struct PlaybackStateWire {
|
||||
#[serde(default)]
|
||||
pub queue: Vec<PlaybackTrack>,
|
||||
#[serde(default)]
|
||||
pub queue_pos: usize,
|
||||
pub playing: bool,
|
||||
pub paused: bool,
|
||||
#[serde(default)]
|
||||
pub idle_since_ms: Option<i64>,
|
||||
pub position_secs: f64,
|
||||
#[serde(default)]
|
||||
pub volume: u8,
|
||||
pub shuffle: bool,
|
||||
pub repeat: PlaybackRepeat,
|
||||
}
|
||||
|
||||
pub type PlaybackSnapshot = music_dht::playback::Snapshot<PlaybackStateWire>;
|
||||
pub type PlaybackCommand = music_dht::playback::Command<PlaybackStateWire>;
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
||||
pub struct SyncOpWire {
|
||||
pub op_id: String,
|
||||
pub origin_device_id: String,
|
||||
pub seq: i64,
|
||||
pub hlc_ms: i64,
|
||||
pub payload: SyncOpPayload,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
||||
#[serde(tag = "kind", rename_all = "snake_case")]
|
||||
pub enum SyncOpPayload {
|
||||
TrackLikeSet {
|
||||
content_id: String,
|
||||
liked: bool,
|
||||
#[serde(default)]
|
||||
fed: Option<SyncedFedTrack>,
|
||||
},
|
||||
PlaylistCreated {
|
||||
playlist_id: String,
|
||||
title: String,
|
||||
},
|
||||
PlaylistRenamed {
|
||||
playlist_id: String,
|
||||
title: String,
|
||||
},
|
||||
PlaylistDeleted {
|
||||
playlist_id: String,
|
||||
},
|
||||
PlaylistTrackAdded {
|
||||
playlist_id: String,
|
||||
content_id: String,
|
||||
position: i64,
|
||||
#[serde(default)]
|
||||
fed: Option<SyncedFedTrack>,
|
||||
},
|
||||
PlaylistTrackRemoved {
|
||||
playlist_id: String,
|
||||
content_id: String,
|
||||
},
|
||||
DeviceProfileSet {
|
||||
name: String,
|
||||
client_version: String,
|
||||
endpoint_ticket: String,
|
||||
endpoint_id: String,
|
||||
},
|
||||
DeviceTrusted {
|
||||
target_device_id: String,
|
||||
},
|
||||
DeviceRevoked {
|
||||
target_device_id: String,
|
||||
target_max_seq_seen: i64,
|
||||
},
|
||||
PlaybackCommand {
|
||||
target_device_id: String,
|
||||
command: PlaybackCommand,
|
||||
#[serde(default)]
|
||||
authority: Option<CommandStamp>,
|
||||
},
|
||||
ListenRecorded {
|
||||
event: ListenEvent,
|
||||
},
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
|
||||
pub struct SyncSnapshot {
|
||||
#[serde(default)]
|
||||
pub likes: Vec<SnapshotLike>,
|
||||
#[serde(default)]
|
||||
pub unlikes: Vec<SnapshotLikeTombstone>,
|
||||
#[serde(default)]
|
||||
pub playlists: Vec<SnapshotPlaylist>,
|
||||
#[serde(default)]
|
||||
pub deleted_playlists: Vec<SnapshotPlaylistTombstone>,
|
||||
#[serde(default)]
|
||||
pub removed_playlist_items: Vec<SnapshotPlaylistItemTombstone>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
||||
pub struct SnapshotLike {
|
||||
pub content_id: String,
|
||||
pub hlc_ms: i64,
|
||||
pub op_id: String,
|
||||
#[serde(default)]
|
||||
pub fed: Option<SyncedFedTrack>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
||||
pub struct SnapshotLikeTombstone {
|
||||
pub content_id: String,
|
||||
pub hlc_ms: i64,
|
||||
pub op_id: String,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
||||
pub struct SnapshotPlaylist {
|
||||
pub playlist_id: String,
|
||||
pub title: String,
|
||||
pub hlc_ms: i64,
|
||||
pub op_id: String,
|
||||
#[serde(default)]
|
||||
pub items: Vec<SnapshotPlaylistItem>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
||||
pub struct SnapshotPlaylistTombstone {
|
||||
pub playlist_id: String,
|
||||
pub hlc_ms: i64,
|
||||
pub op_id: String,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
||||
pub struct SnapshotPlaylistItem {
|
||||
pub content_id: String,
|
||||
pub position: i64,
|
||||
pub hlc_ms: i64,
|
||||
pub op_id: String,
|
||||
#[serde(default)]
|
||||
pub fed: Option<SyncedFedTrack>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
||||
pub struct SnapshotPlaylistItemTombstone {
|
||||
pub playlist_id: String,
|
||||
pub content_id: String,
|
||||
pub hlc_ms: i64,
|
||||
pub op_id: String,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
||||
#[serde(tag = "type", rename_all = "snake_case")]
|
||||
pub enum WireMessage {
|
||||
PairRequest {
|
||||
invite_id: String,
|
||||
secret: String,
|
||||
profile: DeviceProfileWire,
|
||||
#[serde(default)]
|
||||
group_id: Option<String>,
|
||||
#[serde(default)]
|
||||
group_active_devices: usize,
|
||||
#[serde(default)]
|
||||
devices: Vec<DeviceProfileWire>,
|
||||
vector: BTreeMap<String, i64>,
|
||||
ops: Vec<SyncOpWire>,
|
||||
snapshot: SyncSnapshot,
|
||||
#[serde(default)]
|
||||
playback: Option<PlaybackSnapshot>,
|
||||
},
|
||||
PairResponse {
|
||||
accepted: bool,
|
||||
#[serde(default)]
|
||||
pending: bool,
|
||||
#[serde(default)]
|
||||
error: Option<String>,
|
||||
#[serde(default)]
|
||||
group_id: Option<String>,
|
||||
#[serde(default)]
|
||||
profile: Option<DeviceProfileWire>,
|
||||
#[serde(default)]
|
||||
devices: Vec<DeviceProfileWire>,
|
||||
#[serde(default)]
|
||||
vector: BTreeMap<String, i64>,
|
||||
#[serde(default)]
|
||||
ops: Vec<SyncOpWire>,
|
||||
#[serde(default)]
|
||||
snapshot: SyncSnapshot,
|
||||
#[serde(default)]
|
||||
playback: Option<PlaybackSnapshot>,
|
||||
},
|
||||
Hello {
|
||||
group_id: String,
|
||||
profile: DeviceProfileWire,
|
||||
devices: Vec<DeviceProfileWire>,
|
||||
vector: BTreeMap<String, i64>,
|
||||
ops: Vec<SyncOpWire>,
|
||||
snapshot: SyncSnapshot,
|
||||
#[serde(default)]
|
||||
playback: Option<PlaybackSnapshot>,
|
||||
},
|
||||
SyncResponse {
|
||||
accepted: bool,
|
||||
#[serde(default)]
|
||||
error: Option<String>,
|
||||
#[serde(default)]
|
||||
devices: Vec<DeviceProfileWire>,
|
||||
#[serde(default)]
|
||||
vector: BTreeMap<String, i64>,
|
||||
#[serde(default)]
|
||||
ops: Vec<SyncOpWire>,
|
||||
#[serde(default)]
|
||||
snapshot: SyncSnapshot,
|
||||
#[serde(default)]
|
||||
playback: Option<PlaybackSnapshot>,
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
const CONTENT_ID: &str = "b3:1111111111111111111111111111111111111111111111111111111111111111";
|
||||
|
||||
/// A v3 `hello` exercising every v3 operation kind, every snapshot section
|
||||
/// and a coordinated playback snapshot (input order is irrelevant).
|
||||
fn v3_hello_input() -> String {
|
||||
let fed = serde_json::json!({
|
||||
"item_id": "item", "owner": "owner", "title": "Song", "artist_names": ["A"],
|
||||
"featured_artist_names": [], "year": 2001, "duration_seconds": 180,
|
||||
"content_id": CONTENT_ID, "release_title": "Album", "track_number": 1, "disc_number": 1,
|
||||
});
|
||||
let track = serde_json::json!({
|
||||
"id": 7, "title": "Song", "track_number": 1, "disc_number": null,
|
||||
"duration_seconds": 180.5, "artist_names": ["A"], "featured_artist_names": ["B"],
|
||||
"release_id": 3, "release_title": "Album", "release_year": 2001, "file_path": "",
|
||||
"content_id": CONTENT_ID, "audio_format": "flac", "audio_bitrate": 900,
|
||||
"audio_sample_rate": 44100, "audio_bit_depth": 16, "file_size_bytes": 12345,
|
||||
"play_count": 2, "fed": fed,
|
||||
});
|
||||
let state = serde_json::json!({
|
||||
"queue": [track, {"id": 0, "title": "Remote", "track_number": null, "disc_number": null,
|
||||
"duration_seconds": 0.0, "release_id": 0, "release_title": "", "release_year": null,
|
||||
"content_id": null, "audio_format": null, "audio_bitrate": null,
|
||||
"audio_sample_rate": null, "audio_bit_depth": null, "file_size_bytes": null}],
|
||||
"queue_pos": 1, "playing": true, "paused": false, "idle_since_ms": null,
|
||||
"position_secs": 42.5, "volume": 73, "shuffle": true, "repeat": "all",
|
||||
});
|
||||
let claim = serde_json::json!({"counter": 3, "issuer": "tui_a", "owner": "tui_a"});
|
||||
let stamp = serde_json::json!({"version": 1, "claim": claim, "sequence": 9});
|
||||
let op = |seq: i64, payload: serde_json::Value| {
|
||||
serde_json::json!({"op_id": format!("tui_a:{seq}"), "origin_device_id": "tui_a",
|
||||
"seq": seq, "hlc_ms": 1_700_000_000_000i64 + seq, "payload": payload})
|
||||
};
|
||||
let profile = |id: &str| {
|
||||
serde_json::json!({"device_id": id, "name": "TUI", "client_version": "0.3.4",
|
||||
"protocol_version": 3, "endpoint_id": "e", "endpoint_ticket": "t",
|
||||
"revoked": false, "revoke_cutoff_seq": null, "updated_at_ms": 5})
|
||||
};
|
||||
serde_json::json!({
|
||||
"type": "hello",
|
||||
"group_id": "grp_1",
|
||||
"profile": profile("tui_a"),
|
||||
"devices": [profile("tui_a"), profile("web_b")],
|
||||
"vector": {"tui_a": 12, "web_b": 4},
|
||||
"ops": [
|
||||
op(1, serde_json::json!({"kind": "track_like_set", "content_id": CONTENT_ID, "liked": true, "fed": fed})),
|
||||
op(2, serde_json::json!({"kind": "playlist_created", "playlist_id": "pl", "title": "Mix"})),
|
||||
op(3, serde_json::json!({"kind": "playlist_renamed", "playlist_id": "pl", "title": "Mix 2"})),
|
||||
op(4, serde_json::json!({"kind": "playlist_track_added", "playlist_id": "pl", "content_id": CONTENT_ID, "position": 0, "fed": null})),
|
||||
op(5, serde_json::json!({"kind": "playlist_track_removed", "playlist_id": "pl", "content_id": CONTENT_ID})),
|
||||
op(6, serde_json::json!({"kind": "playlist_deleted", "playlist_id": "pl"})),
|
||||
op(7, serde_json::json!({"kind": "device_profile_set", "name": "TUI", "client_version": "0.3.4", "endpoint_ticket": "t", "endpoint_id": "e"})),
|
||||
op(8, serde_json::json!({"kind": "device_trusted", "target_device_id": "web_b"})),
|
||||
op(9, serde_json::json!({"kind": "device_revoked", "target_device_id": "old", "target_max_seq_seen": 3})),
|
||||
op(10, serde_json::json!({"kind": "playback_command", "target_device_id": "web_b",
|
||||
"command": {"kind": "set_state", "state": state, "seek": true}, "authority": stamp})),
|
||||
op(11, serde_json::json!({"kind": "playback_command", "target_device_id": "web_b",
|
||||
"command": {"kind": "active_changed", "active_device_id": "web_b", "active_device_name": "WEB", "state": state}})),
|
||||
op(12, serde_json::json!({"kind": "listen_recorded", "event": {"listen_id": "l1",
|
||||
"content_id": CONTENT_ID, "started_at_ms": 1, "listened_ms": 60000, "track_duration_ms": 180000,
|
||||
"ended_reason": "finished", "track": {"title": "Song", "artist_names": ["A"], "featured_artist_names": [], "release_title": null}}})),
|
||||
],
|
||||
"snapshot": {
|
||||
"likes": [{"content_id": CONTENT_ID, "hlc_ms": 1, "op_id": "tui_a:1", "fed": fed}],
|
||||
"unlikes": [{"content_id": CONTENT_ID, "hlc_ms": 2, "op_id": "tui_a:2"}],
|
||||
"playlists": [{"playlist_id": "pl", "title": "Mix", "hlc_ms": 3, "op_id": "tui_a:3",
|
||||
"items": [{"content_id": CONTENT_ID, "position": 0, "hlc_ms": 4, "op_id": "tui_a:4", "fed": null}]}],
|
||||
"deleted_playlists": [{"playlist_id": "gone", "hlc_ms": 5, "op_id": "tui_a:5"}],
|
||||
"removed_playlist_items": [{"playlist_id": "pl", "content_id": CONTENT_ID, "hlc_ms": 6, "op_id": "tui_a:6"}],
|
||||
},
|
||||
"playback": {"device_id": "tui_a", "device_name": "TUI", "active": true, "updated_at_ms": 9,
|
||||
"state": state, "coordination": {"version": 1, "claim": claim, "heartbeat": 4, "available": true, "playing": true}},
|
||||
})
|
||||
.to_string()
|
||||
}
|
||||
|
||||
fn v3_other_inputs() -> Vec<String> {
|
||||
vec![
|
||||
r#"{"type":"sync_response","accepted":false,"error":"device is not trusted"}"#.into(),
|
||||
r#"{"type":"pair_response","accepted":false,"pending":true,"error":"pairing pending"}"#
|
||||
.into(),
|
||||
serde_json::json!({"type": "pair_request", "invite_id": "i", "secret": "s",
|
||||
"profile": {"device_id": "tui_a", "name": "TUI", "client_version": "0.3.4",
|
||||
"protocol_version": 3, "endpoint_id": "e", "endpoint_ticket": "t"},
|
||||
"vector": {}, "ops": [], "snapshot": {}})
|
||||
.to_string(),
|
||||
]
|
||||
}
|
||||
|
||||
/// Parses `input` with the 0.12.x types and the shared types and checks
|
||||
/// that both serialize to the same bytes, and that each side parses the
|
||||
/// other's output.
|
||||
fn assert_identical(input: &str) -> String {
|
||||
let old: legacy::WireMessage = serde_json::from_str(input).unwrap();
|
||||
let new: WireMessage = serde_json::from_str(input).unwrap();
|
||||
let old_json = serde_json::to_string(&old).unwrap();
|
||||
let new_json = serde_json::to_string(&new).unwrap();
|
||||
assert_eq!(old_json, new_json);
|
||||
assert_eq!(
|
||||
serde_json::from_str::<legacy::WireMessage>(&new_json).unwrap(),
|
||||
old
|
||||
);
|
||||
assert_eq!(serde_json::from_str::<WireMessage>(&old_json).unwrap(), new);
|
||||
new_json
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn v3_messages_serialize_like_furumi_web_0_12() {
|
||||
let hello = assert_identical(&v3_hello_input());
|
||||
let golden = concat!(
|
||||
env!("CARGO_MANIFEST_DIR"),
|
||||
"/src/federation/devices/fixtures/v3_hello.golden.json"
|
||||
);
|
||||
if std::env::var_os("FURUMUSIC_BLESS_GOLDEN").is_some() {
|
||||
// Only for a deliberate change of the v3 shape.
|
||||
std::fs::write(golden, format!("{hello}\n")).unwrap();
|
||||
}
|
||||
assert_eq!(hello, std::fs::read_to_string(golden).unwrap().trim_end());
|
||||
for input in v3_other_inputs() {
|
||||
assert_identical(&input);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn invites_stay_readable_by_older_clients() {
|
||||
let old = legacy::InviteWire {
|
||||
v: 1,
|
||||
ticket: "ticket".into(),
|
||||
device_id: "web_a".into(),
|
||||
invite_id: "inv".into(),
|
||||
secret: "s3cr3t".into(),
|
||||
expires_at_ms: 10,
|
||||
};
|
||||
let old_json = serde_json::to_string(&old).unwrap();
|
||||
assert_eq!(
|
||||
old_json,
|
||||
r#"{"v":1,"t":"ticket","d":"web_a","i":"inv","s":"s3cr3t","e":10}"#
|
||||
);
|
||||
let shared: InviteWire = serde_json::from_str(&old_json).unwrap();
|
||||
assert_eq!(shared.inviter_protocol_version(), 1);
|
||||
assert_eq!(serde_json::to_string(&shared).unwrap(), old_json);
|
||||
let link = encode_invite(&InviteWire {
|
||||
protocol_version: Some(PROTOCOL_VERSION),
|
||||
..shared
|
||||
})
|
||||
.unwrap();
|
||||
let parsed = parse_invite(&link).unwrap();
|
||||
assert_eq!(parsed.inviter_protocol_version(), PROTOCOL_VERSION);
|
||||
// `p` is an unknown field for 0.12.x and is ignored there.
|
||||
let token = link.strip_prefix("frid://i/").unwrap();
|
||||
assert!(!token.is_empty());
|
||||
let json = serde_json::to_string(&parsed).unwrap();
|
||||
assert!(json.ends_with(r#","p":4}"#));
|
||||
assert_eq!(
|
||||
serde_json::from_str::<legacy::InviteWire>(&json).unwrap(),
|
||||
old
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn v3_peers_cannot_parse_podcast_operations() {
|
||||
// Why podcast operations must be gated: an unknown `kind` breaks the
|
||||
// whole message for a 0.12.x/TUI 0.3.x peer, not one operation.
|
||||
let mut hello: serde_json::Value = serde_json::from_str(&v3_hello_input()).unwrap();
|
||||
hello["ops"].as_array_mut().unwrap().push(serde_json::json!({
|
||||
"op_id": "tui_a:13", "origin_device_id": "tui_a", "seq": 13, "hlc_ms": 13,
|
||||
"payload": {"kind": "podcast_share_set",
|
||||
"podcast_id": music_dht::podcast::PodcastId::from_feed_url(
|
||||
&music_dht::podcast::FeedUrl::parse("https://podcasts.example/feed.xml").unwrap()),
|
||||
"shared": false, "generation": 1},
|
||||
}));
|
||||
assert!(serde_json::from_value::<legacy::WireMessage>(hello.clone()).is_err());
|
||||
assert!(serde_json::from_value::<WireMessage>(hello).is_ok());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn v3_peers_would_drop_the_source_of_podcast_items() {
|
||||
// Why podcast playback must be gated: older types ignore `source` and
|
||||
// forward the episode as a broken music item.
|
||||
let episode = PlaybackTrack::podcast_episode(crate::player::queue_items::test_episode());
|
||||
let json = serde_json::to_string(&episode).unwrap();
|
||||
assert!(json.contains(r#""source":{"kind":"podcast_episode""#));
|
||||
let old: legacy::PlaybackTrack = serde_json::from_str(&json).unwrap();
|
||||
let forwarded: PlaybackTrack =
|
||||
serde_json::from_str(&serde_json::to_string(&old).unwrap()).unwrap();
|
||||
assert_eq!(forwarded.source, None);
|
||||
assert_eq!(forwarded.id, 0);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn v4_profile_announcements_stay_readable_by_older_clients() {
|
||||
let announcement = SyncOpPayload::DeviceProfileSet {
|
||||
name: "WEB".into(),
|
||||
client_version: "0.13.0".into(),
|
||||
endpoint_ticket: "t".into(),
|
||||
endpoint_id: "e".into(),
|
||||
protocol_version: Some(PROTOCOL_VERSION),
|
||||
};
|
||||
let json = serde_json::to_string(&announcement).unwrap();
|
||||
assert!(json.ends_with(r#","protocol_version":4}"#));
|
||||
// 0.12.x and TUI 0.3.x ignore the new field.
|
||||
let old: legacy::SyncOpPayload = serde_json::from_str(&json).unwrap();
|
||||
assert!(matches!(
|
||||
old,
|
||||
legacy::SyncOpPayload::DeviceProfileSet { .. }
|
||||
));
|
||||
}
|
||||
@@ -17,6 +17,7 @@
|
||||
mod capabilities;
|
||||
pub mod client;
|
||||
pub mod devices;
|
||||
mod podcast_relay;
|
||||
mod receive;
|
||||
mod serve;
|
||||
mod similarity;
|
||||
@@ -1192,6 +1193,18 @@ impl Federation {
|
||||
.await
|
||||
}
|
||||
|
||||
/// Refuses a transfer that the target device cannot receive (podcast
|
||||
/// items for a device below protocol v4) before ownership changes.
|
||||
pub async fn fed_device_web_transfer_check(
|
||||
&self,
|
||||
user_id: i64,
|
||||
target_device_id: &str,
|
||||
state: serde_json::Value,
|
||||
) -> Result<()> {
|
||||
let pool = self.pool().await?;
|
||||
devices::check_web_transfer(&pool, user_id, target_device_id, state).await
|
||||
}
|
||||
|
||||
pub async fn fed_device_web_active_takeover(
|
||||
&self,
|
||||
user_id: i64,
|
||||
|
||||
@@ -0,0 +1,575 @@
|
||||
//! Lossless relay of podcast sync state (device-sync protocol v4).
|
||||
//!
|
||||
//! The web server does not implement podcasts yet, but it announces protocol
|
||||
//! v4 and therefore must not lose podcast state that trusted devices send
|
||||
//! through it:
|
||||
//!
|
||||
//! * podcast operations are stored verbatim in the generic operation log
|
||||
//! (`furumusic__fed_sync_ops`) and forwarded to v4 peers only;
|
||||
//! * the podcast registers carried by those operations and by snapshot
|
||||
//! sections are kept here as opaque JSON documents, merged with the shared
|
||||
//! `music_dht::podcast` rules, and returned in this device's snapshots.
|
||||
//! Snapshots are the only recovery path for a peer that skipped podcast
|
||||
//! operations while it ran an older version.
|
||||
//!
|
||||
//! The rows hold the shared contract types (`SubscriptionRecord`,
|
||||
//! `ShareRecord`, `ProgressRecord`, `ListenSession`) as JSON and nothing
|
||||
//! web-specific; a later podcast store can import them.
|
||||
|
||||
use anyhow::Result;
|
||||
use music_dht::device_sync::{SyncOpWire, SyncSnapshot};
|
||||
use music_dht::podcast::{
|
||||
FeedUrl, ListenSession, PodcastId, ProgressRecord, ShareRecord, SubscriptionRecord,
|
||||
merge_feed_aliases, merge_listen_session, merge_progress, merge_share, merge_subscription,
|
||||
};
|
||||
use serde::Serialize;
|
||||
use serde::de::DeserializeOwned;
|
||||
use serde_json::Value;
|
||||
use sqlx::Row;
|
||||
|
||||
const SECTION_SUBSCRIPTION: &str = "subscription";
|
||||
const SECTION_SHARE: &str = "share";
|
||||
const SECTION_ALIASES: &str = "aliases";
|
||||
const SECTION_PROGRESS: &str = "progress";
|
||||
const SECTION_SESSION: &str = "session";
|
||||
|
||||
/// One podcast register update, keyed by its entity.
|
||||
#[derive(Debug, Clone, PartialEq)]
|
||||
pub(crate) enum RelayRecord {
|
||||
/// Subscription register of a podcast.
|
||||
Subscription(SubscriptionRecord),
|
||||
/// Share register of a podcast.
|
||||
Share(ShareRecord),
|
||||
/// Feed aliases learned before (or without) the subscription register.
|
||||
Aliases(PodcastId, Vec<FeedUrl>),
|
||||
/// Progress register of an episode.
|
||||
Progress(ProgressRecord),
|
||||
/// Listening session.
|
||||
Session(ListenSession),
|
||||
}
|
||||
|
||||
impl RelayRecord {
|
||||
fn section(&self) -> &'static str {
|
||||
match self {
|
||||
RelayRecord::Subscription(_) => SECTION_SUBSCRIPTION,
|
||||
RelayRecord::Share(_) => SECTION_SHARE,
|
||||
RelayRecord::Aliases(..) => SECTION_ALIASES,
|
||||
RelayRecord::Progress(_) => SECTION_PROGRESS,
|
||||
RelayRecord::Session(_) => SECTION_SESSION,
|
||||
}
|
||||
}
|
||||
|
||||
fn key(&self) -> &str {
|
||||
match self {
|
||||
RelayRecord::Subscription(record) => record.podcast_id.as_str(),
|
||||
RelayRecord::Share(record) => record.podcast_id.as_str(),
|
||||
RelayRecord::Aliases(podcast_id, _) => podcast_id.as_str(),
|
||||
RelayRecord::Progress(record) => record.episode_id.as_str(),
|
||||
RelayRecord::Session(session) => session.session_id.as_str(),
|
||||
}
|
||||
}
|
||||
|
||||
/// Register updates carried by a podcast operation.
|
||||
///
|
||||
/// Operations that fail `validate_podcast` must be dropped before this.
|
||||
pub(crate) fn from_op(op: &SyncOpWire) -> Option<Self> {
|
||||
if let Some(record) = op.podcast_subscription() {
|
||||
return Some(RelayRecord::Subscription(record));
|
||||
}
|
||||
if let Some(record) = op.podcast_share() {
|
||||
return Some(RelayRecord::Share(record));
|
||||
}
|
||||
if let Some((podcast_id, aliases)) = op.podcast_feed_aliases() {
|
||||
return Some(RelayRecord::Aliases(podcast_id.clone(), aliases.to_vec()));
|
||||
}
|
||||
if let Some(record) = op.podcast_progress() {
|
||||
return Some(RelayRecord::Progress(record));
|
||||
}
|
||||
op.podcast_listen_session()
|
||||
.map(|session| RelayRecord::Session(session.clone()))
|
||||
}
|
||||
|
||||
/// Valid register records of a snapshot. Podcast sections that exceed
|
||||
/// the contract counts are ignored as a whole; invalid records are
|
||||
/// skipped one by one.
|
||||
pub(crate) fn from_snapshot(snapshot: &SyncSnapshot) -> Vec<Self> {
|
||||
if !snapshot.podcast_state_within_limits() {
|
||||
tracing::debug!("ignored podcast snapshot sections above the contract limits");
|
||||
return Vec::new();
|
||||
}
|
||||
let subscriptions = snapshot
|
||||
.podcast_subscriptions
|
||||
.iter()
|
||||
.filter(|record| record.validate().is_ok())
|
||||
.cloned()
|
||||
.map(RelayRecord::Subscription);
|
||||
let shares = snapshot
|
||||
.podcast_shares
|
||||
.iter()
|
||||
.filter(|record| record.validate().is_ok())
|
||||
.cloned()
|
||||
.map(RelayRecord::Share);
|
||||
let progress = snapshot
|
||||
.podcast_progress
|
||||
.iter()
|
||||
.filter(|record| record.validate().is_ok())
|
||||
.cloned()
|
||||
.map(RelayRecord::Progress);
|
||||
let sessions = snapshot
|
||||
.podcast_listen_sessions
|
||||
.iter()
|
||||
.filter(|session| session.validate().is_ok())
|
||||
.cloned()
|
||||
.map(RelayRecord::Session);
|
||||
subscriptions
|
||||
.chain(shares)
|
||||
.chain(progress)
|
||||
.chain(sessions)
|
||||
.collect()
|
||||
}
|
||||
}
|
||||
|
||||
/// Document address: `(section, record_key)`.
|
||||
type DocKey = (&'static str, String);
|
||||
|
||||
/// Documents a record's merge reads.
|
||||
fn read_keys(record: &RelayRecord) -> Vec<DocKey> {
|
||||
let own = (record.section(), record.key().to_string());
|
||||
match record {
|
||||
RelayRecord::Aliases(podcast_id, _) => {
|
||||
vec![(SECTION_SUBSCRIPTION, podcast_id.as_str().to_string()), own]
|
||||
}
|
||||
RelayRecord::Subscription(_) => {
|
||||
vec![(SECTION_ALIASES, record.key().to_string()), own]
|
||||
}
|
||||
_ => vec![own],
|
||||
}
|
||||
}
|
||||
|
||||
/// Merges `incoming` into the stored documents with the shared rules.
|
||||
///
|
||||
/// Returns the writes: `Some(value)` upserts, `None` deletes. Aliases
|
||||
/// learned before the subscription register are kept in their own document
|
||||
/// and folded into the register when it arrives.
|
||||
fn plan_merge(
|
||||
docs: &std::collections::BTreeMap<DocKey, Value>,
|
||||
incoming: &RelayRecord,
|
||||
) -> Vec<(DocKey, Option<Value>)> {
|
||||
let own = (incoming.section(), incoming.key().to_string());
|
||||
let current = docs.get(&own);
|
||||
let changed = |merged: Option<Value>| {
|
||||
merged
|
||||
.filter(|merged| current != Some(merged))
|
||||
.map(|merged| (own.clone(), Some(merged)))
|
||||
};
|
||||
match incoming {
|
||||
RelayRecord::Subscription(record) => {
|
||||
let alias_key = (SECTION_ALIASES, incoming.key().to_string());
|
||||
let pending = docs.get(&alias_key).and_then(parse::<Vec<FeedUrl>>);
|
||||
let merged = match current.and_then(parse::<SubscriptionRecord>) {
|
||||
Some(current) => merge_subscription(¤t, record).ok(),
|
||||
None => {
|
||||
let mut record = record.clone();
|
||||
record.normalize();
|
||||
Some(record)
|
||||
}
|
||||
}
|
||||
.map(|mut record| {
|
||||
if let Some(aliases) = &pending {
|
||||
record.add_feed_aliases(aliases);
|
||||
}
|
||||
record
|
||||
});
|
||||
let mut writes: Vec<_> = changed(merged.as_ref().and_then(to_value))
|
||||
.into_iter()
|
||||
.collect();
|
||||
if docs.contains_key(&alias_key) && merged.is_some() {
|
||||
writes.push((alias_key, None));
|
||||
}
|
||||
writes
|
||||
}
|
||||
RelayRecord::Aliases(podcast_id, aliases) => {
|
||||
let sub_key = (SECTION_SUBSCRIPTION, podcast_id.as_str().to_string());
|
||||
if let Some(subscription) = docs.get(&sub_key) {
|
||||
let Some(mut record) = parse::<SubscriptionRecord>(subscription) else {
|
||||
return Vec::new();
|
||||
};
|
||||
record.add_feed_aliases(aliases);
|
||||
return to_value(&record)
|
||||
.filter(|merged| merged != subscription)
|
||||
.map(|merged| vec![(sub_key, Some(merged))])
|
||||
.unwrap_or_default();
|
||||
}
|
||||
let current = current.and_then(parse::<Vec<FeedUrl>>).unwrap_or_default();
|
||||
changed(to_value(&merge_feed_aliases(podcast_id, ¤t, aliases)))
|
||||
.into_iter()
|
||||
.collect()
|
||||
}
|
||||
RelayRecord::Share(record) => changed(match current.and_then(parse::<ShareRecord>) {
|
||||
Some(current) => merge_share(¤t, record)
|
||||
.ok()
|
||||
.as_ref()
|
||||
.and_then(to_value),
|
||||
None => to_value(record),
|
||||
})
|
||||
.into_iter()
|
||||
.collect(),
|
||||
RelayRecord::Progress(record) => changed(match current.and_then(parse::<ProgressRecord>) {
|
||||
Some(current) => merge_progress(¤t, record)
|
||||
.ok()
|
||||
.as_ref()
|
||||
.and_then(to_value),
|
||||
None => to_value(record),
|
||||
})
|
||||
.into_iter()
|
||||
.collect(),
|
||||
RelayRecord::Session(session) => changed(match current.and_then(parse::<ListenSession>) {
|
||||
Some(current) => merge_listen_session(¤t, session)
|
||||
.ok()
|
||||
.as_ref()
|
||||
.and_then(to_value),
|
||||
None => to_value(session),
|
||||
})
|
||||
.into_iter()
|
||||
.collect(),
|
||||
}
|
||||
}
|
||||
|
||||
fn parse<T: DeserializeOwned>(value: &Value) -> Option<T> {
|
||||
serde_json::from_value(value.clone()).ok()
|
||||
}
|
||||
|
||||
fn to_value<T: Serialize>(value: &T) -> Option<Value> {
|
||||
serde_json::to_value(value).ok()
|
||||
}
|
||||
|
||||
/// Merges register updates into the user's relay state.
|
||||
pub(crate) async fn merge_records(
|
||||
pool: &sqlx::PgPool,
|
||||
user_id: i64,
|
||||
records: &[RelayRecord],
|
||||
) -> Result<()> {
|
||||
if records.is_empty() {
|
||||
return Ok(());
|
||||
}
|
||||
let mut tx = pool.begin().await?;
|
||||
// One writer per account: a merge reads, combines and writes documents.
|
||||
sqlx::query(
|
||||
"SELECT pg_advisory_xact_lock(hashtextextended('furumusic:podcast-relay:' || $1::text, 0))",
|
||||
)
|
||||
.bind(user_id)
|
||||
.execute(&mut *tx)
|
||||
.await?;
|
||||
let mut docs = std::collections::BTreeMap::new();
|
||||
for record in records {
|
||||
for key in read_keys(record) {
|
||||
if !docs.contains_key(&key)
|
||||
&& let Some(value) = load(&mut tx, user_id, key.0, &key.1).await?
|
||||
{
|
||||
docs.insert(key, value);
|
||||
}
|
||||
}
|
||||
for (key, value) in plan_merge(&docs, record) {
|
||||
match &value {
|
||||
Some(value) => store(&mut tx, user_id, key.0, &key.1, value).await?,
|
||||
None => {
|
||||
sqlx::query(
|
||||
"DELETE FROM furumusic__fed_podcast_relay
|
||||
WHERE user_id = $1 AND section = $2 AND record_key = $3",
|
||||
)
|
||||
.bind(user_id)
|
||||
.bind(key.0)
|
||||
.bind(&key.1)
|
||||
.execute(&mut *tx)
|
||||
.await?;
|
||||
}
|
||||
}
|
||||
match value {
|
||||
Some(value) => docs.insert(key, value),
|
||||
None => docs.remove(&key),
|
||||
};
|
||||
}
|
||||
}
|
||||
tx.commit().await?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
async fn load(
|
||||
tx: &mut sqlx::Transaction<'_, sqlx::Postgres>,
|
||||
user_id: i64,
|
||||
section: &str,
|
||||
key: &str,
|
||||
) -> Result<Option<Value>> {
|
||||
Ok(sqlx::query_scalar(
|
||||
"SELECT record_json FROM furumusic__fed_podcast_relay
|
||||
WHERE user_id = $1 AND section = $2 AND record_key = $3",
|
||||
)
|
||||
.bind(user_id)
|
||||
.bind(section)
|
||||
.bind(key)
|
||||
.fetch_optional(&mut **tx)
|
||||
.await?)
|
||||
}
|
||||
|
||||
async fn store(
|
||||
tx: &mut sqlx::Transaction<'_, sqlx::Postgres>,
|
||||
user_id: i64,
|
||||
section: &str,
|
||||
key: &str,
|
||||
value: &Value,
|
||||
) -> Result<()> {
|
||||
sqlx::query(
|
||||
"INSERT INTO furumusic__fed_podcast_relay
|
||||
(user_id, section, record_key, record_json, updated_at_ms)
|
||||
VALUES ($1, $2, $3, $4, $5)
|
||||
ON CONFLICT (user_id, section, record_key) DO UPDATE SET
|
||||
record_json = EXCLUDED.record_json,
|
||||
updated_at_ms = EXCLUDED.updated_at_ms",
|
||||
)
|
||||
.bind(user_id)
|
||||
.bind(section)
|
||||
.bind(key)
|
||||
.bind(value)
|
||||
.bind(chrono::Utc::now().timestamp_millis())
|
||||
.execute(&mut **tx)
|
||||
.await?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Relayed progress register of an episode, if any.
|
||||
pub(crate) async fn progress_record(
|
||||
pool: &sqlx::PgPool,
|
||||
user_id: i64,
|
||||
episode_id: &str,
|
||||
) -> Result<Option<ProgressRecord>> {
|
||||
let value: Option<Value> = sqlx::query_scalar(
|
||||
"SELECT record_json FROM furumusic__fed_podcast_relay
|
||||
WHERE user_id = $1 AND section = $2 AND record_key = $3",
|
||||
)
|
||||
.bind(user_id)
|
||||
.bind(SECTION_PROGRESS)
|
||||
.bind(episode_id)
|
||||
.fetch_optional(pool)
|
||||
.await?;
|
||||
Ok(value.as_ref().and_then(parse))
|
||||
}
|
||||
|
||||
/// Adds the relayed podcast registers to `snapshot`.
|
||||
///
|
||||
/// The sections are bounded later, per message, with the contract budget
|
||||
/// (`SyncSnapshot::bound_podcast_state_to`) and stripped for peers below v4
|
||||
/// (`SyncSnapshot::for_peer`).
|
||||
pub(crate) async fn fill_snapshot(
|
||||
pool: &sqlx::PgPool,
|
||||
user_id: i64,
|
||||
snapshot: &mut SyncSnapshot,
|
||||
) -> Result<()> {
|
||||
let rows = sqlx::query(
|
||||
"SELECT section, record_json FROM furumusic__fed_podcast_relay
|
||||
WHERE user_id = $1 AND section <> $2
|
||||
ORDER BY section, record_key",
|
||||
)
|
||||
.bind(user_id)
|
||||
.bind(SECTION_ALIASES)
|
||||
.fetch_all(pool)
|
||||
.await?;
|
||||
for row in rows {
|
||||
let section: String = row.get("section");
|
||||
let value: Value = row.get("record_json");
|
||||
fill_section(snapshot, §ion, &value);
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn fill_section(snapshot: &mut SyncSnapshot, section: &str, value: &Value) {
|
||||
match section {
|
||||
SECTION_SUBSCRIPTION => snapshot.podcast_subscriptions.extend(parse(value)),
|
||||
SECTION_SHARE => snapshot.podcast_shares.extend(parse(value)),
|
||||
SECTION_PROGRESS => snapshot.podcast_progress.extend(parse(value)),
|
||||
SECTION_SESSION => snapshot.podcast_listen_sessions.extend(parse(value)),
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use music_dht::device_sync::{SyncOpPayload, SyncOpWire};
|
||||
use music_dht::podcast::{EpisodeId, PodcastMeta, ProgressStatus};
|
||||
use std::collections::BTreeMap;
|
||||
|
||||
fn feed(path: &str) -> FeedUrl {
|
||||
FeedUrl::parse(&format!("https://podcasts.example/{path}")).unwrap()
|
||||
}
|
||||
|
||||
fn meta() -> PodcastMeta {
|
||||
serde_json::from_value(serde_json::json!({
|
||||
"feed_url": feed("feed.xml").as_str(),
|
||||
"title": "Example Cast",
|
||||
"description": "Long channel description",
|
||||
}))
|
||||
.unwrap()
|
||||
}
|
||||
|
||||
fn podcast() -> PodcastId {
|
||||
PodcastId::from_feed_url(&feed("feed.xml"))
|
||||
}
|
||||
|
||||
fn op(seq: i64, hlc_ms: i64, payload: SyncOpPayload) -> SyncOpWire {
|
||||
SyncOpWire {
|
||||
op_id: format!("tui_a:{seq}"),
|
||||
origin_device_id: "tui_a".into(),
|
||||
seq,
|
||||
hlc_ms,
|
||||
payload,
|
||||
}
|
||||
}
|
||||
|
||||
fn progress(seq: i64, generation: u64, hlc_ms: i64, position_ms: i64) -> SyncOpWire {
|
||||
let podcast_id = podcast();
|
||||
op(
|
||||
seq,
|
||||
hlc_ms,
|
||||
SyncOpPayload::PodcastProgressSet {
|
||||
episode_id: EpisodeId::from_guid(&podcast_id, "ep-1").unwrap(),
|
||||
podcast_id,
|
||||
position_ms,
|
||||
status: ProgressStatus::InProgress,
|
||||
generation,
|
||||
session_id: format!("s{generation}"),
|
||||
episode: None,
|
||||
},
|
||||
)
|
||||
}
|
||||
|
||||
/// Applies records to an in-memory table with the production plan.
|
||||
fn apply(state: &mut BTreeMap<DocKey, Value>, records: &[RelayRecord]) {
|
||||
for record in records {
|
||||
for (key, value) in plan_merge(state, record) {
|
||||
match value {
|
||||
Some(value) => state.insert(key, value),
|
||||
None => state.remove(&key),
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn snapshot_of(state: &BTreeMap<DocKey, Value>) -> SyncSnapshot {
|
||||
let mut snapshot = SyncSnapshot::default();
|
||||
for ((section, _), value) in state {
|
||||
fill_section(&mut snapshot, section, value);
|
||||
}
|
||||
snapshot
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn progress_registers_follow_the_contract_in_any_order() {
|
||||
// A late checkpoint of an older generation never wins, whatever its clock.
|
||||
let ops = [
|
||||
progress(1, 3, 9_000, 600_000),
|
||||
progress(2, 4, 1_000, 10_000),
|
||||
];
|
||||
for order in [[0, 1], [1, 0]] {
|
||||
let mut state = BTreeMap::new();
|
||||
for index in order {
|
||||
apply(&mut state, &[RelayRecord::from_op(&ops[index]).unwrap()]);
|
||||
}
|
||||
let snapshot = snapshot_of(&state);
|
||||
assert_eq!(snapshot.podcast_progress.len(), 1);
|
||||
assert_eq!(snapshot.podcast_progress[0].position_ms, 10_000);
|
||||
assert_eq!(snapshot.podcast_progress[0].generation, 4);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn snapshot_sections_survive_the_relay() {
|
||||
let subscribe = op(
|
||||
1,
|
||||
10,
|
||||
SyncOpPayload::PodcastSubscriptionSet {
|
||||
podcast_id: podcast(),
|
||||
subscribed: true,
|
||||
podcast: meta(),
|
||||
feed_aliases: vec![],
|
||||
generation: 1,
|
||||
},
|
||||
);
|
||||
let share = op(
|
||||
2,
|
||||
11,
|
||||
SyncOpPayload::PodcastShareSet {
|
||||
podcast_id: podcast(),
|
||||
shared: false,
|
||||
generation: 1,
|
||||
},
|
||||
);
|
||||
let mut source = BTreeMap::new();
|
||||
for op in [&subscribe, &share, &progress(3, 2, 12, 5_000)] {
|
||||
op.validate_podcast().unwrap();
|
||||
apply(&mut source, &[RelayRecord::from_op(op).unwrap()]);
|
||||
}
|
||||
let mut sent = snapshot_of(&source);
|
||||
sent.bound_podcast_state();
|
||||
// A second relay that only saw the snapshot re-emits the same state.
|
||||
let mut relay = BTreeMap::new();
|
||||
apply(&mut relay, &RelayRecord::from_snapshot(&sent));
|
||||
let mut relayed = snapshot_of(&relay);
|
||||
relayed.bound_podcast_state();
|
||||
assert_eq!(relayed, sent);
|
||||
assert!(!relayed.podcast_shares[0].shared);
|
||||
assert!(relayed.podcast_subscriptions[0].subscribed);
|
||||
// Peers below v4 never receive the sections.
|
||||
assert!(!relayed.for_peer(3).has_podcast_state());
|
||||
assert!(relayed.for_peer(4).has_podcast_state());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn aliases_learned_before_the_subscription_are_merged_into_it() {
|
||||
let aliases = op(
|
||||
1,
|
||||
10,
|
||||
SyncOpPayload::PodcastFeedAliasesAdded {
|
||||
podcast_id: podcast(),
|
||||
feed_aliases: vec![feed("moved.xml")],
|
||||
},
|
||||
);
|
||||
let subscribe = op(
|
||||
2,
|
||||
11,
|
||||
SyncOpPayload::PodcastSubscriptionSet {
|
||||
podcast_id: podcast(),
|
||||
subscribed: true,
|
||||
podcast: meta(),
|
||||
feed_aliases: vec![],
|
||||
generation: 1,
|
||||
},
|
||||
);
|
||||
let mut state = BTreeMap::new();
|
||||
apply(&mut state, &[RelayRecord::from_op(&aliases).unwrap()]);
|
||||
apply(&mut state, &[RelayRecord::from_op(&subscribe).unwrap()]);
|
||||
let snapshot = snapshot_of(&state);
|
||||
assert_eq!(
|
||||
snapshot.podcast_subscriptions[0].feed_urls(),
|
||||
vec![feed("feed.xml"), feed("moved.xml")]
|
||||
);
|
||||
assert!(!state.keys().any(|(section, _)| *section == SECTION_ALIASES));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn oversized_snapshot_sections_are_ignored() {
|
||||
let mut snapshot = SyncSnapshot::default();
|
||||
let record = RelayRecord::from_op(&progress(1, 1, 1, 1)).unwrap();
|
||||
let RelayRecord::Progress(record) = record else {
|
||||
unreachable!()
|
||||
};
|
||||
snapshot.podcast_progress = vec![record; music_dht::podcast::MAX_SNAPSHOT_PROGRESS + 1];
|
||||
assert!(RelayRecord::from_snapshot(&snapshot).is_empty());
|
||||
snapshot
|
||||
.podcast_progress
|
||||
.truncate(music_dht::podcast::MAX_SNAPSHOT_PROGRESS);
|
||||
assert_eq!(
|
||||
RelayRecord::from_snapshot(&snapshot).len(),
|
||||
music_dht::podcast::MAX_SNAPSHOT_PROGRESS
|
||||
);
|
||||
}
|
||||
}
|
||||
+9
-3
@@ -1,6 +1,12 @@
|
||||
use super::translations;
|
||||
|
||||
translations! {
|
||||
approval_heading: "Awaiting approval", "Ожидается одобрение";
|
||||
approval_message: "You are signed in. An instance administrator must approve your account before you can access the library.", "Вы вошли в аккаунт. Для доступа к библиотеке нужно одобрение администратора инстанса.";
|
||||
guest_login: "Sign in / register", "Войти / зарегистрироваться";
|
||||
guest_label: "Shared music", "Музыка по ссылке";
|
||||
share_unavailable: "This link is unavailable or contains no playable tracks.", "Ссылка недоступна или не содержит доступных треков.";
|
||||
track_download: "Download", "Скачать";
|
||||
// Global
|
||||
site_name: "furumusic" , "furumusic";
|
||||
|
||||
@@ -71,7 +77,7 @@ translations! {
|
||||
settings_oidc_admin_groups: "Admin groups" , "Группы администраторов";
|
||||
settings_oidc_admin_groups_help: "Comma-separated OIDC group names that grant admin role (e.g. /admin,/furumusic-admins)" , "OIDC группы через запятую, дающие роль администратора (напр. /admin,/furumusic-admins)";
|
||||
settings_oidc_user_groups: "User groups" , "Группы пользователей";
|
||||
settings_oidc_user_groups_help: "Comma-separated OIDC group names allowed to access the service. If empty, any authenticated SSO user is allowed." , "OIDC группы через запятую, которым разрешён доступ к сервису. Если пусто, разрешён любой SSO пользователь.";
|
||||
settings_oidc_user_groups_help: "Comma-separated OIDC groups granting automatic user access. Everyone else needs local administrator approval." , "OIDC группы через запятую, дающие автоматический доступ. Остальным нужно локальное одобрение администратора.";
|
||||
|
||||
// User management
|
||||
nav_users: "Users" , "Пользователи";
|
||||
@@ -360,8 +366,6 @@ translations! {
|
||||
player_play: "Play" , "Играть";
|
||||
player_listen: "Listen" , "Слушать";
|
||||
player_listen_artist: "Listen to artist" , "Слушать артиста";
|
||||
player_start_radio: "Start radio" , "Запустить радио";
|
||||
player_radio_failed: "Could not start radio" , "Не удалось запустить радио";
|
||||
player_played_at: "Played" , "Прослушано";
|
||||
player_like: "Like" , "Лайк";
|
||||
player_add_to_queue: "Add to queue" , "Добавить в очередь";
|
||||
@@ -378,6 +382,8 @@ translations! {
|
||||
player_clear: "Clear" , "Очистить";
|
||||
player_remove: "Remove" , "Удалить";
|
||||
player_queue_empty: "Queue is empty" , "Очередь пуста";
|
||||
player_queue_podcast_unplayable: "Podcast · not playable in the web player yet", "Подкаст · пока не воспроизводится в веб-плеере";
|
||||
player_queue_private_item: "Private item · hidden by its owner", "Приватный элемент · скрыт владельцем";
|
||||
player_shuffle: "Shuffle" , "Перемешать";
|
||||
player_repeat: "Repeat" , "Повтор";
|
||||
player_volume: "Volume" , "Громкость";
|
||||
|
||||
+24
-2
@@ -20,6 +20,7 @@ struct PlaybackStateRow {
|
||||
current_track_id: Option<i64>,
|
||||
position_ms: i32,
|
||||
queue_json: String,
|
||||
queue_items_json: Option<serde_json::Value>,
|
||||
queue_position: i32,
|
||||
}
|
||||
|
||||
@@ -738,7 +739,7 @@ async fn cleanup_playback_states(
|
||||
) -> anyhow::Result<()> {
|
||||
let deleted: HashSet<i64> = track_ids.iter().copied().collect();
|
||||
let states: Vec<PlaybackStateRow> = sqlx::query_as(
|
||||
"SELECT id, current_track_id, position_ms, queue_json, queue_position FROM furumusic__playback_state FOR UPDATE",
|
||||
"SELECT id, current_track_id, position_ms, queue_json, queue_items_json, queue_position FROM furumusic__playback_state FOR UPDATE",
|
||||
)
|
||||
.fetch_all(&mut **transaction)
|
||||
.await?;
|
||||
@@ -746,6 +747,14 @@ async fn cleanup_playback_states(
|
||||
for state in states {
|
||||
let mut queue: Vec<i64> = serde_json::from_str(&state.queue_json).unwrap_or_default();
|
||||
let original_queue = queue.clone();
|
||||
let mut typed = crate::player::queue_items::StoredQueue::from_columns(
|
||||
state.queue_items_json.as_ref(),
|
||||
&crate::player::queue_items::LegacyColumns {
|
||||
queue: original_queue.clone(),
|
||||
current_track_id: state.current_track_id,
|
||||
queue_position: state.queue_position,
|
||||
},
|
||||
);
|
||||
queue.retain(|track_id| !deleted.contains(track_id));
|
||||
let current_track_id = state.current_track_id.filter(|id| !deleted.contains(id));
|
||||
if queue == original_queue && current_track_id == state.current_track_id {
|
||||
@@ -763,16 +772,28 @@ async fn cleanup_playback_states(
|
||||
.clamp(0, i32::try_from(queue.len() - 1).unwrap_or(i32::MAX))
|
||||
}
|
||||
});
|
||||
if let Some(typed) = &mut typed {
|
||||
typed.retain_library(
|
||||
|track_id| !deleted.contains(&track_id),
|
||||
crate::player::queue_items::LegacyColumns {
|
||||
queue: queue.clone(),
|
||||
current_track_id,
|
||||
queue_position,
|
||||
},
|
||||
);
|
||||
}
|
||||
let position_ms = if current_track_id.is_some() {
|
||||
state.position_ms
|
||||
} else {
|
||||
0
|
||||
};
|
||||
let queue_json = serde_json::to_string(&queue)?;
|
||||
// The typed queue keeps its other items; a stale one is cleared.
|
||||
let queue_items_json = typed.map(serde_json::to_value).transpose()?;
|
||||
sqlx::query(
|
||||
r#"UPDATE furumusic__playback_state
|
||||
SET current_track_id = $2, position_ms = $3,
|
||||
queue_json = $4, queue_position = $5
|
||||
queue_json = $4, queue_position = $5, queue_items_json = $6
|
||||
WHERE id = $1"#,
|
||||
)
|
||||
.bind(state.id)
|
||||
@@ -780,6 +801,7 @@ async fn cleanup_playback_states(
|
||||
.bind(position_ms)
|
||||
.bind(queue_json)
|
||||
.bind(queue_position)
|
||||
.bind(queue_items_json)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
}
|
||||
|
||||
+82
-108
@@ -70,59 +70,64 @@ fn build_registry() -> Arc<JobRegistry> {
|
||||
// Handlers
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
#[derive(Deserialize)]
|
||||
struct IndexQuery {
|
||||
track: Option<i64>,
|
||||
release: Option<i64>,
|
||||
playlist_share: Option<String>,
|
||||
async fn index(session: Session, db: Database, i18n: I18n) -> cot::Result<cot::response::Response> {
|
||||
render_player(session, db, i18n, String::new()).await
|
||||
}
|
||||
|
||||
async fn index(
|
||||
async fn render_player(
|
||||
session: Session,
|
||||
db: Database,
|
||||
i18n: I18n,
|
||||
UrlQuery(query): UrlQuery<IndexQuery>,
|
||||
share_token: String,
|
||||
) -> cot::Result<cot::response::Response> {
|
||||
let _user = match auth::get_session_user(&session, &db).await {
|
||||
Some(u) => u,
|
||||
None => {
|
||||
if let Some(location) = share_query_redirect(&query) {
|
||||
auth::remember_post_login_redirect(&session, &location).await?;
|
||||
}
|
||||
return Ok(auth::redirect("/login"));
|
||||
let guest = auth::get_session_user(&session, &db).await.is_none();
|
||||
if guest && share_token.is_empty() {
|
||||
if auth::get_session_identity(&session, &db).await.is_some() {
|
||||
return Html::new(PendingTemplate { t: i18n.t }.render()?).into_response();
|
||||
}
|
||||
};
|
||||
return Ok(auth::redirect("/login"));
|
||||
}
|
||||
let (config, _) = AppConfig::load_with_db(&db).await;
|
||||
let template = player::PlayerPageTemplate {
|
||||
t: i18n.t,
|
||||
downloads_enabled: config.downloads_enabled,
|
||||
torrent_downloads_enabled: config.downloads_enabled && config.torrent_downloads_enabled,
|
||||
youtube_downloads_enabled: config.downloads_enabled && config.youtube_downloads_enabled,
|
||||
};
|
||||
Html::new(template.render()?).into_response()
|
||||
Html::new(
|
||||
player::PlayerPageTemplate {
|
||||
t: i18n.t,
|
||||
guest,
|
||||
share_token,
|
||||
downloads_enabled: !guest && config.downloads_enabled,
|
||||
torrent_downloads_enabled: !guest
|
||||
&& config.downloads_enabled
|
||||
&& config.torrent_downloads_enabled,
|
||||
youtube_downloads_enabled: !guest
|
||||
&& config.downloads_enabled
|
||||
&& config.youtube_downloads_enabled,
|
||||
}
|
||||
.render()?,
|
||||
)
|
||||
.into_response()
|
||||
}
|
||||
|
||||
fn share_query_redirect(query: &IndexQuery) -> Option<String> {
|
||||
if let Some(track_id) = query.track.filter(|id| *id > 0) {
|
||||
return Some(format!("/?track={track_id}"));
|
||||
}
|
||||
if let Some(release_id) = query.release.filter(|id| *id > 0) {
|
||||
return Some(format!("/?release={release_id}"));
|
||||
}
|
||||
let token = query.playlist_share.as_deref()?.trim();
|
||||
if is_share_token(token) {
|
||||
Some(format!("/?playlist_share={token}"))
|
||||
} else {
|
||||
None
|
||||
}
|
||||
#[derive(Debug, Template)]
|
||||
#[template(path = "pending.html")]
|
||||
struct PendingTemplate {
|
||||
t: &'static Translations,
|
||||
}
|
||||
|
||||
async fn access_status(session: Session, db: Database) -> cot::Result<cot::response::Response> {
|
||||
let identity = auth::get_session_identity(&session, &db).await;
|
||||
let status = match identity {
|
||||
Some(user) if user.is_active() => "active",
|
||||
Some(_) => "pending",
|
||||
None => "anonymous",
|
||||
};
|
||||
let mut response = cot::json::Json(serde_json::json!({"status": status})).into_response()?;
|
||||
response
|
||||
.headers_mut()
|
||||
.insert("Cache-Control", "private, no-store".parse().unwrap());
|
||||
Ok(response)
|
||||
}
|
||||
|
||||
fn is_share_token(token: &str) -> bool {
|
||||
!token.is_empty()
|
||||
&& token.len() <= 64
|
||||
&& token
|
||||
.bytes()
|
||||
.all(|b| b.is_ascii_alphanumeric() || matches!(b, b'-' | b'_'))
|
||||
token.len() == 32 && token.bytes().all(|b| b.is_ascii_hexdigit())
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
@@ -187,11 +192,7 @@ struct LoginForm {
|
||||
#[derive(Deserialize)]
|
||||
struct LoginQuery {
|
||||
error: Option<String>,
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
struct SharePathId {
|
||||
id: i64,
|
||||
next: Option<String>,
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
@@ -236,56 +237,26 @@ async fn metrics_handler(
|
||||
.expect("valid response"))
|
||||
}
|
||||
|
||||
async fn share_track_handler(
|
||||
session: Session,
|
||||
db: Database,
|
||||
Path(path): Path<SharePathId>,
|
||||
) -> cot::Result<cot::response::Response> {
|
||||
let location = if path.id > 0 {
|
||||
format!("/?track={}", path.id)
|
||||
} else {
|
||||
"/".to_string()
|
||||
};
|
||||
if auth::get_session_user(&session, &db).await.is_none() {
|
||||
auth::remember_post_login_redirect(&session, &location).await?;
|
||||
return Ok(auth::redirect("/login"));
|
||||
}
|
||||
Ok(auth::redirect(&location))
|
||||
}
|
||||
|
||||
async fn share_release_handler(
|
||||
session: Session,
|
||||
db: Database,
|
||||
Path(path): Path<SharePathId>,
|
||||
) -> cot::Result<cot::response::Response> {
|
||||
let location = if path.id > 0 {
|
||||
format!("/?release={}", path.id)
|
||||
} else {
|
||||
"/".to_string()
|
||||
};
|
||||
if auth::get_session_user(&session, &db).await.is_none() {
|
||||
auth::remember_post_login_redirect(&session, &location).await?;
|
||||
return Ok(auth::redirect("/login"));
|
||||
}
|
||||
Ok(auth::redirect(&location))
|
||||
}
|
||||
|
||||
async fn share_playlist_handler(
|
||||
async fn share_handler(
|
||||
session: Session,
|
||||
db: Database,
|
||||
i18n: I18n,
|
||||
Path(path): Path<SharePathToken>,
|
||||
) -> cot::Result<cot::response::Response> {
|
||||
let token = path.token.trim();
|
||||
let location = if is_share_token(token) {
|
||||
format!("/?playlist_share={token}")
|
||||
} else {
|
||||
"/".to_string()
|
||||
};
|
||||
if auth::get_session_user(&session, &db).await.is_none() {
|
||||
auth::remember_post_login_redirect(&session, &location).await?;
|
||||
return Ok(auth::redirect("/login"));
|
||||
if !is_share_token(&path.token) {
|
||||
return Ok(cot::http::Response::builder()
|
||||
.status(cot::http::StatusCode::NOT_FOUND)
|
||||
.body(Body::fixed("Shared music not found"))
|
||||
.expect("valid response"));
|
||||
}
|
||||
Ok(auth::redirect(&location))
|
||||
let mut response = render_player(session, db, i18n, path.token).await?;
|
||||
response
|
||||
.headers_mut()
|
||||
.insert("Referrer-Policy", "no-referrer".parse().unwrap());
|
||||
response
|
||||
.headers_mut()
|
||||
.insert("Cache-Control", "private, no-store".parse().unwrap());
|
||||
Ok(response)
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
@@ -316,26 +287,13 @@ impl App for FuruApp {
|
||||
),
|
||||
Route::with_handler_and_name(
|
||||
"/",
|
||||
|session: Session, db: Database, i18n: I18n, query: UrlQuery<IndexQuery>| async move {
|
||||
index(session, db, i18n, query).await
|
||||
|session: Session, db: Database, i18n: I18n| async move {
|
||||
index(session, db, i18n).await
|
||||
},
|
||||
"index",
|
||||
),
|
||||
Route::with_handler_and_name(
|
||||
"/share/track/{id}",
|
||||
get(share_track_handler),
|
||||
"share_track",
|
||||
),
|
||||
Route::with_handler_and_name(
|
||||
"/share/release/{id}",
|
||||
get(share_release_handler),
|
||||
"share_release",
|
||||
),
|
||||
Route::with_handler_and_name(
|
||||
"/share/playlist/{token}",
|
||||
get(share_playlist_handler),
|
||||
"share_playlist",
|
||||
),
|
||||
Route::with_handler_and_name("/share/{token}", get(share_handler), "share"),
|
||||
Route::with_handler_and_name("/auth/status", get(access_status), "access_status"),
|
||||
Route::with_handler_and_name(
|
||||
"/metrics",
|
||||
get({
|
||||
@@ -353,13 +311,29 @@ impl App for FuruApp {
|
||||
"/login",
|
||||
get({
|
||||
let config = Arc::clone(&self.config);
|
||||
move |i18n: I18n, db: Database, query: UrlQuery<LoginQuery>| {
|
||||
move |i18n: I18n,
|
||||
db: Database,
|
||||
session: Session,
|
||||
query: UrlQuery<LoginQuery>| {
|
||||
let config = Arc::clone(&config);
|
||||
async move {
|
||||
// No users at all → redirect to first-run setup
|
||||
if User::count_all(&db).await.unwrap_or(0) == 0 {
|
||||
return Ok(auth::redirect("/admin/setup"));
|
||||
}
|
||||
if let Some(next) = query.0.next.as_deref() {
|
||||
if next.strip_prefix("/share/").is_some_and(is_share_token) {
|
||||
auth::remember_post_login_redirect(&session, next).await?;
|
||||
}
|
||||
} else {
|
||||
auth::clear_post_login_redirect(&session).await?;
|
||||
}
|
||||
if auth::get_session_identity(&session, &db).await.is_some() {
|
||||
let destination = auth::get_post_login_redirect(&session)
|
||||
.await?
|
||||
.unwrap_or_else(|| "/".into());
|
||||
return Ok(auth::redirect(&destination));
|
||||
}
|
||||
let message = query.0.error.unwrap_or_default();
|
||||
login_page_handler(i18n, &config, db, message)
|
||||
.await?
|
||||
|
||||
+9
-12
@@ -808,9 +808,8 @@ const KNOWN_HTTP_ROUTES: &[&str] = &[
|
||||
"/admin",
|
||||
"/swagger",
|
||||
"/swagger/openapi.json",
|
||||
"/share/track/{id}",
|
||||
"/share/release/{id}",
|
||||
"/share/playlist/{token}",
|
||||
"/share/{token}",
|
||||
"/auth/status",
|
||||
"/metrics",
|
||||
"/login",
|
||||
"/logout",
|
||||
@@ -880,10 +879,11 @@ const KNOWN_HTTP_ROUTES: &[&str] = &[
|
||||
"/api/player/artists",
|
||||
"/api/player/artists/{id}",
|
||||
"/api/player/releases/{id}",
|
||||
"/api/player/radio/{kind}/{id}",
|
||||
"/api/player/playlists",
|
||||
"/api/player/share-playlist",
|
||||
"/api/player/share-playlist/{id}",
|
||||
"/api/player/shares",
|
||||
"/api/player/shares/{id}",
|
||||
"/api/player/shares/{token}/{action}/{track_id}",
|
||||
"/api/player/download/{track_id}",
|
||||
"/api/player/playlists/{id}",
|
||||
"/api/player/playlists/{id}/tracks",
|
||||
"/api/player/likes",
|
||||
@@ -928,13 +928,10 @@ mod tests {
|
||||
known_http_route("/admin/v2/api/jobs/metadata_backfill/runs/123"),
|
||||
Some("/admin/v2/api/jobs/{name}/runs/{run_id}")
|
||||
);
|
||||
assert_eq!(known_http_route("/share/abcDEF123"), Some("/share/{token}"));
|
||||
assert_eq!(
|
||||
known_http_route("/share/playlist/abcDEF123"),
|
||||
Some("/share/playlist/{token}")
|
||||
);
|
||||
assert_eq!(
|
||||
known_http_route("/share/release/42"),
|
||||
Some("/share/release/{id}")
|
||||
known_http_route("/api/player/shares/abcDEF123/stream/42"),
|
||||
Some("/api/player/shares/{token}/{action}/{track_id}")
|
||||
);
|
||||
assert_eq!(
|
||||
known_http_route("/api/player/youtube/start"),
|
||||
|
||||
@@ -2838,6 +2838,110 @@ pub mod db_migrations {
|
||||
&[Operation::custom(add_import_playlist_destinations).build()];
|
||||
}
|
||||
|
||||
// -- M0054: typed playback queue next to the legacy id list ------------
|
||||
|
||||
// (`m_0053` is taken by `src/user.rs` in the same app.)
|
||||
|
||||
// `queue_json` keeps the library track ids and is still written, so an
|
||||
// older release can run against the same database. The typed value adds
|
||||
// the items that are not library tracks (podcast episodes, unresolved
|
||||
// federated music, Jam placeholders) with their explicit source.
|
||||
#[cot::db::migrations::migration_op]
|
||||
async fn add_typed_playback_queue(
|
||||
ctx: migrations::MigrationContext<'_>,
|
||||
) -> cot::db::Result<()> {
|
||||
ctx.db
|
||||
.raw(
|
||||
"ALTER TABLE furumusic__playback_state
|
||||
ADD COLUMN IF NOT EXISTS queue_items_json JSONB",
|
||||
)
|
||||
.await?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[cot::db::migrations::migration_op]
|
||||
async fn drop_typed_playback_queue(
|
||||
ctx: migrations::MigrationContext<'_>,
|
||||
) -> cot::db::Result<()> {
|
||||
ctx.db
|
||||
.raw("ALTER TABLE furumusic__playback_state DROP COLUMN IF EXISTS queue_items_json")
|
||||
.await?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[derive(Debug, Copy, Clone)]
|
||||
pub struct M0054AddTypedPlaybackQueue;
|
||||
impl migrations::Migration for M0054AddTypedPlaybackQueue {
|
||||
const APP_NAME: &'static str = "furumusic";
|
||||
const MIGRATION_NAME: &'static str = "m_0054_add_typed_playback_queue";
|
||||
const DEPENDENCIES: &'static [migrations::MigrationDependency] =
|
||||
&[migrations::MigrationDependency::migration(
|
||||
"furumusic",
|
||||
"m_0052_add_import_playlist_destinations",
|
||||
)];
|
||||
const OPERATIONS: &'static [Operation] = &[Operation::custom(add_typed_playback_queue)
|
||||
.backwards(drop_typed_playback_queue)
|
||||
.build()];
|
||||
}
|
||||
|
||||
// -- M0055: opaque podcast sync relay state (device-sync protocol v4) ---
|
||||
|
||||
// Podcast registers received from trusted devices, kept as the shared
|
||||
// contract JSON so this server can return them in its snapshots. This is
|
||||
// not the podcast store: the web player has no podcast features yet.
|
||||
#[cot::db::migrations::migration_op]
|
||||
async fn create_fed_podcast_relay(
|
||||
ctx: migrations::MigrationContext<'_>,
|
||||
) -> cot::db::Result<()> {
|
||||
ctx.db
|
||||
.raw(
|
||||
"CREATE TABLE IF NOT EXISTS furumusic__fed_podcast_relay (
|
||||
user_id BIGINT NOT NULL,
|
||||
section VARCHAR(16) NOT NULL,
|
||||
record_key TEXT NOT NULL,
|
||||
record_json JSONB NOT NULL,
|
||||
updated_at_ms BIGINT NOT NULL,
|
||||
PRIMARY KEY (user_id, section, record_key)
|
||||
)",
|
||||
)
|
||||
.await?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Removes the operations a 0.12.x release cannot parse: the podcast
|
||||
/// kinds relayed since device-sync protocol 4. Ends with its `WHERE`
|
||||
/// clause, so tests can narrow it to one user.
|
||||
pub(crate) const DELETE_PODCAST_SYNC_OPS_SQL: &str =
|
||||
"DELETE FROM furumusic__fed_sync_ops WHERE kind LIKE 'podcast\\_%'";
|
||||
|
||||
// Release 0.12.x parses every unacknowledged operation it sends to a
|
||||
// peer and fails the whole batch on an unknown kind, so the podcast
|
||||
// operations relayed by 0.13 must go before it runs again (see
|
||||
// docs/administration.md, "Rolling back to 0.12").
|
||||
#[cot::db::migrations::migration_op]
|
||||
async fn drop_fed_podcast_relay(ctx: migrations::MigrationContext<'_>) -> cot::db::Result<()> {
|
||||
ctx.db.raw(DELETE_PODCAST_SYNC_OPS_SQL).await?;
|
||||
ctx.db
|
||||
.raw("DROP TABLE IF EXISTS furumusic__fed_podcast_relay")
|
||||
.await?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[derive(Debug, Copy, Clone)]
|
||||
pub struct M0055CreateFedPodcastRelay;
|
||||
impl migrations::Migration for M0055CreateFedPodcastRelay {
|
||||
const APP_NAME: &'static str = "furumusic";
|
||||
const MIGRATION_NAME: &'static str = "m_0055_create_fed_podcast_relay";
|
||||
const DEPENDENCIES: &'static [migrations::MigrationDependency] =
|
||||
&[migrations::MigrationDependency::migration(
|
||||
"furumusic",
|
||||
"m_0054_add_typed_playback_queue",
|
||||
)];
|
||||
const OPERATIONS: &'static [Operation] = &[Operation::custom(create_fed_podcast_relay)
|
||||
.backwards(drop_fed_podcast_relay)
|
||||
.build()];
|
||||
}
|
||||
|
||||
pub const MIGRATIONS: &[&SyncDynMigration] = &[
|
||||
&M0006CreateMediaFile,
|
||||
&M0007CreateArtist,
|
||||
@@ -2881,5 +2985,7 @@ pub mod db_migrations {
|
||||
&M0050CreateMetadataFixHistory,
|
||||
&M0051AddListenStatisticsIndexes,
|
||||
&M0052AddImportPlaylistDestinations,
|
||||
&M0054AddTypedPlaybackQueue,
|
||||
&M0055CreateFedPodcastRelay,
|
||||
];
|
||||
}
|
||||
+135
-84
@@ -418,16 +418,6 @@ pub async fn oidc_callback_handler(
|
||||
config.oidc_user_groups,
|
||||
);
|
||||
|
||||
if !is_allowed_by_groups(&groups, &config.oidc_user_groups, &config.oidc_admin_groups) {
|
||||
tracing::warn!(
|
||||
"OIDC login denied by group allowlist: sub={sub}, groups={groups:?}, user_groups={:?}, admin_groups={:?}",
|
||||
config.oidc_user_groups,
|
||||
config.oidc_admin_groups,
|
||||
);
|
||||
crate::metrics::record_auth_attempt("oidc", "failure", "not_in_group");
|
||||
return redirect_login_with_error(i18n.t.login_access_denied);
|
||||
}
|
||||
|
||||
// User provisioning logic.
|
||||
let user = match provision_user(
|
||||
&db,
|
||||
@@ -437,6 +427,7 @@ pub async fn oidc_callback_handler(
|
||||
name.as_deref(),
|
||||
&groups,
|
||||
&config.oidc_admin_groups,
|
||||
&config.oidc_user_groups,
|
||||
)
|
||||
.await
|
||||
{
|
||||
@@ -728,17 +719,6 @@ pub async fn oidc_mobile_callback_handler(
|
||||
.map(|n| n.to_string());
|
||||
let groups = extract_groups_from_jwt(&id_token.to_string());
|
||||
|
||||
if !is_allowed_by_groups(&groups, &config.oidc_user_groups, &config.oidc_admin_groups) {
|
||||
tracing::warn!(
|
||||
"Mobile OIDC login denied by group allowlist: sub={sub}, groups={groups:?}, user_groups={:?}, admin_groups={:?}",
|
||||
config.oidc_user_groups,
|
||||
config.oidc_admin_groups,
|
||||
);
|
||||
crate::metrics::record_auth_attempt("mobile_oidc", "failure", "not_in_group");
|
||||
clear_mobile_oidc_session(&session).await?;
|
||||
return Ok(mobile_redirect_error(&app_redirect_uri, "access_denied"));
|
||||
}
|
||||
|
||||
let user = match provision_user(
|
||||
&db,
|
||||
&issuer,
|
||||
@@ -747,6 +727,7 @@ pub async fn oidc_mobile_callback_handler(
|
||||
name.as_deref(),
|
||||
&groups,
|
||||
&config.oidc_admin_groups,
|
||||
&config.oidc_user_groups,
|
||||
)
|
||||
.await
|
||||
{
|
||||
@@ -759,6 +740,11 @@ pub async fn oidc_mobile_callback_handler(
|
||||
}
|
||||
};
|
||||
|
||||
if !user.is_active() {
|
||||
clear_mobile_oidc_session(&session).await?;
|
||||
return Ok(mobile_redirect_error(&app_redirect_uri, "approval_pending"));
|
||||
}
|
||||
|
||||
let exchange_code = auth::create_mobile_exchange_code(&db, user.id_val())
|
||||
.await
|
||||
.map_err(|e| cot::Error::internal(e.to_string()))?;
|
||||
@@ -773,48 +759,26 @@ pub async fn oidc_mobile_callback_handler(
|
||||
// User provisioning
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
/// Resolve the role based on OIDC group membership.
|
||||
/// If `admin_groups` is non-empty and any user group matches, return "admin";
|
||||
/// otherwise return "user".
|
||||
fn resolve_role(groups: &[String], admin_groups: &str) -> &'static str {
|
||||
if admin_groups.is_empty() {
|
||||
return auth::Role::User.code();
|
||||
/// Group-derived access always takes precedence over local approval.
|
||||
fn resolve_sso_role(
|
||||
groups: &[String],
|
||||
admin_groups: &str,
|
||||
user_groups: &str,
|
||||
) -> Option<&'static str> {
|
||||
let matches = |configured: &str| {
|
||||
configured
|
||||
.split(',')
|
||||
.map(str::trim)
|
||||
.filter(|group| !group.is_empty())
|
||||
.any(|group| groups.iter().any(|g| g == group))
|
||||
};
|
||||
if matches(admin_groups) {
|
||||
Some("admin")
|
||||
} else if matches(user_groups) {
|
||||
Some("user")
|
||||
} else {
|
||||
None
|
||||
}
|
||||
let admin_set: std::collections::HashSet<&str> = admin_groups
|
||||
.split(',')
|
||||
.map(|s| s.trim())
|
||||
.filter(|s| !s.is_empty())
|
||||
.collect();
|
||||
if admin_set.is_empty() {
|
||||
return auth::Role::User.code();
|
||||
}
|
||||
for g in groups {
|
||||
if admin_set.contains(g.as_str()) {
|
||||
return auth::Role::Admin.code();
|
||||
}
|
||||
}
|
||||
auth::Role::User.code()
|
||||
}
|
||||
|
||||
fn parse_group_set(groups: &str) -> std::collections::HashSet<&str> {
|
||||
groups
|
||||
.split(',')
|
||||
.map(str::trim)
|
||||
.filter(|s| !s.is_empty())
|
||||
.collect()
|
||||
}
|
||||
|
||||
fn has_any_group(groups: &[String], allowed: &std::collections::HashSet<&str>) -> bool {
|
||||
groups.iter().any(|g| allowed.contains(g.as_str()))
|
||||
}
|
||||
|
||||
fn is_allowed_by_groups(groups: &[String], user_groups: &str, admin_groups: &str) -> bool {
|
||||
let user_set = parse_group_set(user_groups);
|
||||
if user_set.is_empty() {
|
||||
return true;
|
||||
}
|
||||
let admin_set = parse_group_set(admin_groups);
|
||||
has_any_group(groups, &user_set) || has_any_group(groups, &admin_set)
|
||||
}
|
||||
|
||||
async fn provision_user(
|
||||
@@ -825,8 +789,9 @@ async fn provision_user(
|
||||
name: Option<&str>,
|
||||
groups: &[String],
|
||||
admin_groups: &str,
|
||||
user_groups: &str,
|
||||
) -> Result<User, String> {
|
||||
let role = resolve_role(groups, admin_groups);
|
||||
let role = resolve_sso_role(groups, admin_groups, user_groups);
|
||||
|
||||
// 1. Check for existing OIDC link.
|
||||
if let Some(mut link) = OidcLink::find_by_issuer_sub(db, issuer, sub)
|
||||
@@ -841,8 +806,8 @@ async fn provision_user(
|
||||
.await
|
||||
.map_err(|e| format!("DB error updating OIDC link: {e}"))?;
|
||||
|
||||
// Always update role on login.
|
||||
user.update_role(db, role)
|
||||
// Refresh only the SSO grant; preserve independent local approval.
|
||||
user.sync_sso_role(db, role)
|
||||
.await
|
||||
.map_err(|e| format!("DB error updating user role: {e}"))?;
|
||||
|
||||
@@ -863,25 +828,6 @@ async fn provision_user(
|
||||
}
|
||||
}
|
||||
|
||||
// 2. No existing link — try to find a user by email.
|
||||
if let Some(email_str) = email {
|
||||
if let Some(mut user) = User::get_by_email(db, email_str)
|
||||
.await
|
||||
.map_err(|e| format!("DB error finding user by email: {e}"))?
|
||||
{
|
||||
// Create OIDC link for existing user.
|
||||
OidcLink::create_link(db, user.id_val(), issuer, sub, email, name)
|
||||
.await
|
||||
.map_err(|e| format!("DB error creating OIDC link: {e}"))?;
|
||||
|
||||
user.update_role(db, role)
|
||||
.await
|
||||
.map_err(|e| format!("DB error updating user role: {e}"))?;
|
||||
|
||||
return Ok(user);
|
||||
}
|
||||
}
|
||||
|
||||
// 3. Create a brand-new user + OIDC link.
|
||||
// Generate a unique username from the sub or email.
|
||||
let username = if let Some(email_str) = email {
|
||||
@@ -1300,3 +1246,108 @@ mod tests {
|
||||
assert!(safe_mobile_redirect_uri(Some("http://127.0.0.1:notaport/x")).is_none());
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod approval_tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn matching_groups_are_required_and_admin_wins() {
|
||||
let groups = vec!["listeners".into(), "admins".into()];
|
||||
assert_eq!(
|
||||
resolve_sso_role(&groups, " admins ", "listeners"),
|
||||
Some("admin")
|
||||
);
|
||||
assert_eq!(
|
||||
resolve_sso_role(&groups, "other", "listeners"),
|
||||
Some("user")
|
||||
);
|
||||
assert_eq!(resolve_sso_role(&groups, "other", ""), None);
|
||||
assert_eq!(resolve_sso_role(&[], "", ""), None);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
#[ignore = "requires a migrated disposable database in FURU_ACCESS_TEST_DATABASE_URL"]
|
||||
async fn postgres_approval_survives_sso_changes_without_implicit_grants() {
|
||||
let db = Database::new(std::env::var("FURU_ACCESS_TEST_DATABASE_URL").unwrap())
|
||||
.await
|
||||
.unwrap();
|
||||
let subject = format!("approval-test-{}", uuid::Uuid::new_v4());
|
||||
let provision = |groups: Vec<String>| {
|
||||
let db = &db;
|
||||
let subject = &subject;
|
||||
async move {
|
||||
provision_user(
|
||||
db,
|
||||
"https://test.example",
|
||||
subject,
|
||||
None,
|
||||
Some("Test pending user"),
|
||||
&groups,
|
||||
"admins",
|
||||
"listeners",
|
||||
)
|
||||
.await
|
||||
.unwrap()
|
||||
}
|
||||
};
|
||||
let first = provision(vec![]).await;
|
||||
assert!(!first.is_active());
|
||||
let mut again = provision(vec![]).await;
|
||||
assert_eq!(again.id_val(), first.id_val());
|
||||
again.approve(&db, "admin", 1).await.unwrap();
|
||||
assert_eq!(provision(vec![]).await.role(), auth::Role::Admin);
|
||||
assert_eq!(
|
||||
provision(vec!["listeners".into()]).await.role(),
|
||||
auth::Role::User
|
||||
);
|
||||
assert_eq!(
|
||||
provision(vec!["admins".into()]).await.role(),
|
||||
auth::Role::Admin
|
||||
);
|
||||
assert_eq!(provision(vec![]).await.role(), auth::Role::Admin);
|
||||
|
||||
let auto_sub = format!("auto-{subject}");
|
||||
let automatic = provision_user(
|
||||
&db,
|
||||
"https://test.example",
|
||||
&auto_sub,
|
||||
None,
|
||||
None,
|
||||
&["listeners".into()],
|
||||
"admins",
|
||||
"listeners",
|
||||
)
|
||||
.await
|
||||
.unwrap();
|
||||
assert!(automatic.is_active());
|
||||
let removed = provision_user(
|
||||
&db,
|
||||
"https://test.example",
|
||||
&auto_sub,
|
||||
None,
|
||||
None,
|
||||
&[],
|
||||
"admins",
|
||||
"listeners",
|
||||
)
|
||||
.await
|
||||
.unwrap();
|
||||
assert!(!removed.is_active());
|
||||
assert_eq!(automatic.id_val(), removed.id_val());
|
||||
// A stale User held by an OIDC callback must retain a newer local grant.
|
||||
let mut stale = removed.clone();
|
||||
let mut approving = removed.clone();
|
||||
approving.approve(&db, "admin", 1).await.unwrap();
|
||||
stale.sync_sso_role(&db, Some("user")).await.unwrap();
|
||||
stale.sync_sso_role(&db, None).await.unwrap();
|
||||
assert!(stale.is_active());
|
||||
assert_eq!(stale.role(), auth::Role::Admin);
|
||||
let username = stale.username_str().to_owned();
|
||||
stale
|
||||
.update_fields(&db, &username, None, Some("Renamed"), None, "")
|
||||
.await
|
||||
.unwrap();
|
||||
assert!(!stale.is_active());
|
||||
}
|
||||
}
|
||||
+16
-1
@@ -147,6 +147,17 @@ pub(super) struct PlaybackStateDto {
|
||||
pub(super) shuffle: bool,
|
||||
pub(super) repeat_mode: String,
|
||||
pub(super) volume: f64,
|
||||
/// Typed queue (podcast episodes and other non-library items included).
|
||||
///
|
||||
/// Requests send `{"kind": "library", "track_id"}` and
|
||||
/// `{"kind": "external", "track": <device-sync PlaybackTrack>}` items;
|
||||
/// responses return external items as browser track JSON. Clients that
|
||||
/// omit it keep using `queue`, which is always written.
|
||||
#[serde(default, skip_serializing_if = "Option::is_none")]
|
||||
pub(super) queue_items: Option<serde_json::Value>,
|
||||
/// Index of the current item in `queue_items`.
|
||||
#[serde(default, skip_serializing_if = "Option::is_none")]
|
||||
pub(super) queue_items_position: Option<usize>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Deserialize, JsonSchema)]
|
||||
@@ -263,6 +274,10 @@ pub(super) struct PlayerDevicePlaybackStateDto {
|
||||
pub(super) volume: f64,
|
||||
#[serde(default)]
|
||||
pub(super) updated_at_ms: i64,
|
||||
/// The browser does not know the position of its current item, a podcast
|
||||
/// episode it cannot play (`queue_items::POSITION_UNKNOWN_KEY`).
|
||||
#[serde(default, skip_serializing_if = "std::ops::Not::not")]
|
||||
pub(super) position_unknown: bool,
|
||||
}
|
||||
|
||||
#[derive(Debug, Serialize, JsonSchema)]
|
||||
@@ -324,7 +339,7 @@ pub(super) struct ShareLinkResponse {
|
||||
}
|
||||
|
||||
#[derive(Debug, Serialize, JsonSchema)]
|
||||
pub(super) struct PlaylistShareDetail {
|
||||
pub(super) struct ShareDetail {
|
||||
pub(super) token: String,
|
||||
pub(super) title: String,
|
||||
pub(super) tracks: Vec<TrackItem>,
|
||||
|
||||
+627
-572
File diff suppressed because it is too large.
Load diff
@@ -54,7 +54,7 @@ pub(super) struct ReorderPlaylistRequest {
|
||||
}
|
||||
|
||||
#[derive(Debug, Deserialize)]
|
||||
pub(super) struct CreatePlaylistShareRequest {
|
||||
pub(super) struct CreateShareRequest {
|
||||
pub(super) track_ids: Vec<i64>,
|
||||
pub(super) title: Option<String>,
|
||||
}
|
||||
@@ -76,12 +76,6 @@ pub(super) struct PathStringId {
|
||||
pub(super) id: String,
|
||||
}
|
||||
|
||||
#[derive(Debug, Deserialize)]
|
||||
pub(super) struct PathRadioSeed {
|
||||
pub(super) kind: String,
|
||||
pub(super) id: i64,
|
||||
}
|
||||
|
||||
#[derive(Debug, Deserialize)]
|
||||
pub(super) struct SearchQuery {
|
||||
pub(super) q: String,
|
||||
|
||||
@@ -0,0 +1,701 @@
|
||||
//! Lossless queue items shared by the browser player, device sync and the
|
||||
//! persisted playback state.
|
||||
//!
|
||||
//! The browser queue holds plain track JSON objects. Library tracks of this
|
||||
//! server keep their usual shape. Every other item received from a trusted
|
||||
//! device (unresolved federated music, podcast episodes, Jam private
|
||||
//! placeholders) becomes an *external* item: display fields for the queue UI
|
||||
//! plus the verbatim device-sync DTO under [`WIRE_TRACK_KEY`] and its explicit
|
||||
//! [`PlaybackSource`] under [`SOURCE_KEY`]. Converting back to the wire uses
|
||||
//! the verbatim DTO, so such items survive browser -> server -> peers ->
|
||||
//! server -> browser unchanged even though this web player cannot play them.
|
||||
//!
|
||||
//! Gating and Jam decisions are delegated to `music_dht::device_sync`; this
|
||||
//! module only maps browser JSON onto the shared DTOs.
|
||||
|
||||
use music_dht::device_sync::{
|
||||
PRIVATE_ITEM_TITLE, PlaybackCommand, PlaybackSource, PlaybackStateWire, PlaybackTrack,
|
||||
jam_command_allowed, redact_for_jam, restore_jam_private_items,
|
||||
};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use serde_json::Value;
|
||||
|
||||
/// Browser track key holding the verbatim [`PlaybackTrack`] of an external item.
|
||||
pub(crate) const WIRE_TRACK_KEY: &str = "wire_track";
|
||||
/// Browser track key holding the explicit [`PlaybackSource`] of an external item.
|
||||
pub(crate) const SOURCE_KEY: &str = "source";
|
||||
/// Browser playback state key: `true` when the browser does not know the
|
||||
/// position of its current item. That happens when it selects a podcast
|
||||
/// episode it cannot play (Next, auto-advance, a click or a play command):
|
||||
/// it is never told where the episode was left, and inventing 0 would
|
||||
/// restart the episode for every device. The server then takes the
|
||||
/// position from the episode's progress register.
|
||||
pub(crate) const POSITION_UNKNOWN_KEY: &str = "position_unknown";
|
||||
|
||||
/// Reason shown for federated music that is not in this library.
|
||||
pub(crate) const FED_UNAVAILABLE_REASON: &str = "Not available on this web player yet";
|
||||
/// Reason shown for podcast episodes, which this web player cannot play yet.
|
||||
pub(crate) const PODCAST_UNAVAILABLE_REASON: &str =
|
||||
"Podcast episodes cannot be played on the web player yet";
|
||||
/// Reason shown for Jam placeholders of someone else's private item.
|
||||
pub(crate) const PRIVATE_UNAVAILABLE_REASON: &str = "Private item of the Jam host";
|
||||
|
||||
/// Version of the typed queue stored in `furumusic__playback_state.queue_items_json`.
|
||||
pub(crate) const STORED_QUEUE_VERSION: u16 = 1;
|
||||
/// Upper bound of persisted queue items; larger queues keep only `queue_json`.
|
||||
pub(crate) const MAX_STORED_QUEUE_ITEMS: usize = 10_000;
|
||||
|
||||
/// Browser JSON for a queue item that is not a library track of this server.
|
||||
///
|
||||
/// `content_id` is the normalized content id of a music item, when known.
|
||||
/// The `id` is a negative placeholder that is stable for the item and its
|
||||
/// queue position, so the browser can tell items apart; it never refers to a
|
||||
/// library track.
|
||||
pub(crate) fn external_track_json(
|
||||
track: &PlaybackTrack,
|
||||
index: usize,
|
||||
content_id: Option<&str>,
|
||||
) -> Value {
|
||||
let mut json = match &track.source {
|
||||
Some(PlaybackSource::PodcastEpisode(episode)) => serde_json::json!({
|
||||
"id": placeholder_track_id(Some(episode.episode_id.as_str()), index),
|
||||
"title": episode.episode_title,
|
||||
"track_number": serde_json::Value::Null,
|
||||
"disc_number": serde_json::Value::Null,
|
||||
"duration_seconds": episode.duration_ms.unwrap_or(0).max(0) as f64 / 1_000.0,
|
||||
"artists": artist_names_to_json(std::slice::from_ref(&episode.podcast_title)),
|
||||
"featured_artists": [],
|
||||
"release_id": 0,
|
||||
"release_title": episode.podcast_title,
|
||||
"release_year": serde_json::Value::Null,
|
||||
"cover_url": serde_json::Value::Null,
|
||||
"stream_url": "",
|
||||
"uploader_name": "Podcast",
|
||||
"audio_format": episode.mime,
|
||||
"content_id": serde_json::Value::Null,
|
||||
"unavailable": true,
|
||||
"unavailable_reason": PODCAST_UNAVAILABLE_REASON,
|
||||
}),
|
||||
Some(PlaybackSource::Private) => serde_json::json!({
|
||||
"id": placeholder_track_id(Some("private"), index),
|
||||
"title": PRIVATE_ITEM_TITLE,
|
||||
"track_number": serde_json::Value::Null,
|
||||
"disc_number": serde_json::Value::Null,
|
||||
"duration_seconds": 0.0,
|
||||
"artists": [],
|
||||
"featured_artists": [],
|
||||
"release_id": 0,
|
||||
"release_title": "",
|
||||
"release_year": serde_json::Value::Null,
|
||||
"cover_url": serde_json::Value::Null,
|
||||
"stream_url": "",
|
||||
"uploader_name": "",
|
||||
"content_id": serde_json::Value::Null,
|
||||
"unavailable": true,
|
||||
"unavailable_reason": PRIVATE_UNAVAILABLE_REASON,
|
||||
}),
|
||||
Some(PlaybackSource::Music) | None => music_placeholder_json(track, index, content_id),
|
||||
};
|
||||
if let Some(object) = json.as_object_mut() {
|
||||
if let Some(source) = &track.source
|
||||
&& let Ok(source) = serde_json::to_value(source)
|
||||
{
|
||||
object.insert(SOURCE_KEY.to_string(), source);
|
||||
}
|
||||
if let Ok(wire) = serde_json::to_value(track) {
|
||||
object.insert(WIRE_TRACK_KEY.to_string(), wire);
|
||||
}
|
||||
}
|
||||
json
|
||||
}
|
||||
|
||||
/// Display fields of unresolved federated music (unchanged from earlier
|
||||
/// releases, which had no verbatim wire item).
|
||||
fn music_placeholder_json(track: &PlaybackTrack, index: usize, content_id: Option<&str>) -> Value {
|
||||
let artists = if !track.artist_names.is_empty() {
|
||||
track.artist_names.clone()
|
||||
} else if let Some(fed) = &track.fed {
|
||||
fed.artist_names.clone()
|
||||
} else {
|
||||
Vec::new()
|
||||
};
|
||||
let featured = if !track.featured_artist_names.is_empty() {
|
||||
track.featured_artist_names.clone()
|
||||
} else if let Some(fed) = &track.fed {
|
||||
fed.featured_artist_names.clone()
|
||||
} else {
|
||||
Vec::new()
|
||||
};
|
||||
let title = track
|
||||
.fed
|
||||
.as_ref()
|
||||
.map(|fed| fed.title.as_str())
|
||||
.filter(|title| !title.trim().is_empty())
|
||||
.unwrap_or(&track.title);
|
||||
let release_title = track
|
||||
.fed
|
||||
.as_ref()
|
||||
.and_then(|fed| fed.release_title.as_deref())
|
||||
.filter(|title| !title.trim().is_empty())
|
||||
.unwrap_or(&track.release_title);
|
||||
let content_id = content_id
|
||||
.map(ToString::to_string)
|
||||
.or_else(|| track.content_id.clone())
|
||||
.or_else(|| track.fed.as_ref().map(|fed| fed.content_id.clone()));
|
||||
serde_json::json!({
|
||||
"id": placeholder_track_id(content_id.as_deref(), index),
|
||||
"title": title,
|
||||
"track_number": track.track_number,
|
||||
"disc_number": track.disc_number,
|
||||
"duration_seconds": track.duration_seconds,
|
||||
"artists": artist_names_to_json(&artists),
|
||||
"featured_artists": artist_names_to_json(&featured),
|
||||
"release_id": 0,
|
||||
"release_title": release_title,
|
||||
"release_year": track.release_year,
|
||||
"cover_url": serde_json::Value::Null,
|
||||
"stream_url": "",
|
||||
"uploader_name": "Federation",
|
||||
"audio_format": track.audio_format.clone(),
|
||||
"audio_bitrate": track.audio_bitrate,
|
||||
"audio_sample_rate": track.audio_sample_rate,
|
||||
"audio_bit_depth": track.audio_bit_depth,
|
||||
"file_size_bytes": track.file_size_bytes,
|
||||
"content_id": content_id,
|
||||
"unavailable": true,
|
||||
"unavailable_reason": FED_UNAVAILABLE_REASON,
|
||||
})
|
||||
}
|
||||
|
||||
fn artist_names_to_json(names: &[String]) -> Vec<Value> {
|
||||
names
|
||||
.iter()
|
||||
.enumerate()
|
||||
.filter(|(_, name)| !name.trim().is_empty())
|
||||
.map(|(index, name)| serde_json::json!({"id": -((index as i64) + 1), "name": name}))
|
||||
.collect()
|
||||
}
|
||||
|
||||
fn placeholder_track_id(seed: Option<&str>, index: usize) -> i64 {
|
||||
let mut bytes = [0u8; 8];
|
||||
let hash = blake3::hash(seed.unwrap_or("").as_bytes());
|
||||
bytes.copy_from_slice(&hash.as_bytes()[..8]);
|
||||
let value = i64::from_le_bytes(bytes).unsigned_abs() % 9_000_000_000_000;
|
||||
-((value as i64) + index as i64 + 1)
|
||||
}
|
||||
|
||||
/// The device-sync item carried by an external browser track.
|
||||
///
|
||||
/// Returns the verbatim [`WIRE_TRACK_KEY`] DTO when present. Otherwise a
|
||||
/// browser item that only names a podcast or private [`SOURCE_KEY`] is
|
||||
/// rebuilt with the shared constructors. Library tracks (and malformed
|
||||
/// items) return `None` and keep the library mapping.
|
||||
pub(crate) fn wire_track_from_browser_json(track: &Value) -> Option<PlaybackTrack> {
|
||||
if let Some(wire) = track.get(WIRE_TRACK_KEY).filter(|wire| wire.is_object())
|
||||
&& let Ok(wire) = serde_json::from_value::<PlaybackTrack>(wire.clone())
|
||||
{
|
||||
return Some(wire);
|
||||
}
|
||||
match serde_json::from_value::<PlaybackSource>(track.get(SOURCE_KEY)?.clone()).ok()? {
|
||||
PlaybackSource::PodcastEpisode(episode) => Some(PlaybackTrack::podcast_episode(*episode)),
|
||||
PlaybackSource::Private => Some(PlaybackTrack::private_placeholder()),
|
||||
PlaybackSource::Music => None,
|
||||
}
|
||||
}
|
||||
|
||||
/// Whether a browser item is a podcast episode or a Jam placeholder.
|
||||
pub(crate) fn browser_track_requires_podcast_support(track: &Value) -> bool {
|
||||
wire_track_from_browser_json(track).is_some_and(|track| track.requires_podcast_support())
|
||||
}
|
||||
|
||||
/// Wire-shaped view of browser tracks for the shared gating and Jam helpers.
|
||||
///
|
||||
/// External items are their verbatim DTOs. Library tracks become minimal
|
||||
/// music items: the helpers only look at item sources and positions, so
|
||||
/// this conversion needs no database lookups.
|
||||
pub(crate) fn shadow_wire_state(tracks: &[Value], index: usize) -> PlaybackStateWire {
|
||||
PlaybackStateWire {
|
||||
queue: tracks
|
||||
.iter()
|
||||
.map(|track| wire_track_from_browser_json(track).unwrap_or_else(|| music_stub(track)))
|
||||
.collect(),
|
||||
queue_pos: index,
|
||||
playing: false,
|
||||
paused: true,
|
||||
idle_since_ms: None,
|
||||
position_secs: 0.0,
|
||||
volume: 0,
|
||||
shuffle: false,
|
||||
repeat: Default::default(),
|
||||
playback_rate: None,
|
||||
}
|
||||
}
|
||||
|
||||
fn music_stub(track: &Value) -> PlaybackTrack {
|
||||
PlaybackTrack {
|
||||
id: track.get("id").and_then(Value::as_i64).unwrap_or(0),
|
||||
title: String::new(),
|
||||
track_number: None,
|
||||
disc_number: None,
|
||||
duration_seconds: 0.0,
|
||||
artist_names: Vec::new(),
|
||||
featured_artist_names: Vec::new(),
|
||||
release_id: 0,
|
||||
release_title: String::new(),
|
||||
release_year: None,
|
||||
file_path: String::new(),
|
||||
content_id: None,
|
||||
audio_format: None,
|
||||
audio_bitrate: None,
|
||||
audio_sample_rate: None,
|
||||
audio_bit_depth: None,
|
||||
file_size_bytes: None,
|
||||
play_count: 0,
|
||||
fed: None,
|
||||
source: None,
|
||||
}
|
||||
}
|
||||
|
||||
/// Browser tracks as shown to Jam participants.
|
||||
///
|
||||
/// Uses [`redact_for_jam`]: every podcast episode (and existing placeholder)
|
||||
/// becomes the opaque private placeholder; music, order and position stay.
|
||||
pub(crate) fn redact_tracks_for_jam(tracks: &[Value]) -> Vec<Value> {
|
||||
let redacted = redact_for_jam(shadow_wire_state(tracks, 0));
|
||||
tracks
|
||||
.iter()
|
||||
.zip(redacted.queue.iter())
|
||||
.enumerate()
|
||||
.map(|(index, (original, redacted))| {
|
||||
if redacted.is_private_placeholder() {
|
||||
external_track_json(redacted, index, None)
|
||||
} else {
|
||||
original.clone()
|
||||
}
|
||||
})
|
||||
.collect()
|
||||
}
|
||||
|
||||
/// Maps the private placeholders of a Jam participant's full queue back to
|
||||
/// the host's items ([`restore_jam_private_items`]).
|
||||
///
|
||||
/// Returns `None` when the participant queue contains real podcast episodes
|
||||
/// or drops, duplicates or injects private items; the command is then
|
||||
/// rejected.
|
||||
pub(crate) fn restore_jam_tracks(host: &[Value], participant: &[Value]) -> Option<Vec<Value>> {
|
||||
let host_state = shadow_wire_state(host, 0);
|
||||
let restored = restore_jam_private_items(&host_state, shadow_wire_state(participant, 0))?;
|
||||
let mut host_private = host
|
||||
.iter()
|
||||
.zip(host_state.queue.iter())
|
||||
.filter(|(_, wire)| wire.requires_podcast_support())
|
||||
.map(|(json, _)| json);
|
||||
let participant_state = shadow_wire_state(participant, 0);
|
||||
let mut out = Vec::with_capacity(participant.len());
|
||||
for ((json, before), after) in participant
|
||||
.iter()
|
||||
.zip(participant_state.queue.iter())
|
||||
.zip(restored.queue.iter())
|
||||
{
|
||||
if before.is_private_placeholder() {
|
||||
out.push(host_private.next()?.clone());
|
||||
} else {
|
||||
debug_assert_eq!(before, after);
|
||||
out.push(json.clone());
|
||||
}
|
||||
}
|
||||
Some(out)
|
||||
}
|
||||
|
||||
/// Whether tracks sent by a Jam participant may enter the host queue at all
|
||||
/// ([`jam_command_allowed`]): participants cannot add podcast episodes.
|
||||
pub(crate) fn jam_tracks_allowed(tracks: &[Value]) -> bool {
|
||||
jam_command_allowed(&PlaybackCommand::SetState {
|
||||
state: shadow_wire_state(tracks, 0),
|
||||
seek: false,
|
||||
})
|
||||
}
|
||||
|
||||
/// Typed playback queue persisted next to the legacy `queue_json`.
|
||||
///
|
||||
/// `queue_json` (a list of library track ids) is still written for rollback
|
||||
/// to older releases. `legacy_queue`, `legacy_current_track_id` and
|
||||
/// `legacy_queue_position` record the legacy columns written alongside this
|
||||
/// value: when they no longer match the row (an older release or a
|
||||
/// legacy-only writer changed the queue or moved to another track since),
|
||||
/// readers ignore the typed value and fall back to the legacy columns.
|
||||
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
||||
pub(crate) struct StoredQueue {
|
||||
/// Shape version, [`STORED_QUEUE_VERSION`].
|
||||
pub(crate) version: u16,
|
||||
/// Index of the current item in `items`.
|
||||
#[serde(default)]
|
||||
pub(crate) position: usize,
|
||||
/// Queue items in order.
|
||||
#[serde(default)]
|
||||
pub(crate) items: Vec<StoredQueueItem>,
|
||||
/// `queue_json` ids written together with this value.
|
||||
#[serde(default)]
|
||||
pub(crate) legacy_queue: Vec<i64>,
|
||||
/// `current_track_id` written together with this value.
|
||||
#[serde(default)]
|
||||
pub(crate) legacy_current_track_id: Option<i64>,
|
||||
/// `queue_position` written together with this value (`None`: unknown,
|
||||
/// the value is not used).
|
||||
#[serde(default)]
|
||||
pub(crate) legacy_queue_position: Option<i32>,
|
||||
}
|
||||
|
||||
/// Legacy queue columns of a `furumusic__playback_state` row.
|
||||
#[derive(Debug, Clone, PartialEq, Eq, Default)]
|
||||
pub(crate) struct LegacyColumns {
|
||||
/// `queue_json`: library track ids.
|
||||
pub(crate) queue: Vec<i64>,
|
||||
/// `current_track_id`.
|
||||
pub(crate) current_track_id: Option<i64>,
|
||||
/// `queue_position`.
|
||||
pub(crate) queue_position: i32,
|
||||
}
|
||||
|
||||
/// One persisted queue item.
|
||||
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
||||
#[serde(tag = "kind", rename_all = "snake_case")]
|
||||
pub(crate) enum StoredQueueItem {
|
||||
/// Library track of this server.
|
||||
Library {
|
||||
/// Local track id.
|
||||
track_id: i64,
|
||||
},
|
||||
/// Any other item, kept verbatim with its explicit `source`.
|
||||
External {
|
||||
/// Device-sync queue item.
|
||||
track: Box<PlaybackTrack>,
|
||||
},
|
||||
}
|
||||
|
||||
impl StoredQueue {
|
||||
/// Builds the persisted value; `None` when the queue exceeds the bound.
|
||||
///
|
||||
/// Jam private placeholders are dropped: they stand for the Jam host's
|
||||
/// items, never for items of this user's own queue.
|
||||
pub(crate) fn new(
|
||||
items: Vec<StoredQueueItem>,
|
||||
position: usize,
|
||||
legacy: LegacyColumns,
|
||||
) -> Option<Self> {
|
||||
if items.len() > MAX_STORED_QUEUE_ITEMS {
|
||||
return None;
|
||||
}
|
||||
let mut stored = Self {
|
||||
version: STORED_QUEUE_VERSION,
|
||||
position,
|
||||
items,
|
||||
legacy_queue: Vec::new(),
|
||||
legacy_current_track_id: None,
|
||||
legacy_queue_position: None,
|
||||
};
|
||||
stored.retain_items(|item| match item {
|
||||
StoredQueueItem::Library { .. } => true,
|
||||
StoredQueueItem::External { track } => !track.is_private_placeholder(),
|
||||
});
|
||||
stored.set_legacy(legacy);
|
||||
Some(stored)
|
||||
}
|
||||
|
||||
/// Reads the typed column, preferring it over the legacy columns only
|
||||
/// when it has a known version and was written together with exactly
|
||||
/// these legacy values.
|
||||
pub(crate) fn from_columns(typed: Option<&Value>, legacy: &LegacyColumns) -> Option<Self> {
|
||||
let stored = serde_json::from_value::<Self>(typed?.clone()).ok()?;
|
||||
(stored.version == STORED_QUEUE_VERSION
|
||||
&& stored.legacy_queue == legacy.queue
|
||||
&& stored.legacy_current_track_id == legacy.current_track_id
|
||||
&& stored.legacy_queue_position == Some(legacy.queue_position)
|
||||
&& stored.items.len() <= MAX_STORED_QUEUE_ITEMS)
|
||||
.then_some(stored)
|
||||
}
|
||||
|
||||
/// Removes library tracks rejected by `keep` and records the new legacy
|
||||
/// columns. The current position follows its item, or the item after it
|
||||
/// when the current item was removed.
|
||||
pub(crate) fn retain_library(&mut self, keep: impl Fn(i64) -> bool, legacy: LegacyColumns) {
|
||||
self.retain_items(|item| match item {
|
||||
StoredQueueItem::Library { track_id } => keep(*track_id),
|
||||
StoredQueueItem::External { .. } => true,
|
||||
});
|
||||
self.set_legacy(legacy);
|
||||
}
|
||||
|
||||
fn retain_items(&mut self, keep: impl Fn(&StoredQueueItem) -> bool) {
|
||||
let original_position = self.position;
|
||||
let mut position = self.position;
|
||||
let mut index = 0;
|
||||
self.items.retain(|item| {
|
||||
let retained = keep(item);
|
||||
if !retained && index < original_position {
|
||||
position = position.saturating_sub(1);
|
||||
}
|
||||
index += 1;
|
||||
retained
|
||||
});
|
||||
self.position = position.min(self.items.len().saturating_sub(1));
|
||||
}
|
||||
|
||||
fn set_legacy(&mut self, legacy: LegacyColumns) {
|
||||
self.legacy_queue = legacy.queue;
|
||||
self.legacy_current_track_id = legacy.current_track_id;
|
||||
self.legacy_queue_position = Some(legacy.queue_position);
|
||||
}
|
||||
}
|
||||
|
||||
/// A valid podcast episode reference for tests.
|
||||
#[cfg(test)]
|
||||
pub(crate) fn test_episode() -> music_dht::podcast::PodcastEpisodeRef {
|
||||
use music_dht::podcast::{EpisodeId, FeedUrl, PodcastEpisodeRef, PodcastId};
|
||||
let feed_url = FeedUrl::parse("https://podcasts.example/feed.xml?token=Ab").unwrap();
|
||||
let podcast_id = PodcastId::from_feed_url(&feed_url);
|
||||
let episode_id = EpisodeId::from_guid(&podcast_id, "episode-42").unwrap();
|
||||
PodcastEpisodeRef {
|
||||
podcast_id,
|
||||
episode_id,
|
||||
feed_url,
|
||||
podcast_title: "Example Cast".into(),
|
||||
episode_title: "Episode 42".into(),
|
||||
audio_url: "https://cdn.example/ep42.mp3".into(),
|
||||
mime: Some("audio/mpeg".into()),
|
||||
duration_ms: Some(1_800_000),
|
||||
published_at_ms: Some(1_700_000_000_000),
|
||||
season: Some(2),
|
||||
episode_number: Some(42),
|
||||
image_url: None,
|
||||
progress_generation: Some(7),
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use music_dht::podcast::EpisodeId;
|
||||
|
||||
fn episode() -> music_dht::podcast::PodcastEpisodeRef {
|
||||
test_episode()
|
||||
}
|
||||
|
||||
fn library(id: i64) -> Value {
|
||||
serde_json::json!({"id": id, "title": format!("Track {id}"), "stream_url": format!("/api/player/stream/{id}")})
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn podcast_item_round_trips_through_browser_json() {
|
||||
let mut wire = PlaybackTrack::podcast_episode(episode());
|
||||
wire.play_count = 3;
|
||||
let json = external_track_json(&wire, 4, None);
|
||||
assert_eq!(json["unavailable"], true);
|
||||
assert_eq!(json["unavailable_reason"], PODCAST_UNAVAILABLE_REASON);
|
||||
assert_eq!(json["title"], "Episode 42");
|
||||
assert_eq!(json[SOURCE_KEY]["kind"], "podcast_episode");
|
||||
assert!(json["id"].as_i64().unwrap() < 0);
|
||||
// The browser stores and echoes the object; the item is unchanged.
|
||||
let echoed: Value = serde_json::from_str(&json.to_string()).unwrap();
|
||||
assert_eq!(wire_track_from_browser_json(&echoed), Some(wire));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn private_and_unresolved_music_keep_their_wire_item() {
|
||||
let private = PlaybackTrack::private_placeholder();
|
||||
let json = external_track_json(&private, 0, None);
|
||||
assert_eq!(json["title"], PRIVATE_ITEM_TITLE);
|
||||
assert_eq!(json[SOURCE_KEY]["kind"], "private");
|
||||
assert_eq!(wire_track_from_browser_json(&json), Some(private));
|
||||
|
||||
let mut music = PlaybackTrack::private_placeholder();
|
||||
music.source = None;
|
||||
music.title = "Remote song".into();
|
||||
music.content_id = Some(format!("b3:{}", "a".repeat(64)));
|
||||
let json = external_track_json(&music, 1, music.content_id.as_deref());
|
||||
assert!(json.get(SOURCE_KEY).is_none());
|
||||
assert_eq!(json["unavailable_reason"], FED_UNAVAILABLE_REASON);
|
||||
assert_eq!(wire_track_from_browser_json(&json), Some(music));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn library_tracks_are_not_external() {
|
||||
assert_eq!(wire_track_from_browser_json(&library(5)), None);
|
||||
let mut music_source = library(6);
|
||||
music_source[SOURCE_KEY] = serde_json::json!({"kind": "music"});
|
||||
assert_eq!(wire_track_from_browser_json(&music_source), None);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn source_only_items_use_shared_constructors() {
|
||||
let json = serde_json::json!({
|
||||
"id": -1,
|
||||
SOURCE_KEY: serde_json::to_value(PlaybackSource::PodcastEpisode(Box::new(episode()))).unwrap(),
|
||||
});
|
||||
assert_eq!(
|
||||
wire_track_from_browser_json(&json),
|
||||
Some(PlaybackTrack::podcast_episode(episode()))
|
||||
);
|
||||
// A malformed verbatim item falls back to the explicit source.
|
||||
let mut tampered = json.clone();
|
||||
tampered[WIRE_TRACK_KEY] = serde_json::json!({"id": "x"});
|
||||
assert_eq!(
|
||||
wire_track_from_browser_json(&tampered),
|
||||
Some(PlaybackTrack::podcast_episode(episode()))
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn jam_redaction_hides_episodes_and_restores_them_in_order() {
|
||||
let first = external_track_json(&PlaybackTrack::podcast_episode(episode()), 1, None);
|
||||
let mut other = episode();
|
||||
other.episode_title = "Episode 43".into();
|
||||
other.episode_id = EpisodeId::from_guid(&other.podcast_id, "episode-43").unwrap();
|
||||
let second = external_track_json(&PlaybackTrack::podcast_episode(other), 3, None);
|
||||
let host = vec![library(1), first.clone(), library(2), second.clone()];
|
||||
|
||||
let redacted = redact_tracks_for_jam(&host);
|
||||
assert_eq!(redacted[0], host[0]);
|
||||
assert_eq!(redacted[1]["title"], PRIVATE_ITEM_TITLE);
|
||||
let leaked = serde_json::to_string(&redacted).unwrap();
|
||||
assert!(!leaked.contains("Episode 4") && !leaked.contains("podcasts.example"));
|
||||
assert!(!leaked.contains("cdn.example") && !leaked.contains("Example Cast"));
|
||||
|
||||
// The participant reorders music and moves a placeholder.
|
||||
let participant = vec![
|
||||
redacted[3].clone(),
|
||||
library(2),
|
||||
redacted[1].clone(),
|
||||
library(1),
|
||||
];
|
||||
let restored = restore_jam_tracks(&host, &participant).unwrap();
|
||||
assert_eq!(
|
||||
restored,
|
||||
vec![first.clone(), library(2), second, library(1)]
|
||||
);
|
||||
|
||||
// Dropping, duplicating or injecting private items is rejected.
|
||||
assert!(restore_jam_tracks(&host, &[library(1), redacted[1].clone()]).is_none());
|
||||
assert!(restore_jam_tracks(&host, &[first.clone(), redacted[1].clone()]).is_none());
|
||||
assert!(!jam_tracks_allowed(std::slice::from_ref(&first)));
|
||||
assert!(jam_tracks_allowed(&[library(9)]));
|
||||
}
|
||||
|
||||
fn legacy(queue: &[i64], current_track_id: Option<i64>, queue_position: i32) -> LegacyColumns {
|
||||
LegacyColumns {
|
||||
queue: queue.to_vec(),
|
||||
current_track_id,
|
||||
queue_position,
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn stored_queue_prefers_typed_value_only_while_legacy_ids_match() {
|
||||
let items = vec![
|
||||
StoredQueueItem::Library { track_id: 3 },
|
||||
StoredQueueItem::External {
|
||||
track: Box::new(PlaybackTrack::podcast_episode(episode())),
|
||||
},
|
||||
StoredQueueItem::Library { track_id: 4 },
|
||||
];
|
||||
// The episode is current: the browser wrote its placeholder id.
|
||||
let written = legacy(&[3, -11, 4], Some(-11), 1);
|
||||
let stored = StoredQueue::new(items, 1, written.clone()).unwrap();
|
||||
let value = serde_json::to_value(&stored).unwrap();
|
||||
assert_eq!(value["version"], 1);
|
||||
assert_eq!(value["items"][1]["kind"], "external");
|
||||
assert_eq!(
|
||||
value["items"][1]["track"]["source"]["kind"],
|
||||
"podcast_episode"
|
||||
);
|
||||
assert_eq!(
|
||||
StoredQueue::from_columns(Some(&value), &written),
|
||||
Some(stored.clone())
|
||||
);
|
||||
// A rollback release rewrote queue_json: fall back to it.
|
||||
assert_eq!(
|
||||
StoredQueue::from_columns(Some(&value), &legacy(&[3, 4], Some(4), 1)),
|
||||
None
|
||||
);
|
||||
// A rollback release kept the ids but moved to another track (Next
|
||||
// or a click): the typed position is stale, fall back as well.
|
||||
assert_eq!(
|
||||
StoredQueue::from_columns(Some(&value), &legacy(&[3, -11, 4], Some(4), 2)),
|
||||
None
|
||||
);
|
||||
assert_eq!(
|
||||
StoredQueue::from_columns(Some(&value), &legacy(&[3, -11, 4], Some(-11), 0)),
|
||||
None
|
||||
);
|
||||
// Values without the recorded current item are not trusted.
|
||||
let mut unknown = value.clone();
|
||||
unknown
|
||||
.as_object_mut()
|
||||
.unwrap()
|
||||
.remove("legacy_queue_position");
|
||||
assert_eq!(StoredQueue::from_columns(Some(&unknown), &written), None);
|
||||
let mut future = value.clone();
|
||||
future["version"] = serde_json::json!(2);
|
||||
assert_eq!(StoredQueue::from_columns(Some(&future), &written), None);
|
||||
assert_eq!(StoredQueue::from_columns(None, &written), None);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn stored_queue_never_keeps_jam_placeholders() {
|
||||
let items = vec![
|
||||
StoredQueueItem::Library { track_id: 3 },
|
||||
StoredQueueItem::External {
|
||||
track: Box::new(PlaybackTrack::private_placeholder()),
|
||||
},
|
||||
StoredQueueItem::External {
|
||||
track: Box::new(PlaybackTrack::podcast_episode(episode())),
|
||||
},
|
||||
StoredQueueItem::Library { track_id: 4 },
|
||||
];
|
||||
let stored = StoredQueue::new(items.clone(), 3, legacy(&[3, 4], Some(4), 1)).unwrap();
|
||||
assert_eq!(
|
||||
stored.items,
|
||||
vec![items[0].clone(), items[2].clone(), items[3].clone()]
|
||||
);
|
||||
assert_eq!(stored.position, 2);
|
||||
// A current placeholder hands the position to the next item.
|
||||
let stored = StoredQueue::new(items.clone(), 1, legacy(&[3, 4], None, 0)).unwrap();
|
||||
assert_eq!(stored.position, 1);
|
||||
assert_eq!(stored.items[1], items[2]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn stored_queue_cleanup_keeps_external_items_and_position() {
|
||||
let items = vec![
|
||||
StoredQueueItem::Library { track_id: 3 },
|
||||
StoredQueueItem::External {
|
||||
track: Box::new(PlaybackTrack::podcast_episode(episode())),
|
||||
},
|
||||
StoredQueueItem::Library { track_id: 4 },
|
||||
];
|
||||
let mut stored = StoredQueue::new(items.clone(), 1, legacy(&[3, 4], None, 0)).unwrap();
|
||||
stored.retain_library(|id| id != 3, legacy(&[4], None, 0));
|
||||
assert_eq!(stored.items, items[1..].to_vec());
|
||||
assert_eq!(stored.position, 0);
|
||||
assert_eq!(stored.legacy_queue, vec![4]);
|
||||
// The cleanup's new legacy columns are what readers compare with.
|
||||
let value = serde_json::to_value(&stored).unwrap();
|
||||
assert_eq!(
|
||||
StoredQueue::from_columns(Some(&value), &legacy(&[4], None, 0)),
|
||||
Some(stored)
|
||||
);
|
||||
|
||||
let mut current_removed =
|
||||
StoredQueue::new(items.clone(), 2, legacy(&[3, 4], Some(4), 1)).unwrap();
|
||||
current_removed.retain_library(|id| id != 4, legacy(&[3], None, 0));
|
||||
assert_eq!(current_removed.position, 1);
|
||||
assert!(
|
||||
StoredQueue::new(
|
||||
vec![items[0].clone(); MAX_STORED_QUEUE_ITEMS + 1],
|
||||
0,
|
||||
LegacyColumns::default()
|
||||
)
|
||||
.is_none()
|
||||
);
|
||||
}
|
||||
}
|
||||
+2
-1
@@ -54,8 +54,8 @@ pub(super) struct ReleaseArtistRefRow {
|
||||
#[derive(sqlx::FromRow)]
|
||||
pub(super) struct MediaFileRow {
|
||||
pub(super) file_path: String,
|
||||
pub(super) original_filename: String,
|
||||
pub(super) mime_type: String,
|
||||
pub(super) file_size_bytes: i64,
|
||||
pub(super) sha256_hash: String,
|
||||
pub(super) created_at: String,
|
||||
}
|
||||
@@ -65,6 +65,7 @@ pub(super) struct PlaybackStateRow {
|
||||
pub(super) current_track_id: Option<i64>,
|
||||
pub(super) position_ms: i32,
|
||||
pub(super) queue_json: String,
|
||||
pub(super) queue_items_json: Option<serde_json::Value>,
|
||||
pub(super) queue_position: i32,
|
||||
pub(super) shuffle: bool,
|
||||
pub(super) repeat_mode: String,
|
||||
|
||||
@@ -0,0 +1,125 @@
|
||||
//! Public capabilities grant access only to a stored snapshot's visible tracks.
|
||||
use super::*;
|
||||
|
||||
#[derive(Deserialize)]
|
||||
pub(super) struct MediaPath {
|
||||
token: String,
|
||||
action: String,
|
||||
track_id: i64,
|
||||
}
|
||||
|
||||
async fn load_share(pool: &sqlx::PgPool, token: &str) -> cot::Result<Option<ShareDetail>> {
|
||||
if !crate::is_share_token(token) {
|
||||
return Ok(None);
|
||||
}
|
||||
let row: Option<(String, String)> =
|
||||
sqlx::query_as("SELECT title, track_ids_json FROM furumusic__share_link WHERE token = $1")
|
||||
.bind(token)
|
||||
.fetch_optional(pool)
|
||||
.await
|
||||
.map_err(|e| cot::Error::internal(e.to_string()))?;
|
||||
let Some((title, json)) = row else {
|
||||
return Ok(None);
|
||||
};
|
||||
let ids: Vec<i64> =
|
||||
serde_json::from_str(&json).map_err(|e| cot::Error::internal(e.to_string()))?;
|
||||
let tracks = load_track_items_by_ids(pool, &ids).await?;
|
||||
Ok(Some(ShareDetail {
|
||||
token: token.to_owned(),
|
||||
title,
|
||||
tracks,
|
||||
}))
|
||||
}
|
||||
|
||||
pub(super) async fn detail_handler(
|
||||
auth_ctx: auth::AuthContext,
|
||||
session: Session,
|
||||
db: Database,
|
||||
pool: &sqlx::PgPool,
|
||||
path: Path<PathStringId>,
|
||||
) -> cot::Result<cot::response::Response> {
|
||||
let Some(mut share) = load_share(pool, &path.0.id).await? else {
|
||||
return Ok(json_error(StatusCode::NOT_FOUND, "shared music not found"));
|
||||
};
|
||||
if auth::get_request_user(&auth_ctx, &session, &db)
|
||||
.await
|
||||
.is_none()
|
||||
{
|
||||
for track in &mut share.tracks {
|
||||
track.stream_url = format!("/api/player/shares/{}/stream/{}", share.token, track.id);
|
||||
if track.cover_url.is_some() {
|
||||
track.cover_url = Some(format!(
|
||||
"/api/player/shares/{}/cover/{}",
|
||||
share.token, track.id
|
||||
));
|
||||
}
|
||||
}
|
||||
}
|
||||
let mut response = Json(share).into_response()?;
|
||||
response
|
||||
.headers_mut()
|
||||
.insert("Cache-Control", "private, no-store".parse().unwrap());
|
||||
Ok(response)
|
||||
}
|
||||
|
||||
pub(super) async fn media_handler(
|
||||
pool: &sqlx::PgPool,
|
||||
config: &AppConfig,
|
||||
request: &cot::http::Request<Body>,
|
||||
path: Path<MediaPath>,
|
||||
) -> cot::Result<cot::response::Response> {
|
||||
let p = path.0;
|
||||
if !crate::is_share_token(&p.token) {
|
||||
return Ok(json_error(StatusCode::NOT_FOUND, "shared music not found"));
|
||||
}
|
||||
// Media range requests need only a membership check, not the metadata and
|
||||
// artist lists of every track in a potentially large shared queue.
|
||||
let allowed: bool = sqlx::query_scalar(
|
||||
"SELECT EXISTS (SELECT 1 FROM furumusic__share_link s
|
||||
JOIN furumusic__track t ON t.id = $2
|
||||
JOIN furumusic__release r ON r.id = t.release_id
|
||||
WHERE s.token = $1 AND s.track_ids_json::jsonb @> jsonb_build_array($2::bigint)
|
||||
AND t.is_hidden = false AND r.is_hidden = false)",
|
||||
)
|
||||
.bind(&p.token)
|
||||
.bind(p.track_id)
|
||||
.fetch_one(pool)
|
||||
.await
|
||||
.map_err(|e| cot::Error::internal(e.to_string()))?;
|
||||
if !allowed {
|
||||
return Ok(json_error(StatusCode::NOT_FOUND, "shared track not found"));
|
||||
}
|
||||
match p.action.as_str() {
|
||||
"stream" | "download" => {
|
||||
audio_response(pool, config, request, p.track_id, p.action == "download").await
|
||||
}
|
||||
"cover" => {
|
||||
let cover: Option<i64> = sqlx::query_scalar(
|
||||
"SELECT COALESCE(t.cover_file_id, r.cover_file_id) FROM furumusic__track t JOIN furumusic__release r ON r.id = t.release_id WHERE t.id = $1")
|
||||
.bind(p.track_id).fetch_one(pool).await.map_err(|e| cot::Error::internal(e.to_string()))?;
|
||||
match cover {
|
||||
Some(id) => cover_file_response(pool, config, id, Some("card")).await,
|
||||
None => Ok(json_error(StatusCode::NOT_FOUND, "cover not found")),
|
||||
}
|
||||
}
|
||||
_ => Ok(json_error(StatusCode::NOT_FOUND, "not found")),
|
||||
}
|
||||
}
|
||||
|
||||
pub(super) async fn download_handler(
|
||||
auth_ctx: auth::AuthContext,
|
||||
session: Session,
|
||||
db: Database,
|
||||
pool: &sqlx::PgPool,
|
||||
config: &AppConfig,
|
||||
request: &cot::http::Request<Body>,
|
||||
path: Path<PathTrackId>,
|
||||
) -> cot::Result<cot::response::Response> {
|
||||
if auth::get_request_user(&auth_ctx, &session, &db)
|
||||
.await
|
||||
.is_none()
|
||||
{
|
||||
return Ok(json_error(StatusCode::UNAUTHORIZED, "not authenticated"));
|
||||
}
|
||||
audio_response(pool, config, request, path.0.track_id, true).await
|
||||
}
|
||||
+80
-14
@@ -19,6 +19,10 @@ pub struct User {
|
||||
avatar_url: Option<String>,
|
||||
role: LimitedString<32>,
|
||||
is_active: bool,
|
||||
local_role: Option<String>,
|
||||
sso_role: Option<String>,
|
||||
approved_by: Option<i64>,
|
||||
approved_at: Option<String>,
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
@@ -50,6 +54,10 @@ impl User {
|
||||
avatar_url: None,
|
||||
role: LimitedString::new(role).unwrap(),
|
||||
is_active: true,
|
||||
local_role: Some(role.to_owned()),
|
||||
sso_role: None,
|
||||
approved_by: None,
|
||||
approved_at: None,
|
||||
};
|
||||
user.insert(db).await?;
|
||||
Ok(user)
|
||||
@@ -72,8 +80,13 @@ impl User {
|
||||
if let Some(pw) = new_password {
|
||||
self.password = Some(PasswordHash::from_password(&Password::new(pw)).into_string());
|
||||
}
|
||||
self.role = LimitedString::new(role).unwrap();
|
||||
self.save(db).await
|
||||
let local_role = (!role.is_empty()).then(|| role.to_owned());
|
||||
db.raw_with("UPDATE furumusic__user SET username = $1, email = $2, display_name = $3, password = $4, local_role = $5, role = COALESCE(sso_role, $5, 'user'), is_active = (sso_role IS NOT NULL OR $5 IS NOT NULL) WHERE id = $6",
|
||||
&[&username.to_owned(), &self.email, &self.display_name, &self.password, &local_role, &self.id_val()]).await?;
|
||||
if let Some(updated) = Self::get_by_id(db, self.id_val()).await? {
|
||||
*self = updated;
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Look up a user by username.
|
||||
@@ -126,13 +139,17 @@ impl User {
|
||||
self.is_active
|
||||
}
|
||||
|
||||
pub fn has_sso_admin_role(&self) -> bool {
|
||||
self.sso_role.as_deref() == Some("admin")
|
||||
}
|
||||
|
||||
/// Create a user without a password (for OIDC-only accounts).
|
||||
pub async fn create_oidc(
|
||||
db: &Database,
|
||||
username: &str,
|
||||
email: Option<&str>,
|
||||
display_name: Option<&str>,
|
||||
role: &str,
|
||||
sso_role: Option<&str>,
|
||||
) -> cot::db::Result<Self> {
|
||||
let mut user = Self {
|
||||
id: Auto::auto(),
|
||||
@@ -141,24 +158,44 @@ impl User {
|
||||
email: email.map(str::to_owned),
|
||||
display_name: display_name.map(str::to_owned),
|
||||
avatar_url: None,
|
||||
role: LimitedString::new(role).unwrap(),
|
||||
is_active: true,
|
||||
role: LimitedString::new(sso_role.unwrap_or("user")).unwrap(),
|
||||
is_active: sso_role.is_some(),
|
||||
local_role: None,
|
||||
sso_role: sso_role.map(str::to_owned),
|
||||
approved_by: None,
|
||||
approved_at: None,
|
||||
};
|
||||
user.insert(db).await?;
|
||||
Ok(user)
|
||||
}
|
||||
|
||||
/// Update the user's role and persist the change.
|
||||
pub async fn update_role(&mut self, db: &Database, role: &str) -> cot::db::Result<()> {
|
||||
self.role = LimitedString::new(role).unwrap();
|
||||
self.save(db).await
|
||||
pub async fn sync_sso_role(
|
||||
&mut self,
|
||||
db: &Database,
|
||||
role: Option<&str>,
|
||||
) -> cot::db::Result<()> {
|
||||
let role = role.map(str::to_owned);
|
||||
// Change just this grant atomically: a concurrent administrator approval
|
||||
// must not be overwritten by a stale User loaded before the OIDC callback.
|
||||
db.raw_with("UPDATE furumusic__user SET sso_role = $1, role = COALESCE($1, local_role, 'user'), is_active = ($1 IS NOT NULL OR local_role IS NOT NULL) WHERE id = $2", &[&role, &self.id_val()]).await?;
|
||||
if let Some(updated) = Self::get_by_id(db, self.id_val()).await? {
|
||||
*self = updated;
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Find a user by email address.
|
||||
pub async fn get_by_email(db: &Database, email: &str) -> cot::db::Result<Option<Self>> {
|
||||
cot::db::query!(User, $email == Some(email.to_owned()))
|
||||
.get(db)
|
||||
.await
|
||||
pub async fn approve(
|
||||
&mut self,
|
||||
db: &Database,
|
||||
role: &str,
|
||||
admin_id: i64,
|
||||
) -> cot::db::Result<()> {
|
||||
db.raw_with("UPDATE furumusic__user SET local_role = $1, role = COALESCE(sso_role, $1), is_active = true, approved_by = $2, approved_at = $3 WHERE id = $4",
|
||||
&[&role.to_owned(), &admin_id, &chrono::Utc::now().to_rfc3339(), &self.id_val()]).await?;
|
||||
if let Some(updated) = Self::get_by_id(db, self.id_val()).await? {
|
||||
*self = updated;
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
@@ -393,9 +430,38 @@ pub mod db_migrations {
|
||||
&[Operation::custom(create_oidc_link_indexes).build()];
|
||||
}
|
||||
|
||||
#[cot::db::migrations::migration_op]
|
||||
async fn add_local_approval(ctx: migrations::MigrationContext<'_>) -> cot::db::Result<()> {
|
||||
ctx.db.raw("ALTER TABLE furumusic__user ADD COLUMN local_role text, ADD COLUMN sso_role text, ADD COLUMN approved_by bigint, ADD COLUMN approved_at text").await?;
|
||||
// Existing password accounts retain local access. OIDC-only accounts retain
|
||||
// their last SSO role until the next verified login refreshes group membership.
|
||||
ctx.db.raw("UPDATE furumusic__user SET local_role = CASE WHEN password IS NOT NULL AND is_active THEN role ELSE NULL END, sso_role = CASE WHEN password IS NULL AND is_active THEN role ELSE NULL END").await?;
|
||||
ctx.db
|
||||
.raw("DROP TABLE furumusic__playlist_share_link")
|
||||
.await?;
|
||||
ctx.db.raw("CREATE TABLE furumusic__share_link (token text PRIMARY KEY, creator_user_id bigint NOT NULL, title text NOT NULL, track_ids_json text NOT NULL, created_at text NOT NULL)").await?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[derive(Debug, Copy, Clone)]
|
||||
pub struct M0053LocalApprovalAndPublicShares;
|
||||
impl migrations::Migration for M0053LocalApprovalAndPublicShares {
|
||||
const APP_NAME: &'static str = "furumusic";
|
||||
const MIGRATION_NAME: &'static str = "m_0053_local_approval_and_public_shares";
|
||||
const DEPENDENCIES: &'static [migrations::MigrationDependency] = &[
|
||||
migrations::MigrationDependency::migration("furumusic", "m_0005_oidc_link_indexes"),
|
||||
migrations::MigrationDependency::migration(
|
||||
"furumusic",
|
||||
"m_0037_create_playlist_share_links",
|
||||
),
|
||||
];
|
||||
const OPERATIONS: &'static [Operation] = &[Operation::custom(add_local_approval).build()];
|
||||
}
|
||||
|
||||
pub const MIGRATIONS: &[&SyncDynMigration] = &[
|
||||
&M0003CreateUser,
|
||||
&M0004CreateOidcLink,
|
||||
&M0005OidcLinkIndexes,
|
||||
&M0053LocalApprovalAndPublicShares,
|
||||
];
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
<aside class="sidebar" id="admin-navigation" :class="{'is-open': menuOpen}" :data-compact="isCompact" :inert="isCompact && !menuOpen" :role="isCompact ? 'dialog' : null" :aria-modal="isCompact && menuOpen ? 'true' : null" aria-label="Admin navigation" tabindex="-1" x-effect="adminOverlay.sync($el, isCompact && menuOpen)" @keydown="adminOverlay.keydown($event, $el)">
|
||||
<div class="brand">
|
||||
<div><div class="brand-title">FuruMusic <span class="version">v{{ version }}</span></div><div class="admin-user">{{ user_name }} · {{ user_role }}</div></div>
|
||||
<button class="icon-btn nav-close" data-dialog-close aria-label="Close navigation" @click="closeMenu()"><i data-lucide="x"></i></button>
|
||||
</div>
|
||||
<nav aria-label="Administration" class="nav-sections" @click="if ($event.target.closest('.nav-btn')) closeMenu()">
|
||||
<div class="nav-group">
|
||||
<div class="nav-label">Operations</div>
|
||||
<button class="nav-btn" :class="{active: activeView === 'reviews'}" :aria-current="activeView === 'reviews' ? 'page' : null" @click="openReviews()"><i data-lucide="inbox"></i><span>Review Queue</span><span class="nav-count" x-text="reviewTotalAll()"></span></button>
|
||||
<button class="nav-btn" :class="{active: activeView === 'jobs'}" :aria-current="activeView === 'jobs' ? 'page' : null" @click="openJobs()"><i data-lucide="calendar-clock"></i><span>Tasks</span><span class="nav-count" x-text="jobs.length || 0"></span></button>
|
||||
</div>
|
||||
<div class="nav-group">
|
||||
<div class="nav-label">Music</div>
|
||||
<button class="nav-btn" :class="{active: activeView === 'library'}" :aria-current="activeView === 'library' ? 'page' : null" @click="openLibrary(libraryKind)"><i data-lucide="library"></i><span>Library Workbench</span><span class="nav-count" x-text="fmt(stats.tracks || 0)"></span></button>
|
||||
<button class="nav-btn" :class="{active: activeView === 'tools'}" :aria-current="activeView === 'tools' ? 'page' : null" @click="openTools()"><i data-lucide="wrench"></i><span>Library Tools</span></button>
|
||||
<button class="nav-btn" :class="{active: activeView === 'statistics'}" :aria-current="activeView === 'statistics' ? 'page' : null" @click="openStatistics()"><i data-lucide="chart-no-axes-combined"></i><span>Statistics</span></button>
|
||||
</div>
|
||||
<div class="nav-group">
|
||||
<div class="nav-label">Instance</div>
|
||||
<button class="nav-btn" :class="{active: activeView === 'users'}" :aria-current="activeView === 'users' ? 'page' : null" @click="openUsers()"><i data-lucide="users"></i><span>Users</span><span class="nav-count" x-text="users.online_count ? users.online_count + ' online' : ''"></span></button>
|
||||
<button class="nav-btn" :class="{active: activeView === 'settings'}" :aria-current="activeView === 'settings' ? 'page' : null" @click="openSettings()"><i data-lucide="settings"></i><span>Settings</span></button>
|
||||
</div>
|
||||
</nav>
|
||||
<a class="nav-player btn" href="/"><i data-lucide="music-2"></i>Back to player</a>
|
||||
</aside>
|
||||
@@ -0,0 +1,193 @@
|
||||
<style>
|
||||
/* Shared admin UI contract. Keep breakpoints in sync with admin/ui.html. */
|
||||
:root { --admin-gap:16px; --admin-touch:44px; --admin-header:64px; --admin-radius:10px; }
|
||||
html { overscroll-behavior:none; }
|
||||
:focus-visible { outline:2px solid var(--accent); outline-offset:3px; }
|
||||
.admin-shell { min-width:0; }
|
||||
.sidebar { overflow:auto; overscroll-behavior:contain; padding-bottom:env(safe-area-inset-bottom); }
|
||||
.brand { display:flex; align-items:center; justify-content:space-between; gap:12px; }
|
||||
.nav-player { margin:12px; margin-top:auto; min-height:44px; flex:none; }
|
||||
.nav-btn { min-height:44px; height:auto; padding-block:10px; }
|
||||
.nav-group { padding-block:8px; }
|
||||
.nav-label { letter-spacing:.08em; }
|
||||
.nav-btn.active { background:rgba(29,185,84,.12); box-shadow:inset 3px 0 var(--accent); }
|
||||
.menu-toggle, .nav-close, .nav-backdrop, .workspace-tabs, .section-jump { display:none; }
|
||||
.main { overscroll-behavior:contain; scrollbar-gutter:stable; }
|
||||
.main.is-locked { overflow:hidden; }
|
||||
.topbar { min-height:var(--admin-header); height:auto; }
|
||||
.top-actions { flex:none; }
|
||||
.content { min-width:0; padding:var(--admin-gap); }
|
||||
.content > *, .panel-head > *, .toolbar > *, .modal-body > *, .settings-section > *, .image-editor > * { min-width:0; }
|
||||
.panel-head, .toolbar, .action-strip { flex-wrap:wrap; }
|
||||
.panel-head > .toolbar { margin-left:auto; }
|
||||
.toolbar { max-width:100%; }
|
||||
.search { max-width:100%; min-width:0; }
|
||||
.btn { text-decoration:none; white-space:normal; line-height:1.3; }
|
||||
.icon-btn { flex:none; }
|
||||
.segmented { max-width:100%; min-width:0; overflow:auto; flex-wrap:nowrap; }
|
||||
.seg-btn { flex:none; }
|
||||
.panel-title strong, .panel-title span, .setting-help, .selection-summary, .repair-context { overflow-wrap:anywhere; }
|
||||
.table-wrap { max-width:100%; overscroll-behavior:contain; }
|
||||
.table-wrap:focus-visible { outline-offset:-3px; }
|
||||
.jobs-page { grid-template-columns:minmax(0,1fr) minmax(280px,340px); height:calc(100dvh - 100px); }
|
||||
.run-row { width:100%; color:inherit; text-align:left; background:transparent; font:inherit; }
|
||||
.row-link { display:block; max-width:100%; padding:0; background:transparent; color:inherit; text-align:left; cursor:pointer; }
|
||||
.row-link:hover { text-decoration:underline; }
|
||||
.job-fact > .btn { grid-column:2; justify-self:start; }
|
||||
.job-fact > form { grid-column:1 / -1; }
|
||||
.task-form { position:static; max-height:100%; }
|
||||
.settings-section { scroll-margin-top:calc(var(--admin-header) + 70px); }
|
||||
.settings-federation-body { grid-template-columns:minmax(0,4fr) minmax(0,8fr); }
|
||||
.download-method-controls { grid-template-columns:minmax(0,.75fr) minmax(0,1.25fr); }
|
||||
.proxy-row { grid-template-columns:minmax(0,1.4fr) minmax(0,.8fr) minmax(0,.8fr) auto; }
|
||||
.field { display:block; min-width:0; }
|
||||
.modal-backdrop { padding:24px; overscroll-behavior:contain; }
|
||||
.modal { display:flex; flex-direction:column; width:min(760px,100%); max-width:100%; max-height:calc(100dvh - 48px); }
|
||||
.modal.user-modal { width:min(860px,100%); }
|
||||
.modal.merge-modal { width:min(1180px,100%); }
|
||||
.modal-head { flex:none; min-width:0; padding:12px 16px; }
|
||||
.modal-head [data-dialog-close] { flex:none; min-width:44px; min-height:44px; }
|
||||
.modal-body { min-height:0; max-height:none; overflow:auto; overscroll-behavior:contain; padding:16px; }
|
||||
.dialog-actions { position:sticky; bottom:-16px; z-index:4; display:flex; align-items:center; justify-content:flex-end; flex-wrap:wrap; gap:8px; margin:16px -16px -16px; padding:12px 16px; border-top:1px solid var(--border-color); background:var(--bg-secondary); }
|
||||
.merge-footer.dialog-actions { justify-content:space-between; }
|
||||
.track-field { min-width:0; margin:0; }
|
||||
.track-field > span { display:none; }
|
||||
.toast { z-index:50; max-width:min(420px,calc(100vw - 24px)); bottom:max(18px,env(safe-area-inset-bottom)); overflow-wrap:anywhere; }
|
||||
.repair-plan-body { max-width:100%; }
|
||||
.repair-work, .repair-side { min-width:0; }
|
||||
.repair-manual { max-width:100%; overflow:auto; }
|
||||
.repair-diff { table-layout:auto; }
|
||||
.settings-actions { padding-bottom:max(12px,env(safe-area-inset-bottom)); }
|
||||
@media (max-width:1279px) {
|
||||
.workspace-tabs { display:flex; gap:4px; padding:4px; margin-bottom:12px; border:1px solid var(--border-color); border-radius:8px; background:var(--bg-secondary); }
|
||||
.workspace-tabs button { flex:1; min-width:0; min-height:44px; padding:8px; border-radius:5px; background:transparent; color:var(--text-secondary); cursor:pointer; }
|
||||
.workspace-tabs [aria-selected="true"] { background:var(--bg-active); color:var(--text-primary); }
|
||||
.jobs-page { display:block; height:auto; }
|
||||
.jobs-page .jobs-list-panel, .jobs-page .task-form, .jobs-page .run-log-panel { display:none; max-height:none; }
|
||||
.jobs-page[data-task-pane="list"] .jobs-list-panel,
|
||||
.jobs-page[data-task-pane="details"] .task-form,
|
||||
.jobs-page[data-task-pane="logs"] .run-log-panel { display:flex; }
|
||||
.task-form-body { overflow:visible; }
|
||||
.run-log-body { min-height:300px; overflow:visible; }
|
||||
.run-log-output { min-height:50dvh; max-height:70dvh; }
|
||||
.settings-layout { grid-template-columns:minmax(0,1fr); grid-template-areas:"access" "oidc" "agent" "agentstatus" "similarity" "similaritystatus" "downloads" "federation" "lastfm" "developer" "actions"; }
|
||||
.settings-federation-body { grid-template-columns:minmax(0,1fr); }
|
||||
.repair-shell { grid-template-columns:250px minmax(0,1fr); }
|
||||
}
|
||||
@media (max-width:1023px) {
|
||||
:root { --admin-gap:16px; }
|
||||
.admin-shell { grid-template-columns:minmax(0,1fr); }
|
||||
.sidebar { position:fixed; inset:0 auto 0 0; z-index:25; width:min(320px,calc(100vw - 48px)); height:100dvh; transform:translateX(-100%); visibility:hidden; transition:transform .18s ease, visibility .18s; padding-top:env(safe-area-inset-top); box-shadow:16px 0 48px #0006; }
|
||||
.sidebar.is-open { transform:translateX(0); visibility:visible; }
|
||||
.nav-backdrop { display:block; position:fixed; inset:0; z-index:24; background:#0009; }
|
||||
.menu-toggle, .nav-close { display:inline-flex; align-items:center; justify-content:center; min-width:44px; min-height:44px; }
|
||||
.topbar { display:grid; grid-template-columns:44px minmax(0,1fr) auto; gap:10px; padding:10px 16px; padding-top:max(10px,env(safe-area-inset-top)); }
|
||||
.page-title h1 { font-size:18px; }
|
||||
.page-title p { line-height:1.4; }
|
||||
.panel-head { gap:12px; }
|
||||
.panel-head > .toolbar { margin-left:0; }
|
||||
.library-row { grid-template-columns:32px minmax(0,1fr) 110px; }
|
||||
.library-row .tags { grid-column:2 / -1; grid-row:2; }
|
||||
.library-row > .badge { grid-column:3; grid-row:1; justify-self:end; }
|
||||
.section-jump { display:flex; align-items:center; gap:12px; margin-bottom:16px; font-size:13px; color:var(--text-secondary); }
|
||||
.section-jump select { flex:1; width:auto; }
|
||||
.primary-line, .secondary-line { white-space:normal; overflow-wrap:anywhere; }
|
||||
.users-table, .statistics-table { min-width:700px; }
|
||||
}
|
||||
@media (max-width:767px) {
|
||||
:root { --admin-gap:12px; }
|
||||
.topbar { gap:8px; padding-inline:12px; }
|
||||
.top-actions { gap:6px; }
|
||||
.top-actions .btn { width:44px; height:44px; padding:0; justify-content:center; }
|
||||
.top-action-label, .page-title p { display:none; }
|
||||
.page-title h1 { font-size:17px; overflow-wrap:anywhere; }
|
||||
.btn, .icon-btn, .seg-btn { min-height:44px; height:auto; }
|
||||
.icon-btn { width:44px; }
|
||||
.btn { padding:10px 12px; }
|
||||
.search, .setting-field input, .setting-field select, .field input, .field select, .field textarea, .setting-field textarea, .proxy-row input, .download-method-controls select, .youtube-cookie-picker select, .repair-composer textarea { font-size:16px; min-height:44px; }
|
||||
.search { width:100%; }
|
||||
.toolbar { gap:8px; }
|
||||
.panel-head { padding:12px; align-items:stretch; }
|
||||
.panel-head > .toolbar { width:100%; }
|
||||
.toolbar > input.search { flex:1 1 180px; }
|
||||
.segmented { width:100%; }
|
||||
.seg-btn { min-width:max-content; }
|
||||
.action-strip { padding:12px; gap:12px; align-items:stretch; }
|
||||
.action-strip > .toolbar { width:100%; }
|
||||
.action-strip > .selection-summary { flex-basis:100%; }
|
||||
.stats-strip, .statistics-summary, .user-summary-grid, .user-profile-facts, .user-stats-grid { grid-template-columns:repeat(2,minmax(0,1fr)); }
|
||||
.stat-cell { padding:12px; }
|
||||
.stat-value { font-size:24px; }
|
||||
.stats-strip { gap:8px; }
|
||||
.table-wrap, .review-table-wrap, .users-table-wrap, .job-table-wrap { max-height:none; overflow:visible; }
|
||||
.responsive-table { display:block; table-layout:auto; min-width:0; width:100%; }
|
||||
.responsive-table thead { position:absolute; width:1px; height:1px; overflow:hidden; clip-path:inset(50%); }
|
||||
.responsive-table tbody { display:block; }
|
||||
.responsive-table tr { display:grid; grid-template-columns:repeat(2,minmax(0,1fr)); gap:12px; margin:0 12px 12px; padding:14px; border:1px solid var(--border-color); border-radius:8px; background:var(--bg-primary); }
|
||||
.responsive-table tr.active { border-color:var(--accent); }
|
||||
.responsive-table td { display:flex; flex-direction:column; align-items:flex-start; gap:5px; width:auto; height:auto; min-width:0; padding:0; border:0; overflow-wrap:anywhere; white-space:normal; }
|
||||
.responsive-table td::before { content:attr(data-label); color:var(--text-subdued); font-size:10px; font-weight:750; text-transform:uppercase; letter-spacing:.04em; }
|
||||
.responsive-table td[data-primary], .responsive-table td[data-label="Actions"], .responsive-table td[data-label="Account"], .responsive-table td[data-label="Tags"] { grid-column:1 / -1; }
|
||||
.responsive-table td[data-primary] { font-size:15px; }
|
||||
.responsive-table .primary-line { font-size:14px; }
|
||||
.responsive-table .secondary-line { line-height:1.5; }
|
||||
.responsive-table .tags { max-height:none; }
|
||||
.responsive-table .inline-runs { flex-wrap:wrap; }
|
||||
.responsive-table .run-chip { min-height:36px; max-width:none; }
|
||||
.responsive-table .toolbar { justify-content:flex-start; flex-wrap:wrap; }
|
||||
.row-link { min-height:44px; display:flex; align-items:center; }
|
||||
.check { width:22px; height:22px; }
|
||||
.library-row { grid-template-columns:26px minmax(0,1fr) auto; padding:12px; gap:10px; }
|
||||
.library-row > .tags { max-height:none; }
|
||||
.editor-grid, .settings-grid, .federation-status-grid, .download-method-controls, .proxy-row, .metadata-backfill-options .option-grid { grid-template-columns:minmax(0,1fr); }
|
||||
.setting-field, .settings-wide, .setting-field.settings-short { max-width:none; }
|
||||
.settings-grid, .settings-federation-body, .probe-body { padding:12px; }
|
||||
.settings-federation-body .settings-grid, .settings-federation-body .probe-body { padding:0; }
|
||||
.youtube-cookie-picker, .youtube-cookie-upload, .transport-log-head { align-items:stretch; flex-direction:column; }
|
||||
.settings-actions { position:static; }
|
||||
.settings-actions .toolbar { justify-content:flex-end; }
|
||||
.modal-backdrop { padding:0; }
|
||||
.modal, .modal.user-modal, .modal.merge-modal { width:100%; height:100dvh; max-height:100dvh; border:0; border-radius:0; }
|
||||
.modal-head { padding-top:max(12px,env(safe-area-inset-top)); }
|
||||
.modal-body { flex:1; padding-bottom:max(16px,env(safe-area-inset-bottom)); }
|
||||
.dialog-actions { padding-bottom:max(12px,env(safe-area-inset-bottom)); }
|
||||
.modal-body .toolbar { flex-wrap:wrap; }
|
||||
.image-editor { grid-template-columns:96px minmax(0,1fr); }
|
||||
.image-preview { width:96px; }
|
||||
.image-actions { flex-wrap:wrap; }
|
||||
.image-actions input[type="file"] { max-width:100%; }
|
||||
.user-activity-row { grid-template-columns:44px minmax(0,1fr); }
|
||||
.user-activity-cover { width:44px; height:44px; }
|
||||
.user-activity-time { grid-column:2; min-width:0; text-align:left; }
|
||||
.user-activity-title, .user-activity-meta, .user-activity-sub, .user-profile-facts strong { white-space:normal; overflow-wrap:anywhere; }
|
||||
.release-track-head, .merge-track-head { display:none; }
|
||||
.merge-track-list { min-width:0; }
|
||||
.release-track-row, .merge-track-row { grid-template-columns:repeat(2,minmax(0,1fr)); padding:12px; gap:10px; }
|
||||
.release-track-row > div, .merge-track-row > div { grid-column:1 / -1; }
|
||||
.release-track-row .icon-btn { justify-self:end; grid-column:2; }
|
||||
.track-field > span { display:block; color:var(--text-subdued); font-size:11px; margin-bottom:6px; }
|
||||
.release-track-title, .release-track-meta { white-space:normal; overflow-wrap:anywhere; }
|
||||
.merge-track-row > span { grid-column:1 / -1; }
|
||||
.merge-order-actions { justify-content:flex-end; gap:8px; }
|
||||
.merge-release-grid { grid-template-columns:minmax(0,1fr); }
|
||||
.repair-shell { grid-template-columns:minmax(0,1fr); height:auto; min-height:0; }
|
||||
.repair-side .panel:first-child .repair-scroll { max-height:260px; }
|
||||
.repair-work .repair-chat { min-height:420px; height:65dvh; max-height:720px; }
|
||||
.repair-plan-actions { align-items:stretch; flex-direction:column; }
|
||||
.repair-message { max-width:100%; }
|
||||
.repair-composer { flex-wrap:wrap; }
|
||||
.repair-composer textarea { flex-basis:100%; }
|
||||
.repair-composer .btn { margin-left:auto; }
|
||||
.repair-diff { min-width:760px; }
|
||||
.repair-manual { overscroll-behavior:contain; }
|
||||
.statistics-ranking-head { align-items:stretch; flex-direction:column; }
|
||||
.statistics-filters { padding:12px; }
|
||||
.statistics-toolbar label { flex:1 1 140px; min-width:0; }
|
||||
.statistics-toolbar .search { width:100%; }
|
||||
.statistics-chart { padding:16px; }
|
||||
.statistics-service-grid { grid-template-columns:minmax(0,1fr); padding:12px; }
|
||||
.job-fact { grid-template-columns:70px minmax(0,1fr); }
|
||||
.job-fact span:last-child { white-space:normal; overflow-wrap:anywhere; }
|
||||
}
|
||||
@media (prefers-reduced-motion:reduce) { .sidebar { transition:none; } }
|
||||
</style>
|
||||
@@ -5,13 +5,13 @@
|
||||
{% block head_extra %}
|
||||
<style>
|
||||
* { margin: 0; padding: 0; box-sizing: border-box; }
|
||||
body { font-family: system-ui, -apple-system, sans-serif; background: #f5f5f5; color: #333; display: flex; justify-content: center; align-items: center; min-height: 100vh; }
|
||||
.setup-card { background: #fff; border-radius: 8px; box-shadow: 0 2px 8px rgba(0,0,0,.12); padding: 2rem 2.5rem; width: 100%; max-width: 400px; }
|
||||
body { font-family: system-ui, -apple-system, sans-serif; background: #f5f5f5; color: #333; display: flex; justify-content: center; align-items: center; min-height: 100dvh; padding: max(16px, env(safe-area-inset-top)) 16px max(16px, env(safe-area-inset-bottom)); }
|
||||
.setup-card { background: #fff; border-radius: 8px; box-shadow: 0 2px 8px rgba(0,0,0,.12); padding: clamp(20px, 5vw, 40px); width: 100%; max-width: 400px; }
|
||||
.setup-card h1 { margin-bottom: 1.5rem; font-size: 1.5rem; text-align: center; }
|
||||
.setup-card label { display: block; margin-bottom: .25rem; font-weight: 600; font-size: .9rem; }
|
||||
.setup-card input[type="text"],
|
||||
.setup-card input[type="password"] { width: 100%; padding: .5rem .7rem; margin-bottom: 1rem; border: 1px solid #ccc; border-radius: 4px; font-size: .95rem; }
|
||||
.setup-card button { display: block; width: 100%; padding: .6rem; border: none; border-radius: 4px; font-size: 1rem; cursor: pointer; background: #1a1a2e; color: #fff; }
|
||||
.setup-card input[type="password"] { width: 100%; padding: .5rem .7rem; margin-bottom: 1rem; border: 1px solid #ccc; border-radius: 4px; font-size: 16px; min-height: 44px; }
|
||||
.setup-card button { display: block; width: 100%; padding: .6rem; min-height: 44px; border: none; border-radius: 4px; font-size: 1rem; cursor: pointer; background: #1a1a2e; color: #fff; }
|
||||
.setup-card button:hover { background: #16213e; }
|
||||
.setup-card .flash { color: #856404; background: #fff3cd; padding: .5rem .75rem; border-radius: 4px; margin-bottom: 1rem; text-align: center; font-size: .9rem; }
|
||||
</style>
|
||||
@@ -27,11 +27,11 @@
|
||||
|
||||
<form method="post" action="/admin/setup">
|
||||
<label for="username">{{ t.setup_username }}</label>
|
||||
<input type="text" name="username" id="username" required>
|
||||
<input type="text" name="username" id="username" autocomplete="username" required>
|
||||
<label for="password">{{ t.setup_password }}</label>
|
||||
<input type="password" name="password" id="password" required>
|
||||
<input type="password" name="password" id="password" autocomplete="new-password" required>
|
||||
<label for="confirm_password">{{ t.setup_confirm }}</label>
|
||||
<input type="password" name="confirm_password" id="confirm_password" required>
|
||||
<input type="password" name="confirm_password" id="confirm_password" autocomplete="new-password" required>
|
||||
<button type="submit">{{ t.setup_submit }}</button>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,120 @@
|
||||
<script>
|
||||
// Shared responsive shell state. Business data stays in adminV2().
|
||||
function adminUI() {
|
||||
return {
|
||||
menuOpen: false,
|
||||
isCompact: false,
|
||||
isTaskStacked: false,
|
||||
taskPane: 'list',
|
||||
initUI() {
|
||||
const compact = window.matchMedia('(max-width: 1023px)');
|
||||
const stacked = window.matchMedia('(max-width: 1279px)');
|
||||
const update = () => {
|
||||
this.isCompact = compact.matches;
|
||||
this.isTaskStacked = stacked.matches;
|
||||
if (!this.isCompact) this.menuOpen = false;
|
||||
};
|
||||
update();
|
||||
compact.addEventListener('change', update);
|
||||
stacked.addEventListener('change', update);
|
||||
this._uiCleanup = () => {
|
||||
compact.removeEventListener('change', update);
|
||||
stacked.removeEventListener('change', update);
|
||||
};
|
||||
this.$watch('activeView', () => {
|
||||
this.closeMenu();
|
||||
if (this.$refs?.main) this.$refs.main.scrollTop = 0;
|
||||
});
|
||||
},
|
||||
destroy() {
|
||||
this._uiCleanup?.();
|
||||
if (this.poller) clearInterval(this.poller);
|
||||
},
|
||||
openMenu() { this.menuOpen = true; },
|
||||
closeMenu() { this.menuOpen = false; },
|
||||
showTaskPane(pane) {
|
||||
this.taskPane = pane;
|
||||
if (this.isTaskStacked) this.$nextTick(() => document.getElementById('task-tab-' + pane)?.focus());
|
||||
},
|
||||
taskTabKeydown(event) {
|
||||
const panes = ['list', 'details', 'logs'];
|
||||
const index = panes.indexOf(this.taskPane);
|
||||
const keys = {ArrowRight:(index + 1) % 3, ArrowLeft:(index + 2) % 3, Home:0, End:2};
|
||||
if (!(event.key in keys)) return;
|
||||
event.preventDefault();
|
||||
this.showTaskPane(panes[keys[event.key]]);
|
||||
},
|
||||
jumpToSettings(section) {
|
||||
const target = document.getElementById('settings-' + section);
|
||||
if (!target) return;
|
||||
target.scrollIntoView({behavior:window.matchMedia('(prefers-reduced-motion: reduce)').matches ? 'instant' : 'smooth', block:'start'});
|
||||
target.setAttribute('tabindex', '-1');
|
||||
target.focus({preventScroll:true});
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
// All modal dialogs and the mobile navigation share one focus/scroll lifecycle.
|
||||
// State is outside Alpine reactivity so opening a dialog does not retrigger x-effect.
|
||||
const adminOverlay = (() => {
|
||||
const states = new WeakMap();
|
||||
const stack = [];
|
||||
const frame = callback => window.requestAnimationFrame(callback);
|
||||
const focusables = element => [...element.querySelectorAll('button:not(:disabled), a[href], input:not(:disabled), select:not(:disabled), textarea:not(:disabled), [tabindex="0"]')]
|
||||
.filter(node => node.getClientRects().length && !node.closest('[inert]'));
|
||||
function updateBackground() {
|
||||
const top = stack.at(-1);
|
||||
const main = document.getElementById('admin-main');
|
||||
const nav = document.getElementById('admin-navigation');
|
||||
if (main) { main.inert = !!top; main.classList.toggle('is-locked', !!top); }
|
||||
if (nav) nav.inert = (top && top !== nav) || (nav.dataset.compact === 'true' && !nav.classList.contains('is-open'));
|
||||
for (const entry of stack) entry.inert = entry !== top;
|
||||
}
|
||||
function sync(element, open) {
|
||||
const previous = states.get(element);
|
||||
if (previous?.open === open) return;
|
||||
states.set(element, {open, returnFocus:open ? document.activeElement : previous?.returnFocus});
|
||||
if (open) {
|
||||
stack.push(element);
|
||||
frame(() => {
|
||||
if (stack.at(-1) !== element) return;
|
||||
updateBackground();
|
||||
const dialog = element.querySelector('[role="dialog"]') || element;
|
||||
dialog.focus({preventScroll:true});
|
||||
});
|
||||
} else {
|
||||
const index = stack.indexOf(element);
|
||||
if (index !== -1) stack.splice(index, 1);
|
||||
element.inert = element.id !== 'admin-navigation';
|
||||
frame(() => {
|
||||
updateBackground();
|
||||
const top = stack.at(-1);
|
||||
if (top) {
|
||||
if (!top.contains(document.activeElement)) (top.querySelector('[role="dialog"]') || top).focus({preventScroll:true});
|
||||
} else if (previous?.open) {
|
||||
const target = previous.returnFocus;
|
||||
if (target?.isConnected && target.getClientRects().length && !target.closest('[inert]')) target.focus({preventScroll:true});
|
||||
else document.querySelector('.menu-toggle')?.focus({preventScroll:true});
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
function keydown(event, element) {
|
||||
if (stack.at(-1) !== element) return;
|
||||
if (event.key === 'Escape' && !event.defaultPrevented) {
|
||||
const close = element.querySelector('[data-dialog-close]');
|
||||
if (close && !close.disabled) { event.preventDefault(); event.stopPropagation(); close.click(); }
|
||||
} else if (event.key === 'Tab') {
|
||||
const nodes = focusables(element);
|
||||
const first = nodes[0], last = nodes.at(-1);
|
||||
if (!first) { event.preventDefault(); return; }
|
||||
if (event.shiftKey && (document.activeElement === first || !nodes.includes(document.activeElement))) {
|
||||
event.preventDefault(); last.focus();
|
||||
} else if (!event.shiftKey && (document.activeElement === last || !nodes.includes(document.activeElement))) {
|
||||
event.preventDefault(); first.focus();
|
||||
}
|
||||
}
|
||||
}
|
||||
return {sync, keydown};
|
||||
})();
|
||||
</script>
|
||||
+252
-2264
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,23 @@
|
||||
{% extends "base.html" %}
|
||||
{% block title %}{{ t.approval_heading }} | {{ t.site_name }}{% endblock title %}
|
||||
{% block head_extra %}
|
||||
<style>
|
||||
body { margin:0; min-height:100vh; display:grid; place-items:center; background:#121212; color:#eee; font-family:system-ui,sans-serif; }
|
||||
.approval-card { max-width:440px; margin:24px; padding:36px; border:1px solid #333; border-radius:18px; background:#1b1b1b; }
|
||||
h1 { font-size:24px; } p { line-height:1.6; color:#bbb; } a { color:#b7d79f; }
|
||||
</style>
|
||||
{% endblock head_extra %}
|
||||
{% block body %}
|
||||
<main class="approval-card"><h1>{{ t.approval_heading }}</h1><p>{{ t.approval_message }}</p><a href="/logout">{{ t.player_log_out }}</a></main>
|
||||
<script>
|
||||
setInterval(async () => {
|
||||
try {
|
||||
const response = await fetch('/auth/status', {cache:'no-store'});
|
||||
if (!response.ok) return;
|
||||
const {status} = await response.json();
|
||||
if (status === 'active') location.replace('/');
|
||||
else if (status === 'anonymous') location.replace('/login');
|
||||
} catch {}
|
||||
}, 5000);
|
||||
</script>
|
||||
{% endblock body %}
|
||||
+398
-117
@@ -1,9 +1,11 @@
|
||||
<script defer src="https://cdn.jsdelivr.net/npm/alpinejs@3/dist/cdn.min.js"></script>
|
||||
<script>
|
||||
const GUEST = {{ guest }};
|
||||
const SHARE_TOKEN = "{{ share_token }}";
|
||||
// Handle expired sessions centrally, including background player requests.
|
||||
let loginRedirectStarted = false;
|
||||
function redirectOnUnauthorized(status) {
|
||||
if (status !== 401 || loginRedirectStarted) return;
|
||||
if (GUEST || status !== 401 || loginRedirectStarted) return;
|
||||
loginRedirectStarted = true;
|
||||
window.location.replace('/login');
|
||||
}
|
||||
@@ -60,8 +62,10 @@ const T = {
|
||||
lastfmDisconnectConfirm: "{{ t.player_lastfm_disconnect_confirm }}",
|
||||
lastfmConnectFailed: "{{ t.player_lastfm_connect_failed }}",
|
||||
lastfmDisconnectFailed: "{{ t.player_lastfm_disconnect_failed }}",
|
||||
startRadio: "{{ t.player_start_radio }}",
|
||||
radioFailed: "{{ t.player_radio_failed }}",
|
||||
download: "{{ t.track_download }}",
|
||||
shareUnavailable: "{{ t.share_unavailable }}",
|
||||
queuePodcastUnplayable: "{{ t.player_queue_podcast_unplayable }}",
|
||||
queuePrivateItem: "{{ t.player_queue_private_item }}",
|
||||
searchSimilarTo: "{{ t.player_search_similar_to }}",
|
||||
findSimilar: "{{ t.player_find_similar }}",
|
||||
similarityFailed: "{{ t.player_similarity_failed }}",
|
||||
@@ -342,6 +346,7 @@ document.addEventListener('alpine:init', () => {
|
||||
}
|
||||
},
|
||||
navigate(link) {
|
||||
if (GUEST) return;
|
||||
if (!link || !link.id) return;
|
||||
this.close();
|
||||
const library = Alpine.store('library');
|
||||
@@ -388,35 +393,39 @@ document.addEventListener('alpine:init', () => {
|
||||
return copied;
|
||||
},
|
||||
|
||||
copyTrack(track, trigger = null) {
|
||||
async copyTrack(track, trigger = null) {
|
||||
const id = Number(track?.id || track);
|
||||
if (!id) return;
|
||||
this.copyUrl(`/share/track/${id}`, trigger);
|
||||
if (id) return this.copyTracks([{id}], track?.title || T.sharedPlaylist, trigger);
|
||||
},
|
||||
|
||||
async copyQueue(trigger = null) {
|
||||
const queue = Alpine.store('queue');
|
||||
return this.copyTracks(queue?.tracks || [], T.sharedPlaylist, trigger);
|
||||
return this.copyTracks(Alpine.store('queue')?.tracks || [], T.sharedPlaylist, trigger);
|
||||
},
|
||||
|
||||
async copyRelease(release, trigger = null) {
|
||||
const id = Number(release?.id || release || 0);
|
||||
if (!id) return;
|
||||
return this.copyUrl(`/share/release/${id}`, trigger);
|
||||
try {
|
||||
const id = Number(release?.id || release || 0);
|
||||
if (!id) return;
|
||||
const response = await fetch(`/api/player/releases/${id}`);
|
||||
if (!response.ok) throw new Error('release load failed');
|
||||
const data = await response.json();
|
||||
return this.copyTracks(data.tracks || [], data.title || T.sharedPlaylist, trigger);
|
||||
} catch { this.flashTrigger(trigger, false); }
|
||||
},
|
||||
|
||||
async copyTracks(tracks, title = T.sharedPlaylist, trigger = null) {
|
||||
if (GUEST) return this.copyUrl(`/share/${SHARE_TOKEN}`, trigger);
|
||||
const trackIds = (tracks || []).map(track => Number(track.id)).filter(Boolean);
|
||||
if (!trackIds.length) return;
|
||||
try {
|
||||
const res = await fetch('/api/player/share-playlist', {
|
||||
const res = await fetch('/api/player/shares', {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ track_ids: trackIds, title }),
|
||||
});
|
||||
if (!res.ok) throw new Error('share failed');
|
||||
const data = await res.json();
|
||||
await this.copyUrl(data.url || `/share/playlist/${data.token}`, trigger);
|
||||
await this.copyUrl(data.url || `/share/${data.token}`, trigger);
|
||||
} catch (err) {
|
||||
this.flashTrigger(trigger, false);
|
||||
console.warn(err);
|
||||
@@ -468,84 +477,24 @@ document.addEventListener('alpine:init', () => {
|
||||
},
|
||||
|
||||
async handleInitialShareLinks() {
|
||||
if (this._handledInitialLink) return;
|
||||
if (this._handledInitialLink || !SHARE_TOKEN) return;
|
||||
this._handledInitialLink = true;
|
||||
|
||||
const params = new URLSearchParams(window.location.search);
|
||||
const trackId = Number(params.get('track') || 0);
|
||||
const releaseId = Number(params.get('release') || 0);
|
||||
const playlistToken = (params.get('playlist_share') || '').trim();
|
||||
|
||||
if (trackId > 0) {
|
||||
await this.openSharedTrack(trackId);
|
||||
this._clearShareQuery();
|
||||
} else if (releaseId > 0) {
|
||||
await this.openSharedRelease(releaseId);
|
||||
this._clearShareQuery();
|
||||
} else if (playlistToken) {
|
||||
await this.openSharedPlaylist(playlistToken);
|
||||
this._clearShareQuery();
|
||||
}
|
||||
},
|
||||
|
||||
async openSharedTrack(trackId) {
|
||||
try {
|
||||
const res = await fetch('/api/player/tracks-by-ids', {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ ids: [Number(trackId)] }),
|
||||
});
|
||||
if (!res.ok) throw new Error('track load failed');
|
||||
const tracks = await res.json();
|
||||
const track = Array.isArray(tracks) ? tracks[0] : null;
|
||||
if (!track) return;
|
||||
this.markSharedTrack(track.id);
|
||||
if (track.release_id) {
|
||||
await Alpine.store('library').openRelease(track.release_id, { focusSharedTrackId: track.id });
|
||||
}
|
||||
const queue = Alpine.store('queue');
|
||||
queue.tracks = [track];
|
||||
queue.currentIndex = 0;
|
||||
Alpine.store('player')._playLocal(track, { paused: true });
|
||||
this.focusSharedTrack(track.id);
|
||||
} catch (err) {
|
||||
console.warn(err);
|
||||
}
|
||||
},
|
||||
|
||||
async openSharedRelease(releaseId) {
|
||||
const id = Number(releaseId || 0);
|
||||
if (!id) return;
|
||||
this.markSharedTrack(null);
|
||||
await Alpine.store('library').openRelease(id);
|
||||
},
|
||||
|
||||
async openSharedPlaylist(token) {
|
||||
try {
|
||||
const res = await fetch(`/api/player/share-playlist/${encodeURIComponent(token)}`);
|
||||
if (!res.ok) throw new Error('playlist load failed');
|
||||
const data = await res.json();
|
||||
const tracks = Array.isArray(data.tracks) ? data.tracks : [];
|
||||
if (!tracks.length) return;
|
||||
const response = await fetch(`/api/player/shares/${SHARE_TOKEN}`);
|
||||
if (!response.ok) throw new Error('share unavailable');
|
||||
const data = await response.json();
|
||||
const tracks = data.tracks || [];
|
||||
Alpine.store('library').showSharedPlaylist(data);
|
||||
if (!tracks.length) throw new Error('share empty');
|
||||
const queue = Alpine.store('queue');
|
||||
queue.tracks = tracks;
|
||||
queue.currentIndex = 0;
|
||||
Alpine.store('player')._playLocal(tracks[0], { paused: true });
|
||||
Alpine.store('library').showSharedPlaylist(data);
|
||||
} catch (err) {
|
||||
console.warn(err);
|
||||
Alpine.store('player')._playLocal(tracks[0], {paused:true});
|
||||
} catch {
|
||||
Alpine.store('library').showSharedPlaylist({title:T.shareUnavailable, tracks:[]});
|
||||
}
|
||||
},
|
||||
|
||||
_clearShareQuery() {
|
||||
const url = new URL(window.location.href);
|
||||
url.searchParams.delete('track');
|
||||
url.searchParams.delete('release');
|
||||
url.searchParams.delete('playlist_share');
|
||||
const query = url.searchParams.toString();
|
||||
const next = `${url.pathname}${query ? '?' + query : ''}${window.location.hash}`;
|
||||
history.replaceState({}, '', next);
|
||||
},
|
||||
});
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
@@ -553,17 +502,33 @@ document.addEventListener('alpine:init', () => {
|
||||
// -----------------------------------------------------------------------
|
||||
Alpine.store('user', {
|
||||
profile: null,
|
||||
accessStatus: "anonymous",
|
||||
menuOpen: false,
|
||||
settingsOpen: false,
|
||||
lastfm: { configured: false, connected: false, username: null, reauth_required: false, last_error: null },
|
||||
lastfmBusy: false,
|
||||
|
||||
init() {
|
||||
if (GUEST) {
|
||||
this.checkAccess();
|
||||
setInterval(() => this.checkAccess(), 5000);
|
||||
return;
|
||||
}
|
||||
this.cleanLastfmQuery();
|
||||
this.load();
|
||||
this.loadLastfm();
|
||||
},
|
||||
|
||||
async checkAccess() {
|
||||
try {
|
||||
const response = await fetch('/auth/status', {cache:'no-store'});
|
||||
if (!response.ok) return;
|
||||
const data = await response.json();
|
||||
this.accessStatus = data.status;
|
||||
if (data.status === 'active') window.location.reload();
|
||||
} catch {}
|
||||
},
|
||||
|
||||
cleanLastfmQuery() {
|
||||
const url = new URL(window.location.href);
|
||||
if (!url.searchParams.has('lastfm')) return;
|
||||
@@ -792,6 +757,9 @@ document.addEventListener('alpine:init', () => {
|
||||
_listenedSeconds: 0,
|
||||
_lastAudioTime: 0,
|
||||
_localSourceTrackId: null,
|
||||
// The current item is one this player cannot play and nobody told it
|
||||
// that item's position (see _showUnplayableQueueItem).
|
||||
_positionUnknown: false,
|
||||
_remoteExecuting: false,
|
||||
_remoteStateBaseTime: 0,
|
||||
_remoteStateReceivedAt: 0,
|
||||
@@ -799,11 +767,7 @@ document.addEventListener('alpine:init', () => {
|
||||
_prefetchedQueueKey: null,
|
||||
_baseDocumentTitle: '',
|
||||
|
||||
_hasInitialShareLink() {
|
||||
const params = new URLSearchParams(window.location.search);
|
||||
return Number(params.get('track') || 0) > 0
|
||||
|| (params.get('playlist_share') || '').trim().length > 0;
|
||||
},
|
||||
_hasInitialShareLink() { return !!SHARE_TOKEN; },
|
||||
|
||||
init() {
|
||||
audio.volume = this.volume;
|
||||
@@ -813,6 +777,9 @@ document.addEventListener('alpine:init', () => {
|
||||
});
|
||||
|
||||
audio.addEventListener('timeupdate', () => {
|
||||
// Unloading the audio for an unplayable item fires a late
|
||||
// timeupdate at 0; keep that item's handed-off position.
|
||||
if (!this._currentItemHasLocalAudio()) return;
|
||||
this.currentTime = audio.currentTime;
|
||||
this.duration = audio.duration || 0;
|
||||
this.progress = this.duration > 0 ? (this.currentTime / this.duration) * 100 : 0;
|
||||
@@ -898,6 +865,7 @@ document.addEventListener('alpine:init', () => {
|
||||
playQueueIndex(idx) {
|
||||
const queue = Alpine.store('queue');
|
||||
if (!queue || idx < 0 || idx >= queue.tracks.length) return;
|
||||
const previousIndex = queue.currentIndex;
|
||||
queue.currentIndex = idx;
|
||||
const track = queue.tracks[idx];
|
||||
if (track?.federation_pending && track?._federationTrack) {
|
||||
@@ -921,6 +889,24 @@ document.addEventListener('alpine:init', () => {
|
||||
}));
|
||||
return;
|
||||
}
|
||||
if (this._isUnplayableQueueItem(track)) {
|
||||
// Podcast episodes stay in the queue; this player skips them.
|
||||
const step = idx >= previousIndex ? 1 : -1;
|
||||
let playable = this._playableQueueIndex(queue.tracks, idx, step);
|
||||
if (playable < 0 && (this.repeatMode === 'all' || this.shuffle)) {
|
||||
// Wrap around like the queue itself does.
|
||||
playable = this._playableQueueIndex(queue.tracks, step > 0 ? 0 : queue.tracks.length - 1, step);
|
||||
}
|
||||
if (playable < 0) {
|
||||
// Staying on the current item keeps its position; any
|
||||
// other item's position is unknown here, never 0.
|
||||
this._showUnplayableQueueItem(track, track === this.currentTrack ? this._knownPosition() : null);
|
||||
return;
|
||||
}
|
||||
queue.currentIndex = playable;
|
||||
this._playLocal(queue.tracks[playable]);
|
||||
return;
|
||||
}
|
||||
this._playLocal(track);
|
||||
},
|
||||
|
||||
@@ -941,7 +927,13 @@ document.addEventListener('alpine:init', () => {
|
||||
},
|
||||
|
||||
_playLocal(track, options = {}) {
|
||||
if (this._isUnplayableQueueItem(track)) {
|
||||
this._recordHistory('replaced');
|
||||
this._showUnplayableQueueItem(track, options.position_seconds);
|
||||
return;
|
||||
}
|
||||
this._recordHistory('replaced');
|
||||
this._positionUnknown = false;
|
||||
this.currentTrack = track;
|
||||
this._historyTrack = track;
|
||||
this._prefetchedQueueKey = null;
|
||||
@@ -998,9 +990,31 @@ document.addEventListener('alpine:init', () => {
|
||||
this._sendRemote('resume');
|
||||
return;
|
||||
}
|
||||
if (this._isUnplayableQueueItem(this.currentTrack)) {
|
||||
// Not next(): with repeat "one" it would resume this item again.
|
||||
this._skipUnplayableCurrentItem();
|
||||
return;
|
||||
}
|
||||
audio.play().catch(() => {});
|
||||
},
|
||||
|
||||
_skipUnplayableCurrentItem() {
|
||||
const queue = Alpine.store('queue');
|
||||
const tracks = queue?.tracks || [];
|
||||
let idx = this._playableQueueIndex(tracks, Number(queue?.currentIndex ?? -1) + 1, 1);
|
||||
if (idx < 0 && this.repeatMode === 'all') idx = this._playableQueueIndex(tracks, 0, 1);
|
||||
if (idx < 0) {
|
||||
this._showUnplayableQueueItem(this.currentTrack, this._knownPosition());
|
||||
return;
|
||||
}
|
||||
this.playQueueIndex(idx);
|
||||
},
|
||||
|
||||
_knownPosition() {
|
||||
// The current item's position, or null when this player was never told it.
|
||||
return this._positionUnknown ? null : this.currentTime;
|
||||
},
|
||||
|
||||
toggle() {
|
||||
if (!this.currentTrack) return;
|
||||
if (this.isPlaying) { this.pause(); }
|
||||
@@ -1021,6 +1035,11 @@ document.addEventListener('alpine:init', () => {
|
||||
this._sendRemote('seek', { time: nextTime });
|
||||
return;
|
||||
}
|
||||
if (this._isUnplayableQueueItem(this.currentTrack)) {
|
||||
// Nothing is loaded in <audio>: the seek sets the item's position.
|
||||
this._showUnplayableQueueItem(this.currentTrack, nextTime);
|
||||
return;
|
||||
}
|
||||
audio.currentTime = nextTime;
|
||||
this._lastAudioTime = audio.currentTime || 0;
|
||||
},
|
||||
@@ -1028,7 +1047,7 @@ document.addEventListener('alpine:init', () => {
|
||||
seekRelative(delta) {
|
||||
if (!this.currentTrack) return;
|
||||
const duration = this.duration || audio.duration || 0;
|
||||
const current = this._shouldSendRemote() ? this.currentTime : audio.currentTime;
|
||||
const current = this._shouldSendRemote() || this._isUnplayableQueueItem(this.currentTrack) ? this.currentTime : audio.currentTime;
|
||||
const max = duration > 0 ? duration : Number.MAX_SAFE_INTEGER;
|
||||
this.seek(Math.max(0, Math.min(max, current + delta)));
|
||||
},
|
||||
@@ -1078,7 +1097,8 @@ document.addEventListener('alpine:init', () => {
|
||||
this._recordHistory('skipped');
|
||||
|
||||
let nextIdx;
|
||||
if (this.repeatMode === 'one') {
|
||||
// Repeat "one" cannot repeat an item this player cannot play.
|
||||
if (this.repeatMode === 'one' && !this._isUnplayableQueueItem(this.currentTrack)) {
|
||||
this.seek(0);
|
||||
this._historyRecorded = false;
|
||||
this._resetPlaybackTracking();
|
||||
@@ -1105,7 +1125,10 @@ document.addEventListener('alpine:init', () => {
|
||||
this._sendRemote('prev');
|
||||
return;
|
||||
}
|
||||
if (this.currentTime > 3) {
|
||||
// An item this player cannot play is not playing here, so there
|
||||
// is nothing to restart: Prev goes to the previous item.
|
||||
const restartable = !this._isUnplayableQueueItem(this.currentTrack);
|
||||
if (restartable && this.currentTime > 3) {
|
||||
this.seek(0);
|
||||
return;
|
||||
}
|
||||
@@ -1117,7 +1140,7 @@ document.addEventListener('alpine:init', () => {
|
||||
if (this.repeatMode === 'all') {
|
||||
prevIdx = queue.tracks.length - 1;
|
||||
} else {
|
||||
this.seek(0);
|
||||
if (restartable) this.seek(0);
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -1252,11 +1275,19 @@ document.addEventListener('alpine:init', () => {
|
||||
const queue = Alpine.store('queue');
|
||||
const track = this.currentTrack || queue?.tracks?.[queue.currentIndex] || null;
|
||||
if (!track && (!queue || queue.tracks.length === 0)) return null;
|
||||
return this._remotePlaybackPayload(track, {
|
||||
position_seconds: audio.currentTime || this.currentTime || 0,
|
||||
// <audio> holds an older track while an unplayable item is current.
|
||||
const position = this._currentItemHasLocalAudio(track)
|
||||
? (audio.currentTime || this.currentTime || 0)
|
||||
: (this.currentTime || 0);
|
||||
const payload = this._remotePlaybackPayload(track, {
|
||||
position_seconds: position,
|
||||
duration_seconds: this._trackDuration(),
|
||||
paused: !this.isPlaying,
|
||||
});
|
||||
// The server fills the episode's resume position from its progress
|
||||
// register instead of handing 0 to the next device.
|
||||
if (this._positionUnknown && !this._currentItemHasLocalAudio(track)) payload.position_unknown = true;
|
||||
return payload;
|
||||
},
|
||||
|
||||
_mirrorRemoteTrack(track, playing, positionSeconds = null) {
|
||||
@@ -1317,6 +1348,11 @@ document.addEventListener('alpine:init', () => {
|
||||
this._remoteStateBaseTime = desiredTime;
|
||||
this._remoteStateReceivedAt = Date.now();
|
||||
|
||||
if (this._isUnplayableQueueItem(track)) {
|
||||
this._showUnplayableQueueItem(track, state.position_unknown ? null : desiredTime);
|
||||
this._updateMediaSession();
|
||||
return;
|
||||
}
|
||||
if (this._localSourceTrackId !== track.id) {
|
||||
this._playLocal(track, {
|
||||
position_seconds: desiredTime,
|
||||
@@ -1362,6 +1398,9 @@ document.addEventListener('alpine:init', () => {
|
||||
if (!command || !command.command) return;
|
||||
const payload = command.payload || {};
|
||||
const queue = Alpine.store('queue');
|
||||
// The server stamps Jam participant commands. It checks them against
|
||||
// the host state it saw last; this queue is the one they change.
|
||||
if (payload.jam_participant === true && !this._jamParticipantCommandAllowed(command.command, payload, queue)) return;
|
||||
this._remoteExecuting = true;
|
||||
try {
|
||||
if (typeof payload.shuffle === 'boolean') this.shuffle = payload.shuffle;
|
||||
@@ -1376,7 +1415,13 @@ document.addEventListener('alpine:init', () => {
|
||||
const track = payload.track || queue.tracks[queue.currentIndex];
|
||||
if (track?.unavailable || (track && !track.stream_url)) {
|
||||
this._applyRemotePlaybackState({ ...payload, track, paused: true });
|
||||
this._pauseLocal();
|
||||
// This device is now active, so _applyRemotePlaybackState
|
||||
// does not set the time: keep the handed-off position as
|
||||
// the item's position and unload the previous audio.
|
||||
// Play commands start an item from 0, which for an
|
||||
// episode means "its resume position", unknown here.
|
||||
const known = command.command === 'transfer_state' && payload.position_unknown !== true;
|
||||
this._showUnplayableQueueItem(track, known ? payload.position_seconds : null);
|
||||
} else if (track) {
|
||||
this._playLocal(track, payload);
|
||||
}
|
||||
@@ -1427,13 +1472,168 @@ document.addEventListener('alpine:init', () => {
|
||||
navigator.mediaSession.setActionHandler('seekto', (d) => { if (d.seekTime != null) this.seek(d.seekTime); });
|
||||
},
|
||||
|
||||
_queueItemSourceKind(track) {
|
||||
return track?.source?.kind || track?.wire_track?.source?.kind || 'music';
|
||||
},
|
||||
|
||||
_isUnplayableQueueItem(track) {
|
||||
const kind = this._queueItemSourceKind(track);
|
||||
return kind === 'podcast_episode' || kind === 'private';
|
||||
},
|
||||
|
||||
_unplayableQueueLabel(track) {
|
||||
const kind = this._queueItemSourceKind(track);
|
||||
if (kind === 'podcast_episode') return T.queuePodcastUnplayable;
|
||||
if (kind === 'private') return T.queuePrivateItem;
|
||||
return '';
|
||||
},
|
||||
|
||||
_playableQueueIndex(tracks, start, step = 1) {
|
||||
const count = Array.isArray(tracks) ? tracks.length : 0;
|
||||
for (let index = start; index >= 0 && index < count; index += step) {
|
||||
if (!this._isUnplayableQueueItem(tracks[index])) return index;
|
||||
}
|
||||
return -1;
|
||||
},
|
||||
|
||||
_currentItemHasLocalAudio(track = this.currentTrack) {
|
||||
// Whether <audio> can hold this item: podcast episodes, private
|
||||
// items and unresolved federation items are never loaded.
|
||||
return !!track && !track.unavailable && !!track.stream_url && !this._isUnplayableQueueItem(track);
|
||||
},
|
||||
|
||||
_showUnplayableQueueItem(track, positionSeconds = null) {
|
||||
// `positionSeconds` null: nobody told this player where the item
|
||||
// was left (it only knows positions from handoffs and seeks).
|
||||
this._positionUnknown = positionSeconds == null;
|
||||
// Unload the previous source so a later play() cannot resume it.
|
||||
audio.pause();
|
||||
audio.removeAttribute('src');
|
||||
audio.load();
|
||||
this.isPlaying = false;
|
||||
this.currentTrack = track;
|
||||
this._historyTrack = null;
|
||||
this._localSourceTrackId = track?.id ?? null;
|
||||
this.duration = Number(track?.duration_seconds || 0);
|
||||
// Keep the item's position (handoff, restore) so it is reported back unchanged.
|
||||
let position = Math.max(0, Number(positionSeconds || 0));
|
||||
if (!Number.isFinite(position)) position = 0;
|
||||
if (this.duration > 0) position = Math.min(position, this.duration);
|
||||
this.currentTime = position;
|
||||
this._remoteStateBaseTime = position;
|
||||
this._remoteStateReceivedAt = Date.now();
|
||||
this.progress = this.duration > 0 ? (position / this.duration) * 100 : 0;
|
||||
Alpine.store('queue')?.syncCurrentIndexToTrack(track);
|
||||
},
|
||||
|
||||
_jamParticipantCommandAllowed(command, payload, queue) {
|
||||
// Jam participants cannot remove, clear away, add or bring back the
|
||||
// host's private items (podcast episodes). Commands run in a batch,
|
||||
// so an index the server checked can name another item by now.
|
||||
const tracks = queue?.tracks || [];
|
||||
const isPrivate = track => this._isUnplayableQueueItem(track);
|
||||
if (command === 'queue_remove') {
|
||||
const index = Number(payload.index);
|
||||
if (!Number.isInteger(index)) return !tracks.some(isPrivate);
|
||||
return !isPrivate(tracks[index]);
|
||||
}
|
||||
if (command === 'queue_clear') return !tracks.some(isPrivate);
|
||||
if (command === 'queue_add_end' || command === 'queue_add_next') {
|
||||
return !(Array.isArray(payload.tracks) ? payload.tracks : []).some(isPrivate);
|
||||
}
|
||||
if (command === 'play_track' || command === 'play_from_index' || command === 'transfer_state') {
|
||||
const incoming = Array.isArray(payload.tracks) ? payload.tracks.filter(Boolean) : [];
|
||||
if (incoming.length === 0) return !isPrivate(payload.track);
|
||||
// A full queue replaces this one: it must hold exactly the private
|
||||
// items this queue holds now (none dropped, repeated or added).
|
||||
const key = track => {
|
||||
const source = track?.source || track?.wire_track?.source || {};
|
||||
return `${source.kind || ''}:${source.episode_id || ''}`;
|
||||
};
|
||||
const counts = list => {
|
||||
const result = new Map();
|
||||
list.filter(isPrivate).forEach(track => result.set(key(track), (result.get(key(track)) || 0) + 1));
|
||||
return result;
|
||||
};
|
||||
const mine = counts(tracks);
|
||||
const theirs = counts(incoming);
|
||||
return mine.size === theirs.size && [...theirs].every(([item, count]) => mine.get(item) === count);
|
||||
}
|
||||
return true;
|
||||
},
|
||||
|
||||
_dropJamPlaceholders() {
|
||||
// A Jam guest's queue shows the host's private items as placeholders.
|
||||
// They stand for someone else's items and never become this user's
|
||||
// own queue (persisted, relayed to their devices) after the Jam.
|
||||
const queue = Alpine.store('queue');
|
||||
if (!queue) return;
|
||||
const isPlaceholder = track => this._queueItemSourceKind(track) === 'private';
|
||||
const tracks = Array.isArray(queue.tracks) ? queue.tracks : [];
|
||||
if (!tracks.some(isPlaceholder) && !isPlaceholder(this.currentTrack)) return;
|
||||
const currentIndex = Math.max(0, Number(queue.currentIndex || 0));
|
||||
const kept = tracks.filter(track => !isPlaceholder(track));
|
||||
let index = kept.indexOf(tracks[currentIndex]);
|
||||
// A removed current item is followed by the next item that stays.
|
||||
if (index < 0) index = tracks.slice(0, currentIndex).filter(track => !isPlaceholder(track)).length;
|
||||
queue.tracks = kept;
|
||||
queue.currentIndex = Math.max(0, Math.min(index, kept.length - 1));
|
||||
if (!isPlaceholder(this.currentTrack)) return;
|
||||
const next = kept[queue.currentIndex] || null;
|
||||
if (next) {
|
||||
this._playLocal(next, { paused: true });
|
||||
return;
|
||||
}
|
||||
this._pauseLocal();
|
||||
audio.removeAttribute('src');
|
||||
audio.load();
|
||||
this.currentTrack = null;
|
||||
this._historyTrack = null;
|
||||
this._localSourceTrackId = null;
|
||||
this._positionUnknown = false;
|
||||
this.currentTime = 0;
|
||||
this.duration = 0;
|
||||
this.progress = 0;
|
||||
},
|
||||
|
||||
_queueItemsPayload(tracks) {
|
||||
// Library tracks by id; everything else verbatim with its source.
|
||||
return (tracks || []).map(track => {
|
||||
if (track?.wire_track) return { kind: 'external', track: track.wire_track };
|
||||
const id = Number(track?.id);
|
||||
if (Number.isInteger(id) && id > 0 && !track?.federation_pending) {
|
||||
return { kind: 'library', track_id: id };
|
||||
}
|
||||
return null;
|
||||
});
|
||||
},
|
||||
|
||||
_restoredQueueTracks(items, libraryTracks) {
|
||||
const byId = new Map((libraryTracks || []).map(track => [track.id, track]));
|
||||
const tracks = [];
|
||||
const positions = [];
|
||||
(items || []).forEach((item, index) => {
|
||||
const track = item?.kind === 'external' ? item.track : byId.get(item?.track_id);
|
||||
if (!track) return;
|
||||
positions[index] = tracks.length;
|
||||
tracks.push(track);
|
||||
});
|
||||
return { tracks, positions };
|
||||
},
|
||||
|
||||
_buildStatePayload() {
|
||||
const queue = Alpine.store('queue');
|
||||
const localQueue = queue.tracks.filter(track => Number.isInteger(Number(track.id)));
|
||||
const currentLocalId = this.currentTrack && Number.isInteger(Number(this.currentTrack.id))
|
||||
? Number(this.currentTrack.id)
|
||||
: null;
|
||||
const typedItems = this._queueItemsPayload(queue.tracks);
|
||||
const currentItemIndex = Math.max(0, Math.min(Number(queue.currentIndex || 0), queue.tracks.length - 1));
|
||||
const queueItems = typedItems.filter(Boolean);
|
||||
const queueItemsPosition = typedItems.slice(0, currentItemIndex).filter(Boolean).length;
|
||||
return {
|
||||
queue_items: queueItems,
|
||||
queue_items_position: queueItemsPosition,
|
||||
current_track_id: currentLocalId,
|
||||
position_ms: Math.floor(this.currentTime * 1000),
|
||||
queue: localQueue.map(track => Number(track.id)),
|
||||
@@ -1447,6 +1647,7 @@ document.addEventListener('alpine:init', () => {
|
||||
},
|
||||
|
||||
_saveState() {
|
||||
if (GUEST) return;
|
||||
const queue = Alpine.store('queue');
|
||||
if (!this.currentTrack && queue.tracks.length === 0) return;
|
||||
const state = this._buildStatePayload();
|
||||
@@ -1458,6 +1659,7 @@ document.addEventListener('alpine:init', () => {
|
||||
},
|
||||
|
||||
_saveStateSync() {
|
||||
if (GUEST) return;
|
||||
const queue = Alpine.store('queue');
|
||||
if (!this.currentTrack && queue.tracks.length === 0) return;
|
||||
const state = this._buildStatePayload();
|
||||
@@ -1466,6 +1668,7 @@ document.addEventListener('alpine:init', () => {
|
||||
},
|
||||
|
||||
async _restoreState() {
|
||||
if (GUEST) return;
|
||||
try {
|
||||
const res = await fetch('/api/player/state');
|
||||
if (!res.ok) return;
|
||||
@@ -1474,6 +1677,56 @@ document.addEventListener('alpine:init', () => {
|
||||
this.repeatMode = state.repeat_mode || 'off';
|
||||
this._setVolumeLocal(typeof state.volume === 'number' ? state.volume : 0.7);
|
||||
|
||||
// Typed queue: library tracks by id plus external items
|
||||
// (podcast episodes and other items kept with their source).
|
||||
if (Array.isArray(state.queue_items) && state.queue_items.length > 0) {
|
||||
try {
|
||||
const ids = state.queue_items.filter(item => item?.kind === 'library').map(item => item.track_id);
|
||||
let libraryTracks = [];
|
||||
if (ids.length > 0) {
|
||||
const tracksRes = await fetch('/api/player/tracks-by-ids', {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ ids }),
|
||||
});
|
||||
if (tracksRes.ok) libraryTracks = await tracksRes.json();
|
||||
}
|
||||
const restored = this._restoredQueueTracks(state.queue_items, libraryTracks);
|
||||
if (restored.tracks.length > 0) {
|
||||
const queue = Alpine.store('queue');
|
||||
queue.tracks = restored.tracks;
|
||||
const wanted = Number(state.queue_items_position || 0);
|
||||
let idx = restored.positions[wanted];
|
||||
if (idx == null) idx = restored.positions.slice(wanted).find(value => value != null);
|
||||
if (idx == null) idx = restored.tracks.length - 1;
|
||||
queue.currentIndex = idx;
|
||||
const currentTrack = restored.tracks[idx];
|
||||
if (this._isUnplayableQueueItem(currentTrack)) {
|
||||
// A saved 0 is treated as unknown: the server then
|
||||
// uses the episode's progress register.
|
||||
this._showUnplayableQueueItem(currentTrack, state.position_ms ? state.position_ms / 1000 : null);
|
||||
} else if (currentTrack) {
|
||||
this.currentTrack = currentTrack;
|
||||
this._historyTrack = currentTrack;
|
||||
this._localSourceTrackId = currentTrack.id;
|
||||
this._historyRecorded = false;
|
||||
this._resetPlaybackTracking();
|
||||
audio.src = currentTrack.stream_url;
|
||||
const seekMs = state.position_ms || 0;
|
||||
if (seekMs > 0) {
|
||||
const onLoaded = () => {
|
||||
audio.currentTime = seekMs / 1000;
|
||||
audio.removeEventListener('loadedmetadata', onLoaded);
|
||||
};
|
||||
audio.addEventListener('loadedmetadata', onLoaded);
|
||||
}
|
||||
this._updateMediaSession();
|
||||
}
|
||||
return;
|
||||
}
|
||||
} catch {}
|
||||
}
|
||||
|
||||
// Restore queue if there are track IDs
|
||||
if (state.queue && state.queue.length > 0) {
|
||||
try {
|
||||
@@ -1521,6 +1774,7 @@ document.addEventListener('alpine:init', () => {
|
||||
},
|
||||
|
||||
_recordHistory(endedReason, unloading = false) {
|
||||
if (GUEST) return;
|
||||
const track = this._historyTrack;
|
||||
if (this._historyRecorded || !track || !this._playbackStartedAt) return;
|
||||
if (!Number.isInteger(Number(track.id)) || track.federated_cache) return;
|
||||
@@ -1603,6 +1857,7 @@ document.addEventListener('alpine:init', () => {
|
||||
},
|
||||
|
||||
_sendNowPlaying() {
|
||||
if (GUEST) return;
|
||||
if (this._nowPlayingSent || !this.currentTrack) return;
|
||||
if (!Number.isInteger(Number(this.currentTrack.id)) || this.currentTrack.federated_cache) {
|
||||
return;
|
||||
@@ -1641,6 +1896,7 @@ document.addEventListener('alpine:init', () => {
|
||||
fedInviteInput: '',
|
||||
fedBusy: false,
|
||||
fedError: '',
|
||||
selectError: '',
|
||||
remoteHintVisible: false,
|
||||
remoteHintDeviceName: '',
|
||||
_remoteHintShown: false,
|
||||
@@ -1652,6 +1908,7 @@ document.addEventListener('alpine:init', () => {
|
||||
_lastPlaybackState: null,
|
||||
|
||||
init() {
|
||||
if (GUEST) return;
|
||||
this.id = this._ensureId();
|
||||
this.currentJamId = sessionStorage.getItem('furu_player_jam_id') || null;
|
||||
this.heartbeat();
|
||||
@@ -1735,6 +1992,7 @@ document.addEventListener('alpine:init', () => {
|
||||
|
||||
_apply(data) {
|
||||
const previousJamId = this.currentJamId;
|
||||
const wasControllingJam = this.isControllingRemoteJam();
|
||||
this.activeDeviceId = data.active_device_id || null;
|
||||
this.devices = Array.isArray(data.devices) ? data.devices : [];
|
||||
this.jams = Array.isArray(data.jams) ? data.jams : [];
|
||||
@@ -1752,6 +2010,9 @@ document.addEventListener('alpine:init', () => {
|
||||
if (!this.isActive() && !this.shouldPlayJamLocally()) {
|
||||
Alpine.store('player')?._pauseLocal();
|
||||
}
|
||||
if (wasControllingJam && !this.isControllingRemoteJam()) {
|
||||
Alpine.store('player')?._dropJamPlaceholders();
|
||||
}
|
||||
this._maybeShowRemoteHint();
|
||||
},
|
||||
|
||||
@@ -1868,6 +2129,7 @@ document.addEventListener('alpine:init', () => {
|
||||
},
|
||||
|
||||
isActive() {
|
||||
if (GUEST) return true;
|
||||
if (this.isControllingRemoteJam()) return false;
|
||||
return !this.activeDeviceId || this.activeDeviceId === this.id;
|
||||
},
|
||||
@@ -2042,7 +2304,12 @@ document.addEventListener('alpine:init', () => {
|
||||
current_device_id: this.id,
|
||||
}),
|
||||
});
|
||||
if (!res.ok) return;
|
||||
if (!res.ok) {
|
||||
// For example: the target device needs an update to receive podcast episodes.
|
||||
this.selectError = res.status === 409 ? await this._errorText(res) : '';
|
||||
return;
|
||||
}
|
||||
this.selectError = '';
|
||||
const data = await res.json();
|
||||
this._apply(data);
|
||||
this.open = false;
|
||||
@@ -2246,11 +2513,13 @@ document.addEventListener('alpine:init', () => {
|
||||
},
|
||||
|
||||
clearJamSelection() {
|
||||
const wasControllingJam = this.isControllingRemoteJam();
|
||||
this.currentJamId = null;
|
||||
this.jamPanelOpen = false;
|
||||
this.jamPanelJamId = null;
|
||||
this._setJamLocalPlayback(false, { pauseLocal: true });
|
||||
sessionStorage.removeItem('furu_player_jam_id');
|
||||
if (wasControllingJam) Alpine.store('player')?._dropJamPlaceholders();
|
||||
},
|
||||
});
|
||||
|
||||
@@ -2364,7 +2633,10 @@ document.addEventListener('alpine:init', () => {
|
||||
|
||||
playFromIndex(idx) {
|
||||
if (idx < 0 || idx >= this.tracks.length) return;
|
||||
Alpine.store('player').playQueueIndex(idx);
|
||||
const player = Alpine.store('player');
|
||||
// A device playing the audio elsewhere may support the item.
|
||||
if (player._isUnplayableQueueItem(this.tracks[idx]) && !player._shouldSendRemote()) return;
|
||||
player.playQueueIndex(idx);
|
||||
},
|
||||
|
||||
remove(idx) {
|
||||
@@ -2635,6 +2907,10 @@ document.addEventListener('alpine:init', () => {
|
||||
_hashNav: false, // guard against circular hash updates
|
||||
|
||||
init() {
|
||||
if (GUEST) {
|
||||
this.$nextTick(() => Alpine.store('sharing').handleInitialShareLinks());
|
||||
return;
|
||||
}
|
||||
this._setupScroll();
|
||||
this.loadFederationLikes();
|
||||
window.addEventListener('furumi:track-availability', event => {
|
||||
@@ -2668,6 +2944,7 @@ document.addEventListener('alpine:init', () => {
|
||||
},
|
||||
|
||||
_navigateFromHash(options = {}) {
|
||||
if (GUEST) return;
|
||||
if (this._hashNav) return;
|
||||
const hash = location.hash || '#artists';
|
||||
const match = hash.match(/^#(\w+)(?:\/([-]?\d+))?(?:\?(.*))?$/);
|
||||
@@ -2778,6 +3055,7 @@ document.addEventListener('alpine:init', () => {
|
||||
},
|
||||
|
||||
goArtists(options = {}) {
|
||||
if (GUEST) return;
|
||||
this._beginNavigation('#artists', options);
|
||||
if (this.artistFilter !== 'all' || this.artistsPage === 0) {
|
||||
this._resetArtistList('all');
|
||||
@@ -2795,6 +3073,7 @@ document.addEventListener('alpine:init', () => {
|
||||
},
|
||||
|
||||
goMyUploads(options = {}) {
|
||||
if (GUEST) return;
|
||||
this._beginNavigation('#uploads', options);
|
||||
if (this.artistFilter !== 'uploads' || this.artistsPage === 0) {
|
||||
this._resetArtistList('uploads');
|
||||
@@ -2854,6 +3133,7 @@ document.addEventListener('alpine:init', () => {
|
||||
},
|
||||
|
||||
async openArtist(id, options = {}) {
|
||||
if (GUEST) return;
|
||||
this.stopArtistFederation();
|
||||
this._beginNavigation('#artist/' + id, options);
|
||||
this.searchQuery = '';
|
||||
@@ -3145,26 +3425,22 @@ document.addEventListener('alpine:init', () => {
|
||||
return `${T.lastfmRating}: ${Math.round(value)}\n${this.trackInfo(track)}`;
|
||||
},
|
||||
|
||||
async startRadio(kind, id) {
|
||||
if (!kind || !id) return;
|
||||
try {
|
||||
const res = await fetch(`/api/player/radio/${encodeURIComponent(kind)}/${encodeURIComponent(id)}`);
|
||||
if (!res.ok) throw new Error('radio failed');
|
||||
const tracks = await res.json();
|
||||
if (!Array.isArray(tracks) || tracks.length === 0) throw new Error('radio empty');
|
||||
Alpine.store('queue').playRelease(tracks, 0);
|
||||
Alpine.store('info').close();
|
||||
} catch (err) {
|
||||
console.warn(err);
|
||||
window.alert(T.radioFailed);
|
||||
}
|
||||
downloadTrack(track) {
|
||||
if (!track?.id) return;
|
||||
const link = document.createElement('a');
|
||||
link.href = GUEST ? `/api/player/shares/${SHARE_TOKEN}/download/${track.id}` : `/api/player/download/${track.id}`;
|
||||
link.download = '';
|
||||
document.body.appendChild(link);
|
||||
link.click();
|
||||
link.remove();
|
||||
},
|
||||
|
||||
openTrackInfo(track) {
|
||||
Alpine.store('info').openRows(T.trackInfoTitle, this.trackInfoRows(track), [
|
||||
{ label: T.startRadio, run: () => this.startRadio('track', track?.id) },
|
||||
{ label: T.findSimilar, run: () => this.searchSimilar(track) },
|
||||
]);
|
||||
const rows = this.trackInfoRows(track).map(row => GUEST && row.links
|
||||
? {...row, value: row.links.map(link => link.label).join(', '), links: null} : row);
|
||||
const actions = [{label:T.download, run:() => this.downloadTrack(track)}];
|
||||
if (!GUEST) actions.push({label:T.findSimilar, run:() => this.searchSimilar(track)});
|
||||
Alpine.store('info').openRows(T.trackInfoTitle, rows, actions);
|
||||
},
|
||||
|
||||
uploadersInfo(uploaders) {
|
||||
@@ -3188,9 +3464,7 @@ document.addEventListener('alpine:init', () => {
|
||||
},
|
||||
|
||||
openReleaseInfo(release) {
|
||||
Alpine.store('info').openRows(T.releaseInfoTitle, this.releaseInfoRows(release), [
|
||||
{ label: T.startRadio, run: () => this.startRadio('release', release?.id) },
|
||||
]);
|
||||
Alpine.store('info').openRows(T.releaseInfoTitle, this.releaseInfoRows(release));
|
||||
},
|
||||
|
||||
infoLinks(items, type) {
|
||||
@@ -3289,6 +3563,7 @@ document.addEventListener('alpine:init', () => {
|
||||
},
|
||||
|
||||
async openRelease(id, options = {}) {
|
||||
if (GUEST) return;
|
||||
this.stopReleaseFederation();
|
||||
this._beginNavigation('#release/' + id, options);
|
||||
this.searchQuery = '';
|
||||
@@ -3405,6 +3680,7 @@ document.addEventListener('alpine:init', () => {
|
||||
},
|
||||
|
||||
async openPlaylist(id, options = {}) {
|
||||
if (GUEST) return;
|
||||
this._beginNavigation('#playlist/' + id, options);
|
||||
Alpine.store('playlists')?.stopEdit?.();
|
||||
this.view = 'playlist_detail';
|
||||
@@ -3491,6 +3767,7 @@ document.addEventListener('alpine:init', () => {
|
||||
},
|
||||
|
||||
async search(query, options = {}) {
|
||||
if (GUEST) return;
|
||||
const q = (query || '').trim();
|
||||
if (!q) {
|
||||
this.clearSearch();
|
||||
@@ -3518,6 +3795,7 @@ document.addEventListener('alpine:init', () => {
|
||||
},
|
||||
|
||||
async searchSimilar(trackOrId, options = {}) {
|
||||
if (GUEST) return;
|
||||
const id = Number(typeof trackOrId === 'object' ? trackOrId?.id : trackOrId);
|
||||
if (!Number.isInteger(id) || id <= 0) return;
|
||||
const track = typeof trackOrId === 'object' ? trackOrId : null;
|
||||
@@ -4494,6 +4772,7 @@ document.addEventListener('alpine:init', () => {
|
||||
_set: new Set(),
|
||||
|
||||
init() {
|
||||
if (GUEST) return;
|
||||
this.reload();
|
||||
},
|
||||
|
||||
@@ -4563,6 +4842,7 @@ document.addEventListener('alpine:init', () => {
|
||||
artists: [],
|
||||
|
||||
init() {
|
||||
if (GUEST) return;
|
||||
this.reload();
|
||||
},
|
||||
|
||||
@@ -6503,6 +6783,7 @@ document.addEventListener('alpine:init', () => {
|
||||
_pointerDragEnd: null,
|
||||
|
||||
init() {
|
||||
if (GUEST) return;
|
||||
this.reload();
|
||||
},
|
||||
|
||||
|
||||
+63
-46
@@ -1,4 +1,4 @@
|
||||
<div class="app-layout"
|
||||
<div class="app-layout{% if guest %} guest-player{% endif %}"
|
||||
x-data
|
||||
@keydown.window.space="if (!['INPUT','TEXTAREA','SELECT'].includes(document.activeElement?.tagName)) { $event.preventDefault(); $store.player.toggle(); }"
|
||||
@keydown.window.arrow-left="if (!['INPUT','TEXTAREA','SELECT'].includes(document.activeElement?.tagName)) { $event.preventDefault(); $store.player.seekRelative(-5); }"
|
||||
@@ -7,6 +7,7 @@
|
||||
>
|
||||
|
||||
<div class="main-content">
|
||||
{% if !guest %}
|
||||
<!-- Left Sidebar -->
|
||||
<div class="sidebar-left">
|
||||
<div class="user-widget" x-show="$store.user.profile" x-cloak>
|
||||
@@ -119,17 +120,17 @@
|
||||
</div>
|
||||
<template x-if="pl.is_own && pl.kind === 'user'">
|
||||
<div class="playlist-item-actions">
|
||||
<button class="playlist-action-btn" @click.stop="$store.playlists.startRename(pl)" title="{{ t.player_rename }}">
|
||||
<button data-member-only class="playlist-action-btn" @click.stop="$store.playlists.startRename(pl)" title="{{ t.player_rename }}">
|
||||
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M11 4H4a2 2 0 00-2 2v14a2 2 0 002 2h14a2 2 0 002-2v-7"/><path d="M18.5 2.5a2.12 2.12 0 013 3L12 15l-4 1 1-4 9.5-9.5z"/></svg>
|
||||
</button>
|
||||
<button class="playlist-action-btn" @click.stop="$store.playlists.deletePlaylist(pl.id)" title="{{ t.player_delete }}">
|
||||
<button data-member-only class="playlist-action-btn" @click.stop="$store.playlists.deletePlaylist(pl.id)" title="{{ t.player_delete }}">
|
||||
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><polyline points="3 6 5 6 21 6"/><path d="M19 6v14a2 2 0 01-2 2H7a2 2 0 01-2-2V6m3 0V4a2 2 0 012-2h4a2 2 0 012 2v2"/></svg>
|
||||
</button>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
</template>
|
||||
<button class="sidebar-create-btn" @click="$store.playlists.showCreate()">
|
||||
<button data-member-only class="sidebar-create-btn" @click="$store.playlists.showCreate()">
|
||||
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><line x1="12" y1="5" x2="12" y2="19"/><line x1="5" y1="12" x2="19" y2="12"/></svg>
|
||||
{{ t.player_new_playlist }}
|
||||
</button>
|
||||
@@ -156,6 +157,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% endif %}
|
||||
<template x-if="$store.mobile.libraryOpen">
|
||||
<div class="mobile-library-backdrop" @click.self="$store.mobile.closeLibrary()" x-cloak>
|
||||
<aside class="mobile-library-drawer">
|
||||
@@ -212,7 +214,7 @@
|
||||
</div>
|
||||
<div class="following-name" x-text="artist.name"></div>
|
||||
</div>
|
||||
<button class="mobile-list-action"
|
||||
<button data-member-only class="mobile-list-action"
|
||||
@click.stop="$store.follows.toggle(artist.id)"
|
||||
title="{{ t.player_unfollow_artist }}">
|
||||
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
|
||||
@@ -244,17 +246,17 @@
|
||||
</div>
|
||||
<template x-if="pl.is_own && pl.kind === 'user'">
|
||||
<div class="playlist-item-actions">
|
||||
<button class="playlist-action-btn" @click.stop="$store.mobile.closeLibrary(); $store.playlists.startRename(pl)" title="{{ t.player_rename }}">
|
||||
<button data-member-only class="playlist-action-btn" @click.stop="$store.mobile.closeLibrary(); $store.playlists.startRename(pl)" title="{{ t.player_rename }}">
|
||||
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M11 4H4a2 2 0 00-2 2v14a2 2 0 002 2h14a2 2 0 002-2v-7"/><path d="M18.5 2.5a2.12 2.12 0 013 3L12 15l-4 1 1-4 9.5-9.5z"/></svg>
|
||||
</button>
|
||||
<button class="playlist-action-btn" @click.stop="$store.playlists.deletePlaylist(pl.id)" title="{{ t.player_delete }}">
|
||||
<button data-member-only class="playlist-action-btn" @click.stop="$store.playlists.deletePlaylist(pl.id)" title="{{ t.player_delete }}">
|
||||
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><polyline points="3 6 5 6 21 6"/><path d="M19 6v14a2 2 0 01-2 2H7a2 2 0 01-2-2V6m3 0V4a2 2 0 012-2h4a2 2 0 012 2v2"/></svg>
|
||||
</button>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
</template>
|
||||
<button class="sidebar-create-btn" @click="$store.mobile.closeLibrary(); $store.playlists.showCreate()">
|
||||
<button data-member-only class="sidebar-create-btn" @click="$store.mobile.closeLibrary(); $store.playlists.showCreate()">
|
||||
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><line x1="12" y1="5" x2="12" y2="19"/><line x1="5" y1="12" x2="19" y2="12"/></svg>
|
||||
{{ t.player_new_playlist }}
|
||||
</button>
|
||||
@@ -288,7 +290,7 @@
|
||||
<div class="center-content" id="center-scroll">
|
||||
<!-- Search / account bar -->
|
||||
<div class="content-topbar" @click.outside="$store.user.menuOpen = false">
|
||||
<button class="mobile-library-btn"
|
||||
<button data-member-only class="mobile-library-btn"
|
||||
@click="$store.user.menuOpen = false; $store.mobile.toggleLibrary()"
|
||||
title="{{ t.player_library }}">
|
||||
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
|
||||
@@ -310,6 +312,13 @@
|
||||
</svg>
|
||||
<span class="connection-alert-text">{{ t.player_connection_lost }}</span>
|
||||
</div>
|
||||
{% if guest %}
|
||||
<div class="guest-account">
|
||||
<strong>{{ t.guest_label }}</strong>
|
||||
<div x-show="$store.user.accessStatus === 'pending'" x-cloak><span>{{ t.approval_heading }}</span> · <a href="/logout">{{ t.player_log_out }}</a></div>
|
||||
<a x-show="$store.user.accessStatus === 'anonymous'" href="/login?next=/share/{{ share_token }}">{{ t.guest_login }}</a>
|
||||
</div>
|
||||
{% endif %}
|
||||
<div class="search-bar">
|
||||
<span class="search-icon"><svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="11" cy="11" r="8"/><line x1="21" y1="21" x2="16.65" y2="16.65"/></svg></span>
|
||||
<input id="search-input" type="text" placeholder="{{ t.player_search_placeholder }}"
|
||||
@@ -518,7 +527,7 @@
|
||||
<span x-show="$store.library.hasPopularity(track)" x-text="$store.library.popularityLabel(track)"></span>
|
||||
<span x-show="!$store.library.hasPopularity(track)" class="info-letter">i</span>
|
||||
</button>
|
||||
<button class="like-btn" :class="{ liked: $store.likes.has(track.id) }" @click.stop="$store.likes.toggle(track.id)" title="{{ t.player_like }}">
|
||||
<button data-member-only class="like-btn" :class="{ liked: $store.likes.has(track.id) }" @click.stop="$store.likes.toggle(track.id)" title="{{ t.player_like }}">
|
||||
<svg viewBox="0 0 24 24" :fill="$store.likes.has(track.id) ? 'currentColor' : 'none'" stroke="currentColor" stroke-width="2"><path d="M20.84 4.61a5.5 5.5 0 00-7.78 0L12 5.67l-1.06-1.06a5.5 5.5 0 00-7.78 7.78L12 21.23l8.84-8.84a5.5 5.5 0 000-7.78z"/></svg>
|
||||
</button>
|
||||
<button class="track-action-btn queue-insert-btn queue-next-btn" @click.stop="$store.queue.addNextInQueue([track])" title="{{ t.player_play_next }}">
|
||||
@@ -527,10 +536,10 @@
|
||||
<button class="track-action-btn queue-insert-btn queue-end-btn" @click.stop="$store.queue.addToEnd([track])" title="{{ t.player_add_to_queue }}">
|
||||
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M5 6h14M5 12h14M5 18h7"/><path d="M17 15l4 3-4 3" fill="currentColor" stroke="none"/></svg>
|
||||
</button>
|
||||
<button class="track-action-btn track-share-btn" @click.stop="$store.sharing.copyTrack(track, $event.currentTarget)" title="{{ t.player_share_track }}" aria-label="{{ t.player_share_track }}">
|
||||
<button data-member-only class="track-action-btn track-share-btn" @click.stop="$store.sharing.copyTrack(track, $event.currentTarget)" title="{{ t.player_share_track }}" aria-label="{{ t.player_share_track }}">
|
||||
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="18" cy="5" r="3"/><circle cx="6" cy="12" r="3"/><circle cx="18" cy="19" r="3"/><path d="M8.6 10.6l6.8-3.9M8.6 13.4l6.8 3.9"/></svg>
|
||||
</button>
|
||||
<button class="track-action-btn playlist-add-btn" @click.stop="$store.playlists.showPicker([track.id])" title="{{ t.player_add_to_playlist }}">
|
||||
<button data-member-only class="track-action-btn playlist-add-btn" @click.stop="$store.playlists.showPicker([track.id])" title="{{ t.player_add_to_playlist }}">
|
||||
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M8 6h13M8 12h13M8 18h13M3 6h.01M3 12h.01M3 18h.01"/></svg>
|
||||
</button>
|
||||
</div>
|
||||
@@ -670,7 +679,7 @@
|
||||
title="{{ t.player_add_to_queue }}">
|
||||
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M5 6h14M5 12h14M5 18h7"/><path d="M17 15l4 3-4 3" fill="currentColor" stroke="none"/></svg>
|
||||
</button>
|
||||
<button class="track-action-btn playlist-add-btn"
|
||||
<button data-member-only class="track-action-btn playlist-add-btn"
|
||||
@click.stop="$store.playlists.showFederationPicker(track)"
|
||||
title="{{ t.player_add_to_playlist }}">
|
||||
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
|
||||
@@ -714,7 +723,7 @@
|
||||
<template x-if="!artist.image_url">
|
||||
<span class="placeholder-icon"><svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5"><circle cx="12" cy="8" r="4"/><path d="M20 21a8 8 0 10-16 0"/></svg></span>
|
||||
</template>
|
||||
<button class="artist-follow-card-btn"
|
||||
<button data-member-only class="artist-follow-card-btn"
|
||||
:class="{ followed: $store.follows.has(artist.id) }"
|
||||
@click.stop="$store.follows.toggle(artist.id)"
|
||||
:title="$store.follows.has(artist.id) ? '{{ t.player_unfollow_artist }}' : '{{ t.player_follow_artist }}'">
|
||||
@@ -794,7 +803,7 @@
|
||||
</svg>
|
||||
<span>{{ t.player_listen }}</span>
|
||||
</button>
|
||||
<button class="release-action-btn secondary artist-follow-action"
|
||||
<button data-member-only class="release-action-btn secondary artist-follow-action"
|
||||
x-show="$store.library.currentArtist.id"
|
||||
:class="{ followed: $store.follows.has($store.library.currentArtist.id) }"
|
||||
@click="$store.follows.toggle($store.library.currentArtist.id)"
|
||||
@@ -881,7 +890,7 @@
|
||||
<span x-show="$store.library.hasPopularity(track)" x-text="$store.library.popularityLabel(track)"></span>
|
||||
<span x-show="!$store.library.hasPopularity(track)" class="info-letter">i</span>
|
||||
</button>
|
||||
<button class="like-btn" :class="{ liked: $store.likes.has(track.id) }" @click.stop="$store.likes.toggle(track.id)" title="{{ t.player_like }}">
|
||||
<button data-member-only class="like-btn" :class="{ liked: $store.likes.has(track.id) }" @click.stop="$store.likes.toggle(track.id)" title="{{ t.player_like }}">
|
||||
<svg viewBox="0 0 24 24" :fill="$store.likes.has(track.id) ? 'currentColor' : 'none'" stroke="currentColor" stroke-width="2"><path d="M20.84 4.61a5.5 5.5 0 00-7.78 0L12 5.67l-1.06-1.06a5.5 5.5 0 00-7.78 7.78L12 21.23l8.84-8.84a5.5 5.5 0 000-7.78z"/></svg>
|
||||
</button>
|
||||
<button class="track-action-btn queue-insert-btn queue-next-btn" @click.stop="$store.queue.addNextInQueue([track])" title="{{ t.player_play_next }}">
|
||||
@@ -890,10 +899,10 @@
|
||||
<button class="track-action-btn queue-insert-btn queue-end-btn" @click.stop="$store.queue.addToEnd([track])" title="{{ t.player_add_to_queue }}">
|
||||
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M5 6h14M5 12h14M5 18h7"/><path d="M17 15l4 3-4 3" fill="currentColor" stroke="none"/></svg>
|
||||
</button>
|
||||
<button class="track-action-btn track-share-btn" @click.stop="$store.sharing.copyTrack(track, $event.currentTarget)" title="{{ t.player_share_track }}" aria-label="{{ t.player_share_track }}">
|
||||
<button data-member-only class="track-action-btn track-share-btn" @click.stop="$store.sharing.copyTrack(track, $event.currentTarget)" title="{{ t.player_share_track }}" aria-label="{{ t.player_share_track }}">
|
||||
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="18" cy="5" r="3"/><circle cx="6" cy="12" r="3"/><circle cx="18" cy="19" r="3"/><path d="M8.6 10.6l6.8-3.9M8.6 13.4l6.8 3.9"/></svg>
|
||||
</button>
|
||||
<button class="track-action-btn playlist-add-btn" @click.stop="$store.playlists.showPicker([track.id])" title="{{ t.player_add_to_playlist }}">
|
||||
<button data-member-only class="track-action-btn playlist-add-btn" @click.stop="$store.playlists.showPicker([track.id])" title="{{ t.player_add_to_playlist }}">
|
||||
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M8 6h13M8 12h13M8 18h13M3 6h.01M3 12h.01M3 18h.01"/></svg>
|
||||
</button>
|
||||
</div>
|
||||
@@ -1037,7 +1046,7 @@
|
||||
title="{{ t.player_add_to_queue }}">
|
||||
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M5 6h14M5 12h14M5 18h7"/><path d="M17 15l4 3-4 3" fill="currentColor" stroke="none"/></svg>
|
||||
</button>
|
||||
<button class="track-action-btn playlist-add-btn"
|
||||
<button data-member-only class="track-action-btn playlist-add-btn"
|
||||
@click.stop="$store.playlists.showFederationPicker(track)"
|
||||
title="{{ t.player_add_to_playlist }}">
|
||||
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
|
||||
@@ -1110,7 +1119,7 @@
|
||||
<span x-show="$store.library.hasPopularity(track)" x-text="$store.library.popularityLabel(track)"></span>
|
||||
<span x-show="!$store.library.hasPopularity(track)" class="info-letter">i</span>
|
||||
</button>
|
||||
<button class="like-btn" :class="{ liked: $store.likes.has(track.id) }" @click.stop="$store.likes.toggle(track.id)" title="{{ t.player_like }}">
|
||||
<button data-member-only class="like-btn" :class="{ liked: $store.likes.has(track.id) }" @click.stop="$store.likes.toggle(track.id)" title="{{ t.player_like }}">
|
||||
<svg viewBox="0 0 24 24" :fill="$store.likes.has(track.id) ? 'currentColor' : 'none'" stroke="currentColor" stroke-width="2"><path d="M20.84 4.61a5.5 5.5 0 00-7.78 0L12 5.67l-1.06-1.06a5.5 5.5 0 00-7.78 7.78L12 21.23l8.84-8.84a5.5 5.5 0 000-7.78z"/></svg>
|
||||
</button>
|
||||
<button class="track-action-btn queue-insert-btn queue-next-btn" @click.stop="$store.queue.addNextInQueue([track])" title="{{ t.player_play_next }}">
|
||||
@@ -1119,10 +1128,10 @@
|
||||
<button class="track-action-btn queue-insert-btn queue-end-btn" @click.stop="$store.queue.addToEnd([track])" title="{{ t.player_add_to_queue }}">
|
||||
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M5 6h14M5 12h14M5 18h7"/><path d="M17 15l4 3-4 3" fill="currentColor" stroke="none"/></svg>
|
||||
</button>
|
||||
<button class="track-action-btn track-share-btn" @click.stop="$store.sharing.copyTrack(track, $event.currentTarget)" title="{{ t.player_share_track }}" aria-label="{{ t.player_share_track }}">
|
||||
<button data-member-only class="track-action-btn track-share-btn" @click.stop="$store.sharing.copyTrack(track, $event.currentTarget)" title="{{ t.player_share_track }}" aria-label="{{ t.player_share_track }}">
|
||||
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="18" cy="5" r="3"/><circle cx="6" cy="12" r="3"/><circle cx="18" cy="19" r="3"/><path d="M8.6 10.6l6.8-3.9M8.6 13.4l6.8 3.9"/></svg>
|
||||
</button>
|
||||
<button class="track-action-btn playlist-add-btn" @click.stop="$store.playlists.showPicker([track.id])" title="{{ t.player_add_to_playlist }}">
|
||||
<button data-member-only class="track-action-btn playlist-add-btn" @click.stop="$store.playlists.showPicker([track.id])" title="{{ t.player_add_to_playlist }}">
|
||||
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M8 6h13M8 12h13M8 18h13M3 6h.01M3 12h.01M3 18h.01"/></svg>
|
||||
</button>
|
||||
</div>
|
||||
@@ -1193,7 +1202,7 @@
|
||||
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="10"/><line x1="12" y1="16" x2="12" y2="12"/><line x1="12" y1="8" x2="12.01" y2="8"/></svg>
|
||||
{{ t.player_info }}
|
||||
</button>
|
||||
<button class="release-action-btn secondary release-share-btn"
|
||||
<button data-member-only class="release-action-btn secondary release-share-btn"
|
||||
x-show="!$store.library.currentRelease.federated"
|
||||
@click.stop="$store.sharing.copyRelease($store.library.currentRelease, $event.currentTarget)"
|
||||
title="{{ t.player_share }}"
|
||||
@@ -1290,7 +1299,7 @@
|
||||
<span x-show="$store.library.hasPopularity(track)" x-text="$store.library.popularityLabel(track)"></span>
|
||||
<span x-show="!$store.library.hasPopularity(track)" class="info-letter">i</span>
|
||||
</button>
|
||||
<button class="like-btn"
|
||||
<button data-member-only class="like-btn"
|
||||
:class="{ liked: track.federation_pending ? $store.library.federationIsLiked(track._federationTrack) : $store.likes.has(track.id) }"
|
||||
@click.stop="track.federation_pending ? $store.library.toggleFederationLike(track._federationTrack) : $store.likes.toggle(track.id)"
|
||||
title="{{ t.player_like }}">
|
||||
@@ -1304,12 +1313,12 @@
|
||||
<button class="track-action-btn queue-insert-btn queue-end-btn" @click.stop="$store.queue.addToEnd([track])" title="{{ t.player_add_to_queue }}">
|
||||
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M5 6h14M5 12h14M5 18h7"/><path d="M17 15l4 3-4 3" fill="currentColor" stroke="none"/></svg>
|
||||
</button>
|
||||
<button class="track-action-btn track-share-btn"
|
||||
<button data-member-only class="track-action-btn track-share-btn"
|
||||
x-show="!track.federation_pending"
|
||||
@click.stop="$store.sharing.copyTrack(track, $event.currentTarget)" title="{{ t.player_share_track }}" aria-label="{{ t.player_share_track }}">
|
||||
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="18" cy="5" r="3"/><circle cx="6" cy="12" r="3"/><circle cx="18" cy="19" r="3"/><path d="M8.6 10.6l6.8-3.9M8.6 13.4l6.8 3.9"/></svg>
|
||||
</button>
|
||||
<button class="track-action-btn playlist-add-btn"
|
||||
<button data-member-only class="track-action-btn playlist-add-btn"
|
||||
@click.stop="track.federation_pending ? $store.playlists.showFederationPicker(track._federationTrack) : $store.playlists.showPicker([track.id])"
|
||||
title="{{ t.player_add_to_playlist }}">
|
||||
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M8 6h13M8 12h13M8 18h13M3 6h.01M3 12h.01M3 18h.01"/></svg>
|
||||
@@ -1331,7 +1340,7 @@
|
||||
</div>
|
||||
<div class="playlist-detail-heading">
|
||||
<h1 class="section-title" x-text="$store.playlists.displayTitle($store.library.currentPlaylist)"></h1>
|
||||
<button class="release-action-btn secondary playlist-edit-toggle"
|
||||
<button data-member-only class="release-action-btn secondary playlist-edit-toggle"
|
||||
x-show="$store.playlists.canEditCurrent()"
|
||||
x-cloak
|
||||
@click="$store.playlists.toggleEditCurrent()"
|
||||
@@ -1379,7 +1388,7 @@
|
||||
@dragover.prevent="$store.playlists.dragOver($event, idx)"
|
||||
@dragleave="$event.currentTarget.classList.remove('drag-over')"
|
||||
@drop.prevent="$event.currentTarget.classList.remove('drag-over'); $store.playlists.dropOn(idx)">
|
||||
<button class="playlist-track-remove"
|
||||
<button data-member-only class="playlist-track-remove"
|
||||
x-show="$store.playlists.isEditingCurrent()"
|
||||
x-cloak
|
||||
@click.stop="$store.playlists.removeCurrentTrack(track, idx)"
|
||||
@@ -1422,7 +1431,7 @@
|
||||
</template>
|
||||
</span>
|
||||
<div class="track-info playlist-track-info">
|
||||
<button class="playlist-drag-handle"
|
||||
<button data-member-only class="playlist-drag-handle"
|
||||
x-show="$store.playlists.isEditingCurrent() && !!track.playlist_track_id"
|
||||
x-cloak
|
||||
@mousedown.stop
|
||||
@@ -1457,7 +1466,7 @@
|
||||
<span x-show="$store.library.hasPopularity(track)" x-text="$store.library.popularityLabel(track)"></span>
|
||||
<span x-show="!$store.library.hasPopularity(track)" class="info-letter">i</span>
|
||||
</button>
|
||||
<button class="like-btn"
|
||||
<button data-member-only class="like-btn"
|
||||
:class="{ liked: track.federation_pending ? $store.library.federationIsLiked(track._federationTrack) : $store.likes.has(track.id) }"
|
||||
@click.stop="track.federation_pending ? $store.library.toggleFederationLike(track._federationTrack) : $store.likes.toggle(track.id)"
|
||||
title="{{ t.player_like }}">
|
||||
@@ -1471,10 +1480,10 @@
|
||||
<button class="track-action-btn queue-insert-btn queue-end-btn" @click.stop="$store.queue.addToEnd([track])" title="{{ t.player_add_to_queue }}">
|
||||
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M5 6h14M5 12h14M5 18h7"/><path d="M17 15l4 3-4 3" fill="currentColor" stroke="none"/></svg>
|
||||
</button>
|
||||
<button class="track-action-btn track-share-btn" @click.stop="$store.sharing.copyTrack(track, $event.currentTarget)" title="{{ t.player_share_track }}" aria-label="{{ t.player_share_track }}">
|
||||
<button data-member-only class="track-action-btn track-share-btn" @click.stop="$store.sharing.copyTrack(track, $event.currentTarget)" title="{{ t.player_share_track }}" aria-label="{{ t.player_share_track }}">
|
||||
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="18" cy="5" r="3"/><circle cx="6" cy="12" r="3"/><circle cx="18" cy="19" r="3"/><path d="M8.6 10.6l6.8-3.9M8.6 13.4l6.8 3.9"/></svg>
|
||||
</button>
|
||||
<button class="track-action-btn playlist-add-btn"
|
||||
<button data-member-only class="track-action-btn playlist-add-btn"
|
||||
@click.stop="track.federation_pending ? $store.playlists.showFederationPicker(track._federationTrack) : $store.playlists.showPicker([track.id])"
|
||||
title="{{ t.player_add_to_playlist }}">
|
||||
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M8 6h13M8 12h13M8 18h13M3 6h.01M3 12h.01M3 18h.01"/></svg>
|
||||
@@ -1496,7 +1505,7 @@
|
||||
<div class="queue-header">
|
||||
<h3>{{ t.player_queue }}</h3>
|
||||
<div class="queue-header-actions">
|
||||
<button class="queue-share-btn" @click="$store.sharing.copyQueue($event.currentTarget)" :disabled="$store.queue.tracks.length === 0" title="{{ t.player_share_queue }}" aria-label="{{ t.player_share_queue }}">
|
||||
<button data-member-only class="queue-share-btn" @click="$store.sharing.copyQueue($event.currentTarget)" :disabled="$store.queue.tracks.length === 0" title="{{ t.player_share_queue }}" aria-label="{{ t.player_share_queue }}">
|
||||
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="18" cy="5" r="3"/><circle cx="6" cy="12" r="3"/><circle cx="18" cy="19" r="3"/><path d="M8.6 10.6l6.8-3.9M8.6 13.4l6.8 3.9"/></svg>
|
||||
</button>
|
||||
<button class="queue-clear-btn" @click="$store.queue.clear()">{{ t.player_clear }}</button>
|
||||
@@ -1512,7 +1521,8 @@
|
||||
<template x-for="item in $store.queue.displayItems()" :key="item.key">
|
||||
<div class="queue-track"
|
||||
:data-queue-index="item.index"
|
||||
:class="{ active: item.state === 'current', current: item.state === 'current', played: item.state === 'played', dragging: $store.queue._dragIdx === item.index, synthetic: item.synthetic, 'foreign-jam-track': $store.queue.isForeignJamTrack(item.track) }"
|
||||
:class="{ active: item.state === 'current', current: item.state === 'current', played: item.state === 'played', dragging: $store.queue._dragIdx === item.index, synthetic: item.synthetic, 'foreign-jam-track': $store.queue.isForeignJamTrack(item.track), unplayable: $store.player._isUnplayableQueueItem(item.track) }"
|
||||
:title="$store.player._unplayableQueueLabel(item.track) || null"
|
||||
:style="$store.queue.isForeignJamTrack(item.track) ? $store.queue.contributorStyle(item.track) : ''"
|
||||
@click="item.index >= 0 ? $store.queue.playFromIndex(item.index) : $store.player.play(item.track)"
|
||||
:draggable="!item.synthetic"
|
||||
@@ -1565,6 +1575,10 @@
|
||||
</div>
|
||||
<div class="queue-track-info">
|
||||
<div class="queue-track-title" x-text="item.track.title"></div>
|
||||
<div class="queue-track-unplayable"
|
||||
x-show="$store.player._isUnplayableQueueItem(item.track)"
|
||||
x-cloak
|
||||
x-text="$store.player._unplayableQueueLabel(item.track)"></div>
|
||||
<div class="queue-track-artist">
|
||||
<template x-for="(artist, artistIdx) in $store.library.trackArtistLinks(item.track)" :key="artist.label + '-' + artist.id + '-' + artistIdx">
|
||||
<span>
|
||||
@@ -1620,14 +1634,14 @@
|
||||
<div class="player-track-info">
|
||||
<div class="player-track-title-row">
|
||||
<div class="player-track-title" x-text="$store.player.currentTrack.title"></div>
|
||||
<button class="like-btn player-current-like"
|
||||
<button data-member-only class="like-btn player-current-like"
|
||||
:class="{ liked: $store.likes.has($store.player.currentTrack.id) }"
|
||||
@click.stop="$store.likes.toggle($store.player.currentTrack.id)"
|
||||
title="{{ t.player_like }}"
|
||||
aria-label="{{ t.player_like }}">
|
||||
<svg viewBox="0 0 24 24" :fill="$store.likes.has($store.player.currentTrack.id) ? 'currentColor' : 'none'" stroke="currentColor" stroke-width="2"><path d="M20.84 4.61a5.5 5.5 0 00-7.78 0L12 5.67l-1.06-1.06a5.5 5.5 0 00-7.78 7.78L12 21.23l8.84-8.84a5.5 5.5 0 000-7.78z"/></svg>
|
||||
</button>
|
||||
<button class="track-action-btn player-current-share"
|
||||
<button data-member-only class="track-action-btn player-current-share"
|
||||
@click.stop="$store.sharing.copyTrack($store.player.currentTrack, $event.currentTarget)"
|
||||
title="{{ t.player_share_track }}"
|
||||
aria-label="{{ t.player_share_track }}">
|
||||
@@ -1727,7 +1741,7 @@
|
||||
</button>
|
||||
<div class="device-picker" @click.outside="$store.devices.open = false">
|
||||
<template x-if="$store.devices.remoteHintVisible">
|
||||
<button class="remote-playback-hint"
|
||||
<button data-member-only class="remote-playback-hint"
|
||||
type="button"
|
||||
@click="$store.devices.dismissRemoteHint()"
|
||||
x-transition
|
||||
@@ -1736,7 +1750,7 @@
|
||||
<span class="remote-playback-hint-progress"></span>
|
||||
</button>
|
||||
</template>
|
||||
<button class="queue-toggle-btn device-toggle-btn"
|
||||
<button data-member-only class="queue-toggle-btn device-toggle-btn"
|
||||
:class="{ active: $store.devices.isActive() }"
|
||||
@click="$store.devices.toggle()"
|
||||
:title="$store.devices.activeLabel()"
|
||||
@@ -1757,7 +1771,7 @@
|
||||
<div class="device-popover" x-show="$store.devices.open" x-transition x-cloak>
|
||||
<div class="device-section-label">Web players</div>
|
||||
<template x-for="device in $store.devices.webDevices()" :key="device.id">
|
||||
<button class="device-row"
|
||||
<button data-member-only class="device-row"
|
||||
:class="{ active: device.is_active, 'current-device': device.is_current }"
|
||||
@click="$store.devices.select(device.id)">
|
||||
<span class="device-row-icon">
|
||||
@@ -1791,8 +1805,11 @@
|
||||
<span>Trusted federation devices</span>
|
||||
</div>
|
||||
</template>
|
||||
<template x-if="$store.devices.selectError">
|
||||
<div class="fed-device-error device-select-error" role="alert" x-text="$store.devices.selectError"></div>
|
||||
</template>
|
||||
<template x-for="device in $store.devices.playbackFedDevices()" :key="device.id">
|
||||
<button class="device-row federation-device-row"
|
||||
<button data-member-only class="device-row federation-device-row"
|
||||
:class="{ active: device.is_active }"
|
||||
@click="$store.devices.select(device.id)">
|
||||
<span class="device-row-icon federation-device-icon">
|
||||
@@ -1818,7 +1835,7 @@
|
||||
<div class="device-section-label jam-section-label">Jams</div>
|
||||
</template>
|
||||
<template x-for="jam in $store.devices.jams" :key="jam.id">
|
||||
<button class="device-row jam-row"
|
||||
<button data-member-only class="device-row jam-row"
|
||||
:class="{ active: jam.is_active, pending: jam.is_pending }"
|
||||
@click="$store.devices.handleJamRowClick(jam)">
|
||||
<span class="device-row-icon">
|
||||
@@ -1841,7 +1858,7 @@
|
||||
</span>
|
||||
</button>
|
||||
</template>
|
||||
<button class="device-row start-jam-row" x-show="!$store.devices.hasJoinedJam()" @click="$store.devices.openJamPanel()">
|
||||
<button data-member-only class="device-row start-jam-row" x-show="!$store.devices.hasJoinedJam()" @click="$store.devices.openJamPanel()">
|
||||
<span class="device-row-icon">
|
||||
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
|
||||
<path d="M12 5v14"/>
|
||||
@@ -1865,7 +1882,7 @@
|
||||
</label>
|
||||
<div class="jam-selected-users" x-show="$store.devices.jamSelectedUsers.length > 0">
|
||||
<template x-for="user in $store.devices.jamSelectedUsers" :key="user.id">
|
||||
<button class="jam-user-chip" @click="$store.devices.removeJamInvitee(user.id)">
|
||||
<button data-member-only class="jam-user-chip" @click="$store.devices.removeJamInvitee(user.id)">
|
||||
<span x-text="user.display_name || user.username"></span>
|
||||
<span aria-hidden="true">×</span>
|
||||
</button>
|
||||
@@ -1878,18 +1895,18 @@
|
||||
@input="$store.devices.queueJamSearch()">
|
||||
<div class="jam-search-results" x-show="$store.devices.jamUsers.length > 0">
|
||||
<template x-for="user in $store.devices.jamUsers" :key="user.id">
|
||||
<button class="jam-search-row" @click="$store.devices.addJamInvitee(user)">
|
||||
<button data-member-only class="jam-search-row" @click="$store.devices.addJamInvitee(user)">
|
||||
<span x-text="user.display_name || user.username"></span>
|
||||
<small x-text="user.email || user.username"></small>
|
||||
</button>
|
||||
</template>
|
||||
</div>
|
||||
<div class="jam-panel-actions">
|
||||
<button class="jam-create-btn"
|
||||
<button data-member-only class="jam-create-btn"
|
||||
:disabled="$store.devices.jamSelectedUsers.length === 0 && $store.devices.jamPanelMode === 'manage'"
|
||||
@click="$store.devices.submitJamPanel()"
|
||||
x-text="$store.devices.jamPanelMode === 'manage' ? 'Invite' : 'Create Jam'"></button>
|
||||
<button class="jam-leave-btn"
|
||||
<button data-member-only class="jam-leave-btn"
|
||||
x-show="$store.devices.jamPanelMode === 'manage'"
|
||||
@click="$store.devices.leaveJam($store.devices.jamPanelJamId)">Leave</button>
|
||||
</div>
|
||||
|
||||
@@ -1440,6 +1440,17 @@ button.user-stat:hover {
|
||||
.queue-track.current .queue-track-title { color: var(--accent); }
|
||||
.queue-track.played .queue-track-title { color: var(--text-subdued); }
|
||||
|
||||
.queue-track.unplayable .queue-track-title,
|
||||
.queue-track.unplayable .queue-track-cover { opacity: 0.55; }
|
||||
|
||||
.queue-track-unplayable {
|
||||
font-size: 11px;
|
||||
color: var(--text-subdued);
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
|
||||
.queue-track-artist {
|
||||
font-size: 11px;
|
||||
color: var(--text-subdued);
|
||||
@@ -2065,6 +2076,10 @@ button.user-stat:hover {
|
||||
color: #ffb2b2;
|
||||
}
|
||||
|
||||
.device-select-error {
|
||||
padding: 6px 12px;
|
||||
}
|
||||
|
||||
.fed-device-row {
|
||||
min-height: 32px;
|
||||
display: grid;
|
||||
@@ -7002,3 +7017,20 @@ button.user-stat:hover {
|
||||
.queue-tracks::-webkit-scrollbar-thumb,
|
||||
.playlist-list::-webkit-scrollbar-thumb { background: var(--bg-active); border-radius: 3px; }
|
||||
</style>
|
||||
|
||||
<style>
|
||||
.guest-player [data-member-only], .guest-player .search-bar, .guest-player .breadcrumb,
|
||||
.guest-player .device-picker, .guest-player .mobile-library-backdrop,
|
||||
.guest-player .mobile-library-btn, .guest-player .mobile-library-toggle { display:none !important; }
|
||||
.guest-player .artist-link, .guest-player .track-artist a, .guest-player .player-artist a { pointer-events:none; cursor:default; }
|
||||
.guest-account { display:flex; align-items:center; justify-content:space-between; gap:16px; width:100%; font-size:14px; }
|
||||
.guest-account a { color:var(--accent); text-decoration:none; }
|
||||
.guest-account div { color:var(--text-secondary); }
|
||||
@media(max-width:600px) { .guest-account { flex-wrap:wrap; gap:8px; font-size:12px; } }
|
||||
@media(max-width:1100px) {
|
||||
.guest-player .playlist-track-row > span:nth-child(4) { display:none; }
|
||||
.guest-player .playlist-track-row .track-num { grid-column:1; grid-row:1; }
|
||||
.guest-player .playlist-track-row .playlist-track-info { grid-column:2; grid-row:1; }
|
||||
.guest-player .playlist-track-row .track-actions { grid-column:3; grid-row:1; }
|
||||
}
|
||||
</style>
|
||||
@@ -0,0 +1,131 @@
|
||||
const assert = require('node:assert/strict');
|
||||
const { readFileSync } = require('node:fs');
|
||||
const { test } = require('node:test');
|
||||
const vm = require('node:vm');
|
||||
const template = readFileSync(`${__dirname}/../templates/admin/v2.html`, 'utf8');
|
||||
const ui = readFileSync(`${__dirname}/../templates/admin/ui.html`, 'utf8').match(/<script>([\s\S]*?)<\/script>/)[1];
|
||||
const script = ui + '\n' + template.match(/<script>\s*(function adminV2\(\)[\s\S]*?)<\/script>/)[1];
|
||||
function createApp() {
|
||||
const context = vm.createContext({URLSearchParams});
|
||||
vm.runInContext(script, context);
|
||||
const app = context.adminV2();
|
||||
app.showToast = message => { app.toastMessage = message; };
|
||||
app.$nextTick = fn => fn();
|
||||
app.$refs = {};
|
||||
app.repairSelected = [{kind:'artists',id:1,title:'Artist'}];
|
||||
app.repairExpanded = {snapshot:{artists:[{id:1,name:'Artist'}],releases:[{id:2,title:'#ИЗИРОК',year:2018}],tracks:[{id:3,title:'Actual song',release_id:2}]}};
|
||||
return app;
|
||||
}
|
||||
const emptyPlan = () => ({artists:[],releases:[],tracks:[],questions:[],delete:{artists:[],releases:[],tracks:[]}});
|
||||
|
||||
test('deselect all retains related rows and allows selecting only the needed resources', async () => {
|
||||
const app = createApp();
|
||||
app.setAllRepairIncluded(false);
|
||||
assert.equal(app.repairIncludedCount(),0);
|
||||
assert.equal(app.repairRowsCount(),3);
|
||||
app.setRepairIncluded('releases',2,true);
|
||||
app.setRepairIncluded('tracks',3,true);
|
||||
assert.equal(app.repairIncludedCount(),2);
|
||||
app.repairDraft = 'Only these';
|
||||
app.request = async (url,options) => {
|
||||
assert.ok(url.endsWith('/plan'), 'must not re-expand exclusions');
|
||||
const body = JSON.parse(options.body);
|
||||
assert.deepEqual(body.selection,{artists:[],releases:[2],tracks:[3]});
|
||||
return {plan:emptyPlan(),snapshot:app.repairExpanded.snapshot,message:'Done'};
|
||||
};
|
||||
await app.sendRepair();
|
||||
assert.equal(app.repairChat.length,2);
|
||||
app.setAllRepairIncluded(true);
|
||||
assert.equal(app.repairIncludedCount(),3);
|
||||
});
|
||||
|
||||
test('checking only releases includes their contents without selecting the artist', () => {
|
||||
const app = createApp();
|
||||
app.setAllRepairIncluded(false);
|
||||
app.setRepairIncluded('releases',2,true);
|
||||
assert.deepEqual(JSON.parse(JSON.stringify(app.repairSelection(true))),{artists:[],releases:[2],tracks:[3]});
|
||||
assert.equal(app.repairIsIncluded('tracks',3),true);
|
||||
assert.equal(app.repairIsIncluded('artists',1),false);
|
||||
app.setRepairIncluded('tracks',3,false);
|
||||
assert.equal(app.repairIsIncluded('tracks',3),false);
|
||||
assert.deepEqual(JSON.parse(JSON.stringify(app.repairSelection(true))).tracks,[]);
|
||||
assert.deepEqual(JSON.parse(JSON.stringify(app.repairExcludedTracks)),[3]);
|
||||
app.setAllRepairIncluded(false);
|
||||
app.setRepairIncluded('releases',2,true);
|
||||
assert.equal(app.repairIsIncluded('tracks',3),true);
|
||||
});
|
||||
|
||||
test('explicit track exclusions are sent to planning without re-expanding them', async () => {
|
||||
const app=createApp();
|
||||
app.setAllRepairIncluded(false);
|
||||
app.setRepairIncluded('releases',2,true);
|
||||
app.setRepairIncluded('tracks',3,false);
|
||||
app.repairDraft='Edit release only';
|
||||
app.request=async(url,options)=>{
|
||||
assert.ok(url.endsWith('/plan'));
|
||||
const body=JSON.parse(options.body);
|
||||
assert.deepEqual(body.selection,{artists:[],releases:[2],tracks:[]});
|
||||
assert.deepEqual(body.excluded_track_ids,[3]);
|
||||
return {plan:emptyPlan(),snapshot:app.repairExpanded.snapshot,message:'Done'};
|
||||
};
|
||||
await app.sendRepair();
|
||||
});
|
||||
|
||||
test('clarification replaces the single plan including removed changes and questions', async () => {
|
||||
const app = createApp();
|
||||
app.repairPlan = {...emptyPlan(),delete:{artists:[],releases:[],tracks:[3]},questions:['Which release?']};
|
||||
app.repairChat = [{role:'user',content:'Delete song'},{role:'assistant',content:'Please review'}];
|
||||
app.repairPlanOpen = true;
|
||||
app.repairDraft = 'Keep song, cancel everything';
|
||||
app.request = async (_url,options) => {
|
||||
const body=JSON.parse(options.body);
|
||||
assert.deepEqual(body.current_plan.delete.tracks,[3]);
|
||||
assert.equal(body.conversation.length,2);
|
||||
return {plan:emptyPlan(),snapshot:app.repairExpanded.snapshot,message:'Cancelled'};
|
||||
};
|
||||
await app.sendRepair();
|
||||
assert.equal(app.repairChangeCount(),0);
|
||||
assert.equal(app.repairPlan.questions.length,0);
|
||||
assert.equal(app.repairPlanOpen,true);
|
||||
assert.equal(app.repairChat.length,4);
|
||||
});
|
||||
|
||||
test('failed revision preserves prior plan and retry avoids duplicate user messages', async () => {
|
||||
const app = createApp();
|
||||
const prior = {...emptyPlan(),delete:{artists:[],releases:[],tracks:[3]}};
|
||||
app.repairPlan = prior;
|
||||
app.repairDraft = 'Keep song';
|
||||
app.request = async () => {throw Error('Offline');};
|
||||
await app.sendRepair();
|
||||
assert.equal(app.repairPlan,prior);
|
||||
assert.equal(app.repairIncomplete,true);
|
||||
assert.equal(app.repairChat.length,1);
|
||||
app.request = async (_url,options) => {
|
||||
assert.equal(JSON.parse(options.body).conversation.length,0);
|
||||
return {plan:emptyPlan(),snapshot:app.repairExpanded.snapshot,message:'Kept'};
|
||||
};
|
||||
await app.sendRepair();
|
||||
assert.equal(app.repairChat.length,2);
|
||||
assert.equal(app.repairIncomplete,false);
|
||||
});
|
||||
|
||||
test('incomplete plan cannot apply, deletion-only plan can apply and clears stale selection', async () => {
|
||||
const app = createApp();
|
||||
app.repairPlan = {...emptyPlan(),delete:{artists:[],releases:[],tracks:[3]}};
|
||||
app.repairSnapshot = app.repairExpanded.snapshot;
|
||||
app.repairIncomplete = true;
|
||||
app.request = async () => assert.fail('must not apply incomplete plan');
|
||||
await app.applyRepair();
|
||||
app.repairIncomplete = false;
|
||||
app.request = async (url,options) => {
|
||||
assert.ok(url.endsWith('/apply'));
|
||||
assert.deepEqual(JSON.parse(options.body).plan.delete.tracks,[3]);
|
||||
return {history_id:7};
|
||||
};
|
||||
app.loadRepairHistory = async () => {};
|
||||
app.loadLibrary = async () => {};
|
||||
await app.applyRepair();
|
||||
assert.equal(app.repairIncludedCount(),0);
|
||||
assert.equal(app.repairPlan,null);
|
||||
assert.equal(app.repairChat.at(-1).content.includes('#7'),true);
|
||||
});
|
||||
@@ -3,7 +3,8 @@ const {readFileSync} = require('node:fs');
|
||||
const {test} = require('node:test');
|
||||
const vm = require('node:vm');
|
||||
const template = readFileSync(`${__dirname}/../templates/admin/v2.html`, 'utf8');
|
||||
const script = template.match(/<script>\s*(function adminV2\(\)[\s\S]*?)<\/script>/)[1];
|
||||
const ui = readFileSync(`${__dirname}/../templates/admin/ui.html`, 'utf8').match(/<script>([\s\S]*?)<\/script>/)[1];
|
||||
const script = ui + '\n' + template.match(/<script>\s*(function adminV2\(\)[\s\S]*?)<\/script>/)[1];
|
||||
function app() {
|
||||
const context = vm.createContext({URLSearchParams, Date}); vm.runInContext(script, context);
|
||||
const a = context.adminV2(); a.icons = () => {}; a.setRoute = () => {}; return a;
|
||||
|
||||
@@ -4,7 +4,8 @@ const { test } = require('node:test');
|
||||
const vm = require('node:vm');
|
||||
|
||||
const template = readFileSync(`${__dirname}/../templates/admin/v2.html`, 'utf8');
|
||||
const script = template.match(/<script>\s*(function adminV2\(\)[\s\S]*?)<\/script>/)[1];
|
||||
const ui = readFileSync(`${__dirname}/../templates/admin/ui.html`, 'utf8').match(/<script>([\s\S]*?)<\/script>/)[1];
|
||||
const script = ui + '\n' + template.match(/<script>\s*(function adminV2\(\)[\s\S]*?)<\/script>/)[1];
|
||||
|
||||
function createApp() {
|
||||
const context = vm.createContext({});
|
||||
|
||||
@@ -0,0 +1,141 @@
|
||||
// Run against a disposable, freshly migrated instance only.
|
||||
// Requires Docker PostgreSQL (FURU_ACCESS_TEST_PG), Playwright and Chrome.
|
||||
const assert = require('node:assert/strict');
|
||||
const {chromium} = require(process.env.PLAYWRIGHT_MODULE || 'playwright');
|
||||
const {spawnSync} = require('node:child_process');
|
||||
const {mkdirSync, writeFileSync} = require('node:fs');
|
||||
const {createServer} = require('node:http');
|
||||
const {generateKeyPairSync, sign, randomUUID, createHash} = require('node:crypto');
|
||||
const base = process.env.FURU_TEST_URL || 'http://127.0.0.1:18048';
|
||||
const issuer = 'http://127.0.0.1:18049';
|
||||
const mediaRoot = process.env.FURU_ACCESS_TEST_MEDIA || '/tmp/furumi-access-media';
|
||||
function sql(statement) {
|
||||
const result = spawnSync('docker', ['exec', '-i', process.env.FURU_ACCESS_TEST_PG || 'furumi-access-test-pg', 'psql', '-U', 'postgres', '-d', 'furumi_access_test', '-At', '-v', 'ON_ERROR_STOP=1'], {input:statement, encoding:'utf8'});
|
||||
assert.equal(result.status, 0, result.stderr); return result.stdout.trim();
|
||||
}
|
||||
const encode = value => Buffer.from(JSON.stringify(value)).toString('base64url');
|
||||
const {privateKey, publicKey} = generateKeyPairSync('rsa', {modulusLength:2048});
|
||||
const jwk = {...publicKey.export({format:'jwk'}), kid:'test', use:'sig', alg:'RS256'};
|
||||
let claims = {sub:'pending-test', email:'pending@example.test', name:'Pending Listener', groups:[]};
|
||||
const codes = new Map();
|
||||
const oidc = createServer(async (request, response) => {
|
||||
const url = new URL(request.url, issuer);
|
||||
let data;
|
||||
if (url.pathname === '/.well-known/openid-configuration') {
|
||||
data = {issuer, authorization_endpoint:issuer+'/authorize', token_endpoint:issuer+'/token', jwks_uri:issuer+'/jwks', response_types_supported:['code'], subject_types_supported:['public'], id_token_signing_alg_values_supported:['RS256'], token_endpoint_auth_methods_supported:['client_secret_basic'], scopes_supported:['openid','email','profile'], claims_supported:['sub','email','email_verified','name','groups']};
|
||||
} else if (url.pathname === '/jwks') data = {keys:[jwk]};
|
||||
else if (url.pathname === '/authorize') {
|
||||
const code = randomUUID(); codes.set(code, {...claims, nonce:url.searchParams.get('nonce'), challenge:url.searchParams.get('code_challenge')});
|
||||
const target = new URL(url.searchParams.get('redirect_uri'));
|
||||
target.searchParams.set('code', code); target.searchParams.set('state', url.searchParams.get('state'));
|
||||
response.writeHead(302, {Location:target.toString()}); response.end(); return;
|
||||
} else if (url.pathname === '/token') {
|
||||
let body=''; for await (const chunk of request) body += chunk;
|
||||
const form = new URLSearchParams(body); const saved = codes.get(form.get('code')); codes.delete(form.get('code'));
|
||||
assert.ok(saved); assert.equal(createHash('sha256').update(form.get('code_verifier')).digest('base64url'), saved.challenge);
|
||||
const {challenge, ...identity} = saved;
|
||||
const payload = {iss:issuer, aud:'furumi-test', iat:Math.floor(Date.now()/1000), exp:Math.floor(Date.now()/1000)+300, email_verified:true, ...identity};
|
||||
const token = encode({alg:'RS256',kid:'test'})+'.'+encode(payload);
|
||||
data = {access_token:'test-access', token_type:'Bearer', expires_in:300, id_token:token+'.'+sign('RSA-SHA256',Buffer.from(token),privateKey).toString('base64url')};
|
||||
} else { response.writeHead(404); response.end(); return; }
|
||||
response.writeHead(200, {'Content-Type':'application/json'}); response.end(JSON.stringify(data));
|
||||
});
|
||||
(async () => {
|
||||
await new Promise(resolve => oidc.listen(18049,'127.0.0.1',resolve));
|
||||
const browser = await chromium.launch({headless:true, executablePath:process.env.CHROME_PATH || '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome'});
|
||||
const errors=[];
|
||||
try {
|
||||
const admin = await browser.newContext({viewport:{width:1440,height:1000}});
|
||||
let response = await admin.request.post(base+'/admin/setup', {form:{username:'access-admin',password:'access-test-password',confirm_password:'access-test-password'}});
|
||||
assert.ok(response.ok());
|
||||
response = await admin.request.post(base+'/login',{form:{username:'access-admin',password:'access-test-password'}}); assert.ok(response.ok());
|
||||
sql(`INSERT INTO furumusic__config_entry (key,value) VALUES ('auth_sso_enabled','true'),('oidc_issuer','${issuer}'),('oidc_client_id','furumi-test'),('oidc_client_secret','test-${randomUUID()}'),('oidc_admin_groups','admins'),('oidc_user_groups','listeners') ON CONFLICT (key) DO UPDATE SET value=EXCLUDED.value;`);
|
||||
sql("UPDATE furumusic__user SET local_role=NULL, sso_role=NULL, is_active=false WHERE username IN ('pending','automatic','root-new');");
|
||||
mkdirSync(mediaRoot,{recursive:true});
|
||||
const wav=Buffer.alloc(44+8000*2*10); wav.write('RIFF'); wav.writeUInt32LE(wav.length-8,4); wav.write('WAVEfmt ',8); wav.writeUInt32LE(16,16); wav.writeUInt16LE(1,20); wav.writeUInt16LE(1,22); wav.writeUInt32LE(8000,24); wav.writeUInt32LE(16000,28); wav.writeUInt16LE(2,32); wav.writeUInt16LE(16,34); wav.write('data',36); wav.writeUInt32LE(wav.length-44,40);
|
||||
writeFileSync(mediaRoot+'/shared-test.wav',wav);
|
||||
const cover=Buffer.from('iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mP8/x8AAwMCAO+aPioAAAAASUVORK5CYII=','base64'); writeFileSync(mediaRoot+'/cover.png',cover);
|
||||
sql(`INSERT INTO furumusic__media_file (id,file_type,file_path,original_filename,mime_type,file_size_bytes,sha256_hash,uploader_name,created_at) VALUES (9001,'audio','shared-test.wav','Shared test.wav','audio/wav',${wav.length},'${createHash('sha256').update(wav).digest('hex')}','Test','2026-11-18T00:00:00Z'),(9002,'cover_art','cover.png','cover.png','image/png',${cover.length},'${createHash('sha256').update(cover).digest('hex')}','Test','2026-11-18T00:00:00Z') ON CONFLICT (id) DO NOTHING;
|
||||
INSERT INTO furumusic__artist (id,name,name_sort,is_hidden,created_at,updated_at) VALUES (9001,'Test Artist','test artist',false,'2026-11-18T00:00:00Z','2026-11-18T00:00:00Z') ON CONFLICT (id) DO NOTHING;
|
||||
INSERT INTO furumusic__release (id,title,title_sort,release_type,is_hidden,cover_file_id,created_at,updated_at) VALUES (9001,'Shared Album','shared album','album',false,9002,'2026-11-18T00:00:00Z','2026-11-18T00:00:00Z') ON CONFLICT (id) DO NOTHING;
|
||||
INSERT INTO furumusic__track (id,title,title_sort,release_id,duration_seconds,audio_file_id,is_hidden,created_at,updated_at) VALUES (9001,'Shared Song','shared song',9001,10,9001,false,'2026-11-18T00:00:00Z','2026-11-18T00:00:00Z'),(9002,'Private Song','private song',9001,10,9001,false,'2026-11-18T00:00:00Z','2026-11-18T00:00:00Z') ON CONFLICT (id) DO NOTHING;
|
||||
INSERT INTO furumusic__track_artist (track_id,artist_id,role,position) SELECT id,9001,'main',0 FROM furumusic__track WHERE id IN (9001,9002) AND NOT EXISTS (SELECT 1 FROM furumusic__track_artist WHERE track_id=furumusic__track.id);`);
|
||||
response=await admin.request.post(base+'/api/player/shares',{data:{track_ids:[9001],title:'Shared Song'}}); assert.equal(response.status(),200); const share=await response.json();
|
||||
const guest=await browser.newContext({viewport:{width:1440,height:1000}});
|
||||
const page=await guest.newPage(); page.on('pageerror',e=>errors.push(e.message));
|
||||
const api=[]; page.on('request',r=>{if(r.url().includes('/api/'))api.push(new URL(r.url()).pathname);});
|
||||
await page.goto(base+share.url); await page.waitForSelector('.playlist-track-row');
|
||||
assert.equal(await page.locator('.playlist-track-row').count(),1);
|
||||
assert.equal(await page.getByRole('link',{name:'Sign in / register'}).count(),1);
|
||||
assert.equal(await page.locator('#search-input').isVisible(),false);
|
||||
assert.equal(await page.locator('.sidebar-left').count(),0);
|
||||
await page.locator('.player-btn-play').click(); await page.waitForFunction(()=>Alpine.store('player').currentTime>0);
|
||||
assert.equal(await page.locator('.device-picker').isVisible(),false);
|
||||
await page.locator('.playlist-track-row [aria-label="Track info"]').click();
|
||||
assert.equal(await page.getByRole('button',{name:'Start radio',exact:true}).count(),0);
|
||||
assert.equal(await page.getByRole('button',{name:'Find similar',exact:true}).count(),0);
|
||||
const downloading=page.waitForEvent('download'); await page.getByRole('button',{name:'Download',exact:true}).click(); const download=await downloading;
|
||||
assert.equal(download.suggestedFilename(),'Shared test.wav'); await download.saveAs('/tmp/furumi-access-download.wav');
|
||||
await page.locator('.modal-overlay [title="Close"]').click(); await page.screenshot({path:'/tmp/furumi-guest-desktop.png',fullPage:true});
|
||||
assert.ok(api.every(path=>path.startsWith('/api/player/shares/')),JSON.stringify(api));
|
||||
for (const action of ['stream','download','cover']) {
|
||||
assert.equal((await guest.request.get(`${base}/api/player/shares/${share.token}/${action}/9002`)).status(),404);
|
||||
assert.equal((await guest.request.get(`${base}/api/player/shares/${'0'.repeat(32)}/${action}/9001`)).status(),404);
|
||||
}
|
||||
assert.equal((await guest.request.get(`${base}/api/player/stream/9001`)).status(),401);
|
||||
assert.equal((await guest.request.get(`${base}/api/player/artists`)).status(),401);
|
||||
response=await guest.request.get(`${base}/api/player/shares/${share.token}/stream/9001`,{headers:{Range:'bytes=0-43'}}); assert.equal(response.status(),206); assert.equal((await response.body()).length,44);
|
||||
assert.equal((await guest.request.get(`${base}/api/player/shares/${share.token}/stream/9001`,{headers:{Range:'bytes=999999999-'}})).status(),416);
|
||||
assert.equal((await guest.request.get(`${base}/api/player/shares/${share.token}/cover/9001`)).status(),200);
|
||||
assert.equal((await guest.request.post(`${base}/api/player/shares`,{data:{track_ids:[9001]}})).status(),401);
|
||||
await page.getByRole('link',{name:'Sign in / register'}).click(); await page.locator('.sso-btn').click();
|
||||
await page.waitForURL(base+share.url); await page.getByText('Awaiting approval',{exact:true}).waitFor(); await page.waitForSelector('.playlist-track-row');
|
||||
assert.equal(await page.locator('.playlist-track-row').count(),1);
|
||||
const pendingId=Number(sql("SELECT id FROM furumusic__user WHERE username='pending'")); assert.ok(pendingId);
|
||||
await page.goto(base+'/'); await page.getByRole('heading',{name:'Awaiting approval'}).waitFor();
|
||||
assert.equal(await page.locator('.app-layout').count(),0);
|
||||
assert.equal((await guest.request.get(`${base}/api/player/artists`)).status(),401);
|
||||
assert.equal((await guest.request.post(`${base}/admin/v2/api/users/manage`,{data:{action:'approve',id:pendingId,role:'admin'}})).status(),401);
|
||||
const adminPage=await admin.newPage(); adminPage.on('pageerror',e=>errors.push(e.message));
|
||||
await adminPage.goto(base+'/admin/#users');
|
||||
const pendingRow=adminPage.locator('.users-table tr').filter({hasText:'Pending Listener'});
|
||||
await pendingRow.getByRole('button',{name:'Approve as user',exact:true}).click();
|
||||
await page.waitForSelector('.app-layout',{timeout:15000});
|
||||
assert.equal((await guest.request.get(`${base}/api/player/artists`)).status(),200);
|
||||
assert.equal(sql(`SELECT local_role || ':' || role FROM furumusic__user WHERE id=${pendingId}`),'user:user');
|
||||
// Priority: a user SSO group overrides even a local admin grant; losing
|
||||
// that group restores the separate local grant.
|
||||
response=await admin.request.post(base+'/admin/v2/api/users/manage',{data:{action:'approve',id:pendingId,role:'admin'}}); assert.equal(response.status(),200);
|
||||
claims.groups=['listeners']; await page.goto(base+'/logout'); await page.locator('.sso-btn').click(); await page.waitForURL(base+'/');
|
||||
assert.equal(sql(`SELECT local_role || ':' || role FROM furumusic__user WHERE id=${pendingId}`),'admin:user');
|
||||
claims.groups=[]; await page.goto(base+'/logout'); await page.locator('.sso-btn').click(); await page.waitForURL(base+'/');
|
||||
assert.equal(sql(`SELECT local_role || ':' || role FROM furumusic__user WHERE id=${pendingId}`),'admin:admin');
|
||||
claims={sub:'automatic-test',email:'automatic@example.test',name:'Automatic Listener',groups:['admins']};
|
||||
await page.goto(base+'/logout'); await page.locator('.sso-btn').click(); await page.waitForURL(base+'/');
|
||||
assert.equal(sql("SELECT COALESCE(local_role,'none') || ':' || role FROM furumusic__user WHERE username='automatic'"),'none:admin');
|
||||
const automaticId=Number(sql("SELECT id FROM furumusic__user WHERE username='automatic'"));
|
||||
response=await admin.request.post(base+'/admin/v2/api/users/manage',{data:{action:'update',id:automaticId,username:'automatic',display_name:'Renamed Automatic Listener',email:'automatic@example.test',role:''}});
|
||||
assert.equal(response.status(),200);
|
||||
assert.equal(sql("SELECT COALESCE(local_role,'none') || ':' || role FROM furumusic__user WHERE username='automatic'"),'none:admin');
|
||||
claims.groups=[]; await page.goto(base+'/logout'); await page.locator('.sso-btn').click(); await page.getByRole('heading',{name:'Awaiting approval'}).waitFor();
|
||||
assert.equal(sql("SELECT is_active FROM furumusic__user WHERE username='automatic'"),'f');
|
||||
// A completely new identity arriving at the root never sees a demo player.
|
||||
claims={sub:'new-root-test',email:'root-new@example.test',name:'New Root Listener',groups:[]};
|
||||
await page.goto(base+'/logout'); await page.locator('.sso-btn').click(); await page.getByRole('heading',{name:'Awaiting approval'}).waitFor();
|
||||
assert.equal(await page.locator('.app-layout').count(),0);
|
||||
// Queue snapshots preserve order and repeated tracks.
|
||||
response=await admin.request.post(base+'/api/player/shares',{data:{track_ids:[9002,9001,9002],title:'Shared queue'}}); const queue=await response.json();
|
||||
response=await guest.request.get(base+'/api/player/shares/'+queue.token); assert.deepEqual((await response.json()).tracks.map(t=>t.id),[9002,9001,9002]);
|
||||
const mobile=await browser.newContext({viewport:{width:390,height:844},isMobile:true,hasTouch:true}); const mobilePage=await mobile.newPage(); mobilePage.on('pageerror',e=>errors.push(e.message));
|
||||
await mobilePage.goto(base+queue.url); await mobilePage.waitForSelector('.playlist-track-row');
|
||||
assert.equal(await mobilePage.getByRole('link',{name:'Sign in / register'}).isVisible(),true);
|
||||
const info=mobilePage.locator('.playlist-track-row [aria-label="Track info"]').first();
|
||||
const bounds=await info.boundingBox(); assert.ok(bounds && bounds.x>=0 && bounds.x+bounds.width<=390,JSON.stringify(bounds));
|
||||
await info.click(); await mobilePage.getByRole('button',{name:'Download',exact:true}).waitFor();
|
||||
await mobilePage.locator('.modal-overlay [title="Close"]').click();
|
||||
await mobilePage.screenshot({path:'/tmp/furumi-guest-mobile.png',fullPage:true});
|
||||
for (const old of ['/share/track/9001','/share/release/9001','/share/playlist/abc','/api/player/radio/track/9001','/api/player/share-playlist']) assert.equal((await guest.request.get(base+old)).status(),404);
|
||||
assert.deepEqual(errors,[]);
|
||||
console.log('PASS: OIDC approval, live activation, SSO precedence and removal, anonymous playback/download/cover, scope enforcement, queue snapshots, desktop and mobile, removal of legacy routes.');
|
||||
} finally { await browser.close(); await new Promise(resolve=>oidc.close(resolve)); }
|
||||
})().catch(error=>{console.error(error);process.exitCode=1;});
|
||||
@@ -0,0 +1,164 @@
|
||||
// Run against a disposable local instance with at least one admin and one release.
|
||||
// Existing data is read only; long-content fixtures are injected into browser state.
|
||||
// FURU_TEST_URL, FURU_TEST_USERNAME, FURU_TEST_PASSWORD, PLAYWRIGHT_MODULE,
|
||||
// CHROME_PATH and FURU_TEST_SCREENSHOTS configure the runner.
|
||||
const assert = require('node:assert/strict');
|
||||
const {chromium} = require(process.env.PLAYWRIGHT_MODULE || 'playwright');
|
||||
const {mkdirSync} = require('node:fs');
|
||||
const base = process.env.FURU_TEST_URL || 'http://127.0.0.1:18048';
|
||||
(async () => {
|
||||
const browser = await chromium.launch({headless:true, executablePath:process.env.CHROME_PATH});
|
||||
try {
|
||||
const context = await browser.newContext({viewport:{width:390,height:844}, reducedMotion:'reduce'});
|
||||
const response = await context.request.post(base+'/login', {form:{username:process.env.FURU_TEST_USERNAME || 'access-admin', password:process.env.FURU_TEST_PASSWORD || 'access-test-password'}});
|
||||
assert.ok(response.ok());
|
||||
const page = await context.newPage();
|
||||
const errors = []; page.on('pageerror', error => errors.push(error.message));
|
||||
await page.goto(base+'/admin/v2');
|
||||
await page.waitForFunction(() => window.Alpine && document.querySelector('.admin-shell')._x_dataStack);
|
||||
const state = (fn, arg) => page.evaluate(({code,arg}) => Function('app','arg',`return (${code})(app,arg)`)(Alpine.$data(document.querySelector('.admin-shell')), arg), {code:fn.toString(),arg});
|
||||
await state(async app => { clearInterval(app.poller); await app.refreshAll(); });
|
||||
const screenshot = async name => {
|
||||
if (!process.env.FURU_TEST_SCREENSHOTS) return;
|
||||
mkdirSync(process.env.FURU_TEST_SCREENSHOTS, {recursive:true});
|
||||
await page.screenshot({path:process.env.FURU_TEST_SCREENSHOTS+'/'+name+'.png'});
|
||||
};
|
||||
async function fits(label) {
|
||||
const overflow = await page.evaluate(() => [...document.querySelectorAll('html, body, main, .content, .panel, .modal, .modal-body')]
|
||||
.filter(el => el.getClientRects().length && el.scrollWidth > el.clientWidth + 2)
|
||||
.map(el => `${el.tagName}.${el.className}: ${el.scrollWidth} > ${el.clientWidth}`));
|
||||
assert.deepEqual(overflow, [], label);
|
||||
}
|
||||
async function settle() { await page.waitForTimeout(200); }
|
||||
async function navigate(view) {
|
||||
if (await page.locator('.menu-toggle').isVisible()) await page.locator('.menu-toggle').click();
|
||||
await page.locator('.nav-btn').filter({hasText:{reviews:'Review Queue',jobs:'Tasks',library:'Library Workbench',tools:'Library Tools',statistics:'Statistics',users:'Users',settings:'Settings'}[view]}).click();
|
||||
await page.waitForFunction(v => Alpine.$data(document.querySelector('.admin-shell')).activeView === v, view);
|
||||
await settle();
|
||||
assert.equal(await page.locator('main').evaluate(el => el.inert), false);
|
||||
}
|
||||
// Navigate through the actual menu, testing both permanent and drawer modes.
|
||||
for (const width of [320,390,768,1024,1440]) {
|
||||
await page.setViewportSize({width,height:844}); await settle();
|
||||
for (const view of ['reviews','jobs','library','tools','statistics','users','settings']) {
|
||||
await navigate(view); await fits(`${width}: ${view}`);
|
||||
if (width === 390 || width === 1440) await screenshot(`${width}-${view}`);
|
||||
}
|
||||
}
|
||||
await page.setViewportSize({width:390,height:844}); await settle();
|
||||
await page.locator('.menu-toggle').click(); await settle();
|
||||
assert.equal(await page.locator('main').evaluate(el => el.inert), true);
|
||||
await screenshot('390-navigation');
|
||||
await page.keyboard.press('Shift+Tab');
|
||||
assert.equal(await page.evaluate(() => document.activeElement.classList.contains('nav-player')), true);
|
||||
await page.keyboard.press('Tab');
|
||||
assert.equal(await page.evaluate(() => document.activeElement.hasAttribute('data-dialog-close')), true);
|
||||
await page.keyboard.press('Escape'); await settle();
|
||||
assert.equal(await page.evaluate(() => document.activeElement.classList.contains('menu-toggle')), true);
|
||||
await page.locator('.menu-toggle').click(); await page.setViewportSize({width:1440,height:844}); await settle();
|
||||
assert.equal(await page.locator('main').evaluate(el => el.inert), false);
|
||||
assert.equal(await page.locator('.sidebar').evaluate(el => el.inert), false);
|
||||
await page.setViewportSize({width:390,height:844}); await settle();
|
||||
await navigate('jobs');
|
||||
await page.locator('#task-pane-list tbody tr').first().click(); await settle();
|
||||
assert.equal(await page.locator('#task-pane-list').isVisible(), false);
|
||||
assert.equal(await page.locator('#task-pane-details').isVisible(), true);
|
||||
await page.getByRole('button', {name:'Edit schedule',exact:true}).click();
|
||||
await page.getByRole('textbox', {name:'Cron schedule'}).fill('0 15 * * * *');
|
||||
await page.locator('#task-tab-logs').click();
|
||||
await page.keyboard.press('ArrowLeft');
|
||||
assert.equal(await page.getByRole('textbox', {name:'Cron schedule'}).inputValue(), '0 15 * * * *');
|
||||
await fits('task editor');
|
||||
await navigate('settings');
|
||||
await page.locator('.section-jump select').selectOption('federation'); await settle();
|
||||
assert.equal(await page.evaluate(() => document.activeElement.id), 'settings-federation');
|
||||
await page.getByRole('button',{name:'Save settings',exact:true}).scrollIntoViewIfNeeded();
|
||||
await fits('settings footer');
|
||||
// Shared dialog lifecycle: trap focus, lock background, retain close affordance,
|
||||
// scroll long content and restore focus to its trigger.
|
||||
async function checkDialog(name) {
|
||||
const dialog = page.locator('.modal:visible'); await dialog.waitFor(); await settle();
|
||||
assert.equal(await page.locator('main').evaluate(el => el.inert), true);
|
||||
await fits(name);
|
||||
assert.ok((await dialog.locator('.modal-body').innerText()).trim().length > 0, name+' body populated');
|
||||
const box = await dialog.boundingBox();
|
||||
if (page.viewportSize().width < 768) assert.ok(Math.abs(box.height-page.viewportSize().height)<2, name+' full height');
|
||||
await dialog.focus(); await page.keyboard.press('Shift+Tab');
|
||||
assert.equal(await dialog.evaluate(el => el.contains(document.activeElement)), true);
|
||||
await page.keyboard.press('Tab');
|
||||
assert.equal(await page.evaluate(() => document.activeElement.hasAttribute('data-dialog-close')), true);
|
||||
await screenshot(name);
|
||||
await dialog.locator('.modal-body').evaluate(el => { el.scrollTop=el.scrollHeight; });
|
||||
await fits(name+' bottom');
|
||||
const close = await dialog.locator('[data-dialog-close]').boundingBox();
|
||||
assert.ok(close.y >= 0 && close.y+close.height <= page.viewportSize().height, name+' close reachable');
|
||||
const footer = dialog.locator('.dialog-actions:visible');
|
||||
if (await footer.count()) {
|
||||
const bottom = await footer.boundingBox();
|
||||
assert.ok(bottom.y >= -1 && bottom.y+bottom.height <= page.viewportSize().height+1, name+' actions reachable');
|
||||
}
|
||||
await page.keyboard.press('Escape'); await settle();
|
||||
assert.equal(await page.locator('.modal:visible').count(),0);
|
||||
assert.equal(await page.locator('main').evaluate(el => el.inert),false);
|
||||
}
|
||||
await navigate('users');
|
||||
await page.getByRole('button',{name:'Add user',exact:true}).click();
|
||||
await checkDialog('390-add-user');
|
||||
assert.equal(await page.evaluate(() => document.activeElement.textContent.trim()), 'Add user');
|
||||
await page.locator('.users-table tbody tr').first().click();
|
||||
await checkDialog('390-user-profile');
|
||||
const review = {id:987654,status:'pending',review_type:'metadata',filename:'Very long track title '.repeat(8),display_path:'/inbox/'+'album/'.repeat(20),tags:[],normalized:{title:'Long song title',artist:'Test artist',notes:'Notes\n'.repeat(40)}};
|
||||
await navigate('reviews');
|
||||
await state((app,row) => {app.reviews.items=[row]; app.reviews.total=1; app.openReview(row);}, review);
|
||||
await checkDialog('390-review');
|
||||
await fits('populated reviews');
|
||||
await navigate('library');
|
||||
await state(async app => {app.libraryKind='releases'; await app.loadLibrary(); app.openEditor(app.library.items[0]);});
|
||||
await page.waitForFunction(() => !Alpine.$data(document.querySelector('.admin-shell')).editorLoading);
|
||||
await state(app => {app.editorDraft.release_tracks = Array.from({length:12}, (_,i)=>({...app.editorDraft.release_tracks[0],id:700000+i,title:'Very long track title '.repeat(8),disc_number:1,track_number:i+1}));});
|
||||
await page.locator('.modal:visible input[x-model="editorDraft.title"]').waitFor({state:'visible'});
|
||||
assert.equal(await page.locator('.modal:visible .release-track-row:visible').count(),12);
|
||||
await checkDialog('390-release-editor');
|
||||
await state(app => {
|
||||
const detail = app.editorDetail;
|
||||
app.mergeDetails=[detail,{...detail,item:{...detail.item,id:700001},title:'Second release'}];
|
||||
app.mergeDraft={release_ids:[detail.item.id,700001],target_release_id:detail.item.id,title:detail.title,release_type:'album',hidden:'false',year:'2026',artist_ids:[],cover_file_id:null,tracks:app.editorDraft.release_tracks};
|
||||
app.mergeOpen=true;
|
||||
});
|
||||
await checkDialog('390-merge');
|
||||
// Short landscape viewport and desktop dialog geometry use the same contract.
|
||||
for (const viewport of [{width:320,height:568},{width:844,height:390},{width:1440,height:900}]) {
|
||||
await page.setViewportSize(viewport); await settle();
|
||||
await state((app,row)=>app.openReview(row),review);
|
||||
await checkDialog(`${viewport.width}-review`);
|
||||
}
|
||||
await page.setViewportSize({width:320,height:700}); await settle();
|
||||
await navigate('statistics');
|
||||
await state(async app => {
|
||||
await app.loadStatistics();
|
||||
app.statisticsData.ranking.items=[{key:'fixture',label:'Very long artist name '.repeat(12),detail:'long_identifier_'.repeat(20),plays:42,listeners:10,listened_seconds:10000,last_play_ms:Date.now()}];
|
||||
app.statisticsData.history.items=[{user_id:1,listen_id:'fixture',user_name:'Listener '.repeat(12),title:'Long song name '.repeat(12),content_id:'fixture',artist_names:['Artist '.repeat(20)],release_title:'Album '.repeat(20),started_at_ms:Date.now(),listened_ms:60000,track_duration_ms:90000,qualified:true,ended_reason:'ended',device_name:'LongDeviceName'.repeat(20),source:'instance'}];
|
||||
});
|
||||
await settle(); await fits('320 populated statistics');
|
||||
await navigate('tools');
|
||||
await state(app => {
|
||||
app.repairExpanded={snapshot:{artists:[{id:1,name:'Artist'}],releases:[{id:2,title:'Album',year:2026,release_type:'album',artist_ids:[1]}],tracks:[]}};
|
||||
app.repairPlan={artists:[],releases:[{id:2,title:'Album '.repeat(30),year:2026,release_type:'album',artist_ids:[1]}],tracks:[],questions:[],delete:{artists:[],releases:[],tracks:[]}};
|
||||
app.repairPlanOpen=true;
|
||||
});
|
||||
await page.locator('.repair-manual summary').click(); await settle();
|
||||
await fits('320 manual metadata comparison');
|
||||
const comparison=page.locator('.repair-manual');
|
||||
assert.ok(await comparison.evaluate(el=>el.scrollWidth>el.clientWidth), 'wide comparison scrolls within its own region');
|
||||
await screenshot('320-manual-comparison');
|
||||
await navigate('users');
|
||||
await page.locator('.users-table tbody tr').first().click();
|
||||
await page.getByRole('button',{name:'Edit user',exact:true}).click();
|
||||
await checkDialog('320-edit-user');
|
||||
await page.locator('.menu-toggle').click();
|
||||
await page.goBack(); await settle();
|
||||
assert.equal(await page.locator('main').evaluate(el=>el.inert),false, 'browser Back closes navigation');
|
||||
assert.deepEqual(errors, []);
|
||||
console.log('PASS: 7 sections × 5 widths; drawer, task tabs, settings jump and all 5 dialogs, keyboard and long content.');
|
||||
} finally { await browser.close(); }
|
||||
})().catch(error => {console.error(error); process.exitCode=1;});
|
||||
@@ -0,0 +1,181 @@
|
||||
// Run against a fresh disposable instance with tests/metadata_repair_fixture.sql.
|
||||
// FURU_REPAIR_TEST_PG must name its disposable PostgreSQL container.
|
||||
const {chromium}=require(process.env.PLAYWRIGHT_MODULE || 'playwright');
|
||||
const assert=require('node:assert/strict');
|
||||
const {readFileSync}=require('node:fs');
|
||||
const {spawnSync}=require('node:child_process');
|
||||
const base=process.env.FURU_TEST_URL || 'http://127.0.0.1:3029';
|
||||
const container=process.env.FURU_REPAIR_TEST_PG || 'furumi-repair-test-pg';
|
||||
function sql(statement) {
|
||||
const result=spawnSync('docker',['exec','-i',container,'psql','-U','postgres','-d','furumi_repair_test','-At','-v','ON_ERROR_STOP=1'],{input:statement,encoding:'utf8'});
|
||||
assert.equal(result.status,0,result.stderr);
|
||||
return result.stdout.trim();
|
||||
}
|
||||
const emptyPlan=()=>({artists:[],releases:[],tracks:[],questions:[],delete:{artists:[],releases:[],tracks:[]}});
|
||||
(async()=>{
|
||||
const browser=await chromium.launch({headless:true,executablePath:process.env.CHROME_PATH || '/run/current-system/sw/bin/chromium',args:['--no-sandbox']});
|
||||
try {
|
||||
const context=await browser.newContext({viewport:{width:1440,height:1000}});
|
||||
if (process.env.FURU_TEST_ASSETS) {
|
||||
for (const [url,file] of [['alpinejs@3/dist/cdn.min.js','alpine.js'],['lucide@latest/dist/umd/lucide.min.js','lucide.js']]) {
|
||||
await context.route('https://cdn.jsdelivr.net/npm/'+url,route=>route.fulfill({path:process.env.FURU_TEST_ASSETS+'/'+file}));
|
||||
}
|
||||
}
|
||||
const api=context.request;
|
||||
assert.equal((await api.post(base+'/admin/v2/api/metadata-fix/apply',{data:{snapshot:{},plan:{},instruction:'test'}})).status()>=400,true);
|
||||
const page=await context.newPage(); const errors=[]; page.on('pageerror',error=>errors.push(error.message));
|
||||
await page.goto(base+'/admin/setup');
|
||||
if (page.url().includes('/admin/setup')) {
|
||||
await page.locator('[name=username]').fill('repair_admin');
|
||||
await page.locator('[name=password]').fill('repair-test-password');
|
||||
await page.locator('[name=confirm_password]').fill('repair-test-password');
|
||||
await page.locator('button[type=submit]').click();
|
||||
await page.waitForURL('**/admin/v2');
|
||||
} else {
|
||||
await page.goto(base+'/login');
|
||||
await page.locator('[name=username]').fill('repair_admin');
|
||||
await page.locator('[name=password]').fill('repair-test-password');
|
||||
await page.locator('button[type=submit]').click();
|
||||
await page.waitForURL(base+'/');
|
||||
await page.goto(base+'/admin/v2');
|
||||
}
|
||||
if (!process.env.FURU_REPAIR_SKIP_SEED) sql(readFileSync(__dirname+'/metadata_repair_fixture.sql','utf8'));
|
||||
const post=async(path,data,status=200)=>{
|
||||
const response=await api.post(base+'/admin/v2/api/metadata-fix/'+path,{data,timeout:240000});
|
||||
assert.equal(response.status(),status,await response.text());
|
||||
return response.json();
|
||||
};
|
||||
const expanded=await post('expand',{selection:{artists:[2719],releases:[],tracks:[]}});
|
||||
const before=expanded.snapshot;
|
||||
assert.equal(before.releases.length,4); assert.equal(before.tracks.length,10);
|
||||
// Reproduce the reported request using ONLY the four release checkboxes.
|
||||
if (process.env.FURU_REPAIR_TEST_MODEL) {
|
||||
const selection={artists:[],releases:before.releases.map(r=>r.id),tracks:[]};
|
||||
const instruction=`релизы #ИЗИРОК на самом деле один релиз типа компиляция 2021 года. тебе нужно сделать план по объединению в один релиз. вот полный треклист по порядку 01. Старик и братья
|
||||
02. Потрошитель
|
||||
03. Последняя песня
|
||||
04. Песня для твоей подруги
|
||||
05. Просто я сегодня... (feat. Перегаз)
|
||||
06. Отзвуки тьмы
|
||||
07. Битва за Москву
|
||||
08. Настроение лето
|
||||
09. Пробил час
|
||||
10. Цусима`;
|
||||
const proposed=await post('plan',{selection,instruction});
|
||||
assert.equal(proposed.snapshot.artists.length,0);
|
||||
assert.equal(proposed.snapshot.tracks.length,10);
|
||||
assert.deepEqual(proposed.plan.artists,[]);
|
||||
assert.deepEqual(proposed.plan.delete.artists,[]);
|
||||
assert.deepEqual(proposed.plan.delete.tracks,[]);
|
||||
const destination=proposed.plan.releases.find(r=>r.release_type==='compilation' && r.year===2021);
|
||||
assert.ok(destination,JSON.stringify(proposed.plan));
|
||||
const target=destination.id ? 'existing:'+destination.id : 'new:'+destination.key;
|
||||
for (const [index,track] of before.tracks.entries()) {
|
||||
const edit=proposed.plan.tracks.find(t=>t.id===track.id);
|
||||
assert.equal(edit?.target_release || 'existing:'+track.release_id,target);
|
||||
assert.equal(edit?.track_number ?? track.track_number,index+1);
|
||||
assert.deepEqual(edit?.artist_ids || [2719],[2719]);
|
||||
}
|
||||
const result=await post('apply',{snapshot:proposed.snapshot,plan:proposed.plan,instruction});
|
||||
assert.equal(sql('SELECT count(*) FROM furumusic__track'),'10');
|
||||
assert.equal(sql('SELECT count(*) FROM furumusic__release'),'1');
|
||||
assert.equal(sql('SELECT name FROM furumusic__artist'),'Radio Tapok');
|
||||
await post('undo',{history_id:result.history_id});
|
||||
assert.deepEqual((await post('expand',{selection:expanded.selection})).snapshot,before);
|
||||
const excluded=await post('plan',{selection,excluded_track_ids:[33683],instruction:'Ничего не меняй. Верни пустой план.'});
|
||||
assert.equal(excluded.snapshot.tracks.length,9);
|
||||
assert.equal(excluded.snapshot.tracks.some(t=>t.id===33683),false);
|
||||
assert.deepEqual(excluded.plan.tracks,[]);
|
||||
const recovered=await post('plan',{selection,instruction:'__TEST_INVALID_ARTIST__ Объедини четыре релиза в компиляцию 2021 года.'});
|
||||
assert.deepEqual(recovered.plan.artists,[]);
|
||||
assert.equal(recovered.plan.releases[0].year,2021);
|
||||
console.log('Release-only scope, exact ordered tracklist, model correction and exclusions passed.');
|
||||
}
|
||||
const artistIds=track=>before.track_artists.filter(link=>link.owner_id===track.id).map(link=>link.artist_id);
|
||||
const merge={...emptyPlan(),releases:[{id:null,key:'collection',title:'#ИЗИРОК Сборник',release_type:'compilation',year:2021,artist_ids:[2719]}],tracks:before.tracks.map(track=>({id:track.id,title:track.title,target_release:'new:collection',track_number:track.track_number,disc_number:track.disc_number,year:track.year,artist_ids:artistIds(track)})),delete:{artists:[],releases:before.releases.map(release=>release.id),tracks:[]}};
|
||||
await page.getByRole('button',{name:'Library Tools',exact:true}).click();
|
||||
const tools=page.locator('.content').filter({has:page.getByText('Metadata assistant',{exact:true})});
|
||||
await tools.locator('select').first().selectOption('artists');
|
||||
await tools.getByPlaceholder('Search library…').fill('Radio Tapok');
|
||||
await tools.locator('.repair-search-results button').first().click();
|
||||
await tools.getByRole('button',{name:'Show related',exact:true}).click();
|
||||
await page.waitForFunction(()=>Alpine.$data(document.querySelector('.admin-shell')).repairRowsCount()===15);
|
||||
await tools.getByRole('button',{name:'Deselect all',exact:true}).click();
|
||||
assert.equal(await tools.locator('.repair-entity input:checked').count(),0);
|
||||
assert.equal(await tools.locator('.repair-entity input[type=checkbox]').count(),15);
|
||||
for (const release of before.releases) {
|
||||
await tools.getByRole('checkbox',{name:new RegExp('^#ИЗИРОК #' + release.id + ' ')}).check();
|
||||
}
|
||||
assert.equal(await tools.locator('.repair-entity input:checked').count(),14);
|
||||
assert.equal(await tools.getByRole('checkbox',{name:'Radio Tapok #2719',exact:true}).isChecked(),false);
|
||||
let calls=0;
|
||||
await page.route('**/metadata-fix/plan',async route=>{
|
||||
const body=route.request().postDataJSON(); calls++;
|
||||
assert.deepEqual(body.selection,{...expanded.selection,artists:[]});
|
||||
if (calls===1) await route.fulfill({json:{snapshot:before,plan:merge,message:'Объединю все 10 треков в сборник 2021 года.'}});
|
||||
else {
|
||||
assert.equal(body.current_plan.releases[0].year,2021);
|
||||
assert.equal(body.conversation.length,2);
|
||||
await route.fulfill({json:{snapshot:before,plan:{...merge,releases:[{...merge.releases[0],year:2022}]},message:'Год сборника изменён на 2022.'}});
|
||||
}
|
||||
});
|
||||
const composer=tools.getByRole('textbox',{name:'Message to metadata assistant'});
|
||||
await composer.fill('Объедини #ИЗИРОК в #ИЗИРОК Сборник, год 2021');
|
||||
await tools.getByRole('button',{name:'Send',exact:true}).click();
|
||||
await tools.getByText('Объединю все 10 треков в сборник 2021 года.',{exact:true}).waitFor();
|
||||
const plan=tools.locator('details.repair-plan');
|
||||
assert.equal(await plan.getAttribute('open'),null);
|
||||
await plan.locator(':scope > summary').click();
|
||||
await plan.getByText('Edit fields manually',{exact:true}).click();
|
||||
assert.equal(await plan.locator('.repair-diff').nth(1).locator('input[type=number]').inputValue(),'2021');
|
||||
await composer.fill('Сделай год 2022');
|
||||
await tools.getByRole('button',{name:'Send',exact:true}).click();
|
||||
await tools.getByText('Год сборника изменён на 2022.',{exact:true}).waitFor();
|
||||
assert.equal(await tools.locator('details.repair-plan').count(),1);
|
||||
assert.equal(await plan.locator('.repair-diff').nth(1).locator('input[type=number]').inputValue(),'2022');
|
||||
await plan.getByText('Edit fields manually',{exact:true}).click();
|
||||
await plan.locator(':scope > summary').scrollIntoViewIfNeeded();
|
||||
await page.screenshot({path:'/tmp/furumi-repair-desktop.png'});
|
||||
await page.setViewportSize({width:390,height:844});
|
||||
assert.equal(await page.evaluate(()=>document.documentElement.scrollWidth<=innerWidth),true);
|
||||
await page.screenshot({path:'/tmp/furumi-repair-mobile.png'});
|
||||
await page.setViewportSize({width:1440,height:1000});
|
||||
// Apply the 2021 plan against the original snapshot, then undo it.
|
||||
const applied=await post('apply',{snapshot:before,plan:merge,instruction:'Merge #ИЗИРОК'});
|
||||
assert.equal(sql("SELECT title || '|' || year || '|' || total_tracks FROM furumusic__release"),'#ИЗИРОК Сборник|2021|10');
|
||||
assert.equal(sql('SELECT count(*) FROM furumusic__track'),'10');
|
||||
assert.equal(sql('SELECT count(*) FROM furumusic__media_file'),'10');
|
||||
assert.equal(sql('SELECT count(*) FROM furumusic__playlist_track'),'2');
|
||||
await post('undo',{history_id:applied.history_id});
|
||||
assert.deepEqual((await post('expand',{selection:expanded.selection})).snapshot,before);
|
||||
const deletion={...emptyPlan(),delete:{artists:[],releases:[],tracks:[33683,33684]}};
|
||||
const removed=await post('apply',{snapshot:before,plan:deletion,instruction:'Delete two tracks'});
|
||||
assert.equal(sql('SELECT count(*) FROM furumusic__track'),'8');
|
||||
assert.equal(sql('SELECT count(*) FROM furumusic__playlist_track'),'0');
|
||||
assert.equal(sql('SELECT count(*) FROM furumusic__track_ref WHERE local_track_id IS NULL'),'2');
|
||||
assert.equal(sql('SELECT queue_json FROM furumusic__playback_state'),'[33685]');
|
||||
await post('undo',{history_id:removed.history_id});
|
||||
assert.equal(sql('SELECT count(*) FROM furumusic__playlist_track'),'2');
|
||||
assert.equal(sql('SELECT local_track_id FROM furumusic__track_ref ORDER BY content_id'),'33683\n33684');
|
||||
assert.equal(sql('SELECT current_track_id || \'|\' || position_ms || \'|\' || queue_json FROM furumusic__playback_state'),'33683|1234|[33683,33684,33685]');
|
||||
assert.deepEqual((await post('expand',{selection:expanded.selection})).snapshot,before);
|
||||
const artistRemoval=await post('apply',{snapshot:before,plan:{...emptyPlan(),delete:{artists:[2719],releases:[],tracks:[]}},instruction:'Delete artist'});
|
||||
assert.equal(sql('SELECT count(*) FROM furumusic__artist'),'0');
|
||||
assert.equal(sql('SELECT count(*) FROM furumusic__track'),'10');
|
||||
assert.equal(sql('SELECT count(*) FROM furumusic__track_artist'),'0');
|
||||
await post('undo',{history_id:artistRemoval.history_id});
|
||||
assert.deepEqual((await post('expand',{selection:expanded.selection})).snapshot,before);
|
||||
const invalid={...emptyPlan(),delete:{artists:[],releases:[4256],tracks:[]}};
|
||||
await post('apply',{snapshot:before,plan:invalid,instruction:'Invalid deletion'},400);
|
||||
// A changed detached reference must block undo atomically.
|
||||
const conflict=await post('apply',{snapshot:before,plan:deletion,instruction:'Delete before playback changes'});
|
||||
sql("UPDATE furumusic__playback_state SET position_ms=9876");
|
||||
await post('undo',{history_id:conflict.history_id},409);
|
||||
assert.equal(sql('SELECT count(*) FROM furumusic__track'),'8');
|
||||
sql('UPDATE furumusic__playback_state SET position_ms=0');
|
||||
await post('undo',{history_id:conflict.history_id});
|
||||
assert.equal(sql('SELECT count(*) FROM furumusic__track'),'10');
|
||||
assert.deepEqual(errors,[]);
|
||||
console.log('Metadata Repair browser, merge, deletion, undo and conflict checks passed.');
|
||||
} finally { await browser.close(); }
|
||||
})().catch(error=>{console.error(error);process.exit(1);});
|
||||
@@ -0,0 +1,45 @@
|
||||
INSERT INTO furumusic__artist (id,name,is_hidden,name_sort,model_name,updated_at,created_at) VALUES (2719,'Radio Tapok',false,'radio tapok','unsloth/Qwen3.6-35B-A3B-GGUF:UD-Q6_K','2026-11-15T23:13:56Z','2026-01-01T00:00:00Z');
|
||||
INSERT INTO furumusic__release (id,year,title,is_hidden,model_name,title_sort,updated_at,total_discs,release_type,total_tracks,cover_file_id,created_at) VALUES (4256,2018,'#ИЗИРОК',false,'unsloth/Qwen3.6-35B-A3B-GGUF:UD-Q6_K','#изирок','2026-11-15T23:25:33Z',NULL,'album',NULL,NULL,'2026-01-01T00:00:00Z');
|
||||
INSERT INTO furumusic__release (id,year,title,is_hidden,model_name,title_sort,updated_at,total_discs,release_type,total_tracks,cover_file_id,created_at) VALUES (4257,2019,'#ИЗИРОК',false,'unsloth/Qwen3.6-35B-A3B-GGUF:UD-Q6_K','#изирок','2026-11-15T23:25:34Z',NULL,'album',NULL,NULL,'2026-01-01T00:00:00Z');
|
||||
INSERT INTO furumusic__release (id,year,title,is_hidden,model_name,title_sort,updated_at,total_discs,release_type,total_tracks,cover_file_id,created_at) VALUES (4258,2020,'#ИЗИРОК',false,'unsloth/Qwen3.6-35B-A3B-GGUF:UD-Q6_K','#изирок','2026-11-15T23:25:46Z',NULL,'ep',NULL,NULL,'2026-01-01T00:00:00Z');
|
||||
INSERT INTO furumusic__release (id,year,title,is_hidden,model_name,title_sort,updated_at,total_discs,release_type,total_tracks,cover_file_id,created_at) VALUES (4259,2021,'#ИЗИРОК',false,'unsloth/Qwen3.6-35B-A3B-GGUF:UD-Q6_K','#изирок','2026-11-15T23:25:47Z',NULL,'ep',NULL,NULL,'2026-01-01T00:00:00Z');
|
||||
INSERT INTO furumusic__media_file (id,file_type,file_path,original_filename,mime_type,file_size_bytes,sha256_hash,created_at) VALUES (33683,'audio','/tmp/test-33683.mp3','test.mp3','audio/mpeg',1,'0000000000000000000000000000000000000000000000000000000000033683','2026-01-01T00:00:00Z');
|
||||
INSERT INTO furumusic__track (id,year,title,is_hidden,model_name,release_id,title_sort,updated_at,disc_number,track_number,lastfm_rating,lastfm_listeners,lastfm_playcount,lastfm_checked_at,lastfm_updated_at,lastfm_lookup_title,lastfm_lookup_artist,duration_seconds,audio_file_id,cover_file_id,created_at) VALUES (33683,2018,'Старик и братья',false,'unsloth/Qwen3.6-35B-A3B-GGUF:UD-Q6_K',4256,'старик и братья','2026-11-15T23:25:32Z',NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,180,33683,NULL,'2026-01-01T00:00:00Z');
|
||||
INSERT INTO furumusic__media_file (id,file_type,file_path,original_filename,mime_type,file_size_bytes,sha256_hash,created_at) VALUES (33684,'audio','/tmp/test-33684.mp3','test.mp3','audio/mpeg',1,'0000000000000000000000000000000000000000000000000000000000033684','2026-01-01T00:00:00Z');
|
||||
INSERT INTO furumusic__track (id,year,title,is_hidden,model_name,release_id,title_sort,updated_at,disc_number,track_number,lastfm_rating,lastfm_listeners,lastfm_playcount,lastfm_checked_at,lastfm_updated_at,lastfm_lookup_title,lastfm_lookup_artist,duration_seconds,audio_file_id,cover_file_id,created_at) VALUES (33684,2018,'Потрошитель',false,'unsloth/Qwen3.6-35B-A3B-GGUF:UD-Q6_K',4256,'потрошитель','2026-11-15T23:25:33Z',NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,180,33684,NULL,'2026-01-01T00:00:00Z');
|
||||
INSERT INTO furumusic__media_file (id,file_type,file_path,original_filename,mime_type,file_size_bytes,sha256_hash,created_at) VALUES (33685,'audio','/tmp/test-33685.mp3','test.mp3','audio/mpeg',1,'0000000000000000000000000000000000000000000000000000000000033685','2026-01-01T00:00:00Z');
|
||||
INSERT INTO furumusic__track (id,year,title,is_hidden,model_name,release_id,title_sort,updated_at,disc_number,track_number,lastfm_rating,lastfm_listeners,lastfm_playcount,lastfm_checked_at,lastfm_updated_at,lastfm_lookup_title,lastfm_lookup_artist,duration_seconds,audio_file_id,cover_file_id,created_at) VALUES (33685,2018,'Последняя песня',false,'unsloth/Qwen3.6-35B-A3B-GGUF:UD-Q6_K',4256,'последняя песня','2026-11-15T23:25:33Z',NULL,3,NULL,NULL,NULL,NULL,NULL,NULL,NULL,180,33685,NULL,'2026-01-01T00:00:00Z');
|
||||
INSERT INTO furumusic__media_file (id,file_type,file_path,original_filename,mime_type,file_size_bytes,sha256_hash,created_at) VALUES (33686,'audio','/tmp/test-33686.mp3','test.mp3','audio/mpeg',1,'0000000000000000000000000000000000000000000000000000000000033686','2026-01-01T00:00:00Z');
|
||||
INSERT INTO furumusic__track (id,year,title,is_hidden,model_name,release_id,title_sort,updated_at,disc_number,track_number,lastfm_rating,lastfm_listeners,lastfm_playcount,lastfm_checked_at,lastfm_updated_at,lastfm_lookup_title,lastfm_lookup_artist,duration_seconds,audio_file_id,cover_file_id,created_at) VALUES (33686,2018,'Песня для твоей подруги',false,'unsloth/Qwen3.6-35B-A3B-GGUF:UD-Q6_K',4256,'песня для твоей подруги','2026-11-15T23:25:33Z',NULL,4,NULL,NULL,NULL,NULL,NULL,NULL,NULL,180,33686,NULL,'2026-01-01T00:00:00Z');
|
||||
INSERT INTO furumusic__media_file (id,file_type,file_path,original_filename,mime_type,file_size_bytes,sha256_hash,created_at) VALUES (33687,'audio','/tmp/test-33687.mp3','test.mp3','audio/mpeg',1,'0000000000000000000000000000000000000000000000000000000000033687','2026-01-01T00:00:00Z');
|
||||
INSERT INTO furumusic__track (id,year,title,is_hidden,model_name,release_id,title_sort,updated_at,disc_number,track_number,lastfm_rating,lastfm_listeners,lastfm_playcount,lastfm_checked_at,lastfm_updated_at,lastfm_lookup_title,lastfm_lookup_artist,duration_seconds,audio_file_id,cover_file_id,created_at) VALUES (33687,2018,'Просто я сегодня...',false,'unsloth/Qwen3.6-35B-A3B-GGUF:UD-Q6_K',4256,'просто я сегодня...','2026-11-15T23:25:33Z',NULL,5,NULL,NULL,NULL,NULL,NULL,NULL,NULL,180,33687,NULL,'2026-01-01T00:00:00Z');
|
||||
INSERT INTO furumusic__media_file (id,file_type,file_path,original_filename,mime_type,file_size_bytes,sha256_hash,created_at) VALUES (33688,'audio','/tmp/test-33688.mp3','test.mp3','audio/mpeg',1,'0000000000000000000000000000000000000000000000000000000000033688','2026-01-01T00:00:00Z');
|
||||
INSERT INTO furumusic__track (id,year,title,is_hidden,model_name,release_id,title_sort,updated_at,disc_number,track_number,lastfm_rating,lastfm_listeners,lastfm_playcount,lastfm_checked_at,lastfm_updated_at,lastfm_lookup_title,lastfm_lookup_artist,duration_seconds,audio_file_id,cover_file_id,created_at) VALUES (33688,2019,'Отзвуки тьмы',false,'unsloth/Qwen3.6-35B-A3B-GGUF:UD-Q6_K',4257,'отзвуки тьмы','2026-11-15T23:25:34Z',NULL,6,NULL,NULL,NULL,NULL,NULL,NULL,NULL,180,33688,NULL,'2026-01-01T00:00:00Z');
|
||||
INSERT INTO furumusic__media_file (id,file_type,file_path,original_filename,mime_type,file_size_bytes,sha256_hash,created_at) VALUES (33689,'audio','/tmp/test-33689.mp3','test.mp3','audio/mpeg',1,'0000000000000000000000000000000000000000000000000000000000033689','2026-01-01T00:00:00Z');
|
||||
INSERT INTO furumusic__track (id,year,title,is_hidden,model_name,release_id,title_sort,updated_at,disc_number,track_number,lastfm_rating,lastfm_listeners,lastfm_playcount,lastfm_checked_at,lastfm_updated_at,lastfm_lookup_title,lastfm_lookup_artist,duration_seconds,audio_file_id,cover_file_id,created_at) VALUES (33689,2019,'Битва за Москву',false,'unsloth/Qwen3.6-35B-A3B-GGUF:UD-Q6_K',4257,'битва за москву','2026-11-15T23:25:34Z',NULL,7,NULL,NULL,NULL,NULL,NULL,NULL,NULL,180,33689,NULL,'2026-01-01T00:00:00Z');
|
||||
INSERT INTO furumusic__media_file (id,file_type,file_path,original_filename,mime_type,file_size_bytes,sha256_hash,created_at) VALUES (33690,'audio','/tmp/test-33690.mp3','test.mp3','audio/mpeg',1,'0000000000000000000000000000000000000000000000000000000000033690','2026-01-01T00:00:00Z');
|
||||
INSERT INTO furumusic__track (id,year,title,is_hidden,model_name,release_id,title_sort,updated_at,disc_number,track_number,lastfm_rating,lastfm_listeners,lastfm_playcount,lastfm_checked_at,lastfm_updated_at,lastfm_lookup_title,lastfm_lookup_artist,duration_seconds,audio_file_id,cover_file_id,created_at) VALUES (33690,2020,'Настроение лето',false,'unsloth/Qwen3.6-35B-A3B-GGUF:UD-Q6_K',4258,'настроение лето','2026-11-15T23:25:46Z',NULL,8,NULL,NULL,NULL,NULL,NULL,NULL,NULL,180,33690,NULL,'2026-01-01T00:00:00Z');
|
||||
INSERT INTO furumusic__media_file (id,file_type,file_path,original_filename,mime_type,file_size_bytes,sha256_hash,created_at) VALUES (33691,'audio','/tmp/test-33691.mp3','test.mp3','audio/mpeg',1,'0000000000000000000000000000000000000000000000000000000000033691','2026-01-01T00:00:00Z');
|
||||
INSERT INTO furumusic__track (id,year,title,is_hidden,model_name,release_id,title_sort,updated_at,disc_number,track_number,lastfm_rating,lastfm_listeners,lastfm_playcount,lastfm_checked_at,lastfm_updated_at,lastfm_lookup_title,lastfm_lookup_artist,duration_seconds,audio_file_id,cover_file_id,created_at) VALUES (33691,2020,'Пробил час',false,'unsloth/Qwen3.6-35B-A3B-GGUF:UD-Q6_K',4258,'пробил час','2026-11-15T23:25:47Z',NULL,9,NULL,NULL,NULL,NULL,NULL,NULL,NULL,180,33691,NULL,'2026-01-01T00:00:00Z');
|
||||
INSERT INTO furumusic__media_file (id,file_type,file_path,original_filename,mime_type,file_size_bytes,sha256_hash,created_at) VALUES (33692,'audio','/tmp/test-33692.mp3','test.mp3','audio/mpeg',1,'0000000000000000000000000000000000000000000000000000000000033692','2026-01-01T00:00:00Z');
|
||||
INSERT INTO furumusic__track (id,year,title,is_hidden,model_name,release_id,title_sort,updated_at,disc_number,track_number,lastfm_rating,lastfm_listeners,lastfm_playcount,lastfm_checked_at,lastfm_updated_at,lastfm_lookup_title,lastfm_lookup_artist,duration_seconds,audio_file_id,cover_file_id,created_at) VALUES (33692,2021,'Цусима',false,'unsloth/Qwen3.6-35B-A3B-GGUF:UD-Q6_K',4259,'цусима','2026-11-15T23:25:47Z',NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,180,33692,NULL,'2026-01-01T00:00:00Z');
|
||||
INSERT INTO furumusic__release_artist (release_id,artist_id,position) VALUES (4256,2719,0);
|
||||
INSERT INTO furumusic__release_artist (release_id,artist_id,position) VALUES (4257,2719,0);
|
||||
INSERT INTO furumusic__release_artist (release_id,artist_id,position) VALUES (4258,2719,0);
|
||||
INSERT INTO furumusic__release_artist (release_id,artist_id,position) VALUES (4259,2719,0);
|
||||
INSERT INTO furumusic__track_artist (track_id,artist_id,role,position) VALUES (33683,2719,'main',0);
|
||||
INSERT INTO furumusic__track_artist (track_id,artist_id,role,position) VALUES (33684,2719,'main',0);
|
||||
INSERT INTO furumusic__track_artist (track_id,artist_id,role,position) VALUES (33685,2719,'main',0);
|
||||
INSERT INTO furumusic__track_artist (track_id,artist_id,role,position) VALUES (33686,2719,'main',0);
|
||||
INSERT INTO furumusic__track_artist (track_id,artist_id,role,position) VALUES (33687,2719,'main',0);
|
||||
INSERT INTO furumusic__track_artist (track_id,artist_id,role,position) VALUES (33688,2719,'main',0);
|
||||
INSERT INTO furumusic__track_artist (track_id,artist_id,role,position) VALUES (33689,2719,'main',0);
|
||||
INSERT INTO furumusic__track_artist (track_id,artist_id,role,position) VALUES (33690,2719,'main',0);
|
||||
INSERT INTO furumusic__track_artist (track_id,artist_id,role,position) VALUES (33691,2719,'main',0);
|
||||
INSERT INTO furumusic__track_artist (track_id,artist_id,role,position) VALUES (33692,2719,'main',0);
|
||||
INSERT INTO furumusic__playlist (id,owner_id,title,is_public,created_at,updated_at) VALUES (1,1,'Repair test',false,'2026-01-01T00:00:00Z','2026-01-01T00:00:00Z');
|
||||
INSERT INTO furumusic__playlist_track (playlist_id,track_id,position,added_at,added_by_user_id) VALUES (1,33683,0,'2026-01-01T00:00:00Z',1);
|
||||
INSERT INTO furumusic__track_ref (content_id,local_track_id,title,created_at,updated_at) VALUES ('content-33683',33683,'Старик и братья','2026-01-01T00:00:00Z','2026-01-01T00:00:00Z');
|
||||
INSERT INTO furumusic__playlist_track (playlist_id,track_id,position,added_at,added_by_user_id) VALUES (1,33684,1,'2026-01-01T00:00:00Z',1);
|
||||
INSERT INTO furumusic__track_ref (content_id,local_track_id,title,created_at,updated_at) VALUES ('content-33684',33684,'Потрошитель','2026-01-01T00:00:00Z','2026-01-01T00:00:00Z');
|
||||
INSERT INTO furumusic__playback_state (user_id,current_track_id,position_ms,queue_json,queue_position,shuffle,repeat_mode,volume,updated_at) VALUES (1,33683,1234,'[33683,33684,33685]',0,false,'off',1.0,'2026-01-01T00:00:00Z');
|
||||
@@ -3,11 +3,11 @@ const {readFileSync} = require('node:fs');
|
||||
const {test} = require('node:test');
|
||||
const vm = require('node:vm');
|
||||
const template = readFileSync(`${__dirname}/../templates/player/scripts.html`, 'utf8');
|
||||
function player(fetchImpl = async () => ({ok:true}), beacon = () => true) {
|
||||
function player(fetchImpl = async () => ({ok:true}), beacon = () => true, guest = false) {
|
||||
// Exercise the production methods with audio and network stubs.
|
||||
const methods = template.slice(template.indexOf(' _recordHistory(endedReason'), template.indexOf(' _sendNowPlaying()'));
|
||||
const audio = {currentTime:60};
|
||||
const context = vm.createContext({audio, fetch:fetchImpl, navigator:{sendBeacon:beacon}, Blob,
|
||||
const context = vm.createContext({GUEST:guest, audio, fetch:fetchImpl, navigator:{sendBeacon:beacon}, Blob,
|
||||
globalThis:{crypto:{randomUUID:()=> 'uuid'}}, setTimeout: fn => { fn(); }, console});
|
||||
vm.runInContext('this.methods = {' + methods + '};', context);
|
||||
return Object.assign(context.methods, {
|
||||
@@ -50,3 +50,10 @@ test('unstarted tracks and sub-five-second interrupted sessions are not recorded
|
||||
p._playbackStartedAt=123; p._listenedSeconds=4; p._recordHistory('skipped'); await flush();
|
||||
assert.equal(p._historyRecorded,false);
|
||||
});
|
||||
|
||||
test('guest listening never writes personal history or sends a beacon', async () => {
|
||||
const calls = [];
|
||||
const p = player(async () => {calls.push('fetch'); return {ok:true};}, () => {calls.push('beacon'); return true;}, true);
|
||||
p._recordHistory('finished'); p._recordHistory('stopped', true);
|
||||
await flush(); assert.deepEqual(calls, []);
|
||||
});
|
||||
@@ -0,0 +1,377 @@
|
||||
const assert = require('node:assert/strict');
|
||||
const {readFileSync} = require('node:fs');
|
||||
const {test} = require('node:test');
|
||||
const vm = require('node:vm');
|
||||
const template = readFileSync(`${__dirname}/../templates/player/scripts.html`, 'utf8');
|
||||
|
||||
// Queue items received from trusted devices that this player cannot play.
|
||||
const podcast = {
|
||||
id: -11, title: 'Episode 42', unavailable: true, stream_url: '',
|
||||
source: {kind: 'podcast_episode', episode_id: 'ep1:x'},
|
||||
wire_track: {id: 0, title: 'Episode 42', source: {kind: 'podcast_episode', episode_id: 'ep1:x'}},
|
||||
};
|
||||
const privateItem = {
|
||||
id: -12, title: 'Private item', unavailable: true, stream_url: '',
|
||||
source: {kind: 'private'}, wire_track: {id: 0, title: 'Private item', source: {kind: 'private'}},
|
||||
};
|
||||
const remoteMusic = {id: -13, title: 'Remote', unavailable: true, stream_url: '', wire_track: {id: 4, title: 'Remote'}};
|
||||
const song = id => ({id, title: `Song ${id}`, stream_url: `/api/player/stream/${id}`});
|
||||
|
||||
function player(queue) {
|
||||
// Exercise the production methods with audio and store stubs.
|
||||
const methods = template.slice(
|
||||
template.indexOf(' _queueItemSourceKind(track)'),
|
||||
template.indexOf(' _saveState()'),
|
||||
);
|
||||
const audio = {paused: false, src: 'old', pause() { this.paused = true; }, removeAttribute(name) { if (name === 'src') this.src = ''; }, load() {}};
|
||||
const stores = {queue: Object.assign({syncCurrentIndexToTrack() {}}, queue)};
|
||||
const context = vm.createContext({
|
||||
audio, T: {queuePodcastUnplayable: 'Podcast · not playable', queuePrivateItem: 'Private item · hidden'},
|
||||
Alpine: {store: name => stores[name]},
|
||||
});
|
||||
vm.runInContext('this.methods = {' + methods + '};', context);
|
||||
return Object.assign(context.methods, {audio, currentTrack: null, currentTime: 0, volume: 0.5, shuffle: false, repeatMode: 'off'});
|
||||
}
|
||||
|
||||
test('podcast and private items are labelled and never played locally', () => {
|
||||
const p = player({tracks: [], currentIndex: 0});
|
||||
assert.equal(p._isUnplayableQueueItem(podcast), true);
|
||||
assert.equal(p._isUnplayableQueueItem(privateItem), true);
|
||||
assert.equal(p._isUnplayableQueueItem(remoteMusic), false);
|
||||
assert.equal(p._isUnplayableQueueItem(song(1)), false);
|
||||
assert.equal(p._unplayableQueueLabel(podcast), 'Podcast · not playable');
|
||||
assert.equal(p._unplayableQueueLabel(privateItem), 'Private item · hidden');
|
||||
assert.equal(p._unplayableQueueLabel(song(1)), '');
|
||||
// A browser item that only carries the verbatim wire item is recognised too.
|
||||
assert.equal(p._isUnplayableQueueItem({id: -1, wire_track: podcast.wire_track}), true);
|
||||
});
|
||||
|
||||
test('skipping finds the next playable item in the direction of travel', () => {
|
||||
const p = player({tracks: [], currentIndex: 0});
|
||||
const tracks = [song(1), podcast, privateItem, song(2)];
|
||||
assert.equal(p._playableQueueIndex(tracks, 1, 1), 3);
|
||||
assert.equal(p._playableQueueIndex(tracks, 2, -1), 0);
|
||||
assert.equal(p._playableQueueIndex([podcast], 0, 1), -1);
|
||||
});
|
||||
|
||||
test('showing an unplayable item stops and unloads the previous audio', () => {
|
||||
const p = player({tracks: [podcast], currentIndex: 0});
|
||||
p.isPlaying = true;
|
||||
p._showUnplayableQueueItem(podcast);
|
||||
assert.equal(p.audio.paused, true);
|
||||
assert.equal(p.audio.src, '');
|
||||
assert.equal(p.isPlaying, false);
|
||||
assert.equal(p.currentTrack, podcast);
|
||||
assert.equal(p._historyTrack, null);
|
||||
});
|
||||
|
||||
test('persisted queue keeps external items verbatim and in order', () => {
|
||||
const tracks = [song(1), podcast, remoteMusic, {id: 'pending', federation_pending: true}, song(2)];
|
||||
const p = player({tracks, currentIndex: 4});
|
||||
p.currentTrack = tracks[4];
|
||||
p.currentTime = 12.3;
|
||||
const state = p._buildStatePayload();
|
||||
assert.deepEqual(JSON.parse(JSON.stringify(state.queue_items)), [
|
||||
{kind: 'library', track_id: 1},
|
||||
{kind: 'external', track: podcast.wire_track},
|
||||
{kind: 'external', track: remoteMusic.wire_track},
|
||||
{kind: 'library', track_id: 2},
|
||||
]);
|
||||
// The pending federation entry is not persisted, as before.
|
||||
assert.equal(state.queue_items_position, 3);
|
||||
// The legacy id list is unchanged for rollback.
|
||||
assert.deepEqual(JSON.parse(JSON.stringify(state.queue)), [1, -11, -13, 2]);
|
||||
assert.equal(state.current_track_id, 2);
|
||||
});
|
||||
|
||||
test('restoring merges library tracks and external items', () => {
|
||||
const p = player({tracks: [], currentIndex: 0});
|
||||
const restored = p._restoredQueueTracks([
|
||||
{kind: 'library', track_id: 1},
|
||||
{kind: 'external', track: podcast},
|
||||
{kind: 'library', track_id: 99},
|
||||
{kind: 'library', track_id: 2},
|
||||
], [song(2), song(1)]);
|
||||
assert.deepEqual(Array.from(restored.tracks, track => track.id), [1, -11, 2]);
|
||||
assert.equal(restored.positions[3], 2);
|
||||
assert.equal(restored.positions[2], undefined);
|
||||
});
|
||||
|
||||
// Production methods by name, for flows that span several of them.
|
||||
function method(name) {
|
||||
const start = template.indexOf(`\n ${name}(`);
|
||||
assert.ok(start >= 0, `method ${name} not found`);
|
||||
const end = template.indexOf('\n },\n', start);
|
||||
return template.slice(start + 1, end + 11);
|
||||
}
|
||||
|
||||
function activePlayer(queueTracks, currentIndex, audioState = {}, options = {}) {
|
||||
// The browser as the active (local) playback device.
|
||||
const names = [
|
||||
'_executeRemoteCommand', '_applyRemotePlaybackState', '_tickRemoteProgress',
|
||||
'_devicePlaybackStatePayload', '_remotePlaybackPayload', '_trackDuration',
|
||||
'_pauseLocal', '_playLocal', 'resume', 'next', 'prev', 'playQueueIndex', 'seek',
|
||||
'_skipUnplayableCurrentItem', '_knownPosition', '_currentItemHasLocalAudio',
|
||||
'_showUnplayableQueueItem', '_syncLocalPlaybackState',
|
||||
'_queueItemSourceKind', '_isUnplayableQueueItem', '_playableQueueIndex',
|
||||
'_jamParticipantCommandAllowed', '_dropJamPlaceholders',
|
||||
];
|
||||
const audio = Object.assign({
|
||||
paused: true, currentTime: 0, duration: NaN, src: '',
|
||||
played: [],
|
||||
pause() { this.paused = true; },
|
||||
play() { this.paused = false; this.played.push(this.src); return Promise.resolve(); },
|
||||
removeAttribute(name) { if (name === 'src') this.src = ''; },
|
||||
load() { this.currentTime = 0; },
|
||||
addEventListener() {}, removeEventListener() {},
|
||||
}, audioState);
|
||||
const queue = {
|
||||
tracks: queueTracks, currentIndex,
|
||||
_tracksWithJamDefaults: tracks => tracks,
|
||||
syncCurrentIndexToTrack(track) {
|
||||
const index = this.tracks.indexOf(track);
|
||||
if (index >= 0) this.currentIndex = index;
|
||||
},
|
||||
// Simplified local queue edits, as the host applies remote commands.
|
||||
_removeLocal(index) { if (index >= 0 && index < this.tracks.length) this.tracks.splice(index, 1); },
|
||||
_moveTrackLocal(from, to) { this.tracks.splice(to, 0, this.tracks.splice(from, 1)[0]); },
|
||||
_clearLocal() { this.tracks = []; },
|
||||
_addToEndLocal(tracks) { this.tracks.push(...tracks); },
|
||||
};
|
||||
const stores = {queue, devices: {heartbeat() {}}};
|
||||
const context = vm.createContext({audio, Alpine: {store: name => stores[name]}});
|
||||
if (options.random != null) vm.runInContext(`Math.random = () => ${options.random};`, context);
|
||||
vm.runInContext('this.methods = {' + names.map(method).join('\n') + '};', context);
|
||||
return Object.assign(context.methods, {
|
||||
audio, queue,
|
||||
currentTrack: queueTracks[currentIndex] || null, currentTime: 0, duration: 0, progress: 0,
|
||||
isPlaying: false, shuffle: false, repeatMode: 'off', volume: 0.5,
|
||||
_remoteStateBaseTime: 0, _remoteStateReceivedAt: 0,
|
||||
_isLocalPlaybackDevice: () => true, _shouldSendRemote: () => false,
|
||||
_shouldMirrorRemoteLocally: () => false,
|
||||
_setVolumeLocal(v) { this.volume = v; }, _updateMediaSession() {}, _saveState() {},
|
||||
_recordHistory() {}, _resetPlaybackTracking() {}, _mirrorRemoteTrack() {},
|
||||
});
|
||||
}
|
||||
|
||||
const episode = Object.assign({}, podcast, {duration_seconds: 1800});
|
||||
|
||||
test('handoff of a podcast episode keeps its position for the next handoff', () => {
|
||||
for (const audioTime of [95, 0]) {
|
||||
// <audio> still holds a music track (95 s) or the page is fresh (0 s).
|
||||
const p = activePlayer([song(1)], 0, {currentTime: audioTime, src: '/api/player/stream/1'});
|
||||
p._executeRemoteCommand({command: 'transfer_state', payload: {
|
||||
tracks: [song(1), episode], index: 1, track: episode,
|
||||
position_seconds: 1200, duration_seconds: 1800, paused: false,
|
||||
}});
|
||||
assert.equal(p.currentTrack, episode);
|
||||
assert.equal(p.currentTime, 1200);
|
||||
assert.equal(p.isPlaying, false);
|
||||
assert.equal(p.audio.src, '', 'the previous track is unloaded');
|
||||
const reported = p._devicePlaybackStatePayload();
|
||||
assert.equal(reported.position_seconds, 1200);
|
||||
assert.equal(reported.position_unknown, undefined, 'a handed-off position is known');
|
||||
assert.equal(reported.index, 1);
|
||||
assert.equal(reported.paused, true);
|
||||
}
|
||||
});
|
||||
|
||||
test('library tracks still report the audio position', () => {
|
||||
const p = activePlayer([song(1)], 0, {currentTime: 42, src: '/api/player/stream/1'});
|
||||
p.currentTime = 40;
|
||||
assert.equal(p._devicePlaybackStatePayload().position_seconds, 42);
|
||||
});
|
||||
|
||||
test('resume on an unplayable item skips it, also with repeat one', () => {
|
||||
for (const repeatMode of ['one', 'off', 'all']) {
|
||||
const p = activePlayer([podcast], 0);
|
||||
p.repeatMode = repeatMode;
|
||||
p.currentTime = 30;
|
||||
p.resume();
|
||||
p.next();
|
||||
assert.equal(p.currentTrack, podcast);
|
||||
assert.equal(p.isPlaying, false);
|
||||
assert.equal(p.currentTime, 30, 'the item keeps its position');
|
||||
assert.deepEqual(p.audio.played, []);
|
||||
}
|
||||
const p = activePlayer([song(1), podcast, song(2)], 1);
|
||||
p.repeatMode = 'one';
|
||||
p.resume();
|
||||
assert.equal(p.currentTrack.id, 2);
|
||||
assert.deepEqual(p.audio.played, ['/api/player/stream/2']);
|
||||
// Repeat all wraps around to the first playable item.
|
||||
const wrap = activePlayer([song(1), podcast], 1);
|
||||
wrap.repeatMode = 'all';
|
||||
wrap.resume();
|
||||
assert.equal(wrap.currentTrack.id, 1);
|
||||
});
|
||||
|
||||
test('an episode reached without its position reports it as unknown, never as 0', () => {
|
||||
// Next from the last music track lands on a trailing episode.
|
||||
const p = activePlayer([song(1), episode], 0, {currentTime: 200, src: '/api/player/stream/1'});
|
||||
p.isPlaying = true;
|
||||
p.currentTime = 200;
|
||||
p.next();
|
||||
assert.equal(p.currentTrack, episode);
|
||||
assert.equal(p.isPlaying, false);
|
||||
let reported = p._devicePlaybackStatePayload();
|
||||
assert.equal(reported.index, 1);
|
||||
assert.equal(reported.position_unknown, true);
|
||||
// Still unknown after Play finds nothing to skip to.
|
||||
p.resume();
|
||||
assert.equal(p._devicePlaybackStatePayload().position_unknown, true);
|
||||
// A seek is an explicit position.
|
||||
p.seek(600);
|
||||
reported = p._devicePlaybackStatePayload();
|
||||
assert.equal(reported.position_seconds, 600);
|
||||
assert.equal(reported.position_unknown, undefined);
|
||||
// Music never reports the flag.
|
||||
p.playQueueIndex(0);
|
||||
assert.equal(p.currentTrack.id, 1);
|
||||
assert.equal(p._devicePlaybackStatePayload().position_unknown, undefined);
|
||||
|
||||
// Another browser or a Jam guest plays the episode row (position 0 sent).
|
||||
const remote = activePlayer([song(1), episode], 0, {currentTime: 30, src: '/api/player/stream/1'});
|
||||
remote._executeRemoteCommand({command: 'play_from_index', payload: {
|
||||
tracks: [song(1), episode], index: 1, track: episode, position_seconds: 0, paused: false,
|
||||
}});
|
||||
assert.equal(remote.currentTrack, episode);
|
||||
assert.equal(remote._devicePlaybackStatePayload().position_unknown, true);
|
||||
// A transfer passes on what the previous device did not know.
|
||||
const relay = activePlayer([song(1)], 0);
|
||||
relay._executeRemoteCommand({command: 'transfer_state', payload: {
|
||||
tracks: [song(1), episode], index: 1, track: episode, position_seconds: 0,
|
||||
position_unknown: true, paused: true,
|
||||
}});
|
||||
assert.equal(relay._devicePlaybackStatePayload().position_unknown, true);
|
||||
// A mirrored state with a known position keeps it.
|
||||
const mirror = activePlayer([song(1), episode], 0);
|
||||
mirror._syncLocalPlaybackState({tracks: [song(1), episode], index: 1, track: episode, position_seconds: 900, paused: true});
|
||||
assert.equal(mirror._devicePlaybackStatePayload().position_seconds, 900);
|
||||
assert.equal(mirror._devicePlaybackStatePayload().position_unknown, undefined);
|
||||
});
|
||||
|
||||
test('repeat all and shuffle continue past a trailing unplayable item', () => {
|
||||
const wrap = activePlayer([song(1), episode], 0, {currentTime: 200, src: '/api/player/stream/1'});
|
||||
wrap.repeatMode = 'all';
|
||||
wrap.isPlaying = true;
|
||||
wrap.next();
|
||||
assert.equal(wrap.currentTrack.id, 1);
|
||||
assert.equal(wrap.queue.currentIndex, 0);
|
||||
assert.deepEqual(wrap.audio.played, ['/api/player/stream/1']);
|
||||
|
||||
// Shuffle picks the episode (index 1 of 3) and continues with music
|
||||
// (searching towards the pick from the current item).
|
||||
const shuffled = activePlayer([song(1), episode, song(2)], 2, {src: '/api/player/stream/2'}, {random: 0.5});
|
||||
shuffled.shuffle = true;
|
||||
shuffled.next();
|
||||
assert.equal(shuffled.currentTrack.id, 1);
|
||||
assert.equal(shuffled.isPlaying, false, 'the stub audio does not fire play events');
|
||||
assert.deepEqual(shuffled.audio.played, ['/api/player/stream/1']);
|
||||
// A trailing episode picked by shuffle wraps to the first playable item.
|
||||
const trailing = activePlayer([song(1), song(2), episode], 1, {src: '/api/player/stream/2'}, {random: 0.9});
|
||||
trailing.shuffle = true;
|
||||
trailing.next();
|
||||
assert.equal(trailing.currentTrack.id, 1);
|
||||
|
||||
// Without repeat the queue ends on the episode, as before.
|
||||
const stop = activePlayer([song(1), episode], 0, {src: '/api/player/stream/1'});
|
||||
stop.next();
|
||||
assert.equal(stop.currentTrack, episode);
|
||||
assert.equal(stop.isPlaying, false);
|
||||
});
|
||||
|
||||
test('prev and seek work on a handed-off episode', () => {
|
||||
const p = activePlayer([song(1), song(3)], 0, {currentTime: 95, src: '/api/player/stream/1'});
|
||||
p._executeRemoteCommand({command: 'transfer_state', payload: {
|
||||
tracks: [song(1), episode], index: 1, track: episode,
|
||||
position_seconds: 1200, duration_seconds: 1800, paused: false,
|
||||
}});
|
||||
// Seeking moves the episode's own position (nothing is loaded in <audio>).
|
||||
p.seek(1500);
|
||||
assert.equal(p.currentTime, 1500);
|
||||
assert.equal(p._devicePlaybackStatePayload().position_seconds, 1500);
|
||||
// Prev goes to the previous item instead of restarting the episode.
|
||||
p.prev();
|
||||
assert.equal(p.currentTrack.id, 1);
|
||||
assert.deepEqual(p.audio.played, ['/api/player/stream/1']);
|
||||
|
||||
// At the start of the queue Prev leaves the episode and its position alone.
|
||||
const first = activePlayer([episode, song(1)], 0);
|
||||
first._executeRemoteCommand({command: 'transfer_state', payload: {
|
||||
tracks: [episode, song(1)], index: 0, track: episode, position_seconds: 1200, paused: true,
|
||||
}});
|
||||
first.prev();
|
||||
assert.equal(first.currentTrack, episode);
|
||||
assert.equal(first.currentTime, 1200);
|
||||
});
|
||||
|
||||
test('the Jam host keeps its private items against stale participant commands', () => {
|
||||
const a = song(1);
|
||||
const b = song(2);
|
||||
const p = activePlayer([a, episode, b], 0, {src: '/api/player/stream/1'});
|
||||
// One poll batch: the server checked index 2 against the old order [A, P, B].
|
||||
for (const command of [
|
||||
{command: 'queue_move', payload: {from_index: 1, to_index: 2, jam_participant: true}},
|
||||
{command: 'queue_remove', payload: {index: 2, jam_participant: true}},
|
||||
]) p._executeRemoteCommand(command);
|
||||
assert.deepEqual(p.queue.tracks, [a, b, episode]);
|
||||
p._executeRemoteCommand({command: 'queue_clear', payload: {jam_participant: true}});
|
||||
assert.equal(p.queue.tracks.length, 3);
|
||||
p._executeRemoteCommand({command: 'queue_add_end', payload: {tracks: [privateItem], jam_participant: true}});
|
||||
assert.equal(p.queue.tracks.length, 3);
|
||||
// A full queue from a stale view brings back nothing the host removed.
|
||||
p._executeRemoteCommand({command: 'play_from_index', payload: {
|
||||
tracks: [a, episode, episode, b], index: 0, track: a, jam_participant: true,
|
||||
}});
|
||||
assert.deepEqual(p.queue.tracks, [a, b, episode]);
|
||||
p._executeRemoteCommand({command: 'play_from_index', payload: {
|
||||
tracks: [a, b], index: 0, track: a, jam_participant: true,
|
||||
}});
|
||||
assert.deepEqual(p.queue.tracks, [a, b, episode]);
|
||||
// Music is still theirs to change, and the host's own commands are not limited.
|
||||
p._executeRemoteCommand({command: 'queue_remove', payload: {index: 0, jam_participant: true}});
|
||||
assert.deepEqual(p.queue.tracks, [b, episode]);
|
||||
p._executeRemoteCommand({command: 'play_from_index', payload: {
|
||||
tracks: [episode, b], index: 1, track: b, jam_participant: true,
|
||||
}});
|
||||
assert.deepEqual(p.queue.tracks, [episode, b]);
|
||||
p._executeRemoteCommand({command: 'queue_remove', payload: {index: 0}});
|
||||
assert.deepEqual(p.queue.tracks, [b]);
|
||||
});
|
||||
|
||||
test('leaving a Jam drops the host placeholders from the guest queue', () => {
|
||||
const placeholder = Object.assign({}, privateItem);
|
||||
const p = activePlayer([song(1), placeholder, song(2)], 1);
|
||||
p.currentTrack = placeholder;
|
||||
p._dropJamPlaceholders();
|
||||
assert.deepEqual(Array.from(p.queue.tracks, track => track.id), [1, 2]);
|
||||
// The current placeholder hands over to the next item, paused.
|
||||
assert.equal(p.queue.currentIndex, 1);
|
||||
assert.equal(p.currentTrack.id, 2);
|
||||
assert.equal(p.isPlaying, false);
|
||||
assert.deepEqual(p.audio.played, []);
|
||||
|
||||
const music = activePlayer([song(1), placeholder, song(2)], 2);
|
||||
music._dropJamPlaceholders();
|
||||
assert.equal(music.queue.currentIndex, 1);
|
||||
assert.equal(music.currentTrack.id, 2);
|
||||
|
||||
const only = activePlayer([placeholder], 0);
|
||||
only._dropJamPlaceholders();
|
||||
assert.deepEqual(only.queue.tracks, []);
|
||||
assert.equal(only.currentTrack, null);
|
||||
// The guest's own podcast episodes stay.
|
||||
const own = activePlayer([episode, song(1)], 0);
|
||||
own._dropJamPlaceholders();
|
||||
assert.equal(own.queue.tracks.length, 2);
|
||||
});
|
||||
|
||||
test('the devices store drops placeholders when the guest stops controlling a Jam', () => {
|
||||
const start = template.indexOf('\n _apply(data) {');
|
||||
const apply = template.slice(start, template.indexOf('\n },\n', start));
|
||||
assert.match(apply, /const wasControllingJam = this\.isControllingRemoteJam\(\);/);
|
||||
assert.match(apply, /if \(wasControllingJam && !this\.isControllingRemoteJam\(\)\) \{\s*Alpine\.store\('player'\)\?\._dropJamPlaceholders\(\);/);
|
||||
const clear = template.slice(template.indexOf('\n clearJamSelection() {'));
|
||||
assert.match(clear.slice(0, clear.indexOf('\n },\n')), /if \(wasControllingJam\) Alpine\.store\('player'\)\?\._dropJamPlaceholders\(\);/);
|
||||
});
|
||||
Reference in new issue
Block a user