Put all URLs under /api/

server/src/bin/server.rs

@@ -231,7 +231,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
 
     let _ = rocket::build()
         .mount(
-            "/",
+            shared::urls::MOUNT_POINT,
             routes![
                 original,
                 refresh,

server/src/graphql.rs

@@ -337,7 +337,7 @@ impl QueryRoot {
                 .headers
                 .get_first_value("date")
                 .and_then(|d| mailparse::dateparse(&d).ok());
-            let cid_prefix = format!("/cid/{id}/");
+            let cid_prefix = shared::urls::cid_prefix(None, &id);
             let body = match extract_body(&m, &id)? {
                 Body::PlainText(PlainText { text, content_tree }) => {
                     let text = if text.len() > MAX_RAW_MESSAGE_SIZE {

shared/src/lib.rs

@@ -12,3 +12,24 @@ pub struct SearchResult {
 
 #[derive(Serialize, Deserialize, Debug)]
 pub struct Message {}
+
+pub mod urls {
+    pub const MOUNT_POINT: &'static str = "/api";
+    pub fn cid_prefix(host: Option<&str>, cid: &str) -> String {
+        if let Some(host) = host {
+            format!("//{host}/api/cid/{cid}/")
+        } else {
+            format!("/api/cid/{cid}/")
+        }
+    }
+    pub fn download_attachment(host: Option<&str>, id: &str, idx: &str, filename: &str) -> String {
+        if let Some(host) = host {
+            format!(
+                "//{host}/api/download/attachment/{}/{}/{}",
+                id, idx, filename
+            )
+        } else {
+            format!("/api/download/attachment/{}/{}/{}", id, idx, filename)
+        }
+    }
+}

web/Trunk.toml

@@ -7,20 +7,7 @@ address = "0.0.0.0"
 port = 6758
 
 [[proxy]]
-backend = "http://localhost:9345/"
-rewrite= "/api/"
-[[proxy]]
-backend="http://localhost:9345/cid"
-[[proxy]]
-backend="http://localhost:9345/original"
-[[proxy]]
-backend="http://localhost:9345/graphiql"
-[[proxy]]
-backend="http://localhost:9345/graphql"
-[[proxy]]
-backend="http://localhost:9345/download"
-[[proxy]]
-backend="http://localhost:9345/view"
+backend = "http://localhost:9345/api/"
 
 [[hooks]]
 stage = "pre_build"

web/src/graphql.rs

@@ -51,7 +51,7 @@ where
 {
     use web_sys::RequestMode;
 
-    Request::post("/graphql/")
+    Request::post("/api/graphql/")
         .mode(RequestMode::Cors)
         .json(&body)?
         .send()

web/src/view/mod.rs

@@ -732,7 +732,7 @@ fn message_render(msg: &ShowThreadQueryThreadMessages, open: bool) -> Node<Msg>
                                     let default = "UNKNOWN_FILE".to_string();
                                     let filename = a.filename.as_ref().unwrap_or(&default);
                                     let host = seed::window().location().host().expect("couldn't get host");
-                                    let url = format!("//{host}/download/attachment/{}/{}/{}", a.id,a.idx, filename);
+                                    let url = shared::urls::download_attachment(Some(&host), &a.id, &a.idx, filename);
                                     let mut fmtr = Formatter::new();
                                     fmtr.with_separator(" ");
                                     fmtr.with_scales(Scales::Binary());