Merge pull request #141 from code0-tech/129-new-flow-identification-system

Rework of Flow Identification

Author: raphael-goetz

Cargo.lock

@@ -7,8 +7,8 @@ version = "0.0.0"
 edition = "2024"
 
 [workspace.dependencies]
-code0-flow = { version = "0.0.22" }
-tucana = { version = "0.0.50", features = ["aquila"] }
+code0-flow = { version = "0.0.24" }
+tucana = { version = "0.0.52", features = ["aquila"] }
 serde_json = { version = "1.0.138" }
 log = "0.4.27"
 env_logger = "0.11.8"

Cargo.toml

@@ -1,5 +1,4 @@
 use base::{
-    extract_flow_setting_field,
     runner::{ServerContext, ServerRunner},
     store::FlowIdentifyResult,
     traits::{IdentifiableFlow, LoadConfig, Server as ServerTrait},
@@ -36,12 +35,26 @@ struct RequestRoute {
 
 impl IdentifiableFlow for RequestRoute {
     fn identify(&self, flow: &ValidationFlow) -> bool {
-        let url = extract_flow_setting_field(&flow.settings, "HTTP_URL", "url");
-        let regex_str = match url.as_deref() {
-            Some(s) => s,
-            None => return false,
+        let regex_str = flow
+            .settings
+            .iter()
+            .find(|s| s.flow_setting_id == "HTTP_URL")
+            .and_then(|s| s.value.as_ref())
+            .and_then(|v| v.kind.as_ref())
+            .and_then(|k| match k {
+                Kind::StringValue(s) => Some(s.as_str()),
+                _ => None,
+            });
+
+        let Some(regex_str) = regex_str else {
+            return false;
         };
 
+        print!(
+            "Comparing regex {} with literal route: {}",
+            regex_str, self.url
+        );
+
         match regex::Regex::new(regex_str) {
             Ok(regex) => regex.is_match(&self.url),
             Err(err) => {
@@ -71,19 +84,32 @@ impl ServerTrait<HttpServerConfig> for HttpServer {
                 move |request: HttpRequest| {
                     let store = Arc::clone(&store);
                     async move {
-                        let pattern = format!("*.*.REST.{}.{:?}", request.host, request.method);
-                        let route = RequestRoute {
-                            url: request.path.clone(),
-                        };
-
-                        match store.get_possible_flow_match(pattern, route).await {
-                            FlowIdentifyResult::Single(flow) => {
-                                execute_flow(flow, request, store).await
+                        //Get slug => host/slug/real_path
+
+                        let splits: Vec<_> = request.path.split("/").collect();
+                        let first = splits.first();
+
+                        if let Some(slug) = first {
+                            let pattern = format!("REST.{}.*", slug);
+                            let route = RequestRoute {
+                                url: request.path.clone(),
+                            };
+
+                            match store.get_possible_flow_match(pattern, route).await {
+                                FlowIdentifyResult::Single(flow) => {
+                                    print!("Found flow: {}", flow.flow_id);
+                                    execute_flow(flow, request, store).await
+                                }
+                                _ => Some(HttpResponse::internal_server_error(
+                                    format!("No flow found for path: {}", request.path),
+                                    HashMap::new(),
+                                )),
                             }
-                            _ => Some(HttpResponse::internal_server_error(
+                        } else {
+                            Some(HttpResponse::internal_server_error(
                                 format!("No flow found for path: {}", request.path),
                                 HashMap::new(),
-                            )),
+                            ))
                         }
                     }
                 }

adapter/rest/src/main.rs

@@ -1,28 +1,4 @@
-use tucana::shared::{FlowSetting, value::Kind};
-
 pub mod config;
 pub mod runner;
 pub mod store;
 pub mod traits;
-
-pub fn extract_flow_setting_field(
-    settings: &Vec<FlowSetting>,
-    def_key: &str,
-    field_name: &str,
-) -> Option<String> {
-    settings.iter().find_map(|setting| {
-        if setting.flow_setting_id != def_key {
-            return None;
-        }
-
-        let obj = setting.object.as_ref()?;
-        obj.fields.iter().find_map(|(k, v)| {
-            if k == field_name
-                && let Some(Kind::StringValue(s)) = &v.kind
-            {
-                return Some(s.clone());
-            }
-            None
-        })
-    })
-}