From: Raphaël Jakse <raphael.trivabble@jakse.fr>
Date: Mon, 13 Apr 2020 08:25:30 +0000 (+0200)
Subject: Don't force :trivabble in sse and ws URLs
X-Git-Url: https://secure.softndesign.org/git/?a=commitdiff_plain;h=b312e3e26b6ae4d8a3cc8e18afdadde6b52039e2;p=trivabble.git

Don't force :trivabble in sse and ws URLs
---

diff --git a/trivabble-server.js b/trivabble-server.js
index a97c87b..c6e9def 100644
--- a/trivabble-server.js
+++ b/trivabble-server.js
@@ -973,7 +973,7 @@ function handleRequest(request, response) {
             return;
         }
 
-        const sseMatch = request.url.match(/\/:[^/]+\/sse\/(?<data>[\s\S]+)$/u);
+        const sseMatch = request.url.match(/\/(?::[^/]+\/)?sse\/(?<data>[\s\S]+)$/u);
 
         if (sseMatch) {
             response.setHeader("Content-Type", "text/event-stream");
@@ -1025,7 +1025,7 @@ fs.readFile("games.backup.json", function (err, data) {
 
         // socket.on("close", function () {});
 
-        const webSocketMatch = request.url.match(/\/:[^/]+\/ws\/(?<data>[\s\S]+)$/u);
+        const webSocketMatch = request.url.match(/\/(?::[^/]+\/)?ws\/(?<data>[\s\S]+)$/u);
 
         let decodedData;
         try {