Main goal: a lot of nested future/result folding. This mainly modifies error handling for Tracks and TrackHandles to be more consistent, and hides the underlying channel result passing in get_info. Errors returned should be far clearer, and are domain specific rather than falling back to a very opaque use of the underlying channel error. It should be clearer to users why their handle commands failed, or why they can't make a ytdl track loop or similar. Also fixed/cleaned up Songbird::join(_gateway) to return in a single await, sparing the user from the underlying channel details and repeated Errs. I was trying for some time to extend the same graces to `Call`, but could not figure out a sane way to get a 'static version of the first future in the chain (i.e., the gateway send) so that the whole thing could happen after dropping the lock around the Call. I really wanted to fix this to happen as a single folded await too, but I think this might need some crazy hack or redesign.
357 lines
11 KiB
Rust
357 lines
11 KiB
Rust
#[cfg(feature = "driver")]
|
|
use crate::{
|
|
driver::{Config, Driver},
|
|
error::ConnectionResult,
|
|
};
|
|
use crate::{
|
|
error::{JoinError, JoinResult},
|
|
id::{ChannelId, GuildId, UserId},
|
|
info::{ConnectionInfo, ConnectionProgress},
|
|
shards::Shard,
|
|
};
|
|
use flume::{r#async::RecvFut, Sender};
|
|
use serde_json::json;
|
|
use tracing::instrument;
|
|
|
|
#[cfg(feature = "driver")]
|
|
use std::ops::{Deref, DerefMut};
|
|
|
|
#[derive(Clone, Debug)]
|
|
enum Return {
|
|
Info(Sender<ConnectionInfo>),
|
|
#[cfg(feature = "driver")]
|
|
Conn(Sender<ConnectionResult<()>>),
|
|
}
|
|
|
|
/// The Call handler is responsible for a single voice connection, acting
|
|
/// as a clean API above the inner state and gateway message management.
|
|
///
|
|
/// If the `"driver"` feature is enabled, then a Call exposes all control methods of
|
|
/// [`Driver`] via `Deref(Mut)`.
|
|
///
|
|
/// [`Driver`]: struct@Driver
|
|
#[derive(Clone, Debug)]
|
|
pub struct Call {
|
|
connection: Option<(ChannelId, ConnectionProgress, Return)>,
|
|
|
|
#[cfg(feature = "driver")]
|
|
/// The internal controller of the voice connection monitor thread.
|
|
driver: Driver,
|
|
|
|
guild_id: GuildId,
|
|
/// Whether the current handler is set to deafen voice connections.
|
|
self_deaf: bool,
|
|
/// Whether the current handler is set to mute voice connections.
|
|
self_mute: bool,
|
|
user_id: UserId,
|
|
/// Will be set when a `Call` is made via the [`new`]
|
|
/// method.
|
|
///
|
|
/// When set via [`standalone`](`Call::standalone`), it will not be
|
|
/// present.
|
|
///
|
|
/// [`new`]: Call::new
|
|
/// [`standalone`]: Call::standalone
|
|
ws: Option<Shard>,
|
|
}
|
|
|
|
impl Call {
|
|
/// Creates a new Call, which will send out WebSocket messages via
|
|
/// the given shard.
|
|
#[inline]
|
|
#[instrument]
|
|
pub fn new(guild_id: GuildId, ws: Shard, user_id: UserId) -> Self {
|
|
Self::new_raw(guild_id, Some(ws), user_id)
|
|
}
|
|
|
|
#[cfg(feature = "driver")]
|
|
/// Creates a new Call, configuring the driver as specified.
|
|
#[inline]
|
|
#[instrument]
|
|
pub fn from_driver_config(
|
|
guild_id: GuildId,
|
|
ws: Shard,
|
|
user_id: UserId,
|
|
config: Config,
|
|
) -> Self {
|
|
Self::new_raw_cfg(guild_id, Some(ws), user_id, config)
|
|
}
|
|
|
|
/// Creates a new, standalone Call which is not connected via
|
|
/// WebSocket to the Gateway.
|
|
///
|
|
/// Actions such as muting, deafening, and switching channels will not
|
|
/// function through this Call and must be done through some other
|
|
/// method, as the values will only be internally updated.
|
|
///
|
|
/// For most use cases you do not want this.
|
|
#[inline]
|
|
#[instrument]
|
|
pub fn standalone(guild_id: GuildId, user_id: UserId) -> Self {
|
|
Self::new_raw(guild_id, None, user_id)
|
|
}
|
|
|
|
#[cfg(feature = "driver")]
|
|
/// Creates a new standalone Call, configuring the driver as specified.
|
|
#[inline]
|
|
#[instrument]
|
|
pub fn standalone_from_driver_config(
|
|
guild_id: GuildId,
|
|
user_id: UserId,
|
|
config: Config,
|
|
) -> Self {
|
|
Self::new_raw_cfg(guild_id, None, user_id, config)
|
|
}
|
|
|
|
fn new_raw(guild_id: GuildId, ws: Option<Shard>, user_id: UserId) -> Self {
|
|
Call {
|
|
connection: None,
|
|
#[cfg(feature = "driver")]
|
|
driver: Default::default(),
|
|
guild_id,
|
|
self_deaf: false,
|
|
self_mute: false,
|
|
user_id,
|
|
ws,
|
|
}
|
|
}
|
|
|
|
#[cfg(feature = "driver")]
|
|
fn new_raw_cfg(guild_id: GuildId, ws: Option<Shard>, user_id: UserId, config: Config) -> Self {
|
|
Call {
|
|
connection: None,
|
|
driver: Driver::new(config),
|
|
guild_id,
|
|
self_deaf: false,
|
|
self_mute: false,
|
|
user_id,
|
|
ws,
|
|
}
|
|
}
|
|
|
|
#[instrument(skip(self))]
|
|
fn do_connect(&mut self) {
|
|
match &self.connection {
|
|
Some((_, ConnectionProgress::Complete(c), Return::Info(tx))) => {
|
|
// It's okay if the receiver hung up.
|
|
let _ = tx.send(c.clone());
|
|
},
|
|
#[cfg(feature = "driver")]
|
|
Some((_, ConnectionProgress::Complete(c), Return::Conn(tx))) => {
|
|
self.driver.raw_connect(c.clone(), tx.clone());
|
|
},
|
|
_ => {},
|
|
}
|
|
}
|
|
|
|
/// Sets whether the current connection is to be deafened.
|
|
///
|
|
/// If there is no live voice connection, then this only acts as a settings
|
|
/// update for future connections.
|
|
///
|
|
/// **Note**: Unlike in the official client, you _can_ be deafened while
|
|
/// not being muted.
|
|
///
|
|
/// **Note**: If the `Call` was created via [`standalone`], then this
|
|
/// will _only_ update whether the connection is internally deafened.
|
|
///
|
|
/// [`standalone`]: Call::standalone
|
|
#[instrument(skip(self))]
|
|
pub async fn deafen(&mut self, deaf: bool) -> JoinResult<()> {
|
|
self.self_deaf = deaf;
|
|
|
|
self.update().await
|
|
}
|
|
|
|
/// Returns whether the current connection is self-deafened in this server.
|
|
///
|
|
/// This is purely cosmetic.
|
|
#[instrument(skip(self))]
|
|
pub fn is_deaf(&self) -> bool {
|
|
self.self_deaf
|
|
}
|
|
|
|
#[cfg(feature = "driver")]
|
|
/// Connect or switch to the given voice channel by its Id.
|
|
///
|
|
/// This function acts as a future in two stages:
|
|
/// * The first `await` sends the request over the gateway.
|
|
/// * The second `await`s a the driver's connection attempt.
|
|
/// To prevent deadlock, any mutexes around this Call
|
|
/// *must* be released before this result is queried.
|
|
///
|
|
/// When using [`Songbird::join`], this pattern is correctly handled for you.
|
|
///
|
|
/// [`Songbird::join`]: crate::Songbird::join
|
|
#[instrument(skip(self))]
|
|
pub async fn join(
|
|
&mut self,
|
|
channel_id: ChannelId,
|
|
) -> JoinResult<RecvFut<'static, ConnectionResult<()>>> {
|
|
let (tx, rx) = flume::unbounded();
|
|
|
|
self.connection = Some((
|
|
channel_id,
|
|
ConnectionProgress::new(self.guild_id, self.user_id),
|
|
Return::Conn(tx),
|
|
));
|
|
|
|
self.update().await.map(|_| rx.into_recv_async())
|
|
}
|
|
|
|
/// Join the selected voice channel, *without* running/starting an RTP
|
|
/// session or running the driver.
|
|
///
|
|
/// Use this if you require connection info for lavalink,
|
|
/// some other voice implementation, or don't want to use the driver for a given call.
|
|
///
|
|
/// This function acts as a future in two stages:
|
|
/// * The first `await` sends the request over the gateway.
|
|
/// * The second `await`s voice session data from Discord.
|
|
/// To prevent deadlock, any mutexes around this Call
|
|
/// *must* be released before this result is queried.
|
|
///
|
|
/// When using [`Songbird::join_gateway`], this pattern is correctly handled for you.
|
|
///
|
|
/// [`Songbird::join_gateway`]: crate::Songbird::join_gateway
|
|
#[instrument(skip(self))]
|
|
pub async fn join_gateway(
|
|
&mut self,
|
|
channel_id: ChannelId,
|
|
) -> JoinResult<RecvFut<'static, ConnectionInfo>> {
|
|
let (tx, rx) = flume::unbounded();
|
|
|
|
self.connection = Some((
|
|
channel_id,
|
|
ConnectionProgress::new(self.guild_id, self.user_id),
|
|
Return::Info(tx),
|
|
));
|
|
|
|
self.update().await.map(|_| rx.into_recv_async())
|
|
}
|
|
|
|
/// Leaves the current voice channel, disconnecting from it.
|
|
///
|
|
/// This does _not_ forget settings, like whether to be self-deafened or
|
|
/// self-muted.
|
|
///
|
|
/// **Note**: If the `Call` was created via [`standalone`], then this
|
|
/// will _only_ update whether the connection is internally connected to a
|
|
/// voice channel.
|
|
///
|
|
/// [`standalone`]: Call::standalone
|
|
#[instrument(skip(self))]
|
|
pub async fn leave(&mut self) -> JoinResult<()> {
|
|
// Only send an update if we were in a voice channel.
|
|
self.connection = None;
|
|
|
|
#[cfg(feature = "driver")]
|
|
self.driver.leave();
|
|
|
|
self.update().await
|
|
}
|
|
|
|
/// Sets whether the current connection is to be muted.
|
|
///
|
|
/// If there is no live voice connection, then this only acts as a settings
|
|
/// update for future connections.
|
|
///
|
|
/// **Note**: If the `Call` was created via [`standalone`], then this
|
|
/// will _only_ update whether the connection is internally muted.
|
|
///
|
|
/// [`standalone`]: Call::standalone
|
|
#[instrument(skip(self))]
|
|
pub async fn mute(&mut self, mute: bool) -> JoinResult<()> {
|
|
self.self_mute = mute;
|
|
|
|
#[cfg(feature = "driver")]
|
|
self.driver.mute(mute);
|
|
|
|
self.update().await
|
|
}
|
|
|
|
/// Returns whether the current connection is self-muted in this server.
|
|
#[instrument(skip(self))]
|
|
pub fn is_mute(&self) -> bool {
|
|
self.self_mute
|
|
}
|
|
|
|
/// Updates the voice server data.
|
|
///
|
|
/// You should only need to use this if you initialized the `Call` via
|
|
/// [`standalone`].
|
|
///
|
|
/// [`standalone`]: Call::standalone
|
|
#[instrument(skip(self, token))]
|
|
pub fn update_server(&mut self, endpoint: String, token: String) {
|
|
let try_conn = if let Some((_, ref mut progress, _)) = self.connection.as_mut() {
|
|
progress.apply_server_update(endpoint, token)
|
|
} else {
|
|
false
|
|
};
|
|
|
|
if try_conn {
|
|
self.do_connect();
|
|
}
|
|
}
|
|
|
|
/// Updates the internal voice state of the current user.
|
|
///
|
|
/// You should only need to use this if you initialized the `Call` via
|
|
/// [`standalone`].
|
|
///
|
|
/// [`standalone`]: Call::standalone
|
|
#[instrument(skip(self))]
|
|
pub fn update_state(&mut self, session_id: String) {
|
|
let try_conn = if let Some((_, ref mut progress, _)) = self.connection.as_mut() {
|
|
progress.apply_state_update(session_id)
|
|
} else {
|
|
false
|
|
};
|
|
|
|
if try_conn {
|
|
self.do_connect();
|
|
}
|
|
}
|
|
|
|
/// Send an update for the current session over WS.
|
|
///
|
|
/// Does nothing if initialized via [`standalone`].
|
|
///
|
|
/// [`standalone`]: Call::standalone
|
|
#[instrument(skip(self))]
|
|
async fn update(&mut self) -> JoinResult<()> {
|
|
if let Some(ws) = self.ws.as_mut() {
|
|
let map = json!({
|
|
"op": 4,
|
|
"d": {
|
|
"channel_id": self.connection.as_ref().map(|c| c.0.0),
|
|
"guild_id": self.guild_id.0,
|
|
"self_deaf": self.self_deaf,
|
|
"self_mute": self.self_mute,
|
|
}
|
|
});
|
|
|
|
ws.send(map).await
|
|
} else {
|
|
Err(JoinError::NoSender)
|
|
}
|
|
}
|
|
}
|
|
|
|
#[cfg(feature = "driver")]
|
|
impl Deref for Call {
|
|
type Target = Driver;
|
|
|
|
fn deref(&self) -> &Self::Target {
|
|
&self.driver
|
|
}
|
|
}
|
|
|
|
#[cfg(feature = "driver")]
|
|
impl DerefMut for Call {
|
|
fn deref_mut(&mut self) -> &mut Self::Target {
|
|
&mut self.driver
|
|
}
|
|
}
|