patch of feat: Enhance MusicBrainz integration and improve data handling · round #1 · pull #10 · rocksky.app/rocksky

+57 -4

Cargo.lock

···

       3184
       3184
        
        "windows-sys 0.59.0",

     

       3185
       3185
        
       ]

     

       3186
       3186
        
       

     

       3187
       3187
       +
       [[package]]

     

       3188
       3188
       +
       name = "nanoid"

     

       3189
       3189
       +
       version = "0.4.0"

     

       3190
       3190
       +
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       3191
       3191
       +
       checksum = "3ffa00dec017b5b1a8b7cf5e2c008bfda1aa7e0697ac1508b491fdf2622fb4d8"

     

       3192
       3192
       +
       dependencies = [

     

       3193
       3193
       +
        "rand 0.8.5",

     

       3194
       3194
       +
       ]

     

       3195
       3195
       +
       

     

       3187
       3196
        
       [[package]]

     

       3188
       3197
        
       name = "nkeys"

     

       3189
       3198
        
       version = "0.4.4"

     
···

       4697
       4706
        
       

     

       4698
       4707
        
       [[package]]

     

       4699
       4708
        
       name = "regex"

     

       4700
       4700
       -
       version = "1.11.1"

     

       4709
       4709
       +
       version = "1.11.3"

     

       4701
       4710
        
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       4702
       4702
       -
       checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"

     

       4711
       4711
       +
       checksum = "8b5288124840bee7b386bc413c487869b360b2b4ec421ea56425128692f2a82c"

     

       4703
       4712
        
       dependencies = [

     

       4704
       4713
        
        "aho-corasick",

     

       4705
       4714
        
        "memchr",

     
···

       4709
       4718
        
       

     

       4710
       4719
        
       [[package]]

     

       4711
       4720
        
       name = "regex-automata"

     

       4712
       4712
       -
       version = "0.4.9"

     

       4721
       4721
       +
       version = "0.4.11"

     

       4713
       4722
        
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       4714
       4714
       -
       checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"

     

       4723
       4723
       +
       checksum = "833eb9ce86d40ef33cb1306d8accf7bc8ec2bfea4355cbdebb3df68b40925cad"

     

       4715
       4724
        
       dependencies = [

     

       4716
       4725
        
        "aho-corasick",

     

       4717
       4726
        
        "memchr",

     
···

       4999
       5008
        
        "hex",

     

       5000
       5009
        
        "jsonwebtoken",

     

       5001
       5010
        
        "md5",

     

       5011
       5011
       +
        "nanoid",

     

       5002
       5012
        
        "owo-colors",

     

       5003
       5013
        
        "quick-xml 0.37.5",

     

       5004
       5014
        
        "rand 0.9.2",

     
···

       5006
       5016
        
        "reqwest",

     

       5007
       5017
        
        "serde",

     

       5008
       5018
        
        "serde_json",

     

       5019
       5019
       +
        "serial_test",

     

       5009
       5020
        
        "sqlx",

     

       5010
       5021
        
        "tokio",

     

       5011
       5022
        
        "tokio-stream",

     
···

       5089
       5100
        
        "hex",

     

       5090
       5101
        
        "jsonwebtoken",

     

       5091
       5102
        
        "md5",

     

       5103
       5103
       +
        "nanoid",

     

       5092
       5104
        
        "owo-colors",

     

       5093
       5105
        
        "rand 0.9.2",

     

       5094
       5106
        
        "redis 0.29.5",

     

       5095
       5107
        
        "reqwest",

     

       5096
       5108
        
        "serde",

     

       5097
       5109
        
        "serde_json",

     

       5110
       5110
       +
        "serial_test",

     

       5098
       5111
        
        "sqlx",

     

       5099
       5112
        
        "tokio",

     

       5100
       5113
        
        "tokio-stream",

     
···

       5438
       5451
        
        "winapi-util",

     

       5439
       5452
        
       ]

     

       5440
       5453
        
       

     

       5454
       5454
       +
       [[package]]

     

       5455
       5455
       +
       name = "scc"

     

       5456
       5456
       +
       version = "2.4.0"

     

       5457
       5457
       +
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       5458
       5458
       +
       checksum = "46e6f046b7fef48e2660c57ed794263155d713de679057f2d0c169bfc6e756cc"

     

       5459
       5459
       +
       dependencies = [

     

       5460
       5460
       +
        "sdd",

     

       5461
       5461
       +
       ]

     

       5462
       5462
       +
       

     

       5441
       5463
        
       [[package]]

     

       5442
       5464
        
       name = "schannel"

     

       5443
       5465
        
       version = "0.1.27"

     
···

       5463
       5485
        
        "untrusted",

     

       5464
       5486
        
       ]

     

       5465
       5487
        
       

     

       5488
       5488
       +
       [[package]]

     

       5489
       5489
       +
       name = "sdd"

     

       5490
       5490
       +
       version = "3.0.10"

     

       5491
       5491
       +
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       5492
       5492
       +
       checksum = "490dcfcbfef26be6800d11870ff2df8774fa6e86d047e3e8c8a76b25655e41ca"

     

       5493
       5493
       +
       

     

       5466
       5494
        
       [[package]]

     

       5467
       5495
        
       name = "seahash"

     

       5468
       5496
        
       version = "4.1.0"

     
···

       5612
       5640
        
        "serde",

     

       5613
       5641
        
       ]

     

       5614
       5642
        
       

     

       5643
       5643
       +
       [[package]]

     

       5644
       5644
       +
       name = "serial_test"

     

       5645
       5645
       +
       version = "3.2.0"

     

       5646
       5646
       +
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       5647
       5647
       +
       checksum = "1b258109f244e1d6891bf1053a55d63a5cd4f8f4c30cf9a1280989f80e7a1fa9"

     

       5648
       5648
       +
       dependencies = [

     

       5649
       5649
       +
        "futures",

     

       5650
       5650
       +
        "log",

     

       5651
       5651
       +
        "once_cell",

     

       5652
       5652
       +
        "parking_lot",

     

       5653
       5653
       +
        "scc",

     

       5654
       5654
       +
        "serial_test_derive",

     

       5655
       5655
       +
       ]

     

       5656
       5656
       +
       

     

       5657
       5657
       +
       [[package]]

     

       5658
       5658
       +
       name = "serial_test_derive"

     

       5659
       5659
       +
       version = "3.2.0"

     

       5660
       5660
       +
       source = "registry+https://github.com/rust-lang/crates.io-index"

     

       5661
       5661
       +
       checksum = "5d69265a08751de7844521fd15003ae0a888e035773ba05695c5c759a6f89eef"

     

       5662
       5662
       +
       dependencies = [

     

       5663
       5663
       +
        "proc-macro2",

     

       5664
       5664
       +
        "quote",

     

       5665
       5665
       +
        "syn 2.0.101",

     

       5666
       5666
       +
       ]

     

       5667
       5667
       +
       

     

       5615
       5668
        
       [[package]]

     

       5616
       5669
        
       name = "sha1"

     

       5617
       5670
        
       version = "0.10.6"

+5 -1

crates/scrobbler/Cargo.toml

···

       22
       22
        
       dotenv = "0.15.0"

     

       23
       23
        
       anyhow = "1.0.96"

     

       24
       24
        
       actix-web = "4.9.0"

     

       25
       25
       -
       redis = "0.29.0"

     

       25
       25
       +
       redis = { version = "0.29.0", features = ["tokio-comp"] }

     

       26
       26
        
       hex = "0.4.3"

     

       27
       27
        
       jsonwebtoken = "9.3.1"

     

       28
       28
        
       md5 = "0.7.0"

     
···

       41
       41
        
       actix-session = "0.10.1"

     

       42
       42
        
       tokio-stream = { version = "0.1.17", features = ["full"] }

     

       43
       43
        
       tracing = "0.1.41"

     

       44
       44
       +
       nanoid = "0.4.0"

     

       45
       45
       +
       

     

       46
       46
       +
       [dev-dependencies]

     

       47
       47
       +
       serial_test = "3.0.0"

+15 -5

crates/scrobbler/src/handlers/mod.rs

···

       9
       9
        
       use v1::submission::submission;

     

       10
       10
        
       

     

       11
       11
        
       use crate::cache::Cache;

     

       12
       12
       +
       use crate::musicbrainz::client::MusicbrainzClient;

     

       12
       13
        
       use crate::BANNER;

     

       13
       14
        
       

     

       14
       15
        
       pub mod scrobble;

     
···

       43
       44
        
       pub async fn handle_submission(

     

       44
       45
        
           data: web::Data<Arc<Pool<Postgres>>>,

     

       45
       46
        
           cache: web::Data<Cache>,

     

       47
       47
       +
           mb_client: web::Data<Arc<MusicbrainzClient>>,

     

       46
       48
        
           form: web::Form<BTreeMap<String, String>>,

     

       47
       49
        
       ) -> impl Responder {

     

       48
       48
       -
           submission(form.into_inner(), cache.get_ref(), data.get_ref())

     

       49
       49
       -
               .await

     

       50
       50
       -
               .map_err(actix_web::error::ErrorInternalServerError)

     

       50
       50
       +
           submission(

     

       51
       51
       +
               form.into_inner(),

     

       52
       52
       +
               cache.get_ref(),

     

       53
       53
       +
               data.get_ref(),

     

       54
       54
       +
               mb_client.get_ref(),

     

       55
       55
       +
           )

     

       56
       56
       +
           .await

     

       57
       57
       +
           .map_err(actix_web::error::ErrorInternalServerError)

     

       51
       58
        
       }

     

       52
       59
        
       

     

       53
       60
        
       #[get("/2.0")]

     
···

       60
       67
        
           data: web::Data<Arc<Pool<Postgres>>>,

     

       61
       68
        
           cache: web::Data<Cache>,

     

       62
       69
        
           form: web::Form<BTreeMap<String, String>>,

     

       70
       70
       +
           mb_client: web::Data<Arc<MusicbrainzClient>>,

     

       63
       71
        
       ) -> impl Responder {

     

       64
       72
        
           let conn = data.get_ref();

     

       65
       73
        
           let cache = cache.get_ref();

     

       74
       74
       +
           let mb_client = mb_client.get_ref();

     

       66
       75
        
       

     

       67
       76
        
           let method = form.get("method").unwrap_or(&"".to_string()).to_string();

     

       68
       68
       -
           call_method(&method, conn, cache, form.into_inner())

     

       77
       77
       +
           call_method(&method, conn, cache, mb_client, form.into_inner())

     

       69
       78
        
               .await

     

       70
       79
        
               .map_err(actix_web::error::ErrorInternalServerError)

     

       71
       80
        
       }

     
···

       74
       83
        
           method: &str,

     

       75
       84
        
           pool: &Arc<Pool<Postgres>>,

     

       76
       85
        
           cache: &Cache,

     

       86
       86
       +
           mb_client: &Arc<MusicbrainzClient>,

     

       77
       87
        
           form: BTreeMap<String, String>,

     

       78
       88
        
       ) -> Result<HttpResponse, Error> {

     

       79
       89
        
           match method {

     

       80
       80
       -
               "track.scrobble" => handle_scrobble(form, pool, cache).await,

     

       90
       90
       +
               "track.scrobble" => handle_scrobble(form, pool, cache, mb_client).await,

     

       81
       91
        
               _ => Err(Error::msg(format!("Unsupported method: {}", method))),

     

       82
       92
        
           }

     

       83
       93
        
       }

+4 -3

crates/scrobbler/src/handlers/scrobble.rs

···

       5
       5
        
       use std::collections::BTreeMap;

     

       6
       6
        
       

     

       7
       7
        
       use crate::{

     

       8
       8
       -
           auth::authenticate, cache::Cache, params::validate_scrobble_params, response::build_response,

     

       9
       9
       -
           scrobbler::scrobble,

     

       8
       8
       +
           auth::authenticate, cache::Cache, musicbrainz::client::MusicbrainzClient,

     

       9
       9
       +
           params::validate_scrobble_params, response::build_response, scrobbler::scrobble,

     

       10
       10
        
       };

     

       11
       11
        
       

     

       12
       12
        
       pub async fn handle_scrobble(

     

       13
       13
        
           form: BTreeMap<String, String>,

     

       14
       14
        
           conn: &Pool<sqlx::Postgres>,

     

       15
       15
        
           cache: &Cache,

     

       16
       16
       +
           mb_client: &MusicbrainzClient,

     

       16
       17
        
       ) -> Result<HttpResponse, Error> {

     

       17
       18
        
           let params = match validate_scrobble_params(&form, &["api_key", "api_sig", "sk", "method"]) {

     

       18
       19
        
               Ok(params) => params,

     
···

       31
       32
        
               })));

     

       32
       33
        
           }

     

       33
       34
        
       

     

       34
       34
       -
           match scrobble(&conn, cache, &form).await {

     

       35
       35
       +
           match scrobble(&conn, cache, mb_client, &form).await {

     

       35
       36
        
               Ok(scrobbles) => Ok(HttpResponse::Ok().json(build_response(scrobbles))),

     

       36
       37
        
               Err(e) => {

     

       37
       38
        
                   if e.to_string().contains("Timestamp") {

+4 -2

crates/scrobbler/src/handlers/v1/submission.rs

···

       4
       4
        
       use std::{collections::BTreeMap, sync::Arc};

     

       5
       5
        
       

     

       6
       6
        
       use crate::{

     

       7
       7
       -
           auth::verify_session_id, cache::Cache, params::validate_required_params, scrobbler::scrobble_v1,

     

       7
       7
       +
           auth::verify_session_id, cache::Cache, musicbrainz::client::MusicbrainzClient,

     

       8
       8
       +
           params::validate_required_params, scrobbler::scrobble_v1,

     

       8
       9
        
       };

     

       9
       10
        
       

     

       10
       11
        
       pub async fn submission(

     

       11
       12
        
           form: BTreeMap<String, String>,

     

       12
       13
        
           cache: &Cache,

     

       13
       14
        
           pool: &Arc<sqlx::Pool<sqlx::Postgres>>,

     

       15
       15
       +
           mb_client: &Arc<MusicbrainzClient>,

     

       14
       16
        
       ) -> Result<HttpResponse, Error> {

     

       15
       17
        
           match validate_required_params(&form, &["s", "a[0]", "t[0]", "i[0]"]) {

     

       16
       18
        
               Ok(_) => {

     
···

       30
       32
        
                   let user_id = user_id.unwrap();

     

       31
       33
        
                   tracing::info!(artist = %a, track = %t, timestamp = %i, user_id = %user_id, "Submission");

     

       32
       34
        
       

     

       33
       33
       -
                   match scrobble_v1(pool, cache, &form).await {

     

       35
       35
       +
                   match scrobble_v1(pool, cache, mb_client, &form).await {

     

       34
       36
        
                       Ok(_) => Ok(HttpResponse::Ok().body("OK\n")),

     

       35
       37
        
                       Err(e) => Ok(HttpResponse::BadRequest().json(json!({

     

       36
       38
        
                           "error": 4,

+5 -1

crates/scrobbler/src/lib.rs

···

       27
       27
        
       use owo_colors::OwoColorize;

     

       28
       28
        
       use sqlx::postgres::PgPoolOptions;

     

       29
       29
        
       

     

       30
       30
       -
       use crate::cache::Cache;

     

       30
       30
       +
       use crate::{cache::Cache, musicbrainz::client::MusicbrainzClient};

     

       31
       31
        
       

     

       32
       32
        
       pub const BANNER: &str = r#"

     

       33
       33
        
           ___             ___          _____                 __    __    __

     
···

       71
       71
        
                   .unwrap(),

     

       72
       72
        
           );

     

       73
       73
        
       

     

       74
       74
       +
           let mb_client = MusicbrainzClient::new().await?;

     

       75
       75
       +
           let mb_client = Arc::new(mb_client);

     

       76
       76
       +
       

     

       74
       77
        
           HttpServer::new(move || {

     

       75
       78
        
               App::new()

     

       76
       79
        
                   .wrap(RateLimiter::default())

     

       77
       80
        
                   .app_data(limiter.clone())

     

       78
       81
        
                   .app_data(Data::new(conn.clone()))

     

       79
       82
        
                   .app_data(Data::new(cache.clone()))

     

       83
       83
       +
                   .app_data(Data::new(mb_client.clone()))

     

       80
       84
        
                   .service(handlers::handle_methods)

     

       81
       85
        
                   .service(handlers::handle_nowplaying)

     

       82
       86
        
                   .service(handlers::handle_submission)

+3 -1

crates/scrobbler/src/listenbrainz/core/submit.rs

···

       5
       5
        
       use std::sync::Arc;

     

       6
       6
        
       

     

       7
       7
        
       use crate::auth::decode_token;

     

       8
       8
       +
       use crate::musicbrainz::client::MusicbrainzClient;

     

       8
       9
        
       use crate::repo;

     

       9
       10
        
       use crate::{cache::Cache, scrobbler::scrobble_listenbrainz};

     

       10
       11
        
       

     
···

       14
       15
        
           payload: SubmitListensRequest,

     

       15
       16
        
           cache: &Cache,

     

       16
       17
        
           pool: &Arc<sqlx::Pool<sqlx::Postgres>>,

     

       18
       18
       +
           mb_client: &Arc<MusicbrainzClient>,

     

       17
       19
        
           token: &str,

     

       18
       20
        
       ) -> Result<HttpResponse, Error> {

     

       19
       21
        
           if payload.listen_type != "playing_now" {

     
···

       29
       31
        
       

     

       30
       32
        
           const RETRIES: usize = 15;

     

       31
       33
        
           for attempt in 1..=RETRIES {

     

       32
       32
       -
               match scrobble_listenbrainz(pool, cache, &payload, token).await {

     

       34
       34
       +
               match scrobble_listenbrainz(pool, cache, mb_client, &payload, token).await {

     

       33
       35
        
                   Ok(_) => {

     

       34
       36
        
                       return Ok(HttpResponse::Ok().json(json!({

     

       35
       37
        
                         "status": "ok",

+4 -1

crates/scrobbler/src/listenbrainz/handlers.rs

···

       16
       16
        
               },

     

       17
       17
        
               types::SubmitListensRequest,

     

       18
       18
        
           },

     

       19
       19
       +
           musicbrainz::client::MusicbrainzClient,

     

       19
       20
        
           read_payload, repo,

     

       20
       21
        
       };

     

       21
       22
        
       use tokio_stream::StreamExt;

     
···

       39
       40
        
           req: HttpRequest,

     

       40
       41
        
           data: web::Data<Arc<Pool<Postgres>>>,

     

       41
       42
        
           cache: web::Data<Cache>,

     

       43
       43
       +
           mb_client: web::Data<Arc<MusicbrainzClient>>,

     

       42
       44
        
           mut payload: web::Payload,

     

       43
       45
        
       ) -> impl Responder {

     

       44
       46
        
           let token = match req.headers().get("Authorization") {

     
···

       63
       65
        
               })

     

       64
       66
        
               .map_err(actix_web::error::ErrorBadRequest)?;

     

       65
       67
        
       

     

       66
       66
       -
           submit_listens(req, cache.get_ref(), data.get_ref(), token)

     

       68
       68
       +
           let mb_client = mb_client.get_ref();

     

       69
       69
       +
           submit_listens(req, cache.get_ref(), data.get_ref(), &mb_client, token)

     

       67
       70
        
               .await

     

       68
       71
        
               .map_err(actix_web::error::ErrorInternalServerError)

     

       69
       72
        
       }

+2 -2

crates/scrobbler/src/musicbrainz/artist.rs

···

       1
       1
        
       use serde::{Deserialize, Serialize};

     

       2
       2
        
       

     

       3
       3
       -
       #[derive(Debug, Deserialize, Clone)]

     

       3
       3
       +
       #[derive(Debug, Deserialize, Clone, Default)]

     

       4
       4
        
       pub struct Artist {

     

       5
       5
        
           pub name: String,

     

       6
       6
        
           #[serde(rename = "sort-name")]

     
···

       29
       29
        
           pub aliases: Option<Vec<Alias>>,

     

       30
       30
        
       }

     

       31
       31
        
       

     

       32
       32
       -
       #[derive(Debug, Deserialize, Clone)]

     

       32
       32
       +
       #[derive(Debug, Deserialize, Clone, Default)]

     

       33
       33
        
       pub struct ArtistCredit {

     

       34
       34
        
           pub joinphrase: Option<String>,

     

       35
       35
        
           pub name: String,

+310 -24

crates/scrobbler/src/musicbrainz/client.rs

···

       1
       1
       +
       use std::env;

     

       2
       2
       +
       

     

       1
       3
        
       use super::recording::{Recording, Recordings};

     

       2
       2
       -
       use anyhow::Error;

     

       4
       4
       +
       use anyhow::{anyhow, Context, Error};

     

       5
       5
       +
       use redis::aio::MultiplexedConnection;

     

       6
       6
       +
       use redis::AsyncCommands;

     

       7
       7
       +
       use serde::{Deserialize, Serialize};

     

       8
       8
       +
       use tokio::time::{timeout, Duration, Instant};

     

       3
       9
        
       

     

       4
       10
        
       pub const BASE_URL: &str = "https://musicbrainz.org/ws/2";

     

       5
       5
       -
       pub const USER_AGENT: &str = "Rocksky/0.1.0";

     

       11
       11
       +
       pub const USER_AGENT: &str = "Rocksky/0.1.0 (+https://rocksky.app)";

     

       12
       12
       +
       

     

       13
       13
       +
       const Q_QUEUE: &str = "mb:queue:v1";

     

       14
       14
       +
       const CACHE_SEARCH_PREFIX: &str = "mb:cache:search:";

     

       15
       15
       +
       const CACHE_REC_PREFIX: &str = "mb:cache:rec:";

     

       16
       16
       +
       const INFLIGHT_PREFIX: &str = "mb:inflight:";

     

       17
       17
       +
       const RESP_PREFIX: &str = "mb:resp:";

     

       6
       18
        
       

     

       7
       7
       -
       pub struct MusicbrainzClient {}

     

       19
       19
       +
       const CACHE_TTL_SECS: u64 = 60 * 60 * 24;

     

       20
       20
       +
       const WAIT_TIMEOUT_SECS: u64 = 20;

     

       21
       21
       +
       const INFLIGHT_TTL_SECS: i64 = 30; // de-dup window while the worker is fetching

     

       22
       22
       +
       

     

       23
       23
       +
       #[derive(Clone)]

     

       24
       24
       +
       pub struct MusicbrainzClient {

     

       25
       25
       +
           http: reqwest::Client,

     

       26
       26
       +
           redis: MultiplexedConnection,

     

       27
       27
       +
           cache_ttl: u64,

     

       28
       28
       +
       }

     

       29
       29
       +
       

     

       30
       30
       +
       #[derive(Debug, Serialize, Deserialize)]

     

       31
       31
       +
       #[serde(tag = "kind", rename_all = "snake_case")]

     

       32
       32
       +
       enum Job {

     

       33
       33
       +
           Search { id: String, query: String },

     

       34
       34
       +
           GetRecording { id: String, mbid: String },

     

       35
       35
       +
       }

     

       8
       36
        
       

     

       9
       37
        
       impl MusicbrainzClient {

     

       10
       10
       -
           pub fn new() -> Self {

     

       11
       11
       -
               MusicbrainzClient {}

     

       38
       38
       +
           pub async fn new() -> Result<Self, Error> {

     

       39
       39
       +
               let client =

     

       40
       40
       +
                   redis::Client::open(env::var("REDIS_URL").unwrap_or("redis://127.0.0.1".into()))?;

     

       41
       41
       +
               let redis = client.get_multiplexed_tokio_connection().await?;

     

       42
       42
       +
               let http = reqwest::Client::builder()

     

       43
       43
       +
                   .user_agent(USER_AGENT)

     

       44
       44
       +
                   .build()

     

       45
       45
       +
                   .context("build http client")?;

     

       46
       46
       +
               let me = MusicbrainzClient {

     

       47
       47
       +
                   http,

     

       48
       48
       +
                   redis,

     

       49
       49
       +
                   cache_ttl: CACHE_TTL_SECS,

     

       50
       50
       +
               };

     

       51
       51
       +
       

     

       52
       52
       +
               let mut worker_conn = client.get_multiplexed_async_connection().await?;

     

       53
       53
       +
       

     

       54
       54
       +
               let http = me.http.clone();

     

       55
       55
       +
               tokio::spawn(async move { worker_loop(http, &mut worker_conn).await });

     

       56
       56
       +
       

     

       57
       57
       +
               Ok(me)

     

       12
       58
        
           }

     

       13
       59
        
       

     

       14
       60
        
           pub async fn search(&self, query: &str) -> Result<Recordings, Error> {

     

       15
       15
       -
               let url = format!("{}/recording", BASE_URL);

     

       16
       16
       -
               let client = reqwest::Client::new();

     

       17
       17
       -
               let response = client

     

       18
       18
       -
                   .get(&url)

     

       19
       19
       -
                   .header("Accept", "application/json")

     

       20
       20
       -
                   .header("User-Agent", USER_AGENT)

     

       21
       21
       -
                   .query(&[("query", query), ("inc", "artist-credits+releases")])

     

       22
       22
       -
                   .send()

     

       61
       61
       +
               if let Some(h) = self.get_cache(&cache_key_search(query)).await? {

     

       62
       62
       +
                   return Ok(serde_json::from_str(&h).context("decode cached search")?);

     

       63
       63
       +
               }

     

       64
       64
       +
               let id = nanoid::nanoid!();

     

       65
       65
       +
               let job = Job::Search {

     

       66
       66
       +
                   id: id.clone(),

     

       67
       67
       +
                   query: query.to_string(),

     

       68
       68
       +
               };

     

       69
       69
       +
               self.enqueue_if_needed(&job, &infl_key_search(query))

     

       23
       70
        
                   .await?;

     

       24
       71
        
       

     

       25
       25
       -
               Ok(response.json().await?)

     

       72
       72
       +
               let raw = self.wait_for_response(&id).await?;

     

       73
       73
       +
               let parsed: Recordings = serde_json::from_str(&raw).context("decode search response")?;

     

       74
       74
       +
       

     

       75
       75
       +
               self.set_cache(&cache_key_search(query), &raw).await?;

     

       76
       76
       +
               Ok(parsed)

     

       26
       77
        
           }

     

       27
       78
        
       

     

       28
       79
        
           pub async fn get_recording(&self, mbid: &str) -> Result<Recording, Error> {

     

       29
       29
       -
               let url = format!("{}/recording/{}", BASE_URL, mbid);

     

       30
       30
       -
               let client = reqwest::Client::new();

     

       31
       31
       -
               let response = client

     

       32
       32
       -
                   .get(&url)

     

       33
       33
       -
                   .header("Accept", "application/json")

     

       34
       34
       -
                   .header("User-Agent", USER_AGENT)

     

       35
       35
       -
                   .query(&[("inc", "artist-credits+releases")])

     

       36
       36
       -
                   .send()

     

       37
       37
       -
                   .await?;

     

       80
       80
       +
               if let Some(h) = self.get_cache(&cache_key_rec(mbid)).await? {

     

       81
       81
       +
                   return Ok(serde_json::from_str(&h).context("decode cached recording")?);

     

       82
       82
       +
               }

     

       83
       83
       +
               let id = nanoid::nanoid!();

     

       84
       84
       +
               let job = Job::GetRecording {

     

       85
       85
       +
                   id: id.clone(),

     

       86
       86
       +
                   mbid: mbid.to_string(),

     

       87
       87
       +
               };

     

       88
       88
       +
               self.enqueue_if_needed(&job, &infl_key_rec(mbid)).await?;

     

       89
       89
       +
               let raw = self.wait_for_response(&id).await?;

     

       90
       90
       +
               let parsed: Recording = serde_json::from_str(&raw).context("decode recording response")?;

     

       91
       91
       +
               self.set_cache(&cache_key_rec(mbid), &raw).await?;

     

       92
       92
       +
               Ok(parsed)

     

       93
       93
       +
           }

     

       94
       94
       +
       

     

       95
       95
       +
           // ---------- Redis helpers ----------

     

       96
       96
       +
       

     

       97
       97
       +
           async fn get_cache(&self, key: &str) -> Result<Option<String>, Error> {

     

       98
       98
       +
               let mut r = self.redis.clone();

     

       99
       99
       +
               let val: Option<String> = r.get(key).await?;

     

       100
       100
       +
               Ok(val)

     

       101
       101
       +
           }

     

       102
       102
       +
       

     

       103
       103
       +
           async fn set_cache(&self, key: &str, json: &str) -> Result<(), Error> {

     

       104
       104
       +
               let mut r = self.redis.clone();

     

       105
       105
       +
               let _: () = r

     

       106
       106
       +
                   .set_ex(key, json, self.cache_ttl)

     

       107
       107
       +
                   .await

     

       108
       108
       +
                   .with_context(|| format!("cache set {key}"))?;

     

       109
       109
       +
               Ok(())

     

       110
       110
       +
           }

     

       111
       111
       +
       

     

       112
       112
       +
           async fn enqueue_if_needed(&self, job: &Job, inflight_key: &str) -> Result<(), Error> {

     

       113
       113
       +
               let mut r = self.redis.clone();

     

       114
       114
       +
       

     

       115
       115
       +
               // set NX to avoid duplicate work; short TTL

     

       116
       116
       +
               let set: bool = r.set_nx(inflight_key, "1").await.context("set in-flight")?;

     

       117
       117
       +
               if set {

     

       118
       118
       +
                   let _: () = r

     

       119
       119
       +
                       .expire(inflight_key, INFLIGHT_TTL_SECS)

     

       120
       120
       +
                       .await

     

       121
       121
       +
                       .context("expire inflight")?;

     

       122
       122
       +
                   let payload = serde_json::to_string(job).expect("serialize job");

     

       123
       123
       +
                   let _: () = r.rpush(Q_QUEUE, payload).await.context("enqueue job")?;

     

       124
       124
       +
               }

     

       125
       125
       +
               Ok(())

     

       126
       126
       +
           }

     

       127
       127
       +
       

     

       128
       128
       +
           async fn wait_for_response(&self, id: &str) -> Result<String, Error> {

     

       129
       129
       +
               let mut r = self.redis.clone();

     

       130
       130
       +
               let resp_q = resp_key(id);

     

       131
       131
       +
       

     

       132
       132
       +
               let fut = async {

     

       133
       133
       +
                   loop {

     

       134
       134
       +
                       let popped: Option<(String, String)> = r.brpop(&resp_q, 2.0).await?;

     

       135
       135
       +
                       if let Some((_key, json)) = popped {

     

       136
       136
       +
                           return Ok::<String, Error>(json);

     

       137
       137
       +
                       }

     

       138
       138
       +
                   }

     

       139
       139
       +
               };

     

       140
       140
       +
       

     

       141
       141
       +
               match timeout(Duration::from_secs(WAIT_TIMEOUT_SECS), fut).await {

     

       142
       142
       +
                   Ok(res) => res,

     

       143
       143
       +
                   Err(_) => Err(anyhow!("timed out waiting for MusicBrainz response")),

     

       144
       144
       +
               }

     

       145
       145
       +
           }

     

       146
       146
       +
       }

     

       147
       147
       +
       

     

       148
       148
       +
       async fn worker_loop(

     

       149
       149
       +
           http: reqwest::Client,

     

       150
       150
       +
           redis: &mut MultiplexedConnection,

     

       151
       151
       +
       ) -> Result<(), Error> {

     

       152
       152
       +
           // pacing ticker: strictly 1 request/second

     

       153
       153
       +
           let mut next_allowed = Instant::now();

     

       154
       154
       +
       

     

       155
       155
       +
           loop {

     

       156
       156
       +
               tokio::select! {

     

       157
       157
       +
                   res = async {

     

       158
       158
       +
       

     

       159
       159
       +
                       // finite timeout pop

     

       160
       160
       +
                       let v: Option<Vec<String>> = redis.blpop(Q_QUEUE, 2.0).await.ok();

     

       161
       161
       +
                       Ok::<_, Error>(v)

     

       162
       162
       +
                   } => {

     

       163
       163
       +
                       let Some(mut v) = res? else {

     

       164
       164
       +
                           continue };

     

       165
       165
       +
                       if v.len() != 2 {

     

       166
       166
       +
                           continue; }

     

       167
       167
       +
                       let payload = v.pop().unwrap();

     

       168
       168
       +
       

     

       169
       169
       +
                       // 1 rps pacing

     

       170
       170
       +
                       let now = Instant::now();

     

       171
       171
       +
                       if now < next_allowed { tokio::time::sleep(next_allowed - now).await; }

     

       172
       172
       +
                       next_allowed = Instant::now() + Duration::from_secs(1);

     

       173
       173
       +
       

     

       174
       174
       +
                       let payload: Job = match serde_json::from_str(&payload) {

     

       175
       175
       +
                           Ok(j) => j,

     

       176
       176
       +
                           Err(e) => {

     

       177
       177
       +
                               tracing::error!(%e, "invalid job payload");

     

       178
       178
       +
                               continue;

     

       179
       179
       +
                           }

     

       180
       180
       +
                       };

     

       181
       181
       +
                       if let Err(e) = process_job(&http, redis, payload).await {

     

       182
       182
       +
                           tracing::error!(%e, "job failed");

     

       183
       183
       +
                       }

     

       184
       184
       +
                   }

     

       185
       185
       +
               }

     

       186
       186
       +
           }

     

       187
       187
       +
       }

     

       188
       188
       +
       

     

       189
       189
       +
       async fn process_job(

     

       190
       190
       +
           http: &reqwest::Client,

     

       191
       191
       +
           redis: &mut MultiplexedConnection,

     

       192
       192
       +
           job: Job,

     

       193
       193
       +
       ) -> Result<(), Error> {

     

       194
       194
       +
           match job {

     

       195
       195
       +
               Job::Search { id, query } => {

     

       196
       196
       +
                   let url = format!("{}/recording", BASE_URL);

     

       197
       197
       +
                   let resp = http

     

       198
       198
       +
                       .get(&url)

     

       199
       199
       +
                       .header("Accept", "application/json")

     

       200
       200
       +
                       .query(&[

     

       201
       201
       +
                           ("query", query.as_str()),

     

       202
       202
       +
                           ("fmt", "json"),

     

       203
       203
       +
                           ("inc", "artists+releases+isrcs"),

     

       204
       204
       +
                       ])

     

       205
       205
       +
                       .send()

     

       206
       206
       +
                       .await

     

       207
       207
       +
                       .context("http search")?;

     

       208
       208
       +
       

     

       209
       209
       +
                   if !resp.status().is_success() {

     

       210
       210
       +
                       // Push an error payload so waiters don’t hang forever

     

       211
       211
       +
                       let _ = push_response(

     

       212
       212
       +
                           redis,

     

       213
       213
       +
                           &id,

     

       214
       214
       +
                           &format!(r#"{{"error":"http {}"}}"#, resp.status()),

     

       215
       215
       +
                       )

     

       216
       216
       +
                       .await;

     

       217
       217
       +
                       return Err(anyhow!("musicbrainz search http {}", resp.status()));

     

       218
       218
       +
                   }

     

       219
       219
       +
       

     

       220
       220
       +
                   let text = resp.text().await.context("read body")?;

     

       221
       221
       +
                   push_response(redis, &id, &text).await?;

     

       222
       222
       +
               }

     

       223
       223
       +
               Job::GetRecording { id, mbid } => {

     

       224
       224
       +
                   let url = format!("{}/recording/{}", BASE_URL, mbid);

     

       225
       225
       +
                   let resp = http

     

       226
       226
       +
                       .get(&url)

     

       227
       227
       +
                       .header("Accept", "application/json")

     

       228
       228
       +
                       .query(&[("fmt", "json"), ("inc", "artists+releases+isrcs")])

     

       229
       229
       +
                       .send()

     

       230
       230
       +
                       .await

     

       231
       231
       +
                       .context("http get_recording")?;

     

       232
       232
       +
       

     

       233
       233
       +
                   if !resp.status().is_success() {

     

       234
       234
       +
                       let _ = push_response(

     

       235
       235
       +
                           redis,

     

       236
       236
       +
                           &id,

     

       237
       237
       +
                           &format!(r#"{{"error":"http {}"}}"#, resp.status()),

     

       238
       238
       +
                       )

     

       239
       239
       +
                       .await;

     

       240
       240
       +
                       return Err(anyhow!("musicbrainz get_recording http {}", resp.status()));

     

       241
       241
       +
                   }

     

       242
       242
       +
       

     

       243
       243
       +
                   let text = resp.text().await.context("read body")?;

     

       244
       244
       +
                   push_response(redis, &id, &text).await?;

     

       245
       245
       +
               }

     

       246
       246
       +
           }

     

       247
       247
       +
           Ok(())

     

       248
       248
       +
       }

     

       249
       249
       +
       

     

       250
       250
       +
       async fn push_response(

     

       251
       251
       +
           redis: &mut MultiplexedConnection,

     

       252
       252
       +
           id: &str,

     

       253
       253
       +
           json: &str,

     

       254
       254
       +
       ) -> Result<(), Error> {

     

       255
       255
       +
           let q = resp_key(id);

     

       256
       256
       +
           // RPUSH then EXPIRE to avoid leaks if a client never BRPOPs

     

       257
       257
       +
           let _: () = redis.rpush(&q, json).await?;

     

       258
       258
       +
           let _: () = redis.expire(&q, WAIT_TIMEOUT_SECS as i64 + 5).await?;

     

       259
       259
       +
           Ok(())

     

       260
       260
       +
       }

     

       261
       261
       +
       

     

       262
       262
       +
       fn cache_key_search(query: &str) -> String {

     

       263
       263
       +
           format!("{}{}", CACHE_SEARCH_PREFIX, fast_hash(query))

     

       264
       264
       +
       }

     

       265
       265
       +
       fn cache_key_rec(mbid: &str) -> String {

     

       266
       266
       +
           format!("{}{}", CACHE_REC_PREFIX, mbid)

     

       267
       267
       +
       }

     

       268
       268
       +
       fn infl_key_search(query: &str) -> String {

     

       269
       269
       +
           format!("{}search:{}", INFLIGHT_PREFIX, fast_hash(query))

     

       270
       270
       +
       }

     

       271
       271
       +
       fn infl_key_rec(mbid: &str) -> String {

     

       272
       272
       +
           format!("{}rec:{}", INFLIGHT_PREFIX, mbid)

     

       273
       273
       +
       }

     

       274
       274
       +
       fn resp_key(id: &str) -> String {

     

       275
       275
       +
           format!("{}{}", RESP_PREFIX, id)

     

       276
       276
       +
       }

     

       277
       277
       +
       

     

       278
       278
       +
       fn fast_hash(s: &str) -> u64 {

     

       279
       279
       +
           use std::hash::{Hash, Hasher};

     

       280
       280
       +
           let mut h = std::collections::hash_map::DefaultHasher::new();

     

       281
       281
       +
           s.hash(&mut h);

     

       282
       282
       +
           h.finish()

     

       283
       283
       +
       }

     

       284
       284
       +
       

     

       285
       285
       +
       #[cfg(test)]

     

       286
       286
       +
       mod tests {

     

       287
       287
       +
           use super::*;

     

       288
       288
       +
           use serial_test::serial;

     

       289
       289
       +
       

     

       290
       290
       +
           #[test]

     

       291
       291
       +
           fn test_fast_hash() {

     

       292
       292
       +
               let h1 = fast_hash("hello");

     

       293
       293
       +
               let h2 = fast_hash("hello");

     

       294
       294
       +
               let h3 = fast_hash("world");

     

       295
       295
       +
               assert_eq!(h1, h2);

     

       296
       296
       +
               assert_ne!(h1, h3);

     

       297
       297
       +
           }

     

       298
       298
       +
       

     

       299
       299
       +
           #[test]

     

       300
       300
       +
           fn test_cache_keys() {

     

       301
       301
       +
               let q = "test query";

     

       302
       302
       +
               let mbid = "some-mbid";

     

       303
       303
       +
               assert!(cache_key_search(q).starts_with(CACHE_SEARCH_PREFIX));

     

       304
       304
       +
               assert!(cache_key_rec(mbid).starts_with(CACHE_REC_PREFIX));

     

       305
       305
       +
               assert!(infl_key_search(q).starts_with(INFLIGHT_PREFIX));

     

       306
       306
       +
               assert!(infl_key_rec(mbid).starts_with(INFLIGHT_PREFIX));

     

       307
       307
       +
               assert!(resp_key("id").starts_with(RESP_PREFIX));

     

       308
       308
       +
           }

     

       309
       309
       +
       

     

       310
       310
       +
           #[tokio::test]

     

       311
       311
       +
           #[serial]

     

       312
       312
       +
           async fn test_musicbrainz_client() -> Result<(), Error> {

     

       313
       313
       +
               let client = MusicbrainzClient::new().await?;

     

       314
       314
       +
               let query = format!(

     

       315
       315
       +
                   r#"recording:"{}" AND artist:"{}"  AND status:Official"#,

     

       316
       316
       +
                   "Come As You Are", "Nirvana"

     

       317
       317
       +
               );

     

       318
       318
       +
               let search_res = client.search(&query).await?;

     

       38
       319
        
       

     

       39
       39
       -
               Ok(response.json().await?)

     

       320
       320
       +
               assert!(!search_res.recordings.is_empty());

     

       321
       321
       +
               let rec = &search_res.recordings[0];

     

       322
       322
       +
               let mbid = &rec.id;

     

       323
       323
       +
               let rec_res = client.get_recording(mbid).await?;

     

       324
       324
       +
               assert_eq!(rec_res.id, *mbid);

     

       325
       325
       +
               Ok(())

     

       40
       326
        
           }

     

       41
       327
        
       }

+26 -7

crates/scrobbler/src/musicbrainz/release.rs

···

       6
       6
        
           recording::Recording,

     

       7
       7
        
       };

     

       8
       8
        
       

     

       9
       9
       -
       #[derive(Debug, Deserialize, Clone)]

     

       9
       9
       +
       #[derive(Debug, Deserialize, Clone, Default)]

     

       10
       10
        
       pub struct Release {

     

       11
       11
        
           #[serde(rename = "release-events")]

     

       12
       12
        
           pub release_events: Option<Vec<ReleaseEvent>>,

     
···

       24
       24
        
           #[serde(rename = "cover-art-archive")]

     

       25
       25
        
           pub cover_art_archive: Option<CoverArtArchive>,

     

       26
       26
        
           #[serde(rename = "artist-credit")]

     

       27
       27
       -
           pub artist_credit: Vec<ArtistCredit>,

     

       27
       27
       +
           pub artist_credit: Option<Vec<ArtistCredit>>,

     

       28
       28
        
           #[serde(rename = "status-id")]

     

       29
       29
        
           pub status_id: Option<String>,

     

       30
       30
        
           #[serde(rename = "label-info")]

     
···

       33
       33
        
           pub date: Option<String>,

     

       34
       34
        
           pub country: Option<String>,

     

       35
       35
        
           pub asin: Option<String>,

     

       36
       36
       +
           #[serde(rename = "track-count")]

     

       37
       37
       +
           pub track_count: Option<u32>,

     

       38
       38
       +
           #[serde(rename = "release-group")]

     

       39
       39
       +
           pub release_group: Option<ReleaseGroup>,

     

       36
       40
        
       }

     

       37
       41
        
       

     

       38
       38
       -
       #[derive(Debug, Deserialize, Clone)]

     

       42
       42
       +
       #[derive(Debug, Deserialize, Clone, Default)]

     

       39
       43
        
       pub struct CoverArtArchive {

     

       40
       44
        
           pub back: bool,

     

       41
       45
        
           pub artwork: bool,

     
···

       44
       48
        
           pub darkened: bool,

     

       45
       49
        
       }

     

       46
       50
        
       

     

       47
       47
       -
       #[derive(Debug, Deserialize, Clone)]

     

       51
       51
       +
       #[derive(Debug, Deserialize, Clone, Default)]

     

       48
       52
        
       pub struct ReleaseEvent {

     

       49
       53
        
           pub area: Option<Area>,

     

       50
       54
        
           pub date: String,

     

       51
       55
        
       }

     

       52
       56
        
       

     

       53
       53
       -
       #[derive(Debug, Deserialize, Clone)]

     

       57
       57
       +
       #[derive(Debug, Deserialize, Clone, Default)]

     

       54
       58
        
       pub struct TextRepresentation {

     

       55
       59
        
           pub language: Option<String>,

     

       56
       60
        
           pub script: Option<String>,

     

       57
       61
        
       }

     

       58
       62
        
       

     

       59
       59
       -
       #[derive(Debug, Deserialize, Clone)]

     

       63
       63
       +
       #[derive(Debug, Deserialize, Clone, Default)]

     

       60
       64
        
       pub struct Media {

     

       61
       65
        
           #[serde(rename = "format-id")]

     

       62
       66
        
           pub format_id: Option<String>,

     
···

       87
       91
        
           pub title: String,

     

       88
       92
        
           pub recording: Recording,

     

       89
       93
        
           #[serde(rename = "artist-credit")]

     

       90
       90
       -
           pub artist_credit: Vec<ArtistCredit>,

     

       94
       94
       +
           pub artist_credit: Option<Vec<ArtistCredit>>,

     

       91
       95
        
           pub number: String,

     

       92
       96
        
       }

     

       97
       97
       +
       

     

       98
       98
       +
       #[derive(Debug, Deserialize, Clone, Default)]

     

       99
       99
       +
       pub struct ReleaseGroup {

     

       100
       100
       +
           pub id: String,

     

       101
       101
       +
           pub title: String,

     

       102
       102
       +
           #[serde(rename = "primary-type")]

     

       103
       103
       +
           pub primary_type: Option<String>,

     

       104
       104
       +
           #[serde(rename = "secondary-types")]

     

       105
       105
       +
           pub secondary_types: Option<Vec<String>>,

     

       106
       106
       +
           pub disambiguation: Option<String>,

     

       107
       107
       +
           #[serde(rename = "first-release-date")]

     

       108
       108
       +
           pub first_release_date: Option<String>,

     

       109
       109
       +
           #[serde(rename = "artist-credit")]

     

       110
       110
       +
           pub artist_credit: Option<Vec<ArtistCredit>>,

     

       111
       111
       +
       }

crates/webscrobbler/Cargo.toml

···

       39
       39
        
       actix-session = "0.10.1"

     

       40
       40
        
       actix-limitation = "0.5.1"

     

       41
       41
        
       tracing = "0.1.41"

     

       42
       42
       +
       nanoid = "0.4.0"

     

       43
       43
       +
       

     

       44
       44
       +
       [dev-dependencies]

     

       45
       45
       +
       serial_test = "3.0.0"

+7 -2

crates/webscrobbler/src/handlers.rs

···

       1
       1
       -
       use crate::{cache::Cache, consts::BANNER, repo, scrobbler::scrobble, types::ScrobbleRequest};

     

       1
       1
       +
       use crate::{

     

       2
       2
       +
           cache::Cache, consts::BANNER, musicbrainz::client::MusicbrainzClient, repo,

     

       3
       3
       +
           scrobbler::scrobble, types::ScrobbleRequest,

     

       4
       4
       +
       };

     

       2
       5
        
       use actix_web::{get, post, web, HttpRequest, HttpResponse, Responder};

     

       3
       6
        
       use owo_colors::OwoColorize;

     

       4
       7
        
       use sqlx::{Pool, Postgres};

     
···

       28
       31
        
       async fn handle_scrobble(

     

       29
       32
        
           data: web::Data<Arc<Pool<Postgres>>>,

     

       30
       33
        
           cache: web::Data<Cache>,

     

       34
       34
       +
           mb_client: web::Data<Arc<MusicbrainzClient>>,

     

       31
       35
        
           mut payload: web::Payload,

     

       32
       36
        
           req: HttpRequest,

     

       33
       37
        
       ) -> Result<impl Responder, actix_web::Error> {

     
···

       100
       104
        
               }

     

       101
       105
        
           }

     

       102
       106
        
       

     

       103
       103
       -
           scrobble(&pool, &cache, params, &user.did)

     

       107
       107
       +
           let mb_client = mb_client.get_ref().as_ref();

     

       108
       108
       +
           scrobble(&pool, &cache, mb_client, params, &user.did)

     

       104
       109
        
               .await

     

       105
       110
        
               .map_err(|err| {

     

       106
       111
        
                   actix_web::error::ErrorInternalServerError(format!("Failed to scrobble: {}", err))

+5 -1

crates/webscrobbler/src/lib.rs

···

       11
       11
        
       use owo_colors::OwoColorize;

     

       12
       12
        
       use sqlx::postgres::PgPoolOptions;

     

       13
       13
        
       

     

       14
       14
       -
       use crate::{cache::Cache, consts::BANNER};

     

       14
       14
       +
       use crate::{cache::Cache, consts::BANNER, musicbrainz::client::MusicbrainzClient};

     

       15
       15
        
       

     

       16
       16
        
       pub mod auth;

     

       17
       17
        
       pub mod cache;

     
···

       38
       38
        
       

     

       39
       39
        
           let conn = Arc::new(pool);

     

       40
       40
        
       

     

       41
       41
       +
           let mb_client = MusicbrainzClient::new().await?;

     

       42
       42
       +
           let mb_client = Arc::new(mb_client);

     

       43
       43
       +
       

     

       41
       44
        
           let host = env::var("WEBSCROBBLER_HOST").unwrap_or_else(|_| "127.0.0.1".to_string());

     

       42
       45
        
           let port = env::var("WEBSCROBBLER_PORT")

     

       43
       46
        
               .unwrap_or_else(|_| "7883".to_string())

     
···

       65
       68
        
                   .app_data(limiter.clone())

     

       66
       69
        
                   .app_data(Data::new(conn.clone()))

     

       67
       70
        
                   .app_data(Data::new(cache.clone()))

     

       71
       71
       +
                   .app_data(Data::new(mb_client.clone()))

     

       68
       72
        
                   .service(handlers::index)

     

       69
       73
        
                   .service(handlers::handle_scrobble)

     

       70
       74
        
           })

+2 -2

crates/webscrobbler/src/musicbrainz/artist.rs

···

       1
       1
        
       use serde::{Deserialize, Serialize};

     

       2
       2
        
       

     

       3
       3
       -
       #[derive(Debug, Deserialize, Clone)]

     

       3
       3
       +
       #[derive(Debug, Deserialize, Clone, Default)]

     

       4
       4
        
       pub struct Artist {

     

       5
       5
        
           pub name: String,

     

       6
       6
        
           #[serde(rename = "sort-name")]

     
···

       29
       29
        
           pub aliases: Option<Vec<Alias>>,

     

       30
       30
        
       }

     

       31
       31
        
       

     

       32
       32
       -
       #[derive(Debug, Deserialize, Clone)]

     

       32
       32
       +
       #[derive(Debug, Deserialize, Clone, Default)]

     

       33
       33
        
       pub struct ArtistCredit {

     

       34
       34
        
           pub joinphrase: Option<String>,

     

       35
       35
        
           pub name: String,

+310 -24

crates/webscrobbler/src/musicbrainz/client.rs

···

       1
       1
       +
       use std::env;

     

       2
       2
       +
       

     

       1
       3
        
       use super::recording::{Recording, Recordings};

     

       2
       2
       -
       use anyhow::Error;

     

       4
       4
       +
       use anyhow::{anyhow, Context, Error};

     

       5
       5
       +
       use redis::aio::MultiplexedConnection;

     

       6
       6
       +
       use redis::AsyncCommands;

     

       7
       7
       +
       use serde::{Deserialize, Serialize};

     

       8
       8
       +
       use tokio::time::{timeout, Duration, Instant};

     

       3
       9
        
       

     

       4
       10
        
       pub const BASE_URL: &str = "https://musicbrainz.org/ws/2";

     

       5
       5
       -
       pub const USER_AGENT: &str = "Rocksky/0.1.0";

     

       11
       11
       +
       pub const USER_AGENT: &str = "Rocksky/0.1.0 (+https://rocksky.app)";

     

       12
       12
       +
       

     

       13
       13
       +
       const Q_QUEUE: &str = "mb:queue:v1";

     

       14
       14
       +
       const CACHE_SEARCH_PREFIX: &str = "mb:cache:search:";

     

       15
       15
       +
       const CACHE_REC_PREFIX: &str = "mb:cache:rec:";

     

       16
       16
       +
       const INFLIGHT_PREFIX: &str = "mb:inflight:";

     

       17
       17
       +
       const RESP_PREFIX: &str = "mb:resp:";

     

       6
       18
        
       

     

       7
       7
       -
       pub struct MusicbrainzClient {}

     

       19
       19
       +
       const CACHE_TTL_SECS: u64 = 60 * 60 * 24;

     

       20
       20
       +
       const WAIT_TIMEOUT_SECS: u64 = 20;

     

       21
       21
       +
       const INFLIGHT_TTL_SECS: i64 = 30; // de-dup window while the worker is fetching

     

       22
       22
       +
       

     

       23
       23
       +
       #[derive(Clone)]

     

       24
       24
       +
       pub struct MusicbrainzClient {

     

       25
       25
       +
           http: reqwest::Client,

     

       26
       26
       +
           redis: MultiplexedConnection,

     

       27
       27
       +
           cache_ttl: u64,

     

       28
       28
       +
       }

     

       29
       29
       +
       

     

       30
       30
       +
       #[derive(Debug, Serialize, Deserialize)]

     

       31
       31
       +
       #[serde(tag = "kind", rename_all = "snake_case")]

     

       32
       32
       +
       enum Job {

     

       33
       33
       +
           Search { id: String, query: String },

     

       34
       34
       +
           GetRecording { id: String, mbid: String },

     

       35
       35
       +
       }

     

       8
       36
        
       

     

       9
       37
        
       impl MusicbrainzClient {

     

       10
       10
       -
           pub fn new() -> Self {

     

       11
       11
       -
               MusicbrainzClient {}

     

       38
       38
       +
           pub async fn new() -> Result<Self, Error> {

     

       39
       39
       +
               let client =

     

       40
       40
       +
                   redis::Client::open(env::var("REDIS_URL").unwrap_or("redis://127.0.0.1".into()))?;

     

       41
       41
       +
               let redis = client.get_multiplexed_tokio_connection().await?;

     

       42
       42
       +
               let http = reqwest::Client::builder()

     

       43
       43
       +
                   .user_agent(USER_AGENT)

     

       44
       44
       +
                   .build()

     

       45
       45
       +
                   .context("build http client")?;

     

       46
       46
       +
               let me = MusicbrainzClient {

     

       47
       47
       +
                   http,

     

       48
       48
       +
                   redis,

     

       49
       49
       +
                   cache_ttl: CACHE_TTL_SECS,

     

       50
       50
       +
               };

     

       51
       51
       +
       

     

       52
       52
       +
               let mut worker_conn = client.get_multiplexed_async_connection().await?;

     

       53
       53
       +
       

     

       54
       54
       +
               let http = me.http.clone();

     

       55
       55
       +
               tokio::spawn(async move { worker_loop(http, &mut worker_conn).await });

     

       56
       56
       +
       

     

       57
       57
       +
               Ok(me)

     

       12
       58
        
           }

     

       13
       59
        
       

     

       14
       60
        
           pub async fn search(&self, query: &str) -> Result<Recordings, Error> {

     

       15
       15
       -
               let url = format!("{}/recording", BASE_URL);

     

       16
       16
       -
               let client = reqwest::Client::new();

     

       17
       17
       -
               let response = client

     

       18
       18
       -
                   .get(&url)

     

       19
       19
       -
                   .header("Accept", "application/json")

     

       20
       20
       -
                   .header("User-Agent", USER_AGENT)

     

       21
       21
       -
                   .query(&[("query", query), ("inc", "artist-credits+releases")])

     

       22
       22
       -
                   .send()

     

       61
       61
       +
               if let Some(h) = self.get_cache(&cache_key_search(query)).await? {

     

       62
       62
       +
                   return Ok(serde_json::from_str(&h).context("decode cached search")?);

     

       63
       63
       +
               }

     

       64
       64
       +
               let id = nanoid::nanoid!();

     

       65
       65
       +
               let job = Job::Search {

     

       66
       66
       +
                   id: id.clone(),

     

       67
       67
       +
                   query: query.to_string(),

     

       68
       68
       +
               };

     

       69
       69
       +
               self.enqueue_if_needed(&job, &infl_key_search(query))

     

       23
       70
        
                   .await?;

     

       24
       71
        
       

     

       25
       25
       -
               Ok(response.json().await?)

     

       72
       72
       +
               let raw = self.wait_for_response(&id).await?;

     

       73
       73
       +
               let parsed: Recordings = serde_json::from_str(&raw).context("decode search response")?;

     

       74
       74
       +
       

     

       75
       75
       +
               self.set_cache(&cache_key_search(query), &raw).await?;

     

       76
       76
       +
               Ok(parsed)

     

       26
       77
        
           }

     

       27
       78
        
       

     

       28
       79
        
           pub async fn get_recording(&self, mbid: &str) -> Result<Recording, Error> {

     

       29
       29
       -
               let url = format!("{}/recording/{}", BASE_URL, mbid);

     

       30
       30
       -
               let client = reqwest::Client::new();

     

       31
       31
       -
               let response = client

     

       32
       32
       -
                   .get(&url)

     

       33
       33
       -
                   .header("Accept", "application/json")

     

       34
       34
       -
                   .header("User-Agent", USER_AGENT)

     

       35
       35
       -
                   .query(&[("inc", "artist-credits+releases")])

     

       36
       36
       -
                   .send()

     

       37
       37
       -
                   .await?;

     

       80
       80
       +
               if let Some(h) = self.get_cache(&cache_key_rec(mbid)).await? {

     

       81
       81
       +
                   return Ok(serde_json::from_str(&h).context("decode cached recording")?);

     

       82
       82
       +
               }

     

       83
       83
       +
               let id = nanoid::nanoid!();

     

       84
       84
       +
               let job = Job::GetRecording {

     

       85
       85
       +
                   id: id.clone(),

     

       86
       86
       +
                   mbid: mbid.to_string(),

     

       87
       87
       +
               };

     

       88
       88
       +
               self.enqueue_if_needed(&job, &infl_key_rec(mbid)).await?;

     

       89
       89
       +
               let raw = self.wait_for_response(&id).await?;

     

       90
       90
       +
               let parsed: Recording = serde_json::from_str(&raw).context("decode recording response")?;

     

       91
       91
       +
               self.set_cache(&cache_key_rec(mbid), &raw).await?;

     

       92
       92
       +
               Ok(parsed)

     

       93
       93
       +
           }

     

       94
       94
       +
       

     

       95
       95
       +
           // ---------- Redis helpers ----------

     

       96
       96
       +
       

     

       97
       97
       +
           async fn get_cache(&self, key: &str) -> Result<Option<String>, Error> {

     

       98
       98
       +
               let mut r = self.redis.clone();

     

       99
       99
       +
               let val: Option<String> = r.get(key).await?;

     

       100
       100
       +
               Ok(val)

     

       101
       101
       +
           }

     

       102
       102
       +
       

     

       103
       103
       +
           async fn set_cache(&self, key: &str, json: &str) -> Result<(), Error> {

     

       104
       104
       +
               let mut r = self.redis.clone();

     

       105
       105
       +
               let _: () = r

     

       106
       106
       +
                   .set_ex(key, json, self.cache_ttl)

     

       107
       107
       +
                   .await

     

       108
       108
       +
                   .with_context(|| format!("cache set {key}"))?;

     

       109
       109
       +
               Ok(())

     

       110
       110
       +
           }

     

       111
       111
       +
       

     

       112
       112
       +
           async fn enqueue_if_needed(&self, job: &Job, inflight_key: &str) -> Result<(), Error> {

     

       113
       113
       +
               let mut r = self.redis.clone();

     

       114
       114
       +
       

     

       115
       115
       +
               // set NX to avoid duplicate work; short TTL

     

       116
       116
       +
               let set: bool = r.set_nx(inflight_key, "1").await.context("set in-flight")?;

     

       117
       117
       +
               if set {

     

       118
       118
       +
                   let _: () = r

     

       119
       119
       +
                       .expire(inflight_key, INFLIGHT_TTL_SECS)

     

       120
       120
       +
                       .await

     

       121
       121
       +
                       .context("expire inflight")?;

     

       122
       122
       +
                   let payload = serde_json::to_string(job).expect("serialize job");

     

       123
       123
       +
                   let _: () = r.rpush(Q_QUEUE, payload).await.context("enqueue job")?;

     

       124
       124
       +
               }

     

       125
       125
       +
               Ok(())

     

       126
       126
       +
           }

     

       127
       127
       +
       

     

       128
       128
       +
           async fn wait_for_response(&self, id: &str) -> Result<String, Error> {

     

       129
       129
       +
               let mut r = self.redis.clone();

     

       130
       130
       +
               let resp_q = resp_key(id);

     

       131
       131
       +
       

     

       132
       132
       +
               let fut = async {

     

       133
       133
       +
                   loop {

     

       134
       134
       +
                       let popped: Option<(String, String)> = r.brpop(&resp_q, 2.0).await?;

     

       135
       135
       +
                       if let Some((_key, json)) = popped {

     

       136
       136
       +
                           return Ok::<String, Error>(json);

     

       137
       137
       +
                       }

     

       138
       138
       +
                   }

     

       139
       139
       +
               };

     

       140
       140
       +
       

     

       141
       141
       +
               match timeout(Duration::from_secs(WAIT_TIMEOUT_SECS), fut).await {

     

       142
       142
       +
                   Ok(res) => res,

     

       143
       143
       +
                   Err(_) => Err(anyhow!("timed out waiting for MusicBrainz response")),

     

       144
       144
       +
               }

     

       145
       145
       +
           }

     

       146
       146
       +
       }

     

       147
       147
       +
       

     

       148
       148
       +
       async fn worker_loop(

     

       149
       149
       +
           http: reqwest::Client,

     

       150
       150
       +
           redis: &mut MultiplexedConnection,

     

       151
       151
       +
       ) -> Result<(), Error> {

     

       152
       152
       +
           // pacing ticker: strictly 1 request/second

     

       153
       153
       +
           let mut next_allowed = Instant::now();

     

       154
       154
       +
       

     

       155
       155
       +
           loop {

     

       156
       156
       +
               tokio::select! {

     

       157
       157
       +
                   res = async {

     

       158
       158
       +
       

     

       159
       159
       +
                       // finite timeout pop

     

       160
       160
       +
                       let v: Option<Vec<String>> = redis.blpop(Q_QUEUE, 2.0).await.ok();

     

       161
       161
       +
                       Ok::<_, Error>(v)

     

       162
       162
       +
                   } => {

     

       163
       163
       +
                       let Some(mut v) = res? else {

     

       164
       164
       +
                           continue };

     

       165
       165
       +
                       if v.len() != 2 {

     

       166
       166
       +
                           continue; }

     

       167
       167
       +
                       let payload = v.pop().unwrap();

     

       168
       168
       +
       

     

       169
       169
       +
                       // 1 rps pacing

     

       170
       170
       +
                       let now = Instant::now();

     

       171
       171
       +
                       if now < next_allowed { tokio::time::sleep(next_allowed - now).await; }

     

       172
       172
       +
                       next_allowed = Instant::now() + Duration::from_secs(1);

     

       173
       173
       +
       

     

       174
       174
       +
                       let payload: Job = match serde_json::from_str(&payload) {

     

       175
       175
       +
                           Ok(j) => j,

     

       176
       176
       +
                           Err(e) => {

     

       177
       177
       +
                               tracing::error!(%e, "invalid job payload");

     

       178
       178
       +
                               continue;

     

       179
       179
       +
                           }

     

       180
       180
       +
                       };

     

       181
       181
       +
                       if let Err(e) = process_job(&http, redis, payload).await {

     

       182
       182
       +
                           tracing::error!(%e, "job failed");

     

       183
       183
       +
                       }

     

       184
       184
       +
                   }

     

       185
       185
       +
               }

     

       186
       186
       +
           }

     

       187
       187
       +
       }

     

       188
       188
       +
       

     

       189
       189
       +
       async fn process_job(

     

       190
       190
       +
           http: &reqwest::Client,

     

       191
       191
       +
           redis: &mut MultiplexedConnection,

     

       192
       192
       +
           job: Job,

     

       193
       193
       +
       ) -> Result<(), Error> {

     

       194
       194
       +
           match job {

     

       195
       195
       +
               Job::Search { id, query } => {

     

       196
       196
       +
                   let url = format!("{}/recording", BASE_URL);

     

       197
       197
       +
                   let resp = http

     

       198
       198
       +
                       .get(&url)

     

       199
       199
       +
                       .header("Accept", "application/json")

     

       200
       200
       +
                       .query(&[

     

       201
       201
       +
                           ("query", query.as_str()),

     

       202
       202
       +
                           ("fmt", "json"),

     

       203
       203
       +
                           ("inc", "artists+releases+isrcs"),

     

       204
       204
       +
                       ])

     

       205
       205
       +
                       .send()

     

       206
       206
       +
                       .await

     

       207
       207
       +
                       .context("http search")?;

     

       208
       208
       +
       

     

       209
       209
       +
                   if !resp.status().is_success() {

     

       210
       210
       +
                       // Push an error payload so waiters don’t hang forever

     

       211
       211
       +
                       let _ = push_response(

     

       212
       212
       +
                           redis,

     

       213
       213
       +
                           &id,

     

       214
       214
       +
                           &format!(r#"{{"error":"http {}"}}"#, resp.status()),

     

       215
       215
       +
                       )

     

       216
       216
       +
                       .await;

     

       217
       217
       +
                       return Err(anyhow!("musicbrainz search http {}", resp.status()));

     

       218
       218
       +
                   }

     

       219
       219
       +
       

     

       220
       220
       +
                   let text = resp.text().await.context("read body")?;

     

       221
       221
       +
                   push_response(redis, &id, &text).await?;

     

       222
       222
       +
               }

     

       223
       223
       +
               Job::GetRecording { id, mbid } => {

     

       224
       224
       +
                   let url = format!("{}/recording/{}", BASE_URL, mbid);

     

       225
       225
       +
                   let resp = http

     

       226
       226
       +
                       .get(&url)

     

       227
       227
       +
                       .header("Accept", "application/json")

     

       228
       228
       +
                       .query(&[("fmt", "json"), ("inc", "artists+releases+isrcs")])

     

       229
       229
       +
                       .send()

     

       230
       230
       +
                       .await

     

       231
       231
       +
                       .context("http get_recording")?;

     

       232
       232
       +
       

     

       233
       233
       +
                   if !resp.status().is_success() {

     

       234
       234
       +
                       let _ = push_response(

     

       235
       235
       +
                           redis,

     

       236
       236
       +
                           &id,

     

       237
       237
       +
                           &format!(r#"{{"error":"http {}"}}"#, resp.status()),

     

       238
       238
       +
                       )

     

       239
       239
       +
                       .await;

     

       240
       240
       +
                       return Err(anyhow!("musicbrainz get_recording http {}", resp.status()));

     

       241
       241
       +
                   }

     

       242
       242
       +
       

     

       243
       243
       +
                   let text = resp.text().await.context("read body")?;

     

       244
       244
       +
                   push_response(redis, &id, &text).await?;

     

       245
       245
       +
               }

     

       246
       246
       +
           }

     

       247
       247
       +
           Ok(())

     

       248
       248
       +
       }

     

       249
       249
       +
       

     

       250
       250
       +
       async fn push_response(

     

       251
       251
       +
           redis: &mut MultiplexedConnection,

     

       252
       252
       +
           id: &str,

     

       253
       253
       +
           json: &str,

     

       254
       254
       +
       ) -> Result<(), Error> {

     

       255
       255
       +
           let q = resp_key(id);

     

       256
       256
       +
           // RPUSH then EXPIRE to avoid leaks if a client never BRPOPs

     

       257
       257
       +
           let _: () = redis.rpush(&q, json).await?;

     

       258
       258
       +
           let _: () = redis.expire(&q, WAIT_TIMEOUT_SECS as i64 + 5).await?;

     

       259
       259
       +
           Ok(())

     

       260
       260
       +
       }

     

       261
       261
       +
       

     

       262
       262
       +
       fn cache_key_search(query: &str) -> String {

     

       263
       263
       +
           format!("{}{}", CACHE_SEARCH_PREFIX, fast_hash(query))

     

       264
       264
       +
       }

     

       265
       265
       +
       fn cache_key_rec(mbid: &str) -> String {

     

       266
       266
       +
           format!("{}{}", CACHE_REC_PREFIX, mbid)

     

       267
       267
       +
       }

     

       268
       268
       +
       fn infl_key_search(query: &str) -> String {

     

       269
       269
       +
           format!("{}search:{}", INFLIGHT_PREFIX, fast_hash(query))

     

       270
       270
       +
       }

     

       271
       271
       +
       fn infl_key_rec(mbid: &str) -> String {

     

       272
       272
       +
           format!("{}rec:{}", INFLIGHT_PREFIX, mbid)

     

       273
       273
       +
       }

     

       274
       274
       +
       fn resp_key(id: &str) -> String {

     

       275
       275
       +
           format!("{}{}", RESP_PREFIX, id)

     

       276
       276
       +
       }

     

       277
       277
       +
       

     

       278
       278
       +
       fn fast_hash(s: &str) -> u64 {

     

       279
       279
       +
           use std::hash::{Hash, Hasher};

     

       280
       280
       +
           let mut h = std::collections::hash_map::DefaultHasher::new();

     

       281
       281
       +
           s.hash(&mut h);

     

       282
       282
       +
           h.finish()

     

       283
       283
       +
       }

     

       284
       284
       +
       

     

       285
       285
       +
       #[cfg(test)]

     

       286
       286
       +
       mod tests {

     

       287
       287
       +
           use super::*;

     

       288
       288
       +
           use serial_test::serial;

     

       289
       289
       +
       

     

       290
       290
       +
           #[test]

     

       291
       291
       +
           fn test_fast_hash() {

     

       292
       292
       +
               let h1 = fast_hash("hello");

     

       293
       293
       +
               let h2 = fast_hash("hello");

     

       294
       294
       +
               let h3 = fast_hash("world");

     

       295
       295
       +
               assert_eq!(h1, h2);

     

       296
       296
       +
               assert_ne!(h1, h3);

     

       297
       297
       +
           }

     

       298
       298
       +
       

     

       299
       299
       +
           #[test]

     

       300
       300
       +
           fn test_cache_keys() {

     

       301
       301
       +
               let q = "test query";

     

       302
       302
       +
               let mbid = "some-mbid";

     

       303
       303
       +
               assert!(cache_key_search(q).starts_with(CACHE_SEARCH_PREFIX));

     

       304
       304
       +
               assert!(cache_key_rec(mbid).starts_with(CACHE_REC_PREFIX));

     

       305
       305
       +
               assert!(infl_key_search(q).starts_with(INFLIGHT_PREFIX));

     

       306
       306
       +
               assert!(infl_key_rec(mbid).starts_with(INFLIGHT_PREFIX));

     

       307
       307
       +
               assert!(resp_key("id").starts_with(RESP_PREFIX));

     

       308
       308
       +
           }

     

       309
       309
       +
       

     

       310
       310
       +
           #[tokio::test]

     

       311
       311
       +
           #[serial]

     

       312
       312
       +
           async fn test_musicbrainz_client() -> Result<(), Error> {

     

       313
       313
       +
               let client = MusicbrainzClient::new().await?;

     

       314
       314
       +
               let query = format!(

     

       315
       315
       +
                   r#"recording:"{}" AND artist:"{}"  AND status:Official"#,

     

       316
       316
       +
                   "Come As You Are", "Nirvana"

     

       317
       317
       +
               );

     

       318
       318
       +
               let search_res = client.search(&query).await?;

     

       38
       319
        
       

     

       39
       39
       -
               Ok(response.json().await?)

     

       320
       320
       +
               assert!(!search_res.recordings.is_empty());

     

       321
       321
       +
               let rec = &search_res.recordings[0];

     

       322
       322
       +
               let mbid = &rec.id;

     

       323
       323
       +
               let rec_res = client.get_recording(mbid).await?;

     

       324
       324
       +
               assert_eq!(rec_res.id, *mbid);

     

       325
       325
       +
               Ok(())

     

       40
       326
        
           }

     

       41
       327
        
       }

+26 -7

crates/webscrobbler/src/musicbrainz/release.rs

···

       6
       6
        
           recording::Recording,

     

       7
       7
        
       };

     

       8
       8
        
       

     

       9
       9
       -
       #[derive(Debug, Deserialize, Clone)]

     

       9
       9
       +
       #[derive(Debug, Deserialize, Clone, Default)]

     

       10
       10
        
       pub struct Release {

     

       11
       11
        
           #[serde(rename = "release-events")]

     

       12
       12
        
           pub release_events: Option<Vec<ReleaseEvent>>,

     
···

       24
       24
        
           #[serde(rename = "cover-art-archive")]

     

       25
       25
        
           pub cover_art_archive: Option<CoverArtArchive>,

     

       26
       26
        
           #[serde(rename = "artist-credit")]

     

       27
       27
       -
           pub artist_credit: Vec<ArtistCredit>,

     

       27
       27
       +
           pub artist_credit: Option<Vec<ArtistCredit>>,

     

       28
       28
        
           #[serde(rename = "status-id")]

     

       29
       29
        
           pub status_id: Option<String>,

     

       30
       30
        
           #[serde(rename = "label-info")]

     
···

       33
       33
        
           pub date: Option<String>,

     

       34
       34
        
           pub country: Option<String>,

     

       35
       35
        
           pub asin: Option<String>,

     

       36
       36
       +
           #[serde(rename = "track-count")]

     

       37
       37
       +
           pub track_count: Option<u32>,

     

       38
       38
       +
           #[serde(rename = "release-group")]

     

       39
       39
       +
           pub release_group: Option<ReleaseGroup>,

     

       36
       40
        
       }

     

       37
       41
        
       

     

       38
       38
       -
       #[derive(Debug, Deserialize, Clone)]

     

       42
       42
       +
       #[derive(Debug, Deserialize, Clone, Default)]

     

       39
       43
        
       pub struct CoverArtArchive {

     

       40
       44
        
           pub back: bool,

     

       41
       45
        
           pub artwork: bool,

     
···

       44
       48
        
           pub darkened: bool,

     

       45
       49
        
       }

     

       46
       50
        
       

     

       47
       47
       -
       #[derive(Debug, Deserialize, Clone)]

     

       51
       51
       +
       #[derive(Debug, Deserialize, Clone, Default)]

     

       48
       52
        
       pub struct ReleaseEvent {

     

       49
       53
        
           pub area: Option<Area>,

     

       50
       54
        
           pub date: String,

     

       51
       55
        
       }

     

       52
       56
        
       

     

       53
       53
       -
       #[derive(Debug, Deserialize, Clone)]

     

       57
       57
       +
       #[derive(Debug, Deserialize, Clone, Default)]

     

       54
       58
        
       pub struct TextRepresentation {

     

       55
       59
        
           pub language: Option<String>,

     

       56
       60
        
           pub script: Option<String>,

     

       57
       61
        
       }

     

       58
       62
        
       

     

       59
       59
       -
       #[derive(Debug, Deserialize, Clone)]

     

       63
       63
       +
       #[derive(Debug, Deserialize, Clone, Default)]

     

       60
       64
        
       pub struct Media {

     

       61
       65
        
           #[serde(rename = "format-id")]

     

       62
       66
        
           pub format_id: Option<String>,

     
···

       87
       91
        
           pub title: String,

     

       88
       92
        
           pub recording: Recording,

     

       89
       93
        
           #[serde(rename = "artist-credit")]

     

       90
       90
       -
           pub artist_credit: Vec<ArtistCredit>,

     

       94
       94
       +
           pub artist_credit: Option<Vec<ArtistCredit>>,

     

       91
       95
        
           pub number: String,

     

       92
       96
        
       }

     

       97
       97
       +
       

     

       98
       98
       +
       #[derive(Debug, Deserialize, Clone, Default)]

     

       99
       99
       +
       pub struct ReleaseGroup {

     

       100
       100
       +
           pub id: String,

     

       101
       101
       +
           pub title: String,

     

       102
       102
       +
           #[serde(rename = "primary-type")]

     

       103
       103
       +
           pub primary_type: Option<String>,

     

       104
       104
       +
           #[serde(rename = "secondary-types")]

     

       105
       105
       +
           pub secondary_types: Option<Vec<String>>,

     

       106
       106
       +
           pub disambiguation: Option<String>,

     

       107
       107
       +
           #[serde(rename = "first-release-date")]

     

       108
       108
       +
           pub first_release_date: Option<String>,

     

       109
       109
       +
           #[serde(rename = "artist-credit")]

     

       110
       110
       +
           pub artist_credit: Option<Vec<ArtistCredit>>,

     

       111
       111
       +
       }

+46 -32

crates/scrobbler/src/scrobbler.rs

···

       378
       378
        
               .await?;

     

       379
       379
        
       

     

       380
       380
        
           if let Some(track) = result.tracks.items.first() {

     

       381
       381
       -
               tracing::info!(artist = %scrobble.artist, track = %scrobble.track, "Spotify (track)");

     

       382
       382
       -
               scrobble.album = Some(track.album.name.clone());

     

       383
       383
       -
               let mut track = track.clone();

     

       381
       381
       +
               let artists = track

     

       382
       382
       +
                   .artists

     

       383
       383
       +
                   .iter()

     

       384
       384
       +
                   .map(|a| a.name.to_lowercase().clone())

     

       385
       385
       +
                   .collect::<Vec<_>>()

     

       386
       386
       +
                   .join(", ")

     

       387
       387
       +
                   .to_lowercase();

     

       384
       388
        
       

     

       385
       385
       -
               if let Some(album) = spotify_client.get_album(&track.album.id).await? {

     

       386
       386
       -
                   track.album = album;

     

       387
       387
       -
               }

     

       389
       389
       +
               // check if artists don't contain the scrobble artist (to avoid wrong matches)

     

       390
       390
       +
               if !artists.contains(&scrobble.artist.to_lowercase()) {

     

       391
       391
       +
                   tracing::warn!(artist = %artist, track = ?track, "Artist mismatch, skipping");

     

       392
       392
       +
                   return Ok(());

     

       393
       393
       +
               } else {

     

       394
       394
       +
                   tracing::info!(artist = %scrobble.artist, track = %scrobble.track, "Spotify (track)");

     

       395
       395
       +
                   scrobble.album = Some(track.album.name.clone());

     

       396
       396
       +
                   let mut track = track.clone();

     

       388
       397
        
       

     

       389
       389
       -
               if let Some(artist) = spotify_client

     

       390
       390
       -
                   .get_artist(&track.album.artists[0].id)

     

       391
       391
       -
                   .await?

     

       392
       392
       -
               {

     

       393
       393
       -
                   track.album.artists[0] = artist;

     

       394
       394
       -
               }

     

       398
       398
       +
                   if let Some(album) = spotify_client.get_album(&track.album.id).await? {

     

       399
       399
       +
                       track.album = album;

     

       400
       400
       +
                   }

     

       395
       401
        
       

     

       396
       396
       -
               rocksky::scrobble(cache, &did, track.into(), scrobble.timestamp).await?;

     

       397
       397
       -
               tokio::time::sleep(std::time::Duration::from_secs(1)).await;

     

       398
       398
       -
               return Ok(());

     

       402
       402
       +
                   if let Some(artist) = spotify_client

     

       403
       403
       +
                       .get_artist(&track.album.artists[0].id)

     

       404
       404
       +
                       .await?

     

       405
       405
       +
                   {

     

       406
       406
       +
                       track.album.artists[0] = artist;

     

       407
       407
       +
                   }

     

       408
       408
       +
       

     

       409
       409
       +
                   rocksky::scrobble(cache, &did, track.into(), scrobble.timestamp).await?;

     

       410
       410
       +
                   tokio::time::sleep(std::time::Duration::from_secs(1)).await;

     

       411
       411
       +
                   return Ok(());

     

       412
       412
       +
               }

     

       399
       413
        
           }

     

       400
       414
        
       

     

       401
       415
        
           let query = format!(

     
···

       616
       630
        
               let artists = track

     

       617
       631
        
                   .artists

     

       618
       632
        
                   .iter()

     

       619
       619
       -
                   .map(|a| a.name.clone())

     

       633
       633
       +
                   .map(|a| a.name.to_lowercase().clone())

     

       620
       634
        
                   .collect::<Vec<_>>()

     

       621
       635
        
                   .join(", ")

     

       622
       636
        
                   .to_lowercase();

     
···

       625
       639
        
               if !artists.contains(&scrobble.artist.to_lowercase()) {

     

       626
       640
        
                   tracing::warn!(artist = %artist, track = ?track, "Artist mismatch, skipping");

     

       627
       641
        
                   return Ok(());

     

       628
       628
       -
               }

     

       642
       642
       +
               } else {

     

       643
       643
       +
                   tracing::info!("Spotify (track)");

     

       644
       644
       +
                   scrobble.album = Some(track.album.name.clone());

     

       645
       645
       +
                   let mut track = track.clone();

     

       629
       646
        
       

     

       630
       630
       -
               tracing::info!("Spotify (track)");

     

       631
       631
       -
               scrobble.album = Some(track.album.name.clone());

     

       632
       632
       -
               let mut track = track.clone();

     

       647
       647
       +
                   if let Some(album) = spotify_client.get_album(&track.album.id).await? {

     

       648
       648
       +
                       track.album = album;

     

       649
       649
       +
                   }

     

       633
       650
        
       

     

       634
       634
       -
               if let Some(album) = spotify_client.get_album(&track.album.id).await? {

     

       635
       635
       -
                   track.album = album;

     

       636
       636
       -
               }

     

       651
       651
       +
                   if let Some(artist) = spotify_client

     

       652
       652
       +
                       .get_artist(&track.album.artists[0].id)

     

       653
       653
       +
                       .await?

     

       654
       654
       +
                   {

     

       655
       655
       +
                       track.album.artists[0] = artist;

     

       656
       656
       +
                   }

     

       637
       657
        
       

     

       638
       638
       -
               if let Some(artist) = spotify_client

     

       639
       639
       -
                   .get_artist(&track.album.artists[0].id)

     

       640
       640
       -
                   .await?

     

       641
       641
       -
               {

     

       642
       642
       -
                   track.album.artists[0] = artist;

     

       658
       658
       +
                   rocksky::scrobble(cache, &did, track.into(), scrobble.timestamp).await?;

     

       659
       659
       +
                   tokio::time::sleep(std::time::Duration::from_secs(1)).await;

     

       660
       660
       +
                   return Ok(());

     

       643
       661
        
               }

     

       644
       644
       -
       

     

       645
       645
       -
               rocksky::scrobble(cache, &did, track.into(), scrobble.timestamp).await?;

     

       646
       646
       -
               tokio::time::sleep(std::time::Duration::from_secs(1)).await;

     

       647
       647
       -
               return Ok(());

     

       648
       662
        
           }

     

       649
       663
        
       

     

       650
       664
        
           let query = format!(

+16 -17

crates/webscrobbler/src/scrobbler.rs

···

       131
       131
        
               let artists = track

     

       132
       132
        
                   .artists

     

       133
       133
        
                   .iter()

     

       134
       134
       -
                   .map(|a| a.name.clone())

     

       134
       134
       +
                   .map(|a| a.name.to_lowercase().clone())

     

       135
       135
        
                   .collect::<Vec<_>>()

     

       136
       136
        
                   .join(", ")

     

       137
       137
        
                   .to_lowercase();

     
···

       139
       139
        
               // check if artists don't contain the scrobble artist (to avoid wrong matches)

     

       140
       140
        
               if !artists.contains(&scrobble.data.song.parsed.artist.trim().to_lowercase()) {

     

       141
       141
        
                   tracing::warn!(artist = %artist, track = ?track, "Artist mismatch, skipping");

     

       142
       142
       -
                   return Ok(());

     

       143
       143
       -
               }

     

       142
       142
       +
               } else {

     

       143
       143
       +
                   tracing::info!("Spotify (track)");

     

       144
       144
       +
                   let mut track = track.clone();

     

       144
       145
        
       

     

       145
       145
       -
               tracing::info!("Spotify (track)");

     

       146
       146
       -
               let mut track = track.clone();

     

       146
       146
       +
                   if let Some(album) = spotify_client.get_album(&track.album.id).await? {

     

       147
       147
       +
                       track.album = album;

     

       148
       148
       +
                   }

     

       147
       149
        
       

     

       148
       148
       -
               if let Some(album) = spotify_client.get_album(&track.album.id).await? {

     

       149
       149
       -
                   track.album = album;

     

       150
       150
       -
               }

     

       150
       150
       +
                   if let Some(artist) = spotify_client

     

       151
       151
       +
                       .get_artist(&track.album.artists[0].id)

     

       152
       152
       +
                       .await?

     

       153
       153
       +
                   {

     

       154
       154
       +
                       track.album.artists[0] = artist;

     

       155
       155
       +
                   }

     

       151
       156
        
       

     

       152
       152
       -
               if let Some(artist) = spotify_client

     

       153
       153
       -
                   .get_artist(&track.album.artists[0].id)

     

       154
       154
       -
                   .await?

     

       155
       155
       -
               {

     

       156
       156
       -
                   track.album.artists[0] = artist;

     

       157
       157
       +
                   rocksky::scrobble(cache, &did, track.into(), scrobble.time).await?;

     

       158
       158
       +
                   tokio::time::sleep(std::time::Duration::from_secs(1)).await;

     

       159
       159
       +
                   return Ok(());

     

       157
       160
        
               }

     

       158
       158
       -
       

     

       159
       159
       -
               rocksky::scrobble(cache, &did, track.into(), scrobble.time).await?;

     

       160
       160
       -
               tokio::time::sleep(std::time::Duration::from_secs(1)).await;

     

       161
       161
       -
               return Ok(());

     

       162
       161
        
           }

     

       163
       162
        
       

     

       164
       163
        
           let query = format!(