fixe WS issue

Author: Giu Platania

TASK.md

@@ -1,5 +1,5 @@
 # TASKS
-- 2026-03-01: DONE. Add a remote launcher script that installs the backend from local source, installs npm when needed, and starts the API plus UI.
+- 2026-03-01: DONE. Add a remote launcher script that installs the backend from local source, installs npm when needed, and starts the API plus UI with the WebSocket URL derived from the API URL by default.
 - 2026-03-01: DONE. Add remote access documentation for LAN and public IP RCH deployments.
 - 2026-02-26: DONE. Add LXMF outbound delivery acknowledgement handling and log recipient delivery confirmations to the event feed.
 - 2026-02-26: DONE. Abort gateway startup when API host/port is already bound to prevent duplicate hub instances and ratchet contention.

docs/remoteAccess.md

@@ -7,6 +7,7 @@ This guide explains how to reach a Reticulum Community Hub (RCH) instance from a
 - `rch start` is intended for local desktop use and binds the API to `127.0.0.1`.
 - For LAN or WAN access, run the gateway directly with `--api-host 0.0.0.0` (or another reachable interface).
 - For a single-command launcher that installs the backend from local source into a venv and starts both services, run `./run_server_ui_remote.sh`.
+- `run_server_ui_remote.sh` only preconfigures the REST base URL by default; the UI derives the WebSocket URL from that value unless you explicitly set `VITE_RTH_WS_BASE_URL`.
 - Remote clients must authenticate with `RTH_API_KEY`.
 - Remote requests can use either `X-API-Key: <key>` or `Authorization: Bearer <key>`.
 - If the hub is reachable over the public internet, prefer a VPN or HTTPS/WSS behind a reverse proxy.

run_server_ui_remote.sh

@@ -103,7 +103,7 @@ case "$RTH_PUBLIC_SCHEME" in
 esac
 
 VITE_RTH_BASE_URL="${VITE_RTH_BASE_URL:-${RTH_PUBLIC_SCHEME}://${RTH_PUBLIC_HOST}:${RTH_API_PORT}}"
-VITE_RTH_WS_BASE_URL="${VITE_RTH_WS_BASE_URL:-${RTH_PUBLIC_WS_SCHEME}://${RTH_PUBLIC_HOST}:${RTH_API_PORT}}"
+EFFECTIVE_WS_BASE_URL="${VITE_RTH_WS_BASE_URL:-${RTH_PUBLIC_WS_SCHEME}://${RTH_PUBLIC_HOST}:${RTH_API_PORT}}"
 
 if command -v python3 >/dev/null 2>&1; then
   PYTHON_CMD="python3"
@@ -179,7 +179,20 @@ echo "Starting hub + northbound API at ${VITE_RTH_BASE_URL} (bind ${RTH_API_HOST
 BACKEND_PID=$!
 
 echo "Starting UI dev server at http://${RTH_PUBLIC_HOST}:${RTH_UI_PORT} (bind ${RTH_UI_HOST}:${RTH_UI_PORT})"
-(cd ui && VITE_RTH_BASE_URL="$VITE_RTH_BASE_URL" VITE_RTH_WS_BASE_URL="$VITE_RTH_WS_BASE_URL" npm run dev -- --host "$RTH_UI_HOST" --port "$RTH_UI_PORT") &
+if [[ -n "${VITE_RTH_WS_BASE_URL:-}" ]]; then
+  (
+    cd ui && \
+      VITE_RTH_BASE_URL="$VITE_RTH_BASE_URL" \
+      VITE_RTH_WS_BASE_URL="$VITE_RTH_WS_BASE_URL" \
+      npm run dev -- --host "$RTH_UI_HOST" --port "$RTH_UI_PORT"
+  ) &
+else
+  (
+    cd ui && \
+      VITE_RTH_BASE_URL="$VITE_RTH_BASE_URL" \
+      npm run dev -- --host "$RTH_UI_HOST" --port "$RTH_UI_PORT"
+  ) &
+fi
 UI_PID=$!
 
 cleanup() {
@@ -195,7 +208,11 @@ trap cleanup EXIT INT TERM
 echo
 echo "Hub+API: storage=${RTH_STORAGE_DIR}  mode=${RTH_HUB_MODE}  daemon=${RTH_DAEMON}  services=${RTH_SERVICES}"
 echo "API URL: ${VITE_RTH_BASE_URL}"
-echo "WS URL:  ${VITE_RTH_WS_BASE_URL}"
+if [[ -n "${VITE_RTH_WS_BASE_URL:-}" ]]; then
+  echo "WS URL:  ${VITE_RTH_WS_BASE_URL} (explicit override)"
+else
+  echo "WS URL:  ${EFFECTIVE_WS_BASE_URL} (derived from API URL in the UI)"
+fi
 echo "UI URL:  http://${RTH_PUBLIC_HOST}:${RTH_UI_PORT}"
 echo
 echo "Press Ctrl+C to stop both processes."

ui/src/stores/connection.spec.ts

@@ -45,4 +45,24 @@ describe("connection store target and auth validation", () => {
     expect(connectionStore.authValidationError).toBe("");
     expect(connectionStore.hasValidAuthConfig()).toBe(true);
   });
+
+  it("normalizes a redundant stored websocket base url to follow the base url", () => {
+    window.localStorage.setItem(
+      "rth-ui-connection",
+      JSON.stringify({
+        baseUrl: "http://10.0.0.5:8000",
+        wsBaseUrl: "ws://10.0.0.5:8000",
+        authMode: "apiKey",
+        apiKey: "secret"
+      })
+    );
+
+    const connectionStore = useConnectionStore();
+
+    expect(connectionStore.wsBaseUrl).toBe("");
+    expect(connectionStore.resolveWsUrl("/events/system")).toBe("ws://10.0.0.5:8000/events/system");
+
+    connectionStore.baseUrl = "http://192.168.1.20:8000";
+    expect(connectionStore.resolveWsUrl("/events/system")).toBe("ws://192.168.1.20:8000/events/system");
+  });
 });

