From 8eaa9c6324456982d8bc0382f3bf8ecff7a63a0b Mon Sep 17 00:00:00 2001
From: Herbert Wolverson <herberticus@gmail.com>
Date: Wed, 3 Jul 2024 08:41:17 -0500
Subject: [PATCH] Move the websocket to /websocket/ws from /ws - part 1 of
 cleaning up the Axum Router tree.

---
 src/rust/lqosd/src/node_manager/js_build/src/pubsub/ws.js | 2 +-
 src/rust/lqosd/src/node_manager/run.rs                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/rust/lqosd/src/node_manager/js_build/src/pubsub/ws.js b/src/rust/lqosd/src/node_manager/js_build/src/pubsub/ws.js
index 586f7b7f..5af1f2ee 100644
--- a/src/rust/lqosd/src/node_manager/js_build/src/pubsub/ws.js
+++ b/src/rust/lqosd/src/node_manager/js_build/src/pubsub/ws.js
@@ -6,7 +6,7 @@ export function subscribeWS(channels, handler) {
         ws.close();
     }
 
-    ws = new WebSocket('ws://' + window.location.host + '/ws');
+    ws = new WebSocket('ws://' + window.location.host + '/websocket/ws');
     ws.onopen = () => {
         for (let i=0; i<channels.length; i++) {
             ws.send("{ \"channel\" : \"" + channels[i] + "\"}");
diff --git a/src/rust/lqosd/src/node_manager/run.rs b/src/rust/lqosd/src/node_manager/run.rs
index 31e73342..ef3f9c69 100644
--- a/src/rust/lqosd/src/node_manager/run.rs
+++ b/src/rust/lqosd/src/node_manager/run.rs
@@ -14,7 +14,7 @@ pub async fn spawn_webserver() -> Result<()>  {
 
     // Construct the router from parts
     let router = Router::new()
-        .nest("/", websocket_router())
+        .nest("/websocket/", websocket_router())
         .nest("/vendor", vendor_route()?) // Serve /vendor as purely static
         .nest("/", static_routes()?)
         .nest("/local-api", local_api());