From b82a63eeb78bb7ab82a3b081cd1f6d314632b74e Mon Sep 17 00:00:00 2001 From: alemi Date: Sun, 20 Oct 2024 01:47:17 +0200 Subject: [PATCH] chore: refactor endpoint getters --- src/errors.rs | 20 +++++++------ src/model/endpoint.rs | 67 ++++++++++++++++++++++++++++--------------- 2 files changed, 56 insertions(+), 31 deletions(-) diff --git a/src/errors.rs b/src/errors.rs index 62a5403..429671b 100644 --- a/src/errors.rs +++ b/src/errors.rs @@ -7,11 +7,8 @@ pub enum PostWomanError { #[error("invalid method: {0:?}")] InvalidMethod(#[from] http::method::InvalidMethod), - #[error("invalid header name: {0:?}")] - InvalidHeaderName(#[from] reqwest::header::InvalidHeaderName), - - #[error("invalid header value: {0:?}")] - InvalidHeaderValue(#[from] reqwest::header::InvalidHeaderValue), + #[error("invalid header: {0:?}")] + InvalidHeader(#[from] InvalidHeaderError), #[error("contains Unprintable characters: {0:?}")] Unprintable(#[from] reqwest::header::ToStrError), @@ -19,9 +16,6 @@ pub enum PostWomanError { #[error("header '{0}' not found in response")] HeaderNotFound(String), - #[error("invalid header: '{0}'")] - InvalidHeader(String), - #[error("error opening collection: {0:?}")] ErrorOpeningCollection(#[from] std::io::Error), @@ -46,3 +40,13 @@ pub enum PostWomanError { #[error("regex failed matching in content: {0}")] NoMatch(String), } + +#[derive(Debug, thiserror::Error)] +pub enum InvalidHeaderError { + #[error("invalid header name: {0:?}")] + Name(#[from] http::header::InvalidHeaderName), + #[error("invalid header value: {0:?}")] + Value(#[from] http::header::InvalidHeaderValue), + #[error("invalid header format: {0}")] + Format(String) +} diff --git a/src/model/endpoint.rs b/src/model/endpoint.rs index 6cc3051..66b0d93 100644 --- a/src/model/endpoint.rs +++ b/src/model/endpoint.rs @@ -1,9 +1,12 @@ use std::{collections::HashMap, str::FromStr}; use base64::{prelude::BASE64_STANDARD, Engine}; +use http::header::{InvalidHeaderName, InvalidHeaderValue}; +use http::method::InvalidMethod; use http::{HeaderMap, HeaderName, HeaderValue}; use jaq_interpret::FilterT; +use crate::errors::InvalidHeaderError; use crate::{PostWomanError, APP_USER_AGENT}; use crate::ext::{stringify_toml, stringify_json, StringOr}; @@ -29,6 +32,41 @@ pub struct EndpointConfig { } impl EndpointConfig { + pub fn body(&mut self) -> Result { + match self.body.take().unwrap_or_default() { + StringOr::Str(x) => Ok(x.clone()), + StringOr::T(json) => Ok(serde_json::to_string(&json)?), + } + } + + pub fn method(&mut self) -> Result { + match self.method { + Some(ref m) => Ok(reqwest::Method::from_str(m)?), + None => Ok(reqwest::Method::GET), + } + } + + pub fn headers(&mut self) -> Result { + let mut headers = HeaderMap::default(); + for header in self.headers.take().unwrap_or_default() { + let (k, v) = header.split_once(':') + .ok_or_else(|| InvalidHeaderError::Format(header.clone()))?; + headers.insert( + HeaderName::from_str(k)?, + HeaderValue::from_str(v)? + ); + } + Ok(headers) + } + + pub fn url(&mut self) -> String { + let mut url = self.url.clone(); + if let Some(query) = self.query.take() { + url = format!("{url}?{}", query.join("&")); + } + url + } + pub fn fill(mut self, env: &toml::Table) -> Self { let mut vars: HashMap = HashMap::default(); @@ -80,29 +118,11 @@ impl EndpointConfig { self } - pub async fn execute(self, opts: &ClientConfig) -> Result { - let method = match self.method { - Some(m) => reqwest::Method::from_str(&m)?, - None => reqwest::Method::GET, - }; - let mut headers = HeaderMap::default(); - for header in self.headers.unwrap_or_default() { - let (k, v) = header.split_once(':') - .ok_or_else(|| PostWomanError::InvalidHeader(header.clone()))?; - headers.insert( - HeaderName::from_str(k)?, - HeaderValue::from_str(v)? - ); - } - let body = match self.body.unwrap_or_default() { - StringOr::Str(x) => x, - StringOr::T(json) => serde_json::to_string(&json)?, - }; - - let mut url = self.url; - if let Some(query) = self.query { - url = format!("{url}?{}", query.join("&")); - } + pub async fn execute(mut self, opts: &ClientConfig) -> Result { + let url = self.url(); + let body = self.body()?; + let method = self.method()?; + let headers = self.headers()?; let client = reqwest::Client::builder() .user_agent(opts.user_agent.as_deref().unwrap_or(APP_USER_AGENT)) @@ -111,6 +131,7 @@ impl EndpointConfig { .danger_accept_invalid_certs(opts.accept_invalid_certs.unwrap_or(false)) .build()?; + let res = client .request(method, url) .headers(headers)