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

feat: add support for rustypipe-botguard to get PO tokens

Browse source
This commit is contained in:
ThetaDev 2025-02-03 02:41:17 +01:00
parent 92340056f8
commit b90a252a5e
No known key found for this signature in database
GPG key ID: E319D3C5148D65B6
16 changed files with 313 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

4
downloader/src/error.rs
View file

@ -13,8 +13,8 @@ pub enum DownloadError {
#[error("http error: {0}")]
Http(#[from] reqwest::Error),
/// 403 error trying to download video
#[error("YouTube returned 403 error")]
Forbidden(ClientType),
#[error("YouTube returned 403 error; visitor_data={}", .1.as_deref().unwrap_or_default())]
Forbidden(ClientType, Option<String>),
/// File IO error
#[error(transparent)]
Io(#[from] std::io::Error),

18
downloader/src/lib.rs
View file

@ -21,7 +21,7 @@ use rand::Rng;
use regex::Regex;
use reqwest::{header, Client, StatusCode, Url};
use rustypipe::{
client::{ClientType, RustyPipe, DEFAULT_PLAYER_CLIENT_ORDER},
client::{ClientType, RustyPipe},
model::{
traits::{FileFormat, YtEntity},
AudioCodec, TrackItem, VideoCodec, VideoPlayer,
@ -698,9 +698,9 @@ impl DownloadQuery {
.await
{
Ok(res) => return Ok(res),
Err(DownloadError::Forbidden(c)) => {
Err(DownloadError::Forbidden(c, vd)) => {
failed_client = Some(c);
DownloadError::Forbidden(c)
DownloadError::Forbidden(c, vd)
}
Err(DownloadError::Http(e)) => {
if !e.is_timeout() {
@ -770,7 +770,7 @@ impl DownloadQuery {
.as_ref()
.or(self.dl.i.client_types.as_ref())
.map(Vec::as_slice)
.unwrap_or(DEFAULT_PLAYER_CLIENT_ORDER),
.unwrap_or(q.player_client_order()),
);
// If the last download failed, try another client if possible
@ -885,7 +885,14 @@ impl DownloadQuery {
.map_err(|e| {
if let DownloadError::Http(e) = &e {
if e.status() == Some(StatusCode::FORBIDDEN) {
return DownloadError::Forbidden(player_data.client_type);
// 403 errors may occur due to bad visitor data IDs
if let Some(vd) = &player_data.visitor_data {
q.remove_visitor_data(vd);
}
return DownloadError::Forbidden(
player_data.client_type,
player_data.visitor_data.clone(),
);
}
}
e
@ -1410,7 +1417,6 @@ async fn download_chunks_by_param(
));
}
tracing::debug!("Retrieving chunks...");
let mut stream = res.bytes_stream();
while let Some(item) = stream.next().await {
// Retrieve chunk.