clean up implementation

Author: lovasoa

src/webserver/database/sqlpage_functions/function_traits.rs

@@ -84,6 +84,24 @@ impl<'a, T: BorrowFromStr<'a> + Sized + 'a> FunctionParamType<'a> for SqlPageFun
     }
 }
 
+impl<'a, T: BorrowFromStr<'a> + Sized + 'a> FunctionParamType<'a>
+    for Option<SqlPageFunctionParam<T>>
+{
+    type TargetType = Option<T>;
+
+    fn from_args(
+        arg: &mut std::vec::IntoIter<Option<Cow<'a, str>>>,
+    ) -> anyhow::Result<Self::TargetType> {
+        let param = <Option<Cow<'a, str>>>::from_args(arg)?;
+        let res = if let Some(param) = param {
+            Some(T::borrow_from_str(param)?)
+        } else {
+            None
+        };
+        Ok(res)
+    }
+}
+
 pub(super) trait FunctionResultType<'a> {
     fn into_cow_result(self) -> anyhow::Result<Option<Cow<'a, str>>>;
 }

src/webserver/database/sqlpage_functions/functions.rs

@@ -1,9 +1,9 @@
-use super::function_traits::BorrowFromStr;
 use super::{ExecutionContext, RequestInfo};
 use crate::webserver::{
     database::{
-        blob_to_data_url::vec_to_data_uri_with_mime, execute_queries::DbConn,
-        sqlpage_functions::url_parameters::URLParameters,
+        blob_to_data_url::vec_to_data_uri_with_mime,
+        execute_queries::DbConn,
+        sqlpage_functions::{http_fetch_request::HttpFetchRequest, url_parameters::URLParameters},
     },
     http_client::make_http_client,
     request_variables::SetVariablesMap,
@@ -27,8 +27,8 @@ super::function_definition_macro::sqlpage_functions! {
     environment_variable(name: Cow<str>);
     exec((&RequestInfo), program_name: Cow<str>, args: Vec<Cow<str>>);
 
-    fetch((&RequestInfo), http_request: Option<Cow<str>>);
-    fetch_with_meta((&RequestInfo), http_request: Option<Cow<str>>);
+    fetch((&RequestInfo), http_request: Option<SqlPageFunctionParam<HttpFetchRequest<'_>>>);
+    fetch_with_meta((&RequestInfo), http_request: Option<SqlPageFunctionParam<HttpFetchRequest<'_>>>);
 
     hash_password(password: Option<String>);
     header((&RequestInfo), name: Cow<str>);
@@ -186,14 +186,11 @@ fn prepare_request_body(
 
 async fn fetch(
     request: &RequestInfo,
-    http_request: Option<Cow<'_, str>>,
+    http_request: Option<HttpFetchRequest<'_>>,
 ) -> anyhow::Result<Option<String>> {
-    let Some(http_request_str) = http_request else {
+    let Some(http_request) = http_request else {
         return Ok(None);
     };
-    let http_request =
-        super::http_fetch_request::HttpFetchRequest::borrow_from_str(http_request_str)
-            .with_context(|| "Invalid http fetch request")?;
     let client = make_http_client(&request.app_state.config)
         .with_context(|| "Unable to create an HTTP client")?;
     let req = build_request(&client, &http_request)?;
@@ -266,15 +263,13 @@ fn decode_response(response: Vec<u8>, encoding: Option<&str>) -> anyhow::Result<
 
 async fn fetch_with_meta(
     request: &RequestInfo,
-    http_request: Option<Cow<'_, str>>,
+    http_request: Option<HttpFetchRequest<'_>>,
 ) -> anyhow::Result<Option<String>> {
     use serde::{ser::SerializeMap, Serializer};
-    let Some(http_request_str) = http_request else {
+
+    let Some(http_request) = http_request else {
         return Ok(None);
     };
-    let http_request =
-        super::http_fetch_request::HttpFetchRequest::borrow_from_str(http_request_str)
-            .with_context(|| "Invalid http fetch request")?;
 
     let client = make_http_client(&request.app_state.config)
         .with_context(|| "Unable to create an HTTP client")?;