euzu/tuliprox
1
0
Fork 0
mirror of https://github.com/euzu/tuliprox.git synced 2026-10-15 04:12:26 +02:00
Code Issues Packages Projects Releases 5 Wiki Activity

Merge pull request #235 from euzu/featue/proxy_connection

Browse Source 
proxy settings
This commit is contained in:
euzu
2025-04-30 13:40:41 +02:00
committed by GitHub
parent 10095c4573 86ecee997c
commit a9df86eabb
9 changed files with 118 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/endpoints/download_api.rs
+6 -4
View File
@@ -1,6 +1,6 @@
use crate::api::model::app_state::AppState;
use crate::api::model::download::{DownloadQueue, FileDownload, FileDownloadRequest};
use crate::model::config::VideoDownloadConfig;
use crate::model::config::{ConfigProxy, VideoDownloadConfig};
use crate::utils::network::request;
use tokio::sync::RwLock;
use futures::stream::TryStreamExt;
@@ -13,6 +13,7 @@ use std::sync::Arc;
use std::{fs};
use axum::response::IntoResponse;
use crate::m3u_filter_error::to_io_error;
use crate::utils::network::request::create_client;
async fn download_file(active: Arc<RwLock<Option<FileDownload>>>, client: &reqwest::Client) -> Result<(), String> {
let file_download = { active.read().await.as_ref().unwrap().clone() };
@@ -61,13 +62,14 @@ async fn download_file(active: Arc<RwLock<Option<FileDownload>>>, client: &reqwe
}
}
async fn run_download_queue(download_cfg: &VideoDownloadConfig, download_queue: &Arc<DownloadQueue>) -> Result<(), String> {
async fn run_download_queue(proxy_config: Option<&ConfigProxy>, download_cfg: &VideoDownloadConfig, download_queue: &Arc<DownloadQueue>) -> Result<(), String> {
let next_download = download_queue.as_ref().queue.lock().await.pop_front();
if next_download.is_some() {
{ *download_queue.as_ref().active.write().await = next_download; }
let headers = request::get_request_headers(Some(&download_cfg.headers), None);
let dq = Arc::clone(download_queue);
match reqwest::Client::builder().default_headers(headers).build() {
match create_client(proxy_config).default_headers(headers).build() {
Ok(client) => {
tokio::spawn(async move {
loop {
@@ -121,7 +123,7 @@ pub async fn queue_download_file(
Some(file_download) => {
app_state.downloads.queue.lock().await.push_back(file_download.clone());
if app_state.downloads.active.read().await.is_none() {
match run_download_queue(download_cfg, &app_state.downloads).await {
match run_download_queue(app_state.config.proxy.as_ref(), download_cfg, &app_state.downloads).await {
Ok(()) => {}
Err(err) => return (axum::http::StatusCode::INTERNAL_SERVER_ERROR, axum::Json(json!({"error": err}))).into_response(),
}
src/api/main_api.rs
+2 -1
View File
@@ -27,6 +27,7 @@ use axum::Router;
use tokio::sync::Mutex;
use tower_governor::key_extractor::SmartIpKeyExtractor;
use crate::api::api_utils::{get_build_time, get_server_time};
use crate::utils::network::request::create_client;
use crate::VERSION;
fn get_web_dir_path(web_ui_enabled: bool, web_root: &str) -> Result<PathBuf, std::io::Error> {
@@ -71,7 +72,7 @@ async fn create_shared_data(cfg: &Arc<Config>) -> AppState {
let active_users = Arc::new(ActiveUserManager::new(cfg));
let active_provider = Arc::new(ActiveProviderManager::new(cfg).await);
let mut builder = Client::builder().http1_only();
let mut builder = create_client(cfg.proxy.as_ref()).http1_only();
if cfg.connect_timeout_secs > 0 {
builder = builder.connect_timeout(Duration::from_secs(u64::from(cfg.connect_timeout_secs)));
}