the sending app url instead of wasm file path for app-url header

fastn-stack · Feb 3, 2025 · ae39031 · ae39031
1 parent 44732d9
commit ae39031
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 23 deletions.
diff --git a/fastn-core/src/commands/serve.rs b/fastn-core/src/commands/serve.rs
@@ -516,22 +516,22 @@ async fn handle_endpoints(
         .iter()
         .find(|ep| req.path().starts_with(ep.mountpoint.trim_end_matches('/')));
 
-    let endpoint = match matched_endpoint {
+    let (endpoint, app_url) = match matched_endpoint {
         Some(e) => {
             tracing::info!("matched endpoint: {:?}", e);
-            e
+            (e, e.mountpoint.clone())
         }
         None => {
             tracing::info!("no endpoint found in current package. Trying mounted apps");
             tracing::info!("request path: {}", req.path());
 
-            let app = match config
+            let (app, app_url) = match config
                 .package
                 .apps
                 .iter()
                 .find(|a| req.path().starts_with(a.mount_point.trim_end_matches('/')))
             {
-                Some(e) => e,
+                Some(e) => (e, e.mount_point.clone()),
                 None => return None,
             };
 
@@ -567,14 +567,17 @@ async fn handle_endpoints(
 
             tracing::info!("wasm file found: {}", wasm_path);
 
-            &fastn_package::old_fastn::EndpointData {
-                endpoint: format!("wasm+proxy://{wasm_path}"),
-                mountpoint: format!(
-                    "{app}/{wasm_file}",
-                    app = app.mount_point.trim_end_matches('/')
-                ),
-                user_id: None, // idk if we're using this
-            }
+            (
+                &fastn_package::old_fastn::EndpointData {
+                    endpoint: format!("wasm+proxy://{wasm_path}"),
+                    mountpoint: format!(
+                        "{app}/{wasm_file}",
+                        app = app.mount_point.trim_end_matches('/')
+                    ),
+                    user_id: None, // idk if we're using this
+                },
+                app_url,
+            )
         }
     };
 
@@ -597,13 +600,7 @@ async fn handle_endpoints(
 
         return match config
             .ds
-            .handle_wasm(
-                url,
-                req,
-                endpoint.mountpoint.to_string(),
-                app_mounts,
-                session_id,
-            )
+            .handle_wasm(url, req, app_url, app_mounts, session_id)
             .await
         {
             Ok(r) => Some(Ok(to_response(r))),

diff --git a/fastn-ds/src/lib.rs b/fastn-ds/src/lib.rs
@@ -474,7 +474,7 @@ impl DocumentStore {
         &self,
         wasm_url: String,
         req: &T,
-        mountpoint: String,
+        app_url: String,
         app_mounts: std::collections::HashMap<String, String>,
         session_id: &Option<String>,
     ) -> Result<ft_sys_shared::Request, HttpError>
@@ -510,7 +510,7 @@ impl DocumentStore {
             self.pg_pools.clone().into_inner(),
             db_path,
             fastn_wasm::StoreImpl,
-            mountpoint,
+            app_url,
             app_mounts,
         );
         Ok(fastn_wasm::process_http_request(&wasm_url, module, store).await?)

diff --git a/v0.5/fastn-wasm/src/store.rs b/v0.5/fastn-wasm/src/store.rs
@@ -40,11 +40,11 @@ impl<STORE: StoreExt> Store<STORE> {
         pg_pools: std::sync::Arc<scc::HashMap<String, deadpool_postgres::Pool>>,
         db_url: String,
         inner: STORE,
-        mountpoint: String,
+        app_url: String,
         app_mounts: std::collections::HashMap<String, String>,
     ) -> Store<STORE> {
         req.headers
-            .push((FASTN_APP_URL_HEADER.to_string(), mountpoint.into_bytes()));
+            .push((FASTN_APP_URL_HEADER.to_string(), app_url.into_bytes()));
 
         let app_mounts = serde_json::to_string(&app_mounts).unwrap();
         req.headers