printear y no crashear en reqwest error

This commit is contained in:
Cat /dev/Nulo 2023-12-31 20:09:32 -03:00 committed by Nulo
parent 7644adf140
commit bca2717ac8

View file

@ -1,5 +1,6 @@
use async_channel::{Receiver, Sender}; use async_channel::{Receiver, Sender};
use std::{env::args, fs, io::stdout, net::SocketAddr}; use std::{env::args, fs, io::stdout, net::SocketAddr};
use tokio::io::{stderr, AsyncWriteExt};
use warc::{RecordBuilder, WarcHeader, WarcWriter}; use warc::{RecordBuilder, WarcHeader, WarcWriter};
struct FullExchange { struct FullExchange {
@ -18,6 +19,7 @@ async fn main() {
.filter(|s| s.len() > 0) .filter(|s| s.len() > 0)
.map(|s| s.to_owned()) .map(|s| s.to_owned())
.collect::<Vec<_>>(); .collect::<Vec<_>>();
let handle = { let handle = {
let (sender, receiver) = async_channel::bounded::<String>(1); let (sender, receiver) = async_channel::bounded::<String>(1);
let (res_sender, res_receiver) = async_channel::unbounded::<FullExchange>(); let (res_sender, res_receiver) = async_channel::unbounded::<FullExchange>();
@ -48,6 +50,22 @@ async fn main() {
async fn worker(rx: Receiver<String>, tx: Sender<FullExchange>) { async fn worker(rx: Receiver<String>, tx: Sender<FullExchange>) {
let client = reqwest::ClientBuilder::default().build().unwrap(); let client = reqwest::ClientBuilder::default().build().unwrap();
while let Ok(url) = rx.recv().await { while let Ok(url) = rx.recv().await {
let res = fetch(&client, url.clone()).await;
match res {
Ok(ex) => {
tx.send(ex).await.unwrap();
}
Err(err) => {
stderr()
.write_all(format!("Failed to fetch {}: {:#?}", url.as_str(), err).as_bytes())
.await
.unwrap();
}
}
}
}
async fn fetch(client: &reqwest::Client, url: String) -> Result<FullExchange, reqwest::Error> {
let request = client.get(url).build().unwrap(); let request = client.get(url).build().unwrap();
let mut http_request_builder = http::Request::builder() let mut http_request_builder = http::Request::builder()
.method(request.method()) .method(request.method())
@ -55,7 +73,7 @@ async fn worker(rx: Receiver<String>, tx: Sender<FullExchange>) {
for (key, val) in request.headers() { for (key, val) in request.headers() {
http_request_builder = http_request_builder.header(key, val); http_request_builder = http_request_builder.header(key, val);
} }
let response = client.execute(request).await.unwrap(); let response = client.execute(request).await?;
let ip_address = response.remote_addr(); let ip_address = response.remote_addr();
@ -73,30 +91,26 @@ async fn worker(rx: Receiver<String>, tx: Sender<FullExchange>) {
for (key, val) in response.headers() { for (key, val) in response.headers() {
http_response_builder = http_response_builder.header(key, val); http_response_builder = http_response_builder.header(key, val);
} }
let body = response.bytes().await.unwrap(); let body = response.bytes().await?;
http_response_builder.body(body.to_vec()).unwrap() http_response_builder.body(body.to_vec()).unwrap()
}; };
tx.send(FullExchange { Ok(FullExchange {
socket_addr: ip_address, socket_addr: ip_address,
request: http_request, request: http_request,
response: http_response, response: http_response,
}) })
.await
.unwrap();
}
} }
async fn warc_writer(rx: Receiver<FullExchange>) { async fn warc_writer(rx: Receiver<FullExchange>) {
let mut writer = WarcWriter::new(stdout()); let mut writer = WarcWriter::new(stdout());
let warc_fields = format!("software: preciazo-warcificator/0.0.0\nformat: WARC file version 1.0\nconformsTo: http://www.archive.org/documents/WarcFileFormat-1.0.html");
writer writer
.write( .write(
&RecordBuilder::default() &RecordBuilder::default()
.version("1.0".to_owned()) .version("1.0".to_owned())
.warc_type(warc::RecordType::WarcInfo) .warc_type(warc::RecordType::WarcInfo)
.header(WarcHeader::ContentType, "application/warc-fields") .header(WarcHeader::ContentType, "application/warc-fields")
.body(warc_fields.into()) .body(format!("software: preciazo-warcificator/0.0.0\nformat: WARC file version 1.0\nconformsTo: http://www.archive.org/documents/WarcFileFormat-1.0.html").into())
.build() .build()
.unwrap(), .unwrap(),
) )