fix: adding requestor field for wasi-http

Cargo.toml

@@ -3,7 +3,7 @@ members = ["crates/*"]
 resolver = "2"
 
 [workspace.package]
-version = "0.5.3"
+version = "0.5.4"
 edition = "2021"
 publish = false
 authors = ["FastEdge Development Team"]

crates/http-service/src/executor/mod.rs

@@ -133,7 +133,7 @@ where
             body,
         };
 
-        let properties = Self::get_properties(&parts.headers);
+        let properties = get_properties(&parts.headers);
 
         let store_builder = self.store_builder.to_owned().with_properties(properties);
         let wasi_nn = self.store_builder.make_wasi_nn_ctx()?;
@@ -192,19 +192,7 @@ where
         builder.body(body).map(|r| (r, used)).map_err(anyhow::Error::msg)
     }
 
-    fn get_properties(headers: &HeaderMap<HeaderValue>) -> HashMap<String, String> {
-        let mut properties = HashMap::new();
-        if let Some(client_ip) = headers.get(X_REAL_IP).and_then(|v| v.to_str().ok()) {
-            properties.insert("client_ip".to_owned(), client_ip.to_owned());
-        }
-        if let Some(traceparent) = headers.get(TRACEPARENT).and_then(|v| v.to_str().ok()) {
-            properties.insert("traceparent".to_owned(), traceparent.to_owned());
-        }
-        if let Some(requestor) = headers.get(X_CDN_REQUESTOR).and_then(|v| v.to_str().ok()) {
-            properties.insert("requestor".to_owned(), requestor.to_owned());
-        }
-        properties
-    }
+
 }
 
 fn to_fastedge_http_method(method: &Method) -> Result<fastedge::http::Method> {
@@ -219,3 +207,18 @@ fn to_fastedge_http_method(method: &Method) -> Result<fastedge::http::Method> {
         method => bail!("unsupported method: {}", method),
     })
 }
+
+
+pub(crate) fn get_properties(headers: &HeaderMap<HeaderValue>) -> HashMap<String, String> {
+    let mut properties = HashMap::new();
+    if let Some(client_ip) = headers.get(X_REAL_IP).and_then(|v| v.to_str().ok()) {
+        properties.insert("client_ip".to_owned(), client_ip.to_owned());
+    }
+    if let Some(traceparent) = headers.get(TRACEPARENT).and_then(|v| v.to_str().ok()) {
+        properties.insert("traceparent".to_owned(), traceparent.to_owned());
+    }
+    if let Some(requestor) = headers.get(X_CDN_REQUESTOR).and_then(|v| v.to_str().ok()) {
+        properties.insert("requestor".to_owned(), requestor.to_owned());
+    }
+    properties
+}

crates/http-service/src/executor/wasi_http.rs

@@ -15,7 +15,7 @@ use dictionary::Dictionary;
 use http_backend::Backend;
 use runtime::store::StoreBuilder;
 use runtime::InstancePre;
-
+use crate::executor;
 use crate::executor::HttpExecutor;
 use crate::state::HttpState;
 
@@ -100,7 +100,8 @@ where
         let body = Full::new(body).map_err(|never| match never {});
         let body = body.boxed();
 
-        let store_builder = self.store_builder.to_owned(); //.with_properties(properties);
+        let properties = executor::get_properties(&parts.headers);
+        let store_builder = self.store_builder.to_owned().with_properties(properties);
         let wasi_nn = self
             .store_builder
             .make_wasi_nn_ctx()

crates/http-service/src/lib.rs

@@ -468,7 +468,7 @@ fn app_name_from_request(req: &Request<impl Body>) -> Result<SmolStr> {
         bail!("app name not found in URL".to_string());
     }
 
-    return match path.find('/') {
+    match path.find('/') {
         None => Ok(SmolStr::from(path)),
         Some(i) => {
             let (prefix, _) = path.split_at(i);
@@ -478,7 +478,7 @@ fn app_name_from_request(req: &Request<impl Body>) -> Result<SmolStr> {
                 Ok(SmolStr::from(prefix))
             }
         }
-    };
+    }
 }
 
 fn app_res_headers(app_cfg: App) -> HeaderMap {