github-mirrors/librespot
1
0
Fork 0
mirror of https://github.com/librespot-org/librespot.git synced 2025-01-17 17:34:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

core: audio key response timeout after 1.5s (#1360)

Browse source
This commit is contained in:
Nick Steel 2024-10-07 06:54:16 +01:00 committed by GitHub
parent 0ddb3b4cb6
commit 8b769e035b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
core/src/audio_key.rs
View file

@ -1,4 +1,4 @@
use std::{collections::HashMap, io::Write}; use std::{collections::HashMap, io::Write, time::Duration};
use byteorder::{BigEndian, ByteOrder, WriteBytesExt}; use byteorder::{BigEndian, ByteOrder, WriteBytesExt};
use bytes::Bytes; use bytes::Bytes;
@ -20,6 +20,8 @@ pub enum AudioKeyError {
Packet(u8), Packet(u8),
#[error("sequence {0} not pending")] #[error("sequence {0} not pending")]
Sequence(u32), Sequence(u32),
#[error("audio key response timeout")]
Timeout,
} }
impl From<AudioKeyError> for Error { impl From<AudioKeyError> for Error {
@ -29,6 +31,7 @@ impl From<AudioKeyError> for Error {
AudioKeyError::Channel => Error::aborted(err), AudioKeyError::Channel => Error::aborted(err),
AudioKeyError::Sequence(_) => Error::aborted(err), AudioKeyError::Sequence(_) => Error::aborted(err),
AudioKeyError::Packet(_) => Error::unimplemented(err), AudioKeyError::Packet(_) => Error::unimplemented(err),
AudioKeyError::Timeout => Error::aborted(err),
} }
} }
} }
@ -89,7 +92,14 @@ impl AudioKeyManager {
}); });
self.send_key_request(seq, track, file)?; self.send_key_request(seq, track, file)?;
rx.await? const KEY_RESPONSE_TIMEOUT: Duration = Duration::from_millis(1500);
match tokio::time::timeout(KEY_RESPONSE_TIMEOUT, rx).await {
Err(_) => {
error!("Audio key response timeout");
Err(AudioKeyError::Timeout.into())
}
Ok(k) => k?,
}
} }
fn send_key_request(&self, seq: u32, track: SpotifyId, file: FileId) -> Result<(), Error> { fn send_key_request(&self, seq: u32, track: SpotifyId, file: FileId) -> Result<(), Error> {