Merge pull request #15 from fliphess/master

Update websocket regex in javascript code to match the full url when proxied
hvxl · Jan 28, 2021 · 6d1ab21 · 6d1ab21
2 parents a275c52 + ce1af6d
commit 6d1ab21
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/otmonitor.vfs/docroot/configure.js b/otmonitor.vfs/docroot/configure.js
@@ -18,7 +18,7 @@ function formatquery(url, json) {
     return url + '?' + query.join('&');
 }
 
-var wsurl = "ws" + document.URL.match("s?://[-a-z0-9.:]+/") + "configure.ws"
+var wsurl = "ws" + document.URL.match("s?://[-a-zA-Z0-9.:_/]+/") + "configure.ws";
 if (typeof query !== 'undefined') {
     wsurl = formatquery(wsurl, query);
 }
@@ -162,7 +162,7 @@ function input(w, section, name) {
 
 function seconds(w, section, name) {
   config(section, name, w.value * 1000);
-} 
+}
 
 function sync(w, id) {
   var e = document.getElementById(id);

diff --git a/otmonitor.vfs/docroot/iphone.js b/otmonitor.vfs/docroot/iphone.js
@@ -5,7 +5,7 @@ function debug(str) {
     if (output) output.innerHTML += str + "<BR>";
 }
 
-var wsurl = "ws" + document.URL.match("s?://[-a-z0-9.:]+/") + "basic.ws";
+var wsurl = "ws" + document.URL.match("s?://[-a-zA-Z0-9.:_/]+/") + "basic.ws";
 
 if ("WebSocket" in window) {
    var websocket = new WebSocket(wsurl);

diff --git a/otmonitor.vfs/docroot/message.js b/otmonitor.vfs/docroot/message.js
@@ -1,4 +1,4 @@
-var wsurl = "ws" + document.URL.match("s?://[-a-z0-9.:/]+/") + "message.ws"
+var wsurl = "ws" + document.URL.match("s?://[-a-zA-Z0-9.:_/]+/") + "message.ws"
 
 if ("WebSocket" in window) {
    var ws = new WebSocket(wsurl);

diff --git a/otmonitor.vfs/docroot/status.js b/otmonitor.vfs/docroot/status.js
@@ -18,7 +18,7 @@ function formatquery(url, json) {
     return url + '?' + query.join('&');
 }
 
-var wsurl = "ws" + document.URL.match("s?://[-a-z0-9.:]+/") + "status.ws"
+var wsurl = "ws" + document.URL.match("s?://[-a-zA-Z0-9.:_/]+/") + "status.ws"
 if (typeof query !== 'undefined') {
     wsurl = formatquery(wsurl, query);
 }
@@ -181,7 +181,7 @@ function input(w, section, name) {
 
 function seconds(w, section, name) {
     config(section, name, w.value * 1000);
-} 
+}
 
 function sync(w, id) {
     var e = document.getElementById(id);

diff --git a/otmonitor.vfs/docroot/upgrade.js b/otmonitor.vfs/docroot/upgrade.js
@@ -4,7 +4,7 @@ function debug(str) {
   if (output) output.innerHTML += str + "<BR>"
 }
 
-var wsurl = "ws" + document.URL.match("s?://[-a-z0-9.:]+/") + "upgrade.ws"
+var wsurl = "ws" + document.URL.match("s?://[-a-zA-Z0-9.:_/]+/") + "upgrade.ws"
 
 if ("WebSocket" in window) {
    debug("Using WebSocket")