Merge pull request 'fix(node-player): use expires_in instead of expires_at on AccessToken type' (#9 ) from feature/JWT-OIDC-SSO into DEV

Reviewed-on: #9
Merge pull request 'feature/JWT-OIDC-SSO' (#8 ) from feature/JWT-OIDC-SSO into DEV
2026-04-08 14:11:17 +00:00 · 2026-04-08 13:53:36 +00:00 · 2026-04-07 22:52:23 +01:00 · 2026-04-07 22:34:39 +01:00 · 2026-04-07 19:52:03 +01:00 · 2026-04-07 19:32:17 +01:00
4 changed files with 91 additions and 2 deletions
@@ -2,6 +2,12 @@
 # It is not intended for manual editing.
 version = 4

+[[package]]
+name = "adler2"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
+
 [[package]]
 name = "aho-corasick"
 version = "1.1.4"
@@ -572,6 +578,15 @@ version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"

+[[package]]
+name = "crc32fast"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511"
+dependencies = [
+ "cfg-if",
+]
+
 [[package]]
 name = "crossbeam-channel"
 version = "0.5.15"
@@ -969,6 +984,16 @@ version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99"

+[[package]]
+name = "flate2"
+version = "1.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c"
+dependencies = [
+ "crc32fast",
+ "miniz_oxide",
+]
+
 [[package]]
 name = "flume"
 version = "0.11.1"
@@ -1017,6 +1042,7 @@ dependencies = [
 "chrono",
 "clap",
 "encoding_rs",
+ "id3",
 "reqwest 0.12.28",
 "serde",
 "serde_json",
@@ -1750,6 +1776,17 @@ version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954"

+[[package]]
+name = "id3"
+version = "1.16.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "965c5e6a62a241f2f673df956ea5f52c27780bc1031855890a551ed9b869e2d1"
+dependencies = [
+ "bitflags 2.11.0",
+ "byteorder",
+ "flate2",
+]
+
 [[package]]
 name = "ident_case"
 version = "1.0.1"
@@ -2038,6 +2075,16 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"

+[[package]]
+name = "miniz_oxide"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
+dependencies = [
+ "adler2",
+ "simd-adler32",
+]
+
 [[package]]
 name = "mio"
 version = "1.1.1"
@@ -3429,6 +3476,12 @@ dependencies = [
 "rand_core 0.6.4",
 ]

+[[package]]
+name = "simd-adler32"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214"
+
 [[package]]
 name = "simple_asn1"
 version = "0.6.4"
@@ -14,6 +14,7 @@ serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 sqlx = { version = "0.8", features = ["runtime-tokio-rustls", "postgres", "chrono", "uuid", "migrate"] }
 symphonia = { version = "0.5", default-features = false, features = ["mp3", "aac", "flac", "vorbis", "wav", "alac", "adpcm", "pcm", "mpa", "isomp4", "ogg", "aiff", "mkv"] }
+id3 = "1"
 thiserror = "2.0"
 tokio = { version = "1.50", features = ["full"] }
 tracing = "0.1"
@@ -19,9 +19,25 @@ pub struct RawMetadata {
    pub duration_secs: Option<f64>,
 }

-/// Extract metadata from an audio file using Symphonia.
+/// Extract metadata from an audio file.
+/// For MP3, falls back to the `id3` crate when Symphonia cannot probe the file
+/// (e.g., ID3 tag with large embedded cover art exceeds Symphonia's 1 MB probe limit).
 /// Must be called from a blocking context (spawn_blocking).
 pub fn extract(path: &Path) -> anyhow::Result<RawMetadata> {
+    match extract_via_symphonia(path) {
+        Ok(meta) => return Ok(meta),
+        Err(e) => {
+            let is_mp3 = path.extension().and_then(|e| e.to_str()).map(|e| e.eq_ignore_ascii_case("mp3")).unwrap_or(false);
+            if is_mp3 {
+                tracing::debug!(error = %e, "Symphonia failed on MP3, falling back to id3 crate");
+                return extract_mp3_via_id3(path);
+            }
+            return Err(e);
+        }
+    }
+}
+
+fn extract_via_symphonia(path: &Path) -> anyhow::Result<RawMetadata> {
    let file = std::fs::File::open(path)?;
    let mss = MediaSourceStream::new(Box::new(file), Default::default());

@@ -66,6 +82,25 @@ pub fn extract(path: &Path) -> anyhow::Result<RawMetadata> {
    Ok(meta)
 }

+/// Read MP3 tags via the `id3` crate. Duration is not available this way.
+fn extract_mp3_via_id3(path: &Path) -> anyhow::Result<RawMetadata> {
+    use id3::TagLike;
+
+    let tag = id3::Tag::read_from_path(path)
+        .map_err(|e| anyhow::anyhow!("id3 read failed: {}", e))?;
+
+    let mut meta = RawMetadata::default();
+    meta.title = tag.title().map(|s| fix_encoding(s.to_owned()));
+    meta.artist = tag.artist().map(|s| fix_encoding(s.to_owned()));
+    meta.album = tag.album().map(|s| fix_encoding(s.to_owned()));
+    meta.year = tag.year().and_then(|y| u32::try_from(y).ok());
+    meta.track_number = tag.track();
+    meta.genre = tag.genre().map(|s: &str| fix_encoding(s.to_owned()));
+    // duration_secs remains None — acceptable for large-cover files
+
+    Ok(meta)
+}
+
 fn extract_tags(tags: &[symphonia::core::meta::Tag], meta: &mut RawMetadata) {
    for tag in tags {
        let value = fix_encoding(tag.value.to_string());
@@ -124,7 +124,7 @@ app.get('/auth/logout', (req, res) => {
 // Production: serve Vite-built client as static files
 const clientDist = path.resolve(import.meta.dirname, '../../client/dist');
 app.use(express.static(clientDist));
-app.get('/{*path}', (_req, res) => {
+app.get('*', (_req, res) => {
  res.sendFile(path.join(clientDist, 'index.html'));
 });
Author	SHA1	Message	Date
ab	5a5c9967e1	Merge pull request 'fix(node-player): use expires_in instead of expires_at on AccessToken type' (#9 ) from feature/JWT-OIDC-SSO into DEV Publish Metadata Agent Image (dev) / build-and-push-image (push) Successful in 3m38s Details Publish Node Player Image (dev) / build-and-push-image (push) Successful in 36s Details Publish Web Player Image (dev) / build-and-push-image (push) Successful in 1m50s Details Reviewed-on: #9	2026-04-08 14:11:17 +00:00
ab	e920059125	Merge pull request 'feature/JWT-OIDC-SSO' (#8 ) from feature/JWT-OIDC-SSO into DEV Publish Web Player Image (dev) / build-and-push-image (push) Has been cancelled Details Publish Node Player Image (dev) / build-and-push-image (push) Has been cancelled Details Publish Metadata Agent Image (dev) / build-and-push-image (push) Has been cancelled Details Reviewed-on: #8	2026-04-08 13:53:36 +00:00
ab	48c473de56	fix(agent): increase max_tokens for merge requests to avoid truncated responses Publish Metadata Agent Image (dev) / build-and-push-image (push) Successful in 3m43s Details Publish Web Player Image (dev) / build-and-push-image (push) Successful in 4m20s Details normalize: 512 tokens (sufficient for single track metadata) merge: 4096 tokens (needed for artists with many albums) Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>	2026-04-07 22:52:23 +01:00
ab	1e75644abb	feat(agent): switch LLM client from Ollama to OpenAI-compatible API (LM Studio support) Publish Metadata Agent Image (dev) / build-and-push-image (push) Successful in 4m7s Details Publish Web Player Image (dev) / build-and-push-image (push) Successful in 3m57s Details - Replace /api/chat with /v1/chat/completions endpoint - Use json_schema response_format (LM Studio does not support json_object) - Make schema parameter optional in call_ollama to support different schemas per use case - Add dedicated normalize schema (normalized_metadata) with release_kind field instead of release_type to avoid model repetition loops - Add dedicated merge schema (artist_merge) so model no longer confuses normalize and merge response structures - Add retry with frequency_penalty=1.5 on parse failure to suppress repetition - Add id3 crate as fallback metadata reader for MP3 files with large embedded cover art that exceed Symphonia probe limit of 1MB Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>	2026-04-07 22:34:39 +01:00
ab	2d7ac3d8ce	Fixed openai api endpoint Publish Metadata Agent Image (dev) / build-and-push-image (push) Successful in 4m0s Details Publish Web Player Image (dev) / build-and-push-image (push) Successful in 4m23s Details	2026-04-07 19:52:03 +01:00
ab	70a947a8c1	Fixed openai api endpoint Publish Metadata Agent Image (dev) / build-and-push-image (push) Successful in 3m38s Details Publish Web Player Image (dev) / build-and-push-image (push) Successful in 3m49s Details	2026-04-07 19:32:17 +01:00
XakPlant	aea4aef4b2	Merge pull request 'feature/node-app' (#7 ) from feature/node-app into DEV Publish Metadata Agent Image (dev) / build-and-push-image (push) Successful in 1m8s Details Publish Web Player Image (dev) / build-and-push-image (push) Successful in 1m7s Details Reviewed-on: #7	2026-03-23 14:00:08 +00:00