replace lazy_static with once_cell

This commit is contained in:
Hayaku 2023-03-24 18:19:56 +03:00
parent 6b1a5e657c
commit eea81836b7
3 changed files with 56 additions and 58 deletions

12
Cargo.lock generated
View file

@ -829,12 +829,6 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388"
[[package]]
name = "lazy_static"
version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "lebe"
version = "0.5.2"
@ -1004,9 +998,9 @@ dependencies = [
[[package]]
name = "once_cell"
version = "1.16.0"
version = "1.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860"
checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
[[package]]
name = "parking_lot"
@ -1081,7 +1075,7 @@ version = "0.1.0"
dependencies = [
"actix-web",
"image",
"lazy_static",
"once_cell",
"qstring",
"regex",
"reqwest",

View file

@ -8,7 +8,7 @@ version = "0.1.0"
[dependencies]
actix-web = "4.3.1"
image = "0.24.5"
lazy_static = "1.4.0"
once_cell = "1.17.1"
qstring = "0.7.2"
regex = "1.7.2"
reqwest = {version = "0.11.15", features = ["rustls-tls", "stream", "brotli", "gzip"], default-features = false}

View file

@ -1,10 +1,10 @@
use std::env;
use std::error::Error;
use actix_web::{App, HttpRequest, HttpResponse, HttpResponseBuilder, HttpServer, web};
use actix_web::http::Method;
use actix_web::{web, App, HttpRequest, HttpResponse, HttpResponseBuilder, HttpServer};
use image::EncodableLayout;
use lazy_static::lazy_static;
use once_cell::sync::Lazy;
use qstring::QString;
use regex::Regex;
use reqwest::{Client, Request, Url};
@ -15,8 +15,7 @@ async fn main() -> std::io::Result<()> {
let server = HttpServer::new(|| {
// match all requests
App::new()
.default_service(web::to(index))
App::new().default_service(web::to(index))
});
// get port from env
if env::var("UDS").is_ok() {
@ -24,30 +23,30 @@ async fn main() -> std::io::Result<()> {
} else {
let bind = env::var("BIND").unwrap_or_else(|_| "0.0.0.0:8080".to_string());
server.bind(bind)?
}.run().await
}
.run()
.await
}
lazy_static!(
static ref RE_DOMAIN: Regex = Regex::new(r"^(?:[a-z\d\.-]*\.)?((?:[a-z\d-]*)\.(?:[a-z\d-]*))$").unwrap();
static ref RE_MANIFEST: Regex = Regex::new("(?m)URI=\"([^\"]+)\"").unwrap();
static ref RE_DASH_MANIFEST: Regex = Regex::new("BaseURL>(https://[^<]+)</BaseURL").unwrap();
);
static RE_DOMAIN: Lazy<Regex> =
Lazy::new(|| Regex::new(r"^(?:[a-z\d\.-]*\.)?((?:[a-z\d-]*)\.(?:[a-z\d-]*))$").unwrap());
static RE_MANIFEST: Lazy<Regex> = Lazy::new(|| Regex::new("(?m)URI=\"([^\"]+)\"").unwrap());
static RE_DASH_MANIFEST: Lazy<Regex> =
Lazy::new(|| Regex::new("BaseURL>(https://[^<]+)</BaseURL").unwrap());
lazy_static!(
static ref CLIENT: Client = {
let builder = Client::builder()
.user_agent("Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.0");
static CLIENT: Lazy<Client> = Lazy::new(|| {
let builder = Client::builder()
.user_agent("Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.0");
if env::var("IPV4_ONLY").is_ok() {
builder
if env::var("IPV4_ONLY").is_ok() {
builder
.local_address(Some("0.0.0.0".parse().unwrap()))
.build()
.unwrap()
} else {
builder.build().unwrap()
}
};
);
} else {
builder.build().unwrap()
}
});
const ALLOWED_DOMAINS: [&str; 7] = [
"youtube.com",
@ -72,14 +71,17 @@ fn is_header_allowed(header: &str) -> bool {
return false;
}
!matches!(header, "host" |
"content-length" |
"set-cookie" |
"alt-svc" |
"accept-ch" |
"report-to" |
"strict-transport-security" |
"user-agent")
!matches!(
header,
"host"
| "content-length"
| "set-cookie"
| "alt-svc"
| "accept-ch"
| "report-to"
| "strict-transport-security"
| "user-agent"
)
}
async fn index(req: HttpRequest) -> Result<HttpResponse, Box<dyn Error>> {
@ -134,7 +136,8 @@ async fn index(req: HttpRequest) -> Result<HttpResponse, Box<dyn Error>> {
let qs = {
let qs = query.clone();
let collected = qs.into_pairs()
let collected = qs
.into_pairs()
.into_iter()
.filter(|(key, _)| key != "host" && key != "rewrite")
.collect::<Vec<_>>();
@ -144,10 +147,7 @@ async fn index(req: HttpRequest) -> Result<HttpResponse, Box<dyn Error>> {
let mut url = Url::parse(&format!("https://{}{}", host, req.path()))?;
url.set_query(Some(qs.to_string().as_str()));
let mut request = Request::new(
req.method().clone(),
url,
);
let mut request = Request::new(req.method().clone(), url);
let request_headers = request.headers_mut();
@ -194,19 +194,25 @@ async fn index(req: HttpRequest) -> Result<HttpResponse, Box<dyn Error>> {
return Ok(response.body(resp_bytes));
}
if content_type == "application/x-mpegurl" || content_type == "application/vnd.apple.mpegurl" {
if content_type == "application/x-mpegurl"
|| content_type == "application/vnd.apple.mpegurl"
{
let resp_str = resp.text().await.unwrap();
let modified = resp_str.lines().map(|line| {
let captures = RE_MANIFEST.captures(line);
if let Some(captures) = captures {
let url = captures.get(1).unwrap().as_str();
if url.starts_with("https://") {
return line.replace(url, localize_url(url, host).as_str());
let modified = resp_str
.lines()
.map(|line| {
let captures = RE_MANIFEST.captures(line);
if let Some(captures) = captures {
let url = captures.get(1).unwrap().as_str();
if url.starts_with("https://") {
return line.replace(url, localize_url(url, host).as_str());
}
}
}
localize_url(line, host)
}).collect::<Vec<String>>().join("\n");
localize_url(line, host)
})
.collect::<Vec<String>>()
.join("\n");
return Ok(response.body(modified));
}
@ -217,8 +223,7 @@ async fn index(req: HttpRequest) -> Result<HttpResponse, Box<dyn Error>> {
for capture in captures {
let url = capture.get(1).unwrap().as_str();
let new_url = localize_url(url, host);
resp_str = resp_str.replace(url, new_url.as_str())
.clone();
resp_str = resp_str.replace(url, new_url.as_str()).clone();
}
return Ok(response.body(resp_str));
}
@ -239,8 +244,7 @@ fn localize_url(url: &str, host: &str) -> String {
let host = url.host().unwrap().to_string();
// set host query param
url.query_pairs_mut()
.append_pair("host", &host);
url.query_pairs_mut().append_pair("host", &host);
return format!("{}?{}", url.path(), url.query().unwrap());
} else if url.ends_with(".m3u8") || url.ends_with(".ts") {