Sulkta-Coop/rustypipe
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: player: handle VPN ban and captcha required error messages

Browse source
This commit is contained in:
ThetaDev 2025-04-23 21:21:23 +02:00
parent d675987654
commit be6da5e7e3
No known key found for this signature in database
GPG key ID: E319D3C5148D65B6
3 changed files with 36 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/client/player.rs
View file

@ -307,24 +307,28 @@ impl MapResponse<VideoPlayer> for response::Player {
error_screen, error_screen,
} => { } => {
let mut msg = reason; let mut msg = reason;
if let Some(error_screen) = error_screen { if let Some(error_screen) = error_screen.player_error_message_renderer {
msg.push_str(" - "); msg.push_str(" - ");
msg.push_str(&error_screen.player_error_message_renderer.subreason); msg.push_str(&error_screen.subreason);
} }
let reason = msg let reason = if error_screen.player_captcha_view_model.is_some() {
.split_whitespace() UnavailabilityReason::Captcha
.find_map(|word| match word { } else {
"payment" => Some(UnavailabilityReason::Paid), msg.split_whitespace()
"Premium" => Some(UnavailabilityReason::Premium), .find_map(|word| match word {
"members-only" => Some(UnavailabilityReason::MembersOnly), "payment" => Some(UnavailabilityReason::Paid),
"country" => Some(UnavailabilityReason::Geoblocked), "Premium" => Some(UnavailabilityReason::Premium),
"version" | "websites" => Some(UnavailabilityReason::UnsupportedClient), "members-only" => Some(UnavailabilityReason::MembersOnly),
"bot" => Some(UnavailabilityReason::IpBan), "country" => Some(UnavailabilityReason::Geoblocked),
"later." => Some(UnavailabilityReason::TryAgain), "version" | "websites" => Some(UnavailabilityReason::UnsupportedClient),
_ => None, "bot" => Some(UnavailabilityReason::IpBan),
}) "VPN/Proxy" => Some(UnavailabilityReason::VpnBan),
.unwrap_or_default(); "later." => Some(UnavailabilityReason::TryAgain),
_ => None,
})
.unwrap_or_default()
};
return Err(ExtractionError::Unavailable { reason, msg }); return Err(ExtractionError::Unavailable { reason, msg });
} }
response::player::PlayabilityStatus::LoginRequired { reason, messages } => { response::player::PlayabilityStatus::LoginRequired { reason, messages } => {

13
src/client/response/player.rs
View file

@ -37,8 +37,7 @@ pub(crate) enum PlayabilityStatus {
#[serde(default)] #[serde(default)]
reason: String, reason: String,
#[serde(default)] #[serde(default)]
#[serde_as(deserialize_as = "DefaultOnError")] error_screen: ErrorScreen,
error_screen: Option<ErrorScreen>,
}, },
/// Age limit / Private video /// Age limit / Private video
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
@ -61,14 +60,18 @@ pub(crate) enum PlayabilityStatus {
}, },
} }
#[derive(Debug, Deserialize)] #[serde_as]
#[derive(Default, Debug, Deserialize)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub(crate) struct ErrorScreen { pub(crate) struct ErrorScreen {
pub player_error_message_renderer: ErrorMessage, #[serde(default)]
#[serde_as(deserialize_as = "DefaultOnError")]
pub player_error_message_renderer: Option<ErrorMessage>,
pub player_captcha_view_model: Option<Empty>,
} }
#[serde_as] #[serde_as]
#[derive(Debug, Deserialize)] #[derive(Default, Debug, Deserialize)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub(crate) struct ErrorMessage { pub(crate) struct ErrorMessage {
#[serde_as(as = "Text")] #[serde_as(as = "Text")]

9
src/error.rs
View file

@ -105,6 +105,13 @@ pub enum UnavailabilityReason {
OfflineLivestream, OfflineLivestream,
/// YouTube banned your IP address from accessing the platform without an account /// YouTube banned your IP address from accessing the platform without an account
IpBan, IpBan,
/// YouTube bans IP addresses from certain VPN providers from accessing certain geo-restricted
/// videos.
///
/// If this happens to you, you can try another server / VPN provider or disable your VPN.
VpnBan,
/// YouTube requires the user to solve a ReCaptcha
Captcha,
/// Video temporarily unavailable (rate limit) /// Video temporarily unavailable (rate limit)
TryAgain, TryAgain,
/// Video cant be played for other reasons /// Video cant be played for other reasons
@ -125,6 +132,8 @@ impl Display for UnavailabilityReason {
UnavailabilityReason::MembersOnly => f.write_str("members-only"), UnavailabilityReason::MembersOnly => f.write_str("members-only"),
UnavailabilityReason::OfflineLivestream => f.write_str("offline stream"), UnavailabilityReason::OfflineLivestream => f.write_str("offline stream"),
UnavailabilityReason::IpBan => f.write_str("ip-ban"), UnavailabilityReason::IpBan => f.write_str("ip-ban"),
UnavailabilityReason::VpnBan => f.write_str("vpn-ban"),
UnavailabilityReason::Captcha => f.write_str("captcha"),
UnavailabilityReason::TryAgain => f.write_str("try again"), UnavailabilityReason::TryAgain => f.write_str("try again"),
UnavailabilityReason::Unplayable => f.write_str("unplayable"), UnavailabilityReason::Unplayable => f.write_str("unplayable"),
} }