ui/src/stores/connection.ts

@@ -57,6 +57,16 @@ const normalizeOrigin = (value: string): string => {
   }
 };
 
+const deriveWsBaseUrl = (origin: string): string => {
+  const normalizedOrigin = normalizeOrigin(origin);
+  if (!normalizedOrigin) {
+    return "";
+  }
+  const scheme = normalizedOrigin.startsWith("https") ? "wss" : "ws";
+  const host = normalizedOrigin.replace(/^https?:\/\//, "");
+  return `${scheme}://${host}`;
+};
+
 const resolveDefaultBaseUrl = (): string => {
   const envBaseUrl = import.meta.env.VITE_RTH_BASE_URL;
   if (envBaseUrl) {
@@ -80,18 +90,30 @@ const resolveDefaultWsBaseUrl = (): string => {
 };
 
 export const useConnectionStore = defineStore("connection", () => {
+  const defaultBaseUrl = resolveDefaultBaseUrl();
+  const defaultWsBaseUrl = resolveDefaultWsBaseUrl();
   const stored = loadJson<ConnectionState>(STORAGE_KEY, {
-    baseUrl: resolveDefaultBaseUrl(),
-    wsBaseUrl: resolveDefaultWsBaseUrl(),
+    baseUrl: defaultBaseUrl,
+    wsBaseUrl: defaultWsBaseUrl,
     authMode: "none",
     token: "",
     apiKey: "",
     rememberSecrets: false
   });
 
   const rememberSecrets = ref<boolean>(stored.rememberSecrets ?? false);
-  const baseUrl = ref<string>(stored.baseUrl ?? "");
-  const wsBaseUrl = ref<string>(stored.wsBaseUrl ?? "");
+  const initialBaseUrl = normalizeOrigin(stored.baseUrl ?? "") || defaultBaseUrl;
+  const persistedWsBaseUrl = normalizeOrigin(stored.wsBaseUrl ?? "");
+  const derivedWsBaseUrl = deriveWsBaseUrl(initialBaseUrl);
+  const initialWsBaseUrl =
+    persistedWsBaseUrl && persistedWsBaseUrl !== derivedWsBaseUrl
+      ? persistedWsBaseUrl
+      : defaultWsBaseUrl && normalizeOrigin(defaultWsBaseUrl) !== derivedWsBaseUrl
+        ? normalizeOrigin(defaultWsBaseUrl)
+        : "";
+
+  const baseUrl = ref<string>(initialBaseUrl);
+  const wsBaseUrl = ref<string>(initialWsBaseUrl);
   const authMode = ref<AuthMode>(stored.authMode ?? "none");
   const token = ref<string>(rememberSecrets.value ? (stored.token ?? "") : "");
   const apiKey = ref<string>(rememberSecrets.value ? (stored.apiKey ?? "") : "");
@@ -259,9 +281,13 @@ export const useConnectionStore = defineStore("connection", () => {
   };
 
   const persist = (includeSecrets = rememberSecrets.value) => {
+    const normalizedBaseUrl = normalizeOrigin(baseUrl.value);
+    const normalizedWsBaseUrl = normalizeOrigin(wsBaseUrl.value);
+    const persistedWsUrl =
+      normalizedWsBaseUrl && normalizedWsBaseUrl !== deriveWsBaseUrl(normalizedBaseUrl) ? normalizedWsBaseUrl : "";
     saveJson(STORAGE_KEY, {
-      baseUrl: baseUrl.value,
-      wsBaseUrl: wsBaseUrl.value,
+      baseUrl: normalizedBaseUrl,
+      wsBaseUrl: persistedWsUrl,
       authMode: authMode.value,
       token: includeSecrets ? token.value : "",
       apiKey: includeSecrets ? apiKey.value : "",