From 4a8d3a99c143c8d7b5638aeda0926c963197dcaa Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Thu, 2 Nov 2023 11:39:49 +0100
Subject: [PATCH] =?UTF-8?q?Rename=20websocket=20/ws=20=E2=86=92=20/dougal-?=
 =?UTF-8?q?websocket.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The Webpack dev server seems to really like /ws and ignores any
attempts to set a different path, so we just rename our websocket
instead.
---
 lib/www/client/source/src/main.js   | 4 ++--
 lib/www/client/source/vue.config.js | 2 +-
 lib/www/server/ws/index.js          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/www/client/source/src/main.js b/lib/www/client/source/src/main.js
index fc4527c..1f38c4a 100644
--- a/lib/www/client/source/src/main.js
+++ b/lib/www/client/source/src/main.js
@@ -14,7 +14,7 @@ Vue.use(vueDebounce);
 
 Vue.filter('markdown', markdown);
 Vue.filter('markdownInline', markdownInline);
-Vue.filter('position', (str, item, opts) => 
+Vue.filter('position', (str, item, opts) =>
   str
   .replace(/@POS(ITION)?@/g, geometryAsString(item, opts) || "(position unknown)")
   .replace(/@DMS@/g, geometryAsString(item, {...opts, dms:true}) || "(position unknown)")
@@ -31,7 +31,7 @@ new Vue({
 
       user: null,
 
-      wsUrl: "/ws",
+      wsUrl: "/dougal-websocket",
       ws: null
     }
   },
diff --git a/lib/www/client/source/vue.config.js b/lib/www/client/source/vue.config.js
index f915a4a..96a5f74 100644
--- a/lib/www/client/source/vue.config.js
+++ b/lib/www/client/source/vue.config.js
@@ -9,7 +9,7 @@ module.exports = {
       "^/api(/|$)": {
         target: "http://127.0.0.1:3000",
       },
-      "^/ws(/|$)": {
+      "^/dougal-websocket(/|$)": {
         target: "ws://127.0.0.1:3000",
         ws: true
       }
diff --git a/lib/www/server/ws/index.js b/lib/www/server/ws/index.js
index c35e7e1..e483bb1 100644
--- a/lib/www/server/ws/index.js
+++ b/lib/www/server/ws/index.js
@@ -15,7 +15,7 @@ function start (server, pingInterval=30000) {
 	server.on('upgrade', (request, socket, head) => {
 // 		console.log("Received upgrade request", request.url);
 		const url = URL.parse(request.url);
-		if (/^\/ws\/?$/.test(url.pathname)) {
+		if (/^\/dougal-websocket\/?$/.test(url.pathname)) {
 			wsServer.handleUpgrade(request, socket, head, socket => {
 				wsServer.emit('connection', socket, request);
 			});