fix(qconnect): fix queue error decode and add context_uuid to queue commands
ErrorMessage.code was defined as int32 but server sends string codes (e.g. 'ERROR_QUEUE_INSERT_TRACKS'). Changed to string type and added logging for queue error responses. Added context_uuid (random UUID v4) to queue insert and add commands - the server likely requires this to associate tracks with a context.
This commit is contained in:
4 files changed
+12
-4
No files matched your search
@@ -10,5 +10,6 @@ qconnect-core = { path = "../qconnect-core" }
|
|||||||
serde = { workspace = true }
|
serde = { workspace = true }
|
||||||
serde_json = { workspace = true }
|
serde_json = { workspace = true }
|
||||||
thiserror = { workspace = true }
|
thiserror = { workspace = true }
|
||||||
|
log = { workspace = true }
|
||||||
prost = "0.13"
|
prost = "0.13"
|
||||||
uuid = { version = "1", features = ["v4"] }
|
uuid = { version = "1", features = ["v4"] }
|
||||||
@@ -488,8 +488,7 @@ fn map_queue_error(payload: QueueErrorMessage) -> Result<QueueServerEvent, Proto
|
|||||||
let error_code = payload
|
let error_code = payload
|
||||||
.error
|
.error
|
||||||
.as_ref()
|
.as_ref()
|
||||||
.and_then(|err| err.code)
|
.and_then(|err| err.code.clone())
|
||||||
.map(|code| code.to_string())
|
|
||||||
.unwrap_or_else(|| "remote_error".to_string());
|
.unwrap_or_else(|| "remote_error".to_string());
|
||||||
let error_message = payload
|
let error_message = payload
|
||||||
.error
|
.error
|
||||||
@@ -497,6 +496,10 @@ fn map_queue_error(payload: QueueErrorMessage) -> Result<QueueServerEvent, Proto
|
|||||||
.and_then(|err| err.message.clone())
|
.and_then(|err| err.message.clone())
|
||||||
.unwrap_or_else(|| "queue_error_message".to_string());
|
.unwrap_or_else(|| "queue_error_message".to_string());
|
||||||
|
|
||||||
|
log::warn!(
|
||||||
|
"[QConnect/Decode] Queue error from server: code={error_code} message={error_message}"
|
||||||
|
);
|
||||||
|
|
||||||
Ok(QueueServerEvent {
|
Ok(QueueServerEvent {
|
||||||
event_type: QueueEventType::SrvrCtrlQueueErrorMessage,
|
event_type: QueueEventType::SrvrCtrlQueueErrorMessage,
|
||||||
action_uuid: uuid_bytes_to_string_opt(payload.action_uuid, "queue_error.action_uuid")?,
|
action_uuid: uuid_bytes_to_string_opt(payload.action_uuid, "queue_error.action_uuid")?,
|
||||||
|
|||||||
@@ -74,8 +74,10 @@ pub struct QueueVersionRef {
|
|||||||
|
|
||||||
#[derive(Clone, PartialEq, ::prost::Message)]
|
#[derive(Clone, PartialEq, ::prost::Message)]
|
||||||
pub struct ErrorMessage {
|
pub struct ErrorMessage {
|
||||||
#[prost(int32, optional, tag = "1")]
|
/// Server sends error codes as strings (e.g. "ERROR_QUEUE_INSERT_TRACKS"),
|
||||||
pub code: Option<i32>,
|
/// not integers. Wire type = LengthDelimited (string).
|
||||||
|
#[prost(string, optional, tag = "1")]
|
||||||
|
pub code: Option<String>,
|
||||||
#[prost(string, optional, tag = "2")]
|
#[prost(string, optional, tag = "2")]
|
||||||
pub message: Option<String>,
|
pub message: Option<String>,
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -270,6 +270,7 @@ export async function queueTrackNext(
|
|||||||
const insertAfter = await getQconnectInsertAfterQueueItemId();
|
const insertAfter = await getQconnectInsertAfterQueueItemId();
|
||||||
const payload: Record<string, unknown> = {
|
const payload: Record<string, unknown> = {
|
||||||
track_ids: [queueTrack.id],
|
track_ids: [queueTrack.id],
|
||||||
|
context_uuid: crypto.randomUUID(),
|
||||||
autoplay_reset: false,
|
autoplay_reset: false,
|
||||||
autoplay_loading: false
|
autoplay_loading: false
|
||||||
};
|
};
|
||||||
@@ -337,6 +338,7 @@ export async function queueTrackLater(
|
|||||||
try {
|
try {
|
||||||
await sendQconnectQueueCommandWithAdmission('queue_add_tracks', origin, {
|
await sendQconnectQueueCommandWithAdmission('queue_add_tracks', origin, {
|
||||||
track_ids: [queueTrack.id],
|
track_ids: [queueTrack.id],
|
||||||
|
context_uuid: crypto.randomUUID(),
|
||||||
autoplay_reset: false,
|
autoplay_reset: false,
|
||||||
autoplay_loading: false
|
autoplay_loading: false
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in new issue
Block a user