From 3781e4507a10369d0a9b4bdcf137e168866a166a Mon Sep 17 00:00:00 2001
From: Christbru <christbru@live.com>
Date: Sun, 19 Oct 2025 12:25:58 -0500
Subject: [PATCH] Fix deployment, verified with officer as ok

---
 web-app/server.mjs | 52 +++++++++++++++++++++++++++++++++-------------
 1 file changed, 37 insertions(+), 15 deletions(-)

diff --git a/web-app/server.mjs b/web-app/server.mjs
index e811db1..913667b 100644
--- a/web-app/server.mjs
+++ b/web-app/server.mjs
@@ -2,8 +2,9 @@ import express from 'express';
 import path from 'node:path';
 import helmet from 'helmet';
 import cors from 'cors';
-import fetch from 'node-fetch';
-import { fileURLToPath } from 'node:url';
+import http from 'node:http';
+import https from 'node:https';
+import { URL, fileURLToPath } from 'node:url';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -19,24 +20,45 @@ const RUST_ENGINE_BASE =
 app.set('trust proxy', true);
 app.use(helmet({ contentSecurityPolicy: false }));
 app.use(cors());
-app.use(express.json());
 
 app.get('/api/healthz', (_req, res) => {
   res.json({ status: 'ok', upstream: RUST_ENGINE_BASE });
 });
 
-// Proxy minimal API needed by the UI to the rust-engine container
-app.post('/api/files/import-demo', async (req, res) => {
-  try {
-    const qs = req.url.includes('?') ? req.url.substring(req.url.indexOf('?')) : '';
-    const url = `${RUST_ENGINE_BASE}/api/files/import-demo${qs}`;
-    const upstream = await fetch(url, { method: 'POST', headers: { 'content-type': 'application/json' }, body: req.body ? JSON.stringify(req.body) : undefined });
-    const text = await upstream.text();
-    res.status(upstream.status).type(upstream.headers.get('content-type') || 'application/json').send(text);
-  } catch (err) {
-    console.error('import-demo proxy failed:', err);
-    res.status(502).json({ error: 'proxy_failed' });
-  }
+// Stream all /api requests directly to the rust engine (supports JSON, multipart, SSE, etc.)
+app.use('/api', (req, res) => {
+  const targetUrl = new URL(req.originalUrl, RUST_ENGINE_BASE);
+  const client = targetUrl.protocol === 'https:' ? https : http;
+
+  const headers = { ...req.headers, host: targetUrl.host };
+
+  const proxyReq = client.request(
+    targetUrl,
+    {
+      method: req.method,
+      headers,
+    },
+    (upstream) => {
+      res.status(upstream.statusCode || 502);
+      for (const [key, value] of Object.entries(upstream.headers)) {
+        if (typeof value !== 'undefined') {
+          res.setHeader(key, value);
+        }
+      }
+      upstream.pipe(res);
+    }
+  );
+
+  proxyReq.on('error', (err) => {
+    console.error('API proxy error:', err);
+    if (!res.headersSent) {
+      res.status(502).json({ error: 'proxy_failed' });
+    } else {
+      res.end();
+    }
+  });
+
+  req.pipe(proxyReq);
 });
 
 // Serve static frontend