yet another try to fix optimade

Author: d-beltran

src/routes/optimade/base-html.js

@@ -1,14 +1,11 @@
 // Returns the OPTIMADE HTML landing page for base URLs (/optimade/ and /optimade/v1/).
 // Per the OPTIMADE spec, the base URL should return a human-readable page when accessed
 // via a browser. JSON data for programmatic access is available at /optimade/v1/info.
-const { OPTIMADE_VERSION, PROVIDER, IMPLEMENTATION } = require('./utils');
+const { OPTIMADE_VERSION, PROVIDER, IMPLEMENTATION, getBaseUrl } = require('./utils');
 
 // Build the URL carefully so it works both locally and behind a reverse proxy
 function getBaseHtml(request) {
-  const proto = request.get('x-forwarded-proto') || request.protocol;
-  const host  = request.get('host');
-  const match = request.originalUrl.match(/^(.*\/optimade)/);
-  const base  = `${proto}://${host}${match ? match[1] : '/optimade'}/v1`;
+  const base = getBaseUrl(request);
 
   const endpointLinks = ['links', 'references', 'trajectories', 'structures', 'info']
     .map(ep => `<li><a href="${base}/${ep}">${base}/${ep}</a></li>`)

src/routes/optimade/utils.js

@@ -43,13 +43,12 @@ function buildResponse({ data, meta, links }) {
 }
 
 function getBaseUrl(request) {
-  const proto = request.get('x-forwarded-proto') || request.protocol;
   const host = request.get('host');
-  // Extract everything up to /optimade (preserving any reverse-proxy prefix like /api),
-  // then always append /v1 so the base is correct regardless of where the request landed.
-  const match = request.originalUrl.match(/^(.*\/optimade)/);
-  const prefix = match ? match[1] : '/optimade';
-  return `${proto}://${host}${prefix}/v1`;
+  if (host?.match(/^localhost(:\d+)?$/)) {
+    return `http://${host}/optimade/v1`;
+  }
+  const proto = request.get('x-forwarded-proto') || 'https';
+  return `${proto}://${host}/api/optimade/v1`;
 }
 
 // Returns the portion of the URL relative to /optimade/v1