j3d1/webvirtcloud
1
0
Fork 0
mirror of https://github.com/retspen/webvirtcloud synced 2026-10-18 09:00:07 +00:00
Code Issues Projects Releases Wiki Activity

fix(console): fix novncd startup in container and prevent double slashes in websocket url

Browse source
This commit is contained in:
catborise 2026-09-25 23:11:52 +03:00
parent f061189716
commit d9112b797f
7 changed files with 64 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
console/templates/console-spice-full.html
View file

@ -61,8 +61,8 @@
sc.stop();
}
// uri = scheme + host + ":" + port;
uri = scheme + "{{ ws_host }}:{{ ws_port }}{{ ws_path }}";
var path = '{{ ws_path }}';
uri = scheme + "{{ ws_host }}:{{ ws_port }}" + (path ? (path[0] == '/' ? path : ('/' + path)) : '/');
document.getElementById('connectButton').innerHTML = "Stop";
document.getElementById('connectButton').onclick = disconnect;

10
console/templates/console-vnc-lite.html
View file

@ -194,7 +194,15 @@
if (port) {
url += ':' + port;
}
url += '/' + path;
if (path) {
url += path.startsWith('/') ? path : ('/' + path);
} else {
url += '/';
}
const token = readQueryVariable('token', '{{ token }}');
if (token) {
url += (url.includes('?') ? '&' : '?') + 'token=' + encodeURIComponent(token);
}
// Creating a new RFB object will start a new connection
rfb = new RFB(document.getElementById('noVNC_container'), url,