mirror of
https://github.com/librespot-org/librespot.git
synced 2024-12-18 17:11:53 +00:00
eb1472c713
- Improve responsiveness by downloading the smallest possible chunk size when seeking or first loading. - Improve download time and decrease CPU usage by downloading the largest possible chunk size as throughput allows, still allowing for reasonable seek responsiveness (~1 second). - As a result, take refactoring opportunities: simplify prefetching logic, download threading, command sending, and some ergonomics. - Fix disappearing controls in the Spotify mobile UI while loading. - Fix handling of seek, pause, and play commands while loading. - Fix download rate calculation (don't use the Mercury rate). - Fix ping time calculation under lock contention.
229 lines
6.9 KiB
Rust
229 lines
6.9 KiB
Rust
use std::{
|
|
collections::HashMap,
|
|
fmt,
|
|
pin::Pin,
|
|
task::{Context, Poll},
|
|
time::{Duration, Instant},
|
|
};
|
|
|
|
use byteorder::{BigEndian, ByteOrder};
|
|
use bytes::Bytes;
|
|
use futures_core::Stream;
|
|
use futures_util::{lock::BiLock, ready, StreamExt};
|
|
use num_traits::FromPrimitive;
|
|
use thiserror::Error;
|
|
use tokio::sync::mpsc;
|
|
|
|
use crate::{packet::PacketType, util::SeqGenerator, Error};
|
|
|
|
component! {
|
|
ChannelManager : ChannelManagerInner {
|
|
sequence: SeqGenerator<u16> = SeqGenerator::new(0),
|
|
channels: HashMap<u16, mpsc::UnboundedSender<(u8, Bytes)>> = HashMap::new(),
|
|
download_rate_estimate: usize = 0,
|
|
download_measurement_start: Option<Instant> = None,
|
|
download_measurement_bytes: usize = 0,
|
|
invalid: bool = false,
|
|
}
|
|
}
|
|
|
|
const ONE_SECOND: Duration = Duration::from_secs(1);
|
|
|
|
#[derive(Debug, Error, Hash, PartialEq, Eq, Copy, Clone)]
|
|
pub struct ChannelError;
|
|
|
|
impl From<ChannelError> for Error {
|
|
fn from(err: ChannelError) -> Self {
|
|
Error::aborted(err)
|
|
}
|
|
}
|
|
|
|
impl fmt::Display for ChannelError {
|
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
|
write!(f, "channel error")
|
|
}
|
|
}
|
|
|
|
pub struct Channel {
|
|
receiver: mpsc::UnboundedReceiver<(u8, Bytes)>,
|
|
state: ChannelState,
|
|
}
|
|
|
|
pub struct ChannelHeaders(BiLock<Channel>);
|
|
pub struct ChannelData(BiLock<Channel>);
|
|
|
|
pub enum ChannelEvent {
|
|
Header(u8, Vec<u8>),
|
|
Data(Bytes),
|
|
}
|
|
|
|
#[derive(Clone)]
|
|
enum ChannelState {
|
|
Header(Bytes),
|
|
Data,
|
|
Closed,
|
|
}
|
|
|
|
impl ChannelManager {
|
|
pub fn allocate(&self) -> (u16, Channel) {
|
|
let (tx, rx) = mpsc::unbounded_channel();
|
|
|
|
let seq = self.lock(|inner| {
|
|
let seq = inner.sequence.get();
|
|
if !inner.invalid {
|
|
inner.channels.insert(seq, tx);
|
|
}
|
|
seq
|
|
});
|
|
|
|
let channel = Channel {
|
|
receiver: rx,
|
|
state: ChannelState::Header(Bytes::new()),
|
|
};
|
|
|
|
(seq, channel)
|
|
}
|
|
|
|
pub(crate) fn dispatch(&self, cmd: PacketType, mut data: Bytes) -> Result<(), Error> {
|
|
use std::collections::hash_map::Entry;
|
|
|
|
let id: u16 = BigEndian::read_u16(data.split_to(2).as_ref());
|
|
|
|
self.lock(|inner| {
|
|
let current_time = Instant::now();
|
|
if let Some(download_measurement_start) = inner.download_measurement_start {
|
|
if (current_time - download_measurement_start) > ONE_SECOND {
|
|
inner.download_rate_estimate = ONE_SECOND.as_millis() as usize
|
|
* inner.download_measurement_bytes
|
|
/ (current_time - download_measurement_start).as_millis() as usize;
|
|
inner.download_measurement_start = Some(current_time);
|
|
inner.download_measurement_bytes = 0;
|
|
}
|
|
} else {
|
|
inner.download_measurement_start = Some(current_time);
|
|
}
|
|
|
|
inner.download_measurement_bytes += data.len();
|
|
|
|
if let Entry::Occupied(entry) = inner.channels.entry(id) {
|
|
entry
|
|
.get()
|
|
.send((cmd as u8, data))
|
|
.map_err(|_| ChannelError)?;
|
|
}
|
|
|
|
Ok(())
|
|
})
|
|
}
|
|
|
|
pub fn get_download_rate_estimate(&self) -> usize {
|
|
self.lock(|inner| inner.download_rate_estimate)
|
|
}
|
|
|
|
pub(crate) fn shutdown(&self) {
|
|
self.lock(|inner| {
|
|
inner.invalid = true;
|
|
// destroy the sending halves of the channels to signal everyone who is waiting for something.
|
|
inner.channels.clear();
|
|
});
|
|
}
|
|
}
|
|
|
|
impl Channel {
|
|
fn recv_packet(&mut self, cx: &mut Context<'_>) -> Poll<Result<Bytes, ChannelError>> {
|
|
let (cmd, packet) = ready!(self.receiver.poll_recv(cx)).ok_or(ChannelError)?;
|
|
|
|
let packet_type = FromPrimitive::from_u8(cmd);
|
|
if let Some(PacketType::ChannelError) = packet_type {
|
|
let code = BigEndian::read_u16(&packet.as_ref()[..2]);
|
|
error!("channel error: {} {}", packet.len(), code);
|
|
|
|
self.state = ChannelState::Closed;
|
|
|
|
Poll::Ready(Err(ChannelError))
|
|
} else {
|
|
Poll::Ready(Ok(packet))
|
|
}
|
|
}
|
|
|
|
pub fn split(self) -> (ChannelHeaders, ChannelData) {
|
|
let (headers, data) = BiLock::new(self);
|
|
|
|
(ChannelHeaders(headers), ChannelData(data))
|
|
}
|
|
}
|
|
|
|
impl Stream for Channel {
|
|
type Item = Result<ChannelEvent, ChannelError>;
|
|
|
|
fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
|
|
loop {
|
|
match self.state.clone() {
|
|
ChannelState::Closed => {
|
|
error!("Polling already terminated channel");
|
|
return Poll::Ready(None);
|
|
}
|
|
|
|
ChannelState::Header(mut data) => {
|
|
if data.is_empty() {
|
|
data = ready!(self.recv_packet(cx))?;
|
|
}
|
|
|
|
let length = BigEndian::read_u16(data.split_to(2).as_ref()) as usize;
|
|
if length == 0 {
|
|
self.state = ChannelState::Data;
|
|
} else {
|
|
let header_id = data.split_to(1).as_ref()[0];
|
|
let header_data = data.split_to(length - 1).as_ref().to_owned();
|
|
|
|
self.state = ChannelState::Header(data);
|
|
|
|
let event = ChannelEvent::Header(header_id, header_data);
|
|
return Poll::Ready(Some(Ok(event)));
|
|
}
|
|
}
|
|
|
|
ChannelState::Data => {
|
|
let data = ready!(self.recv_packet(cx))?;
|
|
if data.is_empty() {
|
|
self.receiver.close();
|
|
self.state = ChannelState::Closed;
|
|
return Poll::Ready(None);
|
|
} else {
|
|
let event = ChannelEvent::Data(data);
|
|
return Poll::Ready(Some(Ok(event)));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
impl Stream for ChannelData {
|
|
type Item = Result<Bytes, ChannelError>;
|
|
|
|
fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
|
|
let mut channel = ready!(self.0.poll_lock(cx));
|
|
|
|
loop {
|
|
match ready!(channel.poll_next_unpin(cx)?) {
|
|
Some(ChannelEvent::Header(..)) => (),
|
|
Some(ChannelEvent::Data(data)) => return Poll::Ready(Some(Ok(data))),
|
|
None => return Poll::Ready(None),
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
impl Stream for ChannelHeaders {
|
|
type Item = Result<(u8, Vec<u8>), ChannelError>;
|
|
|
|
fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
|
|
let mut channel = ready!(self.0.poll_lock(cx));
|
|
|
|
match ready!(channel.poll_next_unpin(cx)?) {
|
|
Some(ChannelEvent::Header(id, data)) => Poll::Ready(Some(Ok((id, data)))),
|
|
_ => Poll::Ready(None),
|
|
}
|
|
}
|
|
}
|