fix: Usuba docker reverse proxying

Author: cdata

compose.yaml

@@ -6,5 +6,5 @@ services:
       tags:
         - 'usuba:local'
     network_mode: 'host'
-    ports:
-      - '8080:8080'
+    environment:
+      UPSTREAM: 'localhost:5173'

rust/usuba/Dockerfile

@@ -40,5 +40,6 @@ RUN npm install -g @bytecodealliance/jco
 COPY --from=builder /build-root/target/release/usuba /usr/bin/usuba
 
 ENV RUST_LOG="debug"
+ENV UPSTREAM="localhost:5173"
 
 ENTRYPOINT ["/usr/bin/usuba"]

rust/usuba/src/bin/usuba.rs

@@ -14,10 +14,11 @@ pub async fn main() -> Result<(), UsubaError> {
         .finish();
     tracing::subscriber::set_global_default(subscriber.with(Layer::default().pretty()))?;
 
-    let port = std::option_env!("PORT").unwrap_or("8080");
+    let port = std::env::var("PORT").unwrap_or("8080".into());
     let socket_address: SocketAddr = format!("0.0.0.0:{port}").parse()?;
     let listener = tokio::net::TcpListener::bind(socket_address).await?;
-    let upstream = std::option_env!("UPSTREAM")
+    let upstream = std::env::var("UPSTREAM")
+        .ok()
         .map(|upstream| upstream.parse().ok())
         .unwrap_or(None);
 

typescript/packages/usuba-ui/package.json

@@ -25,6 +25,7 @@
     "@commontools/usuba-sw": "^0.0.1",
     "@commontools/usuba-api": "^0.0.1",
     "typescript": "^5.2.2",
+    "tslib": "^2.6.2",
     "vite": "^5.2.0",
     "wireit": "^0.14.4"
   },