From 531c2b5d96ced35c57e55a9156bb5ec2ec3fa12c Mon Sep 17 00:00:00 2001 From: carlos Date: Wed, 2 Sep 2026 23:09:17 -0400 Subject: [PATCH 001/183] cipher: stop rebuilding the extraction stack on every track Three interlocking causes made each track start refetch the 2.9 MB player.js and spawn a fresh hidden WebKit process: - the cipher and PoToken webviews were torn down 15 s after use, which any song outlives; keep them while media is loaded and release after 5 min idle - the player hash was re-read from iframe_api on every resolve because current_hash.txt was written but never read; pin it for the cache TTL - a WEB_REMIX HEAD 403, routine on capped videos, ran the full self-heal (delete player.js, drop the bridge and the PoToken session) each time; allow one heal per ten minutes Measured on a Ryoku desktop: six consecutive track changes with no fetch and no webview build, where before each one paid ~1.2 s and a WebProcess. --- src-tauri/src/cipher/fetcher.rs | 14 ++++++++++++-- src-tauri/src/lib.rs | 26 +++++++++++++++++--------- src-tauri/src/orchestrator.rs | 22 ++++++++++++++++++++-- 3 files changed, 49 insertions(+), 13 deletions(-) diff --git a/src-tauri/src/cipher/fetcher.rs b/src-tauri/src/cipher/fetcher.rs index 7390bec..cce0d3d 100644 --- a/src-tauri/src/cipher/fetcher.rs +++ b/src-tauri/src/cipher/fetcher.rs @@ -53,7 +53,6 @@ impl PlayerJsFetcher { format!("https://www.youtube.com/s/player/{hash}/player_ias.vflset/en_GB/base.js"); let js = get(&url).await?.error_for_status()?.text().await?; std::fs::write(&cached, &js)?; - std::fs::write(self.cache_dir.join("current_hash.txt"), format!("{hash}\n{}", now_secs()))?; tracing::info!(hash, bytes = js.len(), "fetched fresh player.js"); Ok(PlayerJs { js, hash }) } @@ -74,9 +73,20 @@ impl PlayerJsFetcher { } } + /// The player hash, pinned on disk for the cache TTL so a listening session keeps one + /// player: YouTube hands different builds to consecutive `iframe_api` requests, and + /// following every answer meant a fresh 3 MB `base.js` and a webview rebuild per track. async fn current_hash(&self) -> Result { + let pin = self.cache_dir.join("current_hash.txt"); + if let Some(hash) = read_if_fresh(&pin).and_then(|s| s.lines().next().map(str::to_owned)) { + if !hash.is_empty() { + return Ok(hash); + } + } let body = get(IFRAME_API).await?.error_for_status()?.text().await?; - extract_hash(&body).ok_or(Error::NoHash) + let hash = extract_hash(&body).ok_or(Error::NoHash)?; + std::fs::write(&pin, format!("{hash}\n{}", now_secs()))?; + Ok(hash) } } diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index 7286a44..d2b99f8 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -392,16 +392,22 @@ pub fn run() { } }); } - // Hidden authentication JS is burst work, not resident UI. Tear helpers down quickly - // after real work and keep only their Rust-side analysis/session state. + // The hidden cipher/PoToken webviews are burst workers, but every track start needs + // them: tearing them down 15 s after use meant a fresh WebKit process, a 3 MB JS + // injection and a full analysis per track. Keep them resident while media is + // loaded and only release them after a long idle with nothing playing. { let cipher = cipher.clone(); let potoken = potoken.clone(); + let st = app_state.clone(); tauri::async_runtime::spawn(async move { loop { - tokio::time::sleep(Duration::from_secs(10)).await; - cipher.teardown_if_idle(Duration::from_secs(15)).await; - potoken.teardown_if_idle(Duration::from_secs(15)).await; + tokio::time::sleep(Duration::from_secs(30)).await; + if st.player.has_loaded_media() { + continue; + } + cipher.teardown_if_idle(Duration::from_secs(300)).await; + potoken.teardown_if_idle(Duration::from_secs(300)).await; } }); } @@ -414,10 +420,12 @@ pub fn run() { main_window::enforce_floating_geometry(app.handle()); main_window::request_hyprland_float(app.handle()); // The main WebView starts hidden to avoid exposing an unpainted WebKit frame. - // Svelte normally reveals it immediately from `onMount`; this bounded native - // fallback guarantees that a lost readiness message can never leave a normal - // cold launch permanently tray-only. - main_window::arm_reveal_failsafe(app.handle(), Duration::from_millis(1500)); + // Svelte normally reveals it from `onMount`; this bounded native fallback only + // guarantees that a lost readiness message can never leave a cold launch + // permanently tray-only. A cold WebKitGTK + SvelteKit mount takes 1-3 s on a + // laptop, so the fallback sits well past that or it fires before the handshake + // and shows an unstyled frame. + main_window::arm_reveal_failsafe(app.handle(), Duration::from_millis(4000)); spawn_heap_trimmer(); } Ok(()) diff --git a/src-tauri/src/orchestrator.rs b/src-tauri/src/orchestrator.rs index fac1113..3c67f30 100644 --- a/src-tauri/src/orchestrator.rs +++ b/src-tauri/src/orchestrator.rs @@ -8,7 +8,7 @@ use std::collections::HashSet; use std::sync::Arc; -use std::time::Duration; +use std::time::{Duration, Instant}; use innertube::{ find_format, rustypipe_fallback, AudioQuality, Clients, Format, InnerTube, PlayerResponse, @@ -65,6 +65,8 @@ pub enum ResolveError { /// Client keys that need the `n`-transform applied to their stream URLs. stream selection. const NEEDS_N_TRANSFORM: [&str; 4] = ["WEB", "WEB_REMIX", "WEB_CREATOR", "TVHTML5"]; +/// Minimum spacing between two off-hot-path self-heals (`take_heal_slot`). +const HEAL_WINDOW: Duration = Duration::from_secs(10 * 60); // WEB_REMIX is validated with a HEAD like every other client — see `validate_head`. @@ -86,6 +88,11 @@ pub struct Orchestrator { /// (stream selection §2). Cleared when the cipher self-heals. `Arc` so the off-hot-path self-heal /// task can clear it. web_remix_failed: Arc>>, + /// When the last self-heal ran. A WEB_REMIX HEAD 403 is routine on capped videos (see the + /// validation comment in `resolve`), so healing on every one of them threw away player.js, + /// the cipher webview and the PoToken session per track. One heal per window is plenty to + /// catch a config that really went stale. + last_heal: Arc>>, } impl Orchestrator { @@ -101,6 +108,7 @@ impl Orchestrator { cipher, potoken, web_remix_failed: Arc::new(Mutex::new(HashSet::new())), + last_heal: Arc::new(Mutex::new(None)), } } @@ -110,6 +118,16 @@ impl Orchestrator { self.web_remix_failed.lock().await.insert(video_id.to_owned()); } + /// Claim the one self-heal allowed per `HEAL_WINDOW`; false while a recent heal is cooling. + async fn take_heal_slot(&self) -> bool { + let mut last = self.last_heal.lock().await; + if last.is_some_and(|t| t.elapsed() < HEAL_WINDOW) { + return false; + } + *last = Some(Instant::now()); + true + } + /// Resolve a videoId to a playable stream. stream selection full algorithm. pub async fn resolve( &self, @@ -284,7 +302,7 @@ impl Orchestrator { main_ping.clone().or_else(|| playback_ping(&resp, &key)), is_upload, )); - } else if needs_n { + } else if needs_n && self.take_heal_slot().await { // A cipher client that fails validation may have a stale config → self-heal off // the hot path so it never blocks falling through (stream selection §7). If the heal // changes the config table, clear the WEB_REMIX failure memory (stream selection §2). From a75d030472867f4df363a1b4be90f5edbfbdc31a Mon Sep 17 00:00:00 2001 From: carlos Date: Wed, 2 Sep 2026 23:09:17 -0400 Subject: [PATCH 002/183] player: name the mpv stream after the track mpv titled the stream by its URL, so the PipeWire node carried the full signed googlevideo link. Pass a per-file force-media-title (Artist - Title) through loadfile's options, quoted for the command parser and length-prefixed for the option parser so any title round-trips verbatim. Includes a probe example that asserts the round trip. --- crates/player/examples/play.rs | 4 ++-- crates/player/examples/title.rs | 27 +++++++++++++++++++++++++++ crates/player/src/lib.rs | 24 ++++++++++++++++++++---- src-tauri/src/state.rs | 31 ++++++++++++++++++++++++------- 4 files changed, 73 insertions(+), 13 deletions(-) create mode 100644 crates/player/examples/title.rs diff --git a/crates/player/examples/play.rs b/crates/player/examples/play.rs index 02b802d..0b2f0a9 100644 --- a/crates/player/examples/play.rs +++ b/crates/player/examples/play.rs @@ -17,8 +17,8 @@ async fn main() { let mut p = Player::new(cache.to_str().unwrap()).expect("player"); let mut events = p.take_events().unwrap(); - p.load(&a, &HashMap::new(), None).expect("load A"); - p.enqueue(&b).expect("enqueue B"); + p.load(&a, &HashMap::new(), None, "A").expect("load A"); + p.enqueue(&b, "B").expect("enqueue B"); p.play().expect("play"); let mut ended = 0; diff --git a/crates/player/examples/title.rs b/crates/player/examples/title.rs new file mode 100644 index 0000000..991f24f --- /dev/null +++ b/crates/player/examples/title.rs @@ -0,0 +1,27 @@ +//! Media-title probe: `cargo run -p player --example title -- [title]` +//! Loads a file with an awkward per-file title (spaces, commas, quotes, non-ASCII) and asserts +//! that mpv reports it back verbatim. + +use std::collections::HashMap; + +use player::Player; + +fn main() { + let a = std::env::args().nth(1).expect("usage: cargo run -p player --example title -- "); + let cache = std::env::temp_dir().join("ryotunes-player-example"); + std::fs::create_dir_all(&cache).ok(); + let p = Player::new(cache.to_str().unwrap()).expect("player"); + let title = std::env::args() + .nth(2) + .unwrap_or_else(|| "Ünïcode Artist, \"quoted\" – A Title".to_owned()); + p.load(&a, &HashMap::new(), None, &title).expect("load"); + let mut got = String::new(); + for _ in 0..40 { + std::thread::sleep(std::time::Duration::from_millis(100)); + got = p.media_title().unwrap_or_default(); + if !got.is_empty() { break; } + } + println!("want: {title}"); + println!("got: {got}"); + assert_eq!(got, title); +} diff --git a/crates/player/src/lib.rs b/crates/player/src/lib.rs index 52dde9a..bb88bf3 100644 --- a/crates/player/src/lib.rs +++ b/crates/player/src/lib.rs @@ -122,16 +122,19 @@ impl Player { self.events.take() } - /// Load and play a fresh URL, replacing the playlist. + /// Load and play a fresh URL, replacing the playlist. `title` names the stream for mpv + /// (and so for the PipeWire node); without it mpv uses the URL, which for a signed + /// googlevideo link puts the whole token into the audio graph. pub fn load( &self, url: &str, headers: &HashMap, gain_db: Option, + title: &str, ) -> Result<(), Error> { self.apply_headers(headers)?; self.set_gain(gain_db)?; - self.mpv.command("loadfile", &["ed(url), "replace"])?; + self.mpv.command("loadfile", &["ed(url), "replace", "-1", &title_option(title)])?; // Close→pause can happen before mpv's property notification reaches the event thread. // Mark the session loaded immediately so background lifecycle can never mistake that tiny // transition window for an empty player. The observed property corrects this on failure/EOF. @@ -144,8 +147,8 @@ impl Player { /// Note: mpv's `http-header-fields`/`user-agent` are global properties, so appended tracks /// inherit the currently-set headers. Ordinary direct-URL streams do not require per-track /// cookies; upload-specific headers are handled before a track is loaded. - pub fn enqueue(&self, url: &str) -> Result<(), Error> { - self.mpv.command("loadfile", &["ed(url), "append"])?; + pub fn enqueue(&self, url: &str, title: &str) -> Result<(), Error> { + self.mpv.command("loadfile", &["ed(url), "append", "-1", &title_option(title)])?; Ok(()) } @@ -162,6 +165,11 @@ impl Player { self.mpv.get_property::("idle-active").unwrap_or(true) } + /// The title mpv reports for the current file (the per-file `force-media-title` once set). + pub fn media_title(&self) -> Option { + self.mpv.get_property::("media-title").ok() + } + /// Cheap event-driven loaded-media state for background lifecycle decisions. Unlike /// [`Self::is_idle`], this never takes mpv's core lock and therefore cannot turn a transient /// property-query failure during Pause into a false "nothing loaded" result. @@ -414,6 +422,14 @@ fn quoted(arg: &str) -> String { format!("\"{}\"", arg.replace('\\', "\\\\").replace('"', "\\\"")) } +/// Per-file `force-media-title` for `loadfile`'s options argument. Two parsers see it: the +/// command-string parser (libmpv2 joins the args into one line) needs the token quoted, and the +/// comma-separated option list inside needs the value length-prefixed (`%len%...`), which takes +/// any bytes verbatim. A per-file option also leaves the gapless lookahead's title untouched. +fn title_option(title: &str) -> String { + quoted(&format!("force-media-title=%{}%{}", title.len(), title)) +} + /// Slider percent → mpv `volume` value, over a 60 dB range. mpv applies gain = (v/100)³, /// i.e. 60·log10(v/100) dB, so v = 100·10^(−(1−s/100)^1.5) yields −60·(1−s/100)^1.5 dB: /// 50% is −21 dB, 25% is −39 dB, 1% is −59 dB. 0 stays a hard mute. diff --git a/src-tauri/src/state.rs b/src-tauri/src/state.rs index f921a47..e89d67b 100644 --- a/src-tauri/src/state.rs +++ b/src-tauri/src/state.rs @@ -1504,9 +1504,12 @@ impl AppState { if self.generation.load(Ordering::SeqCst) != gen { return false; // user moved on } - if let Err(e) = - self.player.load(&data.stream_url, &data.headers, loudness_gain(data.loudness_db)) - { + if let Err(e) = self.player.load( + &data.stream_url, + &data.headers, + loudness_gain(data.loudness_db), + &media_title(&item.title, &item.artists), + ) { self.emit_error(&item.video_id, &e.to_string()); return false; } @@ -1664,7 +1667,8 @@ impl AppState { } // Headers are global in mpv; the direct-URL clients need none beyond UA, which the // current track already set. Just append the URL. - if let Err(e) = self.player.enqueue(&data.stream_url) { + let title = q.items.get(next_idx).map(|i| media_title(&i.title, &i.artists)).unwrap_or_default(); + if let Err(e) = self.player.enqueue(&data.stream_url, &title) { tracing::warn!(error = %e, "enqueue lookahead failed"); return; } @@ -2434,9 +2438,12 @@ impl AppState { if self.generation.load(Ordering::SeqCst) != gen { return; // superseded by a newer sync } - if let Err(e) = - self.player.load(&data.stream_url, &data.headers, loudness_gain(data.loudness_db)) - { + if let Err(e) = self.player.load( + &data.stream_url, + &data.headers, + loudness_gain(data.loudness_db), + &media_title(&track.title, &track.artist), + ) { self.emit_error(&track.id, &e.to_string()); return; } @@ -3381,6 +3388,16 @@ fn loudness_gain(loudness_db: Option) -> Option { (gain < -0.05).then(|| gain.max(-24.0)) } +/// "Artist – Title" for mpv's per-file media title (what PipeWire and mpv's own metadata show). +fn media_title(title: &str, artists: &str) -> String { + match (title.trim(), artists.trim()) { + ("", "") => "Ryotunes".to_owned(), + (t, "") => t.to_owned(), + ("", a) => a.to_owned(), + (t, a) => format!("{a} – {t}"), + } +} + /// Loudness target, matching YouTube Music's own player rather than the video site's -14. const TARGET_LUFS: f64 = -7.0; From 079755d3cafe76db61a2f80b6d3115c81d99c1d7 Mon Sep 17 00:00:00 2001 From: carlos Date: Wed, 2 Sep 2026 23:09:17 -0400 Subject: [PATCH 003/183] startup: bound the palette wait before the reveal handshake The reveal was gated on the Ryoku token IPC and retried for ~1.85 s against a 1.5 s native failsafe, so a cold WebKit mount was routinely revealed natively and unstyled. Race the palette against 250 ms; the native failsafe moved to 4 s in the previous commit's lib.rs change. --- ui/src/routes/+layout.svelte | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ui/src/routes/+layout.svelte b/ui/src/routes/+layout.svelte index 22e9254..2c6a273 100644 --- a/ui/src/routes/+layout.svelte +++ b/ui/src/routes/+layout.svelte @@ -111,9 +111,14 @@ // `visible:false`, which deadlocks the only callback capable of revealing that window. // Start the bridge handshake immediately; retries use ordinary timers, which continue // to run for a hidden WebView. Native code also owns a bounded reveal failsafe. + // Palette-before-reveal is worth a short wait, not the whole IPC round-trip: gating on + // the token invoke alone routinely outran the native 1.5 s failsafe on a cold WebKit + // process, so the window was revealed natively, unhandshaken. Bound the wait. const begin = () => { if (!cancelled) void attempt(0); }; - if (beforeReveal) void beforeReveal.then(begin, begin); - else begin(); + if (beforeReveal) { + const bounded = Promise.race([beforeReveal, new Promise((r) => setTimeout(r, 250))]); + void bounded.then(begin, begin); + } else begin(); return () => { cancelled = true; if (timer) clearTimeout(timer); }; } From 7f9feedfa406516a4b4c712448af124592557f9c Mon Sep 17 00:00:00 2001 From: carlos Date: Wed, 2 Sep 2026 23:09:17 -0400 Subject: [PATCH 004/183] build: default the custom-protocol feature Tauri sets cfg(dev) whenever custom-protocol is absent, so the source PKGBUILD's plain cargo build produced a binary that opened build.devUrl. Default the feature on; cargo tauri dev still passes --no-default-features. --- src-tauri/Cargo.toml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 6aeb4bf..75c7a81 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -10,6 +10,13 @@ rust-version = "1.80" name = "app_lib" crate-type = ["staticlib", "cdylib", "rlib"] +# Tauri's `dev` cfg is the absence of `custom-protocol`: without it a release binary still +# points its window at `build.devUrl`. Default it on so `cargo build --release` (the source +# PKGBUILD) ships the bundled frontend; `cargo tauri dev` passes --no-default-features. +[features] +default = ["custom-protocol"] +custom-protocol = ["tauri/custom-protocol"] + [build-dependencies] tauri-build = { version = "2", features = [] } From 31bcfda593a74be6e7f0288642ac414f0d9605ab Mon Sep 17 00:00:00 2001 From: 77Darius77 <98291816+77Darius77@users.noreply.github.com> Date: Fri, 4 Sep 2026 20:28:55 +0200 Subject: [PATCH 005/183] fix: derive InnerTube locale from the environment Locale::default() is hard-coded to US/en, so every InnerTube request announces English even when the system language and the signed-in account are French; the API's hl/gl context wins over account preferences and the UI never switches. Add Locale::from_env(), which reads LC_ALL/LANG, parses lang_TERRITORY and maps the compound tags YouTube localises (zh-CN/TW/HK, pt-BR/PT, es-419/es-US, en-GB, fr-CA), falling back to US/en when nothing parseable is set. The session bootstrap now uses it instead of Locale::default(). --- crates/innertube/src/models/context.rs | 36 ++++++++++++++++++++++++++ src-tauri/src/lib.rs | 2 +- 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/crates/innertube/src/models/context.rs b/crates/innertube/src/models/context.rs index 620a193..f54ea84 100644 --- a/crates/innertube/src/models/context.rs +++ b/crates/innertube/src/models/context.rs @@ -17,6 +17,42 @@ impl Default for Locale { } } +impl Locale { + /// Derive a `Locale` from the process environment (`LC_ALL`/`LANG`), so the + /// YouTube API answers in the user's language instead of always US/en. + /// Falls back to [`Locale::default`] when nothing parseable is set. + pub fn from_env() -> Self { + let raw = std::env::var("LC_ALL").or_else(|_| std::env::var("LANG")).unwrap_or_default(); + Self::from_lang(&raw) + } + + fn from_lang(raw: &str) -> Self { + // "fr_FR.UTF-8" -> ("fr", "FR"); "", "C" or "POSIX" -> default. + let base = raw.split('.').next().unwrap_or(""); + let mut parts = base.split('_'); + let lang = parts.next().unwrap_or("").to_ascii_lowercase(); + if lang.is_empty() || lang == "c" || lang == "posix" { + return Locale::default(); + } + let terr = parts.next().unwrap_or("").to_ascii_uppercase(); + let hl = match (lang.as_str(), terr.as_str()) { + // Language+territory pairs YouTube localises as a compound tag. + ("zh", "CN") => "zh-CN".into(), + ("zh", "TW") => "zh-TW".into(), + ("zh", "HK") => "zh-HK".into(), + ("pt", "BR") => "pt-BR".into(), + ("pt", "PT") => "pt-PT".into(), + ("es", "US") => "es-US".into(), + ("es", "ES") => "es".into(), + ("es", _) => "es-419".into(), + ("en", "GB") => "en-GB".into(), + ("fr", "CA") => "fr-CA".into(), + _ => lang, + }; + Locale { gl: if terr.is_empty() { "US".into() } else { terr }, hl } + } +} + // The three load-bearing JSON flags (write API) are realized structurally here: // - ignoreUnknownKeys → serde ignores unknown fields on Deserialize by default. // - explicitNulls = false → `skip_serializing_if = "Option::is_none"` on every Option. diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index d2b99f8..19a7f61 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -247,7 +247,7 @@ pub fn run() { tracing::info!("loaded persisted login session"); } - let session = Session { locale: Locale::default(), visitor_data, data_sync_id, cookie }; + let session = Session { locale: Locale::from_env(), visitor_data, data_sync_id, cookie }; let it = match InnerTube::new(session.clone(), proxy.as_deref()) { Ok(it) => it, Err(error) => { From 74c77d678daf98ad49809da407b9d9f2597563c5 Mon Sep 17 00:00:00 2001 From: 77Darius77 <98291816+77Darius77@users.noreply.github.com> Date: Fri, 4 Sep 2026 20:50:48 +0200 Subject: [PATCH 006/183] i18n: translate the hard-coded UI chrome into French InnerTube content is now localised by the backend locale (hl/gl), but the app-owned chrome (context menus, settings, dialogs, status text) is hard-coded English in the Svelte UI. Add a small reactive i18n module (t() with a fr dictionary keyed by the exact English source string, locale detected from navigator.language) and wrap every static UI string in it. Unknown keys fall back to English, so missing translations degrade gracefully. Covers 36 components/routes (~490 strings), including ternary display branches and aria labels; dynamic API-driven text is untouched. --- ui/src/lib/components/AccountMenu.svelte | 19 +- ui/src/lib/components/AddToPlaylist.svelte | 15 +- ui/src/lib/components/ChannelPicker.svelte | 19 +- ui/src/lib/components/CommandPalette.svelte | 15 +- .../lib/components/EditPlaylistDialog.svelte | 40 +- ui/src/lib/components/ErrorState.svelte | 3 +- ui/src/lib/components/HomeHero.svelte | 13 +- ui/src/lib/components/LibrarySongs.svelte | 21 +- ui/src/lib/components/LinkDialog.svelte | 17 +- ui/src/lib/components/ListenTogether.svelte | 87 ++-- .../lib/components/ListeningInsights.svelte | 33 +- ui/src/lib/components/LocalMusic.svelte | 32 +- ui/src/lib/components/LyricsView.svelte | 23 +- ui/src/lib/components/MiniPlayer.svelte | 49 +- ui/src/lib/components/NowPlaying.svelte | 13 +- ui/src/lib/components/PlayerBar.svelte | 35 +- ui/src/lib/components/PlaylistMenu.svelte | 21 +- ui/src/lib/components/QueuePanel.svelte | 5 +- ui/src/lib/components/SavedInPlaylists.svelte | 9 +- ui/src/lib/components/SearchSuggest.svelte | 21 +- ui/src/lib/components/SettingsDialog.svelte | 168 +++--- ui/src/lib/components/ShareDialog.svelte | 21 +- ui/src/lib/components/Sidebar.svelte | 39 +- ui/src/lib/components/TrackFilter.svelte | 5 +- ui/src/lib/components/TrackMenu.svelte | 29 +- ui/src/lib/i18n.svelte.ts | 24 + ui/src/lib/i18n/fr.json | 491 ++++++++++++++++++ ui/src/routes/+error.svelte | 9 +- ui/src/routes/+layout.svelte | 3 +- ui/src/routes/+page.svelte | 15 +- ui/src/routes/album/[id]/+page.svelte | 41 +- ui/src/routes/artist/[id]/+page.svelte | 31 +- ui/src/routes/library/+page.svelte | 80 ++- ui/src/routes/list/+page.svelte | 5 +- ui/src/routes/playlist/[id]/+page.svelte | 63 +-- ui/src/routes/radio/+page.svelte | 62 ++- ui/src/routes/search-more/+page.svelte | 9 +- ui/src/routes/search/+page.svelte | 49 +- 38 files changed, 1084 insertions(+), 550 deletions(-) create mode 100644 ui/src/lib/i18n.svelte.ts create mode 100644 ui/src/lib/i18n/fr.json diff --git a/ui/src/lib/components/AccountMenu.svelte b/ui/src/lib/components/AccountMenu.svelte index f4afc89..5435110 100644 --- a/ui/src/lib/components/AccountMenu.svelte +++ b/ui/src/lib/components/AccountMenu.svelte @@ -8,6 +8,7 @@ import * as api from '$lib/api'; import { auth, openChannelPicker } from '$lib/player.svelte'; import { thumb } from '$lib/thumb'; + import { t } from '$lib/i18n.svelte'; import { anchorMenu, fitMenu, NO_ANCHOR, toBody } from '$lib/menu'; let menuOpen = $state(false); @@ -39,7 +40,7 @@
{#if auth.account?.signedIn}
-
{auth.account.name ?? 'Account'}
+
{auth.account.name ?? t('Account')}
{#if auth.account.handle || auth.account.email}
{auth.account.handle ?? auth.account.email} @@ -90,18 +91,18 @@ {:else} -

Sign in

+

{t('Sign in')}

- Sign in with your Google account to reach your YouTube Music library and playlists. + {t('Sign in with your Google account to reach your YouTube Music library and playlists.')}

- + {/if}
{/if} diff --git a/ui/src/lib/components/AddToPlaylist.svelte b/ui/src/lib/components/AddToPlaylist.svelte index af7be5b..56cab9c 100644 --- a/ui/src/lib/components/AddToPlaylist.svelte +++ b/ui/src/lib/components/AddToPlaylist.svelte @@ -13,6 +13,7 @@ notePlaylistAdd, noteSavedIn } from '$lib/player.svelte'; + import { t } from '$lib/i18n.svelte'; let playlists = $state([]); let loading = $state(false); @@ -117,11 +118,11 @@ class="ryo-overlay-sheet w-full max-w-sm p-4" >
-

Add to playlist

+

{t('Add to playlist')}

@@ -139,14 +140,14 @@ class="min-w-0 flex-1 rounded-md border border-border bg-background px-3 py-2 text-sm outline-none focus:border-foreground/40" bind:value={newTitle} maxlength="150" - placeholder="Playlist name" + placeholder={t('Playlist name')} /> {:else} @@ -154,12 +155,12 @@ class="w-full rounded-md border border-border px-3 py-2 text-left text-sm font-medium hover:bg-accent/10" onclick={() => (showCreate = true)} > - + New playlist + {t('+ New playlist')} {/if}
{#if loading} -

Loading…

+

{t('Loading…')}

{:else if playlists.length}
{#each playlists as pl (pl.id)} @@ -183,7 +184,7 @@
{:else}

- No playlists yet. Create one above and these songs will be added immediately. + {t('No playlists yet. Create one above and these songs will be added immediately.')}

{/if}
diff --git a/ui/src/lib/components/ChannelPicker.svelte b/ui/src/lib/components/ChannelPicker.svelte index 368d89f..462924e 100644 --- a/ui/src/lib/components/ChannelPicker.svelte +++ b/ui/src/lib/components/ChannelPicker.svelte @@ -6,6 +6,7 @@ import * as api from '$lib/api'; import type { AccountIdentity } from '$lib/api'; import { toast, ui } from '$lib/player.svelte'; + import { t } from '$lib/i18n.svelte'; import { thumb } from '$lib/thumb'; let loading = $state(false); @@ -47,7 +48,7 @@ ui.channelPickerRequired = false; ui.channelPickerOpen = false; ui.channelIdentities = []; - toast.success(wasRequired ? `Signed in as ${identity.name}` : `Switched to ${identity.name}`); + toast.success(wasRequired ? `${t('Signed in as')} ${identity.name}` : `${t('Switched to')} ${identity.name}`); } catch (e) { error = String(e); toast.error(error); @@ -83,23 +84,23 @@ interactOutsideBehavior={dismissable} >
- Choose a YouTube channel + {t('Choose a YouTube channel')} - Library, likes and playlists will use this channel. You can switch again later. + {t('Library, likes and playlists will use this channel. You can switch again later.')}
{#if loading} -

Loading channels…

+

{t('Loading channels…')}

{:else if error}

{error}

- +
{:else if ui.channelIdentities.length === 0}

- YouTube did not return any selectable channels. + {t('YouTube did not return any selectable channels.')}

{:else} {#each ui.channelIdentities as identity (identity.selectionKey)} @@ -131,7 +132,7 @@ {#if identity.selected} - Selected + {t('Selected')} {/if} @@ -142,11 +143,11 @@
{#if ui.channelPickerRequired} {:else} {/if}
diff --git a/ui/src/lib/components/CommandPalette.svelte b/ui/src/lib/components/CommandPalette.svelte index f4a1a33..ef879e3 100644 --- a/ui/src/lib/components/CommandPalette.svelte +++ b/ui/src/lib/components/CommandPalette.svelte @@ -9,6 +9,7 @@ import { goto } from '$app/navigation'; import { HugeiconsIcon } from '@hugeicons/svelte'; import { Search01Icon, MusicNote01Icon, UserIcon } from '@hugeicons/core-free-icons'; + import { t } from '$lib/i18n.svelte'; import * as Command from '$lib/components/ui/command/index.js'; import { Skeleton } from '$lib/components/ui/skeleton'; import ExplicitIcon from './ExplicitIcon.svelte'; @@ -18,7 +19,7 @@ import { thumb } from '$lib/thumb'; import { warmStream } from '$lib/warm-stream'; - const KIND = { song: 'Song', album: 'Album', artist: 'Artist', playlist: 'Playlist' }; + const KIND = { song: t('Song'), album: t('Album'), artist: t('Artist'), playlist: t('Playlist') }; let query = $state(''); let items = $state([]); @@ -81,11 +82,11 @@ shouldFilter={false} vimBindings={false} loop - title="Search" - description="Search songs, albums, artists and playlists" + title={t('Search')} + description={t('Search songs, albums, artists and playlists')} class="ryo-command-palette sm:max-w-xl" > - + {#if loading} {#each Array(4) as _, i (i)} @@ -99,10 +100,10 @@ {/each} {:else if !items.length}
- {query.trim().length < 2 ? 'Type to search.' : 'Nothing quick for that.'} + {t(query.trim().length < 2 ? 'Type to search.' : 'Nothing quick for that.')}
{:else} - + {#each items as item (item.id)} choose(item)} onmouseenter={() => item.kind === 'song' && warmStream(item.id, !!item.isUpload)} class="gap-3 px-2 py-1.5"> {#if item.thumbnail} @@ -147,7 +148,7 @@ - All results for “{query.trim()}” + {t('All results for')} “{query.trim()}” {/if} diff --git a/ui/src/lib/components/EditPlaylistDialog.svelte b/ui/src/lib/components/EditPlaylistDialog.svelte index e0262ed..af5429a 100644 --- a/ui/src/lib/components/EditPlaylistDialog.svelte +++ b/ui/src/lib/components/EditPlaylistDialog.svelte @@ -13,6 +13,7 @@ import * as api from '$lib/api'; import { thumb } from '$lib/thumb'; import { toast } from '$lib/player.svelte'; + import { t } from '$lib/i18n.svelte'; /** What the page shows while YouTube catches up, and what it puts back if the write fails. */ type Edit = { title?: string; description?: string; privacy?: string; cover?: string }; @@ -109,7 +110,7 @@ open = false; try { await api.editPlaylistDetails(id, changes); - toast.success('Playlist updated'); + toast.success(t('Playlist updated')); } catch (e) { onchange(before); toast.error(String(e)); @@ -122,11 +123,11 @@ - Edit playlist + {t('Edit playlist')} - {local + {t(local ? 'Change the name or artwork stored for this playlist on this device.' - : 'Change how this playlist looks and who can see it.'} + : 'Change how this playlist looks and who can see it.')}
{#if preview} @@ -155,7 +156,7 @@ : 'opacity-100'}" > - Choose image + {t('Choose image')} {#if cover} @@ -168,24 +169,23 @@ disabled={removing} > - {removing ? 'Removing…' : 'Remove'} + {t(removing ? 'Removing…' : 'Remove')} {/if}
- + {#if !local} {:else}

- Device playlists stay available without a Google account. Their songs, name and artwork - are kept locally and are never uploaded automatically. + {t('Device playlists stay available without a Google account. Their songs, name and artwork are kept locally and are never uploaded automatically.')}

{/if}
@@ -193,25 +193,25 @@ {#if !local}
-
Public
+
{t('Public')}

- {isPublic + {t(isPublic ? 'Anyone can find this playlist on YouTube Music.' - : 'Only you can see this playlist.'} + : 'Only you can see this playlist.')}

- +
{/if}

- {local + {t(local ? 'Artwork is copied into Ryotunes storage on this device. Square JPEG or PNG works best.' - : 'Artwork applies here at once and uploads to YouTube Music in the background. Square JPEG or PNG works best.'} + : 'Artwork applies here at once and uploads to YouTube Music in the background. Square JPEG or PNG works best.')}

- + diff --git a/ui/src/lib/components/ErrorState.svelte b/ui/src/lib/components/ErrorState.svelte index 594f4c2..fca0316 100644 --- a/ui/src/lib/components/ErrorState.svelte +++ b/ui/src/lib/components/ErrorState.svelte @@ -2,6 +2,7 @@ import { HugeiconsIcon } from '@hugeicons/svelte'; import { RefreshIcon } from '@hugeicons/core-free-icons'; import { Button } from '$lib/components/ui/button'; + import { t } from '$lib/i18n.svelte'; let { message, onRetry }: { message: string; onRetry: () => void } = $props(); @@ -10,6 +11,6 @@

{message}

diff --git a/ui/src/lib/components/HomeHero.svelte b/ui/src/lib/components/HomeHero.svelte index acff6ce..94c9764 100644 --- a/ui/src/lib/components/HomeHero.svelte +++ b/ui/src/lib/components/HomeHero.svelte @@ -6,9 +6,10 @@ import SearchSuggest from '$lib/components/SearchSuggest.svelte'; import RyokuMusicDeck from '$lib/components/RyokuMusicDeck.svelte'; import { auth } from '$lib/player.svelte'; + import { t } from '$lib/i18n.svelte'; const hour = new Date().getHours(); - const daypart = hour < 5 ? 'Good night' : hour < 12 ? 'Good morning' : hour < 18 ? 'Good afternoon' : 'Good evening'; + const daypart = hour < 5 ? t('Good night') : hour < 12 ? t('Good morning') : hour < 18 ? t('Good afternoon') : t('Good evening'); let searchQuery = $state(''); function accountFirstName(name?: string | null) { const raw = name?.trim().split(/\s+/)[0] ?? ''; @@ -32,13 +33,13 @@
力 - HOME / LISTEN + {t('HOME / LISTEN')} 01

{daypart}{firstName ? `, ${firstName}` : ''}

-

Pick up where you left off, or find the next thing worth hearing.

+

{t('Pick up where you left off, or find the next thing worth hearing.')}

{ e.preventDefault(); goSearch(); }}> @@ -50,10 +51,10 @@ /> -
- {MOD}K command search +
+ {MOD}K {t('command search')} - SPACE play / pause + SPACE {t('play / pause')}
diff --git a/ui/src/lib/components/LibrarySongs.svelte b/ui/src/lib/components/LibrarySongs.svelte index 5f472d6..b2fb2f6 100644 --- a/ui/src/lib/components/LibrarySongs.svelte +++ b/ui/src/lib/components/LibrarySongs.svelte @@ -18,6 +18,7 @@ import { getCached, putCached } from '$lib/pagecache'; import { thumb } from '$lib/thumb'; import { openAddToPlaylist, openPlayer, playback } from '$lib/player.svelte'; + import { t } from '$lib/i18n.svelte'; // Cached like every other browse page, so switching tabs (or leaving the Library and coming // back) paints the list instead of refetching it and losing every page you scrolled in. @@ -58,8 +59,8 @@ // filter walks every page), and say so while that walk is still running. const line = $derived( filtering - ? `${shownSongs.length.toLocaleString()} matching${token && !moreError ? ' so far' : ''}` - : 'Every song you’ve saved, in one list' + ? `${shownSongs.length.toLocaleString()} ${t('matching')}${token && !moreError ? t(' so far') : ''}` + : t('Every song you’ve saved, in one list') ); // Four covers for the mosaic. Distinct ones: a library that opens on six tracks off the same // album would otherwise draw the same sleeve four times. @@ -77,7 +78,7 @@ // The queue this tab builds. Not a `playFrom`: there is no page behind "the songs in your // library", so it has no business landing in recents or the sidebar's last-played order. - const SOURCE = 'Your songs'; + const SOURCE = t('Your songs'); onMount(() => { const cached = getCached(KEY); @@ -218,13 +219,13 @@ {/if}
-

Songs

+

{t('Songs')}

{line}

- + @@ -255,18 +256,18 @@ {:else if filtering}

- No songs match “{query.trim()}”{token && !moreError ? ' yet, still loading' : ''}. + {t('No songs match')} “{query.trim()}”{token && !moreError ? t(' yet, still loading') : ''}.

{:else}

- No songs in your library yet. Hit the ⋯ on a song and save it, or like it, and it lands here. + {t('No songs in your library yet. Hit the ⋯ on a song and save it, or like it, and it lands here.')}

{/if} {#if moreError}
{:else if shown < shownSongs.length || token} diff --git a/ui/src/lib/components/LinkDialog.svelte b/ui/src/lib/components/LinkDialog.svelte index 4e1722b..eaeeb3f 100644 --- a/ui/src/lib/components/LinkDialog.svelte +++ b/ui/src/lib/components/LinkDialog.svelte @@ -9,6 +9,7 @@ import { hrefFor } from '$lib/browse'; import { parseYtLink } from '$lib/ytlink'; import { startRadio, toast, ui } from '$lib/player.svelte'; + import { t } from '$lib/i18n.svelte'; let url = $state(''); const target = $derived(parseYtLink(url)); @@ -30,7 +31,7 @@ const value = await navigator.clipboard.readText(); if (value) url = value.trim(); } catch { - toast.error('Clipboard access was not available'); + toast.error(t('Clipboard access was not available')); } } @@ -38,7 +39,7 @@ e.preventDefault(); const resolved = parseYtLink(url); if (!resolved) { - toast.error('That is not a YouTube Music link'); + toast.error(t('That is not a YouTube Music link')); return; } ui.linkOpen = false; @@ -52,15 +53,15 @@
—力LINK / RESOLVELINK-01
- Open a music link - Resolve a YouTube Music song, album, artist or playlist without leaving the instrument. + {t('Open a music link')} + {t('Resolve a YouTube Music song, album, artist or playlist without leaving the instrument.')}
@@ -72,8 +73,8 @@
ACCEPTSSONG · ALBUM · ARTIST · PLAYLIST
- - + +
diff --git a/ui/src/lib/components/ListenTogether.svelte b/ui/src/lib/components/ListenTogether.svelte index 8cbdf6c..1f454cd 100644 --- a/ui/src/lib/components/ListenTogether.svelte +++ b/ui/src/lib/components/ListenTogether.svelte @@ -18,6 +18,7 @@ import { auth, ui, toast } from '$lib/player.svelte'; import { lt } from '$lib/lt.svelte'; import { thumb } from '$lib/thumb'; + import { t } from '$lib/i18n.svelte'; let mode = $state<'join' | 'host'>('join'); let name = $state(''); @@ -65,12 +66,12 @@ } async function host() { - if (!name.trim()) return toast.error('Enter a name first'); + if (!name.trim()) return toast.error(t('Enter a name first')); const u = serverUrl.trim(); - if (!u) return toast.error('Enter your sync server URL'); + if (!u) return toast.error(t('Enter your sync server URL')); busy = true; try { - if (!/^wss?:\/\//i.test(u)) throw new Error('Use a ws:// or wss:// sync server address'); + if (!/^wss?:\/\//i.test(u)) throw new Error(t('Use a ws:// or wss:// sync server address')); if (u !== lt.serverUrl) await api.ltSetServerUrl(u); rememberName(); await api.ltCreateRoom(name.trim()); @@ -83,14 +84,14 @@ async function join(e?: Event) { e?.preventDefault(); - if (!name.trim()) return toast.error('Enter a name first'); + if (!name.trim()) return toast.error(t('Enter a name first')); const parsed = parseInvite(inviteInput); - if (!parsed || !parsed.code) return toast.error('Paste the invite code your friend sent'); + if (!parsed || !parsed.code) return toast.error(t('Paste the invite code your friend sent')); const server = parsed.server || lt.serverUrl; - if (!server) return toast.error('Paste the full invite from the host, it carries the server address'); + if (!server) return toast.error(t('Paste the full invite from the host, it carries the server address')); busy = true; try { - if (!/^wss?:\/\//i.test(server)) throw new Error('The invite does not contain a valid sync server'); + if (!/^wss?:\/\//i.test(server)) throw new Error(t('The invite does not contain a valid sync server')); if (server !== lt.serverUrl) await api.ltSetServerUrl(server); rememberName(); await api.ltJoinRoom(parsed.code, name.trim()); @@ -107,8 +108,8 @@ function copyInvite() { copyText(invite).then( - () => toast.success('Invite copied, send it to a friend'), - () => toast.error('Could not copy the invite') + () => toast.success(t('Invite copied, send it to a friend')), + () => toast.error(t('Could not copy the invite')) ); } @@ -116,76 +117,76 @@
-
—力SESSION / SYNCLT-01
- Listen Together - Share one queue and one playback clock without turning music into a meeting. +
—力{t('SESSION / SYNC')}LT-01
+ {t('Listen Together')} + {t('Share one queue and one playback clock without turning music into a meeting.')}
{#if waiting}
- // SESSION / HANDSHAKE - {lt.status === 'connecting' ? 'Connecting to the sync transport.' : 'Waiting for host approval.'} -

The music engine stays local until the session is accepted.

-
STATE{lt.status.toUpperCase()}ROLEGUEST
- + {t('// SESSION / HANDSHAKE')} + {t(lt.status === 'connecting' ? 'Connecting to the sync transport.' : 'Waiting for host approval.')} +

{t('The music engine stays local until the session is accepted.')}

+
{t('STATE')}{lt.status.toUpperCase()}{t('ROLE')}{t('GUEST')}
+
{:else if !inRoom}
-
- - +
+ +
{#if mode === 'join'}
- - -
ROLEGUEST
TRANSPORTWEBSOCKET
QUEUEFOLLOW HOST
-
+ + +
{t('ROLE')}{t('GUEST')}
{t('TRANSPORT')}WEBSOCKET
{t('QUEUE')}{t('FOLLOW HOST')}
+
{:else}
- - -
ROLEHOST
TRANSPORTWEBSOCKET
CONTROLLOCAL
-
+ + +
{t('ROLE')}{t('HOST')}
{t('TRANSPORT')}WEBSOCKET
{t('CONTROL')}LOCAL
+
{/if}
{:else}
-
// LIVE SESSION{isHost ? 'HOST' : 'GUEST'} · {lt.status.toUpperCase()}
-
{invite}
+
{t('// LIVE SESSION')}{t(isHost ? 'HOST' : 'GUEST')} · {lt.status.toUpperCase()}
+
{invite}
{#if lt.currentTrack}
{#if lt.currentTrack.thumbnail}{/if} -
NOW PLAYING{lt.currentTrack.title}{lt.currentTrack.artist}
+
{t('NOW PLAYING')}{lt.currentTrack.title}{lt.currentTrack.artist}
{/if}
{#if isHost && lt.pendingJoins.length}
-
// JOIN REQUESTS{lt.pendingJoins.length}
+
{t('// JOIN REQUESTS')}{lt.pendingJoins.length}
{#each lt.pendingJoins as p (p.userId)} -
?{p.username}
+
?{p.username}
{/each}
{/if}
-
// LISTENERS{lt.users.length}
+
{t('// LISTENERS')}{lt.users.length}
{#each lt.users as u (u.user_id)}
{u.is_connected ? '●' : '○'} - {u.username}{u.user_id === lt.myId ? ' · YOU' : ''} - {u.is_host ? 'HOST' : 'LISTENER'}
+ {u.username}{u.user_id === lt.myId ? t(' · YOU') : ''} + {t(u.is_host ? 'HOST' : 'LISTENER')}
{#if u.is_host}{/if} {#if isHost && u.user_id !== lt.myId} - - + + {/if}
{/each} @@ -193,17 +194,17 @@ {#if isHost && lt.suggestions.length}
-
// SUGGESTIONS{lt.suggestions.length}
+
{t('// SUGGESTIONS')}{lt.suggestions.length}
{#each lt.suggestions as s (s.id)} -
{s.track.title}{s.track.artist} · from {s.from_username}
+
{s.track.title}{s.track.artist} · {t('from')} {s.from_username}
{/each}
{/if}
-
SYNC{lt.status.toUpperCase()}
- {#if !isHost}{/if} - +
{t('SYNC')}{lt.status.toUpperCase()}
+ {#if !isHost}{/if} +
{/if} diff --git a/ui/src/lib/components/ListeningInsights.svelte b/ui/src/lib/components/ListeningInsights.svelte index bcce2db..0a08b50 100644 --- a/ui/src/lib/components/ListeningInsights.svelte +++ b/ui/src/lib/components/ListeningInsights.svelte @@ -1,6 +1,7 @@ @@ -104,10 +105,10 @@
- Folders + {t('Folders')}

- Music in these folders plays without an internet connection. + {t('Music in these folders plays without an internet connection.')}

@@ -119,10 +120,10 @@ onclick={() => scanLocal()} > - {local.loading ? 'Scanning…' : 'Rescan'} + {local.loading ? t('Scanning…') : t('Rescan')}
@@ -135,7 +136,7 @@
@@ -163,14 +164,14 @@
- Albums ({albums.length}) - Artists ({artists.length}) - Songs ({songs.length}) + {t('Albums')} ({albums.length}) + {t('Artists')} ({artists.length}) + {t('Songs')} ({songs.length}) - +
{#if q && !songs.length && !albums.length && !artists.length} -

Nothing on this device matches “{q}”.

+

{t('Nothing on this device matches')} “{q}”.

{/if} @@ -200,7 +201,7 @@ disabled={!songs.length} onclick={() => playAll(false)} > - Play all + {t('Play all')}
@@ -233,8 +234,7 @@ {:else if local.folders.length}

- Nothing playable found in those folders yet. Looking for mp3, flac, m4a, aac, ogg, opus, - wav, wma, aiff, ape, wv and mka files. + {t('Nothing playable found in those folders yet.')} {t('Looking for mp3, flac, m4a, aac, ogg, opus, wav, wma, aiff, ape, wv and mka files.')}

{/if}
diff --git a/ui/src/lib/components/LyricsView.svelte b/ui/src/lib/components/LyricsView.svelte index 87a69dc..0d81afe 100644 --- a/ui/src/lib/components/LyricsView.svelte +++ b/ui/src/lib/components/LyricsView.svelte @@ -8,6 +8,7 @@ import { appearance } from '$lib/theme.svelte'; import { ryokuWheelScroll } from '$lib/ryoku-scroll'; import { HugeiconsIcon } from '@hugeicons/svelte'; + import { t } from '$lib/i18n.svelte'; import { RefreshIcon, MusicNote01Icon } from '@hugeicons/core-free-icons'; // `expanded` only sizes the type and centres the column. The owner of the extra room (the side @@ -267,7 +268,7 @@ : 'px-5 py-6'}" > {#if manualScroll && lyrics?.synced && activeIndex >= 0 && !compact} - + {/if} {#if loading}
@@ -276,8 +277,8 @@ LOCAL → PROVIDERS
- {playback.now?.title ?? 'CURRENT TRACK'} - {playback.now?.artists ?? 'Waiting for metadata'} + {playback.now?.title ?? t('CURRENT TRACK')} + {playback.now?.artists ?? t('Waiting for metadata')}
@@ -385,10 +386,10 @@
{lyrics.source.startsWith('Source:') ? lyrics.source : `Lyrics from ${lyrics.source}`} {#if lyrics.synced} -
- Timing {formatOffset(offsetMs)} +
+ {t('Timing')} {formatOffset(offsetMs)} - +
{/if} diff --git a/ui/src/lib/components/MiniPlayer.svelte b/ui/src/lib/components/MiniPlayer.svelte index 4adf238..b2ee111 100644 --- a/ui/src/lib/components/MiniPlayer.svelte +++ b/ui/src/lib/components/MiniPlayer.svelte @@ -33,6 +33,7 @@ import LyricsView from './LyricsView.svelte'; import QueueList from './QueueList.svelte'; import Marquee from './Marquee.svelte'; + import { t } from '$lib/i18n.svelte'; type MiniView = 'now' | 'lyrics' | 'queue'; let view = $state('now'); @@ -89,31 +90,31 @@ style={accent ? `--mini-accent:${accent}` : undefined} > -
+
// LIVE
- {now?.title ?? 'Nothing playing'} - {now?.artists ?? 'Ryotunes is ready'} + {now?.title ?? t('Nothing playing')} + {now?.artists ?? t('Ryotunes is ready')}
力 RYOTUNES
-
@@ -121,8 +122,8 @@ {#if view === 'now'}
- - + +
{fmt(shownPosition)} @@ -135,22 +136,22 @@ value={shownPosition} oninput={onSeekInput} onchange={onSeekCommit} - aria-label="Seek" + aria-label={t('Seek')} /> {fmt(playback.duration)}
-
+
- {next ? `NEXT · ${next.title}` : 'QUEUE · END'} + {next ? `${t('Next')} · ${next.title}` : `${t('Queue')} · ${t('End')}`}
{:else if view === 'lyrics'} -
+
// LYRICSAUTO FOLLOW
{:else} -
+
// QUEUE{Math.max(0, playback.queue.items.length - playback.queue.currentIndex - 1)} NEXT
@@ -159,19 +160,19 @@
- - - + + - - +
-
- dragVolume(Number(e.currentTarget.value))} onchange={(e) => commitVolume(Number(e.currentTarget.value))} onwheel={wheelVolume} - aria-label="Volume" + aria-label={t('Volume')} />
diff --git a/ui/src/lib/components/NowPlaying.svelte b/ui/src/lib/components/NowPlaying.svelte index 835e527..756a2fd 100644 --- a/ui/src/lib/components/NowPlaying.svelte +++ b/ui/src/lib/components/NowPlaying.svelte @@ -16,6 +16,7 @@ import * as api from '$lib/api'; import { np, playback, ui } from '$lib/player.svelte'; import { appearance } from '$lib/theme.svelte'; + import { t } from '$lib/i18n.svelte'; import ArtworkImage from './ArtworkImage.svelte'; import QueueList from './QueueList.svelte'; import LyricsView from './LyricsView.svelte'; @@ -72,13 +73,13 @@ >
{#if !big} -
+
- diff --git a/ui/src/lib/components/PlayerBar.svelte b/ui/src/lib/components/PlayerBar.svelte index 73d5a40..1e622c7 100644 --- a/ui/src/lib/components/PlayerBar.svelte +++ b/ui/src/lib/components/PlayerBar.svelte @@ -41,6 +41,7 @@ import ArtistLine from './ArtistLine.svelte'; import Marquee from './Marquee.svelte'; import TrackMenu from './TrackMenu.svelte'; + import { t } from '$lib/i18n.svelte'; let { onToggleQueue, @@ -164,16 +165,16 @@
{#if playback.pendingVideoId} - RESOLVING + {t('RESOLVING')} {/if} {#if autoplayTrack} @@ -196,7 +197,7 @@ size="icon-sm" class="hidden lg:inline-flex" onclick={toggleLike} - aria-label="Like" + aria-label={t('Like')} > @@ -248,7 +249,7 @@ variant="ghost" size="icon-sm" onclick={() => api.toggleShuffle()} - aria-label="Shuffle" + aria-label={t('Shuffle')} aria-pressed={shuffleOn} > - - @@ -374,7 +375,7 @@ variant="ghost" size="icon-sm" onclick={() => (np.open = !np.open)} - aria-label={np.open ? 'Minimise player' : 'Open player'} + aria-label={t(np.open ? 'Minimise player' : 'Open player')} aria-expanded={np.open} > diff --git a/ui/src/lib/components/PlaylistMenu.svelte b/ui/src/lib/components/PlaylistMenu.svelte index 6b00419..95393e0 100644 --- a/ui/src/lib/components/PlaylistMenu.svelte +++ b/ui/src/lib/components/PlaylistMenu.svelte @@ -32,6 +32,7 @@ togglePin, toggleSaved } from '$lib/player.svelte'; + import { t } from '$lib/i18n.svelte'; let { item, @@ -109,7 +110,7 @@
run(e, () => togglePin(item.id))} > - {pinned ? 'Unpin' : 'Pin to top'} + {t(pinned ? 'Unpin' : 'Pin to top')} {/if} {#if canQueue} @@ -153,7 +154,7 @@ queue(true); }} > - Play next + {t('Play next')} {/if} {#if onYouTube} @@ -171,7 +172,7 @@ class="flex w-full cursor-pointer items-center gap-2 rounded-md px-2 py-1.5 text-left text-sm hover:bg-accent/10" onclick={(e) => run(e, () => startRadio(item.kind as 'artist' | 'album' | 'playlist', item.id, item.title))} > - Start radio + {t('Start radio')} {/if} {#if onYouTube} {/if} @@ -196,10 +197,10 @@ onclick={(e) => run(e, () => { toggleSaved(item); - toast.success('Removed from library'); + toast.success(t('Removed from library')); })} > - Remove from library + {t('Remove from library')} {/if}
diff --git a/ui/src/lib/components/QueuePanel.svelte b/ui/src/lib/components/QueuePanel.svelte index 59d7eb4..218136e 100644 --- a/ui/src/lib/components/QueuePanel.svelte +++ b/ui/src/lib/components/QueuePanel.svelte @@ -1,6 +1,7 @@ @@ -9,13 +10,13 @@ diff --git a/ui/src/lib/components/SavedInPlaylists.svelte b/ui/src/lib/components/SavedInPlaylists.svelte index 17a0e96..d22f193 100644 --- a/ui/src/lib/components/SavedInPlaylists.svelte +++ b/ui/src/lib/components/SavedInPlaylists.svelte @@ -10,6 +10,7 @@ import type { BrowseItem } from '$lib/api'; import { hrefFor } from '$lib/browse'; import { anchorMenu, fitMenu, NO_ANCHOR, toBody } from '$lib/menu'; + import { t } from '$lib/i18n.svelte'; import { thumb } from '$lib/thumb'; let { playlists }: { playlists: BrowseItem[] } = $props(); @@ -39,8 +40,8 @@ const label = $derived( playlists.length === 1 - ? `Saved in ${playlists[0].title}` - : `Saved in ${playlists.length} playlists` + ? `${t('Saved in')} ${playlists[0].title}` + : `${t('Saved in')} ${playlists.length} ${t('playlists')}` ); @@ -69,7 +70,7 @@ {@attach toBody} >

- Saved in + {t('Saved in')}

{#each shown as pl (pl.id)} {/each} {#if extra > 0} -

and {extra} more

+

{t('and')} {extra} {t('more')}

{/if} {/if} diff --git a/ui/src/lib/components/SearchSuggest.svelte b/ui/src/lib/components/SearchSuggest.svelte index c4c87bc..09bfb50 100644 --- a/ui/src/lib/components/SearchSuggest.svelte +++ b/ui/src/lib/components/SearchSuggest.svelte @@ -18,6 +18,7 @@ import TrackMenu from './TrackMenu.svelte'; import { createSearchPager, nextSearchPage, searchPagerDone, type SearchPagerState } from '$lib/search-pager'; import { ownNestedVerticalScroll } from '$lib/ryoku-scroll'; + import { t } from '$lib/i18n.svelte'; let { value = $bindable(''), @@ -44,7 +45,7 @@ let loadedFor = ''; // query `items` belongs to, so a stale response can't land let debounce: ReturnType | undefined; - const KIND = { song: 'Song', album: 'Album', artist: 'Artist', playlist: 'Playlist' }; + const KIND = { song: t('Song'), album: t('Album'), artist: t('Artist'), playlist: t('Playlist') }; async function load(q: string) { loadedFor = q; @@ -166,7 +167,7 @@ {#if loading && !items.length}
-
// SEARCH / RESOLVEFETCHING
-
QUERY{value.trim()}SOURCEYOUTUBE MUSIC
+
{t('// SEARCH / RESOLVE')}{t('FETCHING')}
+
{t('QUERY')}{value.trim()}{t('SOURCE')}YOUTUBE MUSIC
{:else if !items.length} -
Nothing quick for that.
+
{t('Nothing quick for that.')}
{:else} {#each items as item, i (item.id)} {@const hero = i === 0} @@ -237,7 +238,7 @@ {KIND[item.kind]}{item.subtitle ? ` • ${item.subtitle}` : ''} - {#if hero}Top result{/if} + {#if hero}{t('Top result')}{/if} {#if item.kind === 'song'} // LOADING MORE RESULTS +
{t('// LOADING MORE RESULTS')}
{:else if items.length && searchPagerDone(pager)} -
// END OF QUICK RESULTS
+
{t('// END OF QUICK RESULTS')}
{/if} {/if} diff --git a/ui/src/lib/components/SettingsDialog.svelte b/ui/src/lib/components/SettingsDialog.svelte index 7e5cf1c..a740b60 100644 --- a/ui/src/lib/components/SettingsDialog.svelte +++ b/ui/src/lib/components/SettingsDialog.svelte @@ -14,28 +14,29 @@ import { setInterfaceScale } from '$lib/zoom'; import { KEYBIND_GROUPS } from '$lib/shortcuts'; import { normalizeSearchText } from '$lib/localsearch'; + import { t } from '$lib/i18n.svelte'; type TabId = 'general' | 'playback' | 'data' | 'keybinds' | 'about'; const TABS: { id: TabId; label: string }[] = [ - { id: 'general', label: 'General' }, - { id: 'playback', label: 'Playback' }, - { id: 'data', label: 'Data & storage' }, - { id: 'keybinds', label: 'Keybinds' }, - { id: 'about', label: 'About' } + { id: 'general', label: t('General') }, + { id: 'playback', label: t('Playback') }, + { id: 'data', label: t('Data & storage') }, + { id: 'keybinds', label: t('Keybinds') }, + { id: 'about', label: t('About') } ]; const TAB_META: Record = { - general: { jp: '全般', group: 'APPLICATION', blurb: 'Session behaviour, desktop integration and the things that should stay out of your way.', code: 'APP-01' }, - playback: { jp: '再生', group: 'PLAYBACK', blurb: 'How the listening engine resolves, queues and carries a session forward.', code: 'PLAY-02' }, - data: { jp: '保存', group: 'DATA', blurb: 'Network routing and local storage used to keep the instrument responsive.', code: 'DATA-03' }, - keybinds: { jp: '鍵', group: 'KEYBINDS', blurb: 'Every Ryotunes shortcut, grouped by intent and read from the same registry the app executes.', code: 'KEY-04' }, - about: { jp: '力', group: 'ABOUT', blurb: 'Build identity and the small set of components that make Ryotunes a Ryoku music instrument.', code: 'INFO-05' } + general: { jp: '全般', group: 'APPLICATION', blurb: t('Session behaviour, desktop integration and the things that should stay out of your way.'), code: 'APP-01' }, + playback: { jp: '再生', group: 'PLAYBACK', blurb: t('How the listening engine resolves, queues and carries a session forward.'), code: 'PLAY-02' }, + data: { jp: '保存', group: 'DATA', blurb: t('Network routing and local storage used to keep the instrument responsive.'), code: 'DATA-03' }, + keybinds: { jp: '鍵', group: 'KEYBINDS', blurb: t('Every Ryotunes shortcut, grouped by intent and read from the same registry the app executes.'), code: 'KEY-04' }, + about: { jp: '力', group: 'ABOUT', blurb: t('Build identity and the small set of components that make Ryotunes a Ryoku music instrument.'), code: 'INFO-05' } }; let tab = $state('general'); const metaFor = (id: TabId) => TAB_META[id]; const activeMeta = $derived(metaFor(tab)); - const activeLabel = $derived(TABS.find((t) => t.id === tab)?.label ?? 'General'); + const activeLabel = $derived(TABS.find((t) => t.id === tab)?.label ?? t('General')); const PRODUCT_VERSION = 'v2.4'; let buildVersion = $state('2.4.1'); getVersion().then((v) => (buildVersion = v)).catch(() => {}); @@ -55,17 +56,17 @@ const settingsCaption = $derived.by(() => { if (tab === 'general') { return auth.account?.signedIn - ? `Session ready${auth.account.name ? ` — ${auth.account.name}` : ''}. Desktop services stay local.` - : 'Local desktop session. Sign in only when your YouTube library needs it.'; - } - if (tab === 'playback') { - return playback.now - ? `${playback.now.title} — ${playback.now.artists || 'Now playing'}` - : 'Playback engine ready. No stream is active.'; - } - if (tab === 'data') return 'Tape, cache and transport — the local path that keeps playback immediate.'; - if (tab === 'keybinds') return 'Keyboard flow is part of the instrument: searchable, grouped and always in sync with the live bindings.'; - return `Ryotunes ${PRODUCT_VERSION} — a Ryoku-native music instrument built around Rust, mpv and WebKitGTK.`; + ? `${t('Session ready')}${auth.account.name ? ` — ${auth.account.name}` : ''}. ${t('Desktop services stay local.')}` + : t('Local desktop session. Sign in only when your YouTube library needs it.'); + } + if (tab === 'playback') { + return playback.now + ? `${playback.now.title} — ${playback.now.artists || t('Now playing')}` + : t('Playback engine ready. No stream is active.'); + } + if (tab === 'data') return t('Tape, cache and transport — the local path that keeps playback immediate.'); + if (tab === 'keybinds') return t('Keyboard flow is part of the instrument: searchable, grouped and always in sync with the live bindings.'); + return `${t('Ryotunes')} ${PRODUCT_VERSION} — ${t('a Ryoku-native music instrument built around Rust, mpv and WebKitGTK.')}`; }); const settingsReadout = $derived.by(() => { if (tab === 'general') { @@ -165,9 +166,9 @@ ); const QUALITIES = [ - { id: 'LOW', label: 'Low' }, - { id: 'AUTO', label: 'Auto' }, - { id: 'HIGH', label: 'High' } + { id: 'LOW', label: t('Low') }, + { id: 'AUTO', label: t('Auto') }, + { id: 'HIGH', label: t('High') } ]; async function setQuality(q: string) { @@ -175,7 +176,7 @@ await api.setSetting('quality', q); // Cached URLs are keyed by video only, so clear them to apply the new quality everywhere. await api.clearCaches(); - toast.success('Audio quality updated'); + toast.success(t('Audio quality updated')); } async function setHistory(on: boolean) { @@ -209,7 +210,7 @@ const value = discordNameInput.trim() || 'Ryotunes'; const length = [...value].length; if (length < 2 || length > 128) { - toast.error('Discord presence title must be between 2 and 128 characters'); + toast.error(t('Discord presence title must be between 2 and 128 characters')); return; } savingDiscordName = true; @@ -217,7 +218,7 @@ await api.setSetting('discord_presence_name', value); settings.discord_presence_name = value; discordNameInput = value; - toast.success(`Discord now shows “Listening to ${value}”`); + toast.success(`${t('Discord now shows')} “${t('Listening to')} ${value}”`); } catch (e) { toast.error(String(e)); } finally { @@ -278,7 +279,7 @@ await api.setSetting('proxy', value); settings.proxy = value; proxyInput = value; - toast.success('Proxy saved — restart to apply'); + toast.success(t('Proxy saved — restart to apply')); } catch (e) { toast.error(String(e)); } @@ -288,7 +289,7 @@ clearing = true; try { await api.clearCaches(); - toast.success('Caches cleared'); + toast.success(t('Caches cleared')); } finally { clearing = false; } @@ -304,7 +305,7 @@ RYOTUNES // SETTINGS_ - Ryotunes application settings + {t("Ryotunes application settings")}
{activeMeta.code}///
@@ -361,47 +362,46 @@
{#if !loaded} -

Loading…

+

{t('Loading…')}

{:else if tab === 'general'}
-
Appearance
-

Follow the desktop automatically, or keep Ryotunes in its comfortable light or dark palette.

-
- {#each [['system','Follow system'], ['light','Light'], ['dark','Dark']] as option} +
{t('Appearance')}
+

{t("Follow the desktop automatically, or keep Ryotunes in its comfortable light or dark palette.")}

+
+ {#each [['system', t('Follow system')], ['light', t('Light')], ['dark', t('Dark')]] as option} {/each}
-

Currently {resolvedTheme()}. Ryoku accent and reduced-motion preferences still apply.

-
+

{t('Currently')} {resolvedTheme()}. {t("Ryoku accent and reduced-motion preferences still apply.")}

+
-
Watch history
+
{t('Watch history')}

- {auth.account?.signedIn ? 'Register completed plays in your YouTube Music history.' : 'Sign in to register completed plays in your YouTube Music history.'} + {t(auth.account?.signedIn ? 'Register completed plays in your YouTube Music history.' : 'Sign in to register completed plays in your YouTube Music history.')}

-
Discord rich presence
-

Show what you're listening to on your Discord profile through the local Discord desktop client.

-

Status: {discordState.status === 'connected' ? 'Connected' : discordState.status === 'connecting' ? 'Connecting…' : discordState.status === 'unavailable' ? 'Discord not running / unavailable' : 'Disabled'}

+
{t('Discord rich presence')}
+

{t("Show what you're listening to on your Discord profile through the local Discord desktop client.")}

+

{t('Status:')} {t(discordState.status === 'connected' ? 'Connected' : discordState.status === 'connecting' ? 'Connecting…' : discordState.status === 'unavailable' ? 'Discord not running / unavailable' : 'Disabled')}

-
Discord presence title
+
{t('Discord presence title')}

- Customize the text Discord renders as “Listening to …”. Track, artist and Ryotunes' - application identity stay unchanged. + {t("Customize the text Discord renders as “Listening to …”. Track, artist and Ryotunes' application identity stay unchanged.")}

- Preview: Listening to {discordNameInput.trim() || 'Ryotunes'} + {t('Preview:')} {t('Listening to')} {discordNameInput.trim() || 'Ryotunes'}

-
Close to tray
+
{t('Close to tray')}

- Closing the window keeps music playing in the background. Restore or quit from the - tray icon. + {t("Closing the window keeps music playing in the background. Restore or quit from the tray icon.")}

-
Low resource mode
+
{t('Low resource mode')}

- Keep playback quality unchanged while disabling speculative stream warming, reducing automatic Home/network work, slowing nonessential UI updates and suppressing decorative motion. + {t("Keep playback quality unchanged while disabling speculative stream warming, reducing automatic Home/network work, slowing nonessential UI updates and suppressing decorative motion.")}

-
Start on login
+
{t('Start on login')}

- Launch Ryotunes automatically when you log in. + {t('Launch Ryotunes automatically when you log in.')}

-
Interface scale
+
{t('Interface scale')}

- Adjust the WebKit interface without changing your desktop scaling. Ctrl+0 restores 110%. + {t("Adjust the WebKit interface without changing your desktop scaling. Ctrl+0 restores 110%.")}

{#each UI_SCALES as n (n)} @@ -466,17 +465,17 @@ {:else if tab === 'playback'}
// PLAYER BEHAVIOURLOCAL
-
Open the player when playback starts

Bring the full listening view forward when you choose a track, album or playlist.

+
{t('Open the player when playback starts')}

{t("Bring the full listening view forward when you choose a track, album or playlist.")}

setAppearance({ openPlayerOnPlay: on })} />
-
Queue and lyrics inside the player

Keep Queue and Lyrics as tabs in Now Playing. Turn off to use the floating side panels instead.

+
{t('Queue and lyrics inside the player')}

{t("Keep Queue and Lyrics as tabs in Now Playing. Turn off to use the floating side panels instead.")}

setAppearance({ tabbedPlayer: on })} />
-
Audio quality
+
{t('Audio quality')}

- Preferred stream quality when resolving a track. + {t("Preferred stream quality when resolving a track.")}

{#each QUALITIES as q (q.id)} @@ -492,40 +491,35 @@
-
Autoplay
+
{t('Autoplay')}

- Keep the music going with similar songs when your queue ends. + {t("Keep the music going with similar songs when your queue ends.")}

-
Prevent duplicate tracks in queue
+
{t('Prevent duplicate tracks in queue')}

- Adding a track that's already in the queue moves it from its old position instead of - adding a second copy. + {t("Adding a track that's already in the queue moves it from its old position instead of adding a second copy.")}

-
Word-by-word lyrics
+
{t('Word-by-word lyrics')}

- Asks lyrics-api.boidu.dev first, the only source here with per-word timings, so - lyrics can highlight as they're sung. It's checked for every track, so turning - this off keeps your listening off that service. Other sources still provide - line-by-line lyrics. + {t("Asks lyrics-api.boidu.dev first, the only source here with per-word timings, so lyrics can highlight as they're sung. It's checked for every track, so turning this off keeps your listening off that service. Other sources still provide line-by-line lyrics.")}

-
Stream clients
+
{t('Stream clients')}

- Advanced — turn a client off to skip it when resolving streams. Overridden by a - RYOTUNES_DISABLED_CLIENTS environment value when one is configured. + {t("Advanced — turn a client off to skip it when resolving streams. Overridden by a RYOTUNES_DISABLED_CLIENTS environment value when one is configured.")}

{#each clients as name (name)} @@ -541,10 +535,9 @@
{:else if tab === 'data'}
-
Proxy
+
{t('Proxy')}

- HTTP or HTTPS proxy for all YouTube traffic. Authenticated proxy URLs are not - stored. Takes effect on restart. + {t("HTTP or HTTPS proxy for all YouTube traffic. Authenticated proxy URLs are not stored. Takes effect on restart.")}

- - + +
-
Cache
+
{t('Cache')}

- Clear cached stream URLs and downloaded audio bytes. + {t("Clear cached stream URLs and downloaded audio bytes.")}

{:else if tab === 'keybinds'}
// KEYBOARD MAP{KEYBIND_GROUPS.reduce((n, g) => n + g.rows.length, 0)} BINDINGS
- +
{#each visibleKeybindGroups as group (group.title)}
@@ -578,14 +571,13 @@ {/each}
{/each} - {#if !visibleKeybindGroups.length}

No shortcut matches that filter.

{/if} + {#if !visibleKeybindGroups.length}

{t('No shortcut matches that filter.')}

{/if}
{:else if tab === 'about'}
Ryotunes

- A focused Ryoku desktop music instrument: your YouTube Music library, local media - controls, queue, lyrics and playback engine in one paper-and-ink surface. + {t("A focused Ryoku desktop music instrument: your YouTube Music library, local media controls, queue, lyrics and playback engine in one paper-and-ink surface.")}

RELEASE{PRODUCT_VERSION}BUILD{buildVersion}ENGINERUST + MPVUITAURI / WEBKITGTK
diff --git a/ui/src/lib/components/ShareDialog.svelte b/ui/src/lib/components/ShareDialog.svelte index e00a608..0710cf5 100644 --- a/ui/src/lib/components/ShareDialog.svelte +++ b/ui/src/lib/components/ShareDialog.svelte @@ -12,6 +12,7 @@ import { Switch } from '$lib/components/ui/switch'; import { thumb } from '$lib/thumb'; import { ui, toast } from '$lib/player.svelte'; + import { t } from '$lib/i18n.svelte'; // Playlist browseIds carry a `VL` prefix that the watch/playlist URLs don't take. function shareUrl(item: BrowseItem): string { @@ -94,7 +95,7 @@ copied = true; setTimeout(() => (copied = false), 1500); }, - () => toast.error('Could not copy the link. Select it and press Ctrl+C.') + () => toast.error(t('Could not copy the link. Select it and press Ctrl+C.')) ); } @@ -112,11 +113,11 @@ >
-

Share

+

{t('Share')}

@@ -152,35 +153,35 @@
{#if privacy === 'PRIVATE'}
-

This playlist is private. Anyone you send the link to will get an error.

+

{t('This playlist is private. Anyone you send the link to will get an error.')}

{/if} {#if wasPrivate && canToggle}
-
Public
+
{t('Public')}

- {privacy === 'PUBLIC' + {t(privacy === 'PUBLIC' ? 'Anyone with the link can open it.' - : 'Turn on to make the link work for everyone.'} + : 'Turn on to make the link work for everyone.')}

{/if} diff --git a/ui/src/lib/components/Sidebar.svelte b/ui/src/lib/components/Sidebar.svelte index 94efb25..8de814b 100644 --- a/ui/src/lib/components/Sidebar.svelte +++ b/ui/src/lib/components/Sidebar.svelte @@ -32,13 +32,14 @@ } from '$lib/player.svelte'; import { mergeSaved, orderLibrary } from '$lib/personal'; import { normalizeSearchText } from '$lib/localsearch'; + import { t } from '$lib/i18n.svelte'; const discoverNav = [ - { href: '/', label: 'Home', icon: Home01Icon, kana: '聴' }, - { href: '/search', label: 'Search', icon: Search01Icon, kana: '探' }, - { href: '/radio', label: 'Radio', icon: Radio02Icon, kana: '波' } + { href: '/', label: t('Home'), icon: Home01Icon, kana: '聴' }, + { href: '/search', label: t('Search'), icon: Search01Icon, kana: '探' }, + { href: '/radio', label: t('Radio'), icon: Radio02Icon, kana: '波' } ]; - const collectionNav = { href: '/library', label: 'Library', icon: LibraryIcon, kana: '蔵' }; + const collectionNav = { href: '/library', label: t('Library'), icon: LibraryIcon, kana: '蔵' }; const isActive = (href: string) => href === '/' ? page.url.pathname === '/' : page.url.pathname.startsWith(href); @@ -83,7 +84,7 @@ creating = true; try { await createLibraryPlaylist(title); - toast.success(`Created "${title}"`); + toast.success(`${t('Created')} "${title}"`); newTitle = ''; dialogOpen = false; } catch (e) { @@ -117,14 +118,14 @@
RYOTUNES
RYOKU // MUSIC
-
///
{:else} - {/if} @@ -165,11 +166,11 @@
@@ -184,11 +185,11 @@ class="mb-2 w-full gap-2" onclick={() => (dialogOpen = true)} > - New playlist + {t('New playlist')} {#if playlists.length > 8}
- +
{/if}
@@ -234,9 +235,9 @@ {/if} {:else} {#if library.loading} -

Loading…

+

{t('Loading…')}

{:else if playlistFilter.trim()} -

No playlists match “{playlistFilter.trim()}”.

+

{t('No playlists match')} “{playlistFilter.trim()}”.

{/if} {/each}
@@ -245,11 +246,11 @@ - New playlist + {t('New playlist')} - {auth.account?.signedIn + {t(auth.account?.signedIn ? 'Give your YouTube Music playlist a name to get started.' - : 'This playlist will be stored on this device. Sign in later without losing it.'} + : 'This playlist will be stored on this device. Sign in later without losing it.')}
- + - +
diff --git a/ui/src/lib/components/TrackFilter.svelte b/ui/src/lib/components/TrackFilter.svelte index 846f7e6..697d9a7 100644 --- a/ui/src/lib/components/TrackFilter.svelte +++ b/ui/src/lib/components/TrackFilter.svelte @@ -11,10 +11,11 @@ diff --git a/ui/src/routes/+layout.svelte b/ui/src/routes/+layout.svelte index 2c6a273..62abb62 100644 --- a/ui/src/routes/+layout.svelte +++ b/ui/src/routes/+layout.svelte @@ -42,6 +42,7 @@ import { initPrecisionScrollFallback } from '$lib/ryoku-scroll'; import * as api from '$lib/api'; import { loadRouteScroll, rememberRoute, saveRouteScroll } from '$lib/session'; + import { t } from '$lib/i18n.svelte'; let { children } = $props(); // Two ways the now-playing view and these panels can divide the same two buttons, picked in @@ -191,7 +192,7 @@
- {#if ui.offline}
OFFLINE · cached and local music remain available
{/if} + {#if ui.offline}
{t('OFFLINE · cached and local music remain available')}
{/if}
diff --git a/ui/src/routes/+page.svelte b/ui/src/routes/+page.svelte index 8bbbf6c..3bc2d78 100644 --- a/ui/src/routes/+page.svelte +++ b/ui/src/routes/+page.svelte @@ -34,6 +34,7 @@ import { getCached, putCached } from '$lib/pagecache'; import { appearance } from '$lib/theme.svelte'; import { buildHomeRegistry, HOME_LOCAL_SECTIONS, homeSectionKey, homeSectionTitle, unsupportedHomeSection } from '$lib/home-sections'; + import { t } from '$lib/i18n.svelte'; const FORGOTTEN_KEY = 'home:forgotten'; @@ -209,7 +210,7 @@ } catch (e) { // Stop auto-loading and offer a retry — auto-retrying a visible sentinel would spin. moreError = true; - toast.error('Could not load more'); + toast.error(t('Could not load more')); } finally { loadingMore = false; } @@ -296,7 +297,7 @@
- + {#each chips as chip (chip.params)} + {:else} - + {/if}
{:else if home.continuation} {#if moreError || appearance.lowResourceMode}
{:else} diff --git a/ui/src/routes/album/[id]/+page.svelte b/ui/src/routes/album/[id]/+page.svelte index 80944b3..2d8a9f8 100644 --- a/ui/src/routes/album/[id]/+page.svelte +++ b/ui/src/routes/album/[id]/+page.svelte @@ -43,6 +43,7 @@ import { getCached, putCached } from "$lib/pagecache"; import { thumb } from "$lib/thumb"; import { anchorMenu, fitMenu, NO_ANCHOR, toBody } from "$lib/menu"; + import { t } from "$lib/i18n.svelte"; let album = $state(null); let artistHero = $state(null); @@ -137,7 +138,7 @@ // tile keeps its circle (see browse.ts `hrefFor`). kind: id.startsWith(api.LOCAL_ARTIST_PREFIX) ? "artist" : "album", id, - title: album?.title ?? "Album", + title: album?.title ?? t("Album"), subtitle: album?.artist, thumbnail: album?.thumbnail, // Recently played keeps this object as the card it draws, so without the flag an album @@ -180,20 +181,20 @@ const next = !inLibrary; if (!auth.account?.signedIn || !a.playlistId) { toggleSaved(asItem()); - toast.success(next ? "Saved to library" : "Removed from library"); + toast.success(t(next ? "Saved to library" : "Removed from library")); return; } // Signed in: YouTube owns it from here, so drop any local row left from before signing in. if (savedHere) toggleSaved(asItem()); if (a.inLibrary === next) { - toast.success(next ? "Saved to library" : "Removed from library"); + toast.success(t(next ? "Saved to library" : "Removed from library")); return; // YouTube already agrees; only the local row had to go } a.inLibrary = next; savingLibrary = true; try { await api.setAlbumSaved(a.playlistId, next); - toast.success(next ? "Saved to library" : "Removed from library"); + toast.success(t(next ? "Saved to library" : "Removed from library")); } catch (e) { a.inLibrary = !next; toast.error(String(e)); @@ -266,7 +267,7 @@ >
- +
@@ -290,12 +291,12 @@
- {album.subtitle ?? "Album"} + {album.subtitle ?? t("Album")}

- {album.title ?? "Album"} + {album.title ?? t("Album")}

(expanded = !expanded)} > - {expanded ? "Less" : "More"} + {t(expanded ? "Less" : "More")}
{/if} @@ -353,14 +354,14 @@ onclick={() => playAll(null)} disabled={!album.items.length} > - Play + {t("Play")} {#if !isLocal} @@ -378,13 +379,13 @@ showAlt={inLibrary} class="h-4 w-4" /> - {inLibrary ? "In library" : "Save to library"} + {t(inLibrary ? "In library" : "Save to library")} {/if} @@ -398,7 +399,7 @@ e.preventDefault(); menuOpen = false; }} - aria-label="Close menu" + aria-label={t('Close menu')} {@attach toBody} >
Play next + /> {t("Play next")} {#if !isLocal && album.playlistId} @@ -434,7 +435,7 @@ Start radio + /> {t("Start radio")} {/if} {#if !isLocal} @@ -445,7 +446,7 @@ Save to playlist + /> {t("Save to playlist")} {/if} {#if !isLocal} {/if}
@@ -496,7 +497,7 @@

{query.trim() ? `No tracks match “${query.trim()}”.` - : "This album is empty."} + : t("This album is empty.")}

{/each}
diff --git a/ui/src/routes/artist/[id]/+page.svelte b/ui/src/routes/artist/[id]/+page.svelte index 5be09ba..4722df7 100644 --- a/ui/src/routes/artist/[id]/+page.svelte +++ b/ui/src/routes/artist/[id]/+page.svelte @@ -37,6 +37,7 @@ import { getCached, putCached } from '$lib/pagecache'; import { anchorMenu, fitMenu, NO_ANCHOR } from '$lib/menu'; import { thumb } from '$lib/thumb'; + import { t } from '$lib/i18n.svelte'; let artist = $state(null); let loading = $state(true); @@ -95,7 +96,7 @@ const asItem = (): BrowseItem => ({ kind: 'artist', id, - title: artist?.name ?? 'Artist', + title: artist?.name ?? t('Artist'), subtitle: artist?.subscribers, thumbnail: artist?.thumbnail }); @@ -218,7 +219,7 @@ class="mt-1 text-xs font-semibold uppercase text-muted-foreground hover:text-foreground" onclick={() => (expanded = !expanded)} > - {expanded ? 'Less' : 'More'} + {t(expanded ? 'Less' : 'More')} {/if}
@@ -227,14 +228,14 @@ onclick={shuffle} disabled={!artist.topSongs.length || shuffleBusy} > - Shuffle + {t('Shuffle')} {#if auth.account?.signedIn} @@ -246,7 +247,7 @@ disabled={subBusy} > - {subscribed ? 'Subscribed' : 'Subscribe'} + {t(subscribed ? 'Subscribed' : 'Subscribe')} {:else} {/if} @@ -287,19 +288,19 @@ {:else} -

Top songs

+

{t('Top songs')}

{/if}
{#each artist.topSongs as song, i (song.video_id + i)} @@ -333,7 +334,7 @@ e.preventDefault(); menuOpen = false; }} - aria-label="Close menu" + aria-label={t('Close menu')} >
- Add to shortcuts + {t('Add to shortcuts')}
{/if} diff --git a/ui/src/routes/library/+page.svelte b/ui/src/routes/library/+page.svelte index 6f09c02..c0ba000 100644 --- a/ui/src/routes/library/+page.svelte +++ b/ui/src/routes/library/+page.svelte @@ -44,6 +44,7 @@ } from '$lib/player.svelte'; import { mergeSaved, unsynced } from '$lib/personal'; import { reveal } from '$lib/reveal.svelte'; + import { t } from '$lib/i18n.svelte'; let dialogOpen = $state(false); let newTitle = $state(''); @@ -115,7 +116,7 @@ try { const transfer = await api.importPlaylistFile(); if (!transfer) return; - if (!transfer.items.length) throw new Error('That playlist file has no tracks.'); + if (!transfer.items.length) throw new Error(t('That playlist file has no tracks.')); const playlistId = await api.createPlaylist(transfer.title.trim() || 'Imported playlist'); let added = 0; for (const song of transfer.items) { @@ -156,8 +157,8 @@ {#if rv.more(items.length)}
{/if} {:else}
-
// COLLECTION / EMPTY蔵
- Nothing in this shelf yet. +
{t('// COLLECTION / EMPTY')}蔵
+ {t('Nothing in this shelf yet.')}

{empty}

{/if} @@ -166,8 +167,8 @@
-
-
01PLAYLISTS{playlists.length}
-
02ALBUMS{albums.length}
-
03ARTISTS{artists.length}
-
04SAVED{savedTotal}
-

{signedOut ? 'Local collection · sign in to merge your YouTube Music library.' : 'Account collection · local music remains available in its own lane.'}

+
+
01{t('PLAYLISTS')}{playlists.length}
+
02{t('ALBUMS')}{albums.length}
+
03{t('ARTISTS')}{artists.length}
+
04{t('SAVED')}{savedTotal}
+

{signedOut ? t('Local collection · sign in to merge your YouTube Music library.') : t('Account collection · local music remains available in its own lane.')}

@@ -218,18 +219,18 @@ {syncing - ? 'Adding them to YouTube Music…' + ? t('Adding them to YouTube Music…') : `Add the ${toSync.length} saved on this device to your YouTube Music library`} {/if} {/if}
@@ -238,11 +239,11 @@ - New playlist + {t('New playlist')} {signedOut - ? 'This playlist will be stored on this device. Sign in later without losing it.' - : 'Give your YouTube Music playlist a name to get started.'} + ? t('This playlist will be stored on this device. Sign in later without losing it.') + : t('Give your YouTube Music playlist a name to get started.')}
- +
@@ -269,25 +270,25 @@ - All + {t('All')} - Playlists + {t('Playlists')} - Albums + {t('Albums')} - Artists + {t('Artists')} - Songs + {t('Songs')} - Local + {t('Local')} - Insights + {t('Insights')} @@ -295,10 +296,7 @@ {#if tab === 'songs'} {#if signedOut} -

- Sign in to see the songs saved in your YouTube Music library. Music on this machine is - in the Local tab. -

+

{t('Sign in to see the songs saved in your YouTube Music library. Music on this machine is in the Local tab.')}

{:else} {/if} @@ -309,9 +307,9 @@ {#if tab !== 'local' && tab !== 'songs' && tab !== 'insights'} {#if loading}
-
// COLLECTION / INDEXINGLOCAL + ACCOUNT
- Loading your collection. -

Resolving playlists, albums and artists without blocking local music.

+
{t('// COLLECTION / INDEXING')}{t('LOCAL + ACCOUNT')}
+ {t('Loading your collection.')} +

{t('Resolving playlists, albums and artists without blocking local music.')}

diff --git a/ui/src/routes/playlist/[id]/+page.svelte b/ui/src/routes/playlist/[id]/+page.svelte index db21b9a..5ab38e3 100644 --- a/ui/src/routes/playlist/[id]/+page.svelte +++ b/ui/src/routes/playlist/[id]/+page.svelte @@ -65,6 +65,7 @@ patchLibraryPlaylist, lastPlaylistAdd } from '$lib/player.svelte'; + import { t } from '$lib/i18n.svelte'; // `$state.raw`, not `$state`: a deep proxy makes every read of a row go through a trap and // create a signal, and this list runs to five figures. Measured at 5,000 rows, one filter pass @@ -186,7 +187,7 @@ let resorting = $state(false); const sortLabel = $derived( - sort === 'default' ? 'Sort' : (SORTS.find((s) => s.key === sort)?.label ?? 'Sort') + sort === 'default' ? t('Sort') : (SORTS.find((s) => s.key === sort)?.label ?? t('Sort')) ); // The local listening history, fetched once and only if "Most played" is ever picked — it is a // SQLite read the other five sorts have no use for. @@ -567,7 +568,7 @@ const asItem = (): BrowseItem => ({ kind: 'playlist', id, - title: pl?.title ?? 'Playlist', + title: pl?.title ?? t('Playlist'), subtitle, // On Repeat stays artwork-free wherever it's rendered (shortcuts, recents) so it always // draws its icon rather than one of its songs' covers. @@ -621,13 +622,13 @@ // Export the whole list, not just the first continuation page. The existing guarded loader // already caps paging and leaves playback untouched. if (pl.continuation && !(await loadAll())) { - toast.error('Could not load the full playlist for export'); + toast.error(t('Could not load the full playlist for export')); return; } const title = pl?.title?.trim() || 'Ryotunes Playlist'; if (!pl) return; try { - if (await api.exportPlaylistFile(title, pl.items)) toast.success('Playlist exported'); + if (await api.exportPlaylistFile(title, pl.items)) toast.success(t('Playlist exported')); } catch (e) { toast.error(String(e)); } } @@ -696,12 +697,12 @@ try { if (isLiked) { await api.rate(track.video_id, 'indifferent'); - toast.success('Removed from Liked Music'); + toast.success(t('Removed from Liked Music')); } else { await api.removeFromPlaylist(id, track.video_id, track.set_video_id!); bumpLibraryTrackCount(id, -1); noteUnsavedFrom(id, track.video_id); - toast.success('Removed from playlist'); + toast.success(t('Removed from playlist')); } cacheCurrent(); } catch (e) { @@ -715,7 +716,7 @@ try { await api.deletePlaylist(id); invalidateCached(`playlist:${id}`); - toast.success('Playlist deleted'); + toast.success(t('Playlist deleted')); goto('/library'); } catch (e) { toast.error(String(e)); @@ -773,11 +774,11 @@ {/if}
- Playlist + {t('Playlist')} {#if pl.collaborative}Collab{/if}

- {pl.title ?? 'Playlist'} + {pl.title ?? t('Playlist')}

{#if subtitle}

{subtitle}

{/if} {#if pl.description} @@ -791,7 +792,7 @@ class="mt-1 cursor-pointer text-xs font-semibold uppercase text-muted-foreground hover:text-foreground" onclick={() => (expanded = !expanded)} > - {expanded ? 'Less' : 'More'} + {t(expanded ? 'Less' : 'More')} {/if}
@@ -804,21 +805,21 @@ disabled={!pl.items.length || preparing || resorting} > - {preparing || resorting ? 'Sorting…' : 'Play'} + {t(preparing || resorting ? 'Sorting…' : 'Play')} {#if confirmingDelete}
- Delete this playlist? - + {t('Delete this playlist?')} +
{:else}
- +
{:else} -

This playlist is empty.

+

{t('This playlist is empty.')}

{/if} {#if pl.continuation} {#if moreError}
{:else} @@ -916,7 +917,7 @@
run(shufflePlay)} disabled={!pl?.items.length} > - Shuffle play + {t('Shuffle play')} {#if !isSmart && !isDevicePlaylist} @@ -989,21 +990,21 @@ class="flex w-full items-center gap-2 rounded-md px-2 py-1.5 text-left text-sm hover:bg-accent/10" onclick={() => run(() => startRadio('playlist', id, pl?.title))} > - Start radio + {t('Start radio')} {/if} {#if !isSmart && !isDevicePlaylist} {/if} {#if savable} @@ -1023,7 +1024,7 @@ showAlt={savedHere} class="h-4 w-4" /> - {savedHere ? 'Remove from library' : 'Save to library'} + {t(savedHere ? 'Remove from library' : 'Save to library')} {/if} {#if editable} @@ -1031,13 +1032,13 @@ class="flex w-full items-center gap-2 rounded-md px-2 py-1.5 text-left text-sm hover:bg-accent/10" onclick={() => run(() => (editing = true))} > - Edit playlist + {t('Edit playlist')} {/if}
diff --git a/ui/src/routes/radio/+page.svelte b/ui/src/routes/radio/+page.svelte index cb282aa..cacb9b8 100644 --- a/ui/src/routes/radio/+page.svelte +++ b/ui/src/routes/radio/+page.svelte @@ -8,6 +8,7 @@ import * as api from '$lib/api'; import type { RadioStation } from '$lib/api'; import { toast } from '$lib/player.svelte'; + import { t } from '$lib/i18n.svelte'; const PAGE = 36; let input = $state(''); @@ -90,7 +91,7 @@ station.codec, station.bitrate && station.bitrate > 0 ? `${station.bitrate} kbps` : '' ].filter(Boolean); - return parts.join(' · ') || 'Live stream'; + return parts.join(' · ') || t('Live stream'); } function stationTags(station: RadioStation) { @@ -114,8 +115,8 @@
- // RADIO BROWSER / LIVE DIRECTORY - {query ? `Results for “${query}”` : 'Popular stations'} -

- Station discovery is demand-driven: Ryotunes only contacts the directory when this page is - opened, searched or extended. -

+ {t('// RADIO BROWSER / LIVE DIRECTORY')} + {query ? `Results for “${query}”` : t('Popular stations')} +

{t('Station discovery is demand-driven: Ryotunes only contacts the directory when this page is opened, searched or extended.')}

- + {#if query} - + {/if} {#if loading}
- // TUNING - Finding live stations. -

Trying available Radio Browser mirrors without blocking the player.

+ {t('// TUNING')} + {t('Finding live stations.')} +

{t('Trying available Radio Browser mirrors without blocking the player.')}

{:else if error && !stations.length} {:else if !stations.length}
- // NO MATCH - No stations found. -

Try a shorter station name or return to the popular directory.

- {#if query}{/if} + {t('// NO MATCH')} + {t('No stations found.')} +

{t('Try a shorter station name or return to the popular directory.')}

+ {#if query}{/if}
{:else}
@@ -190,13 +188,13 @@ /> {/if} - LIVE + {t('LIVE')}

{station.name}

{detail(station)}

{#if stationTags(station).length} -
+
{#each stationTags(station) as tag} {tag} {/each} @@ -212,10 +210,10 @@ aria-label={`Play ${station.name}`} > - {playing === station.stationUuid ? 'Tuning…' : 'Play'} + {t(playing === station.stationUuid ? 'Tuning…' : 'Play')} {#if station.homepage} - + {/if}
@@ -228,20 +226,20 @@ {/if} {#if hasMore} {:else} - // END OF THIS SIGNAL SET + {t('// END OF THIS SIGNAL SET')} {/if}
{/if}
- DIRECTORY + {t('DIRECTORY')} Radio Browser -

Station metadata and live stream endpoints are provided by the community-run Radio Browser network.

+

{t('Station metadata and live stream endpoints are provided by the community-run Radio Browser network.')}

diff --git a/ui/src/routes/search-more/+page.svelte b/ui/src/routes/search-more/+page.svelte index 3e27b05..f8c6a06 100644 --- a/ui/src/routes/search-more/+page.svelte +++ b/ui/src/routes/search-more/+page.svelte @@ -9,6 +9,7 @@ import type { BrowseItem, SongItem } from '$lib/api'; import { openAddToPlaylist, playSong } from '$lib/player.svelte'; import { getCached, putCached } from '$lib/pagecache'; + import { t } from '$lib/i18n.svelte'; type MoreResult = { songs: SongItem[]; cards: BrowseItem[]; continuation?: string }; @@ -22,7 +23,7 @@ const q = $derived(page.url.searchParams.get('q') ?? ''); const cat = $derived(page.url.searchParams.get('cat') ?? 'songs'); - const label = $derived({ songs: 'Songs', albums: 'Albums', artists: 'Artists', playlists: 'Playlists' }[cat] ?? 'Results'); + const label = $derived(t({ songs: 'Songs', albums: 'Albums', artists: 'Artists', playlists: 'Playlists' }[cat] ?? 'Results')); const done = $derived(!continuation); function uniqueSongs(base: SongItem[], next: SongItem[]) { @@ -121,7 +122,7 @@

{label}

-

Results for “{q}”

+

{t('Results for')} “{q}”

{#if loading} {#if cat === 'songs'} @@ -135,14 +136,14 @@
{#each songs as song (song.video_id)} playSong(song)} onAdd={() => openAddToPlaylist(song)} /> - {:else}

Nothing found.

{/each} + {:else}

{t('Nothing found.')}

{/each}
{:else if cards.length}
{#each cards as item (`${item.kind}:${item.id}`)}{/each}
{:else} -

Nothing found.

+

{t('Nothing found.')}

{/if} {#if !loading && (songs.length || cards.length)} diff --git a/ui/src/routes/search/+page.svelte b/ui/src/routes/search/+page.svelte index 3da456d..81edc8c 100644 --- a/ui/src/routes/search/+page.svelte +++ b/ui/src/routes/search/+page.svelte @@ -36,6 +36,7 @@ import { recentItems, freshen } from '$lib/personal'; import { cloneSearchPager, createSearchPager, nextSearchPage, searchPagerDone, type SearchPagerState } from '$lib/search-pager'; import { ownNestedVerticalScroll } from '$lib/ryoku-scroll'; + import { t } from '$lib/i18n.svelte'; type Cached = { res: SearchResults; songs: SongItem[]; songContinuation?: string }; @@ -333,8 +334,8 @@
(lastQuery = query)} inputClass="ryo-search-input" panelClass="left-0 w-[32rem]" /> {#if query} - + {/if} {#if error}
{/if} @@ -373,9 +374,9 @@ {#if searching}
- // DISCOVERY / QUERY + {t('// DISCOVERY / QUERY')} {query} -

Resolving songs, artists, albums and playlists in parallel.

+

{t('Resolving songs, artists, albums and playlists in parallel.')}

INDEXYOUTUBE MUSICSTATESEARCHING
{:else if !res} -
+
-
// RECENT SEARCHES{#if searchHistory.length}{/if}
+
{t('// RECENT SEARCHES')}{#if searchHistory.length}{/if}
{#if searchHistory.length}
{#each searchHistory as value, i (value)} @@ -395,12 +396,12 @@ {/each}
{:else} -
No search history yet.

Use the field above or press Ctrl K from anywhere.

+
{t('No search history yet.')}

{t('Use the field above or press')} Ctrl K {t('from anywhere.')}

{/if}
-
// RECENT LISTENING{recentListening.length ? `${recentListening.length} ITEMS` : 'READY'}
+
{t('// RECENT LISTENING')}{recentListening.length ? `${recentListening.length} ITEMS` : 'READY'}
{#if recentListening.length}
{#each recentListening as item, i (item.id)} @@ -411,21 +412,21 @@ {/each}
{:else} -
検索DISCOVERY INDEX

Search songs, artists, albums and playlists without leaving the keyboard.

/ PAGE SEARCH · CTRL K COMMAND
+
検索DISCOVERY INDEX

{t('Search songs, artists, albums and playlists without leaving the keyboard.')}

/ PAGE SEARCH · CTRL K COMMAND
{/if}
{:else if !sections.length}
- 検索
// DISCOVERY / EMPTYNo results for “{searched}”.

Try a shorter title, the artist name, or a different spelling.

+ 検索
{t('// DISCOVERY / EMPTY')}No results for “{searched}”.

{t('Try a shorter title, the artist name, or a different spelling.')}

{:else}
{#if quickItems.length && activeResult} -
+
-
// RESULTS↑↓ / J K · ENTER
-
+
{t('// RESULTS')}↑↓ / J K · ENTER
+
{#each quickItems as item, i (item.id)}
{/each}
- {#if quickLoading}Loading more…{:else if quickDone}No more results{:else}{/if} + {#if quickLoading}{t('Loading more…')}{:else if quickDone}{t('No more results')}{:else}{/if}
@@ -462,23 +463,23 @@

- Preview: Listening to {discordNameInput.trim() || 'Ryotunes v2'} + Preview: Listening to {discordNameInput.trim() || 'Ryotunes'}

@@ -587,9 +629,72 @@ A focused Ryoku desktop music instrument: your YouTube Music library, local media controls, queue, lyrics and playback engine in one paper-and-ink surface.

-
RELEASE{PRODUCT_VERSION}BUILD{buildVersion}ENGINERUST + MPVUITAURI / WEBKITGTK
+
VERSION{appVersion || '—'}ENGINERUST + MPVUITAURI / WEBKITGTK
+
+
+
Software updates
+

+ You're on {appVersion || 'this build'}. Ryotunes checks GitHub only when you ask — nothing runs in the background. +

+
+ + + {#if canInstallUpdate} + + {/if} +
+

+ {#if updateStatus === 'checking'} + Checking for a new version… + {:else if updateStatus === 'installing'} + Downloading and verifying the update, then asking for administrator approval. Keep Ryotunes open until it finishes. + {:else if updateStatus === 'installed'} + Ryotunes {installedVersion} is installed. Quit Ryotunes and open it again to finish — closing the window isn't enough; the background service reloads only on a full restart. + {:else if updateStatus === 'error'} + Update failed: {updateError} + {:else if update} + {#if update.latestVersion === null} + No release has been published yet. + {:else if update.available} + Version {update.latestVersion} is available.{#if !update.canInstall && update.unsupportedReason} {update.unsupportedReason}{/if} + {:else} + You're on the latest version. + {/if} + {/if} +

+ {#if update?.notes} +
+ + {#if showReleaseNotes} + 
{update.notes}
+ {/if} +
+ {/if} +
+
+
Made by
+

Ryotunes is built by two developers. Open their GitHub profiles:

+
+ + +
+
+
+
Open source
+

+ Ryotunes is a fork of LiMusic, released under the GNU General Public License v3.0 or later. +

+
+ + +
- {/if}
From cea4f972b86a9dc842d77fcef44f9804e7f7cacc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 8 Sep 2026 07:21:31 +0000 Subject: [PATCH 136/183] release: v1.0.0 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e9a82f4..da6d161 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +## v1.0.0 - 2026-09-08 + - **Fresh v1 releases on every default-branch push.** The app, daemon, CLI, native client and package start at `1.0.0`. CI queues pushes, builds each exact source, and advances `1.0.9 → 1.1.0` (major fixed at 1). Releases include generated notes, binary/source archives and SHA-256 sidecars. A permanent pacman `epoch=1` makes v1 packages an upgrade from legacy v2 installations without changing the release asset filenames. Package hooks no longer restart the daemon during the transaction. - **About credits and standalone updates.** Both clients credit ashmitvoid and neur0map and link LiMusic upstream. About shows current/available versions, checks GitHub on request, opens the changelog and installs verified official Arch packages with administrator approval, independently of a full Ryoku update. After installation, fully Quit and reopen Ryotunes to reload the client and daemon. - **Releases ship a prebuilt Arch package.** Each release builds `ryotunes--1-x86_64.pkg.tar.zst` (and its `.sha256`) with an unprivileged `makepkg` in an Arch container from that release's exact source and attaches it to the GitHub release beside the reproducible source tarball, so `pacman -U` — and Ryoku's `update`/`doctor`, which read GitHub releases directly — no longer wait on a downstream rebuild. `scripts/build-arch-package.sh` reproduces the asset locally (`docker run --rm -v "$PWD:/src" -w /src archlinux:latest scripts/build-arch-package.sh`). The old `ryotunes-release` repository_dispatch into Ryoku Arch is removed. From 0d352844d77f6d8eb94938915cb8e94bcb77ef31 Mon Sep 17 00:00:00 2001 From: carlos Date: Tue, 8 Sep 2026 04:41:45 -0400 Subject: [PATCH 137/183] chore: move Ryotunes release and UI references to ryoku-dev --- .github/workflows/release.yml | 2 +- README.md | 12 ++++++------ client/pages/SettingsPage.qml | 4 ++-- crates/core/src/discord.rs | 2 +- crates/core/src/update.rs | 4 ++-- docs/SKINS.md | 4 ++-- packaging/arch/PKGBUILD | 2 +- scripts/release-notes.py | 2 +- skins/arcade/skin.json | 2 +- skins/broadsheet/skin.json | 2 +- skins/concrete/skin.json | 2 +- skins/ember/skin.json | 2 +- skins/mist/skin.json | 2 +- skins/neon/skin.json | 2 +- skins/paper/skin.json | 2 +- skins/phosphor/skin.json | 2 +- skins/skin.schema.json | 2 +- skins/vapor/skin.json | 2 +- skins/velvet/skin.json | 2 +- ui/src/lib/components/SettingsDialog.svelte | 2 +- 20 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 79c65b1..f190e09 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -279,7 +279,7 @@ jobs: run: | set -euo pipefail # A normal published (non-draft, non-prerelease, latest) release is what - # /repos/neur0map/ryotunes/releases/latest returns to Ryoku's clients. + # /repos/ryoku-dev/ryotunes/releases/latest returns to Ryoku's clients. assets=(dist/*.tar.gz dist/*.pkg.tar.zst dist/*.sha256) latest="$(gh release list --limit 1000 --json isLatest,tagName --jq '.[] | select(.isLatest) | .tagName')" # A manual repair of an older tag must not downgrade releases/latest. diff --git a/README.md b/README.md index 6f06f16..f446583 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,8 @@
-Latest release -GPL-3.0-or-later +Latest release +GPL-3.0-or-later Linux x86_64 Ryoku native Audio only @@ -20,7 +20,7 @@ **A Ryoku-native desktop music player with native audio playback, live shell theming, and a UI that knows when to disappear.** -[Download](https://github.com/neur0map/ryotunes/releases/latest) · [Architecture](docs/ARCHITECTURE.md) · [Install](docs/INSTALL-ARCH.md) · [Troubleshooting](docs/TROUBLESHOOTING.md) · [Ryoku](https://github.com/neur0map/ryoku-arch) +[Download](https://github.com/ryoku-dev/ryotunes/releases/latest) · [Architecture](docs/ARCHITECTURE.md) · [Install](docs/INSTALL-ARCH.md) · [Troubleshooting](docs/TROUBLESHOOTING.md) · [Ryoku](https://github.com/ryoku-dev/ryoku-arch)
@@ -118,11 +118,11 @@ Every colour, type face, radius and duration the chrome reads comes from one **s /usr/share/ryotunes/matugen/ryotunes.json the matugen template ``` -Pick one in *Settings › Appearance*, or **Get more skins** there — that opens [RyoStore](https://github.com/neur0map/ryostore) on its *Ryotunes skins* category, and an install lands in `~/.local/share/ryoku/ryotunes-skins//`. To make your own: fork the painted palette with **New skin from current**, validate with `ryotunes-cli skin check `, and submit it to the store catalogue as `ryotunes-skins//` — the format and the checklist are in **[docs/SKINS.md](docs/SKINS.md)**. +Pick one in *Settings › Appearance*, or **Get more skins** there — that opens [RyoStore](https://github.com/ryoku-dev/ryostore) on its *Ryotunes skins* category, and an install lands in `~/.local/share/ryoku/ryotunes-skins//`. To make your own: fork the painted palette with **New skin from current**, validate with `ryotunes-cli skin check `, and submit it to the store catalogue as `ryotunes-skins//` — the format and the checklist are in **[docs/SKINS.md](docs/SKINS.md)**. For the shell itself: -**[Ryoku Arch](https://github.com/neur0map/ryoku-arch)** · **[Ryoku Discord](https://discord.gg/8KjBmUEyKA)** +**[Ryoku Arch](https://github.com/ryoku-dev/ryoku-arch)** · **[Ryoku Discord](https://discord.gg/8KjBmUEyKA)** --- @@ -191,7 +191,7 @@ The published package is **`ryotunes 1:-1`**. The permanent `epoch=1` l The normal user path is a **prebuilt package**. End users do not need Node, pnpm, Rust, Cargo or a local Tauri build. -1. Open **[GitHub Releases](https://github.com/neur0map/ryotunes/releases/latest)**. +1. Open **[GitHub Releases](https://github.com/ryoku-dev/ryotunes/releases/latest)**. 2. Download `ryotunes--1-x86_64.pkg.tar.zst` and its `.sha256`. 3. Verify and install: diff --git a/client/pages/SettingsPage.qml b/client/pages/SettingsPage.qml index 4cf75f2..bc055ff 100644 --- a/client/pages/SettingsPage.qml +++ b/client/pages/SettingsPage.qml @@ -591,7 +591,7 @@ Item { Btn { text: "Open skins folder"; icon: "library"; onClicked: Quickshell.execDetached(["xdg-open", Skin.userDir]) } Btn { text: "New skin from current"; icon: "add"; onClicked: page.forkOpen = !page.forkOpen } Btn { text: "Reload"; icon: "repeat"; onClicked: Skin.reload() } - Btn { text: "Skins guide"; icon: "link"; onClicked: Quickshell.execDetached(["xdg-open", "https://github.com/neur0map/ryotunes/blob/main/docs/SKINS.md"]) } + Btn { text: "Skins guide"; icon: "link"; onClicked: Quickshell.execDetached(["xdg-open", "https://github.com/ryoku-dev/ryotunes/blob/main/docs/SKINS.md"]) } } // Fork the painted palette into a new user skin — kebab-cased id, opened to edit. @@ -1349,7 +1349,7 @@ Item { Btn { text: "View changelog" icon: "link" - onClicked: page.openUrl((page.updateInfo && page.updateInfo.releaseUrl) ? page.updateInfo.releaseUrl : "https://github.com/neur0map/ryotunes/releases") + onClicked: page.openUrl((page.updateInfo && page.updateInfo.releaseUrl) ? page.updateInfo.releaseUrl : "https://github.com/ryoku-dev/ryotunes/releases") } Btn { visible: !!(page.updateInfo && page.updateInfo.available && page.updateInfo.latestVersion && page.updateInfo.canInstall) && page.updateStatus !== "installed" diff --git a/crates/core/src/discord.rs b/crates/core/src/discord.rs index 320a8d9..6d093ab 100644 --- a/crates/core/src/discord.rs +++ b/crates/core/src/discord.rs @@ -60,7 +60,7 @@ const SONG_URL: &str = "https://music.youtube.com/watch?v="; /// fetchable artwork, and the small badge on every art card — so the card never falls back to the /// application's portal icon (the upstream lemon). Verified reachable, `200 image/png` (512×512). const BRAND_IMAGE: &str = - "https://raw.githubusercontent.com/neur0map/ryotunes/main/src-tauri/icons/icon.png"; + "https://raw.githubusercontent.com/ryoku-dev/ryotunes/main/src-tauri/icons/icon.png"; const BRAND_BADGE_TEXT: &str = "Ryotunes"; /// Reconnect backoff while enabled but unconnected (Discord not running, or it quit). Starts short diff --git a/crates/core/src/update.rs b/crates/core/src/update.rs index 5c1fa60..1545417 100644 --- a/crates/core/src/update.rs +++ b/crates/core/src/update.rs @@ -9,8 +9,8 @@ use sha2::{Digest, Sha256}; use tokio::io::AsyncWriteExt; use tokio::process::Command; -const REPOSITORY: &str = "https://github.com/neur0map/ryotunes"; -const LATEST: &str = "https://api.github.com/repos/neur0map/ryotunes/releases/latest"; +const REPOSITORY: &str = "https://github.com/ryoku-dev/ryotunes"; +const LATEST: &str = "https://api.github.com/repos/ryoku-dev/ryotunes/releases/latest"; const MAX_PACKAGE: u64 = 1024 * 1024 * 1024; static INSTALL: tokio::sync::Mutex<()> = tokio::sync::Mutex::const_new(()); diff --git a/docs/SKINS.md b/docs/SKINS.md index 8247836..4919c47 100644 --- a/docs/SKINS.md +++ b/docs/SKINS.md @@ -189,9 +189,9 @@ Ryotunes on every change. Community skins are **RyoStore products**: Ryotunes is a binary package, and the store is how a skin reaches every Ryoku desktop without a Ryotunes release. Open a PR against -[neur0map/ryostore](https://github.com/neur0map/ryostore) that adds `ryotunes-skins//` and its +[ryoku-dev/ryostore](https://github.com/ryoku-dev/ryostore) that adds `ryotunes-skins//` and its entry in `ryotunes-skins/registry.json` — the layout, the packing tool and the checklist are in -that repo's [`ryotunes-skins/AUTHORING.md`](https://github.com/neur0map/ryostore/blob/main/ryotunes-skins/AUTHORING.md). +that repo's [`ryotunes-skins/AUTHORING.md`](https://github.com/ryoku-dev/ryostore/blob/main/ryotunes-skins/AUTHORING.md). In short: - [ ] `skin.json` with `format: 1`, `id` = the folder name, `ryotunes-cli skin check` with **no errors**. diff --git a/packaging/arch/PKGBUILD b/packaging/arch/PKGBUILD index 76ab34c..381aeaa 100644 --- a/packaging/arch/PKGBUILD +++ b/packaging/arch/PKGBUILD @@ -10,7 +10,7 @@ pkgrel=1 # makepkg's epoch-tagged output back to the ryotunes--1-x86_64 contract). epoch=1 pkgdesc='Ryotunes - resource-conscious Linux desktop music client' -url='https://github.com/neur0map/ryotunes' +url='https://github.com/ryoku-dev/ryotunes' arch=('x86_64') license=('GPL-3.0-or-later') depends=( diff --git a/scripts/release-notes.py b/scripts/release-notes.py index 1616eaf..5e18bc7 100755 --- a/scripts/release-notes.py +++ b/scripts/release-notes.py @@ -21,7 +21,7 @@ def release_notes(tag): # entire upstream history. Subsequent releases compare only against v1. legacy = [t for t in tags if re.fullmatch(r'v2\.[0-9]+\.[0-9]+', t)] previous = max(earlier or legacy, key=lambda t: tuple(map(int, t[1:].split('.'))), default=None) - repo = os.environ.get('GITHUB_REPOSITORY', 'neur0map/ryotunes') + repo = os.environ.get('GITHUB_REPOSITORY', 'ryoku-dev/ryotunes') command = ['gh', 'api', f'repos/{repo}/releases/generate-notes', '-f', f'tag_name={tag}', '--jq', '.body'] if previous: diff --git a/skins/arcade/skin.json b/skins/arcade/skin.json index 7d7b590..c54baef 100644 --- a/skins/arcade/skin.json +++ b/skins/arcade/skin.json @@ -6,7 +6,7 @@ "author": "Ryoku", "version": "1.0.0", "license": "CC0-1.0", - "homepage": "https://github.com/neur0map/ryotunes", + "homepage": "https://github.com/ryoku-dev/ryotunes", "description": "8-bit cabinet: indigo paper, coin-yellow bone, a pink sun, Silkscreen titles and Press Start readouts, no corners, the provider's colour as the light.", "default": "dark", "modes": { diff --git a/skins/broadsheet/skin.json b/skins/broadsheet/skin.json index 1173913..45d562c 100644 --- a/skins/broadsheet/skin.json +++ b/skins/broadsheet/skin.json @@ -6,7 +6,7 @@ "author": "Ryoku", "version": "1.0.0", "license": "CC0-1.0", - "homepage": "https://github.com/neur0map/ryotunes", + "homepage": "https://github.com/ryoku-dev/ryotunes", "description": "Newsprint: warm off-white paper, black ink, one deep-red sun, Playfair titles over IBM Plex, hairline corners, almost no wash. Dark edition inside.", "default": "light", "modes": { diff --git a/skins/concrete/skin.json b/skins/concrete/skin.json index 48bfdbe..18cf790 100644 --- a/skins/concrete/skin.json +++ b/skins/concrete/skin.json @@ -6,7 +6,7 @@ "author": "Ryoku", "version": "1.0.0", "license": "CC0-1.0", - "homepage": "https://github.com/neur0map/ryotunes", + "homepage": "https://github.com/ryoku-dev/ryotunes", "description": "Brutalist: grey slab, black ink, safety-orange everything that matters, Bebas Neue titles, zero radius, zero wash, motion cut to the bone.", "default": "light", "modes": { diff --git a/skins/ember/skin.json b/skins/ember/skin.json index 55a2caf..3890fc0 100644 --- a/skins/ember/skin.json +++ b/skins/ember/skin.json @@ -6,7 +6,7 @@ "author": "Ryoku", "version": "1.0.0", "license": "CC0-1.0", - "homepage": "https://github.com/neur0map/ryotunes", + "homepage": "https://github.com/ryoku-dev/ryotunes", "description": "Warm dark: deep-umber paper, warm bone ink, one amber sun. Firelit and rich; the accent follows the sun.", "default": "dark", "modes": { diff --git a/skins/mist/skin.json b/skins/mist/skin.json index 667c4b6..1b6cc22 100644 --- a/skins/mist/skin.json +++ b/skins/mist/skin.json @@ -6,7 +6,7 @@ "author": "Ryoku", "version": "1.0.0", "license": "CC0-1.0", - "homepage": "https://github.com/neur0map/ryotunes", + "homepage": "https://github.com/ryoku-dev/ryotunes", "description": "Light-first: fog paper, slate-navy ink, a quiet teal sun. Calm and flat, with a matching dark mode.", "default": "light", "modes": { diff --git a/skins/neon/skin.json b/skins/neon/skin.json index c42bab0..3b667ca 100644 --- a/skins/neon/skin.json +++ b/skins/neon/skin.json @@ -6,7 +6,7 @@ "author": "Ryoku", "version": "1.0.0", "license": "CC0-1.0", - "homepage": "https://github.com/neur0map/ryotunes", + "homepage": "https://github.com/ryoku-dev/ryotunes", "description": "Tokyo after midnight: ink-blue paper, hot magenta bone, a cyan sun. Unbounded titles, sharp corners, fast motion, the cover wash turned up.", "default": "dark", "modes": { diff --git a/skins/paper/skin.json b/skins/paper/skin.json index afc9e1f..b24a923 100644 --- a/skins/paper/skin.json +++ b/skins/paper/skin.json @@ -6,7 +6,7 @@ "author": "Ryoku", "version": "1.0.0", "license": "CC0-1.0", - "homepage": "https://github.com/neur0map/ryotunes", + "homepage": "https://github.com/ryoku-dev/ryotunes", "description": "Ryotunes' own: pure-black paper, warm bone ink, one red sun. The palette every other skin falls back to.", "default": "dark", "modes": { diff --git a/skins/phosphor/skin.json b/skins/phosphor/skin.json index 181c540..97a3a6d 100644 --- a/skins/phosphor/skin.json +++ b/skins/phosphor/skin.json @@ -6,7 +6,7 @@ "author": "Ryoku", "version": "1.0.0", "license": "CC0-1.0", - "homepage": "https://github.com/neur0map/ryotunes", + "homepage": "https://github.com/ryoku-dev/ryotunes", "description": "A green-phosphor terminal: black glass, P1 green ink, an amber sun, Major Mono titles, square corners, instant motion, no wash.", "default": "dark", "modes": { diff --git a/skins/skin.schema.json b/skins/skin.schema.json index c8bb647..e473e7e 100644 --- a/skins/skin.schema.json +++ b/skins/skin.schema.json @@ -1,6 +1,6 @@ { "$schema": "https://json-schema.org/draft/2020-12/schema", - "$id": "https://raw.githubusercontent.com/neur0map/ryotunes/main/skins/skin.schema.json", + "$id": "https://raw.githubusercontent.com/ryoku-dev/ryotunes/main/skins/skin.schema.json", "title": "Ryotunes skin manifest", "description": "A format-1 Ryotunes skin: the colours, type, shape, motion, decor, accent and wash the chrome reads. See docs/SKINS.md. Everything is optional except a `modes` object with at least one mode carrying both `paper` and `ink`; missing keys fall back to the Paper skin.", "type": "object", diff --git a/skins/vapor/skin.json b/skins/vapor/skin.json index 1f0730e..ceeb9eb 100644 --- a/skins/vapor/skin.json +++ b/skins/vapor/skin.json @@ -6,7 +6,7 @@ "author": "Ryoku", "version": "1.0.0", "license": "CC0-1.0", - "homepage": "https://github.com/neur0map/ryotunes", + "homepage": "https://github.com/ryoku-dev/ryotunes", "description": "Vaporwave: violet paper, pink bone, a teal sun, Playfair titles and VT323 readouts, round corners, slow motion, the cover melting over everything.", "default": "dark", "modes": { diff --git a/skins/velvet/skin.json b/skins/velvet/skin.json index 48b33f6..6768350 100644 --- a/skins/velvet/skin.json +++ b/skins/velvet/skin.json @@ -6,7 +6,7 @@ "author": "Ryoku", "version": "1.0.0", "license": "CC0-1.0", - "homepage": "https://github.com/neur0map/ryotunes", + "homepage": "https://github.com/ryoku-dev/ryotunes", "description": "A lounge at closing time: wine-dark paper, gilt bone and sun, Cormorant titles over DM Sans, soft corners, slow motion, the cover glowing through.", "default": "dark", "modes": { diff --git a/ui/src/lib/components/SettingsDialog.svelte b/ui/src/lib/components/SettingsDialog.svelte index 263e4f5..c35cb62 100644 --- a/ui/src/lib/components/SettingsDialog.svelte +++ b/ui/src/lib/components/SettingsDialog.svelte @@ -50,7 +50,7 @@ const updateAvailable = $derived(!!update?.available && !!update?.latestVersion); const canInstallUpdate = $derived(updateAvailable && !!update?.canInstall && updateStatus !== 'installed'); // Always-available changelog target: the release the check found, else the project's releases page. - const RELEASES_URL = 'https://github.com/neur0map/ryotunes/releases'; + const RELEASES_URL = 'https://github.com/ryoku-dev/ryotunes/releases'; let settings = $state>({}); let clients = $state([]); let proxyInput = $state(''); From f85800e6ba7a6724b51db074700e6e6636d0ba20 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 8 Sep 2026 08:54:26 +0000 Subject: [PATCH 138/183] release: v1.0.1 --- CHANGELOG.md | 2 ++ Cargo.lock | 22 +++++++++---------- Cargo.toml | 2 +- client/version | 2 +- packaging/arch/PKGBUILD | 2 +- .../linux/dev.ryoku.ryotunes.metainfo.xml | 2 +- src-tauri/tauri.conf.json | 2 +- ui/package.json | 2 +- 8 files changed, 19 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index da6d161..d5b9ad7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +## v1.0.1 - 2026-09-08 + ## v1.0.0 - 2026-09-08 - **Fresh v1 releases on every default-branch push.** The app, daemon, CLI, native client and package start at `1.0.0`. CI queues pushes, builds each exact source, and advances `1.0.9 → 1.1.0` (major fixed at 1). Releases include generated notes, binary/source archives and SHA-256 sidecars. A permanent pacman `epoch=1` makes v1 packages an upgrade from legacy v2 installations without changing the release asset filenames. Package hooks no longer restart the daemon during the transaction. diff --git a/Cargo.lock b/Cargo.lock index 728eb88..67a0d01 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2438,7 +2438,7 @@ dependencies = [ [[package]] name = "innertube" -version = "1.0.0" +version = "1.0.1" dependencies = [ "hex", "reqwest 0.12.28", @@ -2943,7 +2943,7 @@ checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" [[package]] name = "listen-protocol" -version = "1.0.0" +version = "1.0.1" dependencies = [ "serde", "serde_json", @@ -3788,7 +3788,7 @@ checksum = "f6b464fbc74e149a392436b17d523f769e057cb6877f6a5c4618bc6f11800548" [[package]] name = "player" -version = "1.0.0" +version = "1.0.1" dependencies = [ "libc", "libmpv2", @@ -4703,7 +4703,7 @@ dependencies = [ [[package]] name = "ryotunes" -version = "1.0.0" +version = "1.0.1" dependencies = [ "anyhow", "async-trait", @@ -4733,7 +4733,7 @@ dependencies = [ [[package]] name = "ryotunes-cli" -version = "1.0.0" +version = "1.0.1" dependencies = [ "ryotunes-protocol", "serde", @@ -4742,7 +4742,7 @@ dependencies = [ [[package]] name = "ryotunes-core" -version = "1.0.0" +version = "1.0.1" dependencies = [ "anyhow", "async-trait", @@ -4778,7 +4778,7 @@ dependencies = [ [[package]] name = "ryotunes-protocol" -version = "1.0.0" +version = "1.0.1" dependencies = [ "serde", "serde_json", @@ -4786,7 +4786,7 @@ dependencies = [ [[package]] name = "ryotunes-soundcloud" -version = "1.0.0" +version = "1.0.1" dependencies = [ "regex", "reqwest 0.12.28", @@ -4799,7 +4799,7 @@ dependencies = [ [[package]] name = "ryotunes-spotify" -version = "1.0.0" +version = "1.0.1" dependencies = [ "anyhow", "bytes", @@ -4822,7 +4822,7 @@ dependencies = [ [[package]] name = "ryotunesd" -version = "1.0.0" +version = "1.0.1" dependencies = [ "anyhow", "async-trait", @@ -5585,7 +5585,7 @@ dependencies = [ [[package]] name = "sync-server" -version = "1.0.0" +version = "1.0.1" dependencies = [ "futures-util", "listen-protocol", diff --git a/Cargo.toml b/Cargo.toml index c1db403..42d8359 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ members = [ ] [workspace.package] -version = "1.0.0" +version = "1.0.1" edition = "2021" license = "GPL-3.0-or-later" diff --git a/client/version b/client/version index 3eefcb9..7dea76e 100644 --- a/client/version +++ b/client/version @@ -1 +1 @@ -1.0.0 +1.0.1 diff --git a/packaging/arch/PKGBUILD b/packaging/arch/PKGBUILD index 381aeaa..1ab5fb3 100644 --- a/packaging/arch/PKGBUILD +++ b/packaging/arch/PKGBUILD @@ -2,7 +2,7 @@ # Run from packaging/arch with: makepkg -si pkgname=ryotunes -pkgver=1.0.0 +pkgver=1.0.1 pkgrel=1 # epoch=1 is permanent: the v1 reset publishes 1:X.Y.Z, which pacman ranks above # the legacy 2.x line an existing machine may carry, so `pacman -U` still upgrades. diff --git a/packaging/linux/dev.ryoku.ryotunes.metainfo.xml b/packaging/linux/dev.ryoku.ryotunes.metainfo.xml index 2ce55c8..55e00cc 100644 --- a/packaging/linux/dev.ryoku.ryotunes.metainfo.xml +++ b/packaging/linux/dev.ryoku.ryotunes.metainfo.xml @@ -11,5 +11,5 @@ ryotunes.desktop ryotunes AudioVideoAudio - + diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index b370744..637b163 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "https://schema.tauri.app/config/2", "productName": "Ryotunes", - "version": "1.0.0", + "version": "1.0.1", "identifier": "dev.ryoku.ryotunes", "build": { "frontendDist": "../ui/build", diff --git a/ui/package.json b/ui/package.json index efde71f..6f742b9 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,7 +1,7 @@ { "name": "ui", "private": true, - "version": "1.0.0", + "version": "1.0.1", "type": "module", "scripts": { "dev": "vite dev", From f78716c8ed0cd8b1606cb38d5c1a7c186343e05e Mon Sep 17 00:00:00 2001 From: Ryoku Date: Tue, 8 Sep 2026 11:44:14 -0400 Subject: [PATCH 139/183] docs: explain replacing legacy Ryotunes packages safely --- README.md | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/README.md b/README.md index f446583..8ae3085 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,46 @@

Repository artwork based on the live v2 Home layout and Ryoku visual language.

+### Replace an older Ryoku-packaged Ryotunes + +Quit Ryotunes completely (closing its window can leave playback running). +Download the Arch `.pkg.tar.zst` and matching `.sha256` from +[the latest release](https://github.com/ryoku-dev/ryotunes/releases/latest). +Before removing anything, verify the download in its directory: + +```bash +sha256sum -c ryotunes-1.0.1-1-x86_64.pkg.tar.zst.sha256 +``` + +Use the filenames for the release you downloaded, and continue only if the +checksum reports `OK`. To remove the old application: + +```bash +sudo pacman -R ryotunes +pacman -Q ryotunes +``` + +The second command should report that the package was not found. Removal does +not delete your personal configuration or music. If pacman reports a dependency +conflict, stop and resolve it; do not bypass dependency checks with `-Rdd`. + +To install the standalone replacement: + +```bash +sudo pacman -U ./ryotunes-1.0.1-1-x86_64.pkg.tar.zst +pacman -Q ryotunes +``` + +The v1.0.1 package reports `1:1.0.1-1`: the `1:` is a pacman epoch, which orders +the standalone package above older distribution-numbered builds such as +`2.5.1-1`. To uninstall without replacing it, stop after the removal commands. + +If installation reports files that already exist, do not use a blanket +`--overwrite`. Check each path with `pacman -Qo /path/to/file`. Preserve unowned +files in a backup outside `/usr/share/ryotunes`, then retry installation. If +another package owns a conflicting file, resolve that package conflict first. + + --- ## Built for Ryoku, not merely compatible with it From 92e01a2b8a2d89165a14c20f50afc81ba5e475a6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 8 Sep 2026 15:52:26 +0000 Subject: [PATCH 140/183] release: v1.0.2 --- CHANGELOG.md | 2 ++ Cargo.lock | 22 +++++++++---------- Cargo.toml | 2 +- client/version | 2 +- packaging/arch/PKGBUILD | 2 +- .../linux/dev.ryoku.ryotunes.metainfo.xml | 2 +- src-tauri/tauri.conf.json | 2 +- ui/package.json | 2 +- 8 files changed, 19 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d5b9ad7..ebfb6db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +## v1.0.2 - 2026-09-08 + ## v1.0.1 - 2026-09-08 ## v1.0.0 - 2026-09-08 diff --git a/Cargo.lock b/Cargo.lock index 67a0d01..209299f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2438,7 +2438,7 @@ dependencies = [ [[package]] name = "innertube" -version = "1.0.1" +version = "1.0.2" dependencies = [ "hex", "reqwest 0.12.28", @@ -2943,7 +2943,7 @@ checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" [[package]] name = "listen-protocol" -version = "1.0.1" +version = "1.0.2" dependencies = [ "serde", "serde_json", @@ -3788,7 +3788,7 @@ checksum = "f6b464fbc74e149a392436b17d523f769e057cb6877f6a5c4618bc6f11800548" [[package]] name = "player" -version = "1.0.1" +version = "1.0.2" dependencies = [ "libc", "libmpv2", @@ -4703,7 +4703,7 @@ dependencies = [ [[package]] name = "ryotunes" -version = "1.0.1" +version = "1.0.2" dependencies = [ "anyhow", "async-trait", @@ -4733,7 +4733,7 @@ dependencies = [ [[package]] name = "ryotunes-cli" -version = "1.0.1" +version = "1.0.2" dependencies = [ "ryotunes-protocol", "serde", @@ -4742,7 +4742,7 @@ dependencies = [ [[package]] name = "ryotunes-core" -version = "1.0.1" +version = "1.0.2" dependencies = [ "anyhow", "async-trait", @@ -4778,7 +4778,7 @@ dependencies = [ [[package]] name = "ryotunes-protocol" -version = "1.0.1" +version = "1.0.2" dependencies = [ "serde", "serde_json", @@ -4786,7 +4786,7 @@ dependencies = [ [[package]] name = "ryotunes-soundcloud" -version = "1.0.1" +version = "1.0.2" dependencies = [ "regex", "reqwest 0.12.28", @@ -4799,7 +4799,7 @@ dependencies = [ [[package]] name = "ryotunes-spotify" -version = "1.0.1" +version = "1.0.2" dependencies = [ "anyhow", "bytes", @@ -4822,7 +4822,7 @@ dependencies = [ [[package]] name = "ryotunesd" -version = "1.0.1" +version = "1.0.2" dependencies = [ "anyhow", "async-trait", @@ -5585,7 +5585,7 @@ dependencies = [ [[package]] name = "sync-server" -version = "1.0.1" +version = "1.0.2" dependencies = [ "futures-util", "listen-protocol", diff --git a/Cargo.toml b/Cargo.toml index 42d8359..54469b8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ members = [ ] [workspace.package] -version = "1.0.1" +version = "1.0.2" edition = "2021" license = "GPL-3.0-or-later" diff --git a/client/version b/client/version index 7dea76e..6d7de6e 100644 --- a/client/version +++ b/client/version @@ -1 +1 @@ -1.0.1 +1.0.2 diff --git a/packaging/arch/PKGBUILD b/packaging/arch/PKGBUILD index 1ab5fb3..e628c1c 100644 --- a/packaging/arch/PKGBUILD +++ b/packaging/arch/PKGBUILD @@ -2,7 +2,7 @@ # Run from packaging/arch with: makepkg -si pkgname=ryotunes -pkgver=1.0.1 +pkgver=1.0.2 pkgrel=1 # epoch=1 is permanent: the v1 reset publishes 1:X.Y.Z, which pacman ranks above # the legacy 2.x line an existing machine may carry, so `pacman -U` still upgrades. diff --git a/packaging/linux/dev.ryoku.ryotunes.metainfo.xml b/packaging/linux/dev.ryoku.ryotunes.metainfo.xml index 55e00cc..9faa829 100644 --- a/packaging/linux/dev.ryoku.ryotunes.metainfo.xml +++ b/packaging/linux/dev.ryoku.ryotunes.metainfo.xml @@ -11,5 +11,5 @@ ryotunes.desktop ryotunes AudioVideoAudio - + diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 637b163..b5a26f6 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "https://schema.tauri.app/config/2", "productName": "Ryotunes", - "version": "1.0.1", + "version": "1.0.2", "identifier": "dev.ryoku.ryotunes", "build": { "frontendDist": "../ui/build", diff --git a/ui/package.json b/ui/package.json index 6f742b9..31bfddd 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,7 +1,7 @@ { "name": "ui", "private": true, - "version": "1.0.1", + "version": "1.0.2", "type": "module", "scripts": { "dev": "vite dev", From 6e3790a539031a453fbb0af5595f83f62432b077 Mon Sep 17 00:00:00 2001 From: Ryoku Date: Tue, 8 Sep 2026 11:55:06 -0400 Subject: [PATCH 141/183] docs: identify QML as primary and correct client migration guidance --- README.md | 96 ++++++++++++++++++++++++++++++------------------------- 1 file changed, 53 insertions(+), 43 deletions(-) diff --git a/README.md b/README.md index 8ae3085..cba46e6 100644 --- a/README.md +++ b/README.md @@ -12,8 +12,7 @@ Audio only
Rust -Tauri 2 -Svelte 5 +Quickshell / QML libmpv

@@ -30,44 +29,56 @@

Repository artwork based on the live v2 Home layout and Ryoku visual language.

-### Replace an older Ryoku-packaged Ryotunes +### The primary client: Quickshell / QML -Quit Ryotunes completely (closing its window can leave playback running). -Download the Arch `.pkg.tar.zst` and matching `.sha256` from -[the latest release](https://github.com/ryoku-dev/ryotunes/releases/latest). -Before removing anything, verify the download in its directory: +**The QML client is the primary Ryotunes application.** It includes the YouTube, +Spotify and SoundCloud provider selector, downloads, and Settings → About +software-update controls. The Tauri/WebKitGTK interface is the legacy client, +not its replacement. Package version numbers alone do not identify the client: +the release package currently contains both. + +To update an existing installation, download the Arch package and matching +checksum from [the latest release](https://github.com/ryoku-dev/ryotunes/releases/latest). +Verify it before changing the installed application: ```bash sha256sum -c ryotunes-1.0.1-1-x86_64.pkg.tar.zst.sha256 ``` -Use the filenames for the release you downloaded, and continue only if the -checksum reports `OK`. To remove the old application: +Use the filenames for your downloaded release and continue only on `OK`. +Quit Ryotunes completely, then replace the package in one transaction; there is +no need to uninstall the primary QML application first: ```bash -sudo pacman -R ryotunes -pacman -Q ryotunes +systemctl --user stop ryotunesd.service ryotunesd.socket +sudo pacman -U ./ryotunes-1.0.1-1-x86_64.pkg.tar.zst +systemctl --user daemon-reload +systemctl --user enable --now ryotunesd.socket +ryotunes ``` -The second command should report that the package was not found. Removal does -not delete your personal configuration or music. If pacman reports a dependency -conflict, stop and resolve it; do not bypass dependency checks with `-Rdd`. +The package's `1:` pacman epoch orders `1:1.0.1-1` above distribution-numbered +builds such as `2.5.1-1`; it does not mean QML is obsolete. Personal configuration +and music are preserved. If pacman reports file conflicts, check ownership with +`pacman -Qo /path/to/file` and back up unowned files before retrying. Do not use +blanket `--overwrite` or bypass dependency checks with `-Rdd`. -To install the standalone replacement: +**If the legacy interface opens:** quit it, then restart socket activation: ```bash -sudo pacman -U ./ryotunes-1.0.1-1-x86_64.pkg.tar.zst -pacman -Q ryotunes +systemctl --user restart ryotunesd.socket +systemctl --user start ryotunesd.service +ryotunes-cli show ``` -The v1.0.1 package reports `1:1.0.1-1`: the `1:` is a pacman epoch, which orders -the standalone package above older distribution-numbered builds such as -`2.5.1-1`. To uninstall without replacing it, stop after the removal commands. +The launcher can fall back to Tauri when the daemon socket is missing or refuses +connections. Verify **Settings → About → Client: QUICKSHELL / QML**, the provider +selector and Downloads sidebar rather than judging the client by its version. +Check for updates from that QML About page. -If installation reports files that already exist, do not use a blanket -`--overwrite`. Check each path with `pacman -Qo /path/to/file`. Preserve unowned -files in a backup outside `/usr/share/ryotunes`, then retry installation. If -another package owns a conflicting file, resolve that package conflict first. +To remove Ryotunes entirely instead of updating it, quit the app and run +`sudo pacman -R ryotunes`. This removes both packaged clients, not just Tauri; +do not use it to remove the legacy interface while keeping QML. --- @@ -76,7 +87,7 @@ another package owns a conflicting file, resolve that package conflict first. Ryotunes is a Linux-first desktop music application shaped around the way **Ryoku + Hyprland** actually behave. -The visible interface is Svelte/WebKitGTK. Playback is not. Rust and libmpv own the audio session, desktop integration, lifecycle, and media state. That separation lets Ryotunes stay visually rich while open and become dramatically quieter when the main interface is no longer needed. +The primary interface is Quickshell / QML, connected to the Rust `ryotunesd` daemon. Rust and libmpv own playback, media state and provider integrations independently of the visible client. The older Svelte/WebKitGTK interface remains a separate legacy launch mode. @@ -95,7 +106,7 @@ Audio stays in **libmpv**, outside the frontend renderer. MPRIS, media keys, tra @@ -170,10 +181,10 @@ For the shell itself: | Situation | Behaviour | |---|---| -| Main window open | Full Svelte/WebKit UI is active | -| Close while music is playing | Main WebKit can hibernate; native playback + MPRIS + tray remain alive | -| Tray-only, nothing playing | Application exits after the bounded 5-minute idle period | -| Reopen | Main WebView is reconstructed and resynchronized from native state | +| Main window open | The primary Quickshell / QML client is connected to the daemon | +| Close while music or downloads are active | The daemon continues the active work | +| Idle with no client | The daemon exits after its idle grace period | +| Reopen | The QML client reconnects to daemon-owned state | | Explicit **Quit** | Playback stops, MPRIS unregisters, media state clears and backend integrations shut down | This is why the UI is a **client of playback state**, not the transport clock that owns it. @@ -187,20 +198,19 @@ flowchart LR R["Ryoku / Hyprland"] --> M["MPRIS · media keys · tray"] R --> T["live palette + window policy"] - M --> N["Tauri / Rust host"] + M --> N["ryotunesd / Rust daemon"] T --> N N --> P["native player crate"] P --> MPV["libmpv · audio only"] - N --> I["Innertube · library · integrations"] - N --> W["Svelte 5 / WebKitGTK"] + N --> I["YouTube · Spotify · SoundCloud · downloads"] + N <-->|"Unix socket RPC + events"| W["Quickshell / QML"] W --> U["Home · Search · Library"] W --> Q["Queue · Lyrics · Now Playing"] W --> MINI["Ryotunes Mini"] - W -. "hibernate while background playback continues" .-> N ``` More detail: **[docs/ARCHITECTURE.md](docs/ARCHITECTURE.md)** @@ -212,9 +222,7 @@ More detail: **[docs/ARCHITECTURE.md](docs/ARCHITECTURE.md)** Ryotunes treats background efficiency as an architectural requirement, not a cleanup pass. - event-driven playback state instead of a permanent 100 ms global frontend transport timer; -- no always-on FFT / requestAnimationFrame loop for ordinary idle playback; -- main WebKit hibernation during background playback; -- stable Home DOM — physical Home virtualization is deliberately avoided; +- daemon-owned playback and downloads independent of the visible QML window; - bounded artwork decode/cache paths; - native playback state remains authoritative across close, tray, mini-player and reopen transitions; - Internet Radio discovery is demand-driven — no startup fetch or permanent station polling loop. @@ -227,9 +235,9 @@ The design rules behind the interface are documented in **[docs/DESIGN.md](docs/ Ryotunes targets **x86_64 Ryoku, CachyOS and Arch-based systems**. -The published package is **`ryotunes 1:-1`**. The permanent `epoch=1` lets it upgrade a machine still on the legacy 2.x line; the downloaded file name stays epochless. +The published package is **`ryotunes 1:-1`**. Its permanent `epoch=1` orders it above distribution-numbered 2.x packages; filenames stay epochless. This numbering transition is not a switch from QML to Tauri. -The normal user path is a **prebuilt package**. End users do not need Node, pnpm, Rust, Cargo or a local Tauri build. +The normal user path is a **prebuilt package**. End users do not need Node, pnpm, Rust or Cargo. 1. Open **[GitHub Releases](https://github.com/ryoku-dev/ryotunes/releases/latest)**. 2. Download `ryotunes--1-x86_64.pkg.tar.zst` and its `.sha256`. @@ -240,7 +248,7 @@ sha256sum -c ryotunes--1-x86_64.pkg.tar.zst.sha256 sudo pacman -U ./ryotunes--1-x86_64.pkg.tar.zst ``` -The package installs a normal `/usr/bin/ryotunes` alongside `ryotunesd`, `ryotunes-cli` and the native client under `/usr/share/ryotunes`. After updating, **quit and reopen Ryotunes** (closing the window is not enough) so the daemon and client load the new build. +The package installs `/usr/bin/ryotunes`, `ryotunesd`, `ryotunes-cli` and the primary QML client under `/usr/share/ryotunes`. Follow the update and socket-activation instructions above when replacing an existing installation. > [!TIP] > An AUR `-bin` recipe lives in [`aur/`](aur/). Public AUR publication is pending; the repository does not pretend the package is available there before it actually is. @@ -259,8 +267,10 @@ crates/ listen-protocol/ shared Listen Together protocol sync-server/ optional room relay -src-tauri/ Tauri host, lifecycle, MPRIS, tray, integrations -ui/ SvelteKit / Svelte 5 interface +client/ primary Quickshell / QML interface +crates/ryotunesd/ playback daemon, provider RPC and downloads +src-tauri/ legacy Tauri host +ui/ legacy Svelte / WebKitGTK interface integrations/ Ryoku / shell integration assets packaging/ Arch / Ryoku replacement packaging scripts/ diagnostics, release gates and packaging tools @@ -334,6 +344,6 @@ Distributed under **[GPL-3.0-or-later](LICENSE)**. ### Music, shaped for the Ryoku desktop. -Rust · Tauri 2 · Svelte 5 · WebKitGTK · libmpv · Hyprland +Rust · Quickshell / QML · libmpv · Hyprland From 3b3d3779a846a06254f775d0c963cb0a29730f61 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 8 Sep 2026 16:16:12 +0000 Subject: [PATCH 142/183] release: v1.0.3 --- CHANGELOG.md | 2 ++ Cargo.lock | 22 +++++++++---------- Cargo.toml | 2 +- client/version | 2 +- packaging/arch/PKGBUILD | 2 +- .../linux/dev.ryoku.ryotunes.metainfo.xml | 2 +- src-tauri/tauri.conf.json | 2 +- ui/package.json | 2 +- 8 files changed, 19 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ebfb6db..5c2c8b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +## v1.0.3 - 2026-09-08 + ## v1.0.2 - 2026-09-08 ## v1.0.1 - 2026-09-08 diff --git a/Cargo.lock b/Cargo.lock index 209299f..63ad94a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2438,7 +2438,7 @@ dependencies = [ [[package]] name = "innertube" -version = "1.0.2" +version = "1.0.3" dependencies = [ "hex", "reqwest 0.12.28", @@ -2943,7 +2943,7 @@ checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" [[package]] name = "listen-protocol" -version = "1.0.2" +version = "1.0.3" dependencies = [ "serde", "serde_json", @@ -3788,7 +3788,7 @@ checksum = "f6b464fbc74e149a392436b17d523f769e057cb6877f6a5c4618bc6f11800548" [[package]] name = "player" -version = "1.0.2" +version = "1.0.3" dependencies = [ "libc", "libmpv2", @@ -4703,7 +4703,7 @@ dependencies = [ [[package]] name = "ryotunes" -version = "1.0.2" +version = "1.0.3" dependencies = [ "anyhow", "async-trait", @@ -4733,7 +4733,7 @@ dependencies = [ [[package]] name = "ryotunes-cli" -version = "1.0.2" +version = "1.0.3" dependencies = [ "ryotunes-protocol", "serde", @@ -4742,7 +4742,7 @@ dependencies = [ [[package]] name = "ryotunes-core" -version = "1.0.2" +version = "1.0.3" dependencies = [ "anyhow", "async-trait", @@ -4778,7 +4778,7 @@ dependencies = [ [[package]] name = "ryotunes-protocol" -version = "1.0.2" +version = "1.0.3" dependencies = [ "serde", "serde_json", @@ -4786,7 +4786,7 @@ dependencies = [ [[package]] name = "ryotunes-soundcloud" -version = "1.0.2" +version = "1.0.3" dependencies = [ "regex", "reqwest 0.12.28", @@ -4799,7 +4799,7 @@ dependencies = [ [[package]] name = "ryotunes-spotify" -version = "1.0.2" +version = "1.0.3" dependencies = [ "anyhow", "bytes", @@ -4822,7 +4822,7 @@ dependencies = [ [[package]] name = "ryotunesd" -version = "1.0.2" +version = "1.0.3" dependencies = [ "anyhow", "async-trait", @@ -5585,7 +5585,7 @@ dependencies = [ [[package]] name = "sync-server" -version = "1.0.2" +version = "1.0.3" dependencies = [ "futures-util", "listen-protocol", diff --git a/Cargo.toml b/Cargo.toml index 54469b8..125f860 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ members = [ ] [workspace.package] -version = "1.0.2" +version = "1.0.3" edition = "2021" license = "GPL-3.0-or-later" diff --git a/client/version b/client/version index 6d7de6e..21e8796 100644 --- a/client/version +++ b/client/version @@ -1 +1 @@ -1.0.2 +1.0.3 diff --git a/packaging/arch/PKGBUILD b/packaging/arch/PKGBUILD index e628c1c..25674fe 100644 --- a/packaging/arch/PKGBUILD +++ b/packaging/arch/PKGBUILD @@ -2,7 +2,7 @@ # Run from packaging/arch with: makepkg -si pkgname=ryotunes -pkgver=1.0.2 +pkgver=1.0.3 pkgrel=1 # epoch=1 is permanent: the v1 reset publishes 1:X.Y.Z, which pacman ranks above # the legacy 2.x line an existing machine may carry, so `pacman -U` still upgrades. diff --git a/packaging/linux/dev.ryoku.ryotunes.metainfo.xml b/packaging/linux/dev.ryoku.ryotunes.metainfo.xml index 9faa829..0f1fdc9 100644 --- a/packaging/linux/dev.ryoku.ryotunes.metainfo.xml +++ b/packaging/linux/dev.ryoku.ryotunes.metainfo.xml @@ -11,5 +11,5 @@ ryotunes.desktop ryotunes AudioVideoAudio - + diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index b5a26f6..af4104b 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "https://schema.tauri.app/config/2", "productName": "Ryotunes", - "version": "1.0.2", + "version": "1.0.3", "identifier": "dev.ryoku.ryotunes", "build": { "frontendDist": "../ui/build", diff --git a/ui/package.json b/ui/package.json index 31bfddd..907a953 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,7 +1,7 @@ { "name": "ui", "private": true, - "version": "1.0.2", + "version": "1.0.3", "type": "module", "scripts": { "dev": "vite dev", From 8da530528fe6ff4a23bf650e57415f3cb5a9088a Mon Sep 17 00:00:00 2001 From: Ryoku Date: Tue, 8 Sep 2026 14:57:46 -0400 Subject: [PATCH 143/183] fix: stabilize native Home and preserve UI during updates --- CHANGELOG.md | 6 + README.md | 9 +- client/Personal.qml | 184 +++++-- client/components/HomeFeed.qml | 28 ++ client/components/HomePersonal.qml | 49 +- client/components/ShortcutPicker.qml | 691 +++++++++++++++++++++++++++ client/lib/browse.js | 2 +- client/lib/ids.js | 16 + client/lib/personal.js | 73 ++- client/lib/playlist-links.js | 146 ++++++ client/lib/recommendations.js | 363 ++++++++++++++ client/pages/AlbumPage.qml | 8 +- client/pages/HomePage.qml | 134 +++++- client/pages/PlaylistPage.qml | 20 +- client/shell.qml | 3 + client/tests/tst_home_feed.qml | 60 +++ client/tests/tst_personal.qml | 107 +++++ client/tests/tst_playlist_links.qml | 107 +++++ client/tests/tst_recommendations.qml | 131 +++++ docs/ARCHITECTURE.md | 8 +- 20 files changed, 2050 insertions(+), 95 deletions(-) create mode 100644 client/components/HomeFeed.qml create mode 100644 client/components/ShortcutPicker.qml create mode 100644 client/lib/playlist-links.js create mode 100644 client/lib/recommendations.js create mode 100644 client/tests/tst_home_feed.qml create mode 100644 client/tests/tst_playlist_links.qml create mode 100644 client/tests/tst_recommendations.qml diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c2c8b2..b757a87 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ ## Unreleased +- Prevented automatic QML reload during package upgrades, which could reload `shell.qml` while pacman temporarily removed it. Quit and reopen after installation to load the new client and daemon together. +- Fixed the primary QML Home page jumping past its header on the first scroll. Asynchronous header growth stays pinned only until the user starts scrolling. +- Home now puts a compact resume control and remembered listening context ahead of discovery. Played songs, albums and playlists persist across launches without counting a restored queue as a new listen. +- Added searchable Home shortcuts from recents, the library and provider search, plus YouTube playlist-link previews. Duplicate/capacity feedback and a bounded scrolling list keep the controls usable in small windows. +- Added a bounded, on-device Home discovery ranker using the existing provider feed, listening recency, artist affinity and diversity. No additional recommendation service, model training or idle polling is introduced. + ## v1.0.3 - 2026-09-08 ## v1.0.2 - 2026-09-08 diff --git a/README.md b/README.md index cba46e6..1ccf10f 100644 --- a/README.md +++ b/README.md @@ -121,7 +121,7 @@ The QML window can close while the daemon continues playback or active downloads | Surface | What Ryotunes does | |---|---| -| **Home** | Stable, non-virtualized sections, listening console, recommendations and progressive loading without scroll-jitter regressions | +| **Home** | Resume listening, remembered songs/albums/playlists, searchable shortcuts and local discovery ranking without the first-scroll jump | | **Search** | Songs, albums, artists and playlists with bounded incremental loading and preserved navigation state | | **Library** | Liked music, account playlists, persistent device playlists and local music in the same desktop flow | | **Radio** | Demand-driven Internet Radio directory with native libmpv live-stream playback | @@ -132,6 +132,13 @@ The QML window can close while the daemon continues playback or active downloads | **Mini-player** | A separate compact Ryoku surface with its own exact Hyprland title and independent geometry | | **Integrations** | MPRIS, hardware media keys, tray, Last.fm, configurable Discord Rich Presence and optional Listen Together | +### Home in the primary QML client + +- **Continue listening** resumes the queue restored by the daemon; reopening does not start playback automatically. +- **Recently played** remembers songs, albums and playlists across launches. Items already saved as shortcuts are not repeated in that row. +- **Add shortcut** lets you filter recents and your library, search the selected provider, or paste a YouTube / YouTube Music playlist link. A link is previewed with its real title and artwork before you add it. Private or unavailable playlists show an error; duplicate shortcuts are not added. +- **Picked for you** re-ranks the selected provider's existing Home feed using local listening history, recency and artist variety. With no relevant history, it uses the provider's discovery ordering instead of claiming learned preferences. This adds no recommendation API, paid service or background training: at most 300 candidates are considered for 12 picks, only when the feed or personal data changes. Displaying additional artwork still has a memory cost. + --- ## Download music in the native client diff --git a/client/Personal.qml b/client/Personal.qml index b204f38..2da75b6 100644 --- a/client/Personal.qml +++ b/client/Personal.qml @@ -7,9 +7,8 @@ import "lib/ids.js" as Ids // The shared personal store, mirrored from the daemon (AppState::{personal,set_personal}). It moved // off the Svelte app's browser localStorage so a native client can read it too. `get_personal` seeds // the mirror on every (re)subscribe and the `personal-changed` event keeps it live, so a second -// client — the mini window, another shell — follows along. Reducers mutate a clone, publish it -// optimistically for an instant UI, and persist through `set_personal` (debounced, because now-playing -// records recency on every track). All the shape logic is the pure port in lib/personal.js. +// client follows along. Mutations are held until hydration, then persisted immediately +// through serialized writes. All shape logic stays in lib/personal.js. Singleton { id: root @@ -20,6 +19,23 @@ Singleton { readonly property var homeArrange: (root.blob && root.blob.home) ? root.blob.home : ({ order: [], hidden: [], seen: [] }) + // Recording state kept out of the persisted blob. `lastNowId` is the last track we recorded a + // play for, so a repeated now-playing for the same track (a metadata refresh) or a reconnect — + // which replays state through the snapshot, never a now-playing event — is not a fresh play. + // `wasSignedIn`/`wasSpotifyIn` remember each session's state so only a real sign-out transition + // sweeps its recents. `pendingSaves` holds the blobs of set_personal writes still awaiting their + // personal-changed echo, so the daemon's echo of our own save can be dropped instead of applied. + property string lastNowId: "" + property bool wasSignedIn: false + property bool wasSpotifyIn: false + property var pendingSaves: [] + property bool hydrated: false + property bool dirty: false + property bool saving: false + property int revision: 0 + property int reloadId: 0 + property var deferredMutations: [] + // The "Jump back in" rail: recents newest-first, minus anything already a shortcut (otherwise // the two lists converge on the same handful of items in two shapes), capped at nine — three // full columns once the window is filtered. @@ -40,43 +56,81 @@ Singleton { Connections { target: Daemon function onEvent(name, data) { - if (name === "personal-changed") + if (name === "personal-changed") { + // The daemon echoes every set_personal back to us. Applying our own echo is a no-op + // at best and, if a mutation landed in the few ms since the save, reverts it — so + // drop the echo. A genuine change from another client never matches and still applies. + if (root.consumeSelfEcho(data)) + return; root.apply(data); - else if (name === "now-playing") + } else if (name === "now-playing") { root.onNowPlaying(data); + } } // Fired on the subscribe reply (first connect and every reconnect) — reload the store then. function onSnapshot(snap) { root.reload(); } } - Component.onCompleted: if (Daemon.connected) root.reload(); + // Seed the sign-out watchers from the current sessions (a singleton created after the auth + // snapshot would otherwise miss the transition), then mirror the store if already connected. + Component.onCompleted: { + root.wasSignedIn = !!(Playback.auth && Playback.auth.signedIn); + root.wasSpotifyIn = !!(Playback.spotify && Playback.spotify.signedIn); + if (Daemon.connected) root.reload(); + } function reload() { + var request = ++root.reloadId; + var revision = root.revision; Daemon.call("get_personal") - .then(function (r) { root.apply(r ? r.personal : null); }) + .then(function (r) { + if (request !== root.reloadId) + return; + if (!root.hydrated || root.revision === revision) + root.apply(r ? r.personal : null); + root.save(); + }) .catch(function () {}); } // Replace the mirror from a daemon blob (a get_personal result or a personal-changed payload). + // No account sweep here: purging must ride the real sign-out transition, not an initial + // hydration. The auth snapshot can still hold its default signed-out value when the first blob + // lands, and sweeping then would wrongly erase recents belonging to a session that is signed in. function apply(b) { + if (root.hydrated && (root.dirty || root.saving)) + return; root.blob = P.hydrate(b); - // The blob can land after the auth snapshot: sweep it too when the session is signed out. - if (!(Playback.auth && Playback.auth.signedIn)) - root.forgetAccountRecents(); + root.revision++; + root.hydrated = true; + var deferred = root.deferredMutations; + root.deferredMutations = []; + for (var i = 0; i < deferred.length; i++) + root.mutate(deferred[i]); } - // A track started: refresh its shortcut's recency and count its artist, exactly as - // player.svelte.ts does on `now-playing`. Radio stations carry no shortcut or artist page. + // A track started playing: record it as a recent song, refresh any matching shortcut's recency + // and count its artist, as player.svelte.ts does on `now-playing`. Guarded on a genuine track + // change so a repeated event for the same track, or a reconnect (which replays through the + // snapshot, never this event), is not counted as a new play. Radio carries no navigable song, + // shortcut or artist page. function onNowPlaying(n) { - if (!n || !n.videoId || Ids.isRadioId(n.videoId)) + if (!n || !n.videoId || Ids.isRadioId(n.videoId)) { + root.lastNowId = ""; + return; + } + if (n.videoId === root.lastNowId) return; + root.lastNowId = n.videoId; root.mutate(function (b) { - var touched = P.touchPick(b, n.videoId, Date.now()); - var noted = false; - if (n.artists) { - P.noteArtist(b, n.artistId ? n.artistId : n.artists, P.firstArtist(n.artists)); - noted = true; - } - return touched || noted; + var now = Date.now(); + var song = { kind: "song", id: n.videoId, title: n.title || "", + subtitle: n.artists || "", thumbnail: n.thumbnail || "" }; + if (n.artistId) song.artistId = n.artistId; + P.noteRecent(b, song, now); + P.touchPick(b, n.videoId, now); + if (n.artists) + P.noteArtist(b, n.artistId ? n.artistId : n.artists, P.firstArtist(n.artists), now); + return true; }); } @@ -84,11 +138,17 @@ Singleton { // A JSON clone so the reassignment is a new object (QML change detection) and the pure reducer // never aliases the live blob's nested recent/artists maps. function mutate(fn) { + if (!root.hydrated) { + root.deferredMutations = root.deferredMutations.concat([fn]); + return true; + } var b = JSON.parse(JSON.stringify(root.blob)); if (fn(b) === false) return false; root.blob = b; - saveTimer.restart(); + root.revision++; + root.dirty = true; + root.save(); return true; } @@ -99,26 +159,24 @@ Singleton { function touchPick(id) { return root.mutate(function (b) { return P.touchPick(b, id, Date.now()); }); } function seedPick(item) { return root.mutate(function (b) { return P.seedPick(b, item, Date.now()); }); } function noteRecent(item) { return root.mutate(function (b) { P.noteRecent(b, item, Date.now()); return true; }); } - // Signing out of the account drops the recents that belong to it: Liked Music (LM), the - // library playlists and anything else that only resolves with that session. Home's "Jump - // back in" must not keep offering a library the daemon can no longer fetch. - function forgetAccountRecents() { - return root.mutate(function (b) { - var n = 0; - for (var id in b.recent) { - var r = b.recent[id]; - // Liked Music (LM / VLLM), Spotify items, and any library playlist: only a signed-in - // session can open them. Public playlists (a shared link, a chart) stay. - if (id === "LM" || id === "VLLM" || id.indexOf("spotify:") === 0 - || (r && r.kind === "playlist" && String(r.subtitle || "").indexOf("Your") === 0)) { delete b.recent[id]; n++; } - } - return n > 0; - }); - } + // Signing out of an account drops only the recents that belong to *that* session (Home's "Jump + // back in" must not keep offering a library the daemon can no longer fetch), and only on a real + // signed-in -> signed-out transition — never on the initial snapshot, whose signed-out default + // would otherwise erase a signed-in session's history. The two providers are independent. Connections { target: Playback - function onAuthChanged(): void { if (!(Playback.auth && Playback.auth.signedIn)) root.forgetAccountRecents(); } - function onSpotifyChanged(): void { if (!(Playback.spotify && Playback.spotify.signedIn)) root.forgetAccountRecents(); } + function onAuthChanged(): void { + var nowIn = !!(Playback.auth && Playback.auth.signedIn); + if (root.wasSignedIn && !nowIn) + root.mutate(function (b) { return P.forgetYouTubeRecents(b) > 0; }); + root.wasSignedIn = nowIn; + } + function onSpotifyChanged(): void { + var nowIn = !!(Playback.spotify && Playback.spotify.signedIn); + if (root.wasSpotifyIn && !nowIn) + root.mutate(function (b) { return P.forgetSpotifyRecents(b) > 0; }); + root.wasSpotifyIn = nowIn; + } } // pin / unpin, returning "pinned" | "unpinned" | "full" like personal.ts togglePin. @@ -133,10 +191,48 @@ Singleton { function pin(id) { return root.isPinned(id) ? "pinned" : root.togglePin(id); } function unpin(id) { if (root.isPinned(id)) root.togglePin(id); } - // Persist the current blob, coalescing a burst (now-playing recency, a drag) into one write. - Timer { - id: saveTimer - interval: 300 - onTriggered: Daemon.call("set_personal", { personal: root.blob }).catch(function () {}) + // Recognise (and drop) the personal-changed echo of a set_personal we sent. The daemon echoes + // each save back in the order it received them, so the oldest pending blob is the one to match; + // deepEqual ignores serde's key reordering. Anything else is a real change from another client. + function consumeSelfEcho(blob) { + for (var i = 0; i < root.pendingSaves.length; i++) { + if (P.deepEqual(root.pendingSaves[i], blob)) { + var pending = root.pendingSaves.slice(); + pending.splice(i, 1); + root.pendingSaves = pending; + return true; + } + } + return false; + } + function dropPendingSave(snap) { + var i = root.pendingSaves.indexOf(snap); + if (i >= 0) { + var arr = root.pendingSaves.slice(); + arr.splice(i, 1); + root.pendingSaves = arr; + } + } + + // No close-time debounce gap and no overlapping full-blob writes. A new mutation + // during an in-flight save is sent as soon as that save acknowledges. + function save() { + if (!root.hydrated || !root.dirty || root.saving || !Daemon.connected) + return; + var snap = root.blob; + root.pendingSaves = root.pendingSaves.concat([snap]); + root.saving = true; + root.dirty = false; + Daemon.call("set_personal", { personal: snap }) + .then(function () { + root.saving = false; + root.save(); + }) + .catch(function () { + root.dropPendingSave(snap); + root.saving = false; + root.dirty = true; + Playback.toast("Could not save your listening history and shortcuts", "error"); + }); } } diff --git a/client/components/HomeFeed.qml b/client/components/HomeFeed.qml new file mode 100644 index 0000000..f55b3ad --- /dev/null +++ b/client/components/HomeFeed.qml @@ -0,0 +1,28 @@ +import QtQuick + +// Home's asynchronous header can grow before the first scroll. Pin its origin only +// until the user takes control. Restoring contentY's old value (usually zero) when +// releasing the binding skips the entire tall header on the first wheel tick. +ListView { + id: feed + property bool stickTop: true + + onMovementStarted: feed.stickTop = false + Binding { + target: feed + property: "contentY" + value: feed.originY + when: feed.stickTop + restoreMode: Binding.RestoreNone + } + WheelHandler { + target: null + blocking: false + acceptedDevices: PointerDevice.Mouse | PointerDevice.TouchPad + onWheel: event => { + if (event.angleDelta.y !== 0 || event.pixelDelta.y !== 0) + feed.stickTop = false; + event.accepted = false; + } + } +} diff --git a/client/components/HomePersonal.qml b/client/components/HomePersonal.qml index 476de42..605dcbe 100644 --- a/client/components/HomePersonal.qml +++ b/client/components/HomePersonal.qml @@ -29,7 +29,7 @@ ColumnLayout { if (!it) return; if (it.kind === "song") - Playback.play(Browse.asSong(it)); + root.playRecent(it); else Router.push(it.kind, { id: it.id, title: it.title }); Personal.touchPick(it.id); @@ -37,21 +37,34 @@ ColumnLayout { function playRecent(it) { if (!it) return; - Personal.noteRecent(it); - if (it.kind === "album") { - Daemon.call("get_album", { id: it.id }) - .then((a) => Daemon.call("play_playlist", { items: a.items, sourceId: a.playlistId, sourceName: it.title })) - .catch(() => Playback.toast("Could not play — try opening it", "error")); - } else { - Daemon.call("get_playlist", { id: it.id }) - .then((p) => Daemon.call("play_playlist", { - items: p.items, - sourceId: Ids.isSmartPlaylistId(it.id) ? undefined : it.id, - sourceName: it.title, - continuation: p.continuation - })) - .catch(() => Playback.toast("Could not play — try opening it", "error")); + if (it.kind === "song") { + Playback.play(Browse.asSong(it)) + .catch(() => Playback.toast("Could not play this song", "error")); + return; } + if (it.kind !== "album" && it.kind !== "playlist") + return; + Daemon.call(it.kind === "album" ? "get_album" : "get_playlist", { id: it.id }) + .then((media) => Daemon.call("play_playlist", { + items: media.items, + sourceId: it.kind === "album" ? media.playlistId + : (Ids.isSmartPlaylistId(it.id) ? undefined : it.id), + sourceName: it.title, + continuation: media.continuation + }).then(() => Personal.noteRecent(it))) + .catch(() => Playback.toast("Could not play — try opening it", "error")); + } + + function recentMeta(it) { + if (!it) + return ""; + var kind = it.kind === "song" ? "Song" : it.kind === "album" ? "Album" + : it.kind === "playlist" ? "Playlist" : "Artist"; + var age = Math.max(0, Date.now() - Number(it.at || 0)); + var when = !it.at ? "" : age < 3600000 ? "Recently" + : age < 86400000 ? "Today" : age < 172800000 ? "Yesterday" + : Math.floor(age / 86400000) + " days ago"; + return [kind, it.subtitle || "", when].filter((part) => !!part).join(" · "); } ColumnLayout { @@ -62,7 +75,7 @@ ColumnLayout { Layout.fillWidth: true spacing: Style.sp(2) Icon { Layout.alignment: Qt.AlignVCenter; name: "jump-back"; size: Style.fs.md; color: Tokens.inkMuted } - SectionHeading { Layout.fillWidth: true; title: "// Jump back in"; mark: Style.decorRich ? "戻" : "" } + SectionHeading { Layout.fillWidth: true; title: "Recently played"; mark: Style.decorRich ? "戻" : "" } } GridLayout { id: recGrid @@ -113,8 +126,7 @@ ColumnLayout { } Text { Layout.fillWidth: true - text: (recRow.modelData && recRow.modelData.subtitle) ? recRow.modelData.subtitle - : (recRow.modelData ? recRow.modelData.kind : "") + text: root.recentMeta(recRow.modelData) color: Tokens.inkMuted font.family: Style.fontUi font.pixelSize: Style.fs.sm @@ -128,6 +140,7 @@ ColumnLayout { iconSize: Style.fs.sm diameter: Style.sp(8) onClicked: root.playRecent(recRow.modelData) + tip: "Play " + (recRow.modelData ? recRow.modelData.title : "") } } HoverHandler { id: recHover } diff --git a/client/components/ShortcutPicker.qml b/client/components/ShortcutPicker.qml new file mode 100644 index 0000000..7fc0c79 --- /dev/null +++ b/client/components/ShortcutPicker.qml @@ -0,0 +1,691 @@ +pragma ComponentBehavior: Bound +import QtQuick +import QtQuick.Layouts +import QtQuick.Effects +import Ryoku.Ui.Singletons +import "../" +import "../lib/personal.js" as P +import "../lib/playlist-links.js" as Links + +// The Home "Add shortcut" picker. Instead of sending the user off to search, this raises a modal +// over Home with three ways to pin a shortcut: the recents/library the user already has, a title +// filter that falls through to a daemon search, and a paste-a-YouTube-playlist-link field for the +// playlists that only exist as a URL (not in search, not in the library). A pasted link is resolved +// to a `VL…` browse id (lib/playlist-links.js) and previewed through `get_playlist` — never by +// fetching the URL — so the tile carries the playlist's real title and cover and reopens/plays it. +// +// Public surface (the parent anchors it over the Home page bounds): `opened`, `open()`, `closed()`. +// It stays instantiated and hides itself when closed. Every async reply is guarded by a sequence +// token and the open flag, so a stale search or link fetch that lands after a re-query, a close, or +// a reopen is dropped. +Item { + id: root + + anchors.fill: parent + visible: root.opened + z: 250 + + property bool opened: false + signal closed() + + // The sibling page content to snapshot-blur behind the card (spec §9); unset → scrim only. + property Item blurSource: null + + // The filter box, and the daemon results it falls through to. + property string query: "" + property var library: [] + property bool libLoaded: false + property var remote: [] + property bool searching: false + property int searchSeq: 0 + property string searchError: "" + property int librarySeq: 0 + + // The paste-a-link field and its previewed target. + property string linkInput: "" + property var linkPreview: null + property string linkError: "" + property bool linkLoading: false + property int linkSeq: 0 + + // The grid is a fixed size; a suggestion never evicts a hand-added tile, so at capacity the + // picker refuses with feedback rather than silently dropping the stalest shortcut. + readonly property int capacity: P.MAX_PICKS || 18 + readonly property bool full: Personal.picks.length >= root.capacity + + // Recents (newest first, already minus current shortcuts) plus the user's library playlists, + // deduped — the offline-friendly candidates shown before a search runs. + readonly property var recents: root.opened ? Personal.recent(40) : [] + readonly property var localCandidates: { + var out = []; + var seen = ({}); + var add = function (it) { + if (!it || !it.id || seen[it.id]) + return; + seen[it.id] = true; + out.push(it); + }; + var r = root.recents; + for (var i = 0; i < r.length; i++) + add(r[i]); + for (var j = 0; j < root.library.length; j++) + add(root.library[j]); + return out; + } + + // What the list shows: with no query, the local candidates; with one, local title matches first + // then the daemon results, deduped and always minus what is already a shortcut. + readonly property var candidates: { + var q = root.query.trim().toLowerCase(); + var picks = Personal.picks; + var isPick = function (id) { + for (var k = 0; k < picks.length; k++) + if (picks[k].id === id) + return true; + return false; + }; + var out = []; + var seen = ({}); + var add = function (it) { + if (!it || !it.id || seen[it.id] || isPick(it.id)) + return; + seen[it.id] = true; + out.push(it); + }; + var local = root.localCandidates; + for (var i = 0; i < local.length; i++) { + var it = local[i]; + if (!q || (String(it.title || "").toLowerCase().indexOf(q) >= 0) + || (String(it.subtitle || "").toLowerCase().indexOf(q) >= 0)) + add(it); + } + if (q) { + for (var j = 0; j < root.remote.length; j++) + add(root.remote[j]); + } + return out.slice(0, 40); + } + + function open() { + root.query = ""; + root.remote = []; + root.searching = false; + root.searchSeq++; + root.linkInput = ""; + root.linkPreview = null; + root.linkError = ""; + root.linkLoading = false; + root.linkSeq++; + root.opened = true; + if (root.blurSource) + snap.scheduleUpdate(); + root.loadLibrary(); + Qt.callLater(function () { filterField.forceActiveFocus(); }); + } + + function close() { + // Bump the guards so any in-flight reply that lands after close is ignored. + root.searchSeq++; + root.linkSeq++; + root.opened = false; + root.librarySeq++; + searchTimer.stop(); + linkTimer.stop(); + root.closed(); + } + + function loadLibrary() { + var seq = ++root.librarySeq; + var provider = Playback.provider; + root.library = []; + Daemon.call("get_library") + .then(function (items) { + if (seq !== root.librarySeq || !root.opened || provider !== Playback.provider) + return; + root.library = (items || []).filter(function (i) { return i && i.id && i.kind; }); + }) + .catch(function () { + if (seq === root.librarySeq && root.opened) + root.searchError = "Your library could not be loaded. Search or paste a public playlist link."; + }); + } + + function runSearch() { + if (!root.opened) + return; + root.searchError = ""; + var q = root.query.trim().replace(/\s+/g, " "); + var seq = ++root.searchSeq; + var prov = Playback.provider; + if (q.length < 2) { + root.remote = []; + root.searching = false; + return; + } + root.searching = true; + Daemon.call("search_all", { query: q }) + .then(function (res) { + if (seq !== root.searchSeq || !root.opened || Playback.provider !== prov) + return; + var flat = []; + var pushAll = function (arr) { + if (!arr) + return; + for (var i = 0; i < arr.length; i++) { + var it = arr[i]; + if (it && it.kind === "song" && it.isVideo) + continue; + if (it && it.id) + flat.push(it); + } + }; + pushAll(res ? res.top : null); + pushAll(res ? res.songs : null); + pushAll(res ? res.albums : null); + pushAll(res ? res.artists : null); + pushAll(res ? res.playlists : null); + root.remote = flat; + root.searching = false; + }) + .catch(function () { + if (seq !== root.searchSeq || !root.opened || Playback.provider !== prov) + return; + root.remote = []; + root.searchError = "Search could not be loaded. Try again or paste a playlist link."; + root.searching = false; + }); + } + + function isShortcut(id) { + var picks = Personal.picks; + for (var i = 0; i < picks.length; i++) + if (picks[i].id === id) + return true; + return false; + } + + function pickFrom(it) { + var item = {}; + for (var key in it) + item[key] = it[key]; + return item; + } + + function addCandidate(it) { + if (!Personal.hydrated) { + Playback.toast("Your listening library is still loading", "info"); + return; + } + if (!it || !it.id) + return; + if (root.isShortcut(it.id)) { + Playback.toast("Already a shortcut", "info"); + return; + } + if (root.full) { + Playback.toast("Shortcuts are full — remove one first", "info"); + return; + } + if (Personal.addPick(root.pickFrom(it))) + Playback.toast("Pinned " + (it.title || "shortcut"), "success"); + } + + // --- pasted link --------------------------------------------------------------------------- + function resolveLink() { + if (!root.opened) + return; + var parsed = Links.parsePlaylistLink(root.linkInput); + root.linkPreview = null; + root.linkError = ""; + var seq = ++root.linkSeq; + if (parsed.reason === "empty") { + root.linkLoading = false; + return; + } + if (!parsed.ok) { + root.linkLoading = false; + root.linkError = parsed.message; + return; + } + root.linkLoading = true; + Daemon.call("get_playlist", { id: parsed.id }) + .then(function (p) { + if (seq !== root.linkSeq || !root.opened) + return; + root.linkLoading = false; + if (!p || !p.title) { + root.linkError = "That playlist is private, empty or unavailable."; + return; + } + root.linkPreview = { + id: parsed.id, + kind: "playlist", + title: p.title, + subtitle: (p && p.subtitle) ? p.subtitle : "", + thumbnail: (p && (p.cover || p.thumbnail)) ? (p.cover || p.thumbnail) : "" + }; + }) + .catch(function (e) { + if (seq !== root.linkSeq || !root.opened) + return; + root.linkLoading = false; + root.linkError = (e && e.message) ? e.message + : "That playlist could not be opened. It may be private or unavailable."; + }); + } + + function addLink() { + if (!Personal.hydrated) { + Playback.toast("Your listening library is still loading", "info"); + return; + } + var t = root.linkPreview; + if (!t) + return; + if (root.isShortcut(t.id)) { + Playback.toast("Already a shortcut", "info"); + return; + } + if (root.full) { + Playback.toast("Shortcuts are full — remove one first", "info"); + return; + } + Personal.addPick(root.pickFrom(t)); + Playback.toast("Pinned " + t.title, "success"); + root.linkInput = ""; + root.linkPreview = null; + root.linkError = ""; + } + + onLinkInputChanged: { + root.linkSeq++; + root.linkLoading = false; + root.linkPreview = null; + root.linkError = ""; + if (root.opened) + linkTimer.restart(); + } + onQueryChanged: { + root.searchSeq++; + root.remote = []; + root.searching = false; + if (root.opened) + searchTimer.restart(); + } + Connections { + target: Playback + function onProviderChanged(): void { + if (root.opened) + root.open(); + } + } + + Timer { id: searchTimer; interval: 250; onTriggered: root.runSearch() } + Timer { id: linkTimer; interval: 300; onTriggered: root.resolveLink() } + + Keys.onEscapePressed: (event) => { root.close(); event.accepted = true; } + + // snapshot blur of the page behind, captured once on open (spec §9) + ShaderEffectSource { + id: snap + anchors.fill: parent + visible: false + sourceItem: root.blurSource + live: false + hideSource: false + recursive: false + } + MultiEffect { + anchors.fill: parent + visible: root.blurSource !== null && Style.blurEnabled + source: snap + blurEnabled: true + blur: 1.0 + blurMax: 32 + autoPaddingEnabled: false + } + + // dismiss layer + scrim + MouseArea { + anchors.fill: parent + onClicked: root.close() + } + Rectangle { + anchors.fill: parent + color: "#000000" + opacity: 0.5 + } + + Rectangle { + id: card + anchors.centerIn: parent + width: Math.min(root.width - Style.sp(12), Style.sp(150)) + implicitHeight: sheet.implicitHeight + Style.sp(12) + height: Math.min(implicitHeight, root.height - Style.sp(12)) + radius: Style.radiusCard + color: Tokens.paper + border.width: 1 + border.color: Tokens.line + + // swallow clicks so they don't reach the dismiss layer + MouseArea { anchors.fill: parent } + + ColumnLayout { + id: sheet + anchors.fill: parent + anchors.margins: Style.sp(6) + spacing: Style.sp(3) + + // header + RowLayout { + Layout.fillWidth: true + spacing: Style.sp(2) + ColumnLayout { + Layout.fillWidth: true + spacing: Style.sp(0.5) + Text { + text: "// PIN / SHORTCUT" + color: Tokens.inkFaint + font.family: Style.fontMono + font.pixelSize: Style.fs.micro + font.letterSpacing: Style.trackMicro + } + Text { + text: "Add a shortcut" + color: Tokens.ink + font.family: Style.fontUi + font.pixelSize: Style.fs.lg + font.weight: Font.DemiBold + } + } + IconButton { + icon: "close" + iconSize: Style.fs.md + diameter: Style.sp(8) + tip: "Close" + onClicked: root.close() + } + } + + Text { + visible: root.full + Layout.fillWidth: true + text: "Shortcuts are full (" + root.capacity + "). Remove one on Home to add another." + color: Style.alert + font.family: Style.fontUi + font.pixelSize: Style.fs.sm + wrapMode: Text.WordWrap + } + + // filter / search field + Rectangle { + Layout.fillWidth: true + implicitHeight: Style.sp(10) + radius: Style.radius + color: Tokens.paperLift + border.width: 1 + border.color: filterField.activeFocus ? Tokens.lineStrong : Tokens.line + RowLayout { + anchors.fill: parent + anchors.leftMargin: Style.sp(2) + anchors.rightMargin: Style.sp(2) + spacing: Style.sp(2) + Icon { name: "search"; size: Style.fs.md; color: Tokens.inkMuted } + TextInput { + id: filterField + Layout.fillWidth: true + verticalAlignment: TextInput.AlignVCenter + clip: true + color: Tokens.ink + font.family: Style.fontUi + font.pixelSize: Style.fs.md + text: root.query + onTextChanged: root.query = text + onAccepted: root.runSearch() + Keys.onEscapePressed: (event) => { root.close(); event.accepted = true; } + Text { + anchors.verticalCenter: parent.verticalCenter + visible: filterField.text.length === 0 + text: "Filter recents & library, or search…" + color: Tokens.inkFaint + font: filterField.font + } + } + Text { + visible: root.searching + text: "…" + color: Tokens.inkMuted + font.family: Style.fontUi + font.pixelSize: Style.fs.md + } + } + } + + // candidate list + Text { + visible: root.candidates.length === 0 && !root.searching + Layout.fillWidth: true + text: root.searchError || (root.query.trim().length > 0 + ? "No matches. Try a different search, or paste a playlist link below." + : "Play something and it shows up here, or search above.") + color: Tokens.inkMuted + font.family: Style.fontUi + font.pixelSize: Style.fs.sm + wrapMode: Text.WordWrap + } + ListView { + id: candidateList + Layout.fillWidth: true + Layout.fillHeight: true + Layout.minimumHeight: 0 + Layout.preferredHeight: Math.min(contentHeight, Style.sp(72)) + visible: root.candidates.length > 0 + clip: true + reuseItems: true + boundsBehavior: Flickable.StopAtBounds + model: root.candidates + spacing: Style.sp(1) + delegate: Rectangle { + id: candRow + required property var modelData + readonly property bool round: candRow.modelData && candRow.modelData.kind === "artist" + readonly property bool pinned: root.isShortcut(candRow.modelData.id) + width: candidateList.width + implicitHeight: Style.sp(12) + radius: Style.radius + color: candHover.hovered ? Tokens.tint5 : "transparent" + RowLayout { + anchors.fill: parent + anchors.leftMargin: Style.sp(2) + anchors.rightMargin: Style.sp(2) + spacing: Style.sp(3) + Artwork { + Layout.alignment: Qt.AlignVCenter + url: candRow.modelData.thumbnail ? candRow.modelData.thumbnail : "" + px: Style.sp(9) + round: candRow.round + placeholderIcon: candRow.round ? "user" + : candRow.modelData.kind === "song" ? "music" : "playlist" + } + ColumnLayout { + Layout.fillWidth: true + spacing: Style.sp(0.5) + Text { + Layout.fillWidth: true + text: candRow.modelData.title ? candRow.modelData.title : "" + color: Tokens.ink + font.family: Style.fontUi + font.pixelSize: Style.fs.md + font.weight: Font.Medium + elide: Text.ElideRight + } + Text { + Layout.fillWidth: true + text: candRow.modelData.subtitle ? candRow.modelData.subtitle + : (candRow.modelData.kind ? candRow.modelData.kind : "") + color: Tokens.inkMuted + font.family: Style.fontUi + font.pixelSize: Style.fs.sm + elide: Text.ElideRight + textFormat: Text.PlainText + } + } + // kind tag + Rectangle { + Layout.alignment: Qt.AlignVCenter + visible: !!candRow.modelData.kind + implicitHeight: Style.sp(6) + implicitWidth: kindLabel.implicitWidth + Style.sp(4) + radius: height / 2 + color: "transparent" + border.width: 1 + border.color: Tokens.line + Text { + id: kindLabel + anchors.centerIn: parent + text: candRow.modelData.kind ? String(candRow.modelData.kind).toUpperCase() : "" + color: Tokens.inkFaint + font.family: Style.fontMono + font.pixelSize: Style.fs.micro + font.letterSpacing: Style.trackMicro + } + } + Btn { + text: candRow.pinned ? "Added" : "Add" + icon: candRow.pinned ? "" : "add" + enabled: !candRow.pinned && !root.full + onClicked: root.addCandidate(candRow.modelData) + } + } + HoverHandler { id: candHover } + } + } + + // divider + Rectangle { Layout.fillWidth: true; implicitHeight: 1; color: Tokens.lineSoft } + + // paste-a-link + Text { + text: "Or paste a YouTube playlist link" + color: Tokens.inkDim + font.family: Style.fontUi + font.pixelSize: Style.fs.sm + font.weight: Font.Medium + } + RowLayout { + Layout.fillWidth: true + spacing: Style.sp(2) + Rectangle { + Layout.fillWidth: true + implicitHeight: Style.sp(10) + radius: Style.radius + color: Tokens.paperLift + border.width: 1 + border.color: linkField.activeFocus ? Tokens.lineStrong : Tokens.line + RowLayout { + anchors.fill: parent + anchors.leftMargin: Style.sp(2) + anchors.rightMargin: Style.sp(2) + spacing: Style.sp(2) + Icon { name: "link"; size: Style.fs.md; color: Tokens.inkMuted } + TextInput { + id: linkField + Layout.fillWidth: true + verticalAlignment: TextInput.AlignVCenter + clip: true + color: Tokens.ink + font.family: Style.fontUi + font.pixelSize: Style.fs.md + text: root.linkInput + onTextChanged: root.linkInput = text + onAccepted: { if (root.linkPreview) root.addLink(); else root.resolveLink(); } + Keys.onEscapePressed: (event) => { root.close(); event.accepted = true; } + Text { + anchors.verticalCenter: parent.verticalCenter + visible: linkField.text.length === 0 + text: "music.youtube.com/playlist?list=…" + color: Tokens.inkFaint + font: linkField.font + } + } + } + } + Btn { + text: "Add" + icon: "add" + primary: true + enabled: !!root.linkPreview && !root.isShortcut(root.linkPreview.id) && !root.full + onClicked: root.addLink() + } + } + + // link readout / preview / error + Text { + visible: root.linkLoading + text: "Resolving playlist…" + color: Tokens.inkMuted + font.family: Style.fontUi + font.pixelSize: Style.fs.sm + } + Text { + visible: root.linkError !== "" + Layout.fillWidth: true + text: root.linkError + color: Style.alert + font.family: Style.fontUi + font.pixelSize: Style.fs.sm + wrapMode: Text.WordWrap + } + Rectangle { + Layout.fillWidth: true + visible: !!root.linkPreview + implicitHeight: Style.sp(12) + radius: Style.radius + color: Tokens.paperLift + border.width: 1 + border.color: Tokens.line + RowLayout { + anchors.fill: parent + anchors.leftMargin: Style.sp(2) + anchors.rightMargin: Style.sp(2) + spacing: Style.sp(3) + Artwork { + Layout.alignment: Qt.AlignVCenter + url: root.linkPreview && root.linkPreview.thumbnail ? root.linkPreview.thumbnail : "" + px: Style.sp(9) + placeholderIcon: "playlist" + } + ColumnLayout { + Layout.fillWidth: true + spacing: Style.sp(0.5) + Text { + Layout.fillWidth: true + text: root.linkPreview ? root.linkPreview.title : "" + color: Tokens.ink + font.family: Style.fontUi + font.pixelSize: Style.fs.md + font.weight: Font.Medium + elide: Text.ElideRight + } + Text { + Layout.fillWidth: true + text: root.linkPreview && root.linkPreview.subtitle ? root.linkPreview.subtitle : "Playlist" + color: Tokens.inkMuted + font.family: Style.fontUi + font.pixelSize: Style.fs.sm + elide: Text.ElideRight + textFormat: Text.PlainText + } + } + Text { + visible: root.linkPreview && root.isShortcut(root.linkPreview.id) + text: "Added" + color: Tokens.inkFaint + font.family: Style.fontUi + font.pixelSize: Style.fs.sm + } + } + } + } + } +} diff --git a/client/lib/browse.js b/client/lib/browse.js index 95b836c..a268a68 100644 --- a/client/lib/browse.js +++ b/client/lib/browse.js @@ -15,7 +15,7 @@ function asSong(i) { title: i.title, artists: i.subtitle || "", artist_runs: i.artistRuns, - artist_id: runId, + artist_id: runId || i.artistId, duration: i.duration, play_count: i.playCount, thumbnail: i.thumbnail, diff --git a/client/lib/ids.js b/client/lib/ids.js index f04c28d..d394013 100644 --- a/client/lib/ids.js +++ b/client/lib/ids.js @@ -25,3 +25,19 @@ function isOnRepeatId(id) { function isSmartPlaylistId(id) { return id === ON_REPEAT || id === RECENTLY_PLAYED || id === REDISCOVER; } + +// The daemon's ids are namespaced across catalogues; keep Home history and +// recommendations on the selected provider without mistaking SoundCloud for YouTube. +function providerOf(id) { + if (typeof id !== "string" || !id) + return ""; + if (isLocalId(id)) + return "local"; + if (isRadioId(id)) + return "radio"; + if (id.indexOf("spotify:") === 0) + return "spotify"; + if (id.indexOf("sc:") === 0) + return "soundcloud"; + return "youtube"; +} diff --git a/client/lib/personal.js b/client/lib/personal.js index c61ae1a..c632056 100644 --- a/client/lib/personal.js +++ b/client/lib/personal.js @@ -190,7 +190,8 @@ function hiddenSections(p) { // --- Recency + artist counts -------------------------------------------------------------------- -// Record that a playlist/album/artist was played from. +// Record that a song, playlist, album or artist was played (songs from a genuine now-playing, +// the rest from a play-from-source). The entry is a BrowseItem clone stamped with `at`. function noteRecent(p, item, now) { var entry = {}; for (var k in item) entry[k] = item[k]; @@ -205,7 +206,7 @@ function noteRecent(p, item, now) { } } -// The most recently played-from playlists/albums/artists, newest first. +// The most recently played songs and played-from playlists/albums/artists, newest first. function recentItems(p, n) { var recent = p.recent; var vals = Object.keys(recent).map(function (id) { return recent[id]; }); @@ -213,18 +214,57 @@ function recentItems(p, n) { return vals.slice(0, n === undefined ? 12 : n); } +// --- account sign-out: forget only what that session can reopen --------------------------------- +// Splitting the purge by provider is deliberate: signing out of YouTube must not drop a Spotify +// recent (or the reverse), and neither touches songs — a public video/track still plays signed out. + +// Recents only a signed-in YouTube session can reopen: Liked Music (LM / VLLM) and the account's +// own library playlists (their subtitle reads "Your …"). Public playlists (a shared link, a chart) +// and everything from other providers stay. Returns how many entries were dropped. +function forgetYouTubeRecents(p) { + var n = 0; + for (var id in p.recent) { + // A Spotify recent is never a YouTube one, even if its subtitle happens to read "Your …". + if (id.indexOf("spotify:") === 0) + continue; + var r = p.recent[id]; + if (id === "LM" || id === "VLLM" + || (r && r.kind === "playlist" && String(r.subtitle || "").indexOf("Your") === 0)) { + delete p.recent[id]; + n++; + } + } + return n; +} + +// Recents only a signed-in Spotify session can reopen: every provider-qualified spotify: id. +// Returns how many entries were dropped. +function forgetSpotifyRecents(p) { + var n = 0; + for (var id in p.recent) { + if (id.indexOf("spotify:") === 0) { + delete p.recent[id]; + n++; + } + } + return n; +} + // The lead artist out of a joined credit string — a usable search seed, unlike the whole list. function firstArtist(artists) { return artists.split(/[,&•]|\sfeat\.?\s|\sft\.?\s/i)[0].trim(); } -function noteArtist(p, key, name) { +function noteArtist(p, key, name, now) { var cur = p.artists[key]; if (cur) { cur.count++; if (name) cur.name = name; + if (now !== undefined) cur.lastPlayedAt = now; } else { - p.artists[key] = { name: name, count: 1 }; + p.artists[key] = (now !== undefined) + ? { name: name, count: 1, lastPlayedAt: now } + : { name: name, count: 1 }; } var keys = Object.keys(p.artists); if (keys.length > MAX_ARTISTS) { @@ -255,3 +295,28 @@ function topArtists(p, n) { .slice(0, n === undefined ? 3 : n) .map(function (a) { return a.name; }); } + +// Structural equality, independent of object key order. The daemon round-trips a saved blob +// through serde before echoing it back on `personal-changed`, and that can reorder keys, so a byte +// comparison of the echo against the blob we sent would spuriously differ. Personal blobs hold only +// JSON scalars, arrays and plain objects — no functions, dates or cycles — so a plain recursion is +// enough. Used to recognise (and drop) our own save echo. +function deepEqual(a, b) { + if (a === b) return true; + if (a === null || b === null || typeof a !== "object" || typeof b !== "object") return false; + var aArr = Array.isArray(a), bArr = Array.isArray(b); + if (aArr !== bArr) return false; + if (aArr) { + if (a.length !== b.length) return false; + for (var i = 0; i < a.length; i++) + if (!deepEqual(a[i], b[i])) return false; + return true; + } + var ak = Object.keys(a), bk = Object.keys(b); + if (ak.length !== bk.length) return false; + for (var j = 0; j < ak.length; j++) { + var k = ak[j]; + if (!b.hasOwnProperty(k) || !deepEqual(a[k], b[k])) return false; + } + return true; +} diff --git a/client/lib/playlist-links.js b/client/lib/playlist-links.js new file mode 100644 index 0000000..aed6ab3 --- /dev/null +++ b/client/lib/playlist-links.js @@ -0,0 +1,146 @@ +.pragma library + +// A pasted YouTube / YouTube Music link turned into a playlist the shortcut picker can add (#63): +// some playlists are only reachable by URL — they don't show up in search and aren't in the +// library — so without this there's no way in. Pure and network-free: the picker resolves an id +// here, then fetches real metadata through `get_playlist` (never the pasted URL itself). +// +// The one target this resolves is a playlist. The picker's link field adds *playlist* shortcuts, so +// a watch/share link is read for its `list=` playlist rather than the single track it was shared +// from (the deliberate opposite of ShareDialog/ytlink, which open the shared track). Manual URL +// parsing on purpose: QML's JS engine has no `URL` constructor, and this must also run under +// qmltestrunner with no Quickshell. + +// The exact hosts we open. A lookalike ("youtube.com.evil.test") is not on the list and is refused. +var HOSTS = { + "youtube.com": true, + "www.youtube.com": true, + "m.youtube.com": true, + "music.youtube.com": true, + "youtu.be": true +}; + +// A YouTube playlist id: PL…, OLAK5uy_…, RDCLAK5uy_…, a bare VL browse id, etc. +var ID_RE = /^[A-Za-z0-9_-]+$/; +// A syntactically plausible hostname (letters/digits/dots/hyphens). Rejects "not a url at all". +var HOST_RE = /^[a-z0-9.-]+$/; + +function fail(reason, message) { + return { ok: false, reason: reason, message: message }; +} + +// Percent/`+` decode one query token, tolerating a malformed sequence rather than throwing. +function decodeToken(s) { + try { + return decodeURIComponent(s.replace(/\+/g, " ")); + } catch (e) { + return s; + } +} + +// Parse a query string into { key: [values…] } with every value decoded. Repeated keys accumulate, +// so a link carrying two different `list=` can be spotted as ambiguous. +function parseQuery(q) { + var out = Object.create(null); + if (!q) + return out; + var parts = q.split("&"); + for (var i = 0; i < parts.length; i++) { + if (!parts[i]) + continue; + var eq = parts[i].indexOf("="); + var k = eq < 0 ? parts[i] : parts[i].slice(0, eq); + var v = eq < 0 ? "" : parts[i].slice(eq + 1); + k = decodeToken(k); + if (!Object.prototype.hasOwnProperty.call(out, k)) + out[k] = []; + out[k].push(decodeToken(v)); + } + return out; +} + +// Resolve a pasted link to a playlist: +// { ok: true, id, rawId } — id is the `VL…` browse id `get_playlist` wants +// { ok: false, reason, message } — a clear, recoverable reason the field can show +// `reason: "empty"` (blank box) is neutral: the field shows nothing rather than an error. +function parsePlaylistLink(input) { + var text = (input === undefined || input === null) ? "" : String(input).trim(); + if (!text) + return fail("empty", ""); + if (text.length > 4096) + return fail("invalid", "That link is too long."); + + // Scheme: require http/https. Assume https for a bare host paste ("music.youtube.com/…"), but + // an explicit foreign scheme (ftp:, file:, javascript:, …) is refused outright. + var schemeMatch = /^([a-zA-Z][a-zA-Z0-9+.-]*):\/\//.exec(text); + var rest; + if (schemeMatch) { + var scheme = schemeMatch[1].toLowerCase(); + if (scheme !== "http" && scheme !== "https") + return fail("scheme", "Only http and https links are supported."); + rest = text.slice(schemeMatch[0].length); + } else { + rest = text; + } + + // Split authority from the path/query (up to the first "/", "?" or "#"). + var cut = rest.search(/[\/?#]/); + var authority = cut < 0 ? rest : rest.slice(0, cut); + var tail = cut < 0 ? "" : rest.slice(cut); + + // Credentials are not part of a share link. No pasted authority is ever fetched. + if (authority.indexOf("@") >= 0) + return fail("invalid", "Paste a public share link without login details."); + var host = authority.replace(/:\d+$/, "").toLowerCase(); + if (!host || !HOST_RE.test(host)) + return fail("invalid", "That does not look like a link."); + if (!HOSTS.hasOwnProperty(host)) + return fail("host", "Only YouTube and YouTube Music links are supported."); + + // Fragment is irrelevant; separate path and query. + var hash = tail.indexOf("#"); + if (hash >= 0) + tail = tail.slice(0, hash); + var path = tail; + var query = ""; + var qi = tail.indexOf("?"); + if (qi >= 0) { + path = tail.slice(0, qi); + query = tail.slice(qi + 1); + } + var params = parseQuery(query); + var segs = path.replace(/^\/+/, "").split("/").filter(function (s) { return s.length > 0; }); + + // The playlist id. `list=` covers /playlist, a watch/share link, and youtu.be/?list=…; a + // YTM /browse/VL… page is the playlist's own browse id. + var raw = null; + var lists = params["list"] || []; + if (lists.length > 0) { + var seen = Object.create(null); + for (var i = 0; i < lists.length; i++) + seen[lists[i]] = true; + if (Object.keys(seen).length > 1) + return fail("ambiguous", "This link points at more than one playlist."); + raw = lists[0]; + } else if (segs[0] === "browse" && segs[1]) { + var bid = segs[1]; + if (/^VL/.test(bid)) + raw = bid; + else if (bid.indexOf("MPRE") === 0) + return fail("no-playlist", "That link is an album, not a playlist."); + else if (bid.indexOf("UC") === 0) + return fail("no-playlist", "That link is an artist, not a playlist."); + else + return fail("no-playlist", "That link is not a playlist."); + } else { + return fail("no-playlist", "That link has no playlist — paste a playlist or a \u201CShare playlist\u201D link."); + } + + raw = String(raw).trim(); + // A playlist browse id carries a VL prefix the URL's `list=` does not; normalise so it is never + // doubled and always canonical. + var rawId = raw.replace(/^VL/, ""); + if (!rawId || rawId.length > 256 || !ID_RE.test(rawId)) + return fail("bad-id", "That does not look like a valid playlist id."); + return { ok: true, id: "VL" + rawId, rawId: rawId }; +} diff --git a/client/lib/recommendations.js b/client/lib/recommendations.js new file mode 100644 index 0000000..00db6b4 --- /dev/null +++ b/client/lib/recommendations.js @@ -0,0 +1,363 @@ +.pragma library +.import "ids.js" as Ids + +// A small, explainable, on-device discovery ranker for Home. It re-ranks the items the active +// provider already put in the feed (get_home sections) using the local listening signals the +// personal store records — nothing leaves the machine, nothing is trained, nothing is invented. +// +// It is a lightweight hybrid, written from scratch: no model, no service, no third-party code. The +// shape borrows only ideas that are public: +// - a linear blend of a few normalised signals (the "hybrid" of retrieval systems such as +// implicit — benfred/implicit, MIT — and LightFM — lyst/lightfm, Apache-2.0 — without adopting +// any of their code, weights, or matrix factorisation: a single user's play history does not +// justify training an ALS/WARP model, and pretending it did would be dishonest); +// - Maximal Marginal Relevance for the diversity pass, the standard +// mmr = lambda * relevance - (1 - lambda) * maxSimilarityToAlreadyChosen +// (see elastic.co/search-labs/blog/maximum-marginal-relevance-diversify-results). The formula +// is math, not licensed code; the implementation below is original. +// +// Signals, all clamped to [0, 1] before weighting: +// provider rank — the feed's own ordering, trusted as a prior (the provider ranked it for a +// reason); earlier => higher. This carries a cold start honestly: with no local +// history the shelf is simply the provider's discovery order, diversified. +// artist affinity— how often the user plays this item's artist (personal.artists counts). +// artist recency — how lately they have been on that artist (decayed, artists[].lastPlayedAt). +// pick affinity — shares an artist with one of the user's shortcut tiles. +// replay fatigue — a penalty when this exact id was played recently (decayed): a discovery shelf +// should not hand back the track you just finished. +// metadata — a small penalty for artwork-less rows so thin/placeholder items do not lead. +// +// Provider boundaries are kept: personal history is scoped to the id family of the active provider, +// so a Spotify/SoundCloud feed does not inherit YouTube Music affinities (it stays an honest cold +// start), and feed rows that positively belong to a *different* provider are dropped outright. +// +// build(sections, personalBlob, provider, nowMs) -> { items, explanation } +// items : up to 12 original BrowseItem-compatible rows (shallow clones + an optional +// `reason` string), deduped by id, never a mutation of the inputs. +// explanation : a short, honest sentence about how this set was chosen (cold vs. personalised), +// always present — even when items is empty. + +var OUT_MAX = 12; // the shelf holds twelve cards +var POOL_MAX = 300; // bound the candidate pool: the feed can be long, ranking is not free + +var DAY_MS = 86400000; +var RECENCY_HALF_LIFE_MS = 14 * DAY_MS; // an artist you were on two weeks ago is half as "current" +var FATIGUE_HALF_LIFE_MS = 3 * DAY_MS; // a track replayed three days ago fatigues half as much + +var RANK_DECAY = 0.06; // provider-rank prior falloff: rank 0 -> 1.0, ~10 -> 0.63, ~25 -> 0.4 +var W_RANK = 0.45; // weight on the provider's own ordering (the base everyone starts from) +var W_ARTIST = 0.40; // weight on play-count affinity +var W_RECENCY = 0.20; // weight on how lately that artist was played +var W_PICK = 0.15; // weight on sharing an artist with a shortcut +var W_FATIGUE = 0.70; // strength of the "just played this" penalty +var W_META = 0.30; // strength of the artwork-less penalty + +var MMR_LAMBDA = 0.72; // relevance vs. diversity: high enough that a genuinely better item wins +var SIM_ARTIST = 1.0; // two rows by the same artist are maximally redundant +var SIM_KIND = 0.28; // two rows of the same kind are mildly redundant + +function providerOf(id) { + return Ids.providerOf(id); +} + +function isForeign(id, provider) { + return providerOf(id) !== provider; +} + +// The lead artist of a joined credit string — same rule as personal.js firstArtist, kept local so +// this module stays a standalone pure library. Tolerant of non-strings. +function firstArtist(artists) { + if (typeof artists !== "string" || !artists) + return ""; + return artists.split(/[,&\u2022]|\sfeat\.?\s|\sft\.?\s/i)[0].trim(); +} + +// 2^(-elapsed / halfLife). Future/negative elapsed (clock skew) reads as "just now" -> 1. +function decay(elapsedMs, halfLifeMs) { + if (!(elapsedMs > 0)) + return 1; + return Math.pow(2, -elapsedMs / halfLifeMs); +} + +// The store keys an artist by its channel id when it has one, otherwise by the whole credit string +// (personal.js noteArtist). Match that exactly so affinity lookups actually hit. +function affinityKeyOf(item) { + if (item.artistId && typeof item.artistId === "string") + return item.artistId; + if (Array.isArray(item.artistRuns)) { + for (var i = 0; i < item.artistRuns.length; i++) + if (item.artistRuns[i] && item.artistRuns[i].id) + return item.artistRuns[i].id; + } + if (item.kind === "artist") + return item.id; + return firstArtist(item.subtitle); +} + +// A looser key for the diversity pass: the lead artist, case-folded, so two songs sharing a lead +// (even across different collab credits) read as the same artist. Empty when there is no artist. +function simArtistOf(item) { + return String(affinityKeyOf(item) || "").toLowerCase(); +} + +// A row worth ranking: a real id and a title. Rows missing either are the "fake"/placeholder rows a +// discovery shelf must not promote — dropped, not penalised. +function usable(item) { + return !!item + && typeof item.id === "string" && item.id.length > 0 + && typeof item.title === "string" && item.title.trim().length > 0 + && ["song", "album", "playlist", "artist"].indexOf(item.kind) >= 0; +} + +// Fold the personal blob into the fast lookups scoring needs, scoped to the active provider so one +// catalogue's history never leaks into another's feed. Returns null-ish maps that are always safe +// to read. +function personalIndex(blob, provider, nowMs) { + var idx = { + recentAt: {}, // id -> last-played epoch ms (for replay fatigue) + artists: {}, // artist key -> { count, lastPlayedAt } + artistNames: Object.create(null), + maxCount: 0, // for normalising affinity + pickIds: {}, // shortcut ids -> true (skip: already surfaced) + pickArtists: {}, // shortcut artist keys -> true (affinity) + personalized: false + }; + if (!blob || typeof blob !== "object") + return idx; + + var recent = (blob.recent && typeof blob.recent === "object") ? blob.recent : {}; + for (var id in recent) { + if (!recent.hasOwnProperty(id)) + continue; + if (providerOf(id) !== provider) + continue; // cross-provider: not this catalogue's history + var r = recent[id]; + var at = r && typeof r.at === "number" ? r.at : 0; + idx.recentAt[id] = at; + idx.personalized = true; + } + + var artists = (blob.artists && typeof blob.artists === "object") ? blob.artists : {}; + for (var key in artists) { + if (!artists.hasOwnProperty(key)) + continue; + if (providerOf(key) !== provider) + continue; + var a = artists[key]; + if (!a || typeof a !== "object") + continue; + var count = typeof a.count === "number" && a.count > 0 ? a.count : 0; + if (count <= 0) + continue; + idx.artists[key] = { + count: count, + lastPlayedAt: typeof a.lastPlayedAt === "number" ? a.lastPlayedAt : 0, + name: typeof a.name === "string" ? a.name : "" + }; + var nameKey = firstArtist(idx.artists[key].name).toLowerCase(); + if (nameKey && (!idx.artistNames[nameKey] || idx.artistNames[nameKey].count < count)) + idx.artistNames[nameKey] = idx.artists[key]; + if (count > idx.maxCount) + idx.maxCount = count; + idx.personalized = true; + } + + var picks = Array.isArray(blob.picks) ? blob.picks : []; + for (var i = 0; i < picks.length; i++) { + var p = picks[i]; + if (!p || typeof p.id !== "string") + continue; + idx.pickIds[p.id] = true; + if (providerOf(p.id) !== provider) + continue; + var pk = affinityKeyOf(p); + if (pk) + idx.pickArtists[pk] = true; + idx.personalized = true; + } + return idx; +} + +// Build the deduped, provider-scoped, bounded candidate pool out of the feed's sections, preserving +// the provider's ordering as the rank. Never mutates a section or an item. +function poolFrom(sections, provider, idx) { + var pool = []; + var seen = {}; + var list = Array.isArray(sections) ? sections : []; + for (var s = 0; s < list.length && pool.length < POOL_MAX; s++) { + var sec = list[s]; + var items = (sec && Array.isArray(sec.items)) ? sec.items : []; + for (var i = 0; i < items.length && pool.length < POOL_MAX; i++) { + var it = items[i]; + if (!usable(it)) + continue; + if (seen[it.id]) + continue; // full id dedup — first (best-ranked) wins + seen[it.id] = true; + if (isForeign(it.id, provider)) + continue; // cross-provider exclusion + if (idx.pickIds[it.id]) + continue; // already a shortcut tile — redundant to re-offer + pool.push({ item: it, rank: pool.length }); + } + } + return pool; +} + +// Score one candidate: a relevance number plus the per-signal parts (kept for the reason string). +function score(entry, idx, nowMs) { + var item = entry.item; + var prior = 1 / (1 + RANK_DECAY * entry.rank); + + var akey = affinityKeyOf(item); + var art = idx.artists[akey] || idx.artistNames[firstArtist(item.subtitle).toLowerCase()]; + var affinity = (art && idx.maxCount > 0) ? (art.count / idx.maxCount) : 0; + var recency = (art && art.lastPlayedAt > 0) ? decay(nowMs - art.lastPlayedAt, RECENCY_HALF_LIFE_MS) : 0; + var pick = (akey && idx.pickArtists[akey]) ? 1 : 0; + + var playedAt = idx.recentAt.hasOwnProperty(item.id) ? idx.recentAt[item.id] : null; + var fatigue = (playedAt !== null) ? decay(nowMs - playedAt, FATIGUE_HALF_LIFE_MS) : 0; + + var thin = (typeof item.thumbnail === "string" && item.thumbnail.length > 0) ? 0 : 1; + + var relevance = W_RANK * prior + + W_ARTIST * affinity + + W_RECENCY * recency + + W_PICK * pick + - W_FATIGUE * fatigue + - W_META * thin; + + entry.rel = relevance; + entry.parts = { affinity: W_ARTIST * affinity, recency: W_RECENCY * recency, + pick: W_PICK * pick, fatigue: fatigue }; + entry.sim = { artist: art && art.name ? firstArtist(art.name).toLowerCase() : simArtistOf(item), + kind: typeof item.kind === "string" ? item.kind : "" }; + entry.artistName = (art && art.name) ? art.name : firstArtist(item.subtitle); + return entry; +} + +// Redundancy of a candidate against an already-chosen one: same artist dominates, same kind is a +// gentle nudge. Max over the chosen set is what MMR subtracts. +function similarity(a, b) { + if (a.sim.artist && b.sim.artist && a.sim.artist === b.sim.artist) + return SIM_ARTIST; + if (a.sim.kind && b.sim.kind && a.sim.kind === b.sim.kind) + return SIM_KIND; + return 0; +} + +// Order-stable comparison for candidates: relevance desc, then the provider's rank, then id. Pure +// so ties never depend on array order or floating jitter — the shelf is the same every build. +function beforeByRelevance(x, y) { + if (y.rel !== x.rel) + return y.rel - x.rel; + if (x.rank !== y.rank) + return x.rank - y.rank; + return x.item.id < y.item.id ? -1 : (x.item.id > y.item.id ? 1 : 0); +} + +// The MMR diversity pass. Greedily pick the candidate maximising +// lambda * relevance - (1 - lambda) * maxSimilarity(candidate, chosen) +// Ties resolve by the stable relevance order above, so the result is deterministic. A much stronger +// candidate still wins over a diverse-but-weak one (relevance survives); a near-tie by the same +// artist yields to a fresh one (diversity survives). +function rerank(scored, limit) { + var chosen = []; + for (var i = 0; i < scored.length; i++) { + scored[i].maxSimilarity = 0; + scored[i].selected = false; + } + while (chosen.length < limit && chosen.length < scored.length) { + var previous = chosen.length ? chosen[chosen.length - 1] : null; + var best = null; + var bestScore = 0; + for (var j = 0; j < scored.length; j++) { + var candidate = scored[j]; + if (candidate.selected) + continue; + // Update against only the newly selected item: previous maxima are still + // valid. This is O(pool × output), not a repeated scan of the chosen set. + if (previous) + candidate.maxSimilarity = Math.max(candidate.maxSimilarity, similarity(candidate, previous)); + var mmr = MMR_LAMBDA * candidate.rel - (1 - MMR_LAMBDA) * candidate.maxSimilarity; + if (best === null || mmr > bestScore + || (mmr === bestScore && beforeByRelevance(candidate, best) < 0)) { + best = candidate; + bestScore = mmr; + } + } + if (!best) + break; + best.selected = true; + chosen.push(best); + } + return chosen; +} + +// A short, honest reason for one row, from whichever positive personal signal contributed most. +// Falls back to the provider prior (a genuine cold-start row) rather than claiming a learned pick. +function reasonFor(entry, provider) { + var p = entry.parts; + var name = entry.artistName; + if (name && p.affinity >= p.recency && p.affinity >= p.pick && p.affinity > 0) + return "More from " + name + ", one of your regulars"; + if (name && p.recency >= p.pick && p.recency > 0) + return "You've had " + name + " on lately"; + if (name && p.pick > 0) + return "Close to your shortcut " + name; + return "From " + providerLabel(provider) + "'s recommendations"; +} + +function providerLabel(provider) { + if (provider === "youtube") + return "YouTube Music"; + if (provider === "spotify") + return "Spotify"; + if (provider === "soundcloud") + return "SoundCloud"; + return "your feed"; +} + +// A shallow clone with the reason attached — the output row is BrowseItem-compatible and never the +// caller's own object, so scoring can annotate without touching the feed. +function present(entry, provider) { + var out = {}; + var item = entry.item; + for (var k in item) + if (item.hasOwnProperty(k)) + out[k] = item[k]; + out.reason = reasonFor(entry, provider); + return out; +} + +// The whole feed-resolved explanation: personalised when local history drove the order, an honest +// cold-start line otherwise, and a useful line even when there is nothing to show. +function explain(personalized, provider, count) { + if (count === 0) { + return "Nothing new to surface here yet — this fills in as your " + + providerLabel(provider) + " feed grows."; + } + if (personalized) { + return "Based on your recent listening and shortcuts, with room for different artists. Ranked on your device."; + } + return "A varied selection from " + providerLabel(provider) + ". Your listening will help shape future picks."; +} + +// Entry point. Pure: reads sections/personalBlob, returns a new { items, explanation }. +function build(sections, personalBlob, provider, nowMs) { + var prov = typeof provider === "string" && provider ? provider : "youtube"; + var now = typeof nowMs === "number" && isFinite(nowMs) ? nowMs : Date.now(); + + var idx = personalIndex(personalBlob, prov, now); + var pool = poolFrom(sections, prov, idx); + + if (!pool.length) + return { items: [], explanation: explain(idx.personalized, prov, 0) }; + + for (var i = 0; i < pool.length; i++) + score(pool[i], idx, now); + + var chosen = rerank(pool, OUT_MAX); + var items = chosen.map(function (e) { return present(e, prov); }); + return { items: items, explanation: explain(idx.personalized, prov, items.length) }; +} diff --git a/client/pages/AlbumPage.qml b/client/pages/AlbumPage.qml index b2559b2..2db5a5d 100644 --- a/client/pages/AlbumPage.qml +++ b/client/pages/AlbumPage.qml @@ -105,23 +105,27 @@ Item { if (!page.album) return; var at = start === null ? null : page.album.items.indexOf(page.shown[start]); + var recent = page.asItem(); Daemon.call("play_playlist", { items: page.album.items, start: at === -1 ? null : at, sourceId: page.album.playlistId ? page.album.playlistId : undefined, sourceName: page.album.title - }).catch((e) => Playback.toast((e && e.message) ? e.message : "Could not play", "error")); + }).then(() => Personal.noteRecent(recent)) + .catch((e) => Playback.toast((e && e.message) ? e.message : "Could not play", "error")); } function shuffle() { if (!page.album || !page.album.items.length) return; + var recent = page.asItem(); Daemon.call("play_playlist", { items: page.album.items, start: null, sourceId: page.album.playlistId ? page.album.playlistId : undefined, sourceName: page.album.title, shuffle: true - }).catch((e) => Playback.toast((e && e.message) ? e.message : "Could not play", "error")); + }).then(() => Personal.noteRecent(recent)) + .catch((e) => Playback.toast((e && e.message) ? e.message : "Could not play", "error")); } function queueAlbum(next) { if (!page.album || !page.album.items.length) diff --git a/client/pages/HomePage.qml b/client/pages/HomePage.qml index 31d9cfd..622b14e 100644 --- a/client/pages/HomePage.qml +++ b/client/pages/HomePage.qml @@ -8,6 +8,7 @@ import "../components" import "../chrome" import "../lib/browse.js" as Browse import "../lib/ids.js" as Ids +import "../lib/recommendations.js" as Recommendations // Home (spec section 5), ported from ui/src/routes/+page.svelte and reset onto the visual system. // One vertical reused ListView of the feed's shelves; the header carries the greeting hero (with @@ -31,13 +32,15 @@ Item { property bool loadingMore: false property bool moreError: false property var blocks: [] + property int requestId: 0 + property var recommendations: ({ items: [], explanation: "" }) // Spotify is selected but not signed in: show the sign-in empty state instead of calling the // daemon (browsing is gated on a signed-in Spotify account). readonly property bool spotifyGate: Playback.provider === "spotify" && !(Playback.spotify && Playback.spotify.signedIn) // Personal shelves, live off the shared store. - readonly property var recents: Personal.recent(12) + readonly property var recents: Personal.recent(100).filter((item) => page.providerFor(item.id) === Playback.provider).slice(0, 6) readonly property var forgottenList: page.forgottenSongs() // Familiar artists: the most-played artists (topArtistIds) resolved to round cards. Loaded once. @@ -54,6 +57,20 @@ Item { function onProviderChanged(): void { page.load(page.selected); } } + Connections { + target: Personal + function onBlobChanged(): void { Qt.callLater(page.refreshRecommendations); } + } + + function providerFor(id) { + return Ids.providerOf(id); + } + function refreshRecommendations() { + page.recommendations = Recommendations.build( + page.home && page.home.sections ? page.home.sections : [], + Personal.blob, Playback.provider, Date.now()); + } + function greeting() { var h = new Date().getHours(); return h < 5 ? "Still up" : h < 12 ? "Good morning" : h < 17 ? "Good afternoon" : h < 22 ? "Good evening" : "Good night"; @@ -88,6 +105,7 @@ Item { page.forgotten = fg; page.listenAgain = la; page.blocks = arr; + page.refreshRecommendations(); } function forgottenSongs() { @@ -106,6 +124,10 @@ Item { function load(params) { page.selected = params; + var request = ++page.requestId; + page.loadingMore = false; + list.cancelFlick(); + list.stickTop = true; page.moreError = false; // Gated: no daemon call, the sign-in card carries the page. if (page.spotifyGate) { @@ -113,6 +135,7 @@ Item { page.blocks = []; page.forgotten = null; page.chips = []; + page.recommendations = ({ items: [], explanation: "" }); page.errorMsg = ""; page.loading = false; return; @@ -121,17 +144,16 @@ Item { page.errorMsg = ""; Daemon.call("get_home", { params: params ? params : null }) .then((h) => { - if (page.selected !== params) + if (page.requestId !== request) return; page.home = h; if (h.chips && h.chips.length) page.chips = h.chips.filter((c) => c.title !== "Podcasts"); page.rebuild(); page.loading = false; - list.stickTop = true; }) .catch((e) => { - if (page.selected !== params) + if (page.requestId !== request) return; page.errorMsg = (e && e.message) ? e.message : String(e); page.loading = false; @@ -143,10 +165,10 @@ Item { return; page.loadingMore = true; var token = page.home.continuation; - var params = page.selected; + var request = page.requestId; Daemon.call("get_home_more", { token: token }) .then((more) => { - if (page.selected !== params || !page.home || page.home.continuation !== token) + if (page.requestId !== request || !page.home || page.home.continuation !== token) return; page.home = { chips: page.home.chips, @@ -157,6 +179,8 @@ Item { page.loadingMore = false; }) .catch(() => { + if (page.requestId !== request) + return; page.moreError = true; page.loadingMore = false; Playback.toast("Could not load more", "error"); @@ -164,15 +188,15 @@ Item { } function maybeLoadMore() { - if (!page.home || !page.home.continuation || page.loadingMore || page.moreError) + if (page.loading || !page.home || !page.home.continuation || page.loadingMore || page.moreError) return; if (list.contentHeight <= 0) return; - if (list.contentY + list.height > list.contentHeight - 400) + if (!list.stickTop && list.contentY - list.originY + list.height > list.contentHeight - 400) page.loadMore(); } - ListView { + HomeFeed { id: list anchors.fill: parent visible: !page.spotifyGate @@ -183,13 +207,7 @@ Item { model: page.blocks spacing: Style.sp(10) - // The header (hero + chips + pinned + personal shelves) is taller than the viewport and - // grows as the recents / familiar / feed shelves resolve. While the user has not scrolled, - // keep it pinned to the very top so a late-arriving shelf never nudges the greeting off the - // edge; the first drag or wheel releases the pin. A chip switch re-arms it (load()). - property bool stickTop: true - onMovementStarted: list.stickTop = false - Binding { target: list; property: "contentY"; value: list.originY; when: list.stickTop } + // HomeFeed releases its top pin without restoring a stale pre-layout offset. onContentYChanged: page.maybeLoadMore() onContentHeightChanged: page.maybeLoadMore() @@ -332,7 +350,6 @@ Item { } Item { Layout.fillWidth: true; Layout.minimumWidth: hero.wide ? Style.sp(10) : 0 } - NowPlayingCard { visible: hero.wide && !!Playback.now Layout.preferredWidth: Style.sp(138) @@ -342,6 +359,56 @@ Item { } } + // The restored listening session must remain reachable on a narrow Home too. + RowLayout { + Layout.fillWidth: true + visible: !!Playback.now + spacing: Style.sp(3) + Artwork { + visible: !hero.wide + url: Playback.now && Playback.now.thumbnail ? Playback.now.thumbnail : "" + px: Style.sp(14) + } + ColumnLayout { + Layout.fillWidth: true + spacing: Style.sp(1) + Text { + Layout.fillWidth: true + text: Playback.paused ? "Continue listening" : "Your listening session" + color: Tokens.ink + font.family: Style.fontUi + font.pixelSize: Style.fs.md + font.weight: Font.Medium + } + Text { + Layout.fillWidth: true + text: Playback.now ? Playback.now.title + " — " + Playback.now.artists : "" + color: Tokens.inkMuted + font.family: Style.fontUi + font.pixelSize: Style.fs.sm + elide: Text.ElideRight + textFormat: Text.PlainText + } + } + Btn { + text: Playback.paused ? "Resume" : "Pause" + icon: Playback.paused ? "play" : "pause" + primary: Playback.paused + onClicked: Playback.togglePause().catch((e) => Playback.toast(String(e), "error")) + } + IconButton { + icon: "queue" + tip: "Open your queue" + onClicked: Playback.nowPlayingRequested("queue") + } + } + + HomePersonal { + Layout.fillWidth: true + visible: page.selected === "" + recents: page.recents + } + // chip rail — a horizontal Flickable whose right edge fades into the paper (never a // hard cut on the last chip) via a gradient overlay rather than an OpacityMask. Item { @@ -473,6 +540,7 @@ Item { else Router.push(pin.modelData.kind, { id: pin.modelData.id, title: pin.modelData.title }); } + acceptedButtons: Qt.LeftButton } } } @@ -519,23 +587,39 @@ Item { ColumnLayout { spacing: Style.sp(0.5) Text { text: "Add shortcut"; color: Tokens.inkMuted; font.family: Style.fontUi; font.pixelSize: Style.fs.md; font.weight: Font.Medium } - Text { text: "Library or any card"; color: Tokens.inkFaint; font.family: Style.fontUi; font.pixelSize: Style.fs.xs } + Text { text: "Recent, library or YouTube link"; color: Tokens.inkFaint; font.family: Style.fontUi; font.pixelSize: Style.fs.xs } } } HoverHandler { id: addHover } - MouseArea { anchors.fill: parent; cursorShape: Qt.PointingHandCursor; onClicked: Router.push("search") } + MouseArea { anchors.fill: parent; cursorShape: Qt.PointingHandCursor; onClicked: shortcutPicker.open() } } } } - // the personal blocks (unfiltered only): Jump back in, the Familiar artists index and - // inspector, and the feed's Listen again as a numbered list + ColumnLayout { + Layout.fillWidth: true + visible: page.selected === "" && page.recommendations.items.length > 0 + spacing: Style.sp(2) + Shelf { + Layout.fillWidth: true + title: "Picked for you" + items: page.recommendations.items + } + Text { + Layout.fillWidth: true + text: page.recommendations.explanation + color: Tokens.inkMuted + font.family: Style.fontUi + font.pixelSize: Style.fs.sm + wrapMode: Text.WordWrap + } + } + HomePersonal { Layout.fillWidth: true // The recents / familiar artists are YouTube Music history; under another // catalogue the provider's own shelves lead instead. visible: page.selected === "" && Playback.provider === "youtube" - recents: page.recents artists: page.famArtists listenAgain: page.listenAgain } @@ -648,4 +732,10 @@ Item { anchors.centerIn: parent visible: page.spotifyGate } + + ShortcutPicker { + id: shortcutPicker + anchors.fill: parent + z: 100 + } } diff --git a/client/pages/PlaylistPage.qml b/client/pages/PlaylistPage.qml index 53b3a48..1e08666 100644 --- a/client/pages/PlaylistPage.qml +++ b/client/pages/PlaylistPage.qml @@ -187,26 +187,42 @@ Item { page.loadMore(); } + // The played-from playlist as a navigable BrowseItem, for Personal recents. Cover overrides the + // auto thumbnail; a smart or local id is kept verbatim so it still resolves. + function asItem() { + return { + kind: "playlist", + id: page.playlistId, + title: page.pl ? page.pl.title : "Playlist", + subtitle: page.pl ? (page.pl.subtitle || "") : "", + thumbnail: page.pl ? (page.pl.cover || page.pl.thumbnail || "") : "" + }; + } + function play(start) { if (!page.pl) return; var at = start === null ? null : page.pl.items.indexOf(page.shown[start]); + var recent = page.asItem(); Daemon.call("play_playlist", { items: page.pl.items, start: at === -1 ? null : at, sourceId: page.isSmart ? undefined : page.playlistId, sourceName: page.pl.title, continuation: page.pl.continuation - }).catch((e) => Playback.toast((e && e.message) ? e.message : "Could not play", "error")); + }).then(() => Personal.noteRecent(recent)) + .catch((e) => Playback.toast((e && e.message) ? e.message : "Could not play", "error")); } function shuffle() { if (!page.pl || !page.pl.items.length) return; + var recent = page.asItem(); Daemon.call("play_playlist", { items: page.pl.items, start: null, sourceId: page.isSmart ? undefined : page.playlistId, sourceName: page.pl.title, shuffle: true, continuation: page.pl.continuation - }).catch((e) => Playback.toast((e && e.message) ? e.message : "Could not play", "error")); + }).then(() => Personal.noteRecent(recent)) + .catch((e) => Playback.toast((e && e.message) ? e.message : "Could not play", "error")); } function chooseSort(k) { diff --git a/client/shell.qml b/client/shell.qml index 3b0230d..bd59db3 100644 --- a/client/shell.qml +++ b/client/shell.qml @@ -14,6 +14,9 @@ ShellRoot { // config is up. subscribeAll() is idempotent and re-subscribes on every reconnect, so a single // call here covers a daemon that is already up, one that starts later, and one that restarts. Component.onCompleted: { + // Package upgrades replace QML files non-atomically. Keep this running generation + // intact until the user quits and reopens, rather than reloading mid-transaction. + Quickshell.watchFiles = false; Daemon.subscribeAll(); Style.applyPrefs(); } diff --git a/client/tests/tst_home_feed.qml b/client/tests/tst_home_feed.qml new file mode 100644 index 0000000..8cb2c72 --- /dev/null +++ b/client/tests/tst_home_feed.qml @@ -0,0 +1,60 @@ +import QtQuick +import QtTest +import "../components" + +TestCase { + name: "HomeFeed" + when: windowShown + width: 600 + visible: true + height: 500 + + Component { + id: feedComponent + HomeFeed { + id: feed + width: 600 + height: 500 + property int headerHeight: 1600 + model: 20 + header: Rectangle { width: 600; height: feed.headerHeight; color: "gray" } + delegate: Rectangle { width: 600; height: 200; color: "white" } + } + } + + function makeFeed() { + var feed = createTemporaryObject(feedComponent, this); + verify(feed !== null); + waitForRendering(feed); + tryCompare(feed.headerItem, "height", 1600); + return feed; + } + + function test_first_wheel_does_not_skip_tall_header() { + var feed = makeFeed(); + var top = feed.contentY; + mouseWheel(feed, 300, 200, 0, -120); + tryVerify(function () { return feed.contentY > top; }, 1000, "Wheel must actually scroll"); + tryVerify(function () { return !feed.moving; }); + verify(feed.contentY - top < feed.height, "One wheel tick must not skip the whole Home header"); + } + + function test_releasing_pin_preserves_position() { + var feed = makeFeed(); + var top = feed.contentY; + feed.stickTop = false; + compare(feed.contentY, top, "Disabling the pin must not restore pre-layout contentY=0"); + } + + function test_async_header_growth_stays_at_top_until_interaction() { + var feed = makeFeed(); + feed.headerHeight = 2100; + tryCompare(feed.headerItem, "height", 2100); + tryCompare(feed, "contentY", feed.originY); + feed.stickTop = false; + feed.contentY += 120; + var offset = feed.contentY; + wait(50); + compare(feed.contentY, offset, "The top pin must not reclaim a user-owned scroll position"); + } +} diff --git a/client/tests/tst_personal.qml b/client/tests/tst_personal.qml index d58358a..454fa33 100644 --- a/client/tests/tst_personal.qml +++ b/client/tests/tst_personal.qml @@ -11,6 +11,11 @@ TestCase { name: "Personal" function item(id) { return { kind: "playlist", id: id, title: id }; } + function song(id, artistId) { + var s = { kind: "song", id: id, title: id.toUpperCase(), subtitle: "Artist " + id, thumbnail: id + ".jpg" }; + if (artistId) s.artistId = artistId; + return s; + } function ids(list) { return list.map(function (x) { return x.id; }).join(","); } function keys(list) { return list.map(function (x) { return x.key; }).join(","); } function secs() { return Array.prototype.slice.call(arguments).map(function (k) { return { key: k }; }); } @@ -123,4 +128,106 @@ TestCase { compare(P.hydrate({}).home.order.length, 0); compare(P.hydrate({ home: { order: [1, "a"], hidden: "nope" } }).home.order.join(","), "a,@familiar"); } + + // A played song is stored as a full navigable BrowseItem, keyed by video id, and shares the + // recent window with played-from playlists/albums without either shape clobbering the other. + function test_song_recents_shape_and_mix() { + var p = P.empty(); + P.noteRecent(p, song("v1", "UCx"), 100); + P.noteRecent(p, item("PL1"), 200); // a played-from playlist + P.noteRecent(p, song("v2"), 300); + compare(ids(P.recentItems(p)), "v2,PL1,v1"); // newest first, songs and playlists together + var v1 = p.recent["v1"]; + compare(v1.kind, "song"); + compare(v1.title, "V1"); + compare(v1.subtitle, "Artist v1"); + compare(v1.thumbnail, "v1.jpg"); + compare(v1.artistId, "UCx"); + verify(p.recent["v2"].artistId === undefined); // an unlinked-artist song omits it + compare(v1.at, 100); + } + + // Replaying an id refreshes its recency in place (one entry, newest timestamp), never a + // duplicate row. + function test_song_recent_replay_refreshes() { + var p = P.empty(); + P.noteRecent(p, song("v1"), 100); + P.noteRecent(p, song("v2"), 200); + P.noteRecent(p, song("v1"), 300); + compare(Object.keys(p.recent).length, 2); + compare(p.recent["v1"].at, 300); + compare(ids(P.recentItems(p)), "v1,v2"); + } + + // Bounded recents: at capacity the OLDEST entries are evicted, never the newest — losing + // recent listening to a flood of stale rows would be the regression. + function test_recent_evicts_oldest() { + var p = P.empty(); + for (var i = 0; i < 105; i++) + P.noteRecent(p, song("v" + i), i + 1); // strictly increasing timestamps + compare(Object.keys(p.recent).length, 100); + verify(p.recent["v104"] !== undefined); // newest kept + verify(p.recent["v5"] !== undefined); // the five oldest gone, nothing newer + verify(p.recent["v4"] === undefined); + } + + // noteArtist stamps lastPlayedAt when a time is given (and refreshes it on later plays) while + // the count still climbs; called without one it stays backward-compatible and adds no field. + function test_note_artist_last_played() { + var p = P.empty(); + P.noteArtist(p, "UCa", "A", 100); + compare(p.artists["UCa"].lastPlayedAt, 100); + P.noteArtist(p, "UCa", "A", 500); + compare(p.artists["UCa"].count, 2); + compare(p.artists["UCa"].lastPlayedAt, 500); + P.noteArtist(p, "UCb", "B"); // legacy call: no timestamp, no field + verify(!("lastPlayedAt" in p.artists["UCb"])); + } + + // Signing out of YouTube forgets only what that session can reopen — Liked Music and the + // account's own "Your …" library playlists — and leaves public playlists, songs and Spotify + // recents. The cross-provider boundary: a YouTube sign-out must not drop a Spotify recent. + function test_forget_youtube_recents() { + var p = P.empty(); + P.noteRecent(p, { kind: "playlist", id: "VLLM", title: "Liked Music" }, 1); + P.noteRecent(p, { kind: "playlist", id: "LM", title: "LM" }, 2); + P.noteRecent(p, { kind: "playlist", id: "PLmine", title: "Mine", subtitle: "Your playlist \u00b7 12 songs" }, 3); + P.noteRecent(p, { kind: "playlist", id: "PLpublic", title: "Chart", subtitle: "YouTube Music \u00b7 50 songs" }, 4); + P.noteRecent(p, { kind: "playlist", id: "spotify:playlist:abc", title: "Mix", subtitle: "Your Mix" }, 5); + P.noteRecent(p, song("v1"), 6); + compare(P.forgetYouTubeRecents(p), 3); + verify(!p.recent["VLLM"] && !p.recent["LM"] && !p.recent["PLmine"]); + verify(!!p.recent["PLpublic"] && !!p.recent["v1"]); + verify(!!p.recent["spotify:playlist:abc"]); // a Spotify item survives a YouTube sign-out + compare(P.forgetYouTubeRecents(P.empty()), 0); + } + + // Signing out of Spotify forgets only provider-qualified spotify: recents and leaves everything + // else, including a YouTube "Your …" playlist and songs — the mirror image of the boundary above. + function test_forget_spotify_recents() { + var p = P.empty(); + P.noteRecent(p, { kind: "playlist", id: "spotify:playlist:abc", title: "Mix", subtitle: "Your Mix" }, 1); + P.noteRecent(p, { kind: "album", id: "spotify:album:xyz", title: "Album" }, 2); + P.noteRecent(p, { kind: "playlist", id: "VLLM", title: "Liked Music" }, 3); + P.noteRecent(p, song("v1"), 4); + compare(P.forgetSpotifyRecents(p), 2); + verify(!p.recent["spotify:playlist:abc"] && !p.recent["spotify:album:xyz"]); + verify(!!p.recent["VLLM"] && !!p.recent["v1"]); + } + + // deepEqual recognises a save's echo despite serde reordering keys at any depth (so the client + // drops it), and reports a genuine change as different (so another client's edit still applies) + // — what keeps a stale full-blob echo from reverting a mutation made while the save was in flight. + function test_deep_equal_echo_detection() { + var a = { picks: [], recent: { v1: { kind: "song", id: "v1", at: 100 } }, artists: { UCx: { name: "X", count: 1 } } }; + var b = { artists: { UCx: { count: 1, name: "X" } }, recent: { v1: { at: 100, id: "v1", kind: "song" } }, picks: [] }; + verify(P.deepEqual(a, b)); // key order never matters, at any depth + var c = JSON.parse(JSON.stringify(a)); + c.recent["v2"] = { kind: "song", id: "v2", at: 200 }; + verify(!P.deepEqual(a, c)); // a newer mutation makes the echo stale + verify(P.deepEqual([1, "a", true, null], [1, "a", true, null])); + verify(!P.deepEqual([1, 2], [1, 2, 3])); + verify(!P.deepEqual({ a: 1 }, { a: 1, b: 2 })); + verify(!P.deepEqual({ a: 1 }, null)); + } } diff --git a/client/tests/tst_playlist_links.qml b/client/tests/tst_playlist_links.qml new file mode 100644 index 0000000..bf6be69 --- /dev/null +++ b/client/tests/tst_playlist_links.qml @@ -0,0 +1,107 @@ +import QtQuick +import QtTest +import "../lib/playlist-links.js" as Links + +// The pasted-link parser behind the shortcut picker's YouTube playlist field, run without +// Quickshell (it is a pure module, mirroring tst_personal). It must open exactly the playlist a +// supported YouTube/YTM link points at, canonicalise the id to the `VL…` browse id `get_playlist` +// wants, and refuse — clearly, by reason — a foreign host, a foreign scheme, or a link with a +// missing, malformed or ambiguous playlist id. Boundaries only; the picker owns the UI. +TestCase { + name: "PlaylistLinks" + + function parse(s) { return Links.parsePlaylistLink(s); } + + // Every URL form we accept resolves to the same VL-prefixed browse id, from a /playlist link, a + // track shared out of a playlist (watch / youtu.be with list=), a bare-host paste, and a YTM + // /browse page. The VL prefix is added once and never doubled. + function test_valid_forms() { + var a = parse("https://music.youtube.com/playlist?list=PLabc123"); + verify(a.ok); + compare(a.id, "VLPLabc123"); + compare(a.rawId, "PLabc123"); + + // A list id already carrying VL is not doubled. + compare(parse("https://music.youtube.com/playlist?list=VLPLabc123").id, "VLPLabc123"); + + // A track shared out of a playlist: the picker adds the playlist, not the single track. + compare(parse("https://music.youtube.com/watch?v=dQw4&list=PLabc").id, "VLPLabc"); + compare(parse("https://youtu.be/dQw4?list=PLabc&si=xyz").id, "VLPLabc"); + + // An album's audio playlist opens as a playlist of the same tracks. + compare(parse("https://www.youtube.com/playlist?list=OLAK5uy_abc").id, "VLOLAK5uy_abc"); + // An auto-generated mix carries its RD id through. + compare(parse("https://music.youtube.com/playlist?list=RDCLAK5uy_x").id, "VLRDCLAK5uy_x"); + + // Other supported hosts, a bare host paste, and surrounding whitespace. + compare(parse("https://m.youtube.com/playlist?list=PLabc").id, "VLPLabc"); + compare(parse("music.youtube.com/playlist?list=PLabc").id, "VLPLabc"); + compare(parse(" https://youtu.be/dQw4?list=PLabc ").id, "VLPLabc"); + + // YTM's own /browse page for a playlist is already a VL browse id. + var b = parse("https://music.youtube.com/browse/VLPLabc"); + verify(b.ok); + compare(b.id, "VLPLabc"); + compare(b.rawId, "PLabc"); + } + + // A host that is not YouTube, and a lookalike host, are refused as "host" — never fetched. + function test_wrong_host() { + var a = parse("https://example.com/playlist?list=PLabc"); + verify(!a.ok); + compare(a.reason, "host"); + + var b = parse("https://youtube.com.evil.test/playlist?list=PLabc"); + verify(!b.ok); + compare(b.reason, "host"); + } + + // A foreign scheme is refused as "scheme"; only http/https (or a bare host) are opened. + function test_wrong_scheme() { + var a = parse("ftp://music.youtube.com/playlist?list=PLabc"); + verify(!a.ok); + compare(a.reason, "scheme"); + + // file: and other schemes are refused too. + verify(!parse("file:///etc/passwd").ok); + // Plain text that is not a link at all is neither a host nor a scheme. + compare(parse("not a url at all").reason, "invalid"); + } + + // A supported link with no playlist to open — the bare site, a single track, an empty /playlist, + // or a /browse page that is an album/artist — reports the missing playlist rather than guessing. + function test_missing_playlist() { + compare(parse("https://music.youtube.com/").reason, "no-playlist"); + compare(parse("https://music.youtube.com/watch?v=dQw4").reason, "no-playlist"); + compare(parse("https://music.youtube.com/playlist").reason, "no-playlist"); + compare(parse("https://music.youtube.com/browse/FEmusic_home").reason, "no-playlist"); + compare(parse("https://music.youtube.com/browse/MPREb_album").reason, "no-playlist"); + compare(parse("https://music.youtube.com/browse/UCartist").reason, "no-playlist"); + } + + // A list= that is present but malformed — empty, VL with nothing after it, or non-id characters + // — is a "bad-id", not a fetchable playlist. + function test_bad_id() { + compare(parse("https://music.youtube.com/playlist?list=").reason, "bad-id"); + compare(parse("https://music.youtube.com/playlist?list=VL").reason, "bad-id"); + // A decoded space is not a valid id character. + compare(parse("https://music.youtube.com/playlist?list=PL%20abc").reason, "bad-id"); + } + + // Two different list= values are ambiguous; the same value twice is not. + function test_ambiguous_id() { + var a = parse("https://music.youtube.com/playlist?list=PLaaa&list=PLbbb"); + verify(!a.ok); + compare(a.reason, "ambiguous"); + + compare(parse("https://music.youtube.com/playlist?list=PLaaa&list=PLaaa").id, "VLPLaaa"); + } + + // A blank box is a neutral "empty" state, not an error the field should shout about. + function test_empty_is_neutral() { + compare(parse("").reason, "empty"); + compare(parse(" ").reason, "empty"); + compare(parse(null).reason, "empty"); + compare(parse(undefined).reason, "empty"); + } +} diff --git a/client/tests/tst_recommendations.qml b/client/tests/tst_recommendations.qml new file mode 100644 index 0000000..36ce215 --- /dev/null +++ b/client/tests/tst_recommendations.qml @@ -0,0 +1,131 @@ +import QtQuick +import QtTest +import "../lib/recommendations.js" as R + +// The Home discovery ranker, exercised as the pure function it is — no Quickshell, no daemon, no +// network — the way tst_personal.qml runs the personal reducers. Each case pins a rule that is easy +// to get wrong: full id dedup, the provider boundary, decayed replay fatigue, the MMR diversity +// pass (both directions of the relevance/diversity trade), an honest zero-history cold start, and +// that build never mutates the feed or the personal blob it reads. +TestCase { + name: "Recommendations" + + // A fixed clock so decay maths is exact and the suite is deterministic. + readonly property double now: 1000 * 86400000 // day 1000, in ms + readonly property double day: 86400000 + + function song(id, artist) { + return { id: id, kind: "song", title: id, subtitle: artist, artistId: artist, thumbnail: "t" }; + } + function sec(title, items) { return { title: title, items: items }; } + function ids(list) { return list.map(function (x) { return x.id; }).join(","); } + + // Full id dedup across sections: an id seen again — even in a later shelf, even with different + // metadata — is dropped, and the first (best-ranked) occurrence is the one kept. + function test_dedup_across_sections() { + var secs = [ + sec("A", [song("x", "UCx"), song("y", "UCy")]), + sec("B", [song("x", "UCx"), song("z", "UCz")]) + ]; + var out = R.build(secs, {}, "youtube", now).items; + compare(out.filter(function (i) { return i.id === "x"; }).length, 1); // x appears once + compare(out.length, 3); // x, y, z + } + + // Provider boundary: a YouTube feed drops rows that positively belong to another catalogue + // (Spotify/SoundCloud uris and on-disk LOCAL ids); the provider's own rows stay. + function test_cross_provider_exclusion() { + var secs = [sec("A", [ + song("vid1", "UCa"), + song("spotify:track:foo", "spotify:artist:z"), + song("sc:track:123", "sc:artist:45"), + song("LOCAL:1", "UCb"), + song("vid2", "UCc") + ])]; + var out = R.build(secs, {}, "youtube", now).items; + compare(ids(out), "vid1,vid2"); + } + + // Replay fatigue: a track played very recently is pushed below an otherwise weaker (later-ranked) + // row, but the penalty decays — the same play long ago no longer demotes it. + function test_replay_fatigue_decays() { + var secs = [sec("A", [song("A", "UCa"), song("B", "UCb")])]; + + var justPlayed = { recent: { "A": { at: now - day } } }; // A played ~1 day ago + var fresh = R.build(secs, justPlayed, "youtube", now).items; + verify(ids(fresh).indexOf("B") < ids(fresh).indexOf("A")); // B overtakes fatigued A + + var longAgo = { recent: { "A": { at: now - 40 * day } } }; // fatigue decayed away + var stale = R.build(secs, longAgo, "youtube", now).items; + compare(ids(stale), "A,B"); // rank order restored + } + + // MMR diversity, both directions. When a different-artist row is close in relevance it is lifted + // above the second same-artist row; when it is genuinely far weaker, the strong same-artist row + // still wins. And the whole pass is deterministic — same inputs, same order, every call. + function test_diversity_rerank_and_determinism() { + // Close call: A,B share an artist, C is a fresh artist one rank back -> C beats B. + var close = [sec("S", [song("A", "UCx"), song("B", "UCx"), song("C", "UCy")])]; + var lifted = R.build(close, {}, "youtube", now).items; + compare(lifted[0].id, "A"); // top relevance leads + verify(ids(lifted).indexOf("C") < ids(lifted).indexOf("B")); // diversity lifts C + + // Genuinely weak alternative: the fresh-artist D sits far down the feed; the strong + // same-artist B still outranks it — relevance is allowed to win. + var items = [song("A", "UCx"), song("B", "UCx")]; + for (var k = 0; k < 40; k++) + items.push(song("pad" + k, "UCx")); + items.push(song("D", "UCy")); + var out = R.build([sec("S", items)], {}, "youtube", now).items; + verify(ids(out).indexOf("B") < ids(out).indexOf("D")); + + // Determinism: identical inputs yield an identical order. + var a = R.build(close, {}, "youtube", now).items; + var b = R.build(close, {}, "youtube", now).items; + compare(ids(a), ids(b)); + } + + // Without history, distinct artists retain provider order and the feed stays untouched. + function test_zero_history_cold_start_and_purity() { + var items = [song("a", "UCa"), song("b", "UCb"), song("c", "UCc")]; + var secs = [sec("S", items)]; + var frozen = JSON.stringify(secs); + + var res = R.build(secs, {}, "youtube", now); + compare(ids(res.items), "a,b,c"); // provider order preserved + compare(JSON.stringify(secs), frozen); // feed untouched + } + + // Empty and placeholder rows must not become playable recommendations. + function test_empty_and_unplayable_feed() { + var empty = R.build([], {}, "youtube", now); + compare(empty.items.length, 0); + + // Rows missing an id or a title are the placeholder rows a discovery shelf must not promote. + var junk = R.build([sec("S", [{ id: "", title: "" }, { kind: "song" }, null])], {}, "youtube", now); + compare(junk.items.length, 0); + } + + // The shelf is bounded to twelve however long the feed is. + function test_caps_at_twelve() { + var items = []; + for (var k = 0; k < 20; k++) + items.push(song("s" + k, "UC" + k)); + compare(R.build([sec("S", items)], {}, "youtube", now).items.length, 12); + } + + // Listening history can change ranking only within its own provider. + function test_personalization_is_provider_scoped() { + var yt = [sec("S", [song("a", "UCa"), song("b", "UCb")])]; + var blob = { artists: { "UCb": { name: "B", count: 5, lastPlayedAt: now - 2 * day } }, recent: {} }; + var frozen = JSON.stringify(blob); + var hot = R.build(yt, blob, "youtube", now); + compare(ids(hot.items), "b,a"); + + var sp = [sec("S", [song("spotify:track:1", "spotify:artist:1"), + song("spotify:track:2", "spotify:artist:2")])]; + var cold = R.build(sp, blob, "spotify", now); + compare(ids(cold.items), "spotify:track:1,spotify:track:2"); + compare(JSON.stringify(blob), frozen); + } +} diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md index 8a6ff5b..f8847c4 100644 --- a/docs/ARCHITECTURE.md +++ b/docs/ARCHITECTURE.md @@ -72,7 +72,13 @@ A tray-only session with no playback has a bounded idle lifetime and exits autom Playback state is event-driven. Ryotunes avoids a permanent high-frequency frontend transport clock and avoids heavy requestAnimationFrame/FFT loops for ordinary idle playback. -Home uses a stable DOM. Sections are not physically mounted/unmounted as the user scrolls; progressive loading, containment and session caching are preferred because physical virtualization previously caused visible jumps and extra renderer work. +The primary QML Home uses a reusable `ListView` with an asynchronous header. `client/components/HomeFeed.qml` pins `contentY` to `originY` until interaction, with `Binding.RestoreNone`: restoring the old pre-layout value (usually zero) when the binding is released skips a tall header whose origin is negative. The QML regression exercises a real wheel event after header growth. + +Home's personal state is a mirror of the existing daemon `personal_json` store, not another database. `client/Personal.qml` hydrates before applying local mutations, serializes immediate saves, and ignores its own outstanding write echoes. Songs are recorded from genuine `now-playing` events; album/playlist controls capture their context before playback and record it after the command succeeds. Subscription snapshots restore the UI without recording another listen. + +`client/lib/recommendations.js` builds a provider-scoped candidate pool from the existing Home response. A lightweight relevance score combines provider order, artist affinity, recency, shortcut affinity and recent-play fatigue; a maximum-marginal-relevance pass adds variety. Candidate count is capped at 300 and output at 12. The diversity pass caches each candidate's maximum similarity as picks are added, so its work is O(candidates × picks), with no training, new network endpoint or timer. Header/feed and personal-data changes trigger recomputation; additional card artwork uses the existing image pipeline. + +We considered [implicit](https://github.com/benfred/implicit) (MIT) and [LightFM](https://github.com/lyst/lightfm) (Apache-2.0), but their trained models add machinery that one user's sparse local history does not justify. Neither is a dependency and no implementation was copied. The local diversity pass follows the standard [MMR relevance/diversity principle](https://www.elastic.co/search-labs/blog/maximum-marginal-relevance-diversify-results). Search loads results incrementally in bounded pages, deduplicates them and preserves query, selection and scroll state when navigating back. From 41561b85add67216f0470c90b34db453b8d0af11 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 8 Sep 2026 19:08:39 +0000 Subject: [PATCH 144/183] release: v1.0.4 --- CHANGELOG.md | 2 ++ Cargo.lock | 22 +++++++++---------- Cargo.toml | 2 +- client/version | 2 +- packaging/arch/PKGBUILD | 2 +- .../linux/dev.ryoku.ryotunes.metainfo.xml | 2 +- src-tauri/tauri.conf.json | 2 +- ui/package.json | 2 +- 8 files changed, 19 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b757a87..a3d580a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +## v1.0.4 - 2026-09-08 + - Prevented automatic QML reload during package upgrades, which could reload `shell.qml` while pacman temporarily removed it. Quit and reopen after installation to load the new client and daemon together. - Fixed the primary QML Home page jumping past its header on the first scroll. Asynchronous header growth stays pinned only until the user starts scrolling. - Home now puts a compact resume control and remembered listening context ahead of discovery. Played songs, albums and playlists persist across launches without counting a restored queue as a new listen. diff --git a/Cargo.lock b/Cargo.lock index 63ad94a..ac84573 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2438,7 +2438,7 @@ dependencies = [ [[package]] name = "innertube" -version = "1.0.3" +version = "1.0.4" dependencies = [ "hex", "reqwest 0.12.28", @@ -2943,7 +2943,7 @@ checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" [[package]] name = "listen-protocol" -version = "1.0.3" +version = "1.0.4" dependencies = [ "serde", "serde_json", @@ -3788,7 +3788,7 @@ checksum = "f6b464fbc74e149a392436b17d523f769e057cb6877f6a5c4618bc6f11800548" [[package]] name = "player" -version = "1.0.3" +version = "1.0.4" dependencies = [ "libc", "libmpv2", @@ -4703,7 +4703,7 @@ dependencies = [ [[package]] name = "ryotunes" -version = "1.0.3" +version = "1.0.4" dependencies = [ "anyhow", "async-trait", @@ -4733,7 +4733,7 @@ dependencies = [ [[package]] name = "ryotunes-cli" -version = "1.0.3" +version = "1.0.4" dependencies = [ "ryotunes-protocol", "serde", @@ -4742,7 +4742,7 @@ dependencies = [ [[package]] name = "ryotunes-core" -version = "1.0.3" +version = "1.0.4" dependencies = [ "anyhow", "async-trait", @@ -4778,7 +4778,7 @@ dependencies = [ [[package]] name = "ryotunes-protocol" -version = "1.0.3" +version = "1.0.4" dependencies = [ "serde", "serde_json", @@ -4786,7 +4786,7 @@ dependencies = [ [[package]] name = "ryotunes-soundcloud" -version = "1.0.3" +version = "1.0.4" dependencies = [ "regex", "reqwest 0.12.28", @@ -4799,7 +4799,7 @@ dependencies = [ [[package]] name = "ryotunes-spotify" -version = "1.0.3" +version = "1.0.4" dependencies = [ "anyhow", "bytes", @@ -4822,7 +4822,7 @@ dependencies = [ [[package]] name = "ryotunesd" -version = "1.0.3" +version = "1.0.4" dependencies = [ "anyhow", "async-trait", @@ -5585,7 +5585,7 @@ dependencies = [ [[package]] name = "sync-server" -version = "1.0.3" +version = "1.0.4" dependencies = [ "futures-util", "listen-protocol", diff --git a/Cargo.toml b/Cargo.toml index 125f860..1b5b7f1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ members = [ ] [workspace.package] -version = "1.0.3" +version = "1.0.4" edition = "2021" license = "GPL-3.0-or-later" diff --git a/client/version b/client/version index 21e8796..ee90284 100644 --- a/client/version +++ b/client/version @@ -1 +1 @@ -1.0.3 +1.0.4 diff --git a/packaging/arch/PKGBUILD b/packaging/arch/PKGBUILD index 25674fe..d7d4c5b 100644 --- a/packaging/arch/PKGBUILD +++ b/packaging/arch/PKGBUILD @@ -2,7 +2,7 @@ # Run from packaging/arch with: makepkg -si pkgname=ryotunes -pkgver=1.0.3 +pkgver=1.0.4 pkgrel=1 # epoch=1 is permanent: the v1 reset publishes 1:X.Y.Z, which pacman ranks above # the legacy 2.x line an existing machine may carry, so `pacman -U` still upgrades. diff --git a/packaging/linux/dev.ryoku.ryotunes.metainfo.xml b/packaging/linux/dev.ryoku.ryotunes.metainfo.xml index 0f1fdc9..3b89975 100644 --- a/packaging/linux/dev.ryoku.ryotunes.metainfo.xml +++ b/packaging/linux/dev.ryoku.ryotunes.metainfo.xml @@ -11,5 +11,5 @@ ryotunes.desktop ryotunes AudioVideoAudio - + diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index af4104b..95e4a6e 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "https://schema.tauri.app/config/2", "productName": "Ryotunes", - "version": "1.0.3", + "version": "1.0.4", "identifier": "dev.ryoku.ryotunes", "build": { "frontendDist": "../ui/build", diff --git a/ui/package.json b/ui/package.json index 907a953..2a6d787 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,7 +1,7 @@ { "name": "ui", "private": true, - "version": "1.0.3", + "version": "1.0.4", "type": "module", "scripts": { "dev": "vite dev", From 1f58f22c11a0a637e81f28dbbad8f6a3d413ff00 Mon Sep 17 00:00:00 2001 From: carlos Date: Tue, 8 Sep 2026 16:07:58 -0400 Subject: [PATCH 145/183] fix: preserve Home pagination and remove legacy Linux launch routes --- CHANGELOG.md | 4 +- client/pages/HomePage.qml | 42 ++++----- docs/ARCHITECTURE.md | 8 +- docs/INSTALL-ARCH.md | 10 +- packaging/arch/PKGBUILD | 7 +- packaging/linux/90-ryotunes.preset | 5 +- packaging/linux/ryotunes-qml.desktop | 12 --- packaging/linux/ryotunes.desktop | 4 +- src-tauri/src/main.rs | 135 +++++++++++++++++++++------ 9 files changed, 143 insertions(+), 84 deletions(-) delete mode 100644 packaging/linux/ryotunes-qml.desktop diff --git a/CHANGELOG.md b/CHANGELOG.md index a3d580a..466faba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,10 @@ ## Unreleased -## v1.0.4 - 2026-09-08 +- Fixed Home snapping back to the top when a continuation page arrived: new shelves now append to a persistent Qt list model instead of replacing the model. +- Made the Linux launcher native-QML-only, including cold starts and missing sockets. Removed the legacy Tauri overrides and duplicate desktop entry; Quickshell is now a required package dependency. +## v1.0.4 - 2026-09-08 - Prevented automatic QML reload during package upgrades, which could reload `shell.qml` while pacman temporarily removed it. Quit and reopen after installation to load the new client and daemon together. - Fixed the primary QML Home page jumping past its header on the first scroll. Asynchronous header growth stays pinned only until the user starts scrolling. - Home now puts a compact resume control and remembered listening context ahead of discovery. Played songs, albums and playlists persist across launches without counting a restored queue as a new listen. diff --git a/client/pages/HomePage.qml b/client/pages/HomePage.qml index 622b14e..52bce02 100644 --- a/client/pages/HomePage.qml +++ b/client/pages/HomePage.qml @@ -31,7 +31,7 @@ Item { property string errorMsg: "" property bool loadingMore: false property bool moreError: false - property var blocks: [] + ListModel { id: blocks } property int requestId: 0 property var recommendations: ({ items: [], explanation: "" }) @@ -85,26 +85,19 @@ Item { return false; } - function rebuild() { - var arr = []; - var fg = null; - var secs = (page.home && page.home.sections) ? page.home.sections : []; - // The feed's "Listen again" is drawn by HomePersonal as the numbered list (the original - // Home's design); Forgotten favourites keeps its own block; everything else is a shelf. - var la = null; + function appendSections(secs) { + // Keep the model alive across continuation responses. Replacing a JS-array model + // resets ListView to the header, even after the user has started scrolling. for (var i = 0; i < secs.length; i++) { if (page.isForgotten(secs[i])) { - if (!fg) - fg = secs[i]; - } else if (!la && /listen again/i.test(secs[i].title)) { - la = secs[i]; + if (!page.forgotten) + page.forgotten = secs[i]; + } else if (!page.listenAgain && /listen again/i.test(secs[i].title)) { + page.listenAgain = secs[i]; } else { - arr.push(secs[i]); + blocks.append({ sectionData: secs[i] }); } } - page.forgotten = fg; - page.listenAgain = la; - page.blocks = arr; page.refreshRecommendations(); } @@ -129,11 +122,12 @@ Item { list.cancelFlick(); list.stickTop = true; page.moreError = false; + blocks.clear(); + page.forgotten = null; + page.listenAgain = null; // Gated: no daemon call, the sign-in card carries the page. if (page.spotifyGate) { page.home = null; - page.blocks = []; - page.forgotten = null; page.chips = []; page.recommendations = ({ items: [], explanation: "" }); page.errorMsg = ""; @@ -149,7 +143,7 @@ Item { page.home = h; if (h.chips && h.chips.length) page.chips = h.chips.filter((c) => c.title !== "Podcasts"); - page.rebuild(); + page.appendSections(h.sections || []); page.loading = false; }) .catch((e) => { @@ -175,7 +169,7 @@ Item { sections: page.home.sections.concat(more.sections), continuation: more.sections.length ? more.continuation : undefined }; - page.rebuild(); + page.appendSections(more.sections); page.loadingMore = false; }) .catch(() => { @@ -204,7 +198,7 @@ Item { reuseItems: true cacheBuffer: Math.max(0, Math.round(height * 1.5)) boundsBehavior: Flickable.StopAtBounds - model: page.blocks + model: blocks spacing: Style.sp(10) // HomeFeed releases its top pin without restoring a stale pre-layout offset. @@ -212,13 +206,13 @@ Item { onContentHeightChanged: page.maybeLoadMore() delegate: Item { - required property var modelData + required property var sectionData width: list.width implicitHeight: shelf.implicitHeight Shelf { id: shelf width: parent.width - section: parent.modelData + section: parent.sectionData mark: Style.decorRich ? "章" : "" } } @@ -690,7 +684,7 @@ Item { ColumnLayout { Layout.alignment: Qt.AlignHCenter Layout.topMargin: Style.sp(16) - visible: !page.loading && page.errorMsg === "" && page.blocks.length === 0 && !page.forgotten + visible: !page.loading && page.errorMsg === "" && blocks.count === 0 && !page.forgotten spacing: Style.sp(3) Icon { Layout.alignment: Qt.AlignHCenter; name: "music"; size: Style.fs.hero; color: Tokens.inkFaint } Text { diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md index f8847c4..08304e1 100644 --- a/docs/ARCHITECTURE.md +++ b/docs/ARCHITECTURE.md @@ -64,7 +64,7 @@ The Tauri app and the daemon share the same data directory (`$XDG_DATA_HOME/dev. Closing the main window is not the same operation as quitting the application. -When playback is active, Ryotunes can destroy/hibernate the expensive user-facing WebView while keeping the native backend alive. MPRIS, tray actions and Ryoku shell media controls therefore continue without retaining the full renderer. Reopening reconstructs the WebView and resynchronises it from native state. +On Linux, the Quickshell client and `ryotunesd` are separate processes. Closing or hibernating the client does not stop active daemon playback, MPRIS or tray controls. Reopening subscribes to the daemon's current state rather than creating a second player. A tray-only session with no playback has a bounded idle lifetime and exits automatically. Explicit Quit stops the playback session, unregisters MPRIS and shuts integrations down immediately. @@ -74,6 +74,8 @@ Playback state is event-driven. Ryotunes avoids a permanent high-frequency front The primary QML Home uses a reusable `ListView` with an asynchronous header. `client/components/HomeFeed.qml` pins `contentY` to `originY` until interaction, with `Binding.RestoreNone`: restoring the old pre-layout value (usually zero) when the binding is released skips a tall header whose origin is negative. The QML regression exercises a real wheel event after header growth. +Continuation pages append shelves to a persistent `ListModel`; only an explicit feed reload clears it. Reassigning a JavaScript array as `ListView.model` resets the view to its header, so pagination must not rebuild the entire model or compensate by writing `contentY` afterward. This follows Qt's [incremental ListModel API](https://doc.qt.io/qt-6/qml-qtqml-models-listmodel.html). + Home's personal state is a mirror of the existing daemon `personal_json` store, not another database. `client/Personal.qml` hydrates before applying local mutations, serializes immediate saves, and ignores its own outstanding write echoes. Songs are recorded from genuine `now-playing` events; album/playlist controls capture their context before playback and record it after the command succeeds. Subscription snapshots restore the UI without recording another listen. `client/lib/recommendations.js` builds a provider-scoped candidate pool from the existing Home response. A lightweight relevance score combines provider order, artist affinity, recency, shortcut affinity and recent-play fatigue; a maximum-marginal-relevance pass adds variety. Candidate count is capped at 300 and output at 12. The diversity pass caches each candidate's maximum similarity as picks are added, so its work is O(candidates × picks), with no training, new network endpoint or timer. Header/feed and personal-data changes trigger recomputation; additional card artwork uses the existing image pipeline. @@ -90,9 +92,9 @@ Device playlists carry no provider thumbnail, so the daemon derives one from the ## Linux / Ryoku lifecycle -The main window uses the stable application id `dev.ryoku.ryotunes`. On Ryoku, a compositor rule floats and centres the main surface before it becomes visible. Native geometry remains a fallback rather than the primary source of a tiled-to-floating transition. +The Linux `ryotunes` executable is a native-only launcher. It requests `show` on the daemon socket, starting the user socket unit or the daemon directly for a cold launch. Connection or protocol failures never open the legacy Tauri player. -Cold launch, second-instance launch, tray reopen and mini-player-to-main restoration all converge on the same native visibility lifecycle. The UI sends a mounted/ready signal, with a native failsafe so a hidden WebView cannot deadlock the application in a tray-only state. +The primary window is a Quickshell surface (`org.quickshell`, title `Ryotunes`). Cold launch, second-instance launch, tray reopen and mini-player-to-main restoration converge on the daemon's show event and the client's visibility lifecycle. The package exposes one desktop entry and requires Quickshell. ## Packaging invariants diff --git a/docs/INSTALL-ARCH.md b/docs/INSTALL-ARCH.md index 4bdb17d..d0928c9 100644 --- a/docs/INSTALL-ARCH.md +++ b/docs/INSTALL-ARCH.md @@ -55,17 +55,17 @@ paru -S ryotunes-bin This command will become usable after the AUR package is published. -## Native QML client (preview) +## Primary QML client -Alongside the Tauri application, the package ships a native [Quickshell](https://quickshell.org) client that talks to the same `ryotunesd` daemon. It installs to `/usr/share/ryotunes/client` and is launched by the `ryotunes-qml` wrapper (a `Ryotunes (QML)` desktop entry is also installed). Because Quickshell resolves `qs -c NAME` only from `$XDG_CONFIG_HOME/quickshell/NAME`, the wrapper runs the packaged tree by explicit path: +On Linux, Ryotunes runs the native [Quickshell](https://quickshell.org) client with `ryotunesd`. The single desktop entry, dock and Super+J all use the same launcher: ```bash -ryotunes-qml # == qs -p /usr/share/ryotunes/client +ryotunes ``` -It needs the optional `quickshell` dependency and the Ryoku QML runtime (`Ryoku.Ui.Singletons`). +The package requires `quickshell`; the client also uses the Ryoku QML runtime (`Ryoku.Ui.Singletons`). The daemon starts the installed client through `ryotunes-qml`, which runs `qs -p /usr/share/ryotunes/client`. -The native client is the default. `/usr/bin/ryotunes` (the desktop's launcher, keybind and dock) asks `ryotunesd` to `show`: the daemon raises the connected client or opens `ryotunes-qml`, and connecting to the socket is what starts the daemon after a boot (systemd socket activation), so a cold start lands in the native client too. The Tauri app, which carries its own player, runs only on `ryotunes --tauri` (or `RYOTUNES_TAURI=1`), or when the daemon's socket does not exist at all. Only one player ever runs. +The launcher asks `ryotunesd` to show its existing client or open one. If the daemon is absent, it starts the user socket unit, or starts the daemon directly when systemd is unavailable. An unreachable daemon produces an error; Linux never falls back to Tauri and has no legacy launch flag or environment override. ## Build from source diff --git a/packaging/arch/PKGBUILD b/packaging/arch/PKGBUILD index d7d4c5b..947d2c9 100644 --- a/packaging/arch/PKGBUILD +++ b/packaging/arch/PKGBUILD @@ -25,9 +25,9 @@ depends=( 'hicolor-icon-theme' 'xdg-utils' 'polkit' -) -optdepends=( - 'quickshell: native QML client (ryotunes-qml), opened by ryotunes whenever ryotunesd is running' + # Required: the native QML client (ryotunes-qml) that `ryotunes` opens on Linux; there is no + # Tauri fallback, so the client runtime is not optional. + 'quickshell' ) makedepends=( 'base-devel' @@ -87,7 +87,6 @@ package() { install -Dm755 "$binaries/ryotunesd" "$pkgdir/usr/bin/ryotunesd" install -Dm755 "$binaries/ryotunes-cli" "$pkgdir/usr/bin/ryotunes-cli" install -Dm755 packaging/linux/ryotunes-qml "$pkgdir/usr/bin/ryotunes-qml" - install -Dm644 packaging/linux/ryotunes-qml.desktop "$pkgdir/usr/share/applications/ryotunes-qml.desktop" # Native QML client, run by Quickshell via `qs -p /usr/share/ryotunes/client` (the ryotunes-qml # launcher); ship the whole config tree minus the QtTest sources, world-readable. install -dm755 "$pkgdir/usr/share/ryotunes" diff --git a/packaging/linux/90-ryotunes.preset b/packaging/linux/90-ryotunes.preset index 80c5b64..7deedef 100644 --- a/packaging/linux/90-ryotunes.preset +++ b/packaging/linux/90-ryotunes.preset @@ -1,4 +1,3 @@ -# Enable the daemon's socket for every user: `ryotunes` defers to the native -# client only while the socket exists, so without this a fresh install opens -# the Tauri app. Socket activation means nothing runs until something connects. +# Enable socket activation for every user. Nothing runs until a client connects; +# the native-only launcher can also start this unit when it is not yet active. enable ryotunesd.socket diff --git a/packaging/linux/ryotunes-qml.desktop b/packaging/linux/ryotunes-qml.desktop deleted file mode 100644 index 6eee3bd..0000000 --- a/packaging/linux/ryotunes-qml.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Ryotunes Native -GenericName=Music Player -Comment=Ryoku-oriented desktop music client (native Quickshell client) -Exec=ryotunes-qml -Icon=ryotunes -Terminal=false -Categories=AudioVideo;Audio;Player; -Keywords=music;youtube;player;ryoku;lyrics;quickshell; -StartupNotify=true -StartupWMClass=org.quickshell diff --git a/packaging/linux/ryotunes.desktop b/packaging/linux/ryotunes.desktop index a05089a..3115c6c 100644 --- a/packaging/linux/ryotunes.desktop +++ b/packaging/linux/ryotunes.desktop @@ -7,6 +7,6 @@ Exec=ryotunes Icon=ryotunes Terminal=false Categories=AudioVideo;Audio;Player; -Keywords=music;youtube;player;ryoku;lyrics; +Keywords=music;youtube;player;ryoku;lyrics;quickshell; StartupNotify=true -StartupWMClass=dev.ryoku.ryotunes +StartupWMClass=org.quickshell diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index 22b24fe..3f18fe9 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -2,57 +2,132 @@ #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] fn main() { + // Linux ships `ryotunes` as a thin launcher for the native Quickshell client; it never runs the + // Tauri app. macOS and Windows still run the bundled Tauri player. #[cfg(target_os = "linux")] - if daemon::defer_to_native() { - return; + { + native::launch(); + } + #[cfg(not(target_os = "linux"))] + { + app_lib::run(); } - app_lib::run(); } -/// The native client is the default: `/usr/bin/ryotunes` (the desktop's keybind, dock and launcher) -/// asks `ryotunesd` to `show`, which raises the connected client or opens `ryotunes-qml`. Connecting -/// to the socket is what starts the daemon when systemd holds it idle (socket activation), so a -/// cold boot lands in the native client too. The Tauri app, with its own player, runs only on -/// `ryotunes --tauri` (or `RYOTUNES_TAURI=1`) or when no daemon socket exists at all, so a box -/// without the daemon installed keeps working. +/// On Linux the installed `/usr/bin/ryotunes` (the desktop's keybind, dock and launcher) hands +/// `ryotunesd` a `show`, which raises the connected client or opens the native `ryotunes-qml` +/// client. Connecting to the socket is what starts the daemon — systemd socket activation, or a +/// direct spawn on a box without systemd — so a cold boot lands in the native client too. There is +/// deliberately no Tauri route on Linux: `--tauri`/`RYOTUNES_TAURI` are gone, and a machine that +/// cannot reach the daemon gets a real error rather than a second player on the same audio device. #[cfg(target_os = "linux")] -mod daemon { +mod native { use std::io::{BufRead, BufReader, Write}; use std::os::unix::net::UnixStream; + use std::path::Path; + use std::process::{Command, Stdio}; + use std::time::{Duration, Instant}; - pub fn defer_to_native() -> bool { - if std::env::args().any(|a| a == "--tauri") || std::env::var_os("RYOTUNES_TAURI").is_some() - { - return false; - } + pub fn launch() { let sock = ryotunes_protocol::socket_path(); - if !sock.exists() { - tracing_lite("no ryotunesd socket; starting the Tauri app"); - return false; + // Fast path: a live daemon (its client already up) or an idle systemd-activated socket + // answers the first `show` straight away. + if show(&sock).is_ok() { + log("asked ryotunesd to show the native client"); + return; } - match show(&sock) { - Ok(reply) => { - tracing_lite(&format!("asked ryotunesd to show ({reply})")); - true - } + // Nothing is listening: bring the daemon up ourselves, then raise the client. Never Tauri. + if let Err(e) = ensure_daemon() { + log(&format!("could not start ryotunesd: {e}")); + std::process::exit(1); + } + match show_until_ready(&sock) { + Ok(()) => log("asked ryotunesd to show the native client"), Err(e) => { - tracing_lite(&format!("ryotunesd `show` failed: {e}; starting the Tauri app")); - false + eprintln!( + "ryotunes: could not reach the Ryotunes daemon (ryotunesd): {e}\n\ + Start it with `systemctl --user start ryotunesd.socket`, or run `ryotunesd`." + ); + std::process::exit(1); } } } - fn show(sock: &std::path::Path) -> std::io::Result { + /// A successful protocol reply acknowledges `show`; EOF and daemon errors are failures. + fn show(sock: &Path) -> std::io::Result<()> { let mut stream = UnixStream::connect(sock)?; - stream.set_read_timeout(Some(std::time::Duration::from_secs(5)))?; + stream.set_read_timeout(Some(Duration::from_secs(5)))?; stream.write_all(b"{\"id\":1,\"method\":\"show\"}\n")?; let mut line = String::new(); BufReader::new(stream).read_line(&mut line)?; - Ok(line.trim_end().to_string()) + let response: ryotunes_protocol::Response = serde_json::from_str(&line) + .map_err(|e| std::io::Error::new(std::io::ErrorKind::InvalidData, e))?; + if response.id != 1 { + return Err(std::io::Error::new( + std::io::ErrorKind::InvalidData, + "unexpected response ID", + )); + } + if let Some(error) = response.error { + return Err(std::io::Error::other(error.message)); + } + Ok(()) + } + + /// Retry `show` while the daemon we just started binds and serves its socket. Bounded, so an + /// unreachable daemon surfaces as an error instead of hanging forever. + fn show_until_ready(sock: &Path) -> std::io::Result<()> { + let deadline = Instant::now() + Duration::from_secs(20); + loop { + let error = match show(sock) { + Ok(()) => return Ok(()), + Err(e) => e, + }; + if Instant::now() >= deadline { + return Err(error); + } + std::thread::sleep(Duration::from_millis(100)); + } + } + + /// Bring the daemon up without ever touching the Tauri app. Prefer systemd socket activation so + /// the daemon lands under the user manager (tray, MPRIS, idle-exit); fall back to spawning + /// `ryotunesd` directly on a box without a working systemd `--user` instance, where the daemon's + /// own bind clears any stale socket first. + fn ensure_daemon() -> std::io::Result<()> { + if start_socket_unit() { + return Ok(()); + } + spawn_daemon() + } + + /// `systemctl --user start ryotunesd.socket`: true when systemd accepted it, so the socket is now + /// listening and the next connect activates the service. False when there is no working user + /// systemd or the unit is absent — the caller then spawns the daemon directly. + fn start_socket_unit() -> bool { + Command::new("systemctl") + .args(["--user", "--no-block", "start", "ryotunesd.socket"]) + .stdin(Stdio::null()) + .stdout(Stdio::null()) + .stderr(Stdio::null()) + .status() + .map(|s| s.success()) + .unwrap_or(false) + } + + /// Spawn `ryotunesd` detached. Its single-instance handshake either becomes the daemon (binding + /// the socket after clearing a stale file) or forwards `show` to a live one and exits. + fn spawn_daemon() -> std::io::Result<()> { + Command::new("ryotunesd") + .stdin(Stdio::null()) + .stdout(Stdio::null()) + .stderr(Stdio::null()) + .spawn() + .map(|_| ()) } - // The tracing subscriber is installed inside `app_lib::run`, which this path never reaches. - fn tracing_lite(msg: &str) { + // The tracing subscriber lives in the daemon; this launcher only prints to stderr. + fn log(msg: &str) { eprintln!("ryotunes: {msg}"); } } From d022973c49efe921dcd84254a591b5eea76306a6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 8 Sep 2026 20:15:11 +0000 Subject: [PATCH 146/183] release: v1.0.5 --- CHANGELOG.md | 2 ++ Cargo.lock | 22 +++++++++---------- Cargo.toml | 2 +- client/version | 2 +- packaging/arch/PKGBUILD | 2 +- .../linux/dev.ryoku.ryotunes.metainfo.xml | 2 +- src-tauri/tauri.conf.json | 2 +- ui/package.json | 2 +- 8 files changed, 19 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 466faba..56e3aac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +## v1.0.5 - 2026-09-08 + - Fixed Home snapping back to the top when a continuation page arrived: new shelves now append to a persistent Qt list model instead of replacing the model. - Made the Linux launcher native-QML-only, including cold starts and missing sockets. Removed the legacy Tauri overrides and duplicate desktop entry; Quickshell is now a required package dependency. diff --git a/Cargo.lock b/Cargo.lock index ac84573..18cbe48 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2438,7 +2438,7 @@ dependencies = [ [[package]] name = "innertube" -version = "1.0.4" +version = "1.0.5" dependencies = [ "hex", "reqwest 0.12.28", @@ -2943,7 +2943,7 @@ checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" [[package]] name = "listen-protocol" -version = "1.0.4" +version = "1.0.5" dependencies = [ "serde", "serde_json", @@ -3788,7 +3788,7 @@ checksum = "f6b464fbc74e149a392436b17d523f769e057cb6877f6a5c4618bc6f11800548" [[package]] name = "player" -version = "1.0.4" +version = "1.0.5" dependencies = [ "libc", "libmpv2", @@ -4703,7 +4703,7 @@ dependencies = [ [[package]] name = "ryotunes" -version = "1.0.4" +version = "1.0.5" dependencies = [ "anyhow", "async-trait", @@ -4733,7 +4733,7 @@ dependencies = [ [[package]] name = "ryotunes-cli" -version = "1.0.4" +version = "1.0.5" dependencies = [ "ryotunes-protocol", "serde", @@ -4742,7 +4742,7 @@ dependencies = [ [[package]] name = "ryotunes-core" -version = "1.0.4" +version = "1.0.5" dependencies = [ "anyhow", "async-trait", @@ -4778,7 +4778,7 @@ dependencies = [ [[package]] name = "ryotunes-protocol" -version = "1.0.4" +version = "1.0.5" dependencies = [ "serde", "serde_json", @@ -4786,7 +4786,7 @@ dependencies = [ [[package]] name = "ryotunes-soundcloud" -version = "1.0.4" +version = "1.0.5" dependencies = [ "regex", "reqwest 0.12.28", @@ -4799,7 +4799,7 @@ dependencies = [ [[package]] name = "ryotunes-spotify" -version = "1.0.4" +version = "1.0.5" dependencies = [ "anyhow", "bytes", @@ -4822,7 +4822,7 @@ dependencies = [ [[package]] name = "ryotunesd" -version = "1.0.4" +version = "1.0.5" dependencies = [ "anyhow", "async-trait", @@ -5585,7 +5585,7 @@ dependencies = [ [[package]] name = "sync-server" -version = "1.0.4" +version = "1.0.5" dependencies = [ "futures-util", "listen-protocol", diff --git a/Cargo.toml b/Cargo.toml index 1b5b7f1..351ab7b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ members = [ ] [workspace.package] -version = "1.0.4" +version = "1.0.5" edition = "2021" license = "GPL-3.0-or-later" diff --git a/client/version b/client/version index ee90284..90a27f9 100644 --- a/client/version +++ b/client/version @@ -1 +1 @@ -1.0.4 +1.0.5 diff --git a/packaging/arch/PKGBUILD b/packaging/arch/PKGBUILD index 947d2c9..4a12b8d 100644 --- a/packaging/arch/PKGBUILD +++ b/packaging/arch/PKGBUILD @@ -2,7 +2,7 @@ # Run from packaging/arch with: makepkg -si pkgname=ryotunes -pkgver=1.0.4 +pkgver=1.0.5 pkgrel=1 # epoch=1 is permanent: the v1 reset publishes 1:X.Y.Z, which pacman ranks above # the legacy 2.x line an existing machine may carry, so `pacman -U` still upgrades. diff --git a/packaging/linux/dev.ryoku.ryotunes.metainfo.xml b/packaging/linux/dev.ryoku.ryotunes.metainfo.xml index 3b89975..f5a3da0 100644 --- a/packaging/linux/dev.ryoku.ryotunes.metainfo.xml +++ b/packaging/linux/dev.ryoku.ryotunes.metainfo.xml @@ -11,5 +11,5 @@ ryotunes.desktop ryotunes AudioVideoAudio - + diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 95e4a6e..acbdb40 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "https://schema.tauri.app/config/2", "productName": "Ryotunes", - "version": "1.0.4", + "version": "1.0.5", "identifier": "dev.ryoku.ryotunes", "build": { "frontendDist": "../ui/build", diff --git a/ui/package.json b/ui/package.json index 2a6d787..7800686 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,7 +1,7 @@ { "name": "ui", "private": true, - "version": "1.0.4", + "version": "1.0.5", "type": "module", "scripts": { "dev": "vite dev", From 6ad0cb7bb0e1c405bb276af9b879cf87b1d76602 Mon Sep 17 00:00:00 2001 From: carlos Date: Tue, 8 Sep 2026 17:19:05 -0400 Subject: [PATCH 147/183] fix: restore native launch after package reinstall --- CHANGELOG.md | 3 +++ docs/INSTALL-ARCH.md | 5 ++++ packaging/arch/PKGBUILD | 2 +- packaging/arch/ryotunes.install | 23 ++++++++++++++++--- .../linux/dev.ryoku.ryotunes.metainfo.xml | 5 ++-- packaging/linux/ryotunes.desktop | 2 +- 6 files changed, 33 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 56e3aac..4ce907c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased +- Fixed app-launcher activation after removing and reinstalling Ryotunes: removal now stops the user units before deleting them, and a fresh install repairs stale socket state left by older packages. Ordinary upgrades still leave playback and self-update RPCs running. +- Presented Ryotunes consistently as Ryoku's main music app in pacman, the app launcher, and software catalogues. + ## v1.0.5 - 2026-09-08 - Fixed Home snapping back to the top when a continuation page arrived: new shelves now append to a persistent Qt list model instead of replacing the model. diff --git a/docs/INSTALL-ARCH.md b/docs/INSTALL-ARCH.md index d0928c9..ec16204 100644 --- a/docs/INSTALL-ARCH.md +++ b/docs/INSTALL-ARCH.md @@ -23,6 +23,11 @@ window is not enough — so the daemon and client load the new build. On Ryoku this is automated: `ryoku update` installs a newer published Ryotunes package, and `ryoku doctor --check` reports its availability without installing. +Removing the package stops its user daemon and activation socket without deleting +your music, personal library, or configuration. Reinstalling through `ryoku update` +repairs stale activation state left by older packages; the app launcher and Super+J +work immediately, without a relogin. Ordinary upgrades do not restart playback. + ## Update inside Ryotunes Open **Settings → About → Check for new version** in either client. About shows the diff --git a/packaging/arch/PKGBUILD b/packaging/arch/PKGBUILD index 4a12b8d..38c8092 100644 --- a/packaging/arch/PKGBUILD +++ b/packaging/arch/PKGBUILD @@ -9,7 +9,7 @@ pkgrel=1 # The published asset name stays epochless (scripts/build-arch-package.sh renames # makepkg's epoch-tagged output back to the ryotunes--1-x86_64 contract). epoch=1 -pkgdesc='Ryotunes - resource-conscious Linux desktop music client' +pkgdesc="Ryoku's main music app — discover, stream, and enjoy your music collection" url='https://github.com/ryoku-dev/ryotunes' arch=('x86_64') license=('GPL-3.0-or-later') diff --git a/packaging/arch/ryotunes.install b/packaging/arch/ryotunes.install index a10f06e..754a206 100644 --- a/packaging/arch/ryotunes.install +++ b/packaging/arch/ryotunes.install @@ -1,4 +1,14 @@ post_install() { + # Older packages could leave a socket "active" with no open descriptors after + # removal. A fresh install must stop that stale state before enabling it; + # `enable --now` alone treats it as already running. Never do this on upgrade. + for uid in $(loginctl list-users --no-legend 2>/dev/null | awk '{print $1}'); do + systemctl --user -M "$uid@" daemon-reload 2>/dev/null || true + systemctl --user -M "$uid@" stop ryotunesd.socket ryotunesd.service 2>/dev/null || true + done + post_upgrade +} +post_upgrade() { gtk-update-icon-cache -q -t -f usr/share/icons/hicolor 2>/dev/null || true update-desktop-database -q 2>/dev/null || true # The user preset enables ryotunesd.socket for new user managers; a user @@ -9,9 +19,6 @@ post_install() { systemctl --user -M "$uid@" daemon-reload 2>/dev/null || true systemctl --user -M "$uid@" enable --now ryotunesd.socket 2>/dev/null || true done -} -post_upgrade() { - post_install # Never restart the running app or daemon inside the pacman transaction. A # self-update runs this very upgrade over its own RPC to ryotunesd; restarting # the daemon here would kill that RPC before it can reply (and could deadlock, @@ -21,8 +28,18 @@ post_upgrade() { # starts the new binary. (Closing the window is not enough; the daemon and # client must be quit and reopened to load the update.) } +pre_remove() { + # Stop while the unit files still exist. Removing them first lets a running + # user manager retain an unusable socket and daemon across a reinstall. + for uid in $(loginctl list-users --no-legend 2>/dev/null | awk '{print $1}'); do + systemctl --user -M "$uid@" stop ryotunesd.socket ryotunesd.service 2>/dev/null || true + done +} post_remove() { gtk-update-icon-cache -q -t -f usr/share/icons/hicolor 2>/dev/null || true update-desktop-database -q 2>/dev/null || true systemctl --global disable ryotunesd.socket 2>/dev/null || true + for uid in $(loginctl list-users --no-legend 2>/dev/null | awk '{print $1}'); do + systemctl --user -M "$uid@" daemon-reload 2>/dev/null || true + done } diff --git a/packaging/linux/dev.ryoku.ryotunes.metainfo.xml b/packaging/linux/dev.ryoku.ryotunes.metainfo.xml index f5a3da0..ae176fe 100644 --- a/packaging/linux/dev.ryoku.ryotunes.metainfo.xml +++ b/packaging/linux/dev.ryoku.ryotunes.metainfo.xml @@ -2,11 +2,12 @@ dev.ryoku.ryotunes Ryotunes - A Ryoku-oriented desktop music client + Ryoku's main music app CC0-1.0 GPL-3.0-or-later -

Ryotunes combines YouTube Music browsing, local music, mpv playback, queue management, lyrics, MPRIS, Discord rich presence, Last.fm, and Ryoku palette integration in one desktop application.

+

Discover, stream, and enjoy your music collection with Ryotunes, Ryoku's main music app. Browse YouTube Music, play local tracks, build playlists, and pick up where you left off with personal recommendations and listening history.

+

A native interface brings together lyrics, downloads, queue management, desktop media controls, and Ryoku's colours in one place.

 ryotunes.desktop ryotunes diff --git a/packaging/linux/ryotunes.desktop b/packaging/linux/ryotunes.desktop index 3115c6c..8560c1c 100644 --- a/packaging/linux/ryotunes.desktop +++ b/packaging/linux/ryotunes.desktop @@ -2,7 +2,7 @@ Type=Application Name=Ryotunes GenericName=Music Player -Comment=Ryoku-oriented desktop music client +Comment=Ryoku's main music app — discover, stream, and enjoy your music collection Exec=ryotunes Icon=ryotunes Terminal=false From 767cc5311eac58fa3e5073bfaf9a05be8be3bda6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 8 Sep 2026 21:26:44 +0000 Subject: [PATCH 148/183] release: v1.0.6 --- CHANGELOG.md | 2 ++ Cargo.lock | 22 +++++++++---------- Cargo.toml | 2 +- client/version | 2 +- packaging/arch/PKGBUILD | 2 +- .../linux/dev.ryoku.ryotunes.metainfo.xml | 2 +- src-tauri/tauri.conf.json | 2 +- ui/package.json | 2 +- 8 files changed, 19 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ce907c..3300c2a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +## v1.0.6 - 2026-09-08 + - Fixed app-launcher activation after removing and reinstalling Ryotunes: removal now stops the user units before deleting them, and a fresh install repairs stale socket state left by older packages. Ordinary upgrades still leave playback and self-update RPCs running. - Presented Ryotunes consistently as Ryoku's main music app in pacman, the app launcher, and software catalogues. diff --git a/Cargo.lock b/Cargo.lock index 18cbe48..daa7bec 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2438,7 +2438,7 @@ dependencies = [ [[package]] name = "innertube" -version = "1.0.5" +version = "1.0.6" dependencies = [ "hex", "reqwest 0.12.28", @@ -2943,7 +2943,7 @@ checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" [[package]] name = "listen-protocol" -version = "1.0.5" +version = "1.0.6" dependencies = [ "serde", "serde_json", @@ -3788,7 +3788,7 @@ checksum = "f6b464fbc74e149a392436b17d523f769e057cb6877f6a5c4618bc6f11800548" [[package]] name = "player" -version = "1.0.5" +version = "1.0.6" dependencies = [ "libc", "libmpv2", @@ -4703,7 +4703,7 @@ dependencies = [ [[package]] name = "ryotunes" -version = "1.0.5" +version = "1.0.6" dependencies = [ "anyhow", "async-trait", @@ -4733,7 +4733,7 @@ dependencies = [ [[package]] name = "ryotunes-cli" -version = "1.0.5" +version = "1.0.6" dependencies = [ "ryotunes-protocol", "serde", @@ -4742,7 +4742,7 @@ dependencies = [ [[package]] name = "ryotunes-core" -version = "1.0.5" +version = "1.0.6" dependencies = [ "anyhow", "async-trait", @@ -4778,7 +4778,7 @@ dependencies = [ [[package]] name = "ryotunes-protocol" -version = "1.0.5" +version = "1.0.6" dependencies = [ "serde", "serde_json", @@ -4786,7 +4786,7 @@ dependencies = [ [[package]] name = "ryotunes-soundcloud" -version = "1.0.5" +version = "1.0.6" dependencies = [ "regex", "reqwest 0.12.28", @@ -4799,7 +4799,7 @@ dependencies = [ [[package]] name = "ryotunes-spotify" -version = "1.0.5" +version = "1.0.6" dependencies = [ "anyhow", "bytes", @@ -4822,7 +4822,7 @@ dependencies = [ [[package]] name = "ryotunesd" -version = "1.0.5" +version = "1.0.6" dependencies = [ "anyhow", "async-trait", @@ -5585,7 +5585,7 @@ dependencies = [ [[package]] name = "sync-server" -version = "1.0.5" +version = "1.0.6" dependencies = [ "futures-util", "listen-protocol", diff --git a/Cargo.toml b/Cargo.toml index 351ab7b..157e6ff 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ members = [ ] [workspace.package] -version = "1.0.5" +version = "1.0.6" edition = "2021" license = "GPL-3.0-or-later" diff --git a/client/version b/client/version index 90a27f9..af0b7dd 100644 --- a/client/version +++ b/client/version @@ -1 +1 @@ -1.0.5 +1.0.6 diff --git a/packaging/arch/PKGBUILD b/packaging/arch/PKGBUILD index 38c8092..aa7fd9b 100644 --- a/packaging/arch/PKGBUILD +++ b/packaging/arch/PKGBUILD @@ -2,7 +2,7 @@ # Run from packaging/arch with: makepkg -si pkgname=ryotunes -pkgver=1.0.5 +pkgver=1.0.6 pkgrel=1 # epoch=1 is permanent: the v1 reset publishes 1:X.Y.Z, which pacman ranks above # the legacy 2.x line an existing machine may carry, so `pacman -U` still upgrades. diff --git a/packaging/linux/dev.ryoku.ryotunes.metainfo.xml b/packaging/linux/dev.ryoku.ryotunes.metainfo.xml index ae176fe..3809559 100644 --- a/packaging/linux/dev.ryoku.ryotunes.metainfo.xml +++ b/packaging/linux/dev.ryoku.ryotunes.metainfo.xml @@ -12,5 +12,5 @@ ryotunes.desktop ryotunes AudioVideoAudio - + diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index acbdb40..ee43c1a 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "https://schema.tauri.app/config/2", "productName": "Ryotunes", - "version": "1.0.5", + "version": "1.0.6", "identifier": "dev.ryoku.ryotunes", "build": { "frontendDist": "../ui/build", diff --git a/ui/package.json b/ui/package.json index 7800686..c87b797 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,7 +1,7 @@ { "name": "ui", "private": true, - "version": "1.0.5", + "version": "1.0.6", "type": "module", "scripts": { "dev": "vite dev", From 32f564eb3af5b0419a37e7717ee7c9e5783ed4f9 Mon Sep 17 00:00:00 2001 From: carlos Date: Sat, 19 Sep 2026 20:52:46 -0400 Subject: [PATCH 149/183] fix: land the page enter state under reduce motion The page-stack enter animation is a ParallelAnimation of OpacityAnimator and YAnimator, both timed by Tokens.durFastEffects. That token zeroes under Ryoku's Reduce motion, and a render-thread Animator with duration 0 never applies its `to` value -- so pageStack was left at its `from` opacity 0 on every route change and on first load, blanking every page while the sidebar, player and daemon kept working. Route the three enter call sites through a reenter() that sets the end state directly when the duration is 0, and restarts the animation otherwise. Closes #193 --- CHANGELOG.md | 2 ++ client/App.qml | 20 +++++++++++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3300c2a..5d677da 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +- Fixed every page rendering blank under Ryoku's Reduce motion: the page-stack enter animation used render-thread Animators, which never apply their end value at duration 0, so the stack was stranded at opacity 0. The end state now lands directly when there is no animation to run. + ## v1.0.6 - 2026-09-08 - Fixed app-launcher activation after removing and reinstalling Ryotunes: removal now stops the user units before deleting them, and a fresh install repairs stale socket state left by older packages. Ordinary upgrades still leave playback and self-update RPCs running. diff --git a/client/App.qml b/client/App.qml index 9df59b6..02db6cd 100644 --- a/client/App.qml +++ b/client/App.qml @@ -201,14 +201,28 @@ Item { OpacityAnimator { target: pageStack; from: 0; to: 1; duration: Tokens.durFastEffects; easing.type: Easing.OutCubic } YAnimator { target: pageStack; from: Style.sp(2); to: 0; duration: Tokens.durFastEffects; easing.type: Easing.OutCubic } } - onPageChanged: enter.restart() - Component.onCompleted: enter.start() + // A render-thread Animator with duration 0 never applies + // its `to`, so under Reduce motion (which zeroes the + // shared token) the page stack would be stranded at + // opacity 0 -- a blank page on every route. Land the end + // state directly when there is no animation to run. + function reenter() { + if (Tokens.durFastEffects > 0) { + enter.restart(); + } else { + enter.stop(); + pageStack.opacity = 1; + pageStack.y = 0; + } + } + onPageChanged: reenter() + Component.onCompleted: reenter() // A provider switch swaps the catalogue under every page (a YouTube // library is not a Spotify one), so the content re-enters the way a // route change does while the room's light tweens to the new colour. Connections { target: Playback - function onProviderChanged(): void { enter.restart(); } + function onProviderChanged(): void { pageStack.reenter(); } } } } From a8ab3d69c04066756f5b1b5f7bdccabc92a45681 Mon Sep 17 00:00:00 2001 From: carlos Date: Sat, 19 Sep 2026 20:57:11 -0400 Subject: [PATCH 150/183] fix: stop the now-playing cover re-polishing on resize The art column sized its cover with `artPx: min(width, body.height - 30)`, reading the column's own assigned `width` and the body RowLayout's assigned `height` -- both layout *outputs* -- and fed them into the Artwork's Layout.preferredWidth/Height and the title block's Layout.maximumWidth, which are layout *inputs*. Every layout pass therefore re-polished the child inside its own updatePolish, the `ColumnLayout called polish() inside updatePolish()` loop that stuttered window moves and resizes. Size the cover from layout inputs instead: the root's width/height and the header row's implicit height. The expression expands body.height to exactly what it resolved to before, so the cover is pixel-for-pixel the same at any size -- it just no longer reads the layout's own output back into it. Closes #196 --- CHANGELOG.md | 2 ++ client/chrome/NowPlaying.qml | 13 ++++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d677da..bca0b11 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +- Stopped Now Playing stuttering while the window is resized or scaled: the cover size read the column's assigned width and the body's assigned height, feeding layout outputs back into the children's preferred sizes, so the column re-polished itself on every pass. The cover now sizes from the root and the header's implicit height, which are layout inputs. + - Fixed every page rendering blank under Ryoku's Reduce motion: the page-stack enter animation used render-thread Animators, which never apply their end value at duration 0, so the stack was stranded at opacity 0. The end state now lands directly when there is no animation to run. ## v1.0.6 - 2026-09-08 diff --git a/client/chrome/NowPlaying.qml b/client/chrome/NowPlaying.qml index 68d84cd..d6265b8 100644 --- a/client/chrome/NowPlaying.qml +++ b/client/chrome/NowPlaying.qml @@ -86,6 +86,7 @@ Item { // ── header: eyebrow left, the Collapse pill right (in flow, so nothing sits under it) ── RowLayout { + id: headRow Layout.fillWidth: true spacing: Style.sp(4) Text { @@ -141,12 +142,18 @@ Item { id: artCol Layout.fillHeight: true Layout.fillWidth: false - Layout.preferredWidth: Math.min(Style.sp(110), Math.round(root.width * 0.34)) + readonly property int colW: Math.min(Style.sp(110), Math.round(root.width * 0.34)) + Layout.preferredWidth: colW spacing: Style.sp(5) // The cover is as wide as the column unless the height says otherwise: the title - // block (~3 lines) must always fit beneath it. + // block (~3 lines) must always fit beneath it. The size comes from the root and + // the header's implicit height -- layout inputs. Reading this column's assigned + // width or body's assigned height fed layout outputs back into preferredWidth/ + // Height, re-polishing the child inside every updatePolish: the polish() loop + // that stuttered window resizes (#196). readonly property int artPx: Math.max(Style.sp(40), - Math.min(width, body.height - Style.sp(30))) + Math.min(colW, root.height - Style.sp(20) - headRow.implicitHeight + - Style.sp(14) - Style.sp(12) - Style.sp(30))) Artwork { id: bigArt From eb60975a2f9078bafd04fdd8c578e89ad3040656 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 20 Sep 2026 01:30:06 +0000 Subject: [PATCH 151/183] release: v1.0.8 --- CHANGELOG.md | 2 ++ Cargo.lock | 22 +++++++++---------- Cargo.toml | 2 +- client/version | 2 +- packaging/arch/PKGBUILD | 2 +- .../linux/dev.ryoku.ryotunes.metainfo.xml | 2 +- src-tauri/tauri.conf.json | 2 +- ui/package.json | 2 +- 8 files changed, 19 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bca0b11..edf1f83 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +## v1.0.8 - 2026-09-20 + - Stopped Now Playing stuttering while the window is resized or scaled: the cover size read the column's assigned width and the body's assigned height, feeding layout outputs back into the children's preferred sizes, so the column re-polished itself on every pass. The cover now sizes from the root and the header's implicit height, which are layout inputs. - Fixed every page rendering blank under Ryoku's Reduce motion: the page-stack enter animation used render-thread Animators, which never apply their end value at duration 0, so the stack was stranded at opacity 0. The end state now lands directly when there is no animation to run. diff --git a/Cargo.lock b/Cargo.lock index daa7bec..39b3bac 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2438,7 +2438,7 @@ dependencies = [ [[package]] name = "innertube" -version = "1.0.6" +version = "1.0.8" dependencies = [ "hex", "reqwest 0.12.28", @@ -2943,7 +2943,7 @@ checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" [[package]] name = "listen-protocol" -version = "1.0.6" +version = "1.0.8" dependencies = [ "serde", "serde_json", @@ -3788,7 +3788,7 @@ checksum = "f6b464fbc74e149a392436b17d523f769e057cb6877f6a5c4618bc6f11800548" [[package]] name = "player" -version = "1.0.6" +version = "1.0.8" dependencies = [ "libc", "libmpv2", @@ -4703,7 +4703,7 @@ dependencies = [ [[package]] name = "ryotunes" -version = "1.0.6" +version = "1.0.8" dependencies = [ "anyhow", "async-trait", @@ -4733,7 +4733,7 @@ dependencies = [ [[package]] name = "ryotunes-cli" -version = "1.0.6" +version = "1.0.8" dependencies = [ "ryotunes-protocol", "serde", @@ -4742,7 +4742,7 @@ dependencies = [ [[package]] name = "ryotunes-core" -version = "1.0.6" +version = "1.0.8" dependencies = [ "anyhow", "async-trait", @@ -4778,7 +4778,7 @@ dependencies = [ [[package]] name = "ryotunes-protocol" -version = "1.0.6" +version = "1.0.8" dependencies = [ "serde", "serde_json", @@ -4786,7 +4786,7 @@ dependencies = [ [[package]] name = "ryotunes-soundcloud" -version = "1.0.6" +version = "1.0.8" dependencies = [ "regex", "reqwest 0.12.28", @@ -4799,7 +4799,7 @@ dependencies = [ [[package]] name = "ryotunes-spotify" -version = "1.0.6" +version = "1.0.8" dependencies = [ "anyhow", "bytes", @@ -4822,7 +4822,7 @@ dependencies = [ [[package]] name = "ryotunesd" -version = "1.0.6" +version = "1.0.8" dependencies = [ "anyhow", "async-trait", @@ -5585,7 +5585,7 @@ dependencies = [ [[package]] name = "sync-server" -version = "1.0.6" +version = "1.0.8" dependencies = [ "futures-util", "listen-protocol", diff --git a/Cargo.toml b/Cargo.toml index 157e6ff..400d65d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ members = [ ] [workspace.package] -version = "1.0.6" +version = "1.0.8" edition = "2021" license = "GPL-3.0-or-later" diff --git a/client/version b/client/version index af0b7dd..b0f3d96 100644 --- a/client/version +++ b/client/version @@ -1 +1 @@ -1.0.6 +1.0.8 diff --git a/packaging/arch/PKGBUILD b/packaging/arch/PKGBUILD index aa7fd9b..24a237d 100644 --- a/packaging/arch/PKGBUILD +++ b/packaging/arch/PKGBUILD @@ -2,7 +2,7 @@ # Run from packaging/arch with: makepkg -si pkgname=ryotunes -pkgver=1.0.6 +pkgver=1.0.8 pkgrel=1 # epoch=1 is permanent: the v1 reset publishes 1:X.Y.Z, which pacman ranks above # the legacy 2.x line an existing machine may carry, so `pacman -U` still upgrades. diff --git a/packaging/linux/dev.ryoku.ryotunes.metainfo.xml b/packaging/linux/dev.ryoku.ryotunes.metainfo.xml index 3809559..e1ed994 100644 --- a/packaging/linux/dev.ryoku.ryotunes.metainfo.xml +++ b/packaging/linux/dev.ryoku.ryotunes.metainfo.xml @@ -12,5 +12,5 @@ ryotunes.desktop ryotunes AudioVideoAudio - + diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index ee43c1a..6ee815a 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "https://schema.tauri.app/config/2", "productName": "Ryotunes", - "version": "1.0.6", + "version": "1.0.8", "identifier": "dev.ryoku.ryotunes", "build": { "frontendDist": "../ui/build", diff --git a/ui/package.json b/ui/package.json index c87b797..8595bac 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,7 +1,7 @@ { "name": "ui", "private": true, - "version": "1.0.6", + "version": "1.0.8", "type": "module", "scripts": { "dev": "vite dev", From 505796dba7bb0ebd5cf2ff1888be8fd4a947ff56 Mon Sep 17 00:00:00 2001 From: carlos Date: Thu, 24 Sep 2026 12:56:27 -0400 Subject: [PATCH 152/183] fix: self-heal bot-gated YouTube playback and silent Spotify session loss; feat: batch collection downloads with smart dedup YouTube: the anonymous fallback clients now require a valid visitorData, and the daemon's single non-retrying startup bootstrap left users whose first fetch failed permanently bot-gated ('Skipped (unavailable)' on every track). The bootstrap now retries with backoff, a gated resolve surfaces as ResolveError::BotGated, and AppState re-bootstraps a fresh visitorData on the spot (5-min cooldown, persisted) and retries once. Spotify (Premium users saw a sign-in gate every launch and every track skipped as unavailable): the startup restore is now announced via spotify-auth restored/restore_failed instead of finishing silently after the client snapshot; an invalidated librespot session is detected (alive() was dead code) and recovered once per credential lifetime under a lock that serializes it against the startup restore; a sign-in-required failure stops the queue with the real reason instead of toast-storming skips; and the Spotify device id is persisted per installation instead of re-randomising every launch. Downloads: playlists get a Download playlist menu item (parity with albums); albums and playlists admit through one enqueue_collection RPC that gathers every continuation page and dedups the whole collection in a single folder pass. Smart dedup (FolderIndex) skips audio already on disk under the exact stem, a collision suffix, or the same normalized 'artist title' from a different upload id, for single tracks too. --- CHANGELOG.md | 5 + Cargo.lock | 1 + client/Downloads.qml | 98 ++++--- client/lib/playback.js | 16 ++ client/pages/PlaylistPage.qml | 3 + client/tests/tst_playback.qml | 15 + crates/core/src/orchestrator.rs | 25 +- crates/core/src/spotify.rs | 90 +++++- crates/core/src/state.rs | 75 ++++- crates/innertube/src/models/player.rs | 28 ++ crates/ryotunesd/src/app.rs | 36 ++- crates/ryotunesd/src/downloads.rs | 386 ++++++++++++++++++++++++-- crates/ryotunesd/src/main.rs | 24 +- crates/ryotunesd/src/methods.rs | 4 + crates/spotify/Cargo.toml | 1 + crates/spotify/src/auth.rs | 52 +++- crates/spotify/src/credentials.rs | 3 + 17 files changed, 780 insertions(+), 82 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index edf1f83..cda47c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ ## Unreleased +- Fixed some users being unable to play any YouTube track ("Skipped (unavailable)" on everything): YouTube's anonymous playback clients now require a valid `visitorData`, and a failed first fetch used to leave the daemon without one for its whole life, so every stream request hit Google's bot gate. The startup bootstrap retries with backoff, and a resolve that is rejected by the bot gate now fetches a fresh `visitorData` on the spot and retries once. +- Fixed Spotify Premium users seeing "sign in" on every launch and every track skipped as "not available": the cached session is announced to clients once it restores (it used to finish silently after the UI snapshot, leaving the gate up), the sign-in gate explains a genuinely dead session instead of demanding a fresh login, a dead librespot session is detected and (once per credential lifetime) recovered from saved credentials before a track is reported as needing sign-in, a Spotify queue that needs sign-in now stops with the real reason instead of toast-storming "Skipped (unavailable)", and the Spotify device identity is persisted per installation instead of re-randomising on every launch. +- Added Download playlist to the playlist page menu: albums and playlists batch-download through one daemon call that gathers every continuation page and admits the whole collection against a single dedup pass. +- Downloaded tracks are now smart-deduplicated: re-downloading a collection (or a single track) skips audio already in the download folder even when it lives there under a different upload's id or a ` (N)` collision name, matching on the normalized "artist title" as well as the exact filename. + ## v1.0.8 - 2026-09-20 - Stopped Now Playing stuttering while the window is resized or scaled: the cover size read the column's assigned width and the body's assigned height, feeding layout outputs back into the children's preferred sizes, so the column re-polished itself on every pass. The cover now sizes from the root and the header's implicit height, which are layout inputs. diff --git a/Cargo.lock b/Cargo.lock index 39b3bac..9bcadcb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4817,6 +4817,7 @@ dependencies = [ "serde_json", "tokio", "url", + "uuid 1.25.0", "vergen", ] diff --git a/client/Downloads.qml b/client/Downloads.qml index 6e5440e..e6017f1 100644 --- a/client/Downloads.qml +++ b/client/Downloads.qml @@ -140,66 +140,82 @@ Singleton { }); } - // Gather the complete album before admission, then use the same bounded queue as single - // downloads. This singleton owns the operation so navigating away cannot interrupt it. - function enqueueAlbum(album) { - if (!album || root.addingAlbum) + // --- collections (albums + playlists) ---------------------------------------------------- + // The batch endpoint owns smart dedup: it checks the whole collection against the download + // folder in one pass (exact name, collision suffix, or the same normalized "artist title" + // from a different upload) and against the queue, so re-downloading an album you half own + // adds only the missing tracks and the toast can say exactly what happened. + function toEntry(song, fallbackArtist, fallbackThumb) { + return { + videoId: song.video_id, + title: song.title, + artists: song.artists || fallbackArtist || "", + thumbnail: song.thumbnail || fallbackThumb || "" + }; + } + + // Post a gathered list of page rows (snake_case SongItems) as one batch. `label` names the + // collection in the progress/failure toasts. This singleton owns the operation, so + // navigating away cannot interrupt it. + function enqueueCollection(songs, label) { + var entries = []; + for (var i = 0; i < songs.length; i++) + entries.push(root.toEntry(songs[i], "", "")); + Playback.toast("Preparing " + label + " downloads\u2026", "info"); + return Daemon.call("enqueue_collection", { entries: entries }).then((res) => { + var parts = []; + var added = res && res.added ? res.added : 0; + if (added) + parts.push(added + (added === 1 ? " track added" : " tracks added")); + if (res && res.alreadyDownloaded) + parts.push(res.alreadyDownloaded + " already saved"); + if (res && res.skipped) + parts.push(res.skipped + " unavailable"); + Playback.toast(parts.length ? parts.join(" \u00b7 ") : "Nothing new to download", + added ? "success" : "info"); + return res; + }); + } + + // Gather the complete album/playlist (every continuation page) before admission so the + // daemon dedups the whole collection, not just the part the UI had loaded. + function enqueueCollectionFromPage(page, label) { + if (!page || root.addingAlbum) return; root.addingAlbum = true; var tokens = Object.create(null); - var seen = Object.create(null); - var tracks = (album.items || []).slice(); - var accepted = 0; - var skipped = 0; - Playback.toast("Preparing album downloads…", "info"); + var tracks = (page.items || []).slice(); function collect(token) { if (!token) return Promise.resolve(); if (tokens[token]) - return Promise.reject(new Error("Album pagination repeated; no downloads were added.")); + return Promise.reject(new Error("Pagination repeated; no downloads were added.")); tokens[token] = true; return Daemon.call("get_playlist_more", { token: token }).then((more) => { tracks = tracks.concat(more.items || []); return collect(more.continuation); }); } - function admit(index) { - while (index < tracks.length) { - var song = tracks[index++]; - var track = { - videoId: song.video_id, - title: song.title, - artists: song.artists || album.artist, - thumbnail: song.thumbnail || album.thumbnail - }; - if (seen[track.videoId]) - continue; - seen[track.videoId] = true; - if (!root.canDownload(track)) { - skipped++; - continue; - } - return root.enqueueRequest(track).then(() => { - accepted++; - return admit(index); - }); - } - return Promise.resolve(); - } - return collect(album.continuation).then(() => admit(0)).then(() => { - root.addingAlbum = false; - var message = accepted + (accepted === 1 ? " track in Downloads" : " tracks in Downloads"); - if (skipped) - message += " · " + skipped + " unavailable"; - Playback.toast(message, accepted ? "success" : "info"); + return collect(page.continuation).then(() => { + // Rows carry their own artist line on playlist pages; album pages may not, so fall + // back to the page's artist, then its cover, exactly as the old per-track path did. + var entries = []; + for (var i = 0; i < tracks.length; i++) + entries.push(root.toEntry(tracks[i], page.artist, page.thumbnail)); + return root.enqueueCollection(entries, label); }).catch((e) => { + Playback.toast(((e && e.message) ? e.message : "Could not download " + label), "error"); + }).then((res) => { root.addingAlbum = false; - Playback.toast(accepted + " tracks in Downloads · " - + ((e && e.message) ? e.message : "Could not download album"), "error"); + return res; }); } + function enqueueAlbum(album) { + return root.enqueueCollectionFromPage(album, "album"); + } + // Save the given track (a Playback.now-shaped object). Immediate: a toast confirms or surfaces // the daemon's error, and the queue updates through the downloads-changed event. A track that // cannot be downloaded is reported rather than sent. diff --git a/client/lib/playback.js b/client/lib/playback.js index 77bd424..3903fb8 100644 --- a/client/lib/playback.js +++ b/client/lib/playback.js @@ -108,6 +108,22 @@ function applyEvent(s, name, data) { flow: "", error: "" }; return { toast: "Signed in to Spotify" + ((data && data.name) ? (" as " + data.name) : ""), kind: "success" }; } + if (st === "restored") { + // The startup restore finished after this client's opening snapshot was taken -- + // the fix for the sign-in gate that reappeared on every launch. Restore is gated + // on Premium, so premium is known true; the display name arrives with a snapshot. + s.spotify = { signedIn: true, stored: true, + name: (s.spotify && s.spotify.name) ? s.spotify.name : null, + premium: true, flow: "", error: "" }; + return null; + } + if (st === "restore_failed") { + // Credentials are on disk but the cached session is dead: keep the reason on the + // gate instead of silently demanding a fresh sign-in. + var why = (data && data.message) ? data.message : "Spotify sign-in no longer works"; + s.spotify = Object.assign({}, s.spotify, { signedIn: false, stored: true, error: why }); + return null; + } if (st === "signed_out") { s.spotify = { signedIn: false, stored: false, name: null, premium: null }; return null; diff --git a/client/pages/PlaylistPage.qml b/client/pages/PlaylistPage.qml index 1e08666..0744777 100644 --- a/client/pages/PlaylistPage.qml +++ b/client/pages/PlaylistPage.qml @@ -283,6 +283,9 @@ Item { var out = []; out.push({ icon: "arrow-up", label: "Play next", danger: false, act: () => page.queuePlaylist(true) }); out.push({ icon: "queue", label: "Add to queue", danger: false, act: () => page.queuePlaylist(false) }); + if (!page.isLocal && page.pl && page.pl.items && page.pl.items.length) + out.push({ icon: "download", label: Downloads.addingAlbum ? "Adding playlist\u2026" : "Download playlist", + danger: false, act: () => Downloads.enqueueCollectionFromPage(page.pl, "playlist") }); if (!page.isSmart && !page.isLocal) out.push({ icon: "radio", label: "Start radio", danger: false, act: () => page.radio() }); if (page.owned) { diff --git a/client/tests/tst_playback.qml b/client/tests/tst_playback.qml index 9e5be15..b2d0776 100644 --- a/client/tests/tst_playback.qml +++ b/client/tests/tst_playback.qml @@ -74,4 +74,19 @@ TestCase { PB.applyEvent(s, "volume", 90); compare(s.volume, 42); // echo ignored mid-drag } + + // A late startup restore (the snapshot said signedIn:false) must clear the sign-in gate. + function test_spotify_restore_announcement_signs_the_client_in() { + var s = freshState(); + s.spotify = { signedIn: false, stored: true, name: null, premium: null }; + compare(PB.applyEvent(s, "spotify-auth", { state: "restored" }), null); + compare(s.spotify.signedIn, true); + compare(s.spotify.stored, true); + compare(s.spotify.premium, true); + // A dead cached session says why instead of silently demanding a sign-in. + PB.applyEvent(s, "spotify-auth", { state: "restore_failed", message: "bad credentials" }); + compare(s.spotify.signedIn, false); + compare(s.spotify.stored, true); + compare(s.spotify.error, "bad credentials"); + } } diff --git a/crates/core/src/orchestrator.rs b/crates/core/src/orchestrator.rs index 7ec8198..88e7fc1 100644 --- a/crates/core/src/orchestrator.rs +++ b/crates/core/src/orchestrator.rs @@ -61,6 +61,12 @@ pub struct PlaybackPing { pub enum ResolveError { #[error("no client could resolve a playable stream for {0}")] AllClientsFailed(String), + /// Like [`Self::AllClientsFailed`], but at least one client answered with YouTube's + /// "confirm you're not a bot" gate — the session has no (fresh) `visitorData`. Not terminal: + /// `AppState::resolve` re-bootstraps the visitorData and retries once. Never surfaces to a + /// user: the caller maps a second failure back to `AllClientsFailed`. + #[error("YouTube's bot gate rejected every playback client for {0}")] + BotGated(String), #[error("this upload could not be played. Try signing in to YouTube Music again ({0})")] UploadUnavailable(String), /// A provider stream needs the user signed in first. The message is user-facing (the daemon @@ -204,6 +210,12 @@ impl Orchestrator { // 4. Fallback loop. idx == -1 reuses the main response; 0.. are the fallback clients. let mut best: Option = None; let last_idx = order.len() as isize - 1; + // Set when any client answers the chain with the anti-bot gate. A gated chain is not a + // genuinely unplayable video: it means our anonymous session identity is missing or stale, + // which the caller can repair (fresh visitorData) and retry. + let mut bot_gated = main_resp + .as_ref() + .is_some_and(|r| !r.playability_status.is_ok() && r.playability_status.is_bot_gate()); for idx in -1..=last_idx { let (key, resp): (String, PlayerResponse) = if idx == -1 { @@ -231,6 +243,9 @@ impl Orchestrator { Ok(r) if r.playability_status.is_ok() => (key.to_owned(), r), Ok(r) => { tracing::debug!(client = key, status = %r.playability_status.status, "not OK"); + if !bot_gated && r.playability_status.is_bot_gate() { + bot_gated = true; + } continue; } Err(e) => { @@ -372,7 +387,15 @@ impl Orchestrator { }), Err(e) => { tracing::error!(video_id, error = %e, "rustypipe fallback failed"); - Err(ResolveError::AllClientsFailed(video_id.to_owned())) + // Surface WHY the chain died when the reason is repairable: every InnerTube + // client answered the anti-bot gate and rustypipe found nothing either — our + // anonymous session identity (visitorData) is missing or stale, and the caller + // can bootstrap a fresh one and retry. + if bot_gated { + Err(ResolveError::BotGated(video_id.to_owned())) + } else { + Err(ResolveError::AllClientsFailed(video_id.to_owned())) + } } } } diff --git a/crates/core/src/spotify.rs b/crates/core/src/spotify.rs index f9dc669..0de23a6 100644 --- a/crates/core/src/spotify.rs +++ b/crates/core/src/spotify.rs @@ -90,6 +90,12 @@ pub fn sc_system_id(id: &str) -> Option<&str> { pub struct SpotifyState { provider: SpotifyProvider, client: RwLock>>, + /// The one on-demand session recovery this process is allowed (see `client_or_recover`). + /// Reset by a fresh sign-in or sign-out, which start a new credential lifetime. + recovery_used: std::sync::atomic::AtomicBool, + /// Serialises session restores so an on-demand recovery never runs a second librespot + /// connect against the same cached credentials while the startup restore is mid-flight. + recover_lock: tokio::sync::Mutex<()>, selected: parking_lot::RwLock, } @@ -98,6 +104,8 @@ impl SpotifyState { Self { provider: SpotifyProvider::new(data_dir), client: RwLock::new(None), + recovery_used: std::sync::atomic::AtomicBool::new(false), + recover_lock: tokio::sync::Mutex::new(()), selected: parking_lot::RwLock::new(selected), } } @@ -128,18 +136,86 @@ impl SpotifyState { self.provider.stored() } - /// Whether a client is currently signed in. + /// Whether a usable client exists. A session librespot invalidated (network drop, Spotify + /// killed it server-side) is *not* usable: it is dropped here so a later `restore`/ + /// `client_or_recover` sees the truth and announces the sign-out to the daemon's event sink. pub async fn status(&self) -> bool { - self.client.read().await.is_some() + self.live_client().await.is_some() } - /// The signed-in client, cloned out for use without holding the lock. + /// The signed-in client, cloned out for use without holding the lock. A dead session reads as + /// signed out (and is dropped), so callers never hand a doomed client to librespot. pub async fn client(&self) -> Option> { - self.client.read().await.clone() + self.live_client().await } - /// Restore a client from cached credentials. Returns whether one was restored. + /// A session that is both present and still connected; drops (and logs) one that died. + async fn live_client(&self) -> Option> { + let live = { + let guard = self.client.read().await; + match guard.as_ref() { + Some(c) if c.alive() => Some(Arc::clone(c)), + Some(_) => None, + None => return None, + } + }; + if live.is_none() { + // Drops a session librespot invalidated; `restore_locked` serialises actual + // (re)connects so this never races a connect in flight. + let dead = self.client.write().await.take(); + if dead.is_some() { + tracing::warn!("spotify: the session was invalidated; treating as signed out"); + } + } + live + } + + /// The client for playback/browsing, recovering a dead or missing one from the saved + /// credentials the first time this process needs it. This is the fix for "every song is + /// skipped as unavailable, and it asks me to sign in every time I open it": a startup + /// restore that raced with server bind, or a session that died mid-life, used to leave the + /// daemon permanently signed-out for that run. Recovery is attempted exactly once per + /// credential lifetime so a genuinely dead credential pair cannot stall every track start. + pub async fn client_or_recover(&self) -> Option> { + if let Some(client) = self.live_client().await { + return Some(client); + } + if !self.provider.stored() + || self + .recovery_used + .swap(true, std::sync::atomic::Ordering::Relaxed) + { + return None; + } + // `restore` serializes against the startup restore itself. + match self.restore().await { + Ok(true) => { + tracing::info!("spotify: recovered the cached session on demand"); + self.live_client().await + } + Ok(false) => None, + Err(e) => { + tracing::warn!(error = %e, "spotify: on-demand session recovery failed"); + None + } + } + } + + /// Restore a client from cached credentials. Returns whether one was restored (or was + /// already live). Serialized on `recover_lock`: a startup restore still connecting and an + /// on-demand recovery racing over one credential cache is how a good session gets + /// invalidated — and under the lock the restore we waited for may already have landed, in + /// which case this simply returns true. pub async fn restore(&self) -> Result { + let _guard = self.recover_lock.lock().await; + self.restore_locked().await + } + + /// The caller holds `recover_lock`. + async fn restore_locked(&self) -> Result { + if self.live_client().await.is_some() { + return Ok(true); + } match self.provider.restore().await? { Some(client) => { *self.client.write().await = Some(Arc::new(client)); @@ -150,13 +226,14 @@ impl SpotifyState { } /// Run the OAuth flow. `on_url` receives the authorization URL to hand to the client; on success - /// the resulting client is stored. + /// the resulting client is stored, and a fresh credential lifetime arms recovery again. pub async fn sign_in(&self, on_url: F) -> Result<()> where F: FnOnce(String) + Send + 'static, { let client = self.provider.sign_in(on_url).await?; *self.client.write().await = Some(Arc::new(client)); + self.recovery_used.store(false, std::sync::atomic::Ordering::Relaxed); Ok(()) } @@ -164,5 +241,6 @@ impl SpotifyState { pub async fn sign_out(&self) { self.provider.sign_out(); *self.client.write().await = None; + self.recovery_used.store(false, std::sync::atomic::Ordering::Relaxed); } } diff --git a/crates/core/src/state.rs b/crates/core/src/state.rs index d38e6a8..78f8efa 100644 --- a/crates/core/src/state.rs +++ b/crates/core/src/state.rs @@ -165,6 +165,9 @@ pub struct AppState { /// now-playing snapshot can render the meta line without another round-trip. Bounded in /// `remember_sc_meta`. sc_meta: parking_lot::Mutex>, + /// Unix secs of the last on-demand visitorData (re)bootstrap attempt, so a failing session + /// retries on a cooldown instead of hammering sw.js_data on every skipped track. + last_visitor_try: AtomicU64, } /// One live Spotify stream held on [`AppState`]: the cheap transport handle the daemon seeks @@ -444,6 +447,7 @@ impl AppState { spotify, soundcloud, sc_meta: parking_lot::Mutex::new(std::collections::HashMap::new()), + last_visitor_try: AtomicU64::new(0), queue: Mutex::new(QueueState::default()), is_playing: AtomicBool::new(false), generation: AtomicU64::new(0), @@ -894,7 +898,10 @@ impl AppState { // them. Opening the stream starts librespot decoding into the FIFO immediately; mpv is // pointed at that FIFO with the rawaudio demuxer options. if let Some(tid) = crate::spotify::spotify_track_id(video_id) { - let Some(client) = self.spotify.client().await else { + // `client_or_recover` gives a session that died since startup (or a restore that lost + // the race with the first client connecting) exactly one chance to come back from the + // saved credentials before this track is honestly reported as needing sign-in. + let Some(client) = self.spotify.client_or_recover().await else { return Err(ResolveError::SignInRequired( "Sign in to Spotify to play this".to_owned(), )); @@ -1010,10 +1017,33 @@ impl AppState { stream_client: "soundcloud".to_owned(), }); } - let data = self + let data = match self .orchestrator .resolve(video_id, is_upload, self.quality(), &self.disabled_clients()) - .await?; + .await + { + Ok(d) => d, + // Every InnerTube client answered "confirm you're not a bot": the session's + // visitorData is missing or stale (YouTube only honours the anonymous fallback + // clients with one). Fetch a fresh identity — once per cooldown window — and retry + // this resolve exactly once. Without this the one-shot startup bootstrap leaving a + // user unable to play ANY track until a restart was unrepairable. + Err(ResolveError::BotGated(vid)) => { + if self.refresh_visitor_data().await.is_none() { + return Err(ResolveError::AllClientsFailed(vid)); + } + self.orchestrator + .resolve(video_id, is_upload, self.quality(), &self.disabled_clients()) + .await + .map_err(|e| match e { + // The fresh token didn't help (or the IP itself is flagged): report the + // same generic failure users saw before, never the internal variant. + ResolveError::BotGated(v) => ResolveError::AllClientsFailed(v), + other => other, + })? + } + Err(e) => return Err(e), + }; // Never cache rustypipe URLs: googlevideo serves them only for bounded-Range requests, // which mpv doesn't send → LOADING_FAILED(-13). Caching one poisons the videoId for ~6h. if data.stream_client != "rustypipe" && !is_upload { @@ -1034,6 +1064,36 @@ impl AppState { Ok(data) } + /// The on-demand visitorData (re)bootstrap a bot-gated resolve triggers: fetch a fresh + /// anonymous identity from sw.js_data, install it in the shared session, and persist it so + /// the next launch starts with one. Returns `Some(vd)` when a *new* token is in place, + /// `None` when the fetch failed or the cooldown suppressed the attempt — callers then treat + /// the gate as a plain failure rather than hammering Google. + /// + /// Cooldown lives here rather than in the orchestrator's retry because a whole broken queue + /// skips track-per-track: every skip would otherwise pay one sw.js_data round trip. + pub async fn refresh_visitor_data(self: &std::sync::Arc) -> Option { + const RETRY_COOLDOWN_SECS: u64 = 5 * 60; + let now = now_secs().max(0) as u64; + let last = self.last_visitor_try.swap(now, Ordering::Relaxed); + if last != 0 && now.saturating_sub(last) < RETRY_COOLDOWN_SECS { + tracing::debug!("visitorData refresh on cooldown; skipping"); + return None; + } + match self.it.fetch_visitor_data().await { + Ok(vd) => { + tracing::info!("visitorData re-bootstrapped after bot gate"); + self.it.set_visitor_data(Some(vd.clone())); + self.db.set_setting("visitor_data", &vd); + Some(vd) + } + Err(e) => { + tracing::warn!(error = %e, "visitorData refresh failed"); + None + } + } + } + /// Speculatively resolve one stream into the normal latency cache without touching playback. /// The UI calls this only after settled search intent / a short hover, so a subsequent Play can /// skip the /player + PoToken + HEAD waterfall and go straight to mpv. Failures are silent. @@ -1733,6 +1793,15 @@ impl AppState { } } Err(e) => { + // A provider stream that needs the user signed in is not "unavailable": + // skipping past it row-by-row turns a whole Spotify queue into a storm of + // "Skipped (unavailable)" toasts and hides the one action that fixes it. + // Stop the queue on the spot and say what is actually wrong. + if let ResolveError::SignInRequired(message) = &e { + tracing::warn!(video_id = item.video_id, message, "playback needs sign-in"); + self.emit_error(&item.video_id, message); + return false; + } let mut q = self.queue.lock().await; // Deliberately ignores repeat-all: wrapping the unplayable-skip would spin // forever on a queue where nothing resolves. Skips stop at the tail. diff --git a/crates/innertube/src/models/player.rs b/crates/innertube/src/models/player.rs index c080168..086109f 100644 --- a/crates/innertube/src/models/player.rs +++ b/crates/innertube/src/models/player.rs @@ -100,6 +100,17 @@ impl PlayabilityStatus { | "CONTENT_CHECK_REQUIRED" ) } + /// YouTube's anti-bot gate: a `LOGIN_REQUIRED` whose reason asks the (anonymous) client to + /// prove it isn't a bot. Distinct from a genuine age/login gate — it is answered by carrying a + /// valid `visitorData` (or signing in), not by the WEB_CREATOR retry, so the orchestrator + /// treats it as "our session identity is missing/stale" and re-bootstraps it. + pub fn is_bot_gate(&self) -> bool { + self.status == "LOGIN_REQUIRED" + && self.reason.as_deref().is_some_and(|r| { + let r = r.to_ascii_lowercase(); + r.contains("not a bot") || r.contains("confirm you") + }) + } } #[derive(Debug, Clone, Deserialize)] @@ -403,6 +414,23 @@ mod tests { assert_eq!(ugc.is_music_video(), Some(true)); assert_eq!(bare.is_music_video(), None); } + + /// The bot gate must be told from a genuine login/age gate: only the former is answered by + /// a fresh visitorData, and the orchestrator re-bootstraps the session on it. + #[test] + fn bot_gate_is_the_login_required_why_not_a_bot() { + let gate = |status: &str, reason: Option<&str>| PlayabilityStatus { + status: status.into(), + reason: reason.map(Into::into), + }; + assert!(gate("LOGIN_REQUIRED", Some("Sign in to confirm you're not a bot")).is_bot_gate()); + assert!(gate("LOGIN_REQUIRED", Some("Please sign in to confirm you're not a bot")).is_bot_gate()); + // A real login/age gate: nothing to do with visitorData. + assert!(!gate("LOGIN_REQUIRED", Some("This video is unavailable")).is_bot_gate()); + assert!(!gate("LOGIN_REQUIRED", None).is_bot_gate()); + assert!(!gate("UNPLAYABLE", Some("Sign in to confirm you're not a bot")).is_bot_gate()); + assert!(!gate("OK", Some("you're not a bot")).is_bot_gate()); + } } #[derive(Debug, Clone, Deserialize)] diff --git a/crates/ryotunesd/src/app.rs b/crates/ryotunesd/src/app.rs index 69f5dde..3f5a350 100644 --- a/crates/ryotunesd/src/app.rs +++ b/crates/ryotunesd/src/app.rs @@ -184,21 +184,37 @@ pub fn build( }); } - // First-run visitorData bootstrap, off the startup path. + // First-run visitorData bootstrap, off the startup path. A missing visitorData makes every + // anonymous fallback /player request hit YouTube's "confirm you're not a bot" gate, so one + // failed fetch (offline at boot, consent interstitial, transient 5xx) used to leave the daemon + // unable to play *any* track until the next restart. Retry with backoff until it lands. if needs_visitor_bootstrap { let st = app_state.clone(); rt.spawn(async move { - tokio::time::sleep(Duration::from_secs(5)).await; - match st.it.fetch_visitor_data().await { - Ok(vd) => { - st.it.set_visitor_data(Some(vd.clone())); - st.db.set_setting("visitor_data", &vd); - tracing::info!("visitorData bootstrapped (background)"); - } - Err(e) => { - tracing::warn!(error = %e, "visitorData bootstrap failed (continuing)") + const DELAYS: [Duration; 5] = [ + Duration::from_secs(5), + Duration::from_secs(20), + Duration::from_secs(60), + Duration::from_secs(180), + Duration::from_secs(600), + ]; + for (attempt, delay) in DELAYS.iter().enumerate() { + tokio::time::sleep(*delay).await; + match st.it.fetch_visitor_data().await { + Ok(vd) => { + st.it.set_visitor_data(Some(vd.clone())); + st.db.set_setting("visitor_data", &vd); + tracing::info!("visitorData bootstrapped (background)"); + return; + } + Err(e) => tracing::warn!( + attempt = attempt + 1, + error = %e, + "visitorData bootstrap failed; will retry" + ), } } + tracing::warn!("visitorData bootstrap gave up; playback will retry on demand"); }); } diff --git a/crates/ryotunesd/src/downloads.rs b/crates/ryotunesd/src/downloads.rs index 87199d1..6742ee7 100644 --- a/crates/ryotunesd/src/downloads.rs +++ b/crates/ryotunesd/src/downloads.rs @@ -1,6 +1,6 @@ //! Bounded, daemon-owned downloads. Slots live until child processes are reaped, settings are //! frozen when a job is queued, and files are atomically published without replacing existing files. -use std::collections::HashMap; +use std::collections::{HashMap, HashSet}; use std::io::{Read, Write}; use std::path::{Path, PathBuf}; use std::process::Stdio; @@ -161,6 +161,122 @@ fn is_youtube_id(id: &str) -> bool { id.len() == 11 && id.bytes().all(|b| b.is_ascii_alphanumeric() || b == b'-' || b == b'_') } +// --- collection downloads + smart dedup ------------------------------------------------------ + +/// One track a collection (playlist/album) offered for batch download. camelCase on the wire, +/// mirroring the download job's field names so the client sends what it already renders. +#[derive(Clone, Debug, Deserialize)] +pub struct CollectionEntry { + pub video_id: String, + pub title: String, + pub artists: String, + pub thumbnail: String, +} + +/// A snapshot of the download folder's audio files, used to refuse re-downloading a track that +/// is already saved — possibly under a different source id (a reupload, a remaster, or a file +/// named before Ryotunes appended the `[videoId]` tag). Stems map to their paths so a dedup hit +/// can hand the client the file it already owns. +struct FolderIndex { + /// Exact file stems (Ryotunes names always end in ` [videoId]`). + stems: HashMap, + /// The same names, lowercased with non-alphanumerics and the id tag removed: the "smart" + /// half — matching two uploads of the same `Artist - Title` across id changes. + keys: HashMap, + root: PathBuf, +} + +const INDEX_MAX_FILES: usize = 20_000; +const INDEX_MAX_DEPTH: usize = 6; + +impl FolderIndex { + fn build(root: &Path) -> FolderIndex { + let mut index = + FolderIndex { stems: HashMap::new(), keys: HashMap::new(), root: root.to_path_buf() }; + index.walk(root, 0); + index + } + + fn walk(&mut self, dir: &Path, depth: usize) { + if depth > INDEX_MAX_DEPTH || self.stems.len() >= INDEX_MAX_FILES { + return; + } + let Ok(entries) = std::fs::read_dir(dir) else { return }; + for entry in entries.flatten() { + if self.stems.len() >= INDEX_MAX_FILES { + return; + } + // Skip our own staging dir, and never descend a symlink: `file_type` here does not + // follow links, so links surface as neither file nor dir and are simply ignored. + if entry.file_name().to_str().is_some_and(|n| n.starts_with(STAGING_DIR)) { + continue; + } + let Ok(file_type) = entry.file_type() else { continue }; + if file_type.is_dir() { + self.walk(&entry.path(), depth + 1); + } else if file_type.is_file() { + let name = entry.file_name(); + let Some(stem) = Path::new(&*name).file_stem().and_then(|s| s.to_str()) else { + continue; + }; + let stem = stem.to_owned(); + let path = entry.path(); + self.stems.insert(stem.clone(), path.clone()); + self.keys.entry(normalize_key(strip_id_tag(&stem))).or_insert(path); + } + } + } + + /// The saved file for a candidate (title/artist/source id, named by the same rules `publish` + /// uses), if one exists: exact stem, any ` (N)` collision suffix, or the same normalized + /// "artist title" key under a different id. Paths are resolved against the folder root so + /// callers can report them directly. + fn find(&self, settings: &DownloadSettings, entry: &CollectionEntry) -> Option { + let base = if settings.organize_by_artist || entry.artists.trim().is_empty() { + entry.title.clone() + } else { + format!("{} - {}", entry.artists.trim(), entry.title.trim()) + }; + let name = sanitize_component(&base); + let stem = format!("{name} [{}]", sanitize_component(&entry.video_id)); + if let Some(path) = self.stems.get(&stem) { + return Some(self.relativize(path)); + } + for suffix in 1..=50u32 { + if let Some(path) = self.stems.get(&format!("{stem} ({suffix})")) { + return Some(self.relativize(path)); + } + } + let key = normalize_key(strip_id_tag(&stem)); + if key.is_empty() { + return None; + } + self.keys.get(&key).map(|path| self.relativize(path)) + } + + fn relativize(&self, path: &Path) -> PathBuf { + path.strip_prefix(&self.root).unwrap_or(path).to_path_buf() + } +} + +/// The trailing `[videoId]` tag Ryotunes appends to every published name, if present. +fn strip_id_tag(stem: &str) -> &str { + match stem.rfind(" [") { + Some(open) if stem.ends_with(']') && open + 2 < stem.len() => &stem[..open], + _ => stem, + } +} + +/// Lowercase alphanumeric only: the collision course for "Artist - Title", "artist–title", and a +/// name re-sanitized through a different character set. +fn normalize_key(input: &str) -> String { + input + .chars() + .filter(|c| c.is_alphanumeric()) + .flat_map(char::to_lowercase) + .collect() +} + struct Running { cancel: Arc, } @@ -264,22 +380,39 @@ impl Downloads { return Ok(job.clone()); } ensure_capacity(&state)?; - let job = DownloadJob { - id: self.inner.next_id(), - video_id, - title, - artists, - thumbnail, - status: DownloadStatus::Queued, - progress: 0, - file_path: None, - error: None, - source: source.label().into(), - created_at: now_secs(), - finished_at: None, - settings: state.settings.clone(), - warnings: Vec::new(), - }; + // Smart dedup beyond the job history (which is capped): a file already sitting in + // the download folder under this id, a collision suffix, or the same normalized + // title from a different upload counts as downloaded. The record returned is a + // description of the existing file, deliberately not part of the queue — the client + // renders `jobs`, so it never becomes a cancel/retry target. + { + let entry = CollectionEntry { + video_id: video_id.clone(), + title: title.clone(), + artists: artists.clone(), + thumbnail: thumbnail.clone(), + }; + let index = FolderIndex::build(Path::new(&state.settings.path)); + if let Some(path) = index.find(&state.settings, &entry) { + let mut job = new_job(&self.inner, &state.settings, source, entry); + job.status = DownloadStatus::Completed; + job.progress = 100; + job.file_path = Some(path.to_string_lossy().into_owned()); + job.finished_at = Some(now_secs()); + return Ok(job); + } + } + let job = new_job( + &self.inner, + &state.settings, + source, + CollectionEntry { + video_id: video_id.clone(), + title: title.clone(), + artists: artists.clone(), + thumbnail: thumbnail.clone(), + }, + ); state.jobs.push(job.clone()); if let Err(error) = self.inner.persist_locked(&state) { state.jobs.pop(); @@ -291,6 +424,104 @@ impl Downloads { Ok(job) } + /// Queue every downloadable track of a collection (playlist/album) the caller enumerated + /// server-side. Smart dedup happens here, once, over a single folder snapshot: a track whose + /// audio already sits in the download folder — under this id, a collision suffix, or the same + /// normalized title under a different upload — is reported `alreadyDownloaded` with the path + /// it found, and a track already queued or downloading is folded into `queued`. The caller + /// gets back what actually entered the queue so a toast can say "12 added · 3 already on + /// disk · 5 unavailable" instead of a silent partial write. + pub fn enqueue_collection( + &self, + entries: Vec, + ) -> Result { + if entries.is_empty() { + return Err("This collection has no tracks to download.".into()); + } + if entries.len() > MAX_ACTIVE_QUEUED { + return Err(format!( + "A collection can add at most {MAX_ACTIVE_QUEUED} tracks at once." + )); + } + let settings = self.inner.state.lock().settings.clone(); + let index = FolderIndex::build(Path::new(&settings.path)); + let mut added = 0usize; + let mut already = 0usize; + let mut skipped = 0usize; + let mut already_paths: Vec = Vec::new(); + { + let mut state = self.inner.state.lock(); + ensure_running(&state)?; + // A batch either fits or reports the same full-queue condition a single enqueue + // would, rather than filling the queue halfway: room counts running workers and + // already-queued rows together. + let queued = + state.jobs.iter().filter(|job| job.status == DownloadStatus::Queued).count(); + let room = MAX_ACTIVE_QUEUED.saturating_sub(state.running.len() + queued); + let mut batch_ids: HashSet<&str> = HashSet::new(); + let mut created: Vec = Vec::new(); + for entry in &entries { + let Ok(source) = classify(&entry.video_id) else { + skipped += 1; + continue; + }; + if entry.video_id.len() > 80 + || entry.title.len() > 512 + || entry.artists.len() > 512 + || entry.thumbnail.len() > 4096 + || entry.title.trim().is_empty() + { + skipped += 1; + continue; + } + // Dedupe against the queue: active or completed-with-file jobs already cover it, + // and the same id may appear twice inside one collection (a playlist with the + // song saved twice). + let in_queue = state.jobs.iter().any(|job| { + job.video_id == entry.video_id + && (job.status.is_active() + || (job.status == DownloadStatus::Completed && file_present(job))) + }); + if in_queue || !batch_ids.insert(entry.video_id.as_str()) { + already += 1; + continue; + } + if let Some(path) = index.find(&settings, entry) { + already += 1; + if already_paths.len() < 6 { + already_paths.push(path.to_string_lossy().into_owned()); + } + continue; + } + if added >= room { + skipped += 1; + continue; + } + let job = new_job(&self.inner, &settings, source, entry.clone()); + created.push(job.id.clone()); + state.jobs.push(job); + added += 1; + } + if added > 0 { + if let Err(error) = self.inner.persist_locked(&state) { + // Drop exactly the rows this batch added on a failed write: a partial queue + // the client believes is complete is worse than an error it can retry. + state.jobs.retain(|job| !created.contains(&job.id)); + return Err(format!("Could not save the download queue: {error}")); + } + } + } + if added > 0 { + self.inner.pump(); + } + Ok(json!({ + "added": added, + "alreadyDownloaded": already, + "skipped": skipped, + "alreadyPaths": already_paths, + })) + } + pub fn cancel(&self, id: &str) -> Result<(), String> { let result = { let mut state = self.inner.state.lock(); @@ -426,6 +657,31 @@ impl Downloads { } } +/// One fresh, queued job for an entry, freezing the current settings and minting an id. +fn new_job( + inner: &Inner, + settings: &DownloadSettings, + source: Source, + entry: CollectionEntry, +) -> DownloadJob { + DownloadJob { + id: inner.next_id(), + video_id: entry.video_id, + title: entry.title, + artists: entry.artists, + thumbnail: entry.thumbnail, + status: DownloadStatus::Queued, + progress: 0, + file_path: None, + error: None, + source: source.label().into(), + created_at: now_secs(), + finished_at: None, + settings: settings.clone(), + warnings: Vec::new(), + } +} + fn ensure_running(state: &State) -> Result<(), String> { if state.stopping { Err("Ryotunes is shutting down.".into()) @@ -1423,6 +1679,102 @@ mod tests { } } + fn entry(video_id: &str, title: &str, artists: &str) -> CollectionEntry { + CollectionEntry { + video_id: video_id.into(), + title: title.into(), + artists: artists.into(), + thumbnail: String::new(), + } + } + + #[test] + fn folder_index_matches_exact_names_and_normalized_titles() { + let directory = Temp::new(); + std::fs::write(directory.0.join("Artist - Song [AAAAAAAAAAA].opus"), b"x").unwrap(); + std::fs::write( + directory.0.join(format!("{STAGING_DIR}-whatever.opus")), + b"partial", + ) + .unwrap(); + let settings = settings(&directory.0, 1); + let index = FolderIndex::build(&directory.0); + + // Exact id match. + let exact = entry("AAAAAAAAAAA", "Song", "Artist"); + assert!(index.find(&settings, &exact).is_some()); + // A reupload of the same recording: different id, same normalized name — the "smart" + // half of the match. + let reupload = entry("BBBBBBBBBBB", "Song", "Artist"); + assert!(index.find(&settings, &reupload).is_some()); + // A different song, and the staging partial, never match. + assert!(index.find(&settings, &entry("BBBBBBBBBBB", "Other", "Artist")).is_none()); + assert!( + index.find(&settings, &entry("whatever", "-whatever", "")).is_none(), + "the incomplete staging dir must not read as a saved file" + ); + } + + #[tokio::test] + async fn single_enqueue_reports_a_file_already_on_disk() { + let directory = Temp::new(); + let music = directory.0.join("music"); + std::fs::create_dir(&music).unwrap(); + let manager = manager(&directory.0); + manager.set_settings(settings(&music, 1)).unwrap(); + std::fs::write(music.join("Daftpunk - Around the World [AAAAAAAAAAA].opus"), b"saved") + .unwrap(); + // Same recording, different upload id: dedup must find it and NOT queue a job. + let job = manager + .enqueue( + "ZZZZZZZZZZZ".into(), + "Around the World".into(), + "Daftpunk".into(), + String::new(), + ) + .unwrap(); + assert_eq!(job.status, DownloadStatus::Completed); + assert!(job.file_path.unwrap().ends_with("[AAAAAAAAAAA].opus")); + assert!(manager.snapshot()["jobs"].as_array().unwrap().is_empty()); + manager.shutdown().await; + } + + #[tokio::test] + async fn collection_batch_dedupes_disk_queue_and_duplicates() { + let directory = Temp::new(); + let music = directory.0.join("music"); + std::fs::create_dir(&music).unwrap(); + let manager = manager(&directory.0); + manager.set_settings(settings(&music, 1)).unwrap(); + std::fs::write(music.join("One - Alpha [AAAAAAAAAAA].opus"), b"saved").unwrap(); + // One already-queued (downloading) job counts as already covered, not added. + manager + .enqueue("BBBBBBBBBBB".into(), "Beta".into(), "One".into(), String::new()) + .unwrap(); + let res = manager + .enqueue_collection(vec![ + entry("AAAAAAAAAAA", "Alpha", "One"), + entry("BBBBBBBBBBB", "Beta", "One"), + entry("CCCCCCCCCCC", "Gamma", "One"), + entry("CCCCCCCCCCC", "Gamma (reprise)", "One"), + entry("not-a-track-id!", "Local", "One"), + ]) + .unwrap(); + assert_eq!(res["added"], 1, "only the new, valid, non-duplicate track enters the queue"); + assert_eq!(res["alreadyDownloaded"], 3, "disk hit, queue hit, in-batch repeat"); + assert_eq!(res["skipped"], 1, "the unclassifiable id is skipped"); + assert!(res["alreadyPaths"][0].as_str().unwrap().ends_with("[AAAAAAAAAAA].opus")); + let ids: Vec = manager.snapshot()["jobs"] + .as_array() + .unwrap() + .iter() + .map(|job| job["videoId"].as_str().unwrap().to_owned()) + .collect(); + assert!(ids.contains(&"CCCCCCCCCCC".to_string())); + assert!(!ids.contains(&"AAAAAAAAAAA".to_string())); + manager.shutdown().await; + } + #[test] fn publication_never_replaces_existing_files_or_accepts_partials() { let directory = Temp::new(); diff --git a/crates/ryotunesd/src/main.rs b/crates/ryotunesd/src/main.rs index 0a9c217..4fd9709 100644 --- a/crates/ryotunesd/src/main.rs +++ b/crates/ryotunesd/src/main.rs @@ -52,13 +52,33 @@ fn main() -> anyhow::Result<()> { // Restore a cached Spotify session in the background so browsing and playback are ready // without blocking startup. Logged, never fatal: no cached credentials is the common case. + // The result is also announced as a `spotify-auth` event: a client that subscribed before + // the restore finished (the server binds while this is still connecting — the premium + // check alone can take 5s) otherwise never learns the session came back, and shows its + // sign-in gate on every launch even though the credentials are live. { let state = state.clone(); tokio::spawn(async move { match state.spotify.restore().await { - Ok(true) => tracing::info!("spotify: restored a cached session"), + Ok(true) => { + tracing::info!("spotify: restored a cached session"); + state.emit("spotify-auth", serde_json::json!({ "state": "restored" })); + } Ok(false) => tracing::debug!("spotify: no cached session to restore"), - Err(e) => tracing::warn!("spotify: restore failed: {:#}", e), + Err(e) => { + tracing::warn!("spotify: restore failed: {:#}", e); + // Credentials exist on disk but the session is dead — tell the UI so the + // gate can explain rather than silently demanding a fresh sign-in. + if state.spotify.stored() { + state.emit( + "spotify-auth", + serde_json::json!({ + "state": "restore_failed", + "message": format!("Spotify sign-in no longer works: {e:#}"), + }), + ); + } + } } }); } diff --git a/crates/ryotunesd/src/methods.rs b/crates/ryotunesd/src/methods.rs index a385750..bd2a535 100644 --- a/crates/ryotunesd/src/methods.rs +++ b/crates/ryotunesd/src/methods.rs @@ -832,6 +832,10 @@ impl Dispatch for Methods { let thumbnail = arg::>(¶ms, "thumbnail")?.unwrap_or_default(); ok(self.downloads.enqueue(video_id, title, artists, thumbnail).map_err(err)?) } + "enqueue_collection" => { + let entries = arg::>(¶ms, "entries")?; + ok(self.downloads.enqueue_collection(entries).map_err(err)?) + } "cancel_download" => { self.downloads.cancel(&arg::(¶ms, "id")?).map_err(err)?; null() diff --git a/crates/spotify/Cargo.toml b/crates/spotify/Cargo.toml index e6f6674..22c12e0 100644 --- a/crates/spotify/Cargo.toml +++ b/crates/spotify/Cargo.toml @@ -13,6 +13,7 @@ tokio = { workspace = true, features = ["net", "io-util"] } bytes = "1" http = "1" log = "0.4" +uuid = { version = "1", features = ["v4"] } protobuf = "3" url = "2" reqwest = { version = "0.12", default-features = false, features = ["rustls-tls"] } diff --git a/crates/spotify/src/auth.rs b/crates/spotify/src/auth.rs index f7c16fe..fc7221c 100644 --- a/crates/spotify/src/auth.rs +++ b/crates/spotify/src/auth.rs @@ -90,6 +90,11 @@ impl AuthConfig { pub fn file(&self) -> PathBuf { self.cache_dir.join(credentials::FILE) } + + /// The per-installation Spotify device id file, next to the credentials. + fn device_file(&self) -> PathBuf { + self.cache_dir.join(credentials::DEVICE_FILE) + } } /// The loopback authority (`host:port`) a redirect URI redirects to, so the callback listener knows @@ -261,18 +266,61 @@ fn classify(message: &str) -> SignInProblem { pub fn forget(config: &AuthConfig) { credentials::remove(&config.file()); + // The device id is kept: it identifies this installation, not this account, and reusing it + // after a sign-out/sign-in is what keeps the new credentials attached to a known device. } fn session(config: &AuthConfig) -> Result { let cache = Cache::new(Some(config.cache_dir.as_path()), None, None, None) .with_context(|| format!("cannot open cache at {}", config.cache_dir.display()))?; - let session_config = - SessionConfig { client_id: config.client_id.clone(), ..Default::default() }; + let session_config = SessionConfig { + client_id: config.client_id.clone(), + device_id: device_id(config), + ..Default::default() + }; Ok(Session::new(session_config, Some(cache))) } +/// The device identity librespot registers with Spotify. librespot's default mints a fresh +/// random uuid per process; a daemon that restarts on every launch (socket activation, idle +/// exit) then re-registers a "new device" each time, which Spotify's session/credential +/// handling treats as a different device — part of why restore kept demanding a fresh sign-in. +/// Persisting one id per installation keeps the stored credentials tied to the device that +/// earned them. +fn device_id(config: &AuthConfig) -> String { + let path = config.device_file(); + if let Ok(stored) = std::fs::read_to_string(&path) { + let id = stored.trim(); + if is_valid_device_id(id) { + return id.to_owned(); + } + } + let id = uuid::Uuid::new_v4().as_hyphenated().to_string(); + if let Some(dir) = path.parent() { + let _ = std::fs::create_dir_all(dir); + } + match std::fs::write(&path, &id) { + Ok(()) => { + credentials::secure(&path); + log::info!("auth: generated a persistent Spotify device id"); + } + Err(e) => { + log::warn!("auth: cannot persist the device id, using a per-process one: {e}"); + } + } + id +} + +/// A uuid-shaped id, no longer than a uuid, nothing but hex and hyphens. Guards against a +/// truncated or corrupt device file being handed to Spotify as the device identity. +fn is_valid_device_id(id: &str) -> bool { + !id.is_empty() + && id.len() <= 36 + && id.bytes().all(|b| b.is_ascii_alphanumeric() || b == b'-') +} + #[cfg(test)] mod tests { use super::{query_param, socket_address}; diff --git a/crates/spotify/src/credentials.rs b/crates/spotify/src/credentials.rs index 18cb70f..2acc1de 100644 --- a/crates/spotify/src/credentials.rs +++ b/crates/spotify/src/credentials.rs @@ -9,6 +9,9 @@ use std::sync::OnceLock; /// The credential file librespot writes after a successful connect. pub(crate) const FILE: &str = "credentials.json"; +/// The stable per-installation Spotify device id (see `auth::device_id`). Lives next to the +/// credentials so one sign-out forgets both together. +pub(crate) const DEVICE_FILE: &str = "device.id"; static ROOT: OnceLock = OnceLock::new(); From 4052c5ebcb50c8a2957c4477ee6d32fb38e14b06 Mon Sep 17 00:00:00 2001 From: carlos Date: Thu, 24 Sep 2026 13:00:24 -0400 Subject: [PATCH 153/183] style: apply rustfmt to the playback/download changes --- crates/core/src/spotify.rs | 4 +--- crates/innertube/src/models/player.rs | 3 ++- crates/ryotunesd/src/downloads.rs | 17 ++++------------- crates/spotify/src/auth.rs | 4 +--- 4 files changed, 8 insertions(+), 20 deletions(-) diff --git a/crates/core/src/spotify.rs b/crates/core/src/spotify.rs index 0de23a6..e19c951 100644 --- a/crates/core/src/spotify.rs +++ b/crates/core/src/spotify.rs @@ -181,9 +181,7 @@ impl SpotifyState { return Some(client); } if !self.provider.stored() - || self - .recovery_used - .swap(true, std::sync::atomic::Ordering::Relaxed) + || self.recovery_used.swap(true, std::sync::atomic::Ordering::Relaxed) { return None; } diff --git a/crates/innertube/src/models/player.rs b/crates/innertube/src/models/player.rs index 086109f..3673793 100644 --- a/crates/innertube/src/models/player.rs +++ b/crates/innertube/src/models/player.rs @@ -424,7 +424,8 @@ mod tests { reason: reason.map(Into::into), }; assert!(gate("LOGIN_REQUIRED", Some("Sign in to confirm you're not a bot")).is_bot_gate()); - assert!(gate("LOGIN_REQUIRED", Some("Please sign in to confirm you're not a bot")).is_bot_gate()); + assert!(gate("LOGIN_REQUIRED", Some("Please sign in to confirm you're not a bot")) + .is_bot_gate()); // A real login/age gate: nothing to do with visitorData. assert!(!gate("LOGIN_REQUIRED", Some("This video is unavailable")).is_bot_gate()); assert!(!gate("LOGIN_REQUIRED", None).is_bot_gate()); diff --git a/crates/ryotunesd/src/downloads.rs b/crates/ryotunesd/src/downloads.rs index 6742ee7..0320a53 100644 --- a/crates/ryotunesd/src/downloads.rs +++ b/crates/ryotunesd/src/downloads.rs @@ -270,11 +270,7 @@ fn strip_id_tag(stem: &str) -> &str { /// Lowercase alphanumeric only: the collision course for "Artist - Title", "artist–title", and a /// name re-sanitized through a different character set. fn normalize_key(input: &str) -> String { - input - .chars() - .filter(|c| c.is_alphanumeric()) - .flat_map(char::to_lowercase) - .collect() + input.chars().filter(|c| c.is_alphanumeric()).flat_map(char::to_lowercase).collect() } struct Running { @@ -1692,11 +1688,8 @@ mod tests { fn folder_index_matches_exact_names_and_normalized_titles() { let directory = Temp::new(); std::fs::write(directory.0.join("Artist - Song [AAAAAAAAAAA].opus"), b"x").unwrap(); - std::fs::write( - directory.0.join(format!("{STAGING_DIR}-whatever.opus")), - b"partial", - ) - .unwrap(); + std::fs::write(directory.0.join(format!("{STAGING_DIR}-whatever.opus")), b"partial") + .unwrap(); let settings = settings(&directory.0, 1); let index = FolderIndex::build(&directory.0); @@ -1748,9 +1741,7 @@ mod tests { manager.set_settings(settings(&music, 1)).unwrap(); std::fs::write(music.join("One - Alpha [AAAAAAAAAAA].opus"), b"saved").unwrap(); // One already-queued (downloading) job counts as already covered, not added. - manager - .enqueue("BBBBBBBBBBB".into(), "Beta".into(), "One".into(), String::new()) - .unwrap(); + manager.enqueue("BBBBBBBBBBB".into(), "Beta".into(), "One".into(), String::new()).unwrap(); let res = manager .enqueue_collection(vec![ entry("AAAAAAAAAAA", "Alpha", "One"), diff --git a/crates/spotify/src/auth.rs b/crates/spotify/src/auth.rs index fc7221c..06f4a01 100644 --- a/crates/spotify/src/auth.rs +++ b/crates/spotify/src/auth.rs @@ -316,9 +316,7 @@ fn device_id(config: &AuthConfig) -> String { /// A uuid-shaped id, no longer than a uuid, nothing but hex and hyphens. Guards against a /// truncated or corrupt device file being handed to Spotify as the device identity. fn is_valid_device_id(id: &str) -> bool { - !id.is_empty() - && id.len() <= 36 - && id.bytes().all(|b| b.is_ascii_alphanumeric() || b == b'-') + !id.is_empty() && id.len() <= 36 && id.bytes().all(|b| b.is_ascii_alphanumeric() || b == b'-') } #[cfg(test)] From f8b134d42af5f8c7ff3007dc9547c258dc727fd4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 24 Sep 2026 17:27:12 +0000 Subject: [PATCH 154/183] release: v1.1.0 --- CHANGELOG.md | 2 ++ Cargo.lock | 22 +++++++++---------- Cargo.toml | 2 +- client/version | 2 +- packaging/arch/PKGBUILD | 2 +- .../linux/dev.ryoku.ryotunes.metainfo.xml | 2 +- src-tauri/tauri.conf.json | 2 +- ui/package.json | 2 +- 8 files changed, 19 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cda47c7..1314ff7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +## v1.1.0 - 2026-09-24 + - Fixed some users being unable to play any YouTube track ("Skipped (unavailable)" on everything): YouTube's anonymous playback clients now require a valid `visitorData`, and a failed first fetch used to leave the daemon without one for its whole life, so every stream request hit Google's bot gate. The startup bootstrap retries with backoff, and a resolve that is rejected by the bot gate now fetches a fresh `visitorData` on the spot and retries once. - Fixed Spotify Premium users seeing "sign in" on every launch and every track skipped as "not available": the cached session is announced to clients once it restores (it used to finish silently after the UI snapshot, leaving the gate up), the sign-in gate explains a genuinely dead session instead of demanding a fresh login, a dead librespot session is detected and (once per credential lifetime) recovered from saved credentials before a track is reported as needing sign-in, a Spotify queue that needs sign-in now stops with the real reason instead of toast-storming "Skipped (unavailable)", and the Spotify device identity is persisted per installation instead of re-randomising on every launch. - Added Download playlist to the playlist page menu: albums and playlists batch-download through one daemon call that gathers every continuation page and admits the whole collection against a single dedup pass. diff --git a/Cargo.lock b/Cargo.lock index 9bcadcb..903ecde 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2438,7 +2438,7 @@ dependencies = [ [[package]] name = "innertube" -version = "1.0.8" +version = "1.1.0" dependencies = [ "hex", "reqwest 0.12.28", @@ -2943,7 +2943,7 @@ checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" [[package]] name = "listen-protocol" -version = "1.0.8" +version = "1.1.0" dependencies = [ "serde", "serde_json", @@ -3788,7 +3788,7 @@ checksum = "f6b464fbc74e149a392436b17d523f769e057cb6877f6a5c4618bc6f11800548" [[package]] name = "player" -version = "1.0.8" +version = "1.1.0" dependencies = [ "libc", "libmpv2", @@ -4703,7 +4703,7 @@ dependencies = [ [[package]] name = "ryotunes" -version = "1.0.8" +version = "1.1.0" dependencies = [ "anyhow", "async-trait", @@ -4733,7 +4733,7 @@ dependencies = [ [[package]] name = "ryotunes-cli" -version = "1.0.8" +version = "1.1.0" dependencies = [ "ryotunes-protocol", "serde", @@ -4742,7 +4742,7 @@ dependencies = [ [[package]] name = "ryotunes-core" -version = "1.0.8" +version = "1.1.0" dependencies = [ "anyhow", "async-trait", @@ -4778,7 +4778,7 @@ dependencies = [ [[package]] name = "ryotunes-protocol" -version = "1.0.8" +version = "1.1.0" dependencies = [ "serde", "serde_json", @@ -4786,7 +4786,7 @@ dependencies = [ [[package]] name = "ryotunes-soundcloud" -version = "1.0.8" +version = "1.1.0" dependencies = [ "regex", "reqwest 0.12.28", @@ -4799,7 +4799,7 @@ dependencies = [ [[package]] name = "ryotunes-spotify" -version = "1.0.8" +version = "1.1.0" dependencies = [ "anyhow", "bytes", @@ -4823,7 +4823,7 @@ dependencies = [ [[package]] name = "ryotunesd" -version = "1.0.8" +version = "1.1.0" dependencies = [ "anyhow", "async-trait", @@ -5586,7 +5586,7 @@ dependencies = [ [[package]] name = "sync-server" -version = "1.0.8" +version = "1.1.0" dependencies = [ "futures-util", "listen-protocol", diff --git a/Cargo.toml b/Cargo.toml index 400d65d..8ae70ec 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ members = [ ] [workspace.package] -version = "1.0.8" +version = "1.1.0" edition = "2021" license = "GPL-3.0-or-later" diff --git a/client/version b/client/version index b0f3d96..9084fa2 100644 --- a/client/version +++ b/client/version @@ -1 +1 @@ -1.0.8 +1.1.0 diff --git a/packaging/arch/PKGBUILD b/packaging/arch/PKGBUILD index 24a237d..fce1521 100644 --- a/packaging/arch/PKGBUILD +++ b/packaging/arch/PKGBUILD @@ -2,7 +2,7 @@ # Run from packaging/arch with: makepkg -si pkgname=ryotunes -pkgver=1.0.8 +pkgver=1.1.0 pkgrel=1 # epoch=1 is permanent: the v1 reset publishes 1:X.Y.Z, which pacman ranks above # the legacy 2.x line an existing machine may carry, so `pacman -U` still upgrades. diff --git a/packaging/linux/dev.ryoku.ryotunes.metainfo.xml b/packaging/linux/dev.ryoku.ryotunes.metainfo.xml index e1ed994..46f7850 100644 --- a/packaging/linux/dev.ryoku.ryotunes.metainfo.xml +++ b/packaging/linux/dev.ryoku.ryotunes.metainfo.xml @@ -12,5 +12,5 @@ ryotunes.desktop ryotunes AudioVideoAudio - + diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 6ee815a..f0a30e2 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "https://schema.tauri.app/config/2", "productName": "Ryotunes", - "version": "1.0.8", + "version": "1.1.0", "identifier": "dev.ryoku.ryotunes", "build": { "frontendDist": "../ui/build", diff --git a/ui/package.json b/ui/package.json index 8595bac..98ff446 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,7 +1,7 @@ { "name": "ui", "private": true, - "version": "1.0.8", + "version": "1.1.0", "type": "module", "scripts": { "dev": "vite dev", From 8256b5755a60b13ad4263aef1a18651c28a51f45 Mon Sep 17 00:00:00 2001 From: carlos Date: Thu, 24 Sep 2026 14:49:35 -0400 Subject: [PATCH 155/183] feat: SoundCloud sign-in and a merged multi-provider home MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit SoundCloud sign-in (opt-in; guest browsing/playback is unchanged): - crates/soundcloud gains an auth module: the captured OAuth bearer's lifetime is read from its JWT claims, and near-expiry tokens are rotated through the site's own refresh exchange under a single-flight lock (the refresh token is single-use; a double spend would log the session out). send() carries Authorization: OAuth . - ryotunesd's soundcloud_login opens the site's sign-in in a WebKitGTK window (allow-listed to SoundCloud + its IdPs) and harvests the oauth_token/oauth_refresh_token/connect_session triple from the cookie jar, watching both load-finished and cookie-changed since the SPA lands the token without navigating. - The daemon proves the bearer against /me before persisting it under the daemon-only soundcloud_auth settings key (never UI_SETTINGS), re-installs it at startup, announces signed_in/signed_out/ restore_failed via a soundcloud-auth event, and clears + explains an expired session on first use. New RPCs: soundcloud_sign_in/out/status; the subscribe snapshot carries the soundcloud block. - Settings' SoundCloud row becomes a real sign-in control. Merged home: get_home (unfiltered) now composes one HomePage — the YouTube Music spine (works signed out, the default source) plus every signed-in provider's shelves: SoundCloud's own playlists/likes/ following ahead of its discover rows, Spotify's made-for-you rows whenever a Premium session exists (with on-demand recovery). A dead spine or provider degrades to the rest instead of blanking the page; continuation stays the YouTube feed's. Cards already navigate/play across providers via the existing id-prefix dispatch, so the QML renderer needed no change beyond dropping the now-wrong Spotify sign-in gate from Home. --- CHANGELOG.md | 3 + Cargo.lock | 3 + client/Playback.qml | 11 +- client/lib/playback.js | 20 ++ client/pages/HomePage.qml | 32 +-- client/pages/SettingsPage.qml | 22 +- client/tests/tst_playback.qml | 17 ++ crates/core/src/soundcloud_bridge.rs | 26 +++ crates/core/src/state.rs | 24 +++ crates/ryotunesd/Cargo.toml | 3 + crates/ryotunesd/src/main.rs | 3 +- crates/ryotunesd/src/methods.rs | 218 +++++++++++++++++--- crates/ryotunesd/src/soundcloud_login.rs | 252 +++++++++++++++++++++++ crates/soundcloud/Cargo.toml | 6 +- crates/soundcloud/src/auth.rs | 181 ++++++++++++++++ crates/soundcloud/src/client.rs | 205 +++++++++++++++++- crates/soundcloud/src/lib.rs | 14 +- 17 files changed, 970 insertions(+), 70 deletions(-) create mode 100644 crates/ryotunesd/src/soundcloud_login.rs create mode 100644 crates/soundcloud/src/auth.rs diff --git a/CHANGELOG.md b/CHANGELOG.md index 1314ff7..0439c12 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased +- Added SoundCloud sign-in: a Ryotunes window opens the site's own sign-in (account or Google/Facebook/Apple), captures the session's OAuth token from the webview's cookie jar, proves it against `/me` before saving it, and keeps it alive through SoundCloud's rotating refresh. Signing in is optional — SoundCloud still browses and plays as a guest — but a signed-in account adds its own playlists, liked tracks and followed artists to Home, and the token survives restarts (an expired one says so instead of silently vanishing). +- Home is now the merged feed: YouTube Music's shelves remain the spine (the default source, signed in or not), and every signed-in provider contributes its own shelves to the same page — Spotify's made-for-you rows when a Premium session exists, SoundCloud's personal rows when connected. Cards navigate and play across providers exactly as before; one provider being down never blanks the page. + ## v1.1.0 - 2026-09-24 - Fixed some users being unable to play any YouTube track ("Skipped (unavailable)" on everything): YouTube's anonymous playback clients now require a valid `visitorData`, and a failed first fetch used to leave the daemon without one for its whole life, so every stream request hit Google's bot gate. The startup bootstrap retries with backoff, and a resolve that is rejected by the bot gate now fetches a fresh `visitorData` on the spot and retries once. diff --git a/Cargo.lock b/Cargo.lock index 903ecde..95bc5bd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4788,6 +4788,8 @@ dependencies = [ name = "ryotunes-soundcloud" version = "1.1.0" dependencies = [ + "base64 0.22.1", + "parking_lot", "regex", "reqwest 0.12.28", "serde", @@ -4827,6 +4829,7 @@ version = "1.1.0" dependencies = [ "anyhow", "async-trait", + "base64 0.22.1", "glib", "gtk", "innertube", diff --git a/client/Playback.qml b/client/Playback.qml index 1d0d4b8..c2c3ee1 100644 --- a/client/Playback.qml +++ b/client/Playback.qml @@ -32,12 +32,16 @@ Singleton { property var audioFx: ({ speed: 1, semitones: 0, reverb: 0, bass: 0, width: 0 }) // The active music provider ("youtube" | "spotify" | "soundcloud"), mirrored from the daemon // (the subscribe snapshot's `provider` and a `provider-changed` event). The title bar's switch - // reads it; SoundCloud is a guest catalogue with no sign-in gate. + // reads it; each catalogue's own sign-in state gates its shelves, not the selector. property string provider: "youtube" // The Spotify account, mirrored from the daemon (the subscribe snapshot's `spotify` object and // the `spotify-auth` events). `signedIn` gates the Spotify catalogue; `premium` is null until the // profile is known. Never a source of truth — every field lands from the daemon. property var spotify: ({ signedIn: false, stored: false, name: null, premium: null }) + // The SoundCloud account, mirrored the same way (the snapshot's `soundcloud` object and the + // `soundcloud-auth` events). SoundCloud browses and plays as a guest; signing in only adds + // the account's own shelves (playlists, likes, following) to Home. + property var soundcloud: ({ signedIn: false, name: null, error: "" }) // --- SoundCloud waveform cache ----------------------------------------------------------- // The playing track's 240 amplitude samples (get_waveform), for the Orange seek bar; null for a @@ -100,6 +104,9 @@ Singleton { if (snap.spotify) root.spotify = { signedIn: !!snap.spotify.signedIn, stored: !!snap.spotify.stored, name: snap.spotify.name, premium: snap.spotify.premium }; + if (snap.soundcloud) + root.soundcloud = { signedIn: !!snap.soundcloud.signedIn, + name: snap.soundcloud.name, error: "" }; } // --- SoundCloud waveform ----------------------------------------------------------------- @@ -149,6 +156,8 @@ Singleton { // spotify-auth events (the url step opens the browser). Idempotent while a flow is running. function spotifySignIn() { return Daemon.call("spotify_sign_in"); } function spotifySignOut() { return Daemon.call("spotify_sign_out"); } + function soundcloudSignIn() { return Daemon.call("soundcloud_sign_in"); } + function soundcloudSignOut() { return Daemon.call("soundcloud_sign_out"); } function toggleShuffle() { return Daemon.call("toggle_shuffle"); } // off -> all -> one -> off, matching player.svelte.ts cycleRepeat. function cycleRepeat() { diff --git a/client/lib/playback.js b/client/lib/playback.js index 3903fb8..f21c5e8 100644 --- a/client/lib/playback.js +++ b/client/lib/playback.js @@ -136,6 +136,26 @@ function applyEvent(s, name, data) { } return null; } + case "soundcloud-auth": { + // The SoundCloud capture flow's progress. The window is visible (the daemon owns it), + // so unlike Spotify there is no url step; the states are signed_in, signed_out, + // restore_failed (a persisted token died) and error. + var sc = (data && data.state) ? data.state : ""; + if (sc === "signed_in") { + s.soundcloud = { signedIn: true, name: (data && data.name) ? data.name : null, error: "" }; + return { toast: "Signed in to SoundCloud" + ((data && data.name) ? (" as " + data.name) : ""), kind: "success" }; + } + if (sc === "signed_out") { + s.soundcloud = { signedIn: false, name: null, error: "" }; + return null; + } + if (sc === "restore_failed" || sc === "error") { + var why = (data && data.message) ? data.message : "SoundCloud sign-in failed"; + s.soundcloud = { signedIn: false, name: null, error: why }; + return { toast: why, kind: "error" }; + } + return null; + } case "playback-error": s.lastError = (data && data.message !== undefined) ? data.message : String(data); s.pendingVideoId = null; diff --git a/client/pages/HomePage.qml b/client/pages/HomePage.qml index 52bce02..411f701 100644 --- a/client/pages/HomePage.qml +++ b/client/pages/HomePage.qml @@ -35,9 +35,9 @@ Item { property int requestId: 0 property var recommendations: ({ items: [], explanation: "" }) - // Spotify is selected but not signed in: show the sign-in empty state instead of calling the - // daemon (browsing is gated on a signed-in Spotify account). - readonly property bool spotifyGate: Playback.provider === "spotify" && !(Playback.spotify && Playback.spotify.signedIn) + // Home is the merged feed: YouTube Music's own shelves (always available, signed in or + // not) plus the shelves of every signed-in provider. There is no sign-in gate here — + // Library and Search still gate on the selected catalogue. // Personal shelves, live off the shared store. readonly property var recents: Personal.recent(100).filter((item) => page.providerFor(item.id) === Playback.provider).slice(0, 6) @@ -125,15 +125,6 @@ Item { blocks.clear(); page.forgotten = null; page.listenAgain = null; - // Gated: no daemon call, the sign-in card carries the page. - if (page.spotifyGate) { - page.home = null; - page.chips = []; - page.recommendations = ({ items: [], explanation: "" }); - page.errorMsg = ""; - page.loading = false; - return; - } page.loading = true; page.errorMsg = ""; Daemon.call("get_home", { params: params ? params : null }) @@ -193,7 +184,6 @@ Item { HomeFeed { id: list anchors.fill: parent - visible: !page.spotifyGate clip: true reuseItems: true cacheBuffer: Math.max(0, Math.round(height * 1.5)) @@ -281,7 +271,7 @@ Item { } Text { Layout.fillWidth: true - text: Playback.provider === "soundcloud" + text: Playback.provider === "soundcloud" && !(Playback.soundcloud && Playback.soundcloud.signedIn) ? "SoundCloud \u00b7 listening as a guest" : "Pick up where you left off, or find the next thing worth hearing." color: Tokens.inkMuted @@ -611,9 +601,10 @@ Item { HomePersonal { Layout.fillWidth: true - // The recents / familiar artists are YouTube Music history; under another - // catalogue the provider's own shelves lead instead. - visible: page.selected === "" && Playback.provider === "youtube" + // The recents / familiar artists are YouTube Music history. The merged + // home always carries the YouTube spine, so they always belong; a mood + // chip filter narrows the YouTube feed alone, so they step aside then. + visible: page.selected === "" artists: page.famArtists listenAgain: page.listenAgain } @@ -720,13 +711,6 @@ Item { } } - // The Spotify sign-in empty state: shown when Spotify is selected but not signed in, in place of - // the feed. It never touches the daemon — the button starts the OAuth flow. - SpotifyGate { - anchors.centerIn: parent - visible: page.spotifyGate - } - ShortcutPicker { id: shortcutPicker anchors.fill: parent diff --git a/client/pages/SettingsPage.qml b/client/pages/SettingsPage.qml index bc055ff..ec5fc99 100644 --- a/client/pages/SettingsPage.qml +++ b/client/pages/SettingsPage.qml @@ -1120,16 +1120,32 @@ Item { Layout.fillWidth: true spacing: 1 Text { - text: "Listening as a guest" + readonly property var sc: Playback.soundcloud || ({}) + text: (sc.signedIn && sc.name) ? sc.name : (sc.signedIn ? "Signed in" : "Listening as a guest") color: Tokens.ink; font.family: Style.fontUi; font.pixelSize: Style.fs.lg; font.weight: Font.DemiBold elide: Text.ElideRight; Layout.fillWidth: true } Text { - text: "No account needed \u00b7 SoundCloud's public catalogue plays for everyone." - color: Tokens.inkMuted; font.family: Style.fontUi; font.pixelSize: Style.fs.sm + readonly property var sc: Playback.soundcloud || ({}) + text: sc.signedIn ? "Connected \u00b7 your playlists and likes join Home" + : (sc.error ? sc.error + : "No account needed \u00b7 SoundCloud's public catalogue plays for everyone.") + color: (sc.error && !sc.signedIn) ? Style.accent : Tokens.inkMuted + font.family: Style.fontUi; font.pixelSize: Style.fs.sm wrapMode: Text.WordWrap; Layout.fillWidth: true } } + Pill { + readonly property var sc: Playback.soundcloud || ({}) + label: sc.signedIn ? "Sign out" : "Sign in to SoundCloud" + icon: sc.signedIn ? "close" : "soundcloud" + primary: !sc.signedIn + onClicked: { + var out = !!(Playback.soundcloud && Playback.soundcloud.signedIn); + var call = out ? Playback.soundcloudSignOut() : Playback.soundcloudSignIn(); + call.catch((e) => Playback.toast((e && e.message) ? e.message : String(e), "error")); + } + } } // switch account diff --git a/client/tests/tst_playback.qml b/client/tests/tst_playback.qml index b2d0776..d00a420 100644 --- a/client/tests/tst_playback.qml +++ b/client/tests/tst_playback.qml @@ -89,4 +89,21 @@ TestCase { compare(s.spotify.stored, true); compare(s.spotify.error, "bad credentials"); } + + // The SoundCloud capture flow drives its own mirror: sign-in, expiry, sign-out. + function test_soundcloud_auth_events_mirror_the_capture_flow() { + var s = freshState(); + s.soundcloud = { signedIn: false, name: null, error: "" }; + var fx = PB.applyEvent(s, "soundcloud-auth", { state: "signed_in", name: "nero" }); + compare(s.soundcloud.signedIn, true); + compare(s.soundcloud.name, "nero"); + compare(fx.kind, "success"); + // An expired persisted token reports itself and keeps the reason for the settings row. + PB.applyEvent(s, "soundcloud-auth", { state: "restore_failed", message: "expired" }); + compare(s.soundcloud.signedIn, false); + compare(s.soundcloud.error, "expired"); + PB.applyEvent(s, "soundcloud-auth", { state: "signed_out" }); + compare(s.soundcloud.signedIn, false); + compare(s.soundcloud.error, ""); + } } diff --git a/crates/core/src/soundcloud_bridge.rs b/crates/core/src/soundcloud_bridge.rs index ab62ec5..7fb54ca 100644 --- a/crates/core/src/soundcloud_bridge.rs +++ b/crates/core/src/soundcloud_bridge.rs @@ -195,6 +195,32 @@ pub fn discover_home(selections: &[Selection]) -> HomePage { HomePage { chips: Vec::new(), sections, continuation: None } } +/// The signed-in user's own shelves, first on Home: their playlists, their liked tracks, and +/// the artists they follow. Empty lists drop their shelf, so a partial fetch (or a fresh +/// account) never renders a blank row. +pub fn personal_home(playlists: &[Playlist], likes: &[Track], followings: &[User]) -> Vec
{ + let mut sections = Vec::new(); + if !playlists.is_empty() { + sections.push(card_section( + "Your playlists".to_string(), + playlists.iter().map(playlist_to_card).collect(), + )); + } + if !likes.is_empty() { + sections.push(card_section( + "Liked tracks".to_string(), + likes.iter().map(track_to_card).collect(), + )); + } + if !followings.is_empty() { + sections.push(card_section( + "Following".to_string(), + followings.iter().map(user_to_card).collect(), + )); + } + sections +} + /// One discover shelf entry as a card: a regular playlist, or a SoundCloud system playlist (a /// curated/charts list keyed by permalink). fn discover_item_to_card(item: &DiscoverItem) -> BrowseItem { diff --git a/crates/core/src/state.rs b/crates/core/src/state.rs index 78f8efa..612ad27 100644 --- a/crates/core/src/state.rs +++ b/crates/core/src/state.rs @@ -48,6 +48,11 @@ pub const LOCAL_PLAYLIST_PREFIX: &str = "RYOTUNES_LOCAL_PLAYLIST:"; pub const LIKED_SONGS_ID: &str = "RYOTUNES_LOCAL_PLAYLIST:liked"; pub const LIKED_SONGS_TITLE: &str = "Liked Songs"; +/// The persisted SoundCloud OAuth blob (access + rotating refresh token + session cookie). +/// Deliberately NOT in [`UI_SETTINGS`]: like `session_cookie`, it is auth material the +/// renderer must never see; only the daemon's sign-in/rotate paths write it. +pub const SOUNDCLOUD_AUTH_KEY: &str = "soundcloud_auth"; + /// Settings the UI is allowed to read *and write*. Session/auth material (`session_cookie`, /// `selected_identity_json`, `data_sync_id`, `account_json`, `account_selection_pending`, /// `visitor_data`) and internal blobs (`queue_json`, `queue_index`, `queue_position`) never cross @@ -431,6 +436,25 @@ impl AppState { Arc::new(crate::spotify::SpotifyState::new(paths.data_dir.join("spotify"), selected)); let soundcloud = Arc::new(ryotunes_soundcloud::SoundCloud::new(paths.data_dir.join("soundcloud"))); + // A captured SoundCloud sign-in survives restarts like the YouTube cookie does: the + // JSON blob lives under a settings key outside UI_SETTINGS, so the renderer can + // neither read nor overwrite it. Every token rotation writes the new pair back + // through this hook (SoundCloud's refresh token is single-use — losing a rotation + // dead-ends the session), and the restore is validated against /me by the host. + if let Some(raw) = db.get_setting(SOUNDCLOUD_AUTH_KEY) { + if let Ok(auth) = serde_json::from_str::(&raw) { + soundcloud.set_auth(Some(auth)); + } + } + let rotate_db = Arc::clone(&db); + soundcloud.set_on_rotate(std::sync::Arc::new(move |auth| { + match serde_json::to_string(&auth) { + Ok(json) => rotate_db.set_setting(SOUNDCLOUD_AUTH_KEY, &json), + Err(e) => { + tracing::error!(error = %e, "soundcloud: cannot serialize rotated auth") + } + } + })); AppState { it, clients, diff --git a/crates/ryotunesd/Cargo.toml b/crates/ryotunesd/Cargo.toml index fb0726e..ff9f2a9 100644 --- a/crates/ryotunesd/Cargo.toml +++ b/crates/ryotunesd/Cargo.toml @@ -36,6 +36,9 @@ javascriptcore = { package = "javascriptcore-rs", version = "1.1" } # `session::allowed_login_navigation` takes a `&url::Url`; the GTK policy hook only gives us the URI # string, so we parse it (Tauri handed a `url::Url` straight to the callback). url = "2" +# The sign-in window's tests build a fake JWT to feed the cookie harvester (same base64 the +# lock already carries via reqwest). +base64 = "0.22" # System tray via StatusNotifierItem. `ksni` speaks the protocol directly (left-click `Activate` # works, unlike libappindicator), the same reason `src-tauri/src/tray.rs` uses it on Linux. ksni = "0.3" diff --git a/crates/ryotunesd/src/main.rs b/crates/ryotunesd/src/main.rs index 4fd9709..2ea32af 100644 --- a/crates/ryotunesd/src/main.rs +++ b/crates/ryotunesd/src/main.rs @@ -8,8 +8,8 @@ mod login; mod methods; mod server; mod sink; +mod soundcloud_login; mod tray; - use std::io::{BufRead, BufReader, Write}; use std::os::unix::io::AsRawFd; use std::os::unix::net::UnixStream; @@ -99,6 +99,7 @@ fn main() -> anyhow::Result<()> { state: state.clone(), quit: quit_tx, downloads: downloads.clone(), + soundcloud_login: Arc::new(soundcloud_login::SoundcloudLogin::new(gtk.clone())), }); // A `systemctl stop` (or any `kill`) sends SIGTERM: handle it exactly like ctrl_c / an // explicit quit so the awaited teardown below runs — cancelling and reaping every download diff --git a/crates/ryotunesd/src/methods.rs b/crates/ryotunesd/src/methods.rs index bd2a535..64892f3 100644 --- a/crates/ryotunesd/src/methods.rs +++ b/crates/ryotunesd/src/methods.rs @@ -32,6 +32,8 @@ pub struct Methods { pub state: Arc, pub quit: tokio::sync::mpsc::UnboundedSender<()>, pub downloads: Arc, + /// The visible SoundCloud sign-in window (cookie-jar OAuth capture). + pub soundcloud_login: Arc, } fn arg(params: &Value, key: &str) -> Result { @@ -72,6 +74,37 @@ impl Drop for SignInGuard { } } +/// Guards the SoundCloud sign-in window so two capture flows never open at once. +static SC_SIGNING_IN: AtomicBool = AtomicBool::new(false); + +/// Resets [`SC_SIGNING_IN`] whenever the spawned flow ends — success, failure or panic. +struct SoundcloudSignInGuard; +impl Drop for SoundcloudSignInGuard { + fn drop(&mut self) { + SC_SIGNING_IN.store(false, Ordering::SeqCst); + } +} + +/// Persist (or forget) the SoundCloud OAuth blob under the daemon-only settings key. The +/// crate's rotate hook writes the same key on every refresh; this writes it at sign-in and +/// sign-out, the two moments the lifetime changes. +fn persist_soundcloud_auth(st: &Arc, auth: Option<&ryotunes_soundcloud::SoundcloudAuth>) { + match auth.map(|a| serde_json::to_string(a)) { + Some(Ok(json)) => st.db.set_setting(ryotunes_core::state::SOUNDCLOUD_AUTH_KEY, &json), + Some(Err(e)) => tracing::error!(error = %e, "soundcloud: cannot serialize auth"), + None => st.db.delete_setting(ryotunes_core::state::SOUNDCLOUD_AUTH_KEY), + } +} + +/// The `{signedIn, name}` block for `soundcloud_status` and the subscribe snapshot. A stored +/// token that never verified reads as signed out (the blob only persists after a /me proof). +fn soundcloud_status_json(st: &Arc) -> Value { + match st.soundcloud.auth() { + Some(auth) => json!({ "signedIn": true, "name": auth.username }), + None => json!({ "signedIn": false, "name": null }), + } +} + /// A Spotify crate error as the daemon's error body. fn spotify_err(e: impl ToString) -> ErrorBody { ErrorBody { code: "spotify".into(), message: e.to_string() } @@ -120,6 +153,7 @@ impl Dispatch for Methods { "audioFx": st.audio_fx(), "provider": provider, "spotify": spotify, + "soundcloud": soundcloud_status_json(st), "downloads": self.downloads.snapshot(), })) } @@ -337,6 +371,7 @@ impl Dispatch for Methods { } "get_provider" => ok(json!({ "provider": st.spotify.selected().as_str() })), "spotify_status" => ok(spotify_status_json(st).await), + "soundcloud_status" => ok(soundcloud_status_json(st)), "spotify_sign_in" => { if SPOTIFY_SIGNING_IN .compare_exchange(false, true, Ordering::SeqCst, Ordering::SeqCst) @@ -390,23 +425,20 @@ impl Dispatch for Methods { // --- browse / library ------------------------------------------------------------ "get_home" => { - if st.spotify.browsing_soundcloud() { - soundcloud_home(st).await - } else if st.spotify.browsing_spotify().await { - spotify_home(st).await - } else { - ok(st - .home(arg::>(¶ms, "params")?.as_deref()) - .await - .map_err(err)?) + // The merged home: YouTube Music is the spine (the default source, signed in + // or not), and every signed-in provider contributes its own shelves to the + // same page. A YouTube chip filter narrows the YouTube feed alone — the other + // providers have no equivalent filter — so a filtered page is YouTube-only. + let params = arg::>(¶ms, "params")?; + match params.as_deref() { + Some(p) => ok(st.home(Some(p)).await.map_err(err)?), + None => home_merged(st).await, } } "get_home_more" => { - if st.spotify.browsing_soundcloud() || st.spotify.browsing_spotify().await { - ok(json!({ "sections": [], "continuation": null })) - } else { - ok(st.home_more(&arg::(¶ms, "token")?).await.map_err(err)?) - } + // The merged page's continuation is always the YouTube spine's: the provider + // shelves that ride with it are finite rows, not paged feeds. + ok(st.home_more(&arg::(¶ms, "token")?).await.map_err(err)?) } "get_library" => { if st.spotify.browsing_soundcloud() { @@ -843,6 +875,60 @@ impl Dispatch for Methods { "retry_download" => { ok(self.downloads.retry(&arg::(¶ms, "id")?).map_err(err)?) } + "soundcloud_sign_in" => { + // One flow at a time; a second click is a no-op while the window is open. + if SC_SIGNING_IN + .compare_exchange(false, true, Ordering::SeqCst, Ordering::SeqCst) + .is_err() + { + return ok(json!({ "started": false })); + } + let task = st.clone(); + let window = self.soundcloud_login.clone(); + tokio::spawn(async move { + let _guard = SoundcloudSignInGuard; + match window.sign_in().await { + Ok(mut auth) => { + // Proof before persistence: the bearer must actually answer /me, + // and the account name rides back for the status line. + task.soundcloud.set_auth(Some(auth.clone())); + match task.soundcloud.me().await { + Ok(user) => { + auth.username = Some(user.username.clone()); + persist_soundcloud_auth(&task, Some(&auth)); + task.soundcloud.set_auth(Some(auth)); + task.emit( + "soundcloud-auth", + json!({ "state": "signed_in", "name": user.username }), + ); + } + Err(e) => { + task.soundcloud.set_auth(None); + task.emit( + "soundcloud-auth", + json!({ + "state": "error", + "message": format!("SoundCloud sign-in failed: {e}"), + }), + ); + } + } + } + Err(ryotunes_core::host::LoginError::Cancelled) => {} + Err(e) => task.emit( + "soundcloud-auth", + json!({ "state": "error", "message": e.to_string() }), + ), + } + }); + ok(json!({ "started": true })) + } + "soundcloud_sign_out" => { + st.soundcloud.set_auth(None); + st.db.delete_setting(ryotunes_core::state::SOUNDCLOUD_AUTH_KEY); + st.emit("soundcloud-auth", json!({ "state": "signed_out" })); + ok(json!({ "signedIn": false })) + } "clear_download_history" => { self.downloads.clear_history().map_err(err)?; null() @@ -893,12 +979,6 @@ async fn spotify_name(st: &Arc) -> Option { client.profile().await.ok().map(|profile| profile.display_name) } -async fn spotify_home(st: &Arc) -> Result { - let client = st.spotify.client().await.ok_or_else(spotify_signed_out)?; - let feed = client.home().await.map_err(spotify_err)?; - ok(spotify_bridge::home_page(&feed)) -} - async fn spotify_search_all(st: &Arc, query: &str) -> Result { let client = st.spotify.client().await.ok_or_else(spotify_signed_out)?; let results = client.search(query).await.map_err(spotify_err)?; @@ -1002,12 +1082,98 @@ async fn spotify_edit_playlist( // --- SoundCloud command bodies ---------------------------------------------------------------- -/// SoundCloud home: the "discover" selections, one shelf per selection in the order SoundCloud -/// returns them ("Trending by genre", "Curated by SoundCloud", "Artists to watch out for"). No -/// account needed; a fetch failure surfaces as an error toast rather than a blank page. -async fn soundcloud_home(st: &Arc) -> Result { - let selections = st.soundcloud.discover().await.map_err(soundcloud_err)?; - ok(soundcloud_bridge::discover_home(&selections)) +/// The merged Home: YouTube Music's own feed (works signed out — the default), with the +/// signed-in providers' shelves woven in. Spotify contributes its made-for-you rows whenever +/// a Premium session exists; a signed-in SoundCloud contributes its personal rows (playlists, +/// likes, following) ahead of its discover rows. Every shelf is the same HomePage `Section` +/// shape, and every card id (`spotify:…`, `sc:…`) already round-trips through the by-prefix +/// dispatch in get_playlist/get_album/get_artist, so the client renders and navigates the +/// mix without knowing where each row came from. One provider failing never blanks the +/// page: its shelves are simply absent, and so is a dead YouTube spine — offline, the merged +/// home still shows what the signed-in providers hold. +async fn home_merged(st: &Arc) -> Result { + let mut spine = st.home(None).await.unwrap_or(innertube::HomePage { + chips: Vec::new(), + sections: Vec::new(), + continuation: None, + }); + let mut extra: Vec = Vec::new(); + + // SoundCloud: personal shelves first when signed in, then the discover rows everyone gets. + if let Some(mut sc) = soundcloud_home_sections(st).await { + extra.append(&mut sc); + } + + // Spotify: whenever a Premium session exists — the merged home aggregates every + // signed-in provider, regardless of which catalogue the selector points at for + // Library/Search. A session that died since startup recovers once from the cache. + if let Some(client) = st.spotify.client_or_recover().await { + if let Ok(feed) = client.home().await { + extra.extend(spotify_bridge::home_page(&feed).sections); + } + } + + if !extra.is_empty() { + // Provider rows lead when YouTube itself has nothing to show (a signed-out first run + // with a dead spine); otherwise they follow the spine's opening rows so the default + // experience is unchanged. + let at = spine.sections.len().min(3); + spine.sections.splice(at..at, extra); + } + ok(spine) +} + +/// SoundCloud's contribution to the merged home: the signed-in account's own rows first +/// (playlists / likes / following), then the public discover shelves. A dead token clears +/// itself so the personal rows stop demanding re-auth on every open. +async fn soundcloud_home_sections(st: &Arc) -> Option> { + let mut sections = Vec::new(); + if st.soundcloud.signed_in() { + match ( + st.soundcloud.my_playlists().await, + st.soundcloud.my_likes().await, + st.soundcloud.my_followings().await, + ) { + (Ok(playlists), Ok(likes), Ok(followings)) => { + sections = soundcloud_bridge::personal_home(&playlists, &likes, &followings); + } + // A 401/403 from the personal calls means the session is gone, not thin: forget + // it and say so, exactly like the Spotify restore_failed announcement. Any other + // error (a network blip) keeps the token — clearing it would turn one failed + // page load into a sign-out. + (a, b, c) => { + let is_dead = |e: &ryotunes_soundcloud::Error| { + matches!(e, ryotunes_soundcloud::Error::Api { status: 401 | 403, .. }) + }; + // The three calls differ in payload type, so test their errors one by one. + let dead = a.as_ref().err().is_some_and(is_dead) + || b.as_ref().err().is_some_and(is_dead) + || c.as_ref().err().is_some_and(is_dead); + if dead { + st.soundcloud.set_auth(None); + st.db.delete_setting(ryotunes_core::state::SOUNDCLOUD_AUTH_KEY); + st.emit( + "soundcloud-auth", + json!({ + "state": "restore_failed", + "message": "Your SoundCloud session expired. Sign in again to \ + see your playlists and likes.", + }), + ); + } + } + } + } + match st.soundcloud.discover().await { + Ok(selections) => { + sections.extend(soundcloud_bridge::discover_home(&selections).sections); + Some(sections) + } + // Discover is public; failing it is a network problem, and the personal rows (if any) + // still ride. + Err(_) if !sections.is_empty() => Some(sections), + Err(_) => None, + } } async fn soundcloud_search_all(st: &Arc, query: &str) -> Result { diff --git a/crates/ryotunesd/src/soundcloud_login.rs b/crates/ryotunesd/src/soundcloud_login.rs new file mode 100644 index 0000000..07b26ff --- /dev/null +++ b/crates/ryotunesd/src/soundcloud_login.rs @@ -0,0 +1,252 @@ +//! The visible SoundCloud sign-in window. SoundCloud's own web player keeps its OAuth access +//! token in a JS-readable `oauth_token` cookie and its session in `connect_session` + +//! `oauth_refresh_token` (httpOnly), and sends the bearer on every api-v2 call as +//! `Authorization: OAuth `. WebKitGTK does not expose outgoing request headers, but its +//! cookie jar holds exactly those three cookies once the user has signed in — so this window +//! opens soundcloud.com/signin and harvests the jar, the same shape as the Google login in +//! `login.rs`. Unlike Google, the SPA writes the cookies without a navigation, so the jar is +//! watched through the cookie manager's `changed` signal as well as on finished loads. +//! +//! Persistent (`WebContext` default) on purpose: the webview keeps its SoundCloud session, so a +//! later re-login is one click. + +use std::collections::BTreeMap; +use std::sync::Arc; + +use parking_lot::Mutex; +use ryotunes_core::host::LoginError; +use ryotunes_soundcloud::SoundcloudAuth; +use tokio::sync::oneshot; + +use crate::gtk_thread::Gtk; + +/// A plain Linux Firefox UA: SoundCloud's login (and its IdP pages) behave normally under it, +/// and unlike the YouTube window there is no bot gate to spoof past. +const LOGIN_UA: &str = "Mozilla/5.0 (X11; Linux x86_64; rv:128.0) Gecko/20100101 Firefox/128.0"; + +/// The origin whose cookie jar carries the token triple. +const SC_ORIGIN: &str = "https://soundcloud.com"; + +/// Where the window starts: the site's own sign-in page (an account form, plus the Google / +/// Facebook / Apple buttons). +const LOGIN_URL: &str = "https://soundcloud.com/signin"; + +type Outcome = Result; +type Tx = Arc>>>; + +/// The host's SoundCloud sign-in: one visible window per call, on the GTK thread. +pub struct SoundcloudLogin { + gtk: Gtk, +} + +impl SoundcloudLogin { + pub fn new(gtk: Gtk) -> Self { + SoundcloudLogin { gtk } + } + + /// Run the sign-in. `Ok(auth)` only after the harvested bearer parses; the caller persists + /// it and installs it on the shared client. + pub async fn sign_in(&self) -> Result { + let (tx, rx) = oneshot::channel::(); + let tx: Tx = Arc::new(Mutex::new(Some(tx))); + self.gtk.call(move || build_login_window(tx)).await; + // The sender is dropped when the window is torn down without resolving → cancelled. + rx.await.unwrap_or(Err(LoginError::Cancelled)) + } +} + +/// True for https URLs the sign-in may live on: the site itself, its CDN, and the IdPs its +/// buttons open. Anything else is a phishing redirect and is refused. +fn allowed_navigation(url: &url::Url) -> bool { + if url.scheme() != "https" { + return false; + } + let Some(host) = url.host_str() else { return false }; + const HOSTS: [&str; 7] = [ + "soundcloud.com", + "sndcdn.com", + "google.com", + "facebook.com", + "facebook.net", + "appleid.apple.com", + "login.live.com", + ]; + HOSTS.iter().any(|h| host == *h || host.ends_with(&format!(".{h}"))) +} + +/// Pick the token triple out of raw `(name, value, domain)` jar entries. Domain-matched by +/// hand like `login.rs` does for YouTube: anything outside soundcloud.com is dropped. +fn harvest(cookies: Vec<(String, String, String)>) -> Option { + let mut jar = BTreeMap::new(); + for (name, value, domain) in cookies { + let domain = domain.strip_prefix('.').map(str::to_owned).unwrap_or(domain); + if domain != "soundcloud.com" && !domain.ends_with(".soundcloud.com") { + continue; + } + if matches!(name.as_str(), "oauth_token" | "oauth_refresh_token" | "connect_session") { + jar.insert(name, value); + } + } + let access = jar.remove("oauth_token")?; + SoundcloudAuth::from_access_token( + access, + jar.remove("oauth_refresh_token"), + jar.remove("connect_session"), + ) +} + +fn build_login_window(tx: Tx) { + use gtk::prelude::*; + use webkit2gtk::{ + gio, CookieManagerExt, LoadEvent, NavigationPolicyDecision, NavigationPolicyDecisionExt, + PolicyDecisionExt, PolicyDecisionType, SettingsExt, URIRequestExt, WebContext, + WebContextExt, WebView, WebViewExt, + }; + + let view = WebView::new(); + crate::gtk_thread::install_clean_exit(); + if let Some(settings) = WebViewExt::settings(&view) { + settings.set_user_agent(Some(LOGIN_UA)); + } + + view.connect_decide_policy(|_view, decision, kind| { + if kind != PolicyDecisionType::NavigationAction + && kind != PolicyDecisionType::NewWindowAction + { + return false; + } + let uri = decision + .downcast_ref::() + .and_then(|d| d.navigation_action()) + .and_then(|a| a.request()) + .and_then(|r| r.uri()); + let allowed = uri + .as_deref() + .and_then(|u| url::Url::parse(u).ok()) + .map(|u| allowed_navigation(&u)) + .unwrap_or(false); + if allowed { + decision.use_(); + } else { + decision.ignore(); + } + true + }); + + // Resolve the flow from the jar: called on finished loads AND on every cookie change, + // because the SPA lands the token without navigating. + let resolve = { + let view = view.clone(); + move |tx: &Tx| { + let Some(cm) = WebContext::default().and_then(|c| c.cookie_manager()) else { + return; + }; + let tx = tx.clone(); + let view = view.clone(); + cm.cookies(SC_ORIGIN, None::<&gio::Cancellable>, move |res| { + let Ok(cookies) = res else { return }; + let triples: Vec<(String, String, String)> = cookies + .into_iter() + .map(|mut c| { + ( + c.name().map(|g| g.to_string()).unwrap_or_default(), + c.value().map(|g| g.to_string()).unwrap_or_default(), + c.domain().map(|g| g.to_string()).unwrap_or_default(), + ) + }) + .collect(); + let Some(auth) = harvest(triples) else { + return; + }; + if let Some(tx) = tx.lock().take() { + let _ = tx.send(Ok(auth)); + } + if let Some(w) = view.toplevel() { + unsafe { w.destroy() }; + } + }); + } + }; + + let tx_load = tx.clone(); + let resolve_load = resolve.clone(); + view.connect_load_changed(move |_, event| { + if event == LoadEvent::Finished { + resolve_load(&tx_load); + } + }); + + if let Some(cm) = WebContext::default().and_then(|c| c.cookie_manager()) { + let tx_changed = tx.clone(); + cm.connect_changed(move |_| { + resolve(&tx_changed); + }); + } + + let window = gtk::Window::new(gtk::WindowType::Toplevel); + window.set_title("Sign in to SoundCloud"); + window.set_default_size(480, 720); + window.add(&view); + + window.connect_delete_event(move |_, _| { + if let Some(tx) = tx.lock().take() { + let _ = tx.send(Err(LoginError::Cancelled)); + } + glib::Propagation::Proceed + }); + + window.show_all(); + view.load_uri(LOGIN_URL); +} + +#[cfg(test)] +mod tests { + use super::*; + + fn triple(name: &str, value: &str, domain: &str) -> (String, String, String) { + (name.into(), value.into(), domain.into()) + } + + /// A JWT with a far-future exp so `from_access_token` keeps it alive. + fn fake_jwt() -> String { + use base64::Engine as _; + let enc = |bytes: &[u8]| { + base64::prelude::BASE64_URL_SAFE_NO_PAD.encode(bytes).trim_end_matches('=').to_string() + }; + let exp = + std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap().as_secs() + + 3600; + format!( + "{}.{}.sig", + enc(b"{\"alg\":\"none\"}"), + &enc(format!("{{\"exp\":{exp},\"client_id\":\"cid\"}}").as_bytes()) + ) + } + + #[test] + fn harvest_needs_the_full_soundcloud_triple() { + // An access token alone cannot rotate, but it is still a sign-in: harvest succeeds + // with the refresh pair absent, and foreign-domain cookies never count. + let auth = harvest(vec![triple("oauth_token", "elsewhere", ".example.com")]).is_none(); + assert!(auth, "a token outside soundcloud.com is not ours"); + let auth = harvest(vec![ + triple("oauth_token", &fake_jwt(), ".soundcloud.com"), + triple("oauth_refresh_token", "rt", ".soundcloud.com"), + triple("connect_session", "cs", ".soundcloud.com"), + ]) + .expect("the triple harvests"); + assert_eq!(auth.refresh_token.as_deref(), Some("rt")); + assert_eq!(auth.connect_session.as_deref(), Some("cs")); + } + + #[test] + fn navigation_stays_on_soundcloud_and_known_idps() { + assert!(allowed_navigation(&url::Url::parse("https://soundcloud.com/signin").unwrap())); + assert!(allowed_navigation(&url::Url::parse("https://a-v2.sndcdn.com/x.js").unwrap())); + assert!(allowed_navigation( + &url::Url::parse("https://accounts.google.com/o/oauth2/v2/auth").unwrap() + )); + assert!(!allowed_navigation(&url::Url::parse("https://evil.test/claim").unwrap())); + assert!(!allowed_navigation(&url::Url::parse("http://soundcloud.com/insecure").unwrap())); + } +} diff --git a/crates/soundcloud/Cargo.toml b/crates/soundcloud/Cargo.toml index 3a9ae04..9d0219c 100644 --- a/crates/soundcloud/Cargo.toml +++ b/crates/soundcloud/Cargo.toml @@ -3,15 +3,17 @@ name = "ryotunes-soundcloud" version.workspace = true edition.workspace = true license.workspace = true -description = "Ryotunes SoundCloud provider: guest api-v2 client (client_id scrape, HLS streams, waveforms)." +description = "Ryotunes SoundCloud provider: api-v2 client (guest scrape + OAuth bearer, HLS streams, waveforms)." [dependencies] serde = { workspace = true } serde_json = { workspace = true } +base64 = "0.22" thiserror = { workspace = true } tracing = { workspace = true } +parking_lot = "0.12" tokio = { workspace = true, features = ["fs", "sync"] } -reqwest = { version = "0.12", default-features = false, features = ["rustls-tls", "gzip", "brotli"] } +reqwest = { version = "0.12", default-features = false, features = ["rustls-tls", "gzip", "brotli", "json"] } regex = "1" [dev-dependencies] diff --git a/crates/soundcloud/src/auth.rs b/crates/soundcloud/src/auth.rs new file mode 100644 index 0000000..42622cb --- /dev/null +++ b/crates/soundcloud/src/auth.rs @@ -0,0 +1,181 @@ +//! Signed-in support: the OAuth bearer the host captures from the web player's cookie jar, its +//! JWT lifetime, and SoundCloud's rotating refresh-token exchange. +//! +//! SoundCloud's own web app keeps its access token in a JS-readable `oauth_token` cookie and a +//! single-use `oauth_refresh_token` (httpOnly) cookie, and refreshes through +//! `POST https://soundcloud.com/n/api/refresh-token` with `credentials: include`. The exchange +//! ROTATES the refresh token: the old one is dead the moment the new one is issued. A client that +//! spends one token twice (two concurrent refreshes) therefore logs itself out — so every refresh +//! runs under one async lock and re-checks whether a sibling already replaced the token before +//! spending another. + +use std::time::{SystemTime, UNIX_EPOCH}; + +use base64::Engine as _; +use serde::{Deserialize, Serialize}; + +/// The refresh endpoint the site itself uses (cookie-authenticated, JSON body). +pub const REFRESH_URL: &str = "https://soundcloud.com/n/api/refresh-token"; + +/// Re-refresh this many seconds before the access token actually dies, so a request that starts +/// near the boundary never carries an expired bearer. +const EXPIRY_MARGIN_SECS: i64 = 60; +/// Fallback lifetime for a token whose JWT we cannot parse (the site's documented ~1 h). +const UNKNOWN_LIFETIME_SECS: i64 = 3600; +/// The web app's own client id, used as the fallback when a JWT carries no readable claim. +const FALLBACK_CLIENT_ID: &str = "3uJIGBRwdofKn6QKzONvDxUM1Vs4bTv9"; + +/// Everything needed to act as the signed-in user and to keep acting after the access token +/// expires. Serializable: the host persists this blob (and rewrites it on every rotation) under a +/// settings key the renderer can never read. +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +pub struct SoundcloudAuth { + pub access_token: String, + /// The single-use rotation token. `None` only if capture somehow saw no refresh cookie — + /// then the auth dies with the access token and the user re-signs. + pub refresh_token: Option, + /// The `client_id` claim inside the JWT: the refresh exchange must echo it back. + pub client_id: String, + /// Unix seconds when the access token dies. + pub expires_at: i64, + /// The `connect_session` cookie the refresh endpoint authenticates with. + pub connect_session: Option, + /// The account's display name, filled in by the host after verifying the token against + /// `/me`, so the status line survives restarts without another round trip. + #[serde(default)] + pub username: Option, +} + +impl SoundcloudAuth { + /// Build auth from a captured bearer: the JWT carries its own expiry and client id, so a + /// capture needs no extra round trip. Returns `None` only for an empty token. + pub fn from_access_token( + access_token: String, + refresh_token: Option, + connect_session: Option, + ) -> Option { + if access_token.trim().is_empty() { + return None; + } + let claims = decode_jwt_claims(&access_token); + let now = now_secs(); + let expires_at = claims.as_ref().and_then(|c| c.exp).unwrap_or(now + UNKNOWN_LIFETIME_SECS); + let client_id = claims + .as_ref() + .and_then(|c| c.client_id.clone()) + .unwrap_or_else(|| FALLBACK_CLIENT_ID.to_string()); + Some(SoundcloudAuth { + access_token, + refresh_token, + client_id, + expires_at, + connect_session, + username: None, + }) + } + + /// Whether the bearer is dead or about to be. + pub fn is_expired(&self, now: i64) -> bool { + self.expires_at <= now + EXPIRY_MARGIN_SECS + } + + /// The `Cookie` header the refresh endpoint needs (it authenticates the browser session). + pub fn refresh_cookie(&self) -> Option { + let session = self.connect_session.as_deref()?; + let mut cookie = format!("connect_session={session}"); + if let Some(rt) = &self.refresh_token { + cookie.push_str(&format!("; oauth_refresh_token={rt}")); + } + Some(cookie) + } +} + +/// The two JWT claims we care about. +#[derive(Deserialize)] +struct JwtClaims { + exp: Option, + #[serde(alias = "client_id", alias = "azp")] + client_id: Option, +} + +fn decode_jwt_claims(token: &str) -> Option { + let payload = token.split('.').nth(1)?; + let bytes = base64::prelude::BASE64_URL_SAFE_NO_PAD + .decode(payload.trim_end_matches('=')) + .or_else(|_| base64::prelude::BASE64_URL_SAFE.decode(payload)) + .ok()?; + serde_json::from_slice(&bytes).ok() +} + +fn now_secs() -> i64 { + SystemTime::now().duration_since(UNIX_EPOCH).map(|d| d.as_secs() as i64).unwrap_or(0) +} + +/// The refresh exchange's response. +#[derive(Deserialize)] +pub struct RefreshResponse { + pub access_token: String, + pub refresh_token: Option, + pub expires_in: Option, +} + +#[cfg(test)] +mod tests { + use super::*; + + /// A JWT-shaped token with a chosen exp/client_id payload, base64url-encoded like the site's. + fn fake_jwt(payload: serde_json::Value) -> String { + let enc = |bytes: &[u8]| { + base64::prelude::BASE64_URL_SAFE_NO_PAD.encode(bytes).trim_end_matches('=').to_string() + }; + format!("{}.{}.sig", enc(b"{\"alg\":\"none\"}"), &enc(payload.to_string().as_bytes())) + } + + #[test] + fn reads_expiry_and_client_id_from_the_jwt() { + let auth = SoundcloudAuth::from_access_token( + fake_jwt(serde_json::json!({"exp": 5_000_000_i64, "client_id": "abc123"})), + None, + None, + ) + .unwrap(); + assert_eq!(auth.expires_at, 5_000_000); + assert_eq!(auth.client_id, "abc123"); + assert!(auth.is_expired(5_000_000 - 30)); // inside the margin + assert!(!auth.is_expired(5_000_000 - 3600)); + } + + #[test] + fn an_unparseable_token_still_authenticates_with_a_fallback_lifetime() { + let now = now_secs(); + let auth = SoundcloudAuth::from_access_token("not-a-jwt".into(), None, Some("sess".into())) + .unwrap(); + assert!(auth.expires_at > now); + assert_eq!(auth.client_id, FALLBACK_CLIENT_ID); + assert_eq!( + auth.refresh_cookie().as_deref(), + Some("connect_session=sess"), + "the refresh call authenticates with the session cookie" + ); + } + + #[test] + fn an_empty_token_is_no_auth() { + assert!(SoundcloudAuth::from_access_token(" ".into(), None, None).is_none()); + } + + #[test] + fn a_blob_without_a_username_round_trips() { + let auth = + SoundcloudAuth::from_access_token("not-a-jwt".into(), Some("rt".into()), None).unwrap(); + let json = serde_json::to_string(&auth).unwrap(); + let back: SoundcloudAuth = serde_json::from_str(&json).unwrap(); + assert_eq!(back, auth); + // An older persisted blob (no username key at all) still parses. + let v: serde_json::Value = serde_json::from_str(&json).unwrap(); + let mut obj = v.as_object().unwrap().clone(); + obj.remove("username"); + let old: SoundcloudAuth = serde_json::from_value(serde_json::Value::Object(obj)).unwrap(); + assert_eq!(old.username, None); + } +} diff --git a/crates/soundcloud/src/client.rs b/crates/soundcloud/src/client.rs index 26f2b53..b03a53d 100644 --- a/crates/soundcloud/src/client.rs +++ b/crates/soundcloud/src/client.rs @@ -1,14 +1,16 @@ -//! The `SoundCloud` guest client: `client_id` discovery + cache + one-retry, and every endpoint -//! the daemon bridge needs. Pure transport — no UI, no mpv. +//! The `SoundCloud` client: `client_id` discovery + cache + one-retry for guests, an OAuth +//! bearer (with rotating refresh) once the host installs a sign-in, and every endpoint the +//! daemon bridge needs. Pure transport — no UI, no mpv. use std::collections::HashMap; use std::path::PathBuf; -use std::time::Duration; +use std::time::{Duration, SystemTime, UNIX_EPOCH}; use serde::de::DeserializeOwned; use serde::Deserialize; use tokio::sync::RwLock; +use crate::auth::{SoundcloudAuth, REFRESH_URL}; use crate::models::*; use crate::{asset_script_srcs, downsample_waveform, scrape_client_id_from_js}; @@ -40,12 +42,26 @@ pub enum Error { pub type Result = std::result::Result; -/// A guest SoundCloud client. Cheap to clone the way callers expect an `Arc` wrapper (holds a -/// pooled `reqwest::Client` and a shared, refreshable `client_id`). +/// A SoundCloud client: guest-capable, and signed-in once an OAuth bearer is installed. Cheap +/// to clone the way callers expect an `Arc` wrapper (holds a pooled `reqwest::Client` and +/// shared, refreshable `client_id` / auth). pub struct SoundCloud { http: reqwest::Client, cache_dir: PathBuf, client_id: RwLock>, + /// The current sign-in, installed by the host after capture or a refresh. When present its + /// bearer rides every api-v2 request as `Authorization: OAuth `, which is what + /// unlocks `/me` and the personal endpoints. A sync (parking_lot) lock: the guards are + /// only ever held long enough to clone, never across an `.await` — so the plain accessors + /// below are safe to call from async context (a tokio `blocking_read` there panics). + auth: parking_lot::RwLock>, + /// Serialises refreshes: SoundCloud's refresh token is single-use and rotates on every + /// exchange, so two concurrent refreshes would spend one token twice and log the session + /// out. The loser re-reads what the winner installed instead of exchanging again. + refresh_lock: tokio::sync::Mutex<()>, + /// Called after a successful refresh so the host can persist the rotated pair (the crate + /// owns no storage for secrets). + on_rotate: parking_lot::RwLock>>, } impl SoundCloud { @@ -59,7 +75,14 @@ impl SoundCloud { .pool_idle_timeout(Duration::from_secs(90)) .build() .expect("reqwest client builds with rustls"); - SoundCloud { http, cache_dir, client_id: RwLock::new(None) } + SoundCloud { + http, + cache_dir, + client_id: RwLock::new(None), + auth: parking_lot::RwLock::new(None), + refresh_lock: tokio::sync::Mutex::new(()), + on_rotate: parking_lot::RwLock::new(None), + } } fn cache_file(&self) -> PathBuf { @@ -94,6 +117,136 @@ impl SoundCloud { Ok(id) } + // --- sign-in ------------------------------------------------------------- + + /// Install (or clear, with `None`) the sign-in. Takes effect through every clone + /// immediately, the same way the shared `client_id` does. + pub fn set_auth(&self, auth: Option) { + *self.auth.write() = auth; + } + + /// A snapshot of the current sign-in, if any. + pub fn auth(&self) -> Option { + self.auth.read().clone() + } + + /// Whether a bearer is installed (the client presents itself as signed in). An expired + /// bearer still counts until proven dead: expiry is repaired by `ensure_fresh` on use. + pub fn signed_in(&self) -> bool { + self.auth.read().is_some() + } + + /// Register the persistence hook for rotated tokens (see `SoundcloudAuth`'s single-use + /// refresh rotation). + pub fn set_on_rotate(&self, hook: std::sync::Arc) { + *self.on_rotate.write() = Some(hook); + } + + /// The signed-in user (`/me`). Requires a token — without one SoundCloud answers 401 and + /// this returns `Err(Api{{401}})`, which is also how the host detects a dead token. + pub async fn me(&self) -> Result { + self.ensure_fresh().await?; + let url = format!("{API}/me"); + let w: WireUser = self.get_json(&url, &[]).await?; + Ok(map_user(w)) + } + + /// Refresh the bearer if it is (nearly) expired, exactly once per rotation. A refresh + /// failure with a still-valid token is ignored (the request may well succeed); with a dead + /// token it surfaces so the caller can report the sign-in as broken. + async fn ensure_fresh(&self) -> Result<()> { + let Some(current) = self.auth.read().clone() else { return Ok(()) }; + let now = + SystemTime::now().duration_since(UNIX_EPOCH).map(|d| d.as_secs() as i64).unwrap_or(0); + if !current.is_expired(now) { + return Ok(()); + } + if current.refresh_token.is_none() || current.connect_session.is_none() { + // Nothing to rotate with: the bearer is what it is. Personal calls will 401 and the + // host will ask the user to sign in again. + return Ok(()); + } + let _guard = self.refresh_lock.lock().await; + // Re-check under the lock: a sibling refresh may have landed while this call queued. + let Some(auth) = self.auth.read().clone() else { return Ok(()) }; + if !auth.is_expired(now) { + return Ok(()); + } + let rotated = self.refresh_token(&auth).await?; + *self.auth.write() = Some(rotated.clone()); + if let Some(hook) = self.on_rotate.read().clone() { + hook(rotated); + } + Ok(()) + } + + /// The site's own refresh exchange. The response rotates BOTH tokens; the old refresh + /// token is dead server-side the moment this call succeeds. + async fn refresh_token(&self, auth: &SoundcloudAuth) -> Result { + let cookie = auth + .refresh_cookie() + .ok_or_else(|| Error::Api { status: 401, url: REFRESH_URL.to_string() })?; + let body = serde_json::json!({ + "client_id": auth.client_id, + "grant_type": "refresh_token", + "refresh_token": auth.refresh_token, + }); + let resp = self + .http + .post(REFRESH_URL) + .header(reqwest::header::COOKIE, cookie) + .header(reqwest::header::REFERER, HOME) + .header(reqwest::header::ORIGIN, "https://soundcloud.com") + .json(&body) + .send() + .await?; + let status = resp.status(); + if !status.is_success() { + return Err(Error::Api { status: status.as_u16(), url: REFRESH_URL.to_string() }); + } + let wire: crate::auth::RefreshResponse = resp.json().await?; + let now = + SystemTime::now().duration_since(UNIX_EPOCH).map(|d| d.as_secs() as i64).unwrap_or(0); + let mut rotated = SoundcloudAuth::from_access_token( + wire.access_token, + wire.refresh_token.or_else(|| auth.refresh_token.clone()), + auth.connect_session.clone(), + ) + .ok_or(Error::ClientId)?; + // The JWT's own exp wins; expires_in is the site's promise and the earlier of the two + // is the safe choice. + if let Some(secs) = wire.expires_in { + rotated.expires_at = rotated.expires_at.min(now + secs); + } + tracing::info!("soundcloud: refreshed the access token"); + Ok(rotated) + } + + /// The signed-in user's own playlists (`/users/{me}/playlists`). + pub async fn my_playlists(&self) -> Result> { + let me = self.me().await?; + let url = format!("{API}/users/{}/playlists", me.id); + let w: WireCollection = + self.get_json(&url, &[("limit", "50".into())]).await?; + Ok(w.collection.iter().map(map_playlist).collect()) + } + + /// The tracks the signed-in user liked (`/users/{me}/likes` — the same envelope + /// `user_likes` reads, reached through the token's identity). + pub async fn my_likes(&self) -> Result> { + let me = self.me().await?; + self.user_likes(me.id).await + } + + /// The users the signed-in account follows (`/users/{me}/followings`), for the + /// Following shelf. + pub async fn my_followings(&self) -> Result> { + let me = self.me().await?; + let url = format!("{API}/users/{}/followings", me.id); + let w: WireCollection = self.get_json(&url, &[("limit", "50".into())]).await?; + Ok(w.collection.into_iter().map(map_user).collect()) + } + /// Fetch soundcloud.com, collect its asset bundles, and scan them (last first) for a client_id. async fn scrape_client_id(&self) -> Result { let html = self.http.get(HOME).send().await?.text().await?; @@ -113,9 +266,16 @@ impl SoundCloud { // --- transport ----------------------------------------------------------- - /// GET `url` with `extra` query params plus the current `client_id`; on 401/403 re-scrape the - /// id once and retry. Returns the raw (decompressed) body bytes. + /// GET `url` with `extra` query params plus the current `client_id` (and the bearer token + /// when signed in); on 401/403 re-scrape the id once and retry. Returns the raw + /// (decompressed) body bytes. async fn get_bytes(&self, url: &str, extra: &[(&str, String)]) -> Result> { + let personal = url.starts_with(API) && is_personal_path(url); + if personal { + // A near-expiry bearer is repaired before the call, not after the 401: the + // rotating refresh must be spent exactly once. + self.ensure_fresh().await?; + } let id = self.client_id().await?; let resp = self.send(url, extra, &id).await?; let status = resp.status(); @@ -123,6 +283,12 @@ impl SoundCloud { return Ok(resp.bytes().await?.to_vec()); } if status == reqwest::StatusCode::UNAUTHORIZED || status == reqwest::StatusCode::FORBIDDEN { + // A signed-in 401 on a personal endpoint is a dead token, not a rotated public + // id; re-scraping cannot fix it, so surface the 401 (the host treats that as + // "token needs re-capture"). + if personal && self.signed_in() { + return Err(Error::Api { status: status.as_u16(), url: url.to_string() }); + } let id = self.refresh_client_id().await?; let resp = self.send(url, extra, &id).await?; let status = resp.status(); @@ -140,7 +306,12 @@ impl SoundCloud { extra: &[(&str, String)], client_id: &str, ) -> Result { - Ok(self.http.get(url).query(extra).query(&[("client_id", client_id)]).send().await?) + let mut req = self.http.get(url).query(extra).query(&[("client_id", client_id)]); + if let Some(token) = self.auth.read().as_ref().map(|a| a.access_token.clone()) { + // SoundCloud's web API takes its bearer scheme as `OAuth `, not `Bearer`. + req = req.header("Authorization", format!("OAuth {token}")); + } + Ok(req.send().await?) } /// GET + deserialize JSON, with the client_id retry. @@ -417,6 +588,22 @@ impl SoundCloud { } } +/// Whether an api-v2 URL asks for the signed-in user's own data (`/me`, or a personal +/// collection like `/users/{id}/likes|followings|playlists` when the id is the caller's). +/// A 401 here with a token installed means the token died — re-scraping the public +/// client_id cannot help, so `get_bytes` surfaces the 401 instead of burning a retry. +fn is_personal_path(url: &str) -> bool { + let Some(rest) = url.strip_prefix(API) else { return false }; + let rest = rest.trim_start_matches('/'); + if rest == "me" || rest.starts_with("me/") { + return true; + } + rest.starts_with("users/") + && ["/likes", "/followings", "/playlists", "/track_likes", "/playlist_likes"] + .iter() + .any(|suffix| rest.ends_with(suffix)) +} + /// Turn a `{collection, next_href}` envelope into a `Page`, deriving the next offset from the /// presence of `next_href` (SoundCloud paginates these endpoints by numeric offset). fn page(w: WireCollection, offset: u32, map: impl Fn(W) -> T) -> Page { diff --git a/crates/soundcloud/src/lib.rs b/crates/soundcloud/src/lib.rs index 7a5e1cc..ca285af 100644 --- a/crates/soundcloud/src/lib.rs +++ b/crates/soundcloud/src/lib.rs @@ -1,16 +1,22 @@ //! Ryotunes SoundCloud provider. //! -//! A guest-only client for SoundCloud's internal `api-v2` (no account, no OAuth). It discovers a -//! public `client_id` by scraping soundcloud.com's asset bundles, caches it in memory and on disk, -//! and re-scrapes once on a 401/403 (the id rotates). Tracks stream as HLS m3u8 playlists that mpv -//! plays directly; waveforms come from SoundCloud's own peak arrays, downsampled for the seek bar. +//! A client for SoundCloud's internal `api-v2`. Guest mode needs no account: it discovers a +//! public `client_id` by scraping soundcloud.com's asset bundles, caches it in memory and on +//! disk, and re-scrapes once on a 401/403 (the id rotates). Signed-in mode ([`SoundcloudAuth`]) +//! adds the web player's OAuth bearer — captured from a login window's cookie jar by the host — +//! which unlocks `/me`, the user's playlists/likes/followings, and their personal feed; the +//! access token's expiry is read from its JWT and refreshed through the site's own rotating +//! refresh-token exchange. Tracks stream as HLS m3u8 playlists that mpv plays directly; +//! waveforms come from SoundCloud's own peak arrays, downsampled for the seek bar. //! //! Boundary: this crate knows nothing about GPUI, Tauri, mpv, or UI state. It maps SoundCloud's //! (frequently field-absent) JSON into tolerant models and hands them to the daemon bridge. +mod auth; mod client; mod models; +pub use auth::SoundcloudAuth; pub use client::{Error, Result, SoundCloud}; pub use models::{ DiscoverItem, Page, Playlist, PlaylistDetail, SearchResults, Selection, SystemPlaylist, Track, From 17be735eba820b89dd80ff50a6bb19d2603a6f6a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 24 Sep 2026 19:01:06 +0000 Subject: [PATCH 156/183] release: v1.1.1 --- CHANGELOG.md | 2 ++ Cargo.lock | 22 +++++++++---------- Cargo.toml | 2 +- client/version | 2 +- packaging/arch/PKGBUILD | 2 +- .../linux/dev.ryoku.ryotunes.metainfo.xml | 2 +- src-tauri/tauri.conf.json | 2 +- ui/package.json | 2 +- 8 files changed, 19 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0439c12..b95bf14 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +## v1.1.1 - 2026-09-24 + - Added SoundCloud sign-in: a Ryotunes window opens the site's own sign-in (account or Google/Facebook/Apple), captures the session's OAuth token from the webview's cookie jar, proves it against `/me` before saving it, and keeps it alive through SoundCloud's rotating refresh. Signing in is optional — SoundCloud still browses and plays as a guest — but a signed-in account adds its own playlists, liked tracks and followed artists to Home, and the token survives restarts (an expired one says so instead of silently vanishing). - Home is now the merged feed: YouTube Music's shelves remain the spine (the default source, signed in or not), and every signed-in provider contributes its own shelves to the same page — Spotify's made-for-you rows when a Premium session exists, SoundCloud's personal rows when connected. Cards navigate and play across providers exactly as before; one provider being down never blanks the page. diff --git a/Cargo.lock b/Cargo.lock index 95bc5bd..d697295 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2438,7 +2438,7 @@ dependencies = [ [[package]] name = "innertube" -version = "1.1.0" +version = "1.1.1" dependencies = [ "hex", "reqwest 0.12.28", @@ -2943,7 +2943,7 @@ checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" [[package]] name = "listen-protocol" -version = "1.1.0" +version = "1.1.1" dependencies = [ "serde", "serde_json", @@ -3788,7 +3788,7 @@ checksum = "f6b464fbc74e149a392436b17d523f769e057cb6877f6a5c4618bc6f11800548" [[package]] name = "player" -version = "1.1.0" +version = "1.1.1" dependencies = [ "libc", "libmpv2", @@ -4703,7 +4703,7 @@ dependencies = [ [[package]] name = "ryotunes" -version = "1.1.0" +version = "1.1.1" dependencies = [ "anyhow", "async-trait", @@ -4733,7 +4733,7 @@ dependencies = [ [[package]] name = "ryotunes-cli" -version = "1.1.0" +version = "1.1.1" dependencies = [ "ryotunes-protocol", "serde", @@ -4742,7 +4742,7 @@ dependencies = [ [[package]] name = "ryotunes-core" -version = "1.1.0" +version = "1.1.1" dependencies = [ "anyhow", "async-trait", @@ -4778,7 +4778,7 @@ dependencies = [ [[package]] name = "ryotunes-protocol" -version = "1.1.0" +version = "1.1.1" dependencies = [ "serde", "serde_json", @@ -4786,7 +4786,7 @@ dependencies = [ [[package]] name = "ryotunes-soundcloud" -version = "1.1.0" +version = "1.1.1" dependencies = [ "base64 0.22.1", "parking_lot", @@ -4801,7 +4801,7 @@ dependencies = [ [[package]] name = "ryotunes-spotify" -version = "1.1.0" +version = "1.1.1" dependencies = [ "anyhow", "bytes", @@ -4825,7 +4825,7 @@ dependencies = [ [[package]] name = "ryotunesd" -version = "1.1.0" +version = "1.1.1" dependencies = [ "anyhow", "async-trait", @@ -5589,7 +5589,7 @@ dependencies = [ [[package]] name = "sync-server" -version = "1.1.0" +version = "1.1.1" dependencies = [ "futures-util", "listen-protocol", diff --git a/Cargo.toml b/Cargo.toml index 8ae70ec..19af044 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ members = [ ] [workspace.package] -version = "1.1.0" +version = "1.1.1" edition = "2021" license = "GPL-3.0-or-later" diff --git a/client/version b/client/version index 9084fa2..524cb55 100644 --- a/client/version +++ b/client/version @@ -1 +1 @@ -1.1.0 +1.1.1 diff --git a/packaging/arch/PKGBUILD b/packaging/arch/PKGBUILD index fce1521..c6e5b08 100644 --- a/packaging/arch/PKGBUILD +++ b/packaging/arch/PKGBUILD @@ -2,7 +2,7 @@ # Run from packaging/arch with: makepkg -si pkgname=ryotunes -pkgver=1.1.0 +pkgver=1.1.1 pkgrel=1 # epoch=1 is permanent: the v1 reset publishes 1:X.Y.Z, which pacman ranks above # the legacy 2.x line an existing machine may carry, so `pacman -U` still upgrades. diff --git a/packaging/linux/dev.ryoku.ryotunes.metainfo.xml b/packaging/linux/dev.ryoku.ryotunes.metainfo.xml index 46f7850..91e8734 100644 --- a/packaging/linux/dev.ryoku.ryotunes.metainfo.xml +++ b/packaging/linux/dev.ryoku.ryotunes.metainfo.xml @@ -12,5 +12,5 @@ ryotunes.desktop ryotunes AudioVideoAudio - + diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index f0a30e2..7cad244 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "https://schema.tauri.app/config/2", "productName": "Ryotunes", - "version": "1.1.0", + "version": "1.1.1", "identifier": "dev.ryoku.ryotunes", "build": { "frontendDist": "../ui/build", diff --git a/ui/package.json b/ui/package.json index 98ff446..570cd9e 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,7 +1,7 @@ { "name": "ui", "private": true, - "version": "1.1.0", + "version": "1.1.1", "type": "module", "scripts": { "dev": "vite dev", From 967278987921c85d51f7c398e864c70afa508d3e Mon Sep 17 00:00:00 2001 From: carlos Date: Thu, 24 Sep 2026 18:35:23 -0400 Subject: [PATCH 157/183] fix: batch downloads, group collections, and a diagnostics log - Collection downloads (albums/playlists) were broken from the start: CollectionEntry lacked #[serde(rename_all = "camelCase")] while the client posts camelCase, so enqueue_collection always died at deserialization with "missing field video_id". Single-track downloads were unaffected. The unit test built the struct in Rust and never crossed the JSON boundary, which is how it shipped green. - Batch jobs now carry their collection label/kind; the downloads queue and history collapse every batch into one card (cover, kind, aggregate progress, expandable track rows) instead of a wall of anonymous rows. Collection tracks land in a folder named after the collection on disk; FolderIndex's recursive stem walk keeps dedup working across layouts. - New crates/ryotunesd/src/diagnostics.rs: a ring buffer + rotating file ($XDG_DATA_HOME/dev.ryoku.ryotunes/logs/ryotunesd.log) fed by a tracing layer (warn+), the server's RPC-error chokepoint, the panic hook, download worker failures, and the client's log_client_error RPC. The ring seeds from the file tail at startup, so evidence survives a crash or upgrade. The client buffers its own failures (not-connected rejects, socket drops, error toasts) while the daemon is down and flushes them on reconnect. - Settings > Diagnostics page: filters by level/source/text, copy-all to clipboard, open-folder, manual refresh (no polling). - Fixed a pre-existing flake: Temp::new() keyed test dirs on pid+nanos, which collides across parallel test threads sharing a coarse clock; a process-local counter makes them unique (0/25 runs after, 1/12 before). - client/Logs.qml needed the Quickshell import for the Singleton type; DiagnosticsPage renamed its snapshot property from 'data' because Item.data is the default children property and shadowing it silently swallowed every child item. --- CHANGELOG.md | 4 + client/Daemon.qml | 8 + client/Downloads.qml | 23 +- client/Logs.qml | 99 +++++ client/lib/collections.js | 61 ++++ client/pages/DiagnosticsPage.qml | 282 ++++++++++++++ client/pages/DownloadsPage.qml | 222 ++++++++++- client/pages/SettingsPage.qml | 12 + client/qmldir | 1 + client/shell.qml | 3 + client/tests/tst_collections.qml | 78 ++++ crates/ryotunesd/Cargo.toml | 2 +- crates/ryotunesd/src/diagnostics.rs | 545 ++++++++++++++++++++++++++++ crates/ryotunesd/src/downloads.rs | 157 +++++++- crates/ryotunesd/src/main.rs | 15 +- crates/ryotunesd/src/methods.rs | 27 ++ crates/ryotunesd/src/server.rs | 21 +- 17 files changed, 1538 insertions(+), 22 deletions(-) create mode 100644 client/Logs.qml create mode 100644 client/lib/collections.js create mode 100644 client/pages/DiagnosticsPage.qml create mode 100644 client/tests/tst_collections.qml create mode 100644 crates/ryotunesd/src/diagnostics.rs diff --git a/CHANGELOG.md b/CHANGELOG.md index b95bf14..2d5e44d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased +- Fixed "Download playlist / Download album" always failing with "entries: missing field `video_id`": the batch endpoint's wire format was snake_case while the client posts camelCase, so no collection download was ever admitted. Single-track downloads were unaffected, which is why only albums and playlists broke. +- Album and playlist downloads now read as one collection: the queue and history group every batch under a single card showing the album/playlist cover, kind, aggregate progress and how many tracks are saved, waiting, failed or cancelled — expandable to its per-track rows. Batch tracks also land in a folder named after their collection on disk, and re-downloading still dedups against them wherever they sit. +- Added Settings ▸ Diagnostics: one rolling record of everything that went wrong, for both halves of the app. The daemon logs its own warnings and errors, every failed request, and panics to a ring buffer and a rotating file (`$XDG_DATA_HOME/dev.ryoku.ryotunes/logs/ryotunesd.log`); the client forwards the failures it sees (rejected actions, lost connections, error toasts), buffering them while the daemon is down and delivering them on reconnect. The page filters by level, source and text, copies the whole list to the clipboard, and opens the log folder — so "songs won't play" finally has evidence to show instead of a guess. + ## v1.1.1 - 2026-09-24 - Added SoundCloud sign-in: a Ryotunes window opens the site's own sign-in (account or Google/Facebook/Apple), captures the session's OAuth token from the webview's cookie jar, proves it against `/me` before saving it, and keeps it alive through SoundCloud's rotating refresh. Signing in is optional — SoundCloud still browses and plays as a guest — but a signed-in account adds its own playlists, liked tracks and followed artists to Home, and the token survives restarts (an expired one says so instead of silently vanishing). diff --git a/client/Daemon.qml b/client/Daemon.qml index 4cf2290..1bd2bb4 100644 --- a/client/Daemon.qml +++ b/client/Daemon.qml @@ -17,6 +17,10 @@ Singleton { // A daemon event (no id): name plus its payload, fanned out to Playback and any surface. signal event(string name, var data) + // A failure the daemon itself cannot record (not connected, socket dropped). `level` is + // "warn"/"error"; Logs subscribes and forwards into the diagnostics record. Emitted as a + // signal rather than calling Logs directly so the two singletons do not import each other. + signal callFailed(string level, string target, string message) // The `subscribe` reply: the full { playback, queue, settings, auth } snapshot, delivered on // the first subscribe and again after every reconnect so Playback resynchronises each time. signal snapshot(var data) @@ -40,6 +44,9 @@ Singleton { function call(method, params) { return new Promise((resolve, reject) => { if (!root.connected) { + // The daemon never sees this failure, so it can only be recorded here: a user + // clicking play against a dead daemon is a support ticket with no other trace. + root.callFailed("warn", "rpc:" + method, "ryotunesd is not connected"); reject({ code: "disconnected", message: "ryotunesd is not connected" }); return; } @@ -91,6 +98,7 @@ Singleton { if (connection.connected) { if (root.wantSubscribe) root._subscribe(); } else { + root.callFailed("error", "daemon", "connection to ryotunesd lost (socket closed)"); for (const id in root.pending) root.pending[id].reject({ code: "disconnected", message: "connection lost" }); root.pending = {}; } diff --git a/client/Downloads.qml b/client/Downloads.qml index e6017f1..c891605 100644 --- a/client/Downloads.qml +++ b/client/Downloads.qml @@ -23,6 +23,19 @@ Singleton { property string error: "" property bool addingAlbum: false + // Which collection cards the downloads page has expanded (label -> true). Lives on the + // singleton so the page's inline components (ComponentBehavior: Bound, no outer ids) can + // toggle it; replaced whole so bindings on it re-evaluate. + property var openCollections: ({}) + function toggleCollection(label) { + var next = Object.assign({}, root.openCollections); + if (next[label]) + delete next[label]; + else + next[label] = true; + root.openCollections = next; + } + // The daemon's persisted download preferences, fetched lazily on demand; null until loaded. The // settings page owns editing them (it calls the daemon directly); this is an optional read for a // surface that wants to show the destination folder. @@ -145,12 +158,16 @@ Singleton { // folder in one pass (exact name, collision suffix, or the same normalized "artist title" // from a different upload) and against the queue, so re-downloading an album you half own // adds only the missing tracks and the toast can say exactly what happened. - function toEntry(song, fallbackArtist, fallbackThumb) { + // `collection`/`collectionKind` name the album/playlist the batch came from; the daemon + // stamps them onto every job it admits so the downloads page can group them under one card. + function toEntry(song, fallbackArtist, fallbackThumb, collection, collectionKind) { return { videoId: song.video_id, title: song.title, artists: song.artists || fallbackArtist || "", - thumbnail: song.thumbnail || fallbackThumb || "" + thumbnail: song.thumbnail || fallbackThumb || "", + collection: collection || "", + collectionKind: collectionKind || "" }; } @@ -202,7 +219,7 @@ Singleton { // back to the page's artist, then its cover, exactly as the old per-track path did. var entries = []; for (var i = 0; i < tracks.length; i++) - entries.push(root.toEntry(tracks[i], page.artist, page.thumbnail)); + entries.push(root.toEntry(tracks[i], page.artist, page.thumbnail, page.title, label)); return root.enqueueCollection(entries, label); }).catch((e) => { Playback.toast(((e && e.message) ? e.message : "Could not download " + label), "error"); diff --git a/client/Logs.qml b/client/Logs.qml new file mode 100644 index 0000000..fd95b14 --- /dev/null +++ b/client/Logs.qml @@ -0,0 +1,99 @@ +pragma Singleton +import QtQuick +import Quickshell + +// The client's side of the diagnostics record. Every failure the UI can see — a rejected RPC, +// a lost daemon connection, a playback stop, a QML binding error — goes through root.error()/ +// root.warn(). While the daemon is reachable the entry is forwarded straight to `log_client_error` +// (it lands in the same ring + file as daemon entries, tagged `client`); while it is not, entries +// buffer here (bounded) and flush on the next successful connection, because "the daemon died" +// is exactly the failure whose evidence must survive. A short window around each burst collapses +// repeats of the same message so a retry loop cannot flood the log. +Singleton { + id: root + + readonly property int maxBuffer: 200 + property var buffer: [] + + // Last-forwarded key + time, for the repeat window. + property string lastKey: "" + property real lastAt: 0 + + Connections { + target: Daemon + function onConnectedChanged(): void { + if (Daemon.connected) + root.flush(); + } + function onCallFailed(level, target, message) { + root._record(level, target, message); + } + } + + // Every failure the user actually sees passes through the toast layer: local validation + // ("sign in first"), daemon events (cover-error, playback stops) and surfaced RPC errors. + // Recording them means a screenshot of a toast is never the only evidence of a bug. + Connections { + target: Playback + function onToast(message, kind) { + if (kind === "error") + root._record("error", "toast", message); + } + } + function warn(target, message) { + root._record("warn", target, message); + } + function error(target, message) { + root._record("error", target, message); + } + + function _record(level, target, message) { + var text = String(message === undefined ? "" : message); + if (text === "") + text = "unknown failure"; + // Collapse an exact repeat of the same level/target/message inside 3 s. + var key = level + "\u0000" + target + "\u0000" + text; + var now = Date.now(); + if (key === root.lastKey && now - root.lastAt < 3000) + return; + root.lastKey = key; + root.lastAt = now; + + var entry = { level: level, target: target, message: text }; + if (Daemon.connected) { + Daemon.call("log_client_error", entry).catch(function () { + root._buffer(entry); + }); + } else { + root._buffer(entry); + } + } + + function _buffer(entry) { + var next = root.buffer.slice(); + next.push(entry); + if (next.length > root.maxBuffer) + next = next.slice(next.length - root.maxBuffer); + root.buffer = next; + } + + // Deliver everything buffered while the daemon was down. One failure to post stops the + // flush (the rest stay buffered for the next connection); entries carry their own text, so + // a daemon that is flapping still accumulates them locally. + function flush() { + if (root.buffer.length === 0) + return; + var pending = root.buffer; + root.buffer = []; + var chain = Promise.resolve(); + for (var i = 0; i < pending.length; i++) { + (function (entry) { + chain = chain.then(function () { + return Daemon.call("log_client_error", entry); + }).catch(function () { + root._buffer(entry); + }); + })(pending[i]); + } + } +} diff --git a/client/lib/collections.js b/client/lib/collections.js new file mode 100644 index 0000000..159330e --- /dev/null +++ b/client/lib/collections.js @@ -0,0 +1,61 @@ +.pragma library + +// Collection grouping for the downloads queue/history. The daemon stamps every batch-added job +// with its `collection` label and `collectionKind`; the page collapses jobs that share a label +// into one card so a 40-track album reads as one line, while single tracks stay flat rows. +// Pure over plain objects (the daemon's job JSON) so it runs under qmltestrunner. +// +// Result shape: a list of `{ job }` (flat row) or `{ group }` entries, where a group is +// `{ label, kind, jobs }`. A group is placed where its first member sorted, preserving the +// caller's queue/history order. + +function groupJobs(list) { + var out = []; + var byLabel = {}; + for (var i = 0; i < list.length; i++) { + var j = list[i]; + var label = (j && j.collection) ? String(j.collection) : ""; + if (label === "") { + out.push({ job: j }); + continue; + } + var g = byLabel[label]; + if (!g) { + g = { label: label, kind: j.collectionKind || "collection", jobs: [] }; + byLabel[label] = g; + out.push({ group: g }); + } + g.jobs.push(j); + } + return out; +} + +// Aggregate progress for one collection card. Completed tracks count as full; a downloading +// one contributes its own percent; failed/cancelled count as finished attempts (they stop the +// bar from ever reaching 100 while nothing is moving). +function stats(jobs) { + var s = { done: 0, waiting: 0, moving: 0, failed: 0, cancelled: 0, percent: 0 }; + if (!jobs || jobs.length === 0) + return s; + var sum = 0; + for (var i = 0; i < jobs.length; i++) { + var j = jobs[i]; + if (j.status === "completed") { + s.done++; + sum += 100; + } else if (j.status === "downloading") { + s.moving++; + sum += Math.max(0, Math.min(100, j.progress || 0)); + } else if (j.status === "queued") { + s.waiting++; + } else if (j.status === "failed") { + s.failed++; + sum += 100; + } else if (j.status === "cancelled") { + s.cancelled++; + sum += 100; + } + } + s.percent = Math.round(sum / jobs.length); + return s; +} diff --git a/client/pages/DiagnosticsPage.qml b/client/pages/DiagnosticsPage.qml new file mode 100644 index 0000000..8b37e81 --- /dev/null +++ b/client/pages/DiagnosticsPage.qml @@ -0,0 +1,282 @@ +pragma ComponentBehavior: Bound +import QtQuick +import QtQuick.Layouts +import Quickshell +import Ryoku.Ui.Singletons +import "../" +import "../components" + +// The diagnostics surface (Settings ▸ Diagnostics): everything that went wrong, both halves of +// the app in one list. The daemon records its own warn/error tracing, every failed RPC, panics, +// and the client's forwarded failures into a ring + a rotating file; this page reads them back +// through `get_logs` with level/source/text filters. Refresh is manual (no polling, the same +// rule as software updates). "Open folder" reveals the file for attaching to a bug report; +// "Copy all" puts a plain-text dump on the clipboard for the same reason. +ColumnLayout { + id: root + spacing: Style.sp(3) + + property var log: null // the get_logs snapshot + property bool loading: false + property string error: "" + property string level: "warn" // all | warn | error + property string source: "all" // all | daemon | client + property string query: "" + readonly property var entries: (root.log && root.log.entries) ? root.log.entries : [] + + readonly property var levels: [ + { k: "all", l: "Everything" }, + { k: "warn", l: "Warnings +" }, + { k: "error", l: "Errors" } + ] + readonly property var sources: [ + { k: "all", l: "Both" }, + { k: "daemon", l: "Daemon" }, + { k: "client", l: "App" } + ] + + function fmtTime(ts) { + if (!ts) + return ""; + var d = new Date(ts); + function p(n) { return (n < 10 ? "0" : "") + n; } + return p(d.getMonth() + 1) + "-" + p(d.getDate()) + " " + p(d.getHours()) + ":" + p(d.getMinutes()) + ":" + p(d.getSeconds()); + } + function fmtBytes(n) { + if (!n) + return "0 B"; + if (n < 1024) + return n + " B"; + if (n < 1024 * 1024) + return Math.round(n / 1024) + " KB"; + return (n / (1024 * 1024)).toFixed(1) + " MB"; + } + + function refresh() { + root.loading = true; + root.error = ""; + Daemon.call("get_logs", { + level: root.level, + source: root.source, + query: root.query, + limit: 500 + }).then((d) => { + root.log = d; + root.loading = false; + }).catch((e) => { + root.loading = false; + root.error = (e && e.message) ? e.message : "Could not read the log"; + }); + } + + function copyAll() { + var lines = []; + for (var i = 0; i < root.entries.length; i++) { + var e = root.entries[i]; + lines.push(new Date(e.ts).toISOString() + " [" + e.level + "] " + e.source + " " + e.target + ": " + e.message); + } + clip.text = lines.join("\n"); + clip.copy(); + Playback.toast(lines.length + " log lines copied", "success"); + } + + Component.onCompleted: root.refresh() + TextEdit { id: clip; visible: false; width: 0; height: 0 } + + // ── header ──────────────────────────────────────────────────────────────────────────── + ColumnLayout { + Layout.fillWidth: true + spacing: Style.sp(1) + Text { + Layout.fillWidth: true + text: "Diagnostics" + color: Tokens.ink; font.family: Style.fontDisplay; font.pixelSize: Style.fs.lg + } + Text { + Layout.fillWidth: true + text: "Everything Ryotunes and its background service got wrong, newest first — including failures from before this session. Use it when something \"works for everyone else but me\"." + color: Tokens.inkMuted; font.family: Style.fontUi; font.pixelSize: Style.fs.sm; wrapMode: Text.WordWrap + } + } + + // ── summary strip ───────────────────────────────────────────────────────────────────── + RowLayout { + Layout.fillWidth: true + spacing: Style.sp(4) + ColumnLayout { + Layout.fillWidth: true + spacing: 1 + Text { + text: root.log ? (root.log.errors + " errors · " + root.log.warnings + " warnings recorded") : "—" + color: Tokens.ink; font.family: Style.fontUi; font.pixelSize: Style.fs.md; font.weight: Font.Medium + } + Text { + Layout.fillWidth: true + text: root.log && root.log.path ? ("File: " + root.log.path + " (" + root.fmtBytes(root.log.fileBytes) + ")") : "Log file not available" + color: Tokens.inkFaint; font.family: Style.fontMono; font.pixelSize: Style.fs.xs + elide: Text.ElideMiddle + } + } + Pill { + Layout.alignment: Qt.AlignVCenter + label: "Open folder" + icon: "folder" + onClicked: Daemon.call("open_logs_folder").catch((e) => Playback.toast((e && e.message) ? e.message : "Could not open the folder", "error")) + } + Pill { + Layout.alignment: Qt.AlignVCenter + label: "Copy all" + icon: "link" + enabled: root.entries.length > 0 + onClicked: root.copyAll() + } + Pill { + Layout.alignment: Qt.AlignVCenter + label: root.loading ? "Refreshing…" : "Refresh" + icon: "loading" + enabled: !root.loading + onClicked: root.refresh() + } + } + + // ── filters ─────────────────────────────────────────────────────────────────────────── + RowLayout { + Layout.fillWidth: true + spacing: Style.sp(3) + + RowLayout { + spacing: Style.sp(1) + Repeater { + model: root.levels + delegate: Pill { + required property var modelData + label: modelData.l + active: root.level === modelData.k + onClicked: { root.level = modelData.k; root.refresh(); } + } + } + } + RowLayout { + spacing: Style.sp(1) + Repeater { + model: root.sources + delegate: Pill { + required property var modelData + label: modelData.l + active: root.source === modelData.k + onClicked: { root.source = modelData.k; root.refresh(); } + } + } + } + Rectangle { + Layout.fillWidth: true + Layout.minimumWidth: Style.sp(30) + implicitHeight: Style.ctlH + radius: Style.radius + color: Tokens.paperLift + border.width: searchField.activeFocus ? 2 : 1 + border.color: searchField.activeFocus ? Tokens.ink : Tokens.line + TextInput { + id: searchField + anchors.fill: parent + anchors.leftMargin: Style.sp(2) + anchors.rightMargin: Style.sp(2) + verticalAlignment: TextInput.AlignVCenter + clip: true + selectByMouse: true + color: Tokens.ink + font.family: Style.fontUi + font.pixelSize: Style.fs.sm + onAccepted: root.refresh() + Accessible.name: "Search log messages" + } + Text { + anchors.verticalCenter: parent.verticalCenter + anchors.left: parent.left + anchors.leftMargin: Style.sp(2) + visible: searchField.text === "" + text: "Search messages…" + color: Tokens.inkFaint + font.family: Style.fontUi + font.pixelSize: Style.fs.sm + } + } + Pill { + label: "Search" + icon: "search" + enabled: !root.loading + onClicked: root.refresh() + } + } + + // ── body ────────────────────────────────────────────────────────────────────────────── + Text { + Layout.fillWidth: true + visible: root.error !== "" + text: root.error + color: Style.alert; font.family: Style.fontUi; font.pixelSize: Style.fs.sm; wrapMode: Text.WordWrap + } + Text { + Layout.fillWidth: true + visible: !root.loading && root.error === "" && root.entries.length === 0 + text: "Nothing here. No failures have been recorded with these filters — that is good news." + color: Tokens.inkMuted; font.family: Style.fontUi; font.pixelSize: Style.fs.sm; wrapMode: Text.WordWrap + } + + // Bounded list: the page lives inside the settings scroller, so cap the rows and let the + // filters narrow instead of growing the settings page to thousands of items. + ColumnLayout { + Layout.fillWidth: true + spacing: 0 + Repeater { + model: Math.min(root.entries.length, 200) + delegate: RowLayout { + id: row + required property int index + readonly property var entry: root.entries[index] + Layout.fillWidth: true + Layout.topMargin: Style.sp(1) + spacing: Style.sp(2) + + Rectangle { + Layout.alignment: Qt.AlignTop + Layout.topMargin: Style.sp(0.5) + width: 8 + height: 8 + radius: 4 + color: row.entry && row.entry.level === "error" ? Style.alert : Tokens.sun + } + Text { + Layout.alignment: Qt.AlignTop + text: root.fmtTime(row.entry ? row.entry.ts : 0) + color: Tokens.inkFaint; font.family: Style.fontMono; font.pixelSize: Style.fs.xs + } + Text { + Layout.alignment: Qt.AlignTop + text: row.entry ? row.entry.source + " " + row.entry.target : "" + color: Tokens.inkDim; font.family: Style.fontMono; font.pixelSize: Style.fs.xs + Layout.maximumWidth: Style.sp(46) + elide: Text.ElideMiddle + } + Text { + Layout.fillWidth: true + Layout.minimumWidth: 0 + text: row.entry ? row.entry.message : "" + textFormat: Text.PlainText + color: Tokens.ink; font.family: Style.fontMono; font.pixelSize: Style.fs.xs + wrapMode: Text.WordWrap + maximumLineCount: 4 + elide: Text.ElideRight + Accessible.role: Accessible.StaticText + Accessible.name: text + } + } + } + } + Text { + Layout.fillWidth: true + visible: root.entries.length > 200 + text: "Showing the newest 200 of " + root.entries.length + " matching lines — narrow with the filters or open the file." + color: Tokens.inkFaint; font.family: Style.fontUi; font.pixelSize: Style.fs.sm; wrapMode: Text.WordWrap + } +} diff --git a/client/pages/DownloadsPage.qml b/client/pages/DownloadsPage.qml index 8345cbf..93b1e55 100644 --- a/client/pages/DownloadsPage.qml +++ b/client/pages/DownloadsPage.qml @@ -2,6 +2,7 @@ pragma ComponentBehavior: Bound import QtQuick import QtQuick.Layouts import Ryoku.Ui.Singletons +import "../lib/collections.js" as Collections import "../" import "../components" @@ -42,6 +43,12 @@ Item { out.sort((a, b) => ((b.finishedAt || b.createdAt || 0) - (a.finishedAt || a.createdAt || 0))); return out; } + + // Collapse jobs that share a collection label into one card; single tracks stay flat rows + // (Collections.groupJobs). The card sits where its first job sorted, so queue/history order + // is preserved. + readonly property var queueGroups: Collections.groupJobs(page.queue) + readonly property var historyGroups: Collections.groupJobs(page.history) readonly property string folderPath: (Downloads.settings && Downloads.settings.path) ? Downloads.settings.path : "" Component.onCompleted: { @@ -272,6 +279,209 @@ Item { } } + // One album/playlist batch collapsed into a single card: cover, kind, aggregate progress, + // and an expandable list of its per-track rows. A collection is what the user asked for, + // so the queue shows one card per collection instead of a hundred anonymous rows. + component CollectionCard: Rectangle { + id: cc + property var group: null + readonly property var jobs: cc.group ? cc.group.jobs : [] + readonly property string label: cc.group ? cc.group.label : "" + readonly property bool open: Downloads.openCollections[label] === true + readonly property var stats: Collections.stats(cc.jobs) + readonly property int doneCount: cc.stats.done + readonly property int waitingCount: cc.stats.waiting + readonly property int movingCount: cc.stats.moving + readonly property int failedCount: cc.stats.failed + readonly property int cancelledCount: cc.stats.cancelled + readonly property bool active: cc.movingCount + cc.waitingCount > 0 + readonly property int percent: cc.stats.percent + readonly property string summary: { + var parts = []; + if (movingCount > 0) + parts.push("Downloading " + doneCount + " of " + jobs.length); + else if (doneCount > 0) + parts.push(doneCount + " saved"); + if (waitingCount > 0) + parts.push(waitingCount + " waiting"); + if (failedCount > 0) + parts.push(failedCount + " failed"); + if (cancelledCount > 0) + parts.push(cancelledCount + " cancelled"); + return parts.join(" \u00b7 "); + } + // The first artwork the batch carried; album pages always have one. + readonly property string cover: { + for (var i = 0; i < jobs.length; i++) + if (jobs[i].thumbnail) + return jobs[i].thumbnail; + return ""; + } + + implicitHeight: body.implicitHeight + Style.sp(4) + radius: Style.radius + color: cardHover.hovered ? Tokens.tint5 : "transparent" + Behavior on color { ColorAnimation { duration: Style.motion.snap } } + HoverHandler { id: cardHover } + + ColumnLayout { + id: body + anchors.left: parent.left + anchors.right: parent.right + anchors.top: parent.top + anchors.margins: Style.sp(2) + spacing: Style.sp(1) + + RowLayout { + id: header + Layout.fillWidth: true + spacing: Style.sp(3) + + Artwork { + Layout.alignment: Qt.AlignVCenter + url: cc.cover + px: Style.sp(11) + } + ColumnLayout { + Layout.fillWidth: true + Layout.minimumWidth: 0 + spacing: Style.sp(0.5) + Text { + text: (cc.group && cc.group.kind === "album") ? "Album" : "Playlist" + textFormat: Text.PlainText + color: Tokens.inkFaint + font.family: Style.fontMono + font.pixelSize: Style.fs.micro + font.letterSpacing: Style.trackMicro + } + Text { + Layout.fillWidth: true + text: cc.label + textFormat: Text.PlainText + color: Tokens.ink + font.family: Style.fontUi + font.pixelSize: Style.fs.md + font.weight: Font.Medium + elide: Text.ElideRight + } + // aggregate progress while anything is still moving + RowLayout { + Layout.fillWidth: true + spacing: Style.sp(2) + visible: cc.active + Rectangle { + Layout.fillWidth: true + Layout.maximumWidth: Style.sp(60) + Layout.alignment: Qt.AlignVCenter + implicitHeight: Style.sp(1) + radius: height / 2 + color: Tokens.lineSoft + Rectangle { + height: parent.height + width: parent.width * cc.percent / 100 + radius: height / 2 + color: Style.accent + Behavior on width { + enabled: !Tokens.reduceMotion + NumberAnimation { duration: Style.motion.move; easing.type: Easing.OutCubic } + } + } + } + Text { + text: cc.percent + "%" + textFormat: Text.PlainText + color: Tokens.inkMuted + font.family: Style.fontMono + font.pixelSize: Style.fs.sm + } + } + Text { + Layout.fillWidth: true + text: cc.summary + textFormat: Text.PlainText + visible: text !== "" + color: (cc.failedCount + cc.cancelledCount) > 0 ? Style.alert : Tokens.inkMuted + font.family: Style.fontUi + font.pixelSize: Style.fs.sm + elide: Text.ElideRight + } + } + + // Reveal the collection folder (any completed file sits in it). + IconAction { + Layout.alignment: Qt.AlignVCenter + visible: cc.doneCount > 0 + icon: "folder" + iconSize: Style.fs.md + diameter: Style.sp(9) + a11y: "Open " + cc.label + " folder" + onClicked: { + for (var i = 0; i < cc.jobs.length; i++) + if (cc.jobs[i].status === "completed") { + Downloads.open(cc.jobs[i].id); + return; + } + } + } + // Cancel every unfinished track of this collection. + IconAction { + Layout.alignment: Qt.AlignVCenter + visible: cc.active + icon: "close" + iconSize: Style.fs.md + diameter: Style.sp(9) + a11y: "Cancel " + cc.label + " downloads" + onClicked: { + for (var i = 0; i < cc.jobs.length; i++) + if (cc.jobs[i].status === "downloading" || cc.jobs[i].status === "queued") + Downloads.cancel(cc.jobs[i].id); + } + } + IconAction { + Layout.alignment: Qt.AlignVCenter + icon: cc.open ? "chevron-down" : "chevron-right" + iconSize: Style.fs.md + diameter: Style.sp(9) + a11y: (cc.open ? "Collapse " : "Expand ") + cc.label + onClicked: Downloads.toggleCollection(cc.label) + } + } + + // Expanded: the per-track rows, indented under their collection. + ColumnLayout { + id: rows + Layout.fillWidth: true + Layout.leftMargin: Style.sp(4) + visible: cc.open + spacing: 0 + Repeater { + model: cc.jobs + delegate: JobRow { + required property var modelData + job: modelData + } + } + } + } + } + + // One entry of the grouped queue/history list: a collection card when the batch shares a + // label, a flat JobRow for a single track. + component GroupRow: Loader { + required property var entry + Layout.fillWidth: true + sourceComponent: entry && entry.group ? collectionCard : jobRow + readonly property var group: entry ? entry.group : null + readonly property var job: entry ? entry.job : null + Component { + id: collectionCard + CollectionCard { group: parent.group } + } + Component { + id: jobRow + JobRow { job: parent.job } + } + } Flickable { id: scroll anchors.fill: parent @@ -432,10 +642,10 @@ Item { font.pixelSize: Style.fs.sm } Repeater { - model: page.queue - delegate: JobRow { + model: page.queueGroups + delegate: GroupRow { required property var modelData - job: modelData + entry: modelData } } } @@ -469,10 +679,10 @@ Item { font.pixelSize: Style.fs.sm } Repeater { - model: page.history - delegate: JobRow { + model: page.historyGroups + delegate: GroupRow { required property var modelData - job: modelData + entry: modelData } } } diff --git a/client/pages/SettingsPage.qml b/client/pages/SettingsPage.qml index ec5fc99..0715c7c 100644 --- a/client/pages/SettingsPage.qml +++ b/client/pages/SettingsPage.qml @@ -66,6 +66,7 @@ Item { { k: "account", l: "Account", jp: "鍵" }, { k: "local", l: "Local music", jp: "音源" }, { k: "playlists", l: "Playlists", jp: "転送" }, + { k: "diagnostics", l: "Diagnostics", jp: "診" }, { k: "about", l: "About", jp: "力" } ] @@ -514,6 +515,7 @@ Item { else if (page.section === "account") h = accountCol.implicitHeight; else if (page.section === "local") h = localCol.implicitHeight; else if (page.section === "playlists") h = playlistsCol.implicitHeight; + else if (page.section === "diagnostics") h = diagnosticsLoader.item ? diagnosticsLoader.item.implicitHeight : 0; else h = aboutCol.implicitHeight; return h + Style.sp(16); } @@ -1318,6 +1320,16 @@ Item { } } + // ─────────────────────────── DIAGNOSTICS ─────────────────────────── + Loader { + id: diagnosticsLoader + active: page.section === "diagnostics" + visible: active + anchors { left: parent.left; right: parent.right; top: parent.top; leftMargin: Style.sp(6); rightMargin: Style.sp(6); topMargin: Style.sp(4) } + source: "DiagnosticsPage.qml" + } + + // ─────────────────────────── ABOUT ─────────────────────────── ColumnLayout { id: aboutCol diff --git a/client/qmldir b/client/qmldir index 6be69ae..150162e 100644 --- a/client/qmldir +++ b/client/qmldir @@ -5,6 +5,7 @@ singleton Router 1.0 Router.qml singleton Style 1.0 Style.qml singleton Skin 1.0 Skin.qml singleton Personal 1.0 Personal.qml +singleton Logs 1.0 Logs.qml singleton Prefs 1.0 Prefs.qml singleton Spectrum 1.0 Spectrum.qml App 1.0 App.qml diff --git a/client/shell.qml b/client/shell.qml index bd59db3..6361e13 100644 --- a/client/shell.qml +++ b/client/shell.qml @@ -18,6 +18,9 @@ ShellRoot { // intact until the user quits and reopens, rather than reloading mid-transaction. Quickshell.watchFiles = false; Daemon.subscribeAll(); + // Touch the Logs singleton so its Connections (callFailed capture + reconnect flush) + // exist from the first moment a failure could happen; the flush is a no-op when empty. + Logs.flush(); Style.applyPrefs(); } diff --git a/client/tests/tst_collections.qml b/client/tests/tst_collections.qml new file mode 100644 index 0000000..493810c --- /dev/null +++ b/client/tests/tst_collections.qml @@ -0,0 +1,78 @@ +import QtQuick +import QtTest +import "../lib/collections.js" as Collections + +// groupJobs collapses batch-added download jobs into one card per collection while leaving +// single tracks as flat rows; stats aggregates a card's progress. Both are pure over the +// daemon's job JSON, so this runs under qmltestrunner without Quickshell. +TestCase { + name: "Collections" + + function job(id, status, collection, kind, progress) { + var j = { videoId: id, status: status }; + if (collection !== undefined) + j.collection = collection; + if (kind !== undefined) + j.collectionKind = kind; + if (progress !== undefined) + j.progress = progress; + return j; + } + + // A mixed list: one album (3 jobs), one single, the same album continued after the single + // (a later batch member must join the FIRST card, not open a second one). + function test_groups_collapse_by_label_in_first_position() { + var list = [ + job("a1", "downloading", "Discovery", "playlist", 40), + job("s1", "queued"), + job("a2", "queued", "Discovery", "playlist"), + job("b1", "completed", "Singles Mix", "playlist"), + job("a3", "completed", "Discovery", "playlist") + ]; + var out = Collections.groupJobs(list); + compare(out.length, 3, "2 cards + 1 flat row: the album collapses even across the single"); + verify(!!out[0].group); + compare(out[0].group.label, "Discovery"); + compare(out[0].group.kind, "playlist"); + compare(out[0].group.jobs.length, 3); + verify(!!out[1].job, "the single stays a flat row"); + compare(out[1].job.videoId, "s1"); + compare(out[2].group.label, "Singles Mix"); + } + + function test_empty_and_missing_labels_stay_flat() { + var out = Collections.groupJobs([job("x", "completed"), job("y", "failed", "")]); + compare(out.length, 2); + verify(!!out[0].job && !!out[1].job); + compare(Collections.groupJobs([]).length, 0); + } + + function test_kind_defaults_to_collection() { + var out = Collections.groupJobs([job("z", "queued", "Lo-fi Beats")]); + compare(out[0].group.kind, "collection"); + } + + // Completed and terminal jobs count as full; the downloading one contributes its own + // percent; waiting contributes nothing. + function test_stats_weight_progress_across_statuses() { + var s = Collections.stats([ + job("a", "completed"), + job("b", "downloading", "X", "album", 50), + job("c", "queued", "X", "album"), + job("d", "failed", "X", "album") + ]); + compare(s.done, 1); + compare(s.moving, 1); + compare(s.waiting, 1); + compare(s.failed, 1); + // (100 + 50 + 0 + 100) / 4 + compare(s.percent, 63); + } + + function test_stats_on_empty_is_quiet() { + var s = Collections.stats([]); + compare(s.percent, 0); + compare(s.done, 0); + compare(s.moving, 0); + } +} diff --git a/crates/ryotunesd/Cargo.toml b/crates/ryotunesd/Cargo.toml index ff9f2a9..ef529c7 100644 --- a/crates/ryotunesd/Cargo.toml +++ b/crates/ryotunesd/Cargo.toml @@ -14,7 +14,7 @@ serde = { workspace = true } serde_json = { workspace = true } tokio = { workspace = true, features = ["net", "io-util", "signal", "fs", "process"] } tracing = { workspace = true } -tracing-subscriber = { version = "0.3", features = ["env-filter"] } +tracing-subscriber = { version = "0.3", features = ["env-filter", "registry"] } anyhow = { workspace = true } thiserror = { workspace = true } async-trait = { workspace = true } diff --git a/crates/ryotunesd/src/diagnostics.rs b/crates/ryotunesd/src/diagnostics.rs new file mode 100644 index 0000000..07ef992 --- /dev/null +++ b/crates/ryotunesd/src/diagnostics.rs @@ -0,0 +1,545 @@ +//! Diagnostics: one rolling record of everything that went wrong, for both halves of the app. +//! +//! Every `warn`/`error` the daemon logs (tracing), every RPC that answered an error (the server +//! records it at the one chokepoint all responses pass), every panic (the hook below), and every +//! failure the *client* saw (the `log_client_error` RPC — including failures the client buffers +//! locally while the daemon is down) land in one ring buffer and one rotating log file under +//! `$XDG_DATA_HOME/dev.ryoku.ryotunes/logs/`. The Settings ▸ Diagnostics page reads them back +//! through `get_logs`, so "some users can't play anything" becomes a list of lines instead of a +//! guess. The file survives restarts (that is the point: a crash loop still leaves evidence); +//! the ring is per-process and always available even if the disk is the thing that is broken. + +use std::collections::VecDeque; +use std::io::Write; +use std::path::{Path, PathBuf}; +use std::sync::OnceLock; +use std::time::{SystemTime, UNIX_EPOCH}; + +use parking_lot::Mutex; + +use serde_json::{json, Value}; +use tracing::field::{Field, Visit}; +use tracing::{Event, Level, Subscriber}; +use tracing_subscriber::layer::Context; +use tracing_subscriber::Layer; + +/// Ring-buffer cap. Two thousand lines is far more than anyone reads at once but small enough to +/// snapshot into every `get_logs` without thinking. +const RING_MAX: usize = 2000; +/// Rotate the log file at 2 MiB, keeping one previous generation (≈4 MiB worst case). +const FILE_MAX_BYTES: u64 = 2 * 1024 * 1024; +const FILE_NAME: &str = "ryotunesd.log"; +const ROTATED_NAME: &str = "ryotunesd.log.1"; +/// Bound one logged message so a pathological error (a giant upstream body) cannot poison the +/// ring or the file. +const MESSAGE_MAX_CHARS: usize = 2000; + +#[derive(Clone, Debug)] +pub struct Entry { + pub ts_ms: i64, + pub level: &'static str, + pub source: &'static str, + pub target: String, + pub message: String, +} + +impl Entry { + fn to_json(&self) -> Value { + json!({ + "ts": self.ts_ms, + "level": self.level, + "source": self.source, + "target": self.target, + "message": self.message, + }) + } + + fn to_line(&self) -> String { + format!( + "{} [{}] {} {}: {}\n", + format_utc(self.ts_ms), + self.level.to_uppercase(), + self.source, + self.target, + self.message, + ) + } +} + +struct Shared { + entries: VecDeque, + path: PathBuf, + bytes_written: u64, + errors: u64, + warnings: u64, +} + +/// The rolling record. Cheap to clone an `Arc` of; installed once at startup. +pub struct Diagnostics { + shared: Mutex, +} + +static GLOBAL: OnceLock> = OnceLock::new(); + +impl Diagnostics { + /// Open (or create) the log file under `logs_dir`, install this as the global recorder, + /// and seed the ring from the tail of the existing file. A daemon that died (or was + /// upgraded) leaves its evidence behind: the first `get_logs` after a crash already shows + /// what the previous process recorded, without the client having to read files. + pub fn install(logs_dir: &Path) -> std::sync::Arc { + let _ = std::fs::create_dir_all(logs_dir); + let path = logs_dir.join(FILE_NAME); + let bytes_written = std::fs::metadata(&path).map(|m| m.len()).unwrap_or(0); + let mut entries = VecDeque::new(); + let mut errors = 0u64; + let mut warnings = 0u64; + for entry in read_tail(&path, RING_MAX) { + match entry.level { + "error" => errors += 1, + "warn" => warnings += 1, + _ => {} + } + entries.push_back(entry); + } + let di = std::sync::Arc::new(Diagnostics { + shared: Mutex::new(Shared { entries, path, bytes_written, errors, warnings }), + }); + let _ = GLOBAL.set(di.clone()); + di + } + + pub fn record(&self, level: &'static str, source: &'static str, target: &str, message: &str) { + let message = truncate(message, MESSAGE_MAX_CHARS); + let entry = + Entry { ts_ms: now_ms(), level, source, target: truncate(target, 120), message }; + let mut shared = self.shared.lock(); + match level { + "error" => shared.errors += 1, + "warn" => shared.warnings += 1, + _ => {} + } + if shared.entries.len() >= RING_MAX { + shared.entries.pop_front(); + } + let line = entry.to_line(); + shared.append_to_file(&line); + shared.entries.push_back(entry); + } + + /// Filtered, newest-first snapshot for the client. `level`: "all" | "warn" | "error"; + /// `source`: "all" | "daemon" | "client"; `query`: case-insensitive substring. + pub fn snapshot(&self, level: &str, source: &str, query: &str, limit: usize) -> Value { + let shared = self.shared.lock(); + let needle = query.to_lowercase(); + let mut out = Vec::new(); + for entry in shared.entries.iter().rev() { + if level == "warn" && entry.level == "info" { + continue; + } + if level == "error" && entry.level != "error" { + continue; + } + if source != "all" && entry.source != source { + continue; + } + if !needle.is_empty() + && !entry.message.to_lowercase().contains(&needle) + && !entry.target.to_lowercase().contains(&needle) + { + continue; + } + out.push(entry.to_json()); + if out.len() >= limit { + break; + } + } + json!({ + "entries": out, + "total": shared.entries.len(), + "errors": shared.errors, + "warnings": shared.warnings, + "path": shared.path.to_string_lossy(), + "fileBytes": shared.bytes_written, + }) + } + + /// Everything currently in the ring, oldest-first, as log-file lines (what `open_logs_folder` + /// complements: the file may be older than the ring after a rotation). + pub fn path(&self) -> PathBuf { + self.shared.lock().path.clone() + } +} + +impl Shared { + fn append_to_file(&mut self, line: &str) { + // Rotate first if this append would cross the cap: rename the current file to .1 + // (replacing any previous .1) and start fresh. A rename failure just keeps appending; + // losing a rotation is never a reason to lose the line. + if self.bytes_written >= FILE_MAX_BYTES { + let rotated = self.path.with_file_name(ROTATED_NAME); + if std::fs::rename(&self.path, &rotated).is_ok() { + self.bytes_written = 0; + } + } + match std::fs::OpenOptions::new().create(true).append(true).open(&self.path) { + Ok(mut file) => { + if file.write_all(line.as_bytes()).is_ok() { + let _ = file.flush(); + self.bytes_written += line.len() as u64; + } + } + // The disk being unwritable is exactly the kind of failure worth keeping in the + // ring; drop the file half silently and carry on serving from memory. + Err(_) => {} + } + } +} + +/// A tracing layer that feeds warn+ events into the diagnostics ring and file. Installed +/// alongside the stderr formatter so `journalctl` keeps working unchanged. +pub struct CaptureLayer; + +impl Layer for CaptureLayer { + fn on_event(&self, event: &Event<'_>, _ctx: Context<'_, S>) { + let meta = event.metadata(); + if meta.level() > &Level::WARN { + return; + } + let mut visitor = MessageVisitor::default(); + event.record(&mut visitor); + let level = if meta.level() == &Level::ERROR { "error" } else { "warn" }; + record(level, "daemon", meta.target(), &visitor.render()); + } +} + +#[derive(Default)] +struct MessageVisitor { + message: String, + error: Option, +} + +impl MessageVisitor { + fn render(self) -> String { + match (self.message.is_empty(), self.error) { + (true, Some(e)) => e, + (true, None) => String::new(), + (false, None) => self.message, + (false, Some(e)) => format!("{} (error: {e})", self.message), + } + } +} + +impl Visit for MessageVisitor { + fn record_str(&mut self, field: &Field, value: &str) { + if field.name() == "message" { + self.message = value.to_owned(); + } else if field.name() == "error" { + self.error = Some(value.to_owned()); + } + } + fn record_debug(&mut self, field: &Field, value: &dyn std::fmt::Debug) { + if field.name() == "message" { + self.message = format!("{value:?}"); + } else if field.name() == "error" { + self.error = Some(format!("{value:?}")); + } + } +} + +/// The global entry point: everything (tracing layer, server chokepoint, panic hook, client RPC) +/// records through here. Before `install` runs there is nowhere to record; those early failures +/// still reach stderr via the formatter. +pub fn record(level: &'static str, source: &'static str, target: &str, message: &str) { + if let Some(di) = GLOBAL.get() { + di.record(level, source, target, message); + } +} + +pub fn snapshot(level: &str, source: &str, query: &str, limit: usize) -> Value { + GLOBAL.get().map(|di| di.snapshot(level, source, query, limit)).unwrap_or_else(|| { + json!({ + "entries": [], "total": 0, "errors": 0, "warnings": 0, + "path": "", "fileBytes": 0, + }) + }) +} + +pub fn logs_path() -> Option { + GLOBAL.get().map(|di| di.path()) +} + +/// Reveal the log folder in the user's file manager. The Settings page offers this beside the +/// viewer so "send me the logs" is a click, not a path hunt. +pub fn open_logs_folder() -> Result<(), String> { + let path = logs_path().ok_or("Logging is not initialised yet.")?; + let dir = path.parent().ok_or("The log file has no folder.")?; + let mut child = std::process::Command::new("xdg-open") + .arg(dir) + .stdin(std::process::Stdio::null()) + .stdout(std::process::Stdio::null()) + .stderr(std::process::Stdio::null()) + .spawn() + .map_err(|error| format!("Could not open the logs folder: {error}"))?; + // A file manager may stay open for hours; reap it on a blocking thread so a tokio worker + // never parks inside `wait`. + std::thread::spawn(move || { + let _ = child.wait(); + }); + Ok(()) +} + +/// Route panics into the log before the default hook prints them. A daemon that dies on launch +/// (the worst support case) leaves the panic line in the file for the next session's UI to show. +pub fn install_panic_hook() { + let previous = std::panic::take_hook(); + std::panic::set_hook(Box::new(move |info| { + let location = info + .location() + .map(|l| format!("{}:{}", l.file(), l.line())) + .unwrap_or_else(|| "unknown".into()); + let payload = info + .payload() + .downcast_ref::<&str>() + .map(|s| s.to_string()) + .or_else(|| info.payload().downcast_ref::().cloned()) + .unwrap_or_else(|| "unknown panic payload".into()); + record("error", "daemon", &format!("panic at {location}"), &payload); + previous(info); + })); +} + +fn truncate(input: &str, max: usize) -> String { + if input.chars().count() <= max { + return input.to_owned(); + } + let mut out: String = input.chars().take(max).collect(); + out.push('…'); + out +} + +fn now_ms() -> i64 { + SystemTime::now().duration_since(UNIX_EPOCH).unwrap_or_default().as_millis() as i64 +} + +/// `2026-09-24T19:12:03Z` from Unix millis (civil-from-days; no chrono for one formatter). +fn format_utc(ts_ms: i64) -> String { + let secs = ts_ms.div_euclid(1000); + let millis = ts_ms.rem_euclid(1000); + let days = secs.div_euclid(86_400); + let rem = secs.rem_euclid(86_400); + let (y, m, d) = civil_from_days(days); + format!( + "{y:04}-{m:02}-{d:02}T{:02}:{:02}:{:02}.{millis:03}Z", + rem / 3600, + (rem % 3600) / 60, + rem % 60, + ) +} + +fn civil_from_days(days: i64) -> (i64, u32, u32) { + let z = days + 719_468; + let era = if z >= 0 { z } else { z - 146_096 } / 146_097; + let doe = z - era * 146_097; + let yoe = (doe - doe / 1460 + doe / 36_524 - doe / 146_096) / 365; + let y = yoe + era * 400; + let doy = doe - (365 * yoe + yoe / 4 - yoe / 100); + let mp = (5 * doy + 2) / 153; + let d = (doy - (153 * mp + 2) / 5 + 1) as u32; + let m = if mp < 10 { mp + 3 } else { mp - 9 } as u32; + (if m <= 2 { y + 1 } else { y }, m, d) +} + +/// The last `max` lines of the log file, in file order (oldest first). A missing or +/// unreadable file seeds nothing (the ring simply starts empty); a line that does not parse +/// is skipped, never fatal — the file is evidence, not a contract. +fn read_tail(path: &Path, max: usize) -> Vec { + let Ok(text) = std::fs::read_to_string(path) else { return Vec::new() }; + let mut out: Vec = text.lines().rev().filter_map(parse_line).collect(); + out.reverse(); + if out.len() > max { + out.drain(0..out.len() - max); + } + out +} + +/// `2026-09-24T19:12:03.456Z [ERROR] daemon rpc:play: message…` back into an entry. +fn parse_line(line: &str) -> Option { + let (stamp, rest) = line.split_once(" [")?; + let ts_ms = parse_utc(stamp)?; + let (level, rest) = rest.split_once("] ")?; + let level = match level.to_ascii_lowercase().as_str() { + "error" => "error", + "warn" => "warn", + "info" => "info", + _ => return None, + }; + let (origin, message) = rest.split_once(": ")?; + let (source, target) = origin.split_once(' ')?; + let source = match source { + "daemon" => "daemon", + "client" => "client", + _ => return None, + }; + Some(Entry { ts_ms, level, source, target: target.to_owned(), message: message.to_owned() }) +} + +/// The inverse of [`format_utc`] (same civil algorithm, reversed). +fn parse_utc(stamp: &str) -> Option { + // YYYY-MM-DDThh:mm:ss.mmmZ + if stamp.len() != 24 { + return None; + } + let b = stamp.as_bytes(); + if b[4] != b'-' + || b[7] != b'-' + || b[10] != b'T' + || b[13] != b':' + || b[16] != b':' + || b[19] != b'.' + || b[23] != b'Z' + { + return None; + } + let num = |s: &str| s.parse::().ok(); + let (y, mo, d) = (num(&stamp[0..4])?, num(&stamp[5..7])?, num(&stamp[8..10])?); + let h = num(&stamp[11..13])?; + let mi = num(&stamp[14..16])?; + let s = num(&stamp[17..19])?; + let ms = num(&stamp[20..23])?; + let days = days_from_civil(y, mo as u32, d as u32); + Some(((days * 86_400 + h * 3600 + mi * 60 + s) * 1000) + ms) +} + +fn days_from_civil(y: i64, m: u32, d: u32) -> i64 { + let y = if m <= 2 { y - 1 } else { y }; + let era = if y >= 0 { y } else { y - 399 } / 400; + let yoe = y - era * 400; + let mp = if m > 2 { m - 3 } else { m + 9 } as i64; + let doy = (153 * mp + 2) / 5 + d as i64 - 1; + let doe = yoe * 365 + yoe / 4 - yoe / 100 + doy; + era * 146_097 + doe - 719_468 +} + +#[cfg(test)] +mod tests { + use super::*; + + struct Dir(PathBuf); + impl Drop for Dir { + fn drop(&mut self) { + let _ = std::fs::remove_dir_all(&self.0); + } + } + fn temp_dir(tag: &str) -> Dir { + static SEQ: std::sync::atomic::AtomicU64 = std::sync::atomic::AtomicU64::new(0); + let path = std::env::temp_dir().join(format!( + "ryotunes-diag-{tag}-{}-{}", + std::process::id(), + SEQ.fetch_add(1, std::sync::atomic::Ordering::Relaxed), + )); + std::fs::create_dir_all(&path).unwrap(); + Dir(path) + } + + #[test] + fn records_filter_and_count_by_level_and_source() { + let dir = temp_dir("filter"); + let di = Diagnostics::install(&dir.0); + di.record("error", "daemon", "resolve", "bot-gated stream"); + di.record("warn", "daemon", "spotify", "session dead"); + di.record("info", "daemon", "boot", "started"); + di.record("error", "client", "rpc:play", "daemon not connected"); + let all = di.snapshot("all", "all", "", 100); + assert_eq!(all["total"], 4); + assert_eq!(all["errors"], 2); + assert_eq!(all["warnings"], 1); + // newest first + assert_eq!(all["entries"][0]["source"], "client"); + + let errors = di.snapshot("error", "all", "", 100); + assert_eq!(errors["entries"].as_array().unwrap().len(), 2); + let daemon = di.snapshot("all", "daemon", "", 100); + assert_eq!(daemon["entries"].as_array().unwrap().len(), 3); + let search = di.snapshot("all", "all", "bot", 100); + assert_eq!(search["entries"].as_array().unwrap().len(), 1); + assert_eq!(search["entries"][0]["level"], "error"); + } + + #[test] + fn log_lines_round_trip_through_the_tail_reader() { + let dir = temp_dir("tail"); + { + let di = Diagnostics::install(&dir.0); + di.record("error", "daemon", "rpc:play", "bot-gated stream"); + di.record("warn", "client", "daemon", "connection lost"); + } + // A fresh install over the same file re-seeds the ring (the crash-restart case). + let di = Diagnostics::install(&dir.0); + let snap = di.snapshot("all", "all", "", 100); + assert_eq!(snap["total"], 2, "both previous entries survived the restart"); + assert_eq!(snap["errors"], 1); + assert_eq!(snap["warnings"], 1); + // snapshot is newest-first: the warn came second. + assert_eq!(snap["entries"][0]["target"], "daemon"); + assert_eq!(snap["entries"][0]["message"], "connection lost"); + assert_eq!(snap["entries"][1]["message"], "bot-gated stream"); + // Unparsable lines are skipped rather than poisoning the seed. + std::fs::write( + dir.0.join(FILE_NAME), + b"garbage line\n2026-09-24T19:12:03.456Z [ERROR] daemon x: hello\n", + ) + .unwrap(); + let di = Diagnostics::install(&dir.0); + let snap = di.snapshot("all", "all", "", 100); + assert_eq!(snap["total"], 1, "unparsable lines are skipped"); + assert_eq!(snap["entries"][0]["ts"], 1_790_277_123_456i64, "timestamp round-trips"); + } + + #[test] + fn entries_land_in_the_log_file_and_rotate_once() { + let dir = temp_dir("file"); + let di = Diagnostics::install(&dir.0); + for i in 0..20 { + di.record("error", "daemon", "test", &format!("failure number {i}")); + } + let log = dir.0.join(FILE_NAME); + let text = std::fs::read_to_string(&log).unwrap(); + assert_eq!(text.lines().count(), 20); + // Each line leads with the UTC timestamp: `YYYY-MM-DDThh:mm:ss.mmmZ [LEVEL] …`. + assert!( + text.lines().all(|l| l.as_bytes()[4] == b'-' && l.contains("Z [ERROR]")), + "timestamps are UTC ISO-like" + ); + + // Force a rotation by claiming the file is at the cap. + { + let mut shared = di.shared.lock(); + shared.bytes_written = FILE_MAX_BYTES; + } + di.record("error", "daemon", "test", "after rotation"); + assert!(dir.0.join(ROTATED_NAME).exists()); + let fresh = std::fs::read_to_string(&log).unwrap(); + assert_eq!(fresh.lines().count(), 1); + assert!(fresh.contains("after rotation")); + } + + #[test] + fn ring_drops_oldest_at_capacity() { + let dir = temp_dir("ring"); + let di = Diagnostics::install(&dir.0); + for i in 0..(RING_MAX + 50) { + di.record("warn", "daemon", "test", &format!("line {i}")); + } + let snap = di.snapshot("all", "all", "", RING_MAX + 10); + assert_eq!(snap["total"], RING_MAX); + assert_eq!(snap["entries"][0]["message"], format!("line {}", RING_MAX + 49)); + } + + #[test] + fn utc_formatting_matches_known_instants() { + // 2000-01-01T00:00:00Z = 946_684_800 s; the others check hour/day rollover. + assert_eq!(format_utc(946_684_800_000), "2000-01-01T00:00:00.000Z"); + assert_eq!(format_utc(1_709_635_200_123), "2024-03-05T10:40:00.123Z"); + assert_eq!(format_utc(1_709_268_800_000), "2024-03-01T04:53:20.000Z"); + } +} diff --git a/crates/ryotunesd/src/downloads.rs b/crates/ryotunesd/src/downloads.rs index 0320a53..2bc3353 100644 --- a/crates/ryotunesd/src/downloads.rs +++ b/crates/ryotunesd/src/downloads.rs @@ -103,6 +103,13 @@ pub struct DownloadJob { pub file_path: Option, pub error: Option, pub source: String, + /// The album/playlist this track was batch-added from, when it was. The client groups + /// collection downloads under one card per collection using this label. `#[serde(default)]` + /// keeps queues persisted by older builds loadable. + #[serde(default)] + pub collection: Option, + #[serde(default)] + pub collection_kind: Option, pub created_at: i64, pub finished_at: Option, #[serde(default = "DownloadSettings::defaults")] @@ -162,15 +169,21 @@ fn is_youtube_id(id: &str) -> bool { } // --- collection downloads + smart dedup ------------------------------------------------------ - /// One track a collection (playlist/album) offered for batch download. camelCase on the wire, /// mirroring the download job's field names so the client sends what it already renders. #[derive(Clone, Debug, Deserialize)] +#[serde(rename_all = "camelCase")] pub struct CollectionEntry { pub video_id: String, pub title: String, pub artists: String, pub thumbnail: String, + /// The album/playlist name the batch came from; stamped onto each created job so the client + /// can group them. Optional so a caller may batch unlabelled tracks. + #[serde(default)] + pub collection: Option, + #[serde(default)] + pub collection_kind: Option, } /// A snapshot of the download folder's audio files, used to refuse re-downloading a track that @@ -387,6 +400,8 @@ impl Downloads { title: title.clone(), artists: artists.clone(), thumbnail: thumbnail.clone(), + collection: None, + collection_kind: None, }; let index = FolderIndex::build(Path::new(&state.settings.path)); if let Some(path) = index.find(&state.settings, &entry) { @@ -407,6 +422,8 @@ impl Downloads { title: title.clone(), artists: artists.clone(), thumbnail: thumbnail.clone(), + collection: None, + collection_kind: None, }, ); state.jobs.push(job.clone()); @@ -660,6 +677,8 @@ fn new_job( source: Source, entry: CollectionEntry, ) -> DownloadJob { + let collection = + entry.collection.as_deref().map(|label| truncate_chars(label.trim(), MAX_COMPONENT_BYTES)); DownloadJob { id: inner.next_id(), video_id: entry.video_id, @@ -671,6 +690,12 @@ fn new_job( file_path: None, error: None, source: source.label().into(), + collection: collection.filter(|label| !label.is_empty()), + collection_kind: entry + .collection_kind + .as_deref() + .filter(|kind| matches!(*kind, "album" | "playlist")) + .map(str::to_owned), created_at: now_secs(), finished_at: None, settings: settings.clone(), @@ -1042,6 +1067,9 @@ fn apply_result(job: &mut DownloadJob, result: Result) { Err(error) => { job.status = DownloadStatus::Failed; job.error = Some(truncate_chars(&error, MAX_ERROR_LEN)); + // A worker failure never passes through the RPC chokepoint (it is async), so log it + // here: the diagnostics CaptureLayer picks warn+ tracing up into the same record. + tracing::error!(job = %job.id, video_id = %job.video_id, error, "download failed"); } } } @@ -1176,8 +1204,14 @@ fn publish( .extension() .and_then(|value| value.to_str()) .ok_or("The download has no audio extension.")?; - let path = - compute_final_path(&job.settings, &job.title, &job.artists, &job.video_id, extension); + let path = compute_final_path( + &job.settings, + &job.title, + &job.artists, + &job.video_id, + extension, + job.collection.as_deref(), + ); let parent = path.parent().ok_or("The download has no destination folder.")?; std::fs::create_dir_all(parent).map_err(|error| error.to_string())?; let root = Path::new(&job.settings.path).canonicalize().map_err(|error| error.to_string())?; @@ -1465,16 +1499,26 @@ fn error_message(tail: &str, code: Option) -> String { } } +/// The destination for a finished download. A track batch-added from an album/playlist lands in +/// a folder named after its collection (the collection *is* the grouping, so the artist +/// subfolder is skipped for it); a single track follows the plain artist settings. Filenames +/// are unchanged either way, which keeps `FolderIndex::find` (stem-keyed, walks recursively) +/// able to dedup files wherever they sit. fn compute_final_path( settings: &DownloadSettings, title: &str, artists: &str, video_id: &str, ext: &str, + collection: Option<&str>, ) -> PathBuf { let mut dir = PathBuf::from(&settings.path); - if settings.organize_by_artist { - dir = dir.join(sanitize_component(primary_artist(artists))); + match collection.map(str::trim).filter(|c| !c.is_empty()) { + Some(label) => dir = dir.join(sanitize_component(label)), + None if settings.organize_by_artist => { + dir = dir.join(sanitize_component(primary_artist(artists))); + } + None => {} } let base = if settings.organize_by_artist || artists.trim().is_empty() { title.to_string() @@ -1617,10 +1661,15 @@ mod tests { struct Temp(PathBuf); impl Temp { fn new() -> Self { + // Tests share one process and run on parallel threads: pid+nanos alone can collide + // when two threads read the same coarse clock tick, failing create_dir on the + // loser's path. A process-local counter guarantees uniqueness. + static SEQ: std::sync::atomic::AtomicU64 = std::sync::atomic::AtomicU64::new(0); let path = std::env::temp_dir().join(format!( - "ryotunes-download-test-{}-{}", + "ryotunes-download-test-{}-{}-{}", std::process::id(), - SystemTime::now().duration_since(UNIX_EPOCH).unwrap().as_nanos() + SystemTime::now().duration_since(UNIX_EPOCH).unwrap().as_nanos(), + SEQ.fetch_add(1, Ordering::Relaxed), )); std::fs::create_dir(&path).unwrap(); Self(path) @@ -1668,6 +1717,8 @@ mod tests { file_path: None, error: None, source: "YouTube".into(), + collection: None, + collection_kind: None, created_at: 1, finished_at: None, settings: settings(directory, 1), @@ -1681,6 +1732,8 @@ mod tests { title: title.into(), artists: artists.into(), thumbnail: String::new(), + collection: None, + collection_kind: None, } } @@ -1763,9 +1816,87 @@ mod tests { .collect(); assert!(ids.contains(&"CCCCCCCCCCC".to_string())); assert!(!ids.contains(&"AAAAAAAAAAA".to_string())); + } + + // The exact wire shape the QML client posts (camelCase keys). The batch endpoint once + // deserialized with snake_case field names, so every collection download died with + // "entries: missing field `video_id`" before any track was admitted. + #[test] + fn collection_entries_deserialize_from_the_camel_case_wire_shape() { + let wire = serde_json::json!([ + { + "videoId": "AAAAAAAAAAA", + "title": "Alpha", + "artists": "One", + "thumbnail": "https://example/thumb.jpg", + "collection": "Greatest Hits", + "collectionKind": "album" + }, + { + "videoId": "BBBBBBBBBBB", + "title": "Beta", + "artists": "One", + "thumbnail": "" + } + ]); + let entries: Vec = serde_json::from_value(wire).unwrap(); + assert_eq!(entries.len(), 2); + assert_eq!(entries[0].video_id, "AAAAAAAAAAA"); + assert_eq!(entries[0].collection.as_deref(), Some("Greatest Hits")); + assert_eq!(entries[0].collection_kind.as_deref(), Some("album")); + assert_eq!(entries[1].collection, None, "collection is optional on the wire"); + } + + #[tokio::test] + async fn batch_jobs_carry_their_collection_label_for_grouped_rendering() { + let directory = Temp::new(); + let music = directory.0.join("music"); + std::fs::create_dir(&music).unwrap(); + let manager = manager(&directory.0); + manager.set_settings(settings(&music, 1)).unwrap(); + let mut tagged = entry("AAAAAAAAAAA", "Alpha", "One"); + tagged.collection = Some(" Late Night Playlist ".into()); + tagged.collection_kind = Some("playlist".into()); + let mut untagged = entry("BBBBBBBBBBB", "Beta", "One"); + untagged.collection = Some(" ".into()); + untagged.collection_kind = Some("bogus-kind".into()); + manager.enqueue_collection(vec![tagged, untagged]).unwrap(); + let jobs = manager.snapshot()["jobs"].as_array().unwrap().clone(); + let alpha = jobs.iter().find(|j| j["videoId"] == "AAAAAAAAAAA").unwrap(); + assert_eq!(alpha["collection"], "Late Night Playlist", "label is trimmed"); + assert_eq!(alpha["collectionKind"], "playlist"); + let beta = jobs.iter().find(|j| j["videoId"] == "BBBBBBBBBBB").unwrap(); + assert!(beta["collection"].is_null(), "a blank label stores no collection"); + assert!(beta["collectionKind"].is_null(), "an unknown kind is dropped"); manager.shutdown().await; } + #[test] + fn collection_tracks_land_in_a_folder_named_after_the_collection() { + let directory = Temp::new(); + let mut s = settings(&directory.0, 1); + s.organize_by_artist = true; + let album = + compute_final_path(&s, "Alpha", "One", "AAAAAAAAAAA", "mp3", Some("Late Night")); + assert_eq!( + album, + directory.0.join("Late Night").join("Alpha [AAAAAAAAAAA].mp3"), + "a collection track is filed under its collection, not its artist" + ); + let single = compute_final_path(&s, "Beta", "Two", "BBBBBBBBBBB", "mp3", None); + assert_eq!( + single, + directory.0.join("Two").join("Beta [BBBBBBBBBBB].mp3"), + "a single track still follows the artist folder" + ); + let traversal = + compute_final_path(&s, "Gamma", "Three", "CCCCCCCCCCC", "mp3", Some("../../etc")); + assert!( + traversal.starts_with(&directory.0), + "the collection folder is sanitized inside the root" + ); + } + #[test] fn publication_never_replaces_existing_files_or_accepts_partials() { let directory = Temp::new(); @@ -1774,7 +1905,14 @@ mod tests { assert!(publish(&staging, &job(&directory.0), &[], &mut Vec::new()).is_err()); std::fs::write(staging.join("audio.mp3"), b"finished audio").unwrap(); let j = job(&directory.0); - let first = compute_final_path(&j.settings, &j.title, &j.artists, &j.video_id, "mp3"); + let first = compute_final_path( + &j.settings, + &j.title, + &j.artists, + &j.video_id, + "mp3", + j.collection.as_deref(), + ); std::fs::write(&first, b"existing user music").unwrap(); let second = publish(&staging, &job(&directory.0), &[], &mut Vec::new()).unwrap(); assert_eq!(std::fs::read(&first).unwrap(), b"existing user music"); @@ -1897,7 +2035,8 @@ mod tests { // Pre-place a cover at the base stem so a suffix-0 companion collision forces the whole set // (audio + sidecars) to the next suffix, and prove the existing cover is never overwritten. let j = job(&directory.0); - let base_audio = compute_final_path(&j.settings, &j.title, &j.artists, &j.video_id, "mp3"); + let base_audio = + compute_final_path(&j.settings, &j.title, &j.artists, &j.video_id, "mp3", None); let base_cover = base_audio.with_extension("jpg"); std::fs::write(&base_cover, b"existing cover").unwrap(); diff --git a/crates/ryotunesd/src/main.rs b/crates/ryotunesd/src/main.rs index 2ea32af..e90dcc7 100644 --- a/crates/ryotunesd/src/main.rs +++ b/crates/ryotunesd/src/main.rs @@ -1,4 +1,5 @@ mod app; +mod diagnostics; mod download_media; mod downloads; mod gtk_thread; @@ -16,11 +17,21 @@ use std::os::unix::net::UnixStream; use std::path::Path; use std::sync::Arc; +use tracing_subscriber::layer::SubscriberExt as _; +use tracing_subscriber::util::SubscriberInitExt as _; + fn main() -> anyhow::Result<()> { - tracing_subscriber::fmt() - .with_env_filter( + // Panics and warn+ tracing land in the diagnostics ring + rolling file before anything + // else can fail, so even a daemon that dies on launch leaves evidence for the next session. + diagnostics::install_panic_hook(); + let logs_dir = app::paths().data_dir.join("logs"); + let _diagnostics = diagnostics::Diagnostics::install(&logs_dir); + tracing_subscriber::registry() + .with( tracing_subscriber::EnvFilter::try_from_default_env().unwrap_or_else(|_| "warn".into()), ) + .with(tracing_subscriber::fmt::layer()) + .with(diagnostics::CaptureLayer) .init(); let path = ryotunes_protocol::socket_path(); diff --git a/crates/ryotunesd/src/methods.rs b/crates/ryotunesd/src/methods.rs index 64892f3..34ec884 100644 --- a/crates/ryotunesd/src/methods.rs +++ b/crates/ryotunesd/src/methods.rs @@ -942,6 +942,33 @@ impl Dispatch for Methods { null() } + // --- diagnostics --------------------------------------------------------------- + "get_logs" => { + let level = + arg::>(¶ms, "level")?.unwrap_or_else(|| "warn".into()); + let source = + arg::>(¶ms, "source")?.unwrap_or_else(|| "all".into()); + let query = arg::>(¶ms, "query")?.unwrap_or_default(); + let limit = arg::>(¶ms, "limit")?.unwrap_or(500).clamp(1, 2000); + Ok(crate::diagnostics::snapshot(&level, &source, &query, limit)) + } + "log_client_error" => { + // The client's own failures (including ones it buffered while the daemon was + // down) join the same record, tagged `client` so the UI can filter them apart. + let message = arg::(¶ms, "message")?; + let target = + arg::>(¶ms, "target")?.unwrap_or_else(|| "client".into()); + let level = + arg::>(¶ms, "level")?.unwrap_or_else(|| "error".into()); + let level = if level == "warn" { "warn" } else { "error" }; + crate::diagnostics::record(level, "client", &target, &message); + null() + } + "open_logs_folder" => { + crate::diagnostics::open_logs_folder().map_err(err)?; + null() + } + // --- client-side / not ported ---------------------------------------------------- "frontend_ready" | "open_mini" | "close_mini" | "login_webview" => Err(ErrorBody { code: "client_side".into(), diff --git a/crates/ryotunesd/src/server.rs b/crates/ryotunesd/src/server.rs index a3c1c10..be9654a 100644 --- a/crates/ryotunesd/src/server.rs +++ b/crates/ryotunesd/src/server.rs @@ -144,6 +144,12 @@ async fn handle( let req = match serde_json::from_str::(&line) { Ok(Incoming::Request(r)) => r, Err(e) => { + crate::diagnostics::record( + "warn", + "client", + "rpc:framing", + &format!("unparsable request line: {e}"), + ); let _ = tx.send( Outgoing::Response(Response::err(0, "bad_request", e.to_string())).to_line(), ); @@ -157,7 +163,20 @@ async fn handle( let Request { id, method, params } = req; let resp = match dispatch.call(&method, params, &conn).await { Ok(v) => Response::ok(id, v), - Err(e) => Response { id, result: None, error: Some(e) }, + Err(e) => { + // The one chokepoint every RPC error passes: record it (minus codes that + // describe an expected state rather than a failure) so the Diagnostics page + // sees what actually broke, with the method name attached. + if !matches!(e.code.as_str(), "spotify_signed_out" | "client_side") { + crate::diagnostics::record( + "error", + "daemon", + &format!("rpc:{method}"), + &format!("[{}] {}", e.code, e.message), + ); + } + Response { id, result: None, error: Some(e) } + } }; let _ = tx.send(Outgoing::Response(resp).to_line()); }); From 0d9557b584f2ad5fd61db3add81eb57d91868dea Mon Sep 17 00:00:00 2001 From: carlos Date: Thu, 24 Sep 2026 18:40:17 -0400 Subject: [PATCH 158/183] fix: map collection entries exactly once MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit enqueueCollectionFromPage already builds camelCase entries with toEntry; enqueueCollection then re-mapped them, reading video_id off objects that carry videoId. JSON.stringify dropped the undefined keys, so the client posted rows without any videoId at all — the second, stacked half of the broken batch download (the serde snake_case wire format was the first). Entries now map once and post verbatim. --- client/Downloads.qml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/client/Downloads.qml b/client/Downloads.qml index c891605..c6750bb 100644 --- a/client/Downloads.qml +++ b/client/Downloads.qml @@ -171,13 +171,11 @@ Singleton { }; } - // Post a gathered list of page rows (snake_case SongItems) as one batch. `label` names the - // collection in the progress/failure toasts. This singleton owns the operation, so - // navigating away cannot interrupt it. - function enqueueCollection(songs, label) { - var entries = []; - for (var i = 0; i < songs.length; i++) - entries.push(root.toEntry(songs[i], "", "")); + // Post pre-built entries (from toEntry) as one batch. `label` names the collection in the + // progress/failure toasts. This singleton owns the operation, so navigating away cannot + // interrupt it. Entries are mapped exactly once — a second toEntry pass would read + // `video_id` off an object that already carries `videoId` and send empty rows. + function enqueueCollection(entries, label) { Playback.toast("Preparing " + label + " downloads\u2026", "info"); return Daemon.call("enqueue_collection", { entries: entries }).then((res) => { var parts = []; From 03f7f23ac2a7db104e2784d0a45d85e849d47d40 Mon Sep 17 00:00:00 2001 From: carlos Date: Thu, 24 Sep 2026 18:40:57 -0400 Subject: [PATCH 159/183] docs: changelog names both stacked batch-download bugs --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d5e44d..ce1996f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## Unreleased -- Fixed "Download playlist / Download album" always failing with "entries: missing field `video_id`": the batch endpoint's wire format was snake_case while the client posts camelCase, so no collection download was ever admitted. Single-track downloads were unaffected, which is why only albums and playlists broke. +- Fixed "Download playlist / Download album" always failing (albums: "missing field `video_id`", playlists: "missing field `videoId`"): two stacked bugs — the client mapped an album/playlist's rows into batch entries twice, dropping every track id, and the daemon's batch endpoint read its JSON in snake_case while the client posts camelCase. Single-track downloads were unaffected, which is why only albums and playlists broke. - Album and playlist downloads now read as one collection: the queue and history group every batch under a single card showing the album/playlist cover, kind, aggregate progress and how many tracks are saved, waiting, failed or cancelled — expandable to its per-track rows. Batch tracks also land in a folder named after their collection on disk, and re-downloading still dedups against them wherever they sit. - Added Settings ▸ Diagnostics: one rolling record of everything that went wrong, for both halves of the app. The daemon logs its own warnings and errors, every failed request, and panics to a ring buffer and a rotating file (`$XDG_DATA_HOME/dev.ryoku.ryotunes/logs/ryotunesd.log`); the client forwards the failures it sees (rejected actions, lost connections, error toasts), buffering them while the daemon is down and delivering them on reconnect. The page filters by level, source and text, copies the whole list to the clipboard, and opens the log folder — so "songs won't play" finally has evidence to show instead of a guess. From 39c4fe407a3d8537716412fbbec4ee3647ef1a20 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 24 Sep 2026 23:28:21 +0000 Subject: [PATCH 160/183] release: v1.1.4 --- CHANGELOG.md | 2 ++ Cargo.lock | 22 +++++++++---------- Cargo.toml | 2 +- client/version | 2 +- packaging/arch/PKGBUILD | 2 +- .../linux/dev.ryoku.ryotunes.metainfo.xml | 2 +- src-tauri/tauri.conf.json | 2 +- ui/package.json | 2 +- 8 files changed, 19 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ce1996f..8cf0596 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +## v1.1.4 - 2026-09-24 + - Fixed "Download playlist / Download album" always failing (albums: "missing field `video_id`", playlists: "missing field `videoId`"): two stacked bugs — the client mapped an album/playlist's rows into batch entries twice, dropping every track id, and the daemon's batch endpoint read its JSON in snake_case while the client posts camelCase. Single-track downloads were unaffected, which is why only albums and playlists broke. - Album and playlist downloads now read as one collection: the queue and history group every batch under a single card showing the album/playlist cover, kind, aggregate progress and how many tracks are saved, waiting, failed or cancelled — expandable to its per-track rows. Batch tracks also land in a folder named after their collection on disk, and re-downloading still dedups against them wherever they sit. - Added Settings ▸ Diagnostics: one rolling record of everything that went wrong, for both halves of the app. The daemon logs its own warnings and errors, every failed request, and panics to a ring buffer and a rotating file (`$XDG_DATA_HOME/dev.ryoku.ryotunes/logs/ryotunesd.log`); the client forwards the failures it sees (rejected actions, lost connections, error toasts), buffering them while the daemon is down and delivering them on reconnect. The page filters by level, source and text, copies the whole list to the clipboard, and opens the log folder — so "songs won't play" finally has evidence to show instead of a guess. diff --git a/Cargo.lock b/Cargo.lock index d697295..1ec1618 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2438,7 +2438,7 @@ dependencies = [ [[package]] name = "innertube" -version = "1.1.1" +version = "1.1.4" dependencies = [ "hex", "reqwest 0.12.28", @@ -2943,7 +2943,7 @@ checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" [[package]] name = "listen-protocol" -version = "1.1.1" +version = "1.1.4" dependencies = [ "serde", "serde_json", @@ -3788,7 +3788,7 @@ checksum = "f6b464fbc74e149a392436b17d523f769e057cb6877f6a5c4618bc6f11800548" [[package]] name = "player" -version = "1.1.1" +version = "1.1.4" dependencies = [ "libc", "libmpv2", @@ -4703,7 +4703,7 @@ dependencies = [ [[package]] name = "ryotunes" -version = "1.1.1" +version = "1.1.4" dependencies = [ "anyhow", "async-trait", @@ -4733,7 +4733,7 @@ dependencies = [ [[package]] name = "ryotunes-cli" -version = "1.1.1" +version = "1.1.4" dependencies = [ "ryotunes-protocol", "serde", @@ -4742,7 +4742,7 @@ dependencies = [ [[package]] name = "ryotunes-core" -version = "1.1.1" +version = "1.1.4" dependencies = [ "anyhow", "async-trait", @@ -4778,7 +4778,7 @@ dependencies = [ [[package]] name = "ryotunes-protocol" -version = "1.1.1" +version = "1.1.4" dependencies = [ "serde", "serde_json", @@ -4786,7 +4786,7 @@ dependencies = [ [[package]] name = "ryotunes-soundcloud" -version = "1.1.1" +version = "1.1.4" dependencies = [ "base64 0.22.1", "parking_lot", @@ -4801,7 +4801,7 @@ dependencies = [ [[package]] name = "ryotunes-spotify" -version = "1.1.1" +version = "1.1.4" dependencies = [ "anyhow", "bytes", @@ -4825,7 +4825,7 @@ dependencies = [ [[package]] name = "ryotunesd" -version = "1.1.1" +version = "1.1.4" dependencies = [ "anyhow", "async-trait", @@ -5589,7 +5589,7 @@ dependencies = [ [[package]] name = "sync-server" -version = "1.1.1" +version = "1.1.4" dependencies = [ "futures-util", "listen-protocol", diff --git a/Cargo.toml b/Cargo.toml index 19af044..264f5c2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ members = [ ] [workspace.package] -version = "1.1.1" +version = "1.1.4" edition = "2021" license = "GPL-3.0-or-later" diff --git a/client/version b/client/version index 524cb55..65087b4 100644 --- a/client/version +++ b/client/version @@ -1 +1 @@ -1.1.1 +1.1.4 diff --git a/packaging/arch/PKGBUILD b/packaging/arch/PKGBUILD index c6e5b08..c3e4318 100644 --- a/packaging/arch/PKGBUILD +++ b/packaging/arch/PKGBUILD @@ -2,7 +2,7 @@ # Run from packaging/arch with: makepkg -si pkgname=ryotunes -pkgver=1.1.1 +pkgver=1.1.4 pkgrel=1 # epoch=1 is permanent: the v1 reset publishes 1:X.Y.Z, which pacman ranks above # the legacy 2.x line an existing machine may carry, so `pacman -U` still upgrades. diff --git a/packaging/linux/dev.ryoku.ryotunes.metainfo.xml b/packaging/linux/dev.ryoku.ryotunes.metainfo.xml index 91e8734..00cd357 100644 --- a/packaging/linux/dev.ryoku.ryotunes.metainfo.xml +++ b/packaging/linux/dev.ryoku.ryotunes.metainfo.xml @@ -12,5 +12,5 @@ ryotunes.desktop ryotunes AudioVideoAudio - + diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 7cad244..5cc5326 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "https://schema.tauri.app/config/2", "productName": "Ryotunes", - "version": "1.1.1", + "version": "1.1.4", "identifier": "dev.ryoku.ryotunes", "build": { "frontendDist": "../ui/build", diff --git a/ui/package.json b/ui/package.json index 570cd9e..e563035 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,7 +1,7 @@ { "name": "ui", "private": true, - "version": "1.1.1", + "version": "1.1.4", "type": "module", "scripts": { "dev": "vite dev", From 6eafeb75fb18f3f1bf463ac3f1cc426789fb5517 Mon Sep 17 00:00:00 2001 From: carlos Date: Thu, 24 Sep 2026 20:12:43 -0400 Subject: [PATCH 161/183] feat: force-clear caches is a one-click playback repair MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit clear_caches now wipes every layer that can wedge stream resolution — cached stream URLs + lyrics, mpv's on-disk audio bytes, the stored PoToken, and the per-video WEB_REMIX failure blacklist — and rotates the anonymous YouTube playback identity (visitorData) on the spot, the manual fix for "Couldn't load this track — YouTube rejected the stream link". The RPC gained a {visitorDataRefreshed} result and a rotate flag: the settings button rotates (default), a quality change clears only the URL cache and leaves the identity alone. An offline re-fetch still drops the token and reports it, so the next launch or a bot-gated resolve re-bootstraps. Wired through the daemon, the Tauri host, the Svelte dialog and the native QML settings page. Verified live: rotate:false keeps the stored identity, rotate:true replaces it, and the daemon answers the new shape on all three calls. --- CHANGELOG.md | 1 + client/pages/SettingsPage.qml | 18 +++++++--- crates/core/src/orchestrator.rs | 7 ++++ crates/core/src/state.rs | 39 +++++++++++++++++++-- crates/ryotunesd/src/methods.rs | 5 +-- src-tauri/src/commands.rs | 13 ++++--- ui/src/lib/api.ts | 5 +-- ui/src/lib/components/SettingsDialog.svelte | 12 ++++--- 8 files changed, 80 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8cf0596..fedda53 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Fixed "Download playlist / Download album" always failing (albums: "missing field `video_id`", playlists: "missing field `videoId`"): two stacked bugs — the client mapped an album/playlist's rows into batch entries twice, dropping every track id, and the daemon's batch endpoint read its JSON in snake_case while the client posts camelCase. Single-track downloads were unaffected, which is why only albums and playlists broke. - Album and playlist downloads now read as one collection: the queue and history group every batch under a single card showing the album/playlist cover, kind, aggregate progress and how many tracks are saved, waiting, failed or cancelled — expandable to its per-track rows. Batch tracks also land in a folder named after their collection on disk, and re-downloading still dedups against them wherever they sit. - Added Settings ▸ Diagnostics: one rolling record of everything that went wrong, for both halves of the app. The daemon logs its own warnings and errors, every failed request, and panics to a ring buffer and a rotating file (`$XDG_DATA_HOME/dev.ryoku.ryotunes/logs/ryotunesd.log`); the client forwards the failures it sees (rejected actions, lost connections, error toasts), buffering them while the daemon is down and delivering them on reconnect. The page filters by level, source and text, copies the whole list to the clipboard, and opens the log folder — so "songs won't play" finally has evidence to show instead of a guess. +- Settings ▸ Storage's cache action is now a one-click playback repair: "Force clear caches" drops every layer that can wedge stream resolution — cached stream URLs and lyrics, mpv's on-disk audio bytes, the stored PoToken, the per-video WEB_REMIX failure blacklist — and rotates the anonymous YouTube playback identity (`visitorData`) on the spot, which is the manual fix for "Couldn't load this track — YouTube rejected the stream link". If the identity re-fetch fails (offline), the toast says so; the token is still dropped, so the next launch or a bot-gated resolve re-bootstraps it. Changing stream quality keeps clearing only the URL cache and no longer rotates the identity. ## v1.1.1 - 2026-09-24 diff --git a/client/pages/SettingsPage.qml b/client/pages/SettingsPage.qml index 0715c7c..c39a81f 100644 --- a/client/pages/SettingsPage.qml +++ b/client/pages/SettingsPage.qml @@ -165,7 +165,9 @@ Item { } function setQuality(q) { page.setSetting("quality", q) - .then(() => Daemon.call("clear_caches").catch(() => {})) + // URLs are keyed by video only, so they must be dropped; the playback identity + // survives a quality change untouched. + .then(() => Daemon.call("clear_caches", { rotate: false }).catch(() => {})) .then(() => Playback.toast("Audio quality updated", "success")); } function saveProxy() { @@ -176,7 +178,15 @@ Item { function clearCaches() { page.clearing = true; Daemon.call("clear_caches") - .then(() => { page.clearing = false; Playback.toast("Caches cleared", "success"); }) + .then((res) => { + page.clearing = false; + // The daemon force-clears every stream cache and re-bootstraps the YouTube + // playback identity; the second half needs the network to work. + if (res && res.visitorDataRefreshed === false) + Playback.toast("Caches cleared — offline, playback ID will retry on next play", "info"); + else + Playback.toast("Playback caches cleared", "success"); + }) .catch((e) => { page.clearing = false; Playback.toast((e && e.message) ? e.message : String(e), "error"); }); } @@ -1004,13 +1014,13 @@ Item { Text { Layout.fillWidth: true; text: "Cache"; color: Tokens.ink; font.family: Style.fontUi; font.pixelSize: Style.fs.md; font.weight: Font.Medium; wrapMode: Text.WordWrap } Text { Layout.fillWidth: true - text: "Clear cached stream URLs and downloaded audio bytes." + text: "Clear cached stream URLs and downloaded audio bytes, and reset the YouTube playback identity. Fixes tracks that fail with “YouTube rejected the stream link”." color: Tokens.inkMuted; font.family: Style.fontUi; font.pixelSize: Style.fs.sm; wrapMode: Text.WordWrap } } Pill { Layout.alignment: Qt.AlignVCenter - label: page.clearing ? "Clearing…" : "Clear caches" + label: page.clearing ? "Clearing…" : "Force clear caches" icon: "close" enabled: !page.clearing onClicked: page.clearCaches() diff --git a/crates/core/src/orchestrator.rs b/crates/core/src/orchestrator.rs index 88e7fc1..5fb7707 100644 --- a/crates/core/src/orchestrator.rs +++ b/crates/core/src/orchestrator.rs @@ -133,6 +133,13 @@ impl Orchestrator { self.web_remix_failed.lock().await.insert(video_id.to_owned()); } + /// Forget every per-video WEB_REMIX failure. The blacklist only steers around dead cached + /// URLs; a force-clear of the caches wipes those too, so the next resolve should retry + /// WEB_REMIX rather than stay locked out for the life of the process. + pub async fn clear_web_remix_failures(&self) { + self.web_remix_failed.lock().await.clear(); + } + /// Claim the one self-heal allowed per `HEAL_WINDOW`; false while a recent heal is cooling. async fn take_heal_slot(&self) -> bool { let mut last = self.last_heal.lock().await; diff --git a/crates/core/src/state.rs b/crates/core/src/state.rs index 612ad27..fd3a607 100644 --- a/crates/core/src/state.rs +++ b/crates/core/src/state.rs @@ -2921,9 +2921,18 @@ impl AppState { self.db.set_setting("queue_position", &pos.to_string()); } - /// Clear both cache tiers (settings "Clear caches"): the SQLite URL cache + mpv's on-disk - /// audio bytes. File cleanup is best-effort; the current track may need to re-buffer. - pub fn clear_caches(&self) { + /// Force-clear everything playback remembers about how to get a stream: the SQLite URL + + /// lyrics cache, mpv's on-disk audio bytes, the stored PoToken, and the per-video WEB_REMIX + /// blacklist. A stale cached stream URL or a stale/missing `visitorData` both surface as mpv + /// 403s ("YouTube rejected the stream link") that no retry can fix on their own — this is + /// the manual lever for it. + /// + /// `rotate_identity` additionally drops the anonymous YouTube playback identity and + /// re-bootstraps a fresh one (the settings button; quality changes pass false). Returns + /// whether a fresh visitorData was installed — false when not rotating or when the fetch + /// failed (offline). A failed fetch still leaves the token deleted, so the next launch or + /// bot-gated resolve re-bootstraps it anyway. + pub async fn clear_caches(&self, rotate_identity: bool) -> bool { self.db.clear_stream_cache(); // The stored PoToken is a cache too, and "clear caches" is where someone goes when // playback has started behaving oddly. Dropping it costs one BotGuard bootstrap. @@ -2933,6 +2942,30 @@ impl AppState { let _ = std::fs::remove_file(e.path()); } } + self.orchestrator.clear_web_remix_failures().await; + // The blacklist is an in-memory hint derived from cached URLs; with the cache wiped, + // WEB_REMIX gets another chance. + if !rotate_identity { + return false; + } + // Drop the persisted anonymous identity before fetching, so a fetch failure still leaves + // the daemon in the "re-bootstrap" state instead of holding the stale token it just + // complained about. Clearing the cooldown lets the on-demand bot-gate heal fire again. + self.db.delete_setting("visitor_data"); + self.it.set_visitor_data(None); + self.last_visitor_try.store(0, Ordering::Relaxed); + match self.it.fetch_visitor_data().await { + Ok(vd) => { + self.it.set_visitor_data(Some(vd.clone())); + self.db.set_setting("visitor_data", &vd); + tracing::info!("playback caches force-cleared; visitorData re-bootstrapped"); + true + } + Err(e) => { + tracing::warn!(error = %e, "visitorData refresh during cache clear failed"); + false + } + } } // --- Listen Together (session protocol) -------------------------------------------------------- diff --git a/crates/ryotunesd/src/methods.rs b/crates/ryotunesd/src/methods.rs index 34ec884..210df20 100644 --- a/crates/ryotunesd/src/methods.rs +++ b/crates/ryotunesd/src/methods.rs @@ -343,8 +343,9 @@ impl Dispatch for Methods { ok(v) } "clear_caches" => { - st.clear_caches(); - null() + let rotate = arg::>(¶ms, "rotate")?.unwrap_or(true); + let refreshed = st.clear_caches(rotate).await; + ok(json!({ "visitorDataRefreshed": refreshed })) } // --- auth ------------------------------------------------------------------------ diff --git a/src-tauri/src/commands.rs b/src-tauri/src/commands.rs index 9ff2755..1f50f16 100644 --- a/src-tauri/src/commands.rs +++ b/src-tauri/src/commands.rs @@ -457,11 +457,16 @@ pub async fn get_stream_clients() -> Result, String> { Ok(v) } -/// Wipe both cache tiers: resolved stream URLs and mpv's on-disk audio cache. +/// Force-clear every resolution cache (URLs, audio bytes, PoToken, WEB_REMIX blacklist) and, +/// unless `rotate` is false, re-bootstrap the YouTube visitorData — the manual repair for +/// "YouTube rejected the stream link". #[tauri::command] -pub async fn clear_caches(state: St<'_>) -> Result<(), String> { - state.clear_caches(); - Ok(()) +pub async fn clear_caches( + state: St<'_>, + rotate: Option, +) -> Result { + let refreshed = state.clear_caches(rotate.unwrap_or(true)).await; + Ok(serde_json::json!({ "visitorDataRefreshed": refreshed })) } // --- auth (authentication flow) --------------------------------------------------------------------- diff --git a/ui/src/lib/api.ts b/ui/src/lib/api.ts index ff194d9..9c2da47 100644 --- a/ui/src/lib/api.ts +++ b/ui/src/lib/api.ts @@ -380,8 +380,9 @@ export interface DiscordStatus { enabled: boolean; status: 'disabled' | 'connect export const discordStatus = () => invoke('discord_status'); /** Streamable client keys for the "disabled clients" setting. */ export const getStreamClients = () => invoke('get_stream_clients'); -/** Wipe both cache tiers (URL cache + mpv on-disk audio cache). */ -export const clearCaches = () => invoke('clear_caches'); +/** Force-clear every playback cache; `rotate` (default true) also re-bootstraps the YouTube visitorData. */ +export const clearCaches = (rotate = true) => + invoke<{ visitorDataRefreshed: boolean }>('clear_caches', { rotate }); /** Open an http(s) link in the real browser, never in the webview itself. */ export const openExternal = (url: string) => invoke('open_external', { url }); diff --git a/ui/src/lib/components/SettingsDialog.svelte b/ui/src/lib/components/SettingsDialog.svelte index c35cb62..a7dbad1 100644 --- a/ui/src/lib/components/SettingsDialog.svelte +++ b/ui/src/lib/components/SettingsDialog.svelte @@ -186,7 +186,7 @@ settings.quality = q; await api.setSetting('quality', q); // Cached URLs are keyed by video only, so clear them to apply the new quality everywhere. - await api.clearCaches(); + await api.clearCaches(false); toast.success('Audio quality updated'); } @@ -299,8 +299,10 @@ async function doClearCaches() { clearing = true; try { - await api.clearCaches(); - toast.success('Caches cleared'); + const res = await api.clearCaches(); + if (res && res.visitorDataRefreshed === false) + toast.info('Caches cleared — offline, playback ID will retry on next play'); + else toast.success('Playback caches cleared'); } finally { clearing = false; } @@ -602,10 +604,10 @@
Cache

- Clear cached stream URLs and downloaded audio bytes. + Clear cached stream URLs and downloaded audio bytes, and reset the YouTube playback identity. Fixes tracks that fail with “YouTube rejected the stream link”.

{:else if tab === 'keybinds'} From 0937b3f833849e35a3f8dcb67a4b7008e98373a6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 25 Sep 2026 00:19:51 +0000 Subject: [PATCH 162/183] release: v1.1.5 --- CHANGELOG.md | 2 ++ Cargo.lock | 22 +++++++++---------- Cargo.toml | 2 +- client/version | 2 +- packaging/arch/PKGBUILD | 2 +- .../linux/dev.ryoku.ryotunes.metainfo.xml | 2 +- src-tauri/tauri.conf.json | 2 +- ui/package.json | 2 +- 8 files changed, 19 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fedda53..2abfb57 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +## v1.1.5 - 2026-09-25 + ## v1.1.4 - 2026-09-24 - Fixed "Download playlist / Download album" always failing (albums: "missing field `video_id`", playlists: "missing field `videoId`"): two stacked bugs — the client mapped an album/playlist's rows into batch entries twice, dropping every track id, and the daemon's batch endpoint read its JSON in snake_case while the client posts camelCase. Single-track downloads were unaffected, which is why only albums and playlists broke. diff --git a/Cargo.lock b/Cargo.lock index 1ec1618..9384acd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2438,7 +2438,7 @@ dependencies = [ [[package]] name = "innertube" -version = "1.1.4" +version = "1.1.5" dependencies = [ "hex", "reqwest 0.12.28", @@ -2943,7 +2943,7 @@ checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" [[package]] name = "listen-protocol" -version = "1.1.4" +version = "1.1.5" dependencies = [ "serde", "serde_json", @@ -3788,7 +3788,7 @@ checksum = "f6b464fbc74e149a392436b17d523f769e057cb6877f6a5c4618bc6f11800548" [[package]] name = "player" -version = "1.1.4" +version = "1.1.5" dependencies = [ "libc", "libmpv2", @@ -4703,7 +4703,7 @@ dependencies = [ [[package]] name = "ryotunes" -version = "1.1.4" +version = "1.1.5" dependencies = [ "anyhow", "async-trait", @@ -4733,7 +4733,7 @@ dependencies = [ [[package]] name = "ryotunes-cli" -version = "1.1.4" +version = "1.1.5" dependencies = [ "ryotunes-protocol", "serde", @@ -4742,7 +4742,7 @@ dependencies = [ [[package]] name = "ryotunes-core" -version = "1.1.4" +version = "1.1.5" dependencies = [ "anyhow", "async-trait", @@ -4778,7 +4778,7 @@ dependencies = [ [[package]] name = "ryotunes-protocol" -version = "1.1.4" +version = "1.1.5" dependencies = [ "serde", "serde_json", @@ -4786,7 +4786,7 @@ dependencies = [ [[package]] name = "ryotunes-soundcloud" -version = "1.1.4" +version = "1.1.5" dependencies = [ "base64 0.22.1", "parking_lot", @@ -4801,7 +4801,7 @@ dependencies = [ [[package]] name = "ryotunes-spotify" -version = "1.1.4" +version = "1.1.5" dependencies = [ "anyhow", "bytes", @@ -4825,7 +4825,7 @@ dependencies = [ [[package]] name = "ryotunesd" -version = "1.1.4" +version = "1.1.5" dependencies = [ "anyhow", "async-trait", @@ -5589,7 +5589,7 @@ dependencies = [ [[package]] name = "sync-server" -version = "1.1.4" +version = "1.1.5" dependencies = [ "futures-util", "listen-protocol", diff --git a/Cargo.toml b/Cargo.toml index 264f5c2..1d6b7a6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ members = [ ] [workspace.package] -version = "1.1.4" +version = "1.1.5" edition = "2021" license = "GPL-3.0-or-later" diff --git a/client/version b/client/version index 65087b4..e25d8d9 100644 --- a/client/version +++ b/client/version @@ -1 +1 @@ -1.1.4 +1.1.5 diff --git a/packaging/arch/PKGBUILD b/packaging/arch/PKGBUILD index c3e4318..40750b3 100644 --- a/packaging/arch/PKGBUILD +++ b/packaging/arch/PKGBUILD @@ -2,7 +2,7 @@ # Run from packaging/arch with: makepkg -si pkgname=ryotunes -pkgver=1.1.4 +pkgver=1.1.5 pkgrel=1 # epoch=1 is permanent: the v1 reset publishes 1:X.Y.Z, which pacman ranks above # the legacy 2.x line an existing machine may carry, so `pacman -U` still upgrades. diff --git a/packaging/linux/dev.ryoku.ryotunes.metainfo.xml b/packaging/linux/dev.ryoku.ryotunes.metainfo.xml index 00cd357..ddc075c 100644 --- a/packaging/linux/dev.ryoku.ryotunes.metainfo.xml +++ b/packaging/linux/dev.ryoku.ryotunes.metainfo.xml @@ -12,5 +12,5 @@ ryotunes.desktop ryotunes AudioVideoAudio - + diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 5cc5326..f6cad85 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "https://schema.tauri.app/config/2", "productName": "Ryotunes", - "version": "1.1.4", + "version": "1.1.5", "identifier": "dev.ryoku.ryotunes", "build": { "frontendDist": "../ui/build", diff --git a/ui/package.json b/ui/package.json index e563035..41c72d0 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,7 +1,7 @@ { "name": "ui", "private": true, - "version": "1.1.4", + "version": "1.1.5", "type": "module", "scripts": { "dev": "vite dev", From eb944784e5680bb10bc617b8a777adfe5c58a0c2 Mon Sep 17 00:00:00 2001 From: carlos Date: Thu, 24 Sep 2026 22:38:24 -0400 Subject: [PATCH 163/183] feat: sign SoundCloud in through the user's own browser The embedded webview capture could not survive captchas or IdP popups, so users reported never getting signed in. Connect now imports the session straight from the browser's cookie stores (Gecko plaintext, Chromium v10 AES-CBC), default profile first, proving the bearer against /me before persisting it; when no session exists it opens soundcloud.com and polls the stores (mtime-guarded) until the sign-in lands or five minutes pass. The client mirrors the new waiting/expired states. --- CHANGELOG.md | 2 + Cargo.lock | 26 ++ client/lib/playback.js | 16 +- client/tests/tst_playback.qml | 16 +- crates/ryotunesd/Cargo.toml | 10 + crates/ryotunesd/src/browser_auth.rs | 552 +++++++++++++++++++++++ crates/ryotunesd/src/main.rs | 3 +- crates/ryotunesd/src/methods.rs | 115 +++-- crates/ryotunesd/src/soundcloud_login.rs | 252 ----------- 9 files changed, 697 insertions(+), 295 deletions(-) create mode 100644 crates/ryotunesd/src/browser_auth.rs delete mode 100644 crates/ryotunesd/src/soundcloud_login.rs diff --git a/CHANGELOG.md b/CHANGELOG.md index 2abfb57..eaaab54 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +- SoundCloud sign-in now happens in your own browser instead of a Ryotunes window: pressing Connect opens soundcloud.com (captchas and Google/Facebook/Apple popups work there), and the daemon watches your browser's cookie stores — Firefox-family and Chromium-family profiles, default browser first — importing the session the moment it appears and proving the token against `/me` before saving it. Already signed in in the browser? One click imports it instantly, no browser round trip. Cookie stores are only re-read when their file actually changes, and an unfinished sign-in ends with a clear message after five minutes rather than hanging. + ## v1.1.5 - 2026-09-25 ## v1.1.4 - 2026-09-24 diff --git a/Cargo.lock b/Cargo.lock index 9384acd..e541410 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -402,6 +402,15 @@ dependencies = [ "generic-array", ] +[[package]] +name = "block-padding" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" +dependencies = [ + "generic-array", +] + [[package]] name = "block2" version = "0.6.2" @@ -548,6 +557,15 @@ dependencies = [ "toml 0.9.12+spec-1.1.0", ] +[[package]] +name = "cbc" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" +dependencies = [ + "cipher", +] + [[package]] name = "cc" version = "1.4.4" @@ -2458,6 +2476,7 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01" dependencies = [ + "block-padding", "generic-array", ] @@ -4827,9 +4846,11 @@ dependencies = [ name = "ryotunesd" version = "1.1.5" dependencies = [ + "aes", "anyhow", "async-trait", "base64 0.22.1", + "cbc", "glib", "gtk", "innertube", @@ -4838,12 +4859,17 @@ dependencies = [ "libc", "lofty", "parking_lot", + "pbkdf2", "player", + "rusqlite", "ryotunes-core", "ryotunes-protocol", "ryotunes-soundcloud", "serde", "serde_json", + "sha1", + "sha2", + "tempfile", "thiserror 2.0.20", "tokio", "tracing", diff --git a/client/lib/playback.js b/client/lib/playback.js index f21c5e8..a59badd 100644 --- a/client/lib/playback.js +++ b/client/lib/playback.js @@ -137,9 +137,11 @@ function applyEvent(s, name, data) { return null; } case "soundcloud-auth": { - // The SoundCloud capture flow's progress. The window is visible (the daemon owns it), - // so unlike Spotify there is no url step; the states are signed_in, signed_out, - // restore_failed (a persisted token died) and error. + // The SoundCloud sign-in flow's progress. Sign-in happens in the user's own browser + // (captchas and IdP popups work there); the daemon opens it and watches the browser's + // cookie store, so the states are: waiting (browser opened, polling), signed_in, + // signed_out, expired (nobody finished in the browser), restore_failed (a persisted + // token died) and error. var sc = (data && data.state) ? data.state : ""; if (sc === "signed_in") { s.soundcloud = { signedIn: true, name: (data && data.name) ? data.name : null, error: "" }; @@ -149,6 +151,14 @@ function applyEvent(s, name, data) { s.soundcloud = { signedIn: false, name: null, error: "" }; return null; } + if (sc === "waiting") { + s.soundcloud = { signedIn: false, name: null, error: "Finish signing in at soundcloud.com in your browser \u2014 Ryotunes picks the session up automatically." }; + return { toast: "Opened soundcloud.com in your browser \u2014 sign in there and Ryotunes will connect", kind: "info" }; + } + if (sc === "expired") { + s.soundcloud = { signedIn: false, name: null, error: "" }; + return { toast: "No SoundCloud sign-in was completed in the browser", kind: "info" }; + } if (sc === "restore_failed" || sc === "error") { var why = (data && data.message) ? data.message : "SoundCloud sign-in failed"; s.soundcloud = { signedIn: false, name: null, error: why }; diff --git a/client/tests/tst_playback.qml b/client/tests/tst_playback.qml index d00a420..c261787 100644 --- a/client/tests/tst_playback.qml +++ b/client/tests/tst_playback.qml @@ -90,14 +90,26 @@ TestCase { compare(s.spotify.error, "bad credentials"); } - // The SoundCloud capture flow drives its own mirror: sign-in, expiry, sign-out. - function test_soundcloud_auth_events_mirror_the_capture_flow() { + // The SoundCloud browser flow drives its own mirror: waiting, sign-in, expiry, sign-out. + function test_soundcloud_auth_events_mirror_the_browser_flow() { var s = freshState(); s.soundcloud = { signedIn: false, name: null, error: "" }; + // Opening the browser is progress, not an error: an info toast plus a guidance line. + var wait = PB.applyEvent(s, "soundcloud-auth", { state: "waiting" }); + compare(wait.kind, "info"); + compare(s.soundcloud.signedIn, false); + verify(s.soundcloud.error.indexOf("browser") >= 0); + // Importing the session from the browser completes the sign-in. var fx = PB.applyEvent(s, "soundcloud-auth", { state: "signed_in", name: "nero" }); compare(s.soundcloud.signedIn, true); compare(s.soundcloud.name, "nero"); + compare(s.soundcloud.error, ""); compare(fx.kind, "success"); + // Giving up clears the guidance line with a calm info toast, not an error. + var expired = PB.applyEvent(s, "soundcloud-auth", { state: "expired" }); + compare(expired.kind, "info"); + compare(s.soundcloud.signedIn, false); + compare(s.soundcloud.error, ""); // An expired persisted token reports itself and keeps the reason for the settings row. PB.applyEvent(s, "soundcloud-auth", { state: "restore_failed", message: "expired" }); compare(s.soundcloud.signedIn, false); diff --git a/crates/ryotunesd/Cargo.toml b/crates/ryotunesd/Cargo.toml index ef529c7..688acc3 100644 --- a/crates/ryotunesd/Cargo.toml +++ b/crates/ryotunesd/Cargo.toml @@ -42,6 +42,16 @@ base64 = "0.22" # System tray via StatusNotifierItem. `ksni` speaks the protocol directly (left-click `Activate` # works, unlike libappindicator), the same reason `src-tauri/src/tray.rs` uses it on Linux. ksni = "0.3" +# Browser-connected SoundCloud sign-in (`browser_auth`): read the session cookies out of the +# user's own browser profile databases (Gecko plaintext, Chromium v10 AES-CBC) instead of an +# embedded webview, so captchas and IdP popups work in the browser they were built for. +rusqlite = { version = "0.32", features = ["bundled"] } +tempfile = "3" +aes = "0.8" +cbc = { version = "0.1", features = ["std", "block-padding"] } +pbkdf2 = "0.12" +sha1 = "0.10" +sha2 = "0.10" # Download enrichment (`download_media`) embeds cover art + lyrics into the finished audio and reads # its real duration. Same version core pins so the workspace resolves one `lofty` (in the lock # already via core, so `--locked` is unaffected). diff --git a/crates/ryotunesd/src/browser_auth.rs b/crates/ryotunesd/src/browser_auth.rs new file mode 100644 index 0000000..3814f49 --- /dev/null +++ b/crates/ryotunesd/src/browser_auth.rs @@ -0,0 +1,552 @@ +//! SoundCloud sign-in through the browser the user already uses, instead of a Ryotunes-owned +//! webview. The embedded WebKit window could not complete real sign-ins: hCaptcha challenges +//! and the Google/Facebook/Apple popup flows need a genuine browser (their own engine, their +//! own profile, working popups), and users rightly refuse to type passwords into an app-owned +//! window. So `soundcloud_sign_in` now opens soundcloud.com in the system default browser and +//! imports the session from that browser's own cookie store once the user has signed in there. +//! +//! What gets imported is exactly what the old window harvested — the `oauth_token`, +//! `oauth_refresh_token` and `connect_session` triple scoped to soundcloud.com — read directly +//! from the cookie databases of the Gecko and Chromium families (Firefox, Zen, LibreWolf, …, +//! Chromium, Chrome, Brave, Vivaldi, Edge), including Flatpak and snap layouts. Only rows whose +//! host matches soundcloud.com are ever selected; no other cookie is read, and values are never +//! logged. A running browser keeps its database locked, so each store is copied (with its WAL) +//! to a private temp dir and read from the copy. +//! +//! The user may already be signed in — the first pass then completes the sign-in immediately. +//! Otherwise the caller polls until a valid triple appears or the window times out. + +use std::collections::BTreeMap; +use std::path::{Path, PathBuf}; + +use rusqlite::{Connection, OpenFlags}; +use ryotunes_soundcloud::SoundcloudAuth; + +/// Where the user is sent: the site's own sign-in page (account form + IdP buttons), which in a +/// real browser has working captchas and popups. +pub const SIGN_IN_URL: &str = "https://soundcloud.com/signin"; + +/// The three cookies that make a SoundCloud web session. +const COOKIE_NAMES: [&str; 3] = ["oauth_token", "oauth_refresh_token", "connect_session"]; + +/// Which cookie dialect a store uses. +#[derive(Clone, Copy, Debug, PartialEq, Eq)] +pub enum Kind { + /// Firefox family: plaintext `value` in `moz_cookies`. + Gecko, + /// Chromium family: `encrypted_value` in `cookies`, AES-128-CBC under the public Linux key. + Chromium, +} + +#[derive(Debug)] +pub struct Store { + pub kind: Kind, + pub path: PathBuf, +} + +/// Hand the sign-in page to the system default browser. True when the launcher spawned; the +/// user still has to actually sign in there. +pub fn open_in_default_browser() -> bool { + let mut command = std::process::Command::new("xdg-open"); + command + .arg(SIGN_IN_URL) + .stdin(std::process::Stdio::null()) + .stdout(std::process::Stdio::null()) + .stderr(std::process::Stdio::null()); + match command.spawn() { + Ok(mut child) => { + // xdg-open usually exits immediately, but a chooser dialog may linger; reap it on a + // blocking thread so a tokio worker never parks in `wait`. + std::thread::spawn(move || { + let _ = child.wait(); + }); + true + } + Err(error) => { + tracing::warn!(error = %error, "could not launch the default browser for SoundCloud sign-in"); + false + } + } +} + +/// Try every discovered cookie store and return the first complete, parseable SoundCloud +/// session. Cheap enough to poll: a store whose database (or WAL journal) has not been +/// touched since the last scan is skipped — a running browser writes every cookie change +/// through the WAL, so unchanged mtimes mean unchanged cookies. Side-effect free. +pub fn import_any() -> Option { + import_from(&discover()) +} + +fn import_from(stores: &[Store]) -> Option { + for store in stores { + if !changed_since_last_look(&store.path) { + continue; + } + let cookies = match store.kind { + Kind::Gecko => read_gecko(&store.path), + Kind::Chromium => read_chromium(&store.path), + }; + let Some(cookies) = cookies else { continue }; + if let Some(auth) = harvest(cookies) { + tracing::info!(store = %store.path.display(), "imported a SoundCloud session from the browser"); + return Some(auth); + } + } + None +} + +/// True when a store's database or WAL journal changed since the previous scan (or was never +/// scanned / cannot be stat'ed — err toward reading it). The memo is process-wide and only +/// ever consulted by the sign-in poller, so a stale entry costs one re-read, never a miss. +fn changed_since_last_look(path: &Path) -> bool { + static SEEN: std::sync::LazyLock>> = + std::sync::LazyLock::new(|| parking_lot::Mutex::new(BTreeMap::new())); + let stamp = |p: &Path| { + std::fs::metadata(&p) + .ok() + .and_then(|m| m.modified().ok()) + .and_then(|t| t.duration_since(std::time::UNIX_EPOCH).ok()) + // Nanoseconds: a write that lands after our stat has a strictly later mtime on + // every local filesystem; second granularity could miss one inside the tick. + .map(|d| d.as_nanos() as i64) + .unwrap_or(-1) + }; + let current = (stamp(path), stamp(&PathBuf::from(format!("{}-wal", path.display())))); + let mut seen = SEEN.lock(); + if seen.get(path) == Some(¤t) { + return false; + } + seen.insert(path.to_path_buf(), current); + true +} + +/// Pick the token triple out of raw `(name, value, domain)` cookie rows. Domain-matched by +/// hand: anything outside soundcloud.com is dropped even if a store somehow returned it. +pub fn harvest(cookies: Vec<(String, String, String)>) -> Option { + let mut jar = BTreeMap::new(); + for (name, value, domain) in cookies { + let domain = domain.strip_prefix('.').map(str::to_owned).unwrap_or(domain); + if domain != "soundcloud.com" && !domain.ends_with(".soundcloud.com") { + continue; + } + if COOKIE_NAMES.contains(&name.as_str()) { + jar.insert(name, value); + } + } + let access = jar.remove("oauth_token")?; + SoundcloudAuth::from_access_token( + access, + jar.remove("oauth_refresh_token"), + jar.remove("connect_session"), + ) +} + +// --- discovery -------------------------------------------------------------------------------- + +/// Every plausible browser config root: `$XDG_CONFIG_HOME`, `~/.mozilla`, and each Flatpak app's +/// private config/home (which is where sandboxed Firefox and Zen actually keep their profiles). +fn candidate_roots() -> Vec { + let home = home_dir(); + let config = std::env::var_os("XDG_CONFIG_HOME") + .filter(|p| Path::new(p).is_absolute()) + .map(PathBuf::from) + .unwrap_or_else(|| home.join(".config")); + let mut roots = vec![config, home.join(".mozilla")]; + if let Ok(entries) = std::fs::read_dir(home.join(".var/app")) { + for entry in entries.flatten() { + let app = entry.path(); + roots.push(app.join("config")); + roots.push(app.join(".config")); + roots.push(app.join(".mozilla")); + } + } + if let Ok(entries) = std::fs::read_dir(home.join("snap")) { + for entry in entries.flatten() { + roots.push(entry.path().join("common/.mozilla")); + roots.push(entry.path().join("common/.config")); + } + } + roots +} + +/// All cookie databases that could hold a SoundCloud session, Gecko stores first (their values +/// are readable without any key material). Bounded so a wild home directory cannot blow up a +/// poll tick. +pub fn discover() -> Vec { + let mut gecko = Vec::new(); + let mut chromium = Vec::new(); + for root in candidate_roots() { + find_named(&root, "cookies.sqlite", 4, &mut gecko); + // Chromium-family profiles keep Cookies under the profile root or its Network/ dir. + find_named(&root, "Cookies", 5, &mut chromium); + } + chromium.retain(|path| { + // A file named "Cookies" is only interesting below a browser-ish profile directory; + // this also drops the Network/ duplicates' parent noise. + path.components().any(|c| { + matches!( + c.as_os_str().to_str(), + Some("Default") | Some("Network") | Some("chromium") | Some("google-chrome") + ) + }) + }); + let mut stores: Vec = gecko + .into_iter() + .map(|path| Store { kind: Kind::Gecko, path }) + .chain(chromium.into_iter().map(|path| Store { kind: Kind::Chromium, path })) + .collect(); + stores.sort_by(|a, b| a.path.cmp(&b.path)); + stores.truncate(64); + prefer_default_browser(&mut stores); + stores +} + +/// The user's default browser is the most likely place they just signed in; try it first. +fn prefer_default_browser(stores: &mut [Store]) { + let Ok(output) = + std::process::Command::new("xdg-settings").args(["get", "default-web-browser"]).output() + else { + return; + }; + if !output.status.success() { + return; + } + let desktop = String::from_utf8_lossy(&output.stdout).trim().to_owned(); + // "zen.desktop" / "firefox.desktop" / "chromium.desktop" … match path fragments. + let name = desktop.trim_end_matches(".desktop").to_lowercase(); + if name.is_empty() { + return; + } + stores.sort_by_key(|store| { + let lower = store.path.to_string_lossy().to_lowercase(); + if lower.contains(&name) { + 0 + } else { + 1 + } + }); +} + +fn find_named(root: &Path, filename: &str, max_depth: usize, out: &mut Vec) { + if max_depth == 0 { + return; + } + let Ok(entries) = std::fs::read_dir(root) else { return }; + for entry in entries.flatten() { + let path = entry.path(); + let Ok(file_type) = entry.file_type() else { continue }; + if file_type.is_file() { + if path.file_name().is_some_and(|n| n == filename) { + out.push(path); + } + } else if file_type.is_dir() && !path_is_symlink(&path) { + find_named(&path, filename, max_depth - 1, out); + } + } +} + +fn path_is_symlink(path: &Path) -> bool { + std::fs::symlink_metadata(path).map(|m| m.file_type().is_symlink()).unwrap_or(false) +} + +fn home_dir() -> PathBuf { + std::env::var_os("HOME").map(PathBuf::from).unwrap_or_else(|| PathBuf::from("/")) +} + +// --- readers ---------------------------------------------------------------------------------- + +/// Copy a (possibly locked, WAL-backed) SQLite database beside its journal files and open the +/// copy read-only, so a running browser never blocks or corrupts the import. +fn copy_and_open(path: &Path) -> Option<(tempfile::TempDir, Connection)> { + let dir = tempfile::Builder::new().prefix("ryotunes-cookies-").tempdir().ok()?; + let target = dir.path().join(path.file_name()?); + std::fs::copy(path, &target).ok()?; + for suffix in ["-wal", "-shm", "-journal"] { + let side = PathBuf::from(format!("{}{suffix}", path.to_string_lossy())); + if side.exists() { + let _ = std::fs::copy(&side, dir.path().join(side.file_name()?)); + } + } + let connection = Connection::open_with_flags( + &target, + OpenFlags::SQLITE_OPEN_READ_ONLY | OpenFlags::SQLITE_OPEN_NO_MUTEX, + ) + .ok()?; + Some((dir, connection)) +} + +fn read_gecko(path: &Path) -> Option> { + let (_dir, connection) = copy_and_open(path)?; + let mut statement = connection + .prepare( + "SELECT name, value, host FROM moz_cookies \ + WHERE host LIKE '%soundcloud.com' AND name IN (?1, ?2, ?3)", + ) + .ok()?; + let rows = statement + .query_map(rusqlite::params![COOKIE_NAMES[0], COOKIE_NAMES[1], COOKIE_NAMES[2]], |row| { + Ok((row.get::<_, String>(0)?, row.get::<_, String>(1)?, row.get::<_, String>(2)?)) + }) + .ok()?; + Some(rows.flatten().collect()) +} + +fn read_chromium(path: &Path) -> Option> { + let (_dir, connection) = copy_and_open(path)?; + let mut statement = connection + .prepare( + "SELECT name, host_key, encrypted_value, value FROM cookies \ + WHERE host_key LIKE '%soundcloud.com' AND name IN (?1, ?2, ?3)", + ) + .ok()?; + let rows = statement + .query_map(rusqlite::params![COOKIE_NAMES[0], COOKIE_NAMES[1], COOKIE_NAMES[2]], |row| { + Ok(( + row.get::<_, String>(0)?, + row.get::<_, String>(1)?, + row.get::<_, Vec>(2)?, + row.get::<_, Vec>(3)?, + )) + }) + .ok()?; + let mut out = Vec::new(); + for row in rows.flatten() { + let (name, host, encrypted, plain) = row; + if let Some(value) = chromium_value(&encrypted, &plain, &host) { + out.push((name, value, host)); + } + } + Some(out) +} + +/// Decode a Chromium cookie value. Linux Chromium stores `v10` values as AES-128-CBC under a +/// key derived from the public passphrase "peanuts" (the whole point is per-user file +/// permissions, not secrecy from the user's own processes); some builds keep plaintext in +/// `value`. `v11` (a keyring-held key) is not attemptable here and is skipped. +fn chromium_value(encrypted: &[u8], plain: &[u8], host: &str) -> Option { + if let Some(text) = non_utf8_none(plain) { + return Some(text); + } + if encrypted.starts_with(b"v10") { + let decrypted = chromium_decrypt_v10(&encrypted[3..])?; + // Some versions prefix the SHA-256 of the cookie host to the plaintext. + let host_hash = sha256(host.trim_start_matches('.')); + let body = if decrypted.len() > 32 && decrypted[..32] == host_hash[..] { + &decrypted[32..] + } else { + &decrypted[..] + }; + return String::from_utf8(body.to_vec()).ok(); + } + if !encrypted.is_empty() && !encrypted.starts_with(b"v1") { + return String::from_utf8(encrypted.to_vec()).ok(); + } + None +} + +fn non_utf8_none(bytes: &[u8]) -> Option { + if bytes.is_empty() { + return None; + } + String::from_utf8(bytes.to_vec()).ok() +} + +fn chromium_decrypt_v10(ciphertext: &[u8]) -> Option> { + use aes::Aes128; + use cbc::cipher::{block_padding::Pkcs7, BlockDecryptMut, KeyIvInit}; + type Aes128CbcDec = cbc::Decryptor; + + let mut key = [0u8; 16]; + pbkdf2::pbkdf2_hmac::(b"peanuts", b"saltysalt", 1, &mut key); + let decryptor = Aes128CbcDec::new(&key.into(), &[0x20; 16].into()); + decryptor.decrypt_padded_vec_mut::(ciphertext).ok() +} + +fn sha256(input: &str) -> [u8; 32] { + use sha2::Digest; + sha2::Sha256::digest(input).into() +} + +#[cfg(test)] +mod tests { + use super::*; + + fn fake_jwt(expiry: i64) -> String { + let header = base64::Engine::encode( + &base64::engine::general_purpose::URL_SAFE_NO_PAD, + br#"{"alg":"RS256"}"#, + ); + let payload = base64::Engine::encode( + &base64::engine::general_purpose::URL_SAFE_NO_PAD, + format!(r#"{{"exp":{expiry},"client_id":"cid"}}"#).as_bytes(), + ); + format!("{header}.{payload}.signature") + } + + #[test] + fn harvest_takes_the_soundcloud_triple_and_ignores_the_rest() { + let expiry = + std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap().as_secs() + as i64 + + 3600; + let cookies = vec![ + ("oauth_token".into(), fake_jwt(expiry), ".soundcloud.com".into()), + ("oauth_refresh_token".into(), "rot-1".into(), ".soundcloud.com".into()), + ("connect_session".into(), "cs-1".into(), ".soundcloud.com".into()), + ("spam".into(), "no".into(), ".evil.com".into()), + ("oauth_token".into(), "wrong-domain".into(), ".notsoundcloud.com".into()), + ]; + let auth = harvest(cookies).expect("a complete triple harvests"); + assert_eq!(auth.refresh_token.as_deref(), Some("rot-1")); + assert_eq!(auth.connect_session.as_deref(), Some("cs-1")); + assert_eq!(auth.client_id, "cid"); + } + + #[test] + fn harvest_needs_the_access_token() { + assert!(harvest(vec![("connect_session".into(), "cs".into(), ".soundcloud.com".into())]) + .is_none()); + } + + fn seed_gecko(root: &Path, profile: &str, rows: &[(&str, &str, &str)]) -> PathBuf { + let dir = root.join(profile); + std::fs::create_dir_all(&dir).unwrap(); + let path = dir.join("cookies.sqlite"); + let connection = Connection::open(&path).unwrap(); + connection + .execute("CREATE TABLE moz_cookies (host TEXT, name TEXT, value TEXT)", []) + .unwrap(); + for (host, name, value) in rows { + connection + .execute( + "INSERT INTO moz_cookies VALUES (?1, ?2, ?3)", + rusqlite::params![host, name, value], + ) + .unwrap(); + } + path + } + + #[test] + fn gecko_store_imports_over_a_locked_live_database() { + let temp = tempfile::tempdir().unwrap(); + let expiry = + std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap().as_secs() + as i64 + + 3600; + let path = seed_gecko( + temp.path(), + "abc123.Default (release)", + &[ + (".soundcloud.com", "oauth_token", &fake_jwt(expiry)), + (".soundcloud.com", "oauth_refresh_token", "rot"), + (".soundcloud.com", "connect_session", "cs"), + (".example.com", "oauth_token", "decoy"), + ], + ); + // Hold the source open (like a running browser) to prove the copy path works anyway. + let _live = Connection::open(&path).unwrap(); + let stores = vec![Store { kind: Kind::Gecko, path }]; + let auth = import_from(&stores).expect("the triple imports"); + assert_eq!(auth.refresh_token.as_deref(), Some("rot")); + } + + #[test] + fn chromium_v10_values_decrypt_with_the_public_linux_key() { + use aes::Aes128; + use cbc::cipher::{block_padding::Pkcs7, BlockEncryptMut, KeyIvInit}; + type Aes128CbcEnc = cbc::Encryptor; + + let mut key = [0u8; 16]; + pbkdf2::pbkdf2_hmac::(b"peanuts", b"saltysalt", 1, &mut key); + let encrypt = |plain: &[u8]| -> Vec { + Aes128CbcEnc::new(&key.into(), &[0x20; 16].into()) + .encrypt_padded_vec_mut::(plain) + }; + + let temp = tempfile::tempdir().unwrap(); + let dir = temp.path().join("chromium/Default"); + std::fs::create_dir_all(&dir).unwrap(); + let path = dir.join("Cookies"); + let connection = Connection::open(&path).unwrap(); + connection + .execute( + "CREATE TABLE cookies (host_key TEXT, name TEXT, encrypted_value BLOB, value BLOB)", + [], + ) + .unwrap(); + let expiry = + std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap().as_secs() + as i64 + + 3600; + let jwt = fake_jwt(expiry); + connection + .execute( + "INSERT INTO cookies VALUES ('.soundcloud.com', 'oauth_token', ?1, x'')", + rusqlite::params![format!("v10") + .into_bytes() + .into_iter() + .chain(encrypt(jwt.as_bytes())) + .collect::>()], + ) + .unwrap(); + connection + .execute( + "INSERT INTO cookies VALUES ('.soundcloud.com', 'oauth_refresh_token', ?1, x'')", + rusqlite::params!["v10" + .as_bytes() + .iter() + .cloned() + .chain(encrypt(b"rot-c")) + .collect::>()], + ) + .unwrap(); + connection + .execute( + "INSERT INTO cookies VALUES ('.soundcloud.com', 'connect_session', ?1, x'')", + rusqlite::params!["v10" + .as_bytes() + .iter() + .cloned() + .chain(encrypt(b"cs-c")) + .collect::>()], + ) + .unwrap(); + drop(connection); + + let stores = vec![Store { kind: Kind::Chromium, path }]; + let auth = import_from(&stores).expect("v10 cookies import"); + assert_eq!(auth.refresh_token.as_deref(), Some("rot-c")); + assert_eq!(auth.connect_session.as_deref(), Some("cs-c")); + } + + #[test] + fn v11_keyring_cookies_are_skipped_not_fatal() { + assert_eq!(chromium_value(b"v11garbage", b"", ".soundcloud.com"), None); + } + + #[test] + fn discovery_finds_gecko_and_chromium_layouts_under_a_fake_home() { + let temp = tempfile::tempdir().unwrap(); + let expiry = + std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap().as_secs() + as i64 + + 3600; + seed_gecko( + &temp.path().join("zen"), + "xyz.Default (release)", + &[(".soundcloud.com", "oauth_token", &fake_jwt(expiry))], + ); + let chrome_dir = temp.path().join("chromium/Default/Network"); + std::fs::create_dir_all(&chrome_dir).unwrap(); + std::fs::write(chrome_dir.join("Cookies"), b"not-a-db").unwrap(); + + let mut gecko = Vec::new(); + let mut chromium = Vec::new(); + find_named(temp.path(), "cookies.sqlite", 4, &mut gecko); + find_named(temp.path(), "Cookies", 5, &mut chromium); + assert_eq!(gecko.len(), 1, "the zen profile db is found"); + assert!(gecko[0].to_string_lossy().contains("zen")); + assert_eq!(chromium.len(), 1, "the chromium Network/Cookies is found"); + } +} diff --git a/crates/ryotunesd/src/main.rs b/crates/ryotunesd/src/main.rs index e90dcc7..5f5d507 100644 --- a/crates/ryotunesd/src/main.rs +++ b/crates/ryotunesd/src/main.rs @@ -1,4 +1,5 @@ mod app; +mod browser_auth; mod diagnostics; mod download_media; mod downloads; @@ -9,7 +10,6 @@ mod login; mod methods; mod server; mod sink; -mod soundcloud_login; mod tray; use std::io::{BufRead, BufReader, Write}; use std::os::unix::io::AsRawFd; @@ -110,7 +110,6 @@ fn main() -> anyhow::Result<()> { state: state.clone(), quit: quit_tx, downloads: downloads.clone(), - soundcloud_login: Arc::new(soundcloud_login::SoundcloudLogin::new(gtk.clone())), }); // A `systemctl stop` (or any `kill`) sends SIGTERM: handle it exactly like ctrl_c / an // explicit quit so the awaited teardown below runs — cancelling and reaping every download diff --git a/crates/ryotunesd/src/methods.rs b/crates/ryotunesd/src/methods.rs index 210df20..cbaeb2b 100644 --- a/crates/ryotunesd/src/methods.rs +++ b/crates/ryotunesd/src/methods.rs @@ -32,8 +32,6 @@ pub struct Methods { pub state: Arc, pub quit: tokio::sync::mpsc::UnboundedSender<()>, pub downloads: Arc, - /// The visible SoundCloud sign-in window (cookie-jar OAuth capture). - pub soundcloud_login: Arc, } fn arg(params: &Value, key: &str) -> Result { @@ -74,10 +72,14 @@ impl Drop for SignInGuard { } } -/// Guards the SoundCloud sign-in window so two capture flows never open at once. +/// Guards the SoundCloud browser-import flow so two watchers never run at once. static SC_SIGNING_IN: AtomicBool = AtomicBool::new(false); +/// How often the browser-import watcher re-reads the browser cookie stores, and how long the +/// user gets to finish signing in there before the flow gives up. +const SC_SIGN_IN_POLL_SECS: u64 = 2; +const SC_SIGN_IN_TIMEOUT_SECS: u64 = 5 * 60; -/// Resets [`SC_SIGNING_IN`] whenever the spawned flow ends — success, failure or panic. +/// Resets [`SC_SIGNING_IN`] whenever the capture flow ends — success, failure or panic. struct SoundcloudSignInGuard; impl Drop for SoundcloudSignInGuard { fn drop(&mut self) { @@ -85,6 +87,33 @@ impl Drop for SoundcloudSignInGuard { } } +/// Finish a SoundCloud sign-in from an imported session: prove the bearer against /me before +/// persisting it, and carry the account name back for the status line. +async fn complete_soundcloud_sign_in( + st: &Arc, + mut auth: ryotunes_soundcloud::SoundcloudAuth, +) { + st.soundcloud.set_auth(Some(auth.clone())); + match st.soundcloud.me().await { + Ok(user) => { + auth.username = Some(user.username.clone()); + persist_soundcloud_auth(st, Some(&auth)); + st.soundcloud.set_auth(Some(auth)); + st.emit("soundcloud-auth", json!({ "state": "signed_in", "name": user.username })); + } + Err(e) => { + st.soundcloud.set_auth(None); + st.emit( + "soundcloud-auth", + json!({ + "state": "error", + "message": format!("SoundCloud sign-in failed: {e}"), + }), + ); + } + } +} + /// Persist (or forget) the SoundCloud OAuth blob under the daemon-only settings key. The /// crate's rotate hook writes the same key on every refresh; this writes it at sign-in and /// sign-out, the two moments the lifetime changes. @@ -885,41 +914,55 @@ impl Dispatch for Methods { return ok(json!({ "started": false })); } let task = st.clone(); - let window = self.soundcloud_login.clone(); tokio::spawn(async move { let _guard = SoundcloudSignInGuard; - match window.sign_in().await { - Ok(mut auth) => { - // Proof before persistence: the bearer must actually answer /me, - // and the account name rides back for the status line. - task.soundcloud.set_auth(Some(auth.clone())); - match task.soundcloud.me().await { - Ok(user) => { - auth.username = Some(user.username.clone()); - persist_soundcloud_auth(&task, Some(&auth)); - task.soundcloud.set_auth(Some(auth)); - task.emit( - "soundcloud-auth", - json!({ "state": "signed_in", "name": user.username }), - ); - } - Err(e) => { - task.soundcloud.set_auth(None); - task.emit( - "soundcloud-auth", - json!({ - "state": "error", - "message": format!("SoundCloud sign-in failed: {e}"), - }), - ); - } - } - } - Err(ryotunes_core::host::LoginError::Cancelled) => {} - Err(e) => task.emit( + // Already signed in in the browser? Import it right now — no round trip. + if let Some(auth) = tokio::task::spawn_blocking(crate::browser_auth::import_any) + .await + .ok() + .flatten() + { + complete_soundcloud_sign_in(&task, auth).await; + return; + } + // Otherwise hand the real sign-in to the system default browser, where + // hCaptcha and the Google/Facebook/Apple popups actually work, and watch the + // browser's cookie store for the session to appear. + if !crate::browser_auth::open_in_default_browser() { + task.emit( "soundcloud-auth", - json!({ "state": "error", "message": e.to_string() }), - ), + json!({ + "state": "error", + "message": "Could not open your browser. Sign in at soundcloud.com, then press the button again.", + }), + ); + return; + } + task.emit("soundcloud-auth", json!({ "state": "waiting" })); + let deadline = tokio::time::Instant::now() + + std::time::Duration::from_secs(SC_SIGN_IN_TIMEOUT_SECS); + loop { + tokio::time::sleep(std::time::Duration::from_secs(SC_SIGN_IN_POLL_SECS)) + .await; + if tokio::time::Instant::now() >= deadline { + task.emit( + "soundcloud-auth", + json!({ + "state": "expired", + "message": "No SoundCloud sign-in was completed in the browser.", + }), + ); + return; + } + if let Some(auth) = + tokio::task::spawn_blocking(crate::browser_auth::import_any) + .await + .ok() + .flatten() + { + complete_soundcloud_sign_in(&task, auth).await; + return; + } } }); ok(json!({ "started": true })) diff --git a/crates/ryotunesd/src/soundcloud_login.rs b/crates/ryotunesd/src/soundcloud_login.rs deleted file mode 100644 index 07b26ff..0000000 --- a/crates/ryotunesd/src/soundcloud_login.rs +++ /dev/null @@ -1,252 +0,0 @@ -//! The visible SoundCloud sign-in window. SoundCloud's own web player keeps its OAuth access -//! token in a JS-readable `oauth_token` cookie and its session in `connect_session` + -//! `oauth_refresh_token` (httpOnly), and sends the bearer on every api-v2 call as -//! `Authorization: OAuth `. WebKitGTK does not expose outgoing request headers, but its -//! cookie jar holds exactly those three cookies once the user has signed in — so this window -//! opens soundcloud.com/signin and harvests the jar, the same shape as the Google login in -//! `login.rs`. Unlike Google, the SPA writes the cookies without a navigation, so the jar is -//! watched through the cookie manager's `changed` signal as well as on finished loads. -//! -//! Persistent (`WebContext` default) on purpose: the webview keeps its SoundCloud session, so a -//! later re-login is one click. - -use std::collections::BTreeMap; -use std::sync::Arc; - -use parking_lot::Mutex; -use ryotunes_core::host::LoginError; -use ryotunes_soundcloud::SoundcloudAuth; -use tokio::sync::oneshot; - -use crate::gtk_thread::Gtk; - -/// A plain Linux Firefox UA: SoundCloud's login (and its IdP pages) behave normally under it, -/// and unlike the YouTube window there is no bot gate to spoof past. -const LOGIN_UA: &str = "Mozilla/5.0 (X11; Linux x86_64; rv:128.0) Gecko/20100101 Firefox/128.0"; - -/// The origin whose cookie jar carries the token triple. -const SC_ORIGIN: &str = "https://soundcloud.com"; - -/// Where the window starts: the site's own sign-in page (an account form, plus the Google / -/// Facebook / Apple buttons). -const LOGIN_URL: &str = "https://soundcloud.com/signin"; - -type Outcome = Result; -type Tx = Arc>>>; - -/// The host's SoundCloud sign-in: one visible window per call, on the GTK thread. -pub struct SoundcloudLogin { - gtk: Gtk, -} - -impl SoundcloudLogin { - pub fn new(gtk: Gtk) -> Self { - SoundcloudLogin { gtk } - } - - /// Run the sign-in. `Ok(auth)` only after the harvested bearer parses; the caller persists - /// it and installs it on the shared client. - pub async fn sign_in(&self) -> Result { - let (tx, rx) = oneshot::channel::(); - let tx: Tx = Arc::new(Mutex::new(Some(tx))); - self.gtk.call(move || build_login_window(tx)).await; - // The sender is dropped when the window is torn down without resolving → cancelled. - rx.await.unwrap_or(Err(LoginError::Cancelled)) - } -} - -/// True for https URLs the sign-in may live on: the site itself, its CDN, and the IdPs its -/// buttons open. Anything else is a phishing redirect and is refused. -fn allowed_navigation(url: &url::Url) -> bool { - if url.scheme() != "https" { - return false; - } - let Some(host) = url.host_str() else { return false }; - const HOSTS: [&str; 7] = [ - "soundcloud.com", - "sndcdn.com", - "google.com", - "facebook.com", - "facebook.net", - "appleid.apple.com", - "login.live.com", - ]; - HOSTS.iter().any(|h| host == *h || host.ends_with(&format!(".{h}"))) -} - -/// Pick the token triple out of raw `(name, value, domain)` jar entries. Domain-matched by -/// hand like `login.rs` does for YouTube: anything outside soundcloud.com is dropped. -fn harvest(cookies: Vec<(String, String, String)>) -> Option { - let mut jar = BTreeMap::new(); - for (name, value, domain) in cookies { - let domain = domain.strip_prefix('.').map(str::to_owned).unwrap_or(domain); - if domain != "soundcloud.com" && !domain.ends_with(".soundcloud.com") { - continue; - } - if matches!(name.as_str(), "oauth_token" | "oauth_refresh_token" | "connect_session") { - jar.insert(name, value); - } - } - let access = jar.remove("oauth_token")?; - SoundcloudAuth::from_access_token( - access, - jar.remove("oauth_refresh_token"), - jar.remove("connect_session"), - ) -} - -fn build_login_window(tx: Tx) { - use gtk::prelude::*; - use webkit2gtk::{ - gio, CookieManagerExt, LoadEvent, NavigationPolicyDecision, NavigationPolicyDecisionExt, - PolicyDecisionExt, PolicyDecisionType, SettingsExt, URIRequestExt, WebContext, - WebContextExt, WebView, WebViewExt, - }; - - let view = WebView::new(); - crate::gtk_thread::install_clean_exit(); - if let Some(settings) = WebViewExt::settings(&view) { - settings.set_user_agent(Some(LOGIN_UA)); - } - - view.connect_decide_policy(|_view, decision, kind| { - if kind != PolicyDecisionType::NavigationAction - && kind != PolicyDecisionType::NewWindowAction - { - return false; - } - let uri = decision - .downcast_ref::() - .and_then(|d| d.navigation_action()) - .and_then(|a| a.request()) - .and_then(|r| r.uri()); - let allowed = uri - .as_deref() - .and_then(|u| url::Url::parse(u).ok()) - .map(|u| allowed_navigation(&u)) - .unwrap_or(false); - if allowed { - decision.use_(); - } else { - decision.ignore(); - } - true - }); - - // Resolve the flow from the jar: called on finished loads AND on every cookie change, - // because the SPA lands the token without navigating. - let resolve = { - let view = view.clone(); - move |tx: &Tx| { - let Some(cm) = WebContext::default().and_then(|c| c.cookie_manager()) else { - return; - }; - let tx = tx.clone(); - let view = view.clone(); - cm.cookies(SC_ORIGIN, None::<&gio::Cancellable>, move |res| { - let Ok(cookies) = res else { return }; - let triples: Vec<(String, String, String)> = cookies - .into_iter() - .map(|mut c| { - ( - c.name().map(|g| g.to_string()).unwrap_or_default(), - c.value().map(|g| g.to_string()).unwrap_or_default(), - c.domain().map(|g| g.to_string()).unwrap_or_default(), - ) - }) - .collect(); - let Some(auth) = harvest(triples) else { - return; - }; - if let Some(tx) = tx.lock().take() { - let _ = tx.send(Ok(auth)); - } - if let Some(w) = view.toplevel() { - unsafe { w.destroy() }; - } - }); - } - }; - - let tx_load = tx.clone(); - let resolve_load = resolve.clone(); - view.connect_load_changed(move |_, event| { - if event == LoadEvent::Finished { - resolve_load(&tx_load); - } - }); - - if let Some(cm) = WebContext::default().and_then(|c| c.cookie_manager()) { - let tx_changed = tx.clone(); - cm.connect_changed(move |_| { - resolve(&tx_changed); - }); - } - - let window = gtk::Window::new(gtk::WindowType::Toplevel); - window.set_title("Sign in to SoundCloud"); - window.set_default_size(480, 720); - window.add(&view); - - window.connect_delete_event(move |_, _| { - if let Some(tx) = tx.lock().take() { - let _ = tx.send(Err(LoginError::Cancelled)); - } - glib::Propagation::Proceed - }); - - window.show_all(); - view.load_uri(LOGIN_URL); -} - -#[cfg(test)] -mod tests { - use super::*; - - fn triple(name: &str, value: &str, domain: &str) -> (String, String, String) { - (name.into(), value.into(), domain.into()) - } - - /// A JWT with a far-future exp so `from_access_token` keeps it alive. - fn fake_jwt() -> String { - use base64::Engine as _; - let enc = |bytes: &[u8]| { - base64::prelude::BASE64_URL_SAFE_NO_PAD.encode(bytes).trim_end_matches('=').to_string() - }; - let exp = - std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap().as_secs() - + 3600; - format!( - "{}.{}.sig", - enc(b"{\"alg\":\"none\"}"), - &enc(format!("{{\"exp\":{exp},\"client_id\":\"cid\"}}").as_bytes()) - ) - } - - #[test] - fn harvest_needs_the_full_soundcloud_triple() { - // An access token alone cannot rotate, but it is still a sign-in: harvest succeeds - // with the refresh pair absent, and foreign-domain cookies never count. - let auth = harvest(vec![triple("oauth_token", "elsewhere", ".example.com")]).is_none(); - assert!(auth, "a token outside soundcloud.com is not ours"); - let auth = harvest(vec![ - triple("oauth_token", &fake_jwt(), ".soundcloud.com"), - triple("oauth_refresh_token", "rt", ".soundcloud.com"), - triple("connect_session", "cs", ".soundcloud.com"), - ]) - .expect("the triple harvests"); - assert_eq!(auth.refresh_token.as_deref(), Some("rt")); - assert_eq!(auth.connect_session.as_deref(), Some("cs")); - } - - #[test] - fn navigation_stays_on_soundcloud_and_known_idps() { - assert!(allowed_navigation(&url::Url::parse("https://soundcloud.com/signin").unwrap())); - assert!(allowed_navigation(&url::Url::parse("https://a-v2.sndcdn.com/x.js").unwrap())); - assert!(allowed_navigation( - &url::Url::parse("https://accounts.google.com/o/oauth2/v2/auth").unwrap() - )); - assert!(!allowed_navigation(&url::Url::parse("https://evil.test/claim").unwrap())); - assert!(!allowed_navigation(&url::Url::parse("http://soundcloud.com/insecure").unwrap())); - } -} From 1019ea10c8efc2d9541d80b44510904e8d2c6568 Mon Sep 17 00:00:00 2001 From: carlos Date: Thu, 24 Sep 2026 22:38:39 -0400 Subject: [PATCH 164/183] feat: restart into an installed update by itself install_update left 'quit and reopen' as the user's chore. The client now spawns a detached helper that flock-waits for the old daemon's socket lock to release, then execs the launcher (socket-activating the new daemon and opening the new client), and asks the daemon to quit. The manual guidance stays as the fallback text if the helper fails. --- CHANGELOG.md | 2 ++ client/pages/SettingsPage.qml | 25 +++++++++++++++++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eaaab54..925a3fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ - SoundCloud sign-in now happens in your own browser instead of a Ryotunes window: pressing Connect opens soundcloud.com (captchas and Google/Facebook/Apple popups work there), and the daemon watches your browser's cookie stores — Firefox-family and Chromium-family profiles, default browser first — importing the session the moment it appears and proving the token against `/me` before saving it. Already signed in in the browser? One click imports it instantly, no browser round trip. Cookie stores are only re-read when their file actually changes, and an unfinished sign-in ends with a clear message after five minutes rather than hanging. +- Installing an update from Settings now restarts Ryotunes by itself: after the package lands, a detached helper waits for the old daemon to release its socket lock, then relaunches — socket-activating the new daemon and opening the new client — instead of leaving "quit and reopen" as the user's chore. If the helper fails, the app stays open with the old manual guidance as the fallback. + ## v1.1.5 - 2026-09-25 ## v1.1.4 - 2026-09-24 diff --git a/client/pages/SettingsPage.qml b/client/pages/SettingsPage.qml index c39a81f..92be7ab 100644 --- a/client/pages/SettingsPage.qml +++ b/client/pages/SettingsPage.qml @@ -208,13 +208,34 @@ Item { page.updateStatus = "installing"; page.updateError = ""; Daemon.call("install_update", { version: version }) - .then((res) => { page.installedVersion = (res && res.version) ? res.version : version; page.updateStatus = "installed"; }) + .then((res) => { + page.installedVersion = (res && res.version) ? res.version : version; + page.updateStatus = "installed"; + page.restartIntoUpdate(); + }) .catch((e) => { page.updateError = (e && e.message) ? e.message : String(e); page.updateStatus = "error"; }); } + // The package is on disk, but this client and the daemon are still running the old code. + // Finish like a normal app does: restart itself. A detached helper waits for the old + // daemon to release its lock file — the daemon's exit is the full teardown (download + // reaping included), so waiting on the lock beats racing it with a timer — then runs the + // launcher, which socket-activates the new daemon and opens the new client. Meanwhile we + // ask the daemon to quit and close this window. If the helper somehow fails, the app + // stays open showing the manual "quit and reopen" guidance as the fallback. + function restartIntoUpdate() { + var lock = (Quickshell.env("XDG_RUNTIME_DIR") || "/tmp") + "/ryotunes/ryotunesd.sock.lock"; + Quickshell.execDetached([ + "sh", "-c", + "flock -w 60 \"$1\" -c true 2>/dev/null; exec ryotunes", + "ryotunes-update-restart", lock + ]); + Daemon.call("quit").catch(() => {}); + Qt.quit(); + } function updateMessage() { if (page.updateStatus === "checking") return "Checking for a new version…"; if (page.updateStatus === "installing") return "Downloading and verifying the update, then asking for administrator approval. Keep Ryotunes open until it finishes."; - if (page.updateStatus === "installed") return "Ryotunes " + page.installedVersion + " is installed. Quit Ryotunes and open it again to finish — closing the window isn't enough; the background service reloads only on a full restart."; + if (page.updateStatus === "installed") return "Ryotunes " + page.installedVersion + " installed — restarting Ryotunes to finish. If the window is still here, quit it and open it again; the background service reloads only on a full restart."; if (page.updateStatus === "error") return "Update failed: " + page.updateError; var info = page.updateInfo; if (!info) return ""; From 8fad27becd373ca7943b2e8943a8f14398b67ddb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 25 Sep 2026 02:46:14 +0000 Subject: [PATCH 165/183] release: v1.1.6 --- CHANGELOG.md | 2 ++ Cargo.lock | 22 +++++++++---------- Cargo.toml | 2 +- client/version | 2 +- packaging/arch/PKGBUILD | 2 +- .../linux/dev.ryoku.ryotunes.metainfo.xml | 2 +- src-tauri/tauri.conf.json | 2 +- ui/package.json | 2 +- 8 files changed, 19 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 925a3fc..47f8090 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +## v1.1.6 - 2026-09-25 + - SoundCloud sign-in now happens in your own browser instead of a Ryotunes window: pressing Connect opens soundcloud.com (captchas and Google/Facebook/Apple popups work there), and the daemon watches your browser's cookie stores — Firefox-family and Chromium-family profiles, default browser first — importing the session the moment it appears and proving the token against `/me` before saving it. Already signed in in the browser? One click imports it instantly, no browser round trip. Cookie stores are only re-read when their file actually changes, and an unfinished sign-in ends with a clear message after five minutes rather than hanging. - Installing an update from Settings now restarts Ryotunes by itself: after the package lands, a detached helper waits for the old daemon to release its socket lock, then relaunches — socket-activating the new daemon and opening the new client — instead of leaving "quit and reopen" as the user's chore. If the helper fails, the app stays open with the old manual guidance as the fallback. diff --git a/Cargo.lock b/Cargo.lock index e541410..959e27d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2456,7 +2456,7 @@ dependencies = [ [[package]] name = "innertube" -version = "1.1.5" +version = "1.1.6" dependencies = [ "hex", "reqwest 0.12.28", @@ -2962,7 +2962,7 @@ checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" [[package]] name = "listen-protocol" -version = "1.1.5" +version = "1.1.6" dependencies = [ "serde", "serde_json", @@ -3807,7 +3807,7 @@ checksum = "f6b464fbc74e149a392436b17d523f769e057cb6877f6a5c4618bc6f11800548" [[package]] name = "player" -version = "1.1.5" +version = "1.1.6" dependencies = [ "libc", "libmpv2", @@ -4722,7 +4722,7 @@ dependencies = [ [[package]] name = "ryotunes" -version = "1.1.5" +version = "1.1.6" dependencies = [ "anyhow", "async-trait", @@ -4752,7 +4752,7 @@ dependencies = [ [[package]] name = "ryotunes-cli" -version = "1.1.5" +version = "1.1.6" dependencies = [ "ryotunes-protocol", "serde", @@ -4761,7 +4761,7 @@ dependencies = [ [[package]] name = "ryotunes-core" -version = "1.1.5" +version = "1.1.6" dependencies = [ "anyhow", "async-trait", @@ -4797,7 +4797,7 @@ dependencies = [ [[package]] name = "ryotunes-protocol" -version = "1.1.5" +version = "1.1.6" dependencies = [ "serde", "serde_json", @@ -4805,7 +4805,7 @@ dependencies = [ [[package]] name = "ryotunes-soundcloud" -version = "1.1.5" +version = "1.1.6" dependencies = [ "base64 0.22.1", "parking_lot", @@ -4820,7 +4820,7 @@ dependencies = [ [[package]] name = "ryotunes-spotify" -version = "1.1.5" +version = "1.1.6" dependencies = [ "anyhow", "bytes", @@ -4844,7 +4844,7 @@ dependencies = [ [[package]] name = "ryotunesd" -version = "1.1.5" +version = "1.1.6" dependencies = [ "aes", "anyhow", @@ -5615,7 +5615,7 @@ dependencies = [ [[package]] name = "sync-server" -version = "1.1.5" +version = "1.1.6" dependencies = [ "futures-util", "listen-protocol", diff --git a/Cargo.toml b/Cargo.toml index 1d6b7a6..ec09596 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ members = [ ] [workspace.package] -version = "1.1.5" +version = "1.1.6" edition = "2021" license = "GPL-3.0-or-later" diff --git a/client/version b/client/version index e25d8d9..0664a8f 100644 --- a/client/version +++ b/client/version @@ -1 +1 @@ -1.1.5 +1.1.6 diff --git a/packaging/arch/PKGBUILD b/packaging/arch/PKGBUILD index 40750b3..e507b66 100644 --- a/packaging/arch/PKGBUILD +++ b/packaging/arch/PKGBUILD @@ -2,7 +2,7 @@ # Run from packaging/arch with: makepkg -si pkgname=ryotunes -pkgver=1.1.5 +pkgver=1.1.6 pkgrel=1 # epoch=1 is permanent: the v1 reset publishes 1:X.Y.Z, which pacman ranks above # the legacy 2.x line an existing machine may carry, so `pacman -U` still upgrades. diff --git a/packaging/linux/dev.ryoku.ryotunes.metainfo.xml b/packaging/linux/dev.ryoku.ryotunes.metainfo.xml index ddc075c..afa45e4 100644 --- a/packaging/linux/dev.ryoku.ryotunes.metainfo.xml +++ b/packaging/linux/dev.ryoku.ryotunes.metainfo.xml @@ -12,5 +12,5 @@ ryotunes.desktop ryotunes AudioVideoAudio - + diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index f6cad85..97e93f6 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "https://schema.tauri.app/config/2", "productName": "Ryotunes", - "version": "1.1.5", + "version": "1.1.6", "identifier": "dev.ryoku.ryotunes", "build": { "frontendDist": "../ui/build", diff --git a/ui/package.json b/ui/package.json index 41c72d0..67b9599 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,7 +1,7 @@ { "name": "ui", "private": true, - "version": "1.1.5", + "version": "1.1.6", "type": "module", "scripts": { "dev": "vite dev", From 05455e7b4e84178e1997a16e818c1b91431927cc Mon Sep 17 00:00:00 2001 From: eximora-private <198456237+eximora-private@users.noreply.github.com> Date: Mon, 12 Oct 2026 21:04:17 +0200 Subject: [PATCH 166/183] fix: saved spotify items come back newest first --- crates/spotify/src/collection2.rs | 57 +++++++++++++++++++++++++++++-- 1 file changed, 54 insertions(+), 3 deletions(-) diff --git a/crates/spotify/src/collection2.rs b/crates/spotify/src/collection2.rs index 61564a9..adeb04e 100644 --- a/crates/spotify/src/collection2.rs +++ b/crates/spotify/src/collection2.rs @@ -117,15 +117,20 @@ pub(crate) async fn saved_items( found.extend(page.items.into_iter().filter(|item| item.uri.starts_with(prefix))); token = page.next; - if found.len() >= limit || token.is_empty() { + if token.is_empty() { break; } } - found.truncate(limit); + newest_first(&mut found, limit); Ok(found) } +fn newest_first(found: &mut Vec, limit: usize) { + found.sort_by(|a, b| b.added_at.cmp(&a.added_at)); + found.truncate(limit); +} + fn headers() -> HeaderMap { let mut headers = HeaderMap::new(); headers.insert(CONTENT_TYPE, HeaderValue::from_static(CONTENT)); @@ -167,7 +172,7 @@ fn kept(bytes: &[u8]) -> Result> { match (field, value) { (ITEM_URI, Value::Bytes(raw)) => uri = Some(text(raw)?), (ITEM_ADDED_AT, Value::Varint(raw) | Value::Fixed(raw)) => { - added_at = Some(raw as u32 as i32 as i64); + added_at = Some(raw as i64); } (ITEM_REMOVED, Value::Varint(flag)) => removed = flag != 0, _ => (), @@ -218,4 +223,50 @@ mod tests { assert!(kept(&writer.finish()).unwrap().is_none()); } + + fn saved(uri: &str, added_at: Option) -> SavedItem { + SavedItem { uri: uri.to_owned(), added_at } + } + + #[test] + fn orders_saved_items_newest_first() { + let mut found = vec![ + saved("spotify:track:a", Some(100)), + saved("spotify:track:b", None), + saved("spotify:track:c", Some(300)), + saved("spotify:track:d", Some(200)), + ]; + + newest_first(&mut found, 4); + + let uris: Vec<_> = found.iter().map(|item| item.uri.as_str()).collect(); + assert_eq!( + uris, + ["spotify:track:c", "spotify:track:d", "spotify:track:a", "spotify:track:b"] + ); + } + + #[test] + fn keeps_the_newest_when_the_limit_cuts() { + let mut found = vec![ + saved("spotify:track:oldest", Some(1)), + saved("spotify:track:newest", Some(9)), + saved("spotify:track:middle", Some(5)), + ]; + + newest_first(&mut found, 2); + + let uris: Vec<_> = found.iter().map(|item| item.uri.as_str()).collect(); + assert_eq!(uris, ["spotify:track:newest", "spotify:track:middle"]); + } + + #[test] + fn undated_items_keep_their_order() { + let mut found = vec![saved("spotify:track:z", None), saved("spotify:track:a", None)]; + + newest_first(&mut found, 2); + + let uris: Vec<_> = found.iter().map(|item| item.uri.as_str()).collect(); + assert_eq!(uris, ["spotify:track:z", "spotify:track:a"]); + } } From c4ac4fd646b7243169ff8b3553a57d5852c7adab Mon Sep 17 00:00:00 2001 From: eximora-private <198456237+eximora-private@users.noreply.github.com> Date: Mon, 12 Oct 2026 21:21:23 +0200 Subject: [PATCH 167/183] fix: publish a spotify track's length to the os media widget --- crates/core/src/state.rs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/crates/core/src/state.rs b/crates/core/src/state.rs index fd3a607..e3bf8c7 100644 --- a/crates/core/src/state.rs +++ b/crates/core/src/state.rs @@ -2250,6 +2250,10 @@ impl AppState { } }); m.set_metadata(&item.title, &item.artists, item.album.as_deref(), cover.as_deref()); + let secs = parse_duration_ms(item.duration.as_deref()) as f64 / 1000.0; + if secs > 0.0 { + m.set_duration(secs); + } } if let Some(d) = &self.discord { d.set_track(item); From 2410db6fe094f471d8edd96386d0115547b8fedd Mon Sep 17 00:00:00 2001 From: eximora-private <198456237+eximora-private@users.noreply.github.com> Date: Mon, 12 Oct 2026 22:23:58 +0200 Subject: [PATCH 168/183] fix: close the spotify pipe when librespot is done so the queue advances --- crates/core/src/state.rs | 20 +++++++++++++++++--- crates/spotify/src/stream.rs | 4 ++++ 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/crates/core/src/state.rs b/crates/core/src/state.rs index fd3a607..3dd1881 100644 --- a/crates/core/src/state.rs +++ b/crates/core/src/state.rs @@ -2607,10 +2607,24 @@ impl AppState { video_id: String, mut handle: StreamHandle, ) { + let mut closed = false; while let Some(event) = handle.next_event().await { - if event == StreamEvent::Unavailable { - self.skip_unavailable_spotify(&video_id).await; - return; + match event { + StreamEvent::Unavailable => { + self.skip_unavailable_spotify(&video_id).await; + return; + } + StreamEvent::EndOfTrack if !closed => { + let current = { + let q = self.queue.lock().await; + q.items.get(q.current).map(|i| i.video_id == video_id).unwrap_or(false) + }; + if current { + closed = true; + handle.close_writer(); + } + } + _ => (), } } } diff --git a/crates/spotify/src/stream.rs b/crates/spotify/src/stream.rs index 279af03..6f3fec4 100644 --- a/crates/spotify/src/stream.rs +++ b/crates/spotify/src/stream.rs @@ -119,6 +119,10 @@ impl StreamHandle { self.player.pause(); } + pub fn close_writer(&self) { + self.player.stop(); + } + /// The next playback event, or `None` once the player has shut down. librespot events that do not /// map onto [`StreamEvent`] (e.g. `Loading`) are skipped. pub async fn next_event(&mut self) -> Option { From 4838c24b7b04cdf3333b6b76c47ef1992dd19893 Mon Sep 17 00:00:00 2001 From: eximora-private <198456237+eximora-private@users.noreply.github.com> Date: Mon, 12 Oct 2026 21:26:03 +0200 Subject: [PATCH 169/183] feat: spotify lists carry the sort menu the other providers have --- crates/core/src/spotify_bridge.rs | 112 +++++++++++++++++++++++++++--- crates/ryotunesd/src/methods.rs | 17 +++-- 2 files changed, 113 insertions(+), 16 deletions(-) diff --git a/crates/core/src/spotify_bridge.rs b/crates/core/src/spotify_bridge.rs index 1c2f5eb..6f0c340 100644 --- a/crates/core/src/spotify_bridge.rs +++ b/crates/core/src/spotify_bridge.rs @@ -15,8 +15,8 @@ use std::time::Duration; use innertube::models::metadata::ArtistRun; use innertube::{ - AlbumPage, ArtistCarousel, ArtistPage, BrowseItem, HomePage, PlaylistPage, Rating, - SearchResults, Section, SongItem, + AlbumPage, ArtistCarousel, ArtistPage, BrowseItem, HomePage, PlaylistPage, PlaylistSort, + Rating, SearchResults, Section, SongItem, SortMenu, }; use ryotunes_spotify::{ Album, AlbumDetail, Artist, ArtistRef, GenreItem, HomeFeed, Lyrics, LyricsLine, Playlist, @@ -216,9 +216,31 @@ pub fn artist_page(id: &str, artist: &Artist) -> ArtistPage { } } +fn sorted(tracks: &[Track], sort: PlaylistSort, desc: bool) -> Vec<&Track> { + let mut out: Vec<&Track> = tracks.iter().collect(); + match sort { + PlaylistSort::Default => return out, + PlaylistSort::Newest => out.sort_by(|a, b| b.added_at.cmp(&a.added_at)), + PlaylistSort::Oldest => out.sort_by(|a, b| a.added_at.cmp(&b.added_at)), + PlaylistSort::Title => out.sort_by_cached_key(|t| t.name.to_lowercase()), + PlaylistSort::Artist => out.sort_by_cached_key(|t| t.artists.to_lowercase()), + PlaylistSort::Album => out.sort_by_cached_key(|t| t.album.to_lowercase()), + PlaylistSort::Top => out.sort_by(|a, b| b.popularity.cmp(&a.popularity)), + } + if desc { + out.reverse(); + } + out +} + /// A Spotify [`PlaylistDetail`] as the playlist page. -pub fn playlist_page(detail: &PlaylistDetail) -> PlaylistPage { +pub fn playlist_page( + detail: &PlaylistDetail, + sort: Option, + desc: bool, +) -> PlaylistPage { let playlist = &detail.playlist; + let key = sort.unwrap_or(PlaylistSort::Default); PlaylistPage { title: Some(playlist.name.clone()), subtitle: (!playlist.owner.is_empty()).then(|| playlist.owner.clone()), @@ -226,17 +248,18 @@ pub fn playlist_page(detail: &PlaylistDetail) -> PlaylistPage { description: None, privacy: Some(if playlist.public { "PUBLIC" } else { "PRIVATE" }.to_owned()), cover: None, - items: detail.tracks.iter().map(track_to_song).collect(), + items: sorted(&detail.tracks, key, desc).into_iter().map(track_to_song).collect(), continuation: None, owned: playlist.owned, collaborative: playlist.collaborative, - sort_menu: None, + sort_menu: Some(SortMenu { selected: Some(key), editable: false }), } } /// The liked-songs page: the paged saved tracks under the "Liked Songs" title. -pub fn liked_page(tracks: &[Track]) -> PlaylistPage { - let items: Vec = tracks.iter().map(track_to_song).collect(); +pub fn liked_page(tracks: &[Track], sort: Option, desc: bool) -> PlaylistPage { + let key = sort.unwrap_or(PlaylistSort::Newest); + let items: Vec = sorted(tracks, key, desc).into_iter().map(track_to_song).collect(); PlaylistPage { title: Some("Liked Songs".to_owned()), subtitle: Some(song_count(items.len())), @@ -248,7 +271,7 @@ pub fn liked_page(tracks: &[Track]) -> PlaylistPage { continuation: None, owned: true, collaborative: false, - sort_menu: None, + sort_menu: Some(SortMenu { selected: Some(key), editable: false }), } } @@ -650,19 +673,88 @@ mod tests { #[test] fn playlist_and_liked_pages() { let detail = PlaylistDetail { playlist: playlist(), tracks: vec![track(), track()] }; - let page = playlist_page(&detail); + let page = playlist_page(&detail, None, false); assert_eq!(page.title.as_deref(), Some("Today's Top Hits")); assert_eq!(page.subtitle.as_deref(), Some("Spotify")); assert_eq!(page.privacy.as_deref(), Some("PUBLIC")); assert!(!page.owned); assert_eq!(page.items.len(), 2); - let liked = liked_page(&[track()]); + let liked = liked_page(&[track()], None, false); assert_eq!(liked.title.as_deref(), Some("Liked Songs")); assert_eq!(liked.subtitle.as_deref(), Some("1 song")); assert!(liked.owned); } + fn saved(name: &str, artists: &str, album: &str, added_at: i64) -> Track { + Track { + name: name.to_owned(), + artists: artists.to_owned(), + album: album.to_owned(), + added_at: Some(added_at), + ..track() + } + } + + fn three() -> Vec { + vec![ + saved("Cats", "Ann", "Zoo", 200), + saved("Bats", "Zoe", "Air", 300), + saved("Ants", "Moe", "Moon", 100), + ] + } + + fn titles(page: &PlaylistPage) -> Vec<&str> { + page.items.iter().map(|i| i.title.as_str()).collect() + } + + #[test] + fn every_sort_key_reads_its_own_field() { + let tracks = three(); + let of = |key| titles(&liked_page(&tracks, Some(key), false)).join(","); + + assert_eq!(of(PlaylistSort::Default), "Cats,Bats,Ants"); + assert_eq!(of(PlaylistSort::Newest), "Bats,Cats,Ants"); + assert_eq!(of(PlaylistSort::Oldest), "Ants,Cats,Bats"); + assert_eq!(of(PlaylistSort::Title), "Ants,Bats,Cats"); + assert_eq!(of(PlaylistSort::Artist), "Cats,Ants,Bats"); + assert_eq!(of(PlaylistSort::Album), "Bats,Ants,Cats"); + } + + #[test] + fn an_unsorted_liked_page_really_is_newest_first() { + let page = liked_page(&three(), None, false); + + assert_eq!(titles(&page), ["Bats", "Cats", "Ants"]); + assert_eq!(page.sort_menu.unwrap().selected, Some(PlaylistSort::Newest)); + } + + #[test] + fn an_unsorted_playlist_keeps_the_owners_order() { + let detail = PlaylistDetail { playlist: playlist(), tracks: three() }; + let page = playlist_page(&detail, None, false); + + assert_eq!(titles(&page), ["Cats", "Bats", "Ants"]); + assert_eq!(page.sort_menu.unwrap().selected, Some(PlaylistSort::Default)); + } + + #[test] + fn descending_turns_newest_into_oldest() { + let tracks = three(); + + assert_eq!( + titles(&liked_page(&tracks, Some(PlaylistSort::Newest), true)), + ["Ants", "Cats", "Bats"] + ); + } + + #[test] + fn a_spotify_list_never_offers_to_write_its_order_back() { + assert!(!liked_page(&three(), None, false).sort_menu.unwrap().editable); + let detail = PlaylistDetail { playlist: playlist(), tracks: three() }; + assert!(!playlist_page(&detail, None, false).sort_menu.unwrap().editable); + } + #[test] fn home_page_orders_sections_and_drops_empties() { let feed = HomeFeed { diff --git a/crates/ryotunesd/src/methods.rs b/crates/ryotunesd/src/methods.rs index cbaeb2b..0ed6454 100644 --- a/crates/ryotunesd/src/methods.rs +++ b/crates/ryotunesd/src/methods.rs @@ -1093,7 +1093,12 @@ async fn spotify_library_artists(st: &Arc) -> Result } /// `spotify:playlist:liked` pages every saved track; any other id is a real Spotify playlist. -async fn spotify_playlist(st: &Arc, pid: &str) -> Result { +async fn spotify_playlist( + st: &Arc, + pid: &str, + sort: Option, + desc: bool, +) -> Result { let client = st.spotify.client().await.ok_or_else(spotify_signed_out)?; if pid == "liked" { let mut tracks = Vec::new(); @@ -1107,10 +1112,10 @@ async fn spotify_playlist(st: &Arc, pid: &str) -> Result) -> Result { async fn get_playlist(st: &Arc, params: &Value) -> Result { let id = arg::(params, "id")?; + let sort = arg::>(params, "sort")?; + let desc = arg::>(params, "desc")?; if let Some(pid) = id.strip_prefix("spotify:playlist:") { - return spotify_playlist(st, pid).await; + return spotify_playlist(st, pid, sort, desc.unwrap_or(false)).await; } if let Some(permalink) = sc_system_id(&id) { return soundcloud_system_playlist(st, permalink).await; @@ -1406,8 +1413,6 @@ async fn get_playlist(st: &Arc, params: &Value) -> Result>(params, "sort")?; - let desc = arg::>(params, "desc")?; if is_local_playlist_id(&id) { // Liked Songs exists from the first read, so the library's Songs tab renders empty // rather than erroring before the first heart. From 27a12b23d5074a78bafd44b25812a4d2b05990a6 Mon Sep 17 00:00:00 2001 From: eximora-private <198456237+eximora-private@users.noreply.github.com> Date: Mon, 12 Oct 2026 21:21:23 +0200 Subject: [PATCH 170/183] fix: a spotify seek no longer sends the scrubber back to zero --- crates/core/src/state.rs | 13 +++++-------- crates/ryotunesd/src/app.rs | 1 + 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/crates/core/src/state.rs b/crates/core/src/state.rs index fd3a607..84736b9 100644 --- a/crates/core/src/state.rs +++ b/crates/core/src/state.rs @@ -2123,12 +2123,10 @@ impl AppState { let q = self.queue.lock().await; (q.duration, q.items.get(q.current).cloned()) }; - // mpv's raw `time-pos` is relative to the last FIFO (re)load for a Spotify track; add the - // seek base (0 for everything else) so a window opening mid-playback sees the true position. let position = self .player .position() - .map(|p| position_with_base(p, self.spotify_base())) + .map(|p| self.track_position(p)) .unwrap_or_else(|| self.current_position()); self.note_position_sample(position); serde_json::json!({ @@ -2457,6 +2455,10 @@ impl AppState { }) } + pub fn track_position(&self, mpv_time_pos: f64) -> f64 { + position_with_base(mpv_time_pos, self.spotify_base()) + } + /// Record the newest mpv position with no allocation, lock or I/O. The player can emit /// time-pos much faster than the UI needs; the event pump calls this for every raw sample and /// runs [`Self::on_position`] only at its throttled cadence. Pause/seek flushes therefore still @@ -2472,11 +2474,6 @@ impl AppState { /// watch-history ping, latched to happen exactly once per play. The ping is additionally /// gated on the `enable_history` setting + being logged in. Best-effort (errors logged). pub async fn on_position(&self, pos: f64) { - // mpv restarts `time-pos` at 0 whenever a Spotify FIFO is (re)loaded; the base carries the - // true track position across a seek. It is 0 for every non-Spotify track, so this is a - // no-op there — everything downstream (scrubber, resume, history threshold) sees the real - // position. - let pos = position_with_base(pos, self.spotify_base()); self.record_position(pos); let crossed = { let mut q = self.queue.lock().await; diff --git a/crates/ryotunesd/src/app.rs b/crates/ryotunesd/src/app.rs index 3f5a350..aad6145 100644 --- a/crates/ryotunesd/src/app.rs +++ b/crates/ryotunesd/src/app.rs @@ -297,6 +297,7 @@ fn spawn_event_pump( let ui = sink.subscriber_count() > 0; match ev { PlayerEvent::Position(p) => { + let p = state.track_position(p); state.note_position_sample(p); let cadence = if ui { if state.low_resource_mode() { From 888a23e9c08d8c14c8f4e6bc7e14dd95396bc2a5 Mon Sep 17 00:00:00 2001 From: eximora-private <198456237+eximora-private@users.noreply.github.com> Date: Mon, 12 Oct 2026 22:23:15 +0200 Subject: [PATCH 171/183] fix: seek a spotify track inside mpv's cache instead of reloading its pipe --- crates/core/src/state.rs | 66 ++++++++++++++++++++++++++-------------- crates/player/src/lib.rs | 4 +++ 2 files changed, 48 insertions(+), 22 deletions(-) diff --git a/crates/core/src/state.rs b/crates/core/src/state.rs index fd3a607..fa3e1fd 100644 --- a/crates/core/src/state.rs +++ b/crates/core/src/state.rs @@ -3174,9 +3174,6 @@ impl AppState { return Ok(()); // guests can't scrub — the host controls the timeline } let position = position.max(0.0); - // A Spotify track: mpv can't seek a FIFO, so tell librespot to seek, record the base, and - // reload mpv on the same FIFO so it reads the post-seek PCM from 0 (base + mpv time-pos = - // the true position). Anything else is a plain mpv seek. let spotify_title = { let q = self.queue.lock().await; q.items @@ -3185,23 +3182,29 @@ impl AppState { .map(|i| media_title(&i.title, &i.artists)) }; if let Some(title) = spotify_title { - let controls = self.spotify_stream.lock().as_ref().map(|s| s.controls.clone()); - let Some(controls) = controls else { - return Ok(()); // no live stream to seek (shouldn't happen while one plays) - }; - controls.seek(Duration::from_secs_f64(position)); - self.set_spotify_base(position); - self.player - .load( - controls.fifo_path().to_string_lossy().as_ref(), - &Default::default(), - None, - &title, - &spotify_mpv_options(), - ) - .map_err(|e| e.to_string())?; - let _ = self.player.play(); - controls.play(); + if let Some(target) = + seek_inside_cache(position, self.spotify_base(), self.player.cache_end()) + { + self.player.seek(target).map_err(|e| e.to_string())?; + } else { + let controls = self.spotify_stream.lock().as_ref().map(|s| s.controls.clone()); + let Some(controls) = controls else { + return Ok(()); // no live stream to seek (shouldn't happen while one plays) + }; + controls.seek(Duration::from_secs_f64(position)); + self.set_spotify_base(position); + self.player + .load( + controls.fifo_path().to_string_lossy().as_ref(), + &Default::default(), + None, + &title, + &spotify_mpv_options(), + ) + .map_err(|e| e.to_string())?; + let _ = self.player.play(); + controls.play(); + } } else { self.player.seek(position).map_err(|e| e.to_string())?; } @@ -4092,6 +4095,14 @@ fn spotify_mpv_options() -> Vec { /// True track position from mpv's per-load `time-pos` and the Spotify seek base. mpv restarts its /// clock at 0 on every FIFO (re)load, so a seek stores the target as the base and playback reports +const CACHE_SEEK_MARGIN: f64 = 0.5; + +fn seek_inside_cache(position: f64, seek_base: f64, cache_end: Option) -> Option { + let end = cache_end?; + let target = position - seek_base; + (target >= 0.0 && target < end - CACHE_SEEK_MARGIN).then_some(target) +} + /// `base + time-pos`. The base is 0 for every non-Spotify track and for an un-seeked Spotify one, /// making this transparent there. fn position_with_base(mpv_time_pos: f64, seek_base: f64) -> f64 { @@ -4315,8 +4326,9 @@ mod tests { append_page, backfill_metadata, drop_duplicates, enqueue_at, format_duration, guest_insert_index, is_mix, loudness_gain, merge_radio, next_index, parse_duration_ms, persist_fingerprint, position_with_base, queue_fingerprint, radio_seed_for, read_personal, - shuffle_new_queue, shuffle_upcoming, splice_radio_into, spotify_mpv_options, unshuffled, - upcoming_queued, validate_personal_blob, QueueState, RepeatMode, PERSONAL_JSON_KEY, + seek_inside_cache, shuffle_new_queue, shuffle_upcoming, splice_radio_into, + spotify_mpv_options, unshuffled, upcoming_queued, validate_personal_blob, QueueState, + RepeatMode, PERSONAL_JSON_KEY, }; use crate::db::Db; @@ -5021,6 +5033,16 @@ mod tests { assert_eq!(position_with_base(0.5, 60.0), 60.5); } + #[test] + fn a_target_inside_the_drained_cache_seeks_mpv_not_the_stream() { + assert_eq!(seek_inside_cache(20.0, 0.0, Some(156.0)), Some(20.0)); + assert_eq!(seek_inside_cache(100.0, 60.0, Some(96.0)), Some(40.0)); + assert_eq!(seek_inside_cache(20.0, 0.0, Some(3.0)), None); + assert_eq!(seek_inside_cache(30.0, 60.0, Some(96.0)), None); + assert_eq!(seek_inside_cache(155.9, 0.0, Some(156.0)), None); + assert_eq!(seek_inside_cache(20.0, 0.0, None), None); + } + // Real Spotify playback needs a Premium session and the librespot pipe backend, which can't run // in CI (no credentials, no audio device). This documents the manual acceptance path; run it // by hand on the rig against a signed-in Premium account. See `crates/spotify/README.md`. diff --git a/crates/player/src/lib.rs b/crates/player/src/lib.rs index bb364c4..cd1b016 100644 --- a/crates/player/src/lib.rs +++ b/crates/player/src/lib.rs @@ -265,6 +265,10 @@ impl Player { self.mpv.get_property::("time-pos").ok().filter(|p| p.is_finite()) } + pub fn cache_end(&self) -> Option { + self.mpv.get_property::("demuxer-cache-time").ok().filter(|p| p.is_finite()) + } + /// Absolute seek in seconds. pub fn seek(&self, position_secs: f64) -> Result<(), Error> { self.mpv.command("seek", &[&position_secs.to_string(), "absolute"])?; From 598d7a25dc7a52dfe06b7dba68a4ba7d972686a2 Mon Sep 17 00:00:00 2001 From: eximora-private <198456237+eximora-private@users.noreply.github.com> Date: Tue, 13 Oct 2026 17:46:12 +0200 Subject: [PATCH 172/183] fix: a dead spotify session recovers on a cooldown, not once per process --- crates/core/src/spotify.rs | 98 +++++++++++++++++++-------------- crates/core/src/state.rs | 5 +- crates/ryotunesd/src/methods.rs | 2 +- crates/spotify/src/stream.rs | 4 +- 4 files changed, 61 insertions(+), 48 deletions(-) diff --git a/crates/core/src/spotify.rs b/crates/core/src/spotify.rs index e19c951..3c3fe65 100644 --- a/crates/core/src/spotify.rs +++ b/crates/core/src/spotify.rs @@ -85,14 +85,14 @@ pub fn sc_system_id(id: &str) -> Option<&str> { id.strip_prefix(SC_SYSTEM_PREFIX).filter(|s| !s.is_empty()) } +const RECOVERY_COOLDOWN: std::time::Duration = std::time::Duration::from_secs(30); + /// Owns the Spotify sign-in, the current client and the catalogue selector. Construct once with the /// daemon's data directory; `spotify` credentials land under `/spotify`. pub struct SpotifyState { provider: SpotifyProvider, client: RwLock>>, - /// The one on-demand session recovery this process is allowed (see `client_or_recover`). - /// Reset by a fresh sign-in or sign-out, which start a new credential lifetime. - recovery_used: std::sync::atomic::AtomicBool, + last_recovery: parking_lot::Mutex>, /// Serialises session restores so an on-demand recovery never runs a second librespot /// connect against the same cached credentials while the startup restore is mid-flight. recover_lock: tokio::sync::Mutex<()>, @@ -104,7 +104,7 @@ impl SpotifyState { Self { provider: SpotifyProvider::new(data_dir), client: RwLock::new(None), - recovery_used: std::sync::atomic::AtomicBool::new(false), + last_recovery: parking_lot::Mutex::new(None), recover_lock: tokio::sync::Mutex::new(()), selected: parking_lot::RwLock::new(selected), } @@ -136,17 +136,39 @@ impl SpotifyState { self.provider.stored() } - /// Whether a usable client exists. A session librespot invalidated (network drop, Spotify - /// killed it server-side) is *not* usable: it is dropped here so a later `restore`/ - /// `client_or_recover` sees the truth and announces the sign-out to the daemon's event sink. + /// Whether a usable client exists. pub async fn status(&self) -> bool { - self.live_client().await.is_some() + self.client().await.is_some() } - /// The signed-in client, cloned out for use without holding the lock. A dead session reads as - /// signed out (and is dropped), so callers never hand a doomed client to librespot. + /// The signed-in client, cloned out for use without holding the lock. pub async fn client(&self) -> Option> { - self.live_client().await + if let Some(client) = self.live_client().await { + return Some(client); + } + if !self.provider.stored() || !self.may_recover() { + return None; + } + match self.restore().await { + Ok(true) => { + tracing::info!("spotify: recovered the cached session on demand"); + self.live_client().await + } + Ok(false) => None, + Err(e) => { + tracing::warn!(error = %e, "spotify: on-demand session recovery failed"); + None + } + } + } + + fn may_recover(&self) -> bool { + let mut last = self.last_recovery.lock(); + if matches!(*last, Some(at) if at.elapsed() < RECOVERY_COOLDOWN) { + return false; + } + *last = Some(std::time::Instant::now()); + true } /// A session that is both present and still connected; drops (and logs) one that died. @@ -170,35 +192,6 @@ impl SpotifyState { live } - /// The client for playback/browsing, recovering a dead or missing one from the saved - /// credentials the first time this process needs it. This is the fix for "every song is - /// skipped as unavailable, and it asks me to sign in every time I open it": a startup - /// restore that raced with server bind, or a session that died mid-life, used to leave the - /// daemon permanently signed-out for that run. Recovery is attempted exactly once per - /// credential lifetime so a genuinely dead credential pair cannot stall every track start. - pub async fn client_or_recover(&self) -> Option> { - if let Some(client) = self.live_client().await { - return Some(client); - } - if !self.provider.stored() - || self.recovery_used.swap(true, std::sync::atomic::Ordering::Relaxed) - { - return None; - } - // `restore` serializes against the startup restore itself. - match self.restore().await { - Ok(true) => { - tracing::info!("spotify: recovered the cached session on demand"); - self.live_client().await - } - Ok(false) => None, - Err(e) => { - tracing::warn!(error = %e, "spotify: on-demand session recovery failed"); - None - } - } - } - /// Restore a client from cached credentials. Returns whether one was restored (or was /// already live). Serialized on `recover_lock`: a startup restore still connecting and an /// on-demand recovery racing over one credential cache is how a good session gets @@ -231,7 +224,7 @@ impl SpotifyState { { let client = self.provider.sign_in(on_url).await?; *self.client.write().await = Some(Arc::new(client)); - self.recovery_used.store(false, std::sync::atomic::Ordering::Relaxed); + *self.last_recovery.lock() = None; Ok(()) } @@ -239,6 +232,27 @@ impl SpotifyState { pub async fn sign_out(&self) { self.provider.sign_out(); *self.client.write().await = None; - self.recovery_used.store(false, std::sync::atomic::Ordering::Relaxed); + *self.last_recovery.lock() = None; + } +} + +#[cfg(test)] +mod tests { + use super::*; + + #[tokio::test] + async fn a_spent_recovery_re_arms_after_the_cooldown() { + let dir = tempfile::tempdir().unwrap(); + let cache = dir.path().join("spotify"); + std::fs::create_dir_all(&cache).unwrap(); + std::fs::write(cache.join("credentials.json"), b"{").unwrap(); + + let state = SpotifyState::new(dir.path().to_path_buf(), Provider::Spotify); + assert!(state.stored()); + assert!(state.client().await.is_none()); + assert!(!state.may_recover()); + + *state.last_recovery.lock() = Some(std::time::Instant::now() - RECOVERY_COOLDOWN); + assert!(state.may_recover()); } } diff --git a/crates/core/src/state.rs b/crates/core/src/state.rs index fd3a607..493045e 100644 --- a/crates/core/src/state.rs +++ b/crates/core/src/state.rs @@ -922,10 +922,7 @@ impl AppState { // them. Opening the stream starts librespot decoding into the FIFO immediately; mpv is // pointed at that FIFO with the rawaudio demuxer options. if let Some(tid) = crate::spotify::spotify_track_id(video_id) { - // `client_or_recover` gives a session that died since startup (or a restore that lost - // the race with the first client connecting) exactly one chance to come back from the - // saved credentials before this track is honestly reported as needing sign-in. - let Some(client) = self.spotify.client_or_recover().await else { + let Some(client) = self.spotify.client().await else { return Err(ResolveError::SignInRequired( "Sign in to Spotify to play this".to_owned(), )); diff --git a/crates/ryotunesd/src/methods.rs b/crates/ryotunesd/src/methods.rs index cbaeb2b..3a25c80 100644 --- a/crates/ryotunesd/src/methods.rs +++ b/crates/ryotunesd/src/methods.rs @@ -1178,7 +1178,7 @@ async fn home_merged(st: &Arc) -> Result { // Spotify: whenever a Premium session exists — the merged home aggregates every // signed-in provider, regardless of which catalogue the selector points at for // Library/Search. A session that died since startup recovers once from the cache. - if let Some(client) = st.spotify.client_or_recover().await { + if let Some(client) = st.spotify.client().await { if let Ok(feed) = client.home().await { extra.extend(spotify_bridge::home_page(&feed).sections); } diff --git a/crates/spotify/src/stream.rs b/crates/spotify/src/stream.rs index 279af03..6ae8989 100644 --- a/crates/spotify/src/stream.rs +++ b/crates/spotify/src/stream.rs @@ -195,7 +195,9 @@ impl Fifo { let dir = runtime_dir().join("ryotunes"); std::fs::create_dir_all(&dir) .with_context(|| format!("cannot create the FIFO directory {}", dir.display()))?; - let path = dir.join(format!("spotify-{}.pcm", std::process::id())); + static NEXT: std::sync::atomic::AtomicU64 = std::sync::atomic::AtomicU64::new(0); + let serial = NEXT.fetch_add(1, std::sync::atomic::Ordering::Relaxed); + let path = dir.join(format!("spotify-{}-{serial}.pcm", std::process::id())); // A stale FIFO from a crashed run would be reused with the wrong permissions/owner; start // fresh. let _ = std::fs::remove_file(&path); From 3aec58ce022e1ae999328387af3ba9cbfba8592d Mon Sep 17 00:00:00 2001 From: carlos Date: Tue, 13 Oct 2026 21:05:35 -0400 Subject: [PATCH 173/183] fix: keep the accessibility bridge out of the daemon's hidden views --- CHANGELOG.md | 2 ++ crates/ryotunesd/src/gtk_thread.rs | 14 +++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 47f8090..d853f9a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +- Fixed music stopping and the app closing after a few minutes of playback: the daemon's hidden YouTube helper views loaded the desktop accessibility bridge, and when the session's accessibility bus went stale the bridge crashed the whole daemon the next time a helper view was built. The daemon no longer loads the bridge at all, since those views are never shown. + ## v1.1.6 - 2026-09-25 - SoundCloud sign-in now happens in your own browser instead of a Ryotunes window: pressing Connect opens soundcloud.com (captchas and Google/Facebook/Apple popups work there), and the daemon watches your browser's cookie stores — Firefox-family and Chromium-family profiles, default browser first — importing the session the moment it appears and proving the token against `/me` before saving it. Already signed in in the browser? One click imports it instantly, no browser round trip. Cookie stores are only re-read when their file actually changes, and an unfinished sign-in ends with a clear message after five minutes rather than hanging. diff --git a/crates/ryotunesd/src/gtk_thread.rs b/crates/ryotunesd/src/gtk_thread.rs index 0ae8b81..4a23baf 100644 --- a/crates/ryotunesd/src/gtk_thread.rs +++ b/crates/ryotunesd/src/gtk_thread.rs @@ -21,6 +21,13 @@ impl Gtk { // (`set_var` is safe on the 2021 edition and this runs before the GTK thread exists.) std::env::set_var("WEBKIT_DISABLE_COMPOSITING_MODE", "1"); std::env::set_var("WEBKIT_DISABLE_DMABUF_RENDERER", "1"); + // The views are never shown, so they need no accessibility. GTK otherwise loads the + // AT-SPI bridge in `gtk::init`, and when the session's a11y bus is stale or replaced + // mid-session the bridge segfaults the daemon the next time a view is built, killing + // playback and the client with it. Scoped to init so the client and the browser the + // daemon opens keep their accessibility. + let inherited_no_at_bridge = std::env::var_os("NO_AT_BRIDGE"); + std::env::set_var("NO_AT_BRIDGE", "1"); let (tx, rx) = std::sync::mpsc::channel(); std::thread::Builder::new() .name("gtk".into()) @@ -33,7 +40,12 @@ impl Gtk { gtk::main(); }) .expect("spawn gtk thread"); - Gtk { ctx: rx.recv().expect("gtk thread reported its context") } + let ctx = rx.recv().expect("gtk thread reported its context"); + match inherited_no_at_bridge { + Some(v) => std::env::set_var("NO_AT_BRIDGE", v), + None => std::env::remove_var("NO_AT_BRIDGE"), + } + Gtk { ctx } } /// Run `f` on the GTK thread and await its result. From 07cd171d2f572ff684fdccada9b891663ad01ab2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 14 Oct 2026 01:16:01 +0000 Subject: [PATCH 174/183] release: v1.1.7 --- CHANGELOG.md | 2 ++ Cargo.lock | 22 +++++++++---------- Cargo.toml | 2 +- client/version | 2 +- packaging/arch/PKGBUILD | 2 +- .../linux/dev.ryoku.ryotunes.metainfo.xml | 2 +- src-tauri/tauri.conf.json | 2 +- ui/package.json | 2 +- 8 files changed, 19 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d853f9a..db47e30 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +## v1.1.7 - 2026-10-14 + - Fixed music stopping and the app closing after a few minutes of playback: the daemon's hidden YouTube helper views loaded the desktop accessibility bridge, and when the session's accessibility bus went stale the bridge crashed the whole daemon the next time a helper view was built. The daemon no longer loads the bridge at all, since those views are never shown. ## v1.1.6 - 2026-09-25 diff --git a/Cargo.lock b/Cargo.lock index 959e27d..1abbf56 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2456,7 +2456,7 @@ dependencies = [ [[package]] name = "innertube" -version = "1.1.6" +version = "1.1.7" dependencies = [ "hex", "reqwest 0.12.28", @@ -2962,7 +2962,7 @@ checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" [[package]] name = "listen-protocol" -version = "1.1.6" +version = "1.1.7" dependencies = [ "serde", "serde_json", @@ -3807,7 +3807,7 @@ checksum = "f6b464fbc74e149a392436b17d523f769e057cb6877f6a5c4618bc6f11800548" [[package]] name = "player" -version = "1.1.6" +version = "1.1.7" dependencies = [ "libc", "libmpv2", @@ -4722,7 +4722,7 @@ dependencies = [ [[package]] name = "ryotunes" -version = "1.1.6" +version = "1.1.7" dependencies = [ "anyhow", "async-trait", @@ -4752,7 +4752,7 @@ dependencies = [ [[package]] name = "ryotunes-cli" -version = "1.1.6" +version = "1.1.7" dependencies = [ "ryotunes-protocol", "serde", @@ -4761,7 +4761,7 @@ dependencies = [ [[package]] name = "ryotunes-core" -version = "1.1.6" +version = "1.1.7" dependencies = [ "anyhow", "async-trait", @@ -4797,7 +4797,7 @@ dependencies = [ [[package]] name = "ryotunes-protocol" -version = "1.1.6" +version = "1.1.7" dependencies = [ "serde", "serde_json", @@ -4805,7 +4805,7 @@ dependencies = [ [[package]] name = "ryotunes-soundcloud" -version = "1.1.6" +version = "1.1.7" dependencies = [ "base64 0.22.1", "parking_lot", @@ -4820,7 +4820,7 @@ dependencies = [ [[package]] name = "ryotunes-spotify" -version = "1.1.6" +version = "1.1.7" dependencies = [ "anyhow", "bytes", @@ -4844,7 +4844,7 @@ dependencies = [ [[package]] name = "ryotunesd" -version = "1.1.6" +version = "1.1.7" dependencies = [ "aes", "anyhow", @@ -5615,7 +5615,7 @@ dependencies = [ [[package]] name = "sync-server" -version = "1.1.6" +version = "1.1.7" dependencies = [ "futures-util", "listen-protocol", diff --git a/Cargo.toml b/Cargo.toml index ec09596..6e08854 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ members = [ ] [workspace.package] -version = "1.1.6" +version = "1.1.7" edition = "2021" license = "GPL-3.0-or-later" diff --git a/client/version b/client/version index 0664a8f..2bf1ca5 100644 --- a/client/version +++ b/client/version @@ -1 +1 @@ -1.1.6 +1.1.7 diff --git a/packaging/arch/PKGBUILD b/packaging/arch/PKGBUILD index e507b66..8fdcf27 100644 --- a/packaging/arch/PKGBUILD +++ b/packaging/arch/PKGBUILD @@ -2,7 +2,7 @@ # Run from packaging/arch with: makepkg -si pkgname=ryotunes -pkgver=1.1.6 +pkgver=1.1.7 pkgrel=1 # epoch=1 is permanent: the v1 reset publishes 1:X.Y.Z, which pacman ranks above # the legacy 2.x line an existing machine may carry, so `pacman -U` still upgrades. diff --git a/packaging/linux/dev.ryoku.ryotunes.metainfo.xml b/packaging/linux/dev.ryoku.ryotunes.metainfo.xml index afa45e4..00426d3 100644 --- a/packaging/linux/dev.ryoku.ryotunes.metainfo.xml +++ b/packaging/linux/dev.ryoku.ryotunes.metainfo.xml @@ -12,5 +12,5 @@ ryotunes.desktop ryotunes AudioVideoAudio - + diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 97e93f6..cc31d3f 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "https://schema.tauri.app/config/2", "productName": "Ryotunes", - "version": "1.1.6", + "version": "1.1.7", "identifier": "dev.ryoku.ryotunes", "build": { "frontendDist": "../ui/build", diff --git a/ui/package.json b/ui/package.json index 67b9599..6264957 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,7 +1,7 @@ { "name": "ui", "private": true, - "version": "1.1.6", + "version": "1.1.7", "type": "module", "scripts": { "dev": "vite dev", From 4a53be1cede69469211737e5f4473e0df9c0417e Mon Sep 17 00:00:00 2001 From: itsKontra Date: Sat, 26 Sep 2026 01:19:17 +0200 Subject: [PATCH 175/183] fix: advance past Spotify tracks and make them seekable mpv's demuxer cache drains the Spotify FIFO, so librespot decodes a whole track within seconds and then idles in EndOfTrack with its sink still open. mpv never saw EOF, so playback hung at the end of every Spotify track, and seeks went to librespot, which rejects them in that state. Close the pipe when the stream handle sees its own EndOfTrack so mpv plays out its cache and EOFs into the normal queue advance, and seek Spotify tracks in mpv's cache like any other track. That retires the FIFO reload on seek and the position base it needed. --- crates/core/src/state.rs | 133 +++++++---------------------------- crates/spotify/README.md | 11 +++ crates/spotify/src/lib.rs | 2 +- crates/spotify/src/stream.rs | 80 ++++++++++----------- 4 files changed, 74 insertions(+), 152 deletions(-) diff --git a/crates/core/src/state.rs b/crates/core/src/state.rs index fd3a607..7f9b310 100644 --- a/crates/core/src/state.rs +++ b/crates/core/src/state.rs @@ -8,9 +8,8 @@ use std::sync::atomic::{AtomicBool, AtomicU64, Ordering}; use std::future::Future; use std::pin::Pin; use std::sync::Arc; -use std::time::Duration; -use ryotunes_spotify::{StreamControls, StreamEvent, StreamHandle}; +use ryotunes_spotify::{StreamEvent, StreamHandle}; use innertube::{ AccountIdentity, AccountInfo, AudioQuality, Clients, InnerTube, SongItem, MAIN_CLIENT, @@ -153,16 +152,11 @@ pub struct AppState { /// the `audio-fx` event and the subscribe snapshot. Applied to the player as one `af` chain; /// kept here so a newly opened window can be told the current values. audio_fx: parking_lot::RwLock, - /// The one live Spotify stream, if a `spotify:track:` id is playing: its transport controls - /// (seek/play) plus the task watching librespot's events. A fresh `resolve` of a Spotify id + /// The one live Spotify stream, if a `spotify:track:` id is playing: the task watching + /// librespot's events. A fresh `resolve` of a Spotify id /// replaces it (dropping the previous handle and aborting its watcher); a non-Spotify track or /// an explicit stop drops it. `None` whenever YouTube/local/radio audio is playing. spotify_stream: parking_lot::Mutex>, - /// Per-track position offset (secs, f64 bits) for the playing Spotify track: mpv restarts its - /// `time-pos` at 0 every time the FIFO is (re)loaded, so a seek stores the target here and - /// position ticks report `base + mpv time-pos`. Reset to 0 on every track start; always 0 - /// while a non-Spotify track plays, so adding it is a no-op there. - spotify_seek_base: AtomicU64, /// The SoundCloud provider (guest api-v2 client), cache dir `/soundcloud`. SoundCloud /// tracks stream over plain HTTPS, so unlike `spotify_stream` there is no live handle to hold. pub soundcloud: Arc, @@ -175,11 +169,9 @@ pub struct AppState { last_visitor_try: AtomicU64, } -/// One live Spotify stream held on [`AppState`]: the cheap transport handle the daemon seeks -/// with, plus the task watching librespot's event stream for the cases mpv can't see (a track -/// that never becomes available). Aborting the watcher and dropping the controls tears it down. +/// One live Spotify stream held on [`AppState`]: the task watching librespot's event stream, +/// which owns the [`StreamHandle`]. Aborting the watcher tears it down. struct SpotifyStream { - controls: StreamControls, watcher: tokio::task::JoinHandle<()>, } @@ -486,7 +478,6 @@ impl AppState { low_resource_mode: AtomicBool::new(low_resource_mode), audio_fx: parking_lot::RwLock::new(AudioFx::default()), spotify_stream: parking_lot::Mutex::new(None), - spotify_seek_base: AtomicU64::new(0), } } @@ -933,8 +924,7 @@ impl AppState { let handle = client .stream(tid) .map_err(|e| ResolveError::AllClientsFailed(format!("{video_id}: {e}")))?; - let controls = handle.controls(); - let fifo = controls.fifo_path().to_string_lossy().into_owned(); + let fifo = handle.fifo_path().to_string_lossy().into_owned(); // Watch librespot's events off the mpv pump. An Unavailable track never fills the FIFO, // so mpv would just block forever — the watcher surfaces it as an error + skip. let watcher = { @@ -942,7 +932,7 @@ impl AppState { let vid = video_id.to_owned(); tokio::spawn(async move { me.watch_spotify_stream(vid, handle).await }) }; - let previous = self.spotify_stream.lock().replace(SpotifyStream { controls, watcher }); + let previous = self.spotify_stream.lock().replace(SpotifyStream { watcher }); if let Some(prev) = previous { prev.watcher.abort(); } @@ -1701,10 +1691,6 @@ impl AppState { q.history_pinged = false; q.duration = 0.0; } - // A gapless advance is only ever YouTube→YouTube (a Spotify boundary is never primed), so - // the base is already 0 — reset anyway to keep the "0 unless a Spotify track was seeked" - // invariant local and obvious. - self.set_spotify_base(0.0); if let Some(item) = self.current_item().await { self.emit_now_playing(&item, "gapless"); self.refresh_rating(&item.video_id, gen); @@ -1902,10 +1888,6 @@ impl AppState { } } } - // A fresh load always starts at position 0 (a user seek moves the base later). Clear it - // unconditionally: it is only ever non-zero after a Spotify seek, and this covers the - // Spotify→anything and anything→Spotify transitions in one place. - self.set_spotify_base(0.0); if crate::spotify::is_spotify_id(&item.video_id) { // mpv can't measure a FIFO's length, so seed the duration from the queue item and push // it exactly like `on_duration` would (mpv's own `duration` events are ignored while a @@ -2123,13 +2105,7 @@ impl AppState { let q = self.queue.lock().await; (q.duration, q.items.get(q.current).cloned()) }; - // mpv's raw `time-pos` is relative to the last FIFO (re)load for a Spotify track; add the - // seek base (0 for everything else) so a window opening mid-playback sees the true position. - let position = self - .player - .position() - .map(|p| position_with_base(p, self.spotify_base())) - .unwrap_or_else(|| self.current_position()); + let position = self.player.position().unwrap_or_else(|| self.current_position()); self.note_position_sample(position); serde_json::json!({ "now": item.as_ref().map(|i| self.now_playing_json(i, "current")), @@ -2472,11 +2448,6 @@ impl AppState { /// watch-history ping, latched to happen exactly once per play. The ping is additionally /// gated on the `enable_history` setting + being logged in. Best-effort (errors logged). pub async fn on_position(&self, pos: f64) { - // mpv restarts `time-pos` at 0 whenever a Spotify FIFO is (re)loaded; the base carries the - // true track position across a seek. It is 0 for every non-Spotify track, so this is a - // no-op there — everything downstream (scrubber, resume, history threshold) sees the real - // position. - let pos = position_with_base(pos, self.spotify_base()); self.record_position(pos); let crossed = { let mut q = self.queue.lock().await; @@ -2562,15 +2533,6 @@ impl AppState { self.lastfm.set_duration(secs); } - /// The playing Spotify track's position base (secs). 0 while anything else plays. - fn spotify_base(&self) -> f64 { - f64::from_bits(self.spotify_seek_base.load(Ordering::Relaxed)) - } - - fn set_spotify_base(&self, secs: f64) { - self.spotify_seek_base.store(secs.to_bits(), Ordering::Relaxed); - } - /// Seed a Spotify track's duration from its queue item (`m:ss`) and push it to the OS controls, /// Discord and Last.fm exactly as [`Self::on_duration`] would — mpv can't measure the FIFO. async fn seed_spotify_duration(&self, item: &SongItem) { @@ -2588,20 +2550,21 @@ impl AppState { self.lastfm.set_duration(secs); } - /// Drop the live Spotify stream, if any: releasing the transport controls and aborting the - /// event watcher. A no-op when nothing is streaming. Also clears the seek base. + /// Drop the live Spotify stream, if any, aborting its event watcher. A no-op when nothing is + /// streaming. fn drop_spotify_stream(&self) { if let Some(prev) = self.spotify_stream.lock().take() { prev.watcher.abort(); } - self.set_spotify_base(0.0); } /// Watch one Spotify stream's librespot events on its own task. mpv drives ordinary playback - /// (position/pause, and end-of-track via the FIFO closing → mpv EOF → `on_track_ended`), so - /// this only catches what mpv can't see: a track that never becomes available (the FIFO simply - /// never fills). Owns the [`StreamHandle`]; aborted by [`Self::drop_spotify_stream`] / a - /// replacing `resolve`. + /// (position/pause/seek within its cache, and end-of-track via the FIFO closing → mpv EOF → + /// `on_track_ended`). Polling the handle is what closes the FIFO once librespot has decoded + /// the whole track, so this task must run for the stream's lifetime; beyond that it only + /// catches what mpv can't see: a track that never becomes available (the FIFO simply never + /// fills). Owns the [`StreamHandle`]; aborted by [`Self::drop_spotify_stream`] / a replacing + /// `resolve`. async fn watch_spotify_stream( self: std::sync::Arc, video_id: String, @@ -3174,37 +3137,9 @@ impl AppState { return Ok(()); // guests can't scrub — the host controls the timeline } let position = position.max(0.0); - // A Spotify track: mpv can't seek a FIFO, so tell librespot to seek, record the base, and - // reload mpv on the same FIFO so it reads the post-seek PCM from 0 (base + mpv time-pos = - // the true position). Anything else is a plain mpv seek. - let spotify_title = { - let q = self.queue.lock().await; - q.items - .get(q.current) - .filter(|i| crate::spotify::is_spotify_id(&i.video_id)) - .map(|i| media_title(&i.title, &i.artists)) - }; - if let Some(title) = spotify_title { - let controls = self.spotify_stream.lock().as_ref().map(|s| s.controls.clone()); - let Some(controls) = controls else { - return Ok(()); // no live stream to seek (shouldn't happen while one plays) - }; - controls.seek(Duration::from_secs_f64(position)); - self.set_spotify_base(position); - self.player - .load( - controls.fifo_path().to_string_lossy().as_ref(), - &Default::default(), - None, - &title, - &spotify_mpv_options(), - ) - .map_err(|e| e.to_string())?; - let _ = self.player.play(); - controls.play(); - } else { - self.player.seek(position).map_err(|e| e.to_string())?; - } + // A Spotify track seeks like any other: librespot decodes the whole track into the FIFO + // within seconds and mpv keeps it in its seekable cache. + self.player.seek(position).map_err(|e| e.to_string())?; if self.lt.is_host().await { self.lt .broadcast_playback(Playback::at(PlaybackKind::Seek, (position * 1000.0) as i64)) @@ -4090,14 +4025,6 @@ fn spotify_mpv_options() -> Vec { ] } -/// True track position from mpv's per-load `time-pos` and the Spotify seek base. mpv restarts its -/// clock at 0 on every FIFO (re)load, so a seek stores the target as the base and playback reports -/// `base + time-pos`. The base is 0 for every non-Spotify track and for an un-seeked Spotify one, -/// making this transparent there. -fn position_with_base(mpv_time_pos: f64, seek_base: f64) -> f64 { - mpv_time_pos + seek_base -} - /// Loudness target, matching YouTube Music's own player rather than the video site's -14. const TARGET_LUFS: f64 = -7.0; @@ -4314,9 +4241,9 @@ mod tests { use super::{ append_page, backfill_metadata, drop_duplicates, enqueue_at, format_duration, guest_insert_index, is_mix, loudness_gain, merge_radio, next_index, parse_duration_ms, - persist_fingerprint, position_with_base, queue_fingerprint, radio_seed_for, read_personal, - shuffle_new_queue, shuffle_upcoming, splice_radio_into, spotify_mpv_options, unshuffled, - upcoming_queued, validate_personal_blob, QueueState, RepeatMode, PERSONAL_JSON_KEY, + persist_fingerprint, queue_fingerprint, radio_seed_for, read_personal, shuffle_new_queue, + shuffle_upcoming, splice_radio_into, spotify_mpv_options, unshuffled, upcoming_queued, + validate_personal_blob, QueueState, RepeatMode, PERSONAL_JSON_KEY, }; use crate::db::Db; @@ -5010,17 +4937,6 @@ mod tests { ); } - // mpv's `time-pos` restarts at 0 every time the Spotify FIFO is (re)loaded, so a reported - // position is `mpv time-pos + seek base`. Base 0 (every non-Spotify track, and a Spotify track - // that was never seeked) is transparent; a seek to 60s makes mpv's post-reload 0/0.5 read back - // as 60/60.5 — the true track position, not a jump back to the start. - #[test] - fn spotify_seek_base_reconstructs_true_position() { - assert_eq!(position_with_base(12.5, 0.0), 12.5); - assert_eq!(position_with_base(0.0, 60.0), 60.0); - assert_eq!(position_with_base(0.5, 60.0), 60.5); - } - // Real Spotify playback needs a Premium session and the librespot pipe backend, which can't run // in CI (no credentials, no audio device). This documents the manual acceptance path; run it // by hand on the rig against a signed-in Premium account. See `crates/spotify/README.md`. @@ -5030,9 +4946,10 @@ mod tests { // 1. Sign in to a Premium account (daemon `spotify_sign_in`), select the Spotify provider. // 2. Play a `spotify:track:` item: `resolve` opens a librespot stream, mpv reads the FIFO // with `spotify_mpv_options()`, audio plays; duration is seeded from the queue item. - // 3. Seek: librespot seeks, mpv reloads the FIFO, the position reads `base + time-pos`. + // 3. Seek: a plain mpv seek within its cache of the whole decoded track. // 4. Pause/resume: mpv only — FIFO backpressure stalls librespot, the pipe stays open. - // 5. Let it end: librespot closes the FIFO, mpv EOFs, `on_track_ended` advances the queue. + // 5. Let it end: the stream watcher closes the FIFO at librespot's EndOfTrack, mpv plays + // out its cache and EOFs, `on_track_ended` advances the queue. // 6. Play while signed out: `resolve` returns `SignInRequired` and the UI toasts it. } } diff --git a/crates/spotify/README.md b/crates/spotify/README.md index 8ced4a6..97689f3 100644 --- a/crates/spotify/README.md +++ b/crates/spotify/README.md @@ -68,6 +68,17 @@ which mpv reads as end-of-file. So the daemon's normal pause should **pause mpv* (backpressure), keeping the pipe open. Use `StreamHandle::pause()`/`play()` only when a real teardown/reload is acceptable. Gapless is **off** for v1 (each track is a fresh `loadfile`). +### End of track and seeking + +The daemon's mpv runs with `cache=yes`, so it drains the FIFO into its seekable demuxer cache and +librespot finishes decoding a track within seconds of it starting. Two consequences: + +- librespot does **not** close its sink after the last packet (it expects a next `load`), so mpv + would wait on the pipe forever. `next_event()` closes it (`Player::stop`) on this handle's own + `EndOfTrack`; mpv plays out its cache, hits EOF, and the daemon advances the queue as usual. +- A seek is a plain mpv seek within that cache. librespot has already left its playing state, so + `StreamHandle::seek` would be rejected there. + Endianness: librespot emits native-endian S16, i.e. little-endian on Ryotunes' Linux x86-64 target, matching `s16le`. diff --git a/crates/spotify/src/lib.rs b/crates/spotify/src/lib.rs index 0c52737..aa7686f 100644 --- a/crates/spotify/src/lib.rs +++ b/crates/spotify/src/lib.rs @@ -33,7 +33,7 @@ pub use auth::{SignInFailure, SignInProblem}; pub use client::{Client, SearchResults}; pub use models::*; pub use provider::{SpotifyConfig, SpotifyProvider}; -pub use stream::{StreamControls, StreamEvent, StreamHandle}; +pub use stream::{StreamEvent, StreamHandle}; /// The media kinds [`Client::share_url`] can address. #[derive(Clone, Copy, Debug, PartialEq, Eq)] diff --git a/crates/spotify/src/stream.rs b/crates/spotify/src/stream.rs index 279af03..4797643 100644 --- a/crates/spotify/src/stream.rs +++ b/crates/spotify/src/stream.rs @@ -76,7 +76,12 @@ impl Engine { let uri = track_uri(track_id)?; let events = self.player.get_player_event_channel(); self.player.load(uri, true, 0); - Ok(StreamHandle { player: self.player.clone(), fifo: self.fifo.clone(), events }) + Ok(StreamHandle { + player: self.player.clone(), + fifo: self.fifo.clone(), + events, + request: None, + }) } } @@ -87,6 +92,10 @@ pub struct StreamHandle { player: Arc, fifo: Arc, events: PlayerEventChannel, + /// librespot's id for this handle's load, learned from the first `PlayRequestIdChanged`. The + /// channel is shared with the whole player, so anything tagged with another id is a previous + /// track's straggler and must not steer this one. + request: Option, } impl StreamHandle { @@ -95,13 +104,6 @@ impl StreamHandle { self.fifo.path() } - /// A cheap, cloneable transport handle (seek/play + FIFO path). The daemon keeps this to - /// drive scrubbing while a separate task owns the [`StreamHandle`] to poll - /// [`StreamHandle::next_event`] — the two halves can't share `&mut self`. - pub fn controls(&self) -> StreamControls { - StreamControls { player: self.player.clone(), fifo: self.fifo.clone() } - } - /// Seek within the current track. pub fn seek(&self, position: Duration) { self.player.seek(position.as_millis() as u32); @@ -119,46 +121,32 @@ impl StreamHandle { self.player.pause(); } - /// The next playback event, or `None` once the player has shut down. librespot events that do not - /// map onto [`StreamEvent`] (e.g. `Loading`) are skipped. + /// The next playback event for this track, or `None` once the player has shut down. librespot + /// events that do not map onto [`StreamEvent`] (e.g. `Loading`) and events from other loads are + /// skipped. + /// + /// At [`StreamEvent::EndOfTrack`] the pipe is closed here: librespot keeps its sink open after + /// the last packet (waiting for a next track that never comes), and without the close the + /// reader never sees EOF and playback hangs at the end. pub async fn next_event(&mut self) -> Option { loop { let event = self.events.recv().await?; - if let Some(event) = translate(event) { - return Some(event); + if let PlayerEvent::PlayRequestIdChanged { play_request_id } = event { + self.request.get_or_insert(play_request_id); + continue; + } + if event.get_play_request_id().is_some_and(|id| Some(id) != self.request) { + continue; + } + let Some(event) = translate(event) else { continue }; + if event == StreamEvent::EndOfTrack { + self.player.stop(); } + return Some(event); } } } -/// The transport half of a live stream, split off from [`StreamHandle`] so the daemon can seek -/// and reload from one place while the handle itself is owned by the task polling its events. -/// Cheap to clone: two `Arc`s. Dropping it does not tear the player down (see [`StreamHandle`]). -#[derive(Clone)] -pub struct StreamControls { - player: Arc, - fifo: Arc, -} - -impl StreamControls { - /// The FIFO mpv should `loadfile` with the rawaudio demuxer options (see the module docs). - pub fn fifo_path(&self) -> &Path { - self.fifo.path() - } - - /// Seek within the current track. The daemon reloads mpv on the FIFO afterwards so it reads - /// the post-seek PCM (mpv cannot seek a pipe itself). - pub fn seek(&self, position: Duration) { - self.player.seek(position.as_millis() as u32); - } - - /// Resume librespot decoding. Never used for an ordinary pause (that pauses mpv and lets FIFO - /// backpressure stall librespot); only after a seek reload. - pub fn play(&self) { - self.player.play(); - } -} - fn track_uri(track_id: &str) -> Result { let uri = if track_id.starts_with(TRACK_PREFIX) { track_id.to_owned() @@ -177,9 +165,7 @@ fn translate(event: PlayerEvent) -> Option { | PlayerEvent::PositionCorrection { position_ms, .. } => { Some(StreamEvent::Position(millis(position_ms))) } - PlayerEvent::Stopped { .. } | PlayerEvent::EndOfTrack { .. } => { - Some(StreamEvent::EndOfTrack) - } + PlayerEvent::EndOfTrack { .. } => Some(StreamEvent::EndOfTrack), PlayerEvent::Unavailable { .. } => Some(StreamEvent::Unavailable), _ => None, } @@ -268,5 +254,13 @@ mod tests { }), Some(StreamEvent::EndOfTrack) ); + // `Stopped` is the echo of the pipe close `next_event` issues at EndOfTrack. + assert_eq!( + translate(PlayerEvent::Stopped { + play_request_id: 0, + track_id: SpotifyUri::from_uri("spotify:track:4uLU6hMCjMI75M1A2tKUQC").unwrap(), + }), + None + ); } } From 58823982bb6b86ab76bac80a5c7ba6911de8f795 Mon Sep 17 00:00:00 2001 From: carlos Date: Tue, 13 Oct 2026 22:57:41 -0400 Subject: [PATCH 176/183] fix: the daemon asks YouTube Music in the system's language and region --- crates/innertube/src/models/context.rs | 42 ++++++++++++++++++++++---- crates/ryotunesd/src/app.rs | 2 +- src-tauri/src/lib.rs | 3 +- 3 files changed, 39 insertions(+), 8 deletions(-) diff --git a/crates/innertube/src/models/context.rs b/crates/innertube/src/models/context.rs index f54ea84..a1d03f4 100644 --- a/crates/innertube/src/models/context.rs +++ b/crates/innertube/src/models/context.rs @@ -18,17 +18,21 @@ impl Default for Locale { } impl Locale { - /// Derive a `Locale` from the process environment (`LC_ALL`/`LANG`), so the - /// YouTube API answers in the user's language instead of always US/en. - /// Falls back to [`Locale::default`] when nothing parseable is set. + /// Derive a `Locale` from the process environment (`LC_ALL`, `LC_MESSAGES`, then `LANG`, the + /// first non-empty one wins as in POSIX), so the YouTube API answers in the user's language + /// instead of always US/en. Falls back to [`Locale::default`] when nothing parseable is set. pub fn from_env() -> Self { - let raw = std::env::var("LC_ALL").or_else(|_| std::env::var("LANG")).unwrap_or_default(); + let raw = ["LC_ALL", "LC_MESSAGES", "LANG"] + .iter() + .filter_map(|k| std::env::var(k).ok()) + .find(|v| !v.is_empty()) + .unwrap_or_default(); Self::from_lang(&raw) } fn from_lang(raw: &str) -> Self { - // "fr_FR.UTF-8" -> ("fr", "FR"); "", "C" or "POSIX" -> default. - let base = raw.split('.').next().unwrap_or(""); + // "fr_FR.UTF-8" / "de_DE@euro" -> ("fr", "FR") / ("de", "DE"); "", "C" or "POSIX" -> default. + let base = raw.split(['.', '@']).next().unwrap_or(""); let mut parts = base.split('_'); let lang = parts.next().unwrap_or("").to_ascii_lowercase(); if lang.is_empty() || lang == "c" || lang == "posix" { @@ -154,3 +158,29 @@ impl YouTubeClient { } } } + +#[cfg(test)] +mod tests { + use super::Locale; + + fn tags(raw: &str) -> (String, String) { + let l = Locale::from_lang(raw); + (l.hl, l.gl) + } + + #[test] + fn system_locales_map_onto_youtube_tags() { + assert_eq!(tags("fr_FR.UTF-8"), ("fr".into(), "FR".into())); + assert_eq!(tags("de_DE@euro"), ("de".into(), "DE".into())); + assert_eq!(tags("pt_BR.UTF-8"), ("pt-BR".into(), "BR".into())); + assert_eq!(tags("es_MX.UTF-8"), ("es-419".into(), "MX".into())); + assert_eq!(tags("ja"), ("ja".into(), "US".into())); + } + + #[test] + fn unset_or_neutral_locales_stay_us_english() { + for raw in ["", "C", "C.UTF-8", "POSIX"] { + assert_eq!(tags(raw), ("en".into(), "US".into()), "{raw:?}"); + } + } +} diff --git a/crates/ryotunesd/src/app.rs b/crates/ryotunesd/src/app.rs index 3f5a350..37bd643 100644 --- a/crates/ryotunesd/src/app.rs +++ b/crates/ryotunesd/src/app.rs @@ -122,7 +122,7 @@ pub fn build( tracing::info!("loaded persisted login session"); } - let session = Session { locale: Locale::default(), visitor_data, data_sync_id, cookie }; + let session = Session { locale: Locale::from_env(), visitor_data, data_sync_id, cookie }; let it = match InnerTube::new(session.clone(), proxy.as_deref()) { Ok(it) => it, Err(error) => { diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index fe02e79..63db04f 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -322,7 +322,8 @@ pub fn run() { tracing::info!("loaded persisted login session"); } - let session = Session { locale: Locale::from_env(), visitor_data, data_sync_id, cookie }; + let session = + Session { locale: Locale::from_env(), visitor_data, data_sync_id, cookie }; let it = match InnerTube::new(session.clone(), proxy.as_deref()) { Ok(it) => it, Err(error) => { From 8c7d2aa6f2db7e4526f32efe1b43bf4d302a0c07 Mon Sep 17 00:00:00 2001 From: carlos Date: Tue, 13 Oct 2026 22:57:41 -0400 Subject: [PATCH 177/183] fix: an account Spotify refuses is not reconnected every cooldown --- crates/core/src/spotify.rs | 43 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/crates/core/src/spotify.rs b/crates/core/src/spotify.rs index 3c3fe65..fdfeb08 100644 --- a/crates/core/src/spotify.rs +++ b/crates/core/src/spotify.rs @@ -93,6 +93,10 @@ pub struct SpotifyState { provider: SpotifyProvider, client: RwLock>>, last_recovery: parking_lot::Mutex>, + /// Set when the stored credentials were refused for a reason no retry fixes (no Premium, + /// out of region, revoked). Recovery then stays off until a sign-in or sign-out, instead of + /// reconnecting librespot once per cooldown for an account that can never play. + refused: std::sync::atomic::AtomicBool, /// Serialises session restores so an on-demand recovery never runs a second librespot /// connect against the same cached credentials while the startup restore is mid-flight. recover_lock: tokio::sync::Mutex<()>, @@ -105,6 +109,7 @@ impl SpotifyState { provider: SpotifyProvider::new(data_dir), client: RwLock::new(None), last_recovery: parking_lot::Mutex::new(None), + refused: std::sync::atomic::AtomicBool::new(false), recover_lock: tokio::sync::Mutex::new(()), selected: parking_lot::RwLock::new(selected), } @@ -146,7 +151,10 @@ impl SpotifyState { if let Some(client) = self.live_client().await { return Some(client); } - if !self.provider.stored() || !self.may_recover() { + if !self.provider.stored() + || self.refused.load(std::sync::atomic::Ordering::Relaxed) + || !self.may_recover() + { return None; } match self.restore().await { @@ -207,7 +215,12 @@ impl SpotifyState { if self.live_client().await.is_some() { return Ok(true); } - match self.provider.restore().await? { + let restored = self.provider.restore().await.inspect_err(|e| { + if retry_cannot_fix(e) { + self.refused.store(true, std::sync::atomic::Ordering::Relaxed); + } + })?; + match restored { Some(client) => { *self.client.write().await = Some(Arc::new(client)); Ok(true) @@ -225,6 +238,7 @@ impl SpotifyState { let client = self.provider.sign_in(on_url).await?; *self.client.write().await = Some(Arc::new(client)); *self.last_recovery.lock() = None; + self.refused.store(false, std::sync::atomic::Ordering::Relaxed); Ok(()) } @@ -233,9 +247,21 @@ impl SpotifyState { self.provider.sign_out(); *self.client.write().await = None; *self.last_recovery.lock() = None; + self.refused.store(false, std::sync::atomic::Ordering::Relaxed); } } +/// Whether a failed restore is about the account itself rather than the connection. +fn retry_cannot_fix(e: &anyhow::Error) -> bool { + use ryotunes_spotify::{SignInFailure, SignInProblem}; + matches!( + e.downcast_ref::(), + Some(SignInFailure( + SignInProblem::Premium | SignInProblem::Region | SignInProblem::Credentials + )) + ) +} + #[cfg(test)] mod tests { use super::*; @@ -255,4 +281,17 @@ mod tests { *state.last_recovery.lock() = Some(std::time::Instant::now() - RECOVERY_COOLDOWN); assert!(state.may_recover()); } + + #[test] + fn only_account_refusals_stop_recovery() { + use ryotunes_spotify::{SignInFailure, SignInProblem}; + let refused = |p| retry_cannot_fix(&anyhow::Error::new(SignInFailure(p))); + + assert!(refused(SignInProblem::Premium)); + assert!(refused(SignInProblem::Region)); + assert!(refused(SignInProblem::Credentials)); + assert!(!refused(SignInProblem::Network)); + assert!(!refused(SignInProblem::Refused)); + assert!(!retry_cannot_fix(&anyhow::anyhow!("Connection to server closed"))); + } } From 19eac6f0422f3cd667079b1095b36756fcbbc508 Mon Sep 17 00:00:00 2001 From: carlos Date: Tue, 13 Oct 2026 22:57:41 -0400 Subject: [PATCH 178/183] docs: changelog for the merged contributor fixes --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index db47e30..d23327a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ ## Unreleased +- Fixed Spotify playback stopping at the end of every track instead of moving on, and seeking doing nothing: the track now ends cleanly into the next one, and seeking jumps within the already-buffered track. +- Spotify tracks now show their length in the desktop media widget. +- Saved Spotify songs, albums and artists now come back newest first, and Spotify playlists and Liked Songs have the same sort menu as the other providers. +- A Spotify session that drops mid-listen now reconnects on its own from the saved sign-in, with a short cooldown between attempts, instead of giving up after the first reconnect. An account Spotify refuses outright (no Premium, out of region, revoked) is not retried until you sign in again. +- YouTube Music now answers in your system language and region (from `LC_ALL`, `LC_MESSAGES` or `LANG`) instead of always US English. The Tauri build's own menus and dialogs also gain a French translation. + ## v1.1.7 - 2026-10-14 - Fixed music stopping and the app closing after a few minutes of playback: the daemon's hidden YouTube helper views loaded the desktop accessibility bridge, and when the session's accessibility bus went stale the bridge crashed the whole daemon the next time a helper view was built. The daemon no longer loads the bridge at all, since those views are never shown. From 80b0423a76f2095134d71a634a29174b171c8e4e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 14 Oct 2026 03:02:35 +0000 Subject: [PATCH 179/183] release: v1.1.8 --- CHANGELOG.md | 2 ++ Cargo.lock | 22 +++++++++---------- Cargo.toml | 2 +- client/version | 2 +- packaging/arch/PKGBUILD | 2 +- .../linux/dev.ryoku.ryotunes.metainfo.xml | 2 +- src-tauri/tauri.conf.json | 2 +- ui/package.json | 2 +- 8 files changed, 19 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d23327a..b99a42a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +## v1.1.8 - 2026-10-14 + - Fixed Spotify playback stopping at the end of every track instead of moving on, and seeking doing nothing: the track now ends cleanly into the next one, and seeking jumps within the already-buffered track. - Spotify tracks now show their length in the desktop media widget. - Saved Spotify songs, albums and artists now come back newest first, and Spotify playlists and Liked Songs have the same sort menu as the other providers. diff --git a/Cargo.lock b/Cargo.lock index 1abbf56..1c1aefd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2456,7 +2456,7 @@ dependencies = [ [[package]] name = "innertube" -version = "1.1.7" +version = "1.1.8" dependencies = [ "hex", "reqwest 0.12.28", @@ -2962,7 +2962,7 @@ checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" [[package]] name = "listen-protocol" -version = "1.1.7" +version = "1.1.8" dependencies = [ "serde", "serde_json", @@ -3807,7 +3807,7 @@ checksum = "f6b464fbc74e149a392436b17d523f769e057cb6877f6a5c4618bc6f11800548" [[package]] name = "player" -version = "1.1.7" +version = "1.1.8" dependencies = [ "libc", "libmpv2", @@ -4722,7 +4722,7 @@ dependencies = [ [[package]] name = "ryotunes" -version = "1.1.7" +version = "1.1.8" dependencies = [ "anyhow", "async-trait", @@ -4752,7 +4752,7 @@ dependencies = [ [[package]] name = "ryotunes-cli" -version = "1.1.7" +version = "1.1.8" dependencies = [ "ryotunes-protocol", "serde", @@ -4761,7 +4761,7 @@ dependencies = [ [[package]] name = "ryotunes-core" -version = "1.1.7" +version = "1.1.8" dependencies = [ "anyhow", "async-trait", @@ -4797,7 +4797,7 @@ dependencies = [ [[package]] name = "ryotunes-protocol" -version = "1.1.7" +version = "1.1.8" dependencies = [ "serde", "serde_json", @@ -4805,7 +4805,7 @@ dependencies = [ [[package]] name = "ryotunes-soundcloud" -version = "1.1.7" +version = "1.1.8" dependencies = [ "base64 0.22.1", "parking_lot", @@ -4820,7 +4820,7 @@ dependencies = [ [[package]] name = "ryotunes-spotify" -version = "1.1.7" +version = "1.1.8" dependencies = [ "anyhow", "bytes", @@ -4844,7 +4844,7 @@ dependencies = [ [[package]] name = "ryotunesd" -version = "1.1.7" +version = "1.1.8" dependencies = [ "aes", "anyhow", @@ -5615,7 +5615,7 @@ dependencies = [ [[package]] name = "sync-server" -version = "1.1.7" +version = "1.1.8" dependencies = [ "futures-util", "listen-protocol", diff --git a/Cargo.toml b/Cargo.toml index 6e08854..5076828 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ members = [ ] [workspace.package] -version = "1.1.7" +version = "1.1.8" edition = "2021" license = "GPL-3.0-or-later" diff --git a/client/version b/client/version index 2bf1ca5..18efdb9 100644 --- a/client/version +++ b/client/version @@ -1 +1 @@ -1.1.7 +1.1.8 diff --git a/packaging/arch/PKGBUILD b/packaging/arch/PKGBUILD index 8fdcf27..20b7097 100644 --- a/packaging/arch/PKGBUILD +++ b/packaging/arch/PKGBUILD @@ -2,7 +2,7 @@ # Run from packaging/arch with: makepkg -si pkgname=ryotunes -pkgver=1.1.7 +pkgver=1.1.8 pkgrel=1 # epoch=1 is permanent: the v1 reset publishes 1:X.Y.Z, which pacman ranks above # the legacy 2.x line an existing machine may carry, so `pacman -U` still upgrades. diff --git a/packaging/linux/dev.ryoku.ryotunes.metainfo.xml b/packaging/linux/dev.ryoku.ryotunes.metainfo.xml index 00426d3..cb59e5e 100644 --- a/packaging/linux/dev.ryoku.ryotunes.metainfo.xml +++ b/packaging/linux/dev.ryoku.ryotunes.metainfo.xml @@ -12,5 +12,5 @@ ryotunes.desktop ryotunes AudioVideoAudio - + diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index cc31d3f..45647a1 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "https://schema.tauri.app/config/2", "productName": "Ryotunes", - "version": "1.1.7", + "version": "1.1.8", "identifier": "dev.ryoku.ryotunes", "build": { "frontendDist": "../ui/build", diff --git a/ui/package.json b/ui/package.json index 6264957..99f2f63 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,7 +1,7 @@ { "name": "ui", "private": true, - "version": "1.1.7", + "version": "1.1.8", "type": "module", "scripts": { "dev": "vite dev", From e14343f51c417bbc17c23f81f9eec913b8d224d1 Mon Sep 17 00:00:00 2001 From: carlos Date: Tue, 13 Oct 2026 23:34:14 -0400 Subject: [PATCH 180/183] feat: cards and rows show which service a song or album comes from --- CHANGELOG.md | 2 ++ client/components/MediaCard.qml | 11 ++++++++++ client/components/ProviderBadge.qml | 31 +++++++++++++++++++++++++++++ client/components/TrackRow.qml | 15 ++++++++++++++ client/lib/ids.js | 16 +++++++++++++++ client/tests/tst_ids.qml | 29 +++++++++++++++++++++++++++ 6 files changed, 104 insertions(+) create mode 100644 client/components/ProviderBadge.qml create mode 100644 client/tests/tst_ids.qml diff --git a/CHANGELOG.md b/CHANGELOG.md index b99a42a..06ec4ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +- Every song, album, playlist and artist now shows where it comes from: cards carry a small YouTube Music, Spotify or SoundCloud badge in that service's colour on the cover, and track rows show the same glyph beside the title. Ryotunes' own collections (On Repeat, local playlists, files on disk, radio) carry none. + ## v1.1.8 - 2026-10-14 - Fixed Spotify playback stopping at the end of every track instead of moving on, and seeking doing nothing: the track now ends cleanly into the next one, and seeking jumps within the already-buffered track. diff --git a/client/components/MediaCard.qml b/client/components/MediaCard.qml index 41dc75a..ee89864 100644 --- a/client/components/MediaCard.qml +++ b/client/components/MediaCard.qml @@ -86,6 +86,17 @@ Item { : (root.item && Ids.isOnRepeatId(root.item.id)) ? "on-repeat" : "music" } + // where it comes from: top-left, clear of the hover play; on an artist circle it sits + // on the rim at 45° instead of hanging off the empty corner + ProviderBadge { + id: badge + itemId: root.item ? root.item.id : "" + anchors.left: parent.left + anchors.top: parent.top + anchors.margins: root.round ? Math.max(0, Math.round(parent.width * 0.146 - badge.width / 2)) + : Style.sp(2) + } + // hover ring Rectangle { anchors.fill: parent diff --git a/client/components/ProviderBadge.qml b/client/components/ProviderBadge.qml new file mode 100644 index 0000000..ee1a807 --- /dev/null +++ b/client/components/ProviderBadge.qml @@ -0,0 +1,31 @@ +import QtQuick +import "../" +import "../lib/ids.js" as Ids + +// The source tag a card's artwork wears: the catalogue's glyph in its own colour on a dark chip, +// so YouTube Music, Spotify and SoundCloud items tell apart on any cover. Hidden for Ryotunes' own +// collections, which come from no catalogue. +Rectangle { + id: root + + property string itemId: "" + property int glyphSize: Style.sp(4) + + readonly property string glyph: Ids.sourceGlyph(root.itemId) + + visible: root.glyph !== "" + width: root.glyphSize + Style.sp(2) + height: width + radius: width / 2 + // A fixed dark chip, not a skin token: it sits on arbitrary artwork and has to read on all of it. + color: Qt.rgba(0, 0, 0, 0.6) + border.width: 1 + border.color: Qt.rgba(1, 1, 1, 0.14) + + Icon { + anchors.centerIn: parent + name: root.glyph + size: root.glyphSize + color: Style.providerColors[Ids.providerOf(root.itemId)] || "white" + } +} diff --git a/client/components/TrackRow.qml b/client/components/TrackRow.qml index 9692db9..a85eb3a 100644 --- a/client/components/TrackRow.qml +++ b/client/components/TrackRow.qml @@ -45,6 +45,9 @@ Rectangle { readonly property string duration: (song && song.duration && /^[\d:]+$/.test(song.duration)) ? song.duration : "" readonly property string album: (song && song.album) ? song.album : "" readonly property string plays: (song && song.play_count) ? song.play_count : "" + // The catalogue the track comes from, as a glyph in that catalogue's colour beside the title. + readonly property string sourceGlyph: song ? Ids.sourceGlyph(song.video_id) : "" + readonly property color sourceColor: Style.providerColors[song ? Ids.providerOf(song.video_id) : ""] || Tokens.inkMuted implicitHeight: Style.rowH radius: Style.radius @@ -156,6 +159,12 @@ Rectangle { border.color: Tokens.inkFaint Text { anchors.centerIn: parent; text: "E"; color: Tokens.inkMuted; font.family: Style.fontUi; font.pixelSize: Style.fs.xs; font.weight: Font.DemiBold } } + Icon { + visible: root.sourceGlyph !== "" + name: root.sourceGlyph + size: Style.sp(3.5) + color: root.sourceColor + } } Text { Layout.fillWidth: true @@ -192,6 +201,12 @@ Rectangle { border.color: Tokens.inkFaint Text { anchors.centerIn: parent; text: "E"; color: Tokens.inkMuted; font.family: Style.fontUi; font.pixelSize: Style.fs.xs; font.weight: Font.DemiBold } } + Icon { + visible: root.sourceGlyph !== "" + name: root.sourceGlyph + size: Style.sp(3.5) + color: root.sourceColor + } } // artist column — full table diff --git a/client/lib/ids.js b/client/lib/ids.js index d394013..22a46ce 100644 --- a/client/lib/ids.js +++ b/client/lib/ids.js @@ -41,3 +41,19 @@ function providerOf(id) { return "soundcloud"; return "youtube"; } + +// The catalogue glyph a card or row wears so its source reads at a glance: "youtube-music", +// "spotify" or "soundcloud". Ryotunes' own collections (smart playlists, local playlists, files +// on disk, radio) come from no catalogue and get "". +function sourceGlyph(id) { + switch (providerOf(id)) { + case "spotify": + return "spotify"; + case "soundcloud": + return "soundcloud"; + case "youtube": + return isSmartPlaylistId(id) || id.indexOf("RYOTUNES_") === 0 ? "" : "youtube-music"; + default: + return ""; + } +} diff --git a/client/tests/tst_ids.qml b/client/tests/tst_ids.qml new file mode 100644 index 0000000..9f7c82f --- /dev/null +++ b/client/tests/tst_ids.qml @@ -0,0 +1,29 @@ +import QtQuick +import QtTest +import "../lib/ids.js" as Ids + +// The source tag on cards and rows: every catalogue id wears its catalogue's glyph, and Ryotunes' +// own collections (which share YouTube's unprefixed id space in providerOf) wear none, so a smart or +// local playlist never claims to come from YouTube Music. +TestCase { + name: "Ids" + + function test_catalogue_ids_wear_their_glyph() { + compare(Ids.sourceGlyph("dQw4w9WgXcQ"), "youtube-music"); + compare(Ids.sourceGlyph("MPREb_abc"), "youtube-music"); + compare(Ids.sourceGlyph("spotify:album:4uLU6hMCjMI75M1A2tKUQC"), "spotify"); + compare(Ids.sourceGlyph("spotify:playlist:liked"), "spotify"); + compare(Ids.sourceGlyph("sc:playlist:123"), "soundcloud"); + compare(Ids.sourceGlyph("sc:system:weekly"), "soundcloud"); + } + + function test_ryotunes_own_collections_wear_none() { + compare(Ids.sourceGlyph("RYOTUNES_ON_REPEAT"), ""); + compare(Ids.sourceGlyph("RYOTUNES_REDISCOVER"), ""); + compare(Ids.sourceGlyph("RYOTUNES_LOCAL_PLAYLIST:42"), ""); + compare(Ids.sourceGlyph("RYOTUNES_RADIO:station"), ""); + compare(Ids.sourceGlyph("LOCALALBUM:x"), ""); + compare(Ids.sourceGlyph(""), ""); + compare(Ids.sourceGlyph(undefined), ""); + } +} From 20cd120e7479b2c7d04546d2d3923854b6665db8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 14 Oct 2026 03:39:17 +0000 Subject: [PATCH 181/183] release: v1.1.9 --- CHANGELOG.md | 2 ++ Cargo.lock | 22 +++++++++---------- Cargo.toml | 2 +- client/version | 2 +- packaging/arch/PKGBUILD | 2 +- .../linux/dev.ryoku.ryotunes.metainfo.xml | 2 +- src-tauri/tauri.conf.json | 2 +- ui/package.json | 2 +- 8 files changed, 19 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 06ec4ca..9b378e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +## v1.1.9 - 2026-10-14 + - Every song, album, playlist and artist now shows where it comes from: cards carry a small YouTube Music, Spotify or SoundCloud badge in that service's colour on the cover, and track rows show the same glyph beside the title. Ryotunes' own collections (On Repeat, local playlists, files on disk, radio) carry none. ## v1.1.8 - 2026-10-14 diff --git a/Cargo.lock b/Cargo.lock index 1c1aefd..738728f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2456,7 +2456,7 @@ dependencies = [ [[package]] name = "innertube" -version = "1.1.8" +version = "1.1.9" dependencies = [ "hex", "reqwest 0.12.28", @@ -2962,7 +2962,7 @@ checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" [[package]] name = "listen-protocol" -version = "1.1.8" +version = "1.1.9" dependencies = [ "serde", "serde_json", @@ -3807,7 +3807,7 @@ checksum = "f6b464fbc74e149a392436b17d523f769e057cb6877f6a5c4618bc6f11800548" [[package]] name = "player" -version = "1.1.8" +version = "1.1.9" dependencies = [ "libc", "libmpv2", @@ -4722,7 +4722,7 @@ dependencies = [ [[package]] name = "ryotunes" -version = "1.1.8" +version = "1.1.9" dependencies = [ "anyhow", "async-trait", @@ -4752,7 +4752,7 @@ dependencies = [ [[package]] name = "ryotunes-cli" -version = "1.1.8" +version = "1.1.9" dependencies = [ "ryotunes-protocol", "serde", @@ -4761,7 +4761,7 @@ dependencies = [ [[package]] name = "ryotunes-core" -version = "1.1.8" +version = "1.1.9" dependencies = [ "anyhow", "async-trait", @@ -4797,7 +4797,7 @@ dependencies = [ [[package]] name = "ryotunes-protocol" -version = "1.1.8" +version = "1.1.9" dependencies = [ "serde", "serde_json", @@ -4805,7 +4805,7 @@ dependencies = [ [[package]] name = "ryotunes-soundcloud" -version = "1.1.8" +version = "1.1.9" dependencies = [ "base64 0.22.1", "parking_lot", @@ -4820,7 +4820,7 @@ dependencies = [ [[package]] name = "ryotunes-spotify" -version = "1.1.8" +version = "1.1.9" dependencies = [ "anyhow", "bytes", @@ -4844,7 +4844,7 @@ dependencies = [ [[package]] name = "ryotunesd" -version = "1.1.8" +version = "1.1.9" dependencies = [ "aes", "anyhow", @@ -5615,7 +5615,7 @@ dependencies = [ [[package]] name = "sync-server" -version = "1.1.8" +version = "1.1.9" dependencies = [ "futures-util", "listen-protocol", diff --git a/Cargo.toml b/Cargo.toml index 5076828..8d0423b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ members = [ ] [workspace.package] -version = "1.1.8" +version = "1.1.9" edition = "2021" license = "GPL-3.0-or-later" diff --git a/client/version b/client/version index 18efdb9..512a1fa 100644 --- a/client/version +++ b/client/version @@ -1 +1 @@ -1.1.8 +1.1.9 diff --git a/packaging/arch/PKGBUILD b/packaging/arch/PKGBUILD index 20b7097..8416f82 100644 --- a/packaging/arch/PKGBUILD +++ b/packaging/arch/PKGBUILD @@ -2,7 +2,7 @@ # Run from packaging/arch with: makepkg -si pkgname=ryotunes -pkgver=1.1.8 +pkgver=1.1.9 pkgrel=1 # epoch=1 is permanent: the v1 reset publishes 1:X.Y.Z, which pacman ranks above # the legacy 2.x line an existing machine may carry, so `pacman -U` still upgrades. diff --git a/packaging/linux/dev.ryoku.ryotunes.metainfo.xml b/packaging/linux/dev.ryoku.ryotunes.metainfo.xml index cb59e5e..f121beb 100644 --- a/packaging/linux/dev.ryoku.ryotunes.metainfo.xml +++ b/packaging/linux/dev.ryoku.ryotunes.metainfo.xml @@ -12,5 +12,5 @@ ryotunes.desktop ryotunes AudioVideoAudio - + diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 45647a1..f66f76b 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "https://schema.tauri.app/config/2", "productName": "Ryotunes", - "version": "1.1.8", + "version": "1.1.9", "identifier": "dev.ryoku.ryotunes", "build": { "frontendDist": "../ui/build", diff --git a/ui/package.json b/ui/package.json index 99f2f63..99d115b 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,7 +1,7 @@ { "name": "ui", "private": true, - "version": "1.1.8", + "version": "1.1.9", "type": "module", "scripts": { "dev": "vite dev", From 806e151c7b86a56834f3318b0281b61255db2e97 Mon Sep 17 00:00:00 2001 From: carlos Date: Wed, 14 Oct 2026 00:03:09 -0400 Subject: [PATCH 182/183] fix: an upgrade installed under a running ryotunes asks for a restart --- CHANGELOG.md | 2 + client/pages/SettingsPage.qml | 13 +++++- crates/core/src/update.rs | 83 +++++++++++++++++++++++++---------- 3 files changed, 74 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b378e5..f4f134e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +- Fixed Settings ▸ Software updates wrongly saying "This is not a pacman-managed Ryotunes installation" after a system upgrade replaced Ryotunes while it was running. It now says the new version is already installed and offers "Restart to finish update", which restarts straight into it with nothing to download. + ## v1.1.9 - 2026-10-14 - Every song, album, playlist and artist now shows where it comes from: cards carry a small YouTube Music, Spotify or SoundCloud badge in that service's colour on the cover, and track rows show the same glyph beside the title. Ryotunes' own collections (On Repeat, local playlists, files on disk, radio) carry none. diff --git a/client/pages/SettingsPage.qml b/client/pages/SettingsPage.qml index 92be7ab..758c5be 100644 --- a/client/pages/SettingsPage.qml +++ b/client/pages/SettingsPage.qml @@ -205,6 +205,13 @@ Item { var info = page.updateInfo; if (!info || !info.latestVersion || !info.available || !info.canInstall) return; var version = info.latestVersion; + // Already on disk (a system upgrade got there first): nothing to download, just restart. + if (info.restartPending) { + page.installedVersion = version; + page.updateStatus = "installed"; + page.restartIntoUpdate(); + return; + } page.updateStatus = "installing"; page.updateError = ""; Daemon.call("install_update", { version: version }) @@ -241,6 +248,8 @@ Item { if (!info) return ""; if (info.latestVersion === null || info.latestVersion === undefined) return "No release has been published yet."; if (info.available) { + if (info.restartPending) + return "Ryotunes " + info.latestVersion + " is already installed. Restart Ryotunes to start using it."; var msg = "Version " + info.latestVersion + " is available."; if (!info.canInstall && info.unsupportedReason) msg += " " + info.unsupportedReason; return msg; @@ -1413,7 +1422,9 @@ Item { Btn { visible: !!(page.updateInfo && page.updateInfo.available && page.updateInfo.latestVersion && page.updateInfo.canInstall) && page.updateStatus !== "installed" primary: true - text: page.updateStatus === "installing" ? "Installing…" : ("Update to " + (page.updateInfo ? page.updateInfo.latestVersion : "")) + text: page.updateStatus === "installing" ? "Installing…" + : (page.updateInfo && page.updateInfo.restartPending) ? "Restart to finish update" + : ("Update to " + (page.updateInfo ? page.updateInfo.latestVersion : "")) icon: "download" enabled: page.updateStatus !== "installing" && page.updateStatus !== "checking" onClicked: page.installUpdate() diff --git a/crates/core/src/update.rs b/crates/core/src/update.rs index 1545417..dbfdb92 100644 --- a/crates/core/src/update.rs +++ b/crates/core/src/update.rs @@ -1,6 +1,6 @@ //! Explicit, package-managed updates shared by both desktop hosts. GitHub is the release //! authority; the renderer can select a version, never a URL, command or destination. -use std::path::Path; +use std::path::{Path, PathBuf}; use std::process::Stdio; use std::time::Duration; @@ -24,6 +24,9 @@ pub struct UpdateInfo { pub notes: String, pub can_install: bool, pub unsupported_reason: Option, + /// The latest release is already installed on disk (pacman upgraded the files under this + /// running daemon); only a restart is left to do. + pub restart_pending: bool, } #[derive(Serialize)] @@ -78,6 +81,7 @@ fn release_info(release: Option, current: &str, reason: Option) notes: String::new(), can_install: false, unsupported_reason: reason, + restart_pending: false, }; let Some(release) = release else { return info }; let Some(latest) = release.tag_name.strip_prefix('v') else { return info }; @@ -128,7 +132,7 @@ async fn bounded_body(mut response: reqwest::Response, limit: usize) -> Result Option { if !cfg!(all(target_os = "linux", target_arch = "x86_64")) { - return Some("Self update supports the x86_64 Arch/Ryoku package. Download a release for your platform instead.".into()); + return Some("Self update supports the x86_64 Arch Linux package. Download a release for your platform instead.".into()); } if !Path::new("/usr/bin/pacman").is_file() || !Path::new("/usr/bin/pkexec").is_file() { return Some( @@ -137,16 +141,49 @@ async fn installation_reason() -> Option { ); } let exe = match std::env::current_exe() { - Ok(exe) => exe, + Ok(exe) => on_disk(exe), Err(e) => return Some(format!("Cannot determine the running installation: {e}")), }; let owner = Command::new("/usr/bin/pacman").args(["-Qoq"]).arg(exe).kill_on_drop(true).output(); match tokio::time::timeout(Duration::from_secs(10), owner).await { Ok(Ok(output)) if output.status.success() && output.stdout == b"ryotunes\n" => None, - _ => Some("This is not a pacman-managed Ryotunes installation. Install the release package first; development builds are never overwritten.".into()), + _ => Some("This copy of Ryotunes was not installed from its pacman package, so it cannot update itself. Install the package from the release page; development builds are never overwritten.".into()), } } +/// The running binary's path on disk. Once pacman replaces the file under a running daemon, the +/// kernel reports `/usr/bin/ryotunesd (deleted)`; the package still owns the original path. +fn on_disk(exe: PathBuf) -> PathBuf { + match exe.to_str().and_then(|path| path.strip_suffix(" (deleted)")) { + Some(path) => PathBuf::from(path), + None => exe, + } +} + +/// The installed package's version, which runs ahead of this daemon once pacman (a system +/// upgrade, or an update installed from another window) has replaced the files underneath it. +async fn installed_package_version() -> Result, String> { + let output = tokio::time::timeout( + Duration::from_secs(10), + Command::new("/usr/bin/pacman").args(["-Q", "ryotunes"]).kill_on_drop(true).output(), + ) + .await + .map_err(|_| "Timed out reading the installed package.")? + .map_err(|e| format!("Could not query the installed package: {e}"))?; + if !output.status.success() { + return Err("Could not query the installed Ryotunes package.".into()); + } + Ok(package_version(&String::from_utf8_lossy(&output.stdout))) +} + +/// `ryotunes 1:1.1.9-1` → `1.1.9`. +fn package_version(query: &str) -> Option { + query + .trim() + .strip_prefix("ryotunes 1:") + .and_then(|value| value.rsplit_once('-').map(|(version, _)| version.to_owned())) +} + pub async fn check_for_updates() -> Result { let response = response(LATEST, Duration::from_secs(30)).await?; let release = if response.status() == reqwest::StatusCode::NOT_FOUND { @@ -158,7 +195,12 @@ pub async fn check_for_updates() -> Result { .map_err(|e| format!("Invalid GitHub release metadata: {e}"))?, ) }; - Ok(release_info(release, env!("CARGO_PKG_VERSION"), installation_reason().await)) + let mut info = release_info(release, env!("CARGO_PKG_VERSION"), installation_reason().await); + if info.available && info.can_install { + info.restart_pending = installed_package_version().await.ok().flatten().as_deref() + == info.latest_version.as_deref(); + } + Ok(info) } fn checksum(bytes: &[u8], name: &str) -> Result { @@ -229,24 +271,9 @@ pub async fn install_update(requested: String) -> Result version(&requested) { + // A system upgrade may already have replaced the files while this older daemon kept running. + if let Some(installed_version) = installed_package_version().await? { + if version(&installed_version) > version(&requested) { return Err( "A newer package is already installed. Quit Ryotunes and open it again.".into() ); @@ -390,4 +417,14 @@ mod tests { assert!(checksum(format!("{hash} package\n{hash} other").as_bytes(), "package").is_err()); assert!(checksum(b"not-a-hash package", "package").is_err()); } + + #[test] + fn a_replaced_binary_still_resolves_to_its_package_path() { + let replaced = PathBuf::from("/usr/bin/ryotunesd (deleted)"); + assert_eq!(on_disk(replaced), PathBuf::from("/usr/bin/ryotunesd")); + let intact = PathBuf::from("/usr/bin/ryotunesd"); + assert_eq!(on_disk(intact.clone()), intact); + assert_eq!(package_version("ryotunes 1:1.1.9-1\n").as_deref(), Some("1.1.9")); + assert_eq!(package_version("other 1:1.1.9-1"), None); + } } From ade86b744651b908f3946b6769853e5084a59ce1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 14 Oct 2026 04:09:45 +0000 Subject: [PATCH 183/183] release: v1.2.0 --- CHANGELOG.md | 2 ++ Cargo.lock | 22 +++++++++---------- Cargo.toml | 2 +- client/version | 2 +- packaging/arch/PKGBUILD | 2 +- .../linux/dev.ryoku.ryotunes.metainfo.xml | 2 +- src-tauri/tauri.conf.json | 2 +- ui/package.json | 2 +- 8 files changed, 19 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f4f134e..6e1f5f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +## v1.2.0 - 2026-10-14 + - Fixed Settings ▸ Software updates wrongly saying "This is not a pacman-managed Ryotunes installation" after a system upgrade replaced Ryotunes while it was running. It now says the new version is already installed and offers "Restart to finish update", which restarts straight into it with nothing to download. ## v1.1.9 - 2026-10-14 diff --git a/Cargo.lock b/Cargo.lock index 738728f..bfe0691 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2456,7 +2456,7 @@ dependencies = [ [[package]] name = "innertube" -version = "1.1.9" +version = "1.2.0" dependencies = [ "hex", "reqwest 0.12.28", @@ -2962,7 +2962,7 @@ checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" [[package]] name = "listen-protocol" -version = "1.1.9" +version = "1.2.0" dependencies = [ "serde", "serde_json", @@ -3807,7 +3807,7 @@ checksum = "f6b464fbc74e149a392436b17d523f769e057cb6877f6a5c4618bc6f11800548" [[package]] name = "player" -version = "1.1.9" +version = "1.2.0" dependencies = [ "libc", "libmpv2", @@ -4722,7 +4722,7 @@ dependencies = [ [[package]] name = "ryotunes" -version = "1.1.9" +version = "1.2.0" dependencies = [ "anyhow", "async-trait", @@ -4752,7 +4752,7 @@ dependencies = [ [[package]] name = "ryotunes-cli" -version = "1.1.9" +version = "1.2.0" dependencies = [ "ryotunes-protocol", "serde", @@ -4761,7 +4761,7 @@ dependencies = [ [[package]] name = "ryotunes-core" -version = "1.1.9" +version = "1.2.0" dependencies = [ "anyhow", "async-trait", @@ -4797,7 +4797,7 @@ dependencies = [ [[package]] name = "ryotunes-protocol" -version = "1.1.9" +version = "1.2.0" dependencies = [ "serde", "serde_json", @@ -4805,7 +4805,7 @@ dependencies = [ [[package]] name = "ryotunes-soundcloud" -version = "1.1.9" +version = "1.2.0" dependencies = [ "base64 0.22.1", "parking_lot", @@ -4820,7 +4820,7 @@ dependencies = [ [[package]] name = "ryotunes-spotify" -version = "1.1.9" +version = "1.2.0" dependencies = [ "anyhow", "bytes", @@ -4844,7 +4844,7 @@ dependencies = [ [[package]] name = "ryotunesd" -version = "1.1.9" +version = "1.2.0" dependencies = [ "aes", "anyhow", @@ -5615,7 +5615,7 @@ dependencies = [ [[package]] name = "sync-server" -version = "1.1.9" +version = "1.2.0" dependencies = [ "futures-util", "listen-protocol", diff --git a/Cargo.toml b/Cargo.toml index 8d0423b..af67a10 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ members = [ ] [workspace.package] -version = "1.1.9" +version = "1.2.0" edition = "2021" license = "GPL-3.0-or-later" diff --git a/client/version b/client/version index 512a1fa..26aaba0 100644 --- a/client/version +++ b/client/version @@ -1 +1 @@ -1.1.9 +1.2.0 diff --git a/packaging/arch/PKGBUILD b/packaging/arch/PKGBUILD index 8416f82..4f178c4 100644 --- a/packaging/arch/PKGBUILD +++ b/packaging/arch/PKGBUILD @@ -2,7 +2,7 @@ # Run from packaging/arch with: makepkg -si pkgname=ryotunes -pkgver=1.1.9 +pkgver=1.2.0 pkgrel=1 # epoch=1 is permanent: the v1 reset publishes 1:X.Y.Z, which pacman ranks above # the legacy 2.x line an existing machine may carry, so `pacman -U` still upgrades. diff --git a/packaging/linux/dev.ryoku.ryotunes.metainfo.xml b/packaging/linux/dev.ryoku.ryotunes.metainfo.xml index f121beb..875b838 100644 --- a/packaging/linux/dev.ryoku.ryotunes.metainfo.xml +++ b/packaging/linux/dev.ryoku.ryotunes.metainfo.xml @@ -12,5 +12,5 @@ ryotunes.desktop ryotunes AudioVideoAudio - + diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index f66f76b..eb6da32 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "https://schema.tauri.app/config/2", "productName": "Ryotunes", - "version": "1.1.9", + "version": "1.2.0", "identifier": "dev.ryoku.ryotunes", "build": { "frontendDist": "../ui/build", diff --git a/ui/package.json b/ui/package.json index 99d115b..a3ff4e9 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,7 +1,7 @@ { "name": "ui", "private": true, - "version": "1.1.9", + "version": "1.2.0", "type": "module", "scripts": { "dev": "vite dev",
### Quiet in the background -During background playback, the expensive visible WebKit surface can be **destroyed / hibernated** while the native playback session continues. +The QML window can close while the daemon continues playback or active downloads.