ruslan/Stend_mont
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rdp-proxy: show overlay only after connect, remove waiting phase

Browse Source
This commit is contained in:
Ruslan
2026-07-20 15:16:43 +00:00
parent 6f40e9dc72
commit 283f4f93c9
1 changed files with 10 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rdp-proxy/entrypoint.sh
+5 -35
View File
@@ -40,7 +40,6 @@ cat > /opt/portal/index.html <<HTML
animation:spin .9s linear infinite; animation:spin .9s linear infinite;
} }
.co-title{color:#dce8f5;font:600 1.1rem/1.4 sans-serif;text-align:center;letter-spacing:.01em} .co-title{color:#dce8f5;font:600 1.1rem/1.4 sans-serif;text-align:center;letter-spacing:.01em}
.co-timer{color:#6a8aaa;font:400 .85rem sans-serif;min-height:1.2em}
.co-bar-wrap{ .co-bar-wrap{
width:280px;height:4px;background:rgba(220,232,245,.1); width:280px;height:4px;background:rgba(220,232,245,.1);
border-radius:99px;overflow:hidden; border-radius:99px;overflow:hidden;
@@ -71,12 +70,11 @@ cat > /opt/portal/index.html <<HTML
</head> </head>
<body> <body>
<div id="screen"></div> <div id="screen"></div>
<div id="co"> <div id="co" style="display:none">
<div class="co-inner"> <div class="co-inner">
<div class="co-ring"></div> <div class="co-ring"></div>
<div class="co-title" id="co-title">Подключение к рабочему столу...</div> <div class="co-title">Устанавливается соединение с рабочим столом...</div>
<div class="co-timer" id="co-timer"></div> <div class="co-bar-wrap">
<div class="co-bar-wrap" id="co-bar-wrap" style="display:none">
<div class="co-bar" id="co-bar"></div> <div class="co-bar" id="co-bar"></div>
</div> </div>
</div> </div>
@@ -93,9 +91,6 @@ cat > /opt/portal/index.html <<HTML
const wsUrl = (location.protocol === 'https:' ? 'wss://' : 'ws://') + location.host + wsBase + '/websockify'; const wsUrl = (location.protocol === 'https:' ? 'wss://' : 'ws://') + location.host + wsBase + '/websockify';
const statusEl = document.getElementById('status'); const statusEl = document.getElementById('status');
const coEl = document.getElementById('co'); const coEl = document.getElementById('co');
const coTitleEl = document.getElementById('co-title');
const coTimerEl = document.getElementById('co-timer');
const coBarWrap = document.getElementById('co-bar-wrap');
const coBar = document.getElementById('co-bar'); const coBar = document.getElementById('co-bar');
const XK_ALT_L = 0xffe9; const XK_ALT_L = 0xffe9;
const XK_LEFT = 0xff51; const XK_LEFT = 0xff51;
@@ -107,37 +102,14 @@ cat > /opt/portal/index.html <<HTML
const MAX_RECONNECT = 12; const MAX_RECONNECT = 12;
const DELAYS = [1000,2000,3000,5000,8000]; const DELAYS = [1000,2000,3000,5000,8000];
let manualDisconnect = false; let manualDisconnect = false;
let timerInterval = null;
let timerStart = 0;
function startTimer() { function showOverlayConnecting() {
timerStart = Date.now(); coBar.style.transition = 'none';
clearInterval(timerInterval);
timerInterval = setInterval(() => {
const s = Math.floor((Date.now() - timerStart) / 1000);
coTimerEl.textContent = s + ' сек';
}, 500);
}
function showOverlayWaiting() {
coTitleEl.textContent = 'Подключение к рабочему столу...';
coTimerEl.textContent = '0 сек';
coBarWrap.style.display = 'none';
coBar.style.width = '0%'; coBar.style.width = '0%';
coEl.style.opacity = '1'; coEl.style.opacity = '1';
coEl.style.display = 'flex'; coEl.style.display = 'flex';
coEl.classList.remove('hidden'); coEl.classList.remove('hidden');
statusEl.style.display = 'none'; statusEl.style.display = 'none';
startTimer();
}
function showOverlayConnecting() {
clearInterval(timerInterval);
coTitleEl.textContent = 'Устанавливается соединение с рабочим столом...';
coTimerEl.textContent = '';
coBarWrap.style.display = 'block';
coBar.style.transition = 'none';
coBar.style.width = '0%';
requestAnimationFrame(() => requestAnimationFrame(() => { requestAnimationFrame(() => requestAnimationFrame(() => {
coBar.style.transition = 'width 5.8s cubic-bezier(0.25,0.46,0.45,0.94)'; coBar.style.transition = 'width 5.8s cubic-bezier(0.25,0.46,0.45,0.94)';
coBar.style.width = '100%'; coBar.style.width = '100%';
@@ -146,7 +118,6 @@ cat > /opt/portal/index.html <<HTML
} }
function hideOverlay() { function hideOverlay() {
clearInterval(timerInterval);
coEl.classList.add('hidden'); coEl.classList.add('hidden');
setTimeout(() => { coEl.style.display = 'none'; }, 520); setTimeout(() => { coEl.style.display = 'none'; }, 520);
} }
@@ -176,7 +147,6 @@ cat > /opt/portal/index.html <<HTML
if (manualDisconnect) return; if (manualDisconnect) return;
connected = false; connected = false;
hideStatus(); hideStatus();
showOverlayWaiting();
if (rfb) { try { rfb.disconnect(); } catch(e){} } if (rfb) { try { rfb.disconnect(); } catch(e){} }
rfb = new RFB(document.getElementById('screen'), wsUrl); rfb = new RFB(document.getElementById('screen'), wsUrl);
rfb.viewOnly = false; rfb.viewOnly = false;