aboutsummaryrefslogtreecommitdiff
path: root/src/zenserver
diff options
context:
space:
mode:
Diffstat (limited to 'src/zenserver')
-rw-r--r--src/zenserver/compute/computeserver.cpp16
-rw-r--r--src/zenserver/frontend/html/compute/compute.html6
-rw-r--r--src/zenserver/frontend/html/compute/hub.html7
-rw-r--r--src/zenserver/frontend/html/compute/orchestrator.html7
-rw-r--r--src/zenserver/frontend/html/util/sanitize.js9
-rw-r--r--src/zenserver/main.cpp5
-rw-r--r--src/zenserver/xmake.lua10
7 files changed, 24 insertions, 36 deletions
diff --git a/src/zenserver/compute/computeserver.cpp b/src/zenserver/compute/computeserver.cpp
index 724ef9ad2..d1875f41a 100644
--- a/src/zenserver/compute/computeserver.cpp
+++ b/src/zenserver/compute/computeserver.cpp
@@ -721,21 +721,7 @@ ZenComputeServer::InitializeOrchestratorWebSocket()
return;
}
- // Convert http://host:port → ws://host:port/orch/ws
- std::string WsUrl = m_CoordinatorEndpoint;
- if (WsUrl.starts_with("http://"))
- {
- WsUrl = "ws://" + WsUrl.substr(7);
- }
- else if (WsUrl.starts_with("https://"))
- {
- WsUrl = "wss://" + WsUrl.substr(8);
- }
- if (!WsUrl.empty() && WsUrl.back() != '/')
- {
- WsUrl += '/';
- }
- WsUrl += "orch/ws";
+ std::string WsUrl = HttpToWsUrl(m_CoordinatorEndpoint, "/orch/ws");
ZEN_INFO("establishing WebSocket link to orchestrator at {}", WsUrl);
diff --git a/src/zenserver/frontend/html/compute/compute.html b/src/zenserver/frontend/html/compute/compute.html
index 66c20175f..c07bbb692 100644
--- a/src/zenserver/frontend/html/compute/compute.html
+++ b/src/zenserver/frontend/html/compute/compute.html
@@ -6,6 +6,7 @@
<title>Zen Compute Dashboard</title>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/chart.umd.min.js"></script>
<link rel="stylesheet" type="text/css" href="../zen.css" />
+ <script src="../util/sanitize.js"></script>
<script src="../theme.js"></script>
<script src="../banner.js" defer></script>
<script src="../nav.js" defer></script>
@@ -456,11 +457,6 @@
});
// Helper functions
- function escapeHtml(text) {
- var div = document.createElement('div');
- div.textContent = text;
- return div.innerHTML;
- }
function formatBytes(bytes) {
if (bytes === 0) return '0 B';
diff --git a/src/zenserver/frontend/html/compute/hub.html b/src/zenserver/frontend/html/compute/hub.html
index 32e1b05db..620349a2b 100644
--- a/src/zenserver/frontend/html/compute/hub.html
+++ b/src/zenserver/frontend/html/compute/hub.html
@@ -4,6 +4,7 @@
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" type="text/css" href="../zen.css" />
+ <script src="../util/sanitize.js"></script>
<script src="../theme.js"></script>
<script src="../banner.js" defer></script>
<script src="../nav.js" defer></script>
@@ -62,12 +63,6 @@
const BASE_URL = window.location.origin;
const REFRESH_INTERVAL = 2000;
- function escapeHtml(text) {
- var div = document.createElement('div');
- div.textContent = text;
- return div.innerHTML;
- }
-
function showError(message) {
document.getElementById('error-container').innerHTML =
'<div class="error">Error: ' + escapeHtml(message) + '</div>';
diff --git a/src/zenserver/frontend/html/compute/orchestrator.html b/src/zenserver/frontend/html/compute/orchestrator.html
index a519dee18..d1a2bb015 100644
--- a/src/zenserver/frontend/html/compute/orchestrator.html
+++ b/src/zenserver/frontend/html/compute/orchestrator.html
@@ -4,6 +4,7 @@
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" type="text/css" href="../zen.css" />
+ <script src="../util/sanitize.js"></script>
<script src="../theme.js"></script>
<script src="../banner.js" defer></script>
<script src="../nav.js" defer></script>
@@ -128,12 +129,6 @@
const BASE_URL = window.location.origin;
const REFRESH_INTERVAL = 2000;
- function escapeHtml(text) {
- var div = document.createElement('div');
- div.textContent = text;
- return div.innerHTML;
- }
-
function showError(message) {
document.getElementById('error-container').innerHTML =
'<div class="error">Error: ' + escapeHtml(message) + '</div>';
diff --git a/src/zenserver/frontend/html/util/sanitize.js b/src/zenserver/frontend/html/util/sanitize.js
new file mode 100644
index 000000000..1b0f32e38
--- /dev/null
+++ b/src/zenserver/frontend/html/util/sanitize.js
@@ -0,0 +1,9 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+// Shared utility functions for compute dashboard pages.
+
+function escapeHtml(text) {
+ var div = document.createElement('div');
+ div.textContent = text;
+ return div.innerHTML;
+}
diff --git a/src/zenserver/main.cpp b/src/zenserver/main.cpp
index 26ae85ae1..9d786c209 100644
--- a/src/zenserver/main.cpp
+++ b/src/zenserver/main.cpp
@@ -319,6 +319,11 @@ main(int argc, char* argv[])
{
ServerMode = kTest;
}
+ else if (argv[1][0] != '-')
+ {
+ fprintf(stderr, "unknown mode '%s'. Available modes: hub, store, compute, proxy, test\n", argv[1]);
+ return 1;
+ }
}
switch (ServerMode)
diff --git a/src/zenserver/xmake.lua b/src/zenserver/xmake.lua
index fe279ebb2..b619c5548 100644
--- a/src/zenserver/xmake.lua
+++ b/src/zenserver/xmake.lua
@@ -19,7 +19,7 @@ target("zenserver")
add_headerfiles("**.h")
add_rules("utils.bin2c", {extensions = {".zip"}})
add_files("**.cpp")
- add_files("frontend/html.zip")
+ add_files("$(buildir)/frontend/html.zip")
add_files("zenserver.cpp", {unity_ignored = true })
if is_plat("linux") and not (get_config("toolchain") or ""):find("clang") then
@@ -84,7 +84,8 @@ target("zenserver")
on_load(function(target)
local html_dir = path.join(os.projectdir(), "src/zenserver/frontend/html")
- local zip_path = path.join(os.projectdir(), "src/zenserver/frontend/html.zip")
+ local zip_dir = path.join(os.projectdir(), get_config("buildir") or "build", "frontend")
+ local zip_path = path.join(zip_dir, "html.zip")
-- Check if zip needs regeneration
local need_update = not os.isfile(zip_path)
@@ -100,18 +101,19 @@ target("zenserver")
if need_update then
print("Regenerating frontend zip...")
+ os.mkdir(zip_dir)
os.tryrm(zip_path)
import("detect.tools.find_7z")
local cmd_7z = find_7z()
if cmd_7z then
- os.execv(cmd_7z, {"a", "-mx0", zip_path, path.join(html_dir, ".")})
+ os.execv(cmd_7z, {"a", "-mx0", "-bso0", zip_path, path.join(html_dir, ".")})
else
import("detect.tools.find_zip")
local zip_cmd = find_zip()
if zip_cmd then
local oldir = os.cd(html_dir)
- os.execv(zip_cmd, {"-r", "-0", zip_path, "."})
+ os.execv(zip_cmd, {"-r", "-0", "-q", zip_path, "."})
os.cd(oldir)
else
raise("Unable to find a suitable zip tool (need 7z or zip)")
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-27 07:42:37 +0000