Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ee2be0427c | ||
|
|
5fb8c0c513 | ||
|
|
a796453766 | ||
|
|
b4b029d2a6 |
9
Dockerfile.preview
Normal file
9
Dockerfile.preview
Normal file
@@ -0,0 +1,9 @@
|
||||
FROM nginx:alpine
|
||||
|
||||
RUN rm /etc/nginx/conf.d/default.conf
|
||||
COPY preview/nginx.conf /etc/nginx/conf.d/default.conf
|
||||
|
||||
COPY *.html *.js *.mjs *.json *.css /usr/share/nginx/html/
|
||||
COPY nexus/ /usr/share/nginx/html/nexus/
|
||||
|
||||
EXPOSE 3000
|
||||
12
app.js
12
app.js
@@ -1249,10 +1249,16 @@ async function updateSovereignHealth() {
|
||||
const container = document.getElementById('sovereign-health-content');
|
||||
if (!container) return;
|
||||
|
||||
const params = new URLSearchParams(window.location.search);
|
||||
const metricsOverride = params.get('metrics');
|
||||
const metricsUrl = metricsOverride || `${window.location.protocol}//${window.location.host}/metrics`;
|
||||
const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:';
|
||||
const wsStatusUrl = `${protocol}//${window.location.host}/api/world/ws`;
|
||||
|
||||
let metrics = { sovereignty_score: 100, local_sessions: 0, total_sessions: 0 };
|
||||
let daemonReachable = false;
|
||||
try {
|
||||
const res = await fetch('http://localhost:8082/metrics');
|
||||
const res = await fetch(metricsUrl);
|
||||
if (res.ok) {
|
||||
metrics = await res.json();
|
||||
daemonReachable = true;
|
||||
@@ -1265,8 +1271,8 @@ async function updateSovereignHealth() {
|
||||
{ name: 'LOCAL DAEMON', status: daemonReachable ? 'ONLINE' : 'OFFLINE' },
|
||||
{ name: 'FORGE / GITEA', url: 'https://forge.alexanderwhitestone.com', status: 'ONLINE' },
|
||||
{ name: 'NEXUS CORE', url: 'https://forge.alexanderwhitestone.com/Timmy_Foundation/the-nexus', status: 'ONLINE' },
|
||||
{ name: 'HERMES WS', url: 'ws://143.198.27.163:8765', status: wsConnected ? 'ONLINE' : 'OFFLINE' },
|
||||
{ name: 'SOVEREIGNTY', url: 'http://localhost:8082/metrics', status: metrics.sovereignty_score + '%' }
|
||||
{ name: 'HERMES WS', url: wsStatusUrl, status: wsConnected ? 'ONLINE' : 'OFFLINE' },
|
||||
{ name: 'SOVEREIGNTY', url: metricsUrl, status: metrics.sovereignty_score + '%' }
|
||||
];
|
||||
|
||||
container.innerHTML = '';
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
version: "3.9"
|
||||
|
||||
services:
|
||||
nexus-main:
|
||||
build: .
|
||||
@@ -7,9 +5,21 @@ services:
|
||||
restart: unless-stopped
|
||||
ports:
|
||||
- "8765:8765"
|
||||
|
||||
nexus-staging:
|
||||
build: .
|
||||
container_name: nexus-staging
|
||||
restart: unless-stopped
|
||||
ports:
|
||||
- "8766:8765"
|
||||
- "8766:8765"
|
||||
|
||||
nexus-preview:
|
||||
build:
|
||||
context: .
|
||||
dockerfile: Dockerfile.preview
|
||||
container_name: nexus-preview
|
||||
restart: unless-stopped
|
||||
ports:
|
||||
- "3000:3000"
|
||||
depends_on:
|
||||
- nexus-main
|
||||
25
docs/preview-deploy.md
Normal file
25
docs/preview-deploy.md
Normal file
@@ -0,0 +1,25 @@
|
||||
# Nexus preview deploy
|
||||
|
||||
The Nexus frontend must be served over HTTP for ES modules to boot. This repo now includes a preview stack that serves the frontend on a proper URL and proxies `/api/world/ws` back to the existing Nexus WebSocket gateway.
|
||||
|
||||
## Quick start
|
||||
|
||||
```bash
|
||||
docker compose up -d nexus-main nexus-preview
|
||||
```
|
||||
|
||||
Open:
|
||||
- `http://localhost:3000`
|
||||
|
||||
The preview service serves the static frontend and proxies WebSocket traffic at:
|
||||
- `/api/world/ws`
|
||||
|
||||
## Remote preview
|
||||
|
||||
If you run the same compose stack on a VPS, the preview URL is:
|
||||
- `http://<host>:3000`
|
||||
|
||||
## Notes
|
||||
- `nexus-main` keeps serving the backend WebSocket gateway on port `8765`
|
||||
- `nexus-preview` serves the frontend on port `3000`
|
||||
- The browser can stay on a single origin because nginx proxies the WebSocket path
|
||||
36
preview/nginx.conf
Normal file
36
preview/nginx.conf
Normal file
@@ -0,0 +1,36 @@
|
||||
server {
|
||||
listen 3000;
|
||||
server_name _;
|
||||
root /usr/share/nginx/html;
|
||||
index index.html;
|
||||
|
||||
location / {
|
||||
try_files $uri $uri/ /index.html;
|
||||
}
|
||||
|
||||
location ~* \.js$ {
|
||||
types { application/javascript js; }
|
||||
}
|
||||
|
||||
location ~* \.mjs$ {
|
||||
types { application/javascript mjs; }
|
||||
}
|
||||
|
||||
location ~* \.css$ {
|
||||
types { text/css css; }
|
||||
}
|
||||
|
||||
location ~* \.json$ {
|
||||
types { application/json json; }
|
||||
add_header Cache-Control "no-cache";
|
||||
}
|
||||
|
||||
location /api/world/ws {
|
||||
proxy_pass http://nexus-main:8765;
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Upgrade $http_upgrade;
|
||||
proxy_set_header Connection "upgrade";
|
||||
proxy_set_header Host $host;
|
||||
proxy_read_timeout 86400;
|
||||
}
|
||||
}
|
||||
46
tests/test_preview_deploy.py
Normal file
46
tests/test_preview_deploy.py
Normal file
@@ -0,0 +1,46 @@
|
||||
from pathlib import Path
|
||||
|
||||
|
||||
ROOT = Path(__file__).resolve().parent.parent
|
||||
DOCKERFILE = ROOT / "Dockerfile.preview"
|
||||
NGINX_CONF = ROOT / "preview" / "nginx.conf"
|
||||
DOC = ROOT / "docs" / "preview-deploy.md"
|
||||
COMPOSE = ROOT / "docker-compose.yml"
|
||||
|
||||
|
||||
def test_preview_deploy_files_exist():
|
||||
assert DOCKERFILE.exists(), "expected Dockerfile.preview for Nexus preview deployment"
|
||||
assert NGINX_CONF.exists(), "expected preview/nginx.conf for Nexus preview deployment"
|
||||
assert DOC.exists(), "expected docs/preview-deploy.md runbook"
|
||||
|
||||
|
||||
def test_preview_nginx_config_proxies_websocket_and_serves_modules():
|
||||
text = NGINX_CONF.read_text(encoding="utf-8")
|
||||
assert "listen 3000;" in text
|
||||
assert "location /api/world/ws" in text
|
||||
assert "proxy_pass http://nexus-main:8765;" in text
|
||||
assert "application/javascript js;" in text
|
||||
assert "try_files $uri $uri/ /index.html;" in text
|
||||
|
||||
|
||||
def test_compose_exposes_preview_service():
|
||||
text = COMPOSE.read_text(encoding="utf-8")
|
||||
assert "nexus-preview:" in text
|
||||
assert '"3000:3000"' in text
|
||||
assert "depends_on:" in text
|
||||
assert "nexus-main" in text
|
||||
|
||||
|
||||
def test_preview_runbook_documents_preview_url():
|
||||
text = DOC.read_text(encoding="utf-8")
|
||||
assert "http://localhost:3000" in text
|
||||
assert "docker compose up -d nexus-main nexus-preview" in text
|
||||
assert "/api/world/ws" in text
|
||||
|
||||
|
||||
def test_app_avoids_hardcoded_preview_breaking_urls():
|
||||
text = (ROOT / "app.js").read_text(encoding="utf-8")
|
||||
assert "ws://143.198.27.163:8765" not in text
|
||||
assert "http://localhost:8082/metrics" not in text
|
||||
assert "const metricsUrl = metricsOverride || `${window.location.protocol}//${window.location.host}/metrics`;" in text
|
||||
assert "const wsStatusUrl = `${protocol}//${window.location.host}/api/world/ws`;" in text
|
||||
Reference in New Issue
Block a user