feat(qobuz): add session/start and file/url CMAF endpoints
New CMAF session management with lazy renewal and file/url endpoint returning segmented encrypted streaming URLs. cc
This commit is contained in:
5 files changed
+166
-1
No files matched your search
@@ -104,9 +104,11 @@ pub use types::{
|
|||||||
ReleasesGridResponse,
|
ReleasesGridResponse,
|
||||||
SearchResults,
|
SearchResults,
|
||||||
SearchResultsPage,
|
SearchResultsPage,
|
||||||
|
SessionStartResponse,
|
||||||
StreamRestriction,
|
StreamRestriction,
|
||||||
StreamUrl,
|
StreamUrl,
|
||||||
Track,
|
Track,
|
||||||
|
TrackFileUrl,
|
||||||
TracksContainer,
|
TracksContainer,
|
||||||
UserSession,
|
UserSession,
|
||||||
};
|
};
|
||||||
@@ -7,6 +7,7 @@ description = "Qobuz API client for QBZ"
|
|||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
qbz-models = { path = "../qbz-models" }
|
qbz-models = { path = "../qbz-models" }
|
||||||
|
qbz-cmaf = { path = "../qbz-cmaf" }
|
||||||
|
|
||||||
# Async
|
# Async
|
||||||
tokio = { workspace = true }
|
tokio = { workspace = true }
|
||||||
|
|||||||
@@ -135,6 +135,22 @@ pub fn parse_login_response(response: &serde_json::Value) -> Result<UserSession>
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Generate CMAF signature for session/start endpoint
|
||||||
|
pub fn sign_session_start(timestamp: u64) -> String {
|
||||||
|
let mut args = std::collections::BTreeMap::new();
|
||||||
|
args.insert("profile", "qbz-1".to_string());
|
||||||
|
qbz_cmaf::compute_request_sig("sessionstart", &args, ×tamp.to_string())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Generate CMAF signature for file/url endpoint
|
||||||
|
pub fn sign_file_url(track_id: u64, format_id: u32, timestamp: u64) -> String {
|
||||||
|
let mut args = std::collections::BTreeMap::new();
|
||||||
|
args.insert("format_id", format_id.to_string());
|
||||||
|
args.insert("intent", "stream".to_string());
|
||||||
|
args.insert("track_id", track_id.to_string());
|
||||||
|
qbz_cmaf::compute_request_sig("fileurl", &args, ×tamp.to_string())
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
|||||||
@@ -5,7 +5,10 @@ use serde_json::Value;
|
|||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
use tokio::sync::RwLock;
|
use tokio::sync::RwLock;
|
||||||
|
|
||||||
use super::auth::{get_timestamp, parse_login_response, sign_get_favorites, sign_get_file_url};
|
use super::auth::{
|
||||||
|
get_timestamp, parse_login_response, sign_file_url, sign_get_favorites, sign_get_file_url,
|
||||||
|
sign_session_start,
|
||||||
|
};
|
||||||
use super::bundle::{extract_bundle_tokens, BundleTokens};
|
use super::bundle::{extract_bundle_tokens, BundleTokens};
|
||||||
use super::endpoints::{self, paths};
|
use super::endpoints::{self, paths};
|
||||||
use super::error::{ApiError, Result};
|
use super::error::{ApiError, Result};
|
||||||
@@ -13,6 +16,13 @@ use qbz_models::*;
|
|||||||
|
|
||||||
const USER_AGENT: &str = "Mozilla/5.0 (X11; Linux x86_64; rv:120.0) Gecko/20100101 Firefox/120.0";
|
const USER_AGENT: &str = "Mozilla/5.0 (X11; Linux x86_64; rv:120.0) Gecko/20100101 Firefox/120.0";
|
||||||
|
|
||||||
|
/// CMAF session state (session/start + infos for key derivation)
|
||||||
|
struct CmafSession {
|
||||||
|
session_id: String,
|
||||||
|
infos: String,
|
||||||
|
expires_at: u64,
|
||||||
|
}
|
||||||
|
|
||||||
/// Qobuz API client
|
/// Qobuz API client
|
||||||
pub struct QobuzClient {
|
pub struct QobuzClient {
|
||||||
http: Client,
|
http: Client,
|
||||||
@@ -20,6 +30,7 @@ pub struct QobuzClient {
|
|||||||
session: Arc<RwLock<Option<UserSession>>>,
|
session: Arc<RwLock<Option<UserSession>>>,
|
||||||
validated_secret: Arc<RwLock<Option<String>>>,
|
validated_secret: Arc<RwLock<Option<String>>>,
|
||||||
locale: Arc<RwLock<String>>,
|
locale: Arc<RwLock<String>>,
|
||||||
|
cmaf_session: Arc<RwLock<Option<CmafSession>>>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Clone for QobuzClient {
|
impl Clone for QobuzClient {
|
||||||
@@ -30,6 +41,7 @@ impl Clone for QobuzClient {
|
|||||||
session: Arc::clone(&self.session),
|
session: Arc::clone(&self.session),
|
||||||
validated_secret: Arc::clone(&self.validated_secret),
|
validated_secret: Arc::clone(&self.validated_secret),
|
||||||
locale: Arc::clone(&self.locale),
|
locale: Arc::clone(&self.locale),
|
||||||
|
cmaf_session: Arc::clone(&self.cmaf_session),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -48,6 +60,7 @@ impl QobuzClient {
|
|||||||
session: Arc::new(RwLock::new(None)),
|
session: Arc::new(RwLock::new(None)),
|
||||||
validated_secret: Arc::new(RwLock::new(None)),
|
validated_secret: Arc::new(RwLock::new(None)),
|
||||||
locale: Arc::new(RwLock::new("en".to_string())),
|
locale: Arc::new(RwLock::new("en".to_string())),
|
||||||
|
cmaf_session: Arc::new(RwLock::new(None)),
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1839,6 +1852,133 @@ impl QobuzClient {
|
|||||||
|
|
||||||
Ok(serde_json::from_value(response)?)
|
Ok(serde_json::from_value(response)?)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// === CMAF streaming endpoints ===
|
||||||
|
|
||||||
|
/// Ensure we have a valid CMAF session, renewing if expired.
|
||||||
|
/// Returns `(session_id, infos)` for use with file/url and key derivation.
|
||||||
|
async fn ensure_cmaf_session(&self) -> Result<(String, String)> {
|
||||||
|
let now = get_timestamp();
|
||||||
|
|
||||||
|
// Check existing session (with 60s safety margin)
|
||||||
|
{
|
||||||
|
let guard = self.cmaf_session.read().await;
|
||||||
|
if let Some(ref cs) = *guard {
|
||||||
|
if cs.expires_at > now + 60 {
|
||||||
|
return Ok((cs.session_id.clone(), cs.infos.clone()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Need a new session
|
||||||
|
log::info!("[CMAF] Starting new session");
|
||||||
|
let timestamp = get_timestamp();
|
||||||
|
let sig = sign_session_start(timestamp);
|
||||||
|
|
||||||
|
let url = endpoints::build_url(paths::SESSION_START);
|
||||||
|
let response = self
|
||||||
|
.http
|
||||||
|
.post(&url)
|
||||||
|
.headers(self.authenticated_headers().await?)
|
||||||
|
.form(&[
|
||||||
|
("profile", "qbz-1"),
|
||||||
|
("request_ts", ×tamp.to_string()),
|
||||||
|
("request_sig", &sig),
|
||||||
|
])
|
||||||
|
.send()
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
let status = response.status();
|
||||||
|
if !status.is_success() {
|
||||||
|
return Err(ApiError::ApiResponse(format!(
|
||||||
|
"session/start failed with status {}",
|
||||||
|
status
|
||||||
|
)));
|
||||||
|
}
|
||||||
|
|
||||||
|
let resp: SessionStartResponse = response.json().await?;
|
||||||
|
let infos = resp.infos.unwrap_or_default();
|
||||||
|
log::info!(
|
||||||
|
"[CMAF] Session started: id={}, expires_at={}",
|
||||||
|
resp.session_id,
|
||||||
|
resp.expires_at
|
||||||
|
);
|
||||||
|
|
||||||
|
let session_id = resp.session_id.clone();
|
||||||
|
let infos_clone = infos.clone();
|
||||||
|
|
||||||
|
*self.cmaf_session.write().await = Some(CmafSession {
|
||||||
|
session_id: resp.session_id,
|
||||||
|
infos,
|
||||||
|
expires_at: resp.expires_at,
|
||||||
|
});
|
||||||
|
|
||||||
|
Ok((session_id, infos_clone))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Get CMAF segmented file URL for a track.
|
||||||
|
///
|
||||||
|
/// This is the new streaming endpoint that returns encrypted CMAF segments
|
||||||
|
/// instead of a direct file URL.
|
||||||
|
pub async fn get_file_url(
|
||||||
|
&self,
|
||||||
|
track_id: u64,
|
||||||
|
quality: Quality,
|
||||||
|
) -> Result<TrackFileUrl> {
|
||||||
|
let (session_id, _infos) = self.ensure_cmaf_session().await?;
|
||||||
|
|
||||||
|
let timestamp = get_timestamp();
|
||||||
|
let format_id = quality.id();
|
||||||
|
let sig = sign_file_url(track_id, format_id, timestamp);
|
||||||
|
|
||||||
|
let url = endpoints::build_url(paths::FILE_URL);
|
||||||
|
|
||||||
|
let mut headers = self.authenticated_headers().await?;
|
||||||
|
headers.insert(
|
||||||
|
"X-Session-Id",
|
||||||
|
reqwest::header::HeaderValue::from_str(&session_id)
|
||||||
|
.map_err(|_| ApiError::ApiResponse("Invalid session ID format".into()))?,
|
||||||
|
);
|
||||||
|
|
||||||
|
let response = self
|
||||||
|
.http
|
||||||
|
.get(&url)
|
||||||
|
.headers(headers)
|
||||||
|
.query(&[
|
||||||
|
("track_id", track_id.to_string()),
|
||||||
|
("format_id", format_id.to_string()),
|
||||||
|
("intent", "stream".to_string()),
|
||||||
|
("request_ts", timestamp.to_string()),
|
||||||
|
("request_sig", sig),
|
||||||
|
])
|
||||||
|
.send()
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
let status = response.status();
|
||||||
|
log::info!(
|
||||||
|
"[CMAF] file/url track_id={} format_id={} status={}",
|
||||||
|
track_id,
|
||||||
|
format_id,
|
||||||
|
status
|
||||||
|
);
|
||||||
|
|
||||||
|
if !status.is_success() {
|
||||||
|
return Err(ApiError::ApiResponse(format!(
|
||||||
|
"file/url failed with status {}",
|
||||||
|
status
|
||||||
|
)));
|
||||||
|
}
|
||||||
|
|
||||||
|
let file_url: TrackFileUrl = response.json().await?;
|
||||||
|
log::info!(
|
||||||
|
"[CMAF] file/url result: segments={}, mime={:?}, sampling_rate={:?}",
|
||||||
|
file_url.n_segments,
|
||||||
|
file_url.mime_type,
|
||||||
|
file_url.sampling_rate
|
||||||
|
);
|
||||||
|
|
||||||
|
Ok(file_url)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Default for QobuzClient {
|
impl Default for QobuzClient {
|
||||||
|
|||||||
@@ -55,6 +55,12 @@ pub mod paths {
|
|||||||
// Genre
|
// Genre
|
||||||
pub const GENRE_LIST: &str = "/genre/list";
|
pub const GENRE_LIST: &str = "/genre/list";
|
||||||
|
|
||||||
|
// Session (CMAF streaming)
|
||||||
|
pub const SESSION_START: &str = "/session/start";
|
||||||
|
|
||||||
|
// File (CMAF streaming)
|
||||||
|
pub const FILE_URL: &str = "/file/url";
|
||||||
|
|
||||||
// Catalog (combined search)
|
// Catalog (combined search)
|
||||||
pub const CATALOG_SEARCH: &str = "/catalog/search";
|
pub const CATALOG_SEARCH: &str = "/catalog/search";
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user