Added ability to send variables to the application and proxying options

Author: szagi3891

Cargo.lock

@@ -33,13 +33,13 @@ script = [
 
 [tasks.demo-watch]
 script = [
-    'cargo run --bin vertigo -- watch vertigo-demo --dest-dir=demo_build'
+    'cargo run --bin vertigo -- watch vertigo-demo --dest-dir=demo_build --env ws_chat=ws://127.0.0.1:3333/ws'
 ]
 
 [tasks.demo-start]
 script = [
     "cargo run --bin vertigo -- build vertigo-demo --dest-dir=demo_build",
-    "cargo run --bin vertigo -- serve --dest-dir=demo_build"
+    "cargo run --bin vertigo -- serve --dest-dir=demo_build --env ws_chat=ws://127.0.0.1:3333/ws"
 ]
 
 [tasks.demo]

Makefile.toml

@@ -29,8 +29,8 @@ log = "0.4"
 env_logger = "0.10"
 tokio = { version = "1.25", features = ["full"] }
 tokio-stream = "0.1"
-axum = "0.6"
-axum-extra = "0.7"
+axum = { version = "0.6.12", features = ["macros"] }
+axum-extra = "0.7.2"
 tower-http = { version = "0.4", features = ["fs"] }
 reqwest = "0.11.14"
 notify = "5.1.0"

crates/vertigo-cli/Cargo.toml

@@ -6,6 +6,8 @@ mod check_env;
 mod command;
 mod watch;
 mod spawn;
+mod utils;
+
 use clap::{Parser, Subcommand};
 
 use build::BuildOpts;
@@ -46,7 +48,7 @@ pub async fn main() -> Result<(), i32> {
             new::run(opts)
         }
         Command::Serve(opts) => {
-            serve::run(opts).await
+            serve::run(opts, None).await
         }
         Command::Watch(opts) => {
             watch::run(opts).await

crates/vertigo-cli/src/main.rs

@@ -307,11 +307,15 @@ impl HtmlElement {
         }
     }
 
-    pub fn attr(mut self, name: &'static str, value: impl Into<String>) -> Self {
+    pub fn attr(mut self, name: impl Into<String>, value: impl Into<String>) -> Self {
         self.attr.set(name, value);
         self
     }
 
+    pub fn add_attr(&mut self, name: impl Into<String>, value: impl Into<String>) {
+        self.attr.set(name, value);
+    }
+
     pub fn add_first_child(&mut self, child: HtmlNode) {
         self.children.push_front(child);
     }

crates/vertigo-cli/src/serve/html/html_element.rs

@@ -21,7 +21,7 @@ use super::{
     html_element::{
         HtmlElement,
         HtmlDocument
-    },
+    }, HtmlNode,
 };
 
 enum FetchStatus {
@@ -45,16 +45,18 @@ pub struct HtmlResponse {
     inst: WasmInstance,
     all_elements: AllElements,
     fetch: HashMap<Arc<FetchRequest>, FetchStatus>,
+    env: HashMap<String, String>
 }
 
 impl HtmlResponse {
-    pub fn new(sender: UnboundedSender<Message>, mount_path: &MountPathConfig, inst: WasmInstance) -> Self {
+    pub fn new(sender: UnboundedSender<Message>, mount_path: &MountPathConfig, inst: WasmInstance, env: HashMap<String, String>) -> Self {
         Self {
             sender,
             mount_path: mount_path.clone(),
             inst,
             all_elements: AllElements::new(),
             fetch: HashMap::new(),
+            env,
         }
     }
 
@@ -79,15 +81,16 @@ impl HtmlResponse {
 
         let css = css.into_iter().collect::<VecDeque<_>>();
 
-        let root_ok = if let Some(element) = root_html.get_element() {
-            element.name == "html"
-        } else {
-            false
-        };
+        if let HtmlNode::Element(html) = &mut root_html {
+            if html.name != "html" {
+                return (StatusCode::INTERNAL_SERVER_ERROR, "root: the html element was expected".into());
+            }
 
-        if !root_ok {
-            let message = "root: the html element was expected".into();
-            return (StatusCode::INTERNAL_SERVER_ERROR, message);
+            for (env_name, env_value) in &self.env {
+                html.add_attr(format!("data-env-{env_name}"), env_value);
+            }    
+        } else {
+            return (StatusCode::INTERNAL_SERVER_ERROR, "root: the html element was expected".into());
         }
 
         let is_exist_head = root_html.modify(&[("head", 0)], move |_head| {});

crates/vertigo-cli/src/serve/html/html_response.rs

@@ -53,7 +53,7 @@ fn read_index(dest_dir: &str) -> Result<IndexModel, i32> {
     let index_html = match std::fs::read_to_string(&index_path) {
         Ok(data) => data,
         Err(err) => {
-            log::error!("File read error: file={index_path:?}, error={err}");
+            log::error!("File read error: file={index_path:?}, error={err}, dest_dir={dest_dir}");
             return Err(-1);
         }
     };

crates/vertigo-cli/src/serve/mount_path.rs

@@ -1,3 +1,19 @@
+use std::collections::HashMap;
+
+#[derive(Clone)]
 pub struct RequestState {
     pub url: String,
+    pub env: HashMap<String, String>,
 }
+
+impl RequestState {
+    pub fn env(&self, name: impl Into<String>) -> Option<String> {
+        let name = name.into();
+        let Some(value) = self.env.get(&name) else {
+            return None;
+        };
+
+        Some(value.clone())
+    }
+}
+