MyFavMirrors/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-04-12 15:32:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix sharing latency and timer

Browse Source 
Signed-off-by: si458 <simonsmith5521@gmail.com>
This commit is contained in:
si458 2024-05-24 15:30:03 +01:00
parent 6c685d5557
commit 89b67ff999
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
views/sharing.handlebars
View File

@ -71,8 +71,8 @@
</div> </div>
<div id=deskarea4 class="areaFoot" style="min-height:24px"> <div id=deskarea4 class="areaFoot" style="min-height:24px">
<div class="toright2"> <div class="toright2">
<span id="DeskLatency" title="Desktop Session Latency"></span> <span id="DeskLatency" style="line-height:22px;width:50px" title="Desktop Session Latency"></span>
<span id="DeskTimer" style="display:none" title="Session time"></span>&nbsp; <span id="DeskTimer" style="line-height:22px" title="Session time"></span>&nbsp;
<select id=termdisplays style="display:none" onchange=deskSetDisplay(event) onkeypress="return false" onkeydown="return false"></select>&nbsp; <select id=termdisplays style="display:none" onchange=deskSetDisplay(event) onkeypress="return false" onkeydown="return false"></select>&nbsp;
<span id=DeskSaveImageButton title="Save a screenshot of the remote desktop"><img src='images/icon-camera.png' onclick=deskSaveImage() height=16 width=16 style=padding-top:2px /></span> <span id=DeskSaveImageButton title="Save a screenshot of the remote desktop"><img src='images/icon-camera.png' onclick=deskSaveImage() height=16 width=16 style=padding-top:2px /></span>
</div> </div>
@ -480,6 +480,9 @@
QE('DeskWD', deskState == 3); QE('DeskWD', deskState == 3);
QV('deskkeys', viewOnly != 1); QV('deskkeys', viewOnly != 1);
QE('deskkeys', deskState == 3); QE('deskkeys', deskState == 3);
QV('DeskTimer', deskState == 3);
QV('DeskLatency', deskState == 3);
QS('DeskLatency').display = (deskState == 3 ? 'inline-block' : 'none');
// Display this only if we have Chat & Notify permissions // Display this only if we have Chat & Notify permissions
QV('DeskSaveImageButton', (deskState == 3) && (Q('Desk')['toBlob'] != null)); QV('DeskSaveImageButton', (deskState == 3) && (Q('Desk')['toBlob'] != null));
@ -624,7 +627,7 @@
desktop.m.onDisplayinfo = deskDisplayInfo; desktop.m.onDisplayinfo = deskDisplayInfo;
desktop.m.onScreenSizeChange = deskAdjust; desktop.m.onScreenSizeChange = deskAdjust;
desktop.Start(null); desktop.Start(null);
desktop.latency.callback = function (ms) { console.log('latency', ms); updateSessionTime(); }; desktop.latency.callback = function (ms) { /* console.log('latency', ms); */ updateSessionTime(); };
desktop.contype = 1; desktop.contype = 1;
} }
} else { } else {
@ -736,14 +739,26 @@
// Desktop // Desktop
var latencyStr = '', seconds = 0; var latencyStr = '', seconds = 0;
if (desktop && desktop.startTime) { if (desktop && desktop.startTime) {
if (desktop.latency && (desktop.latency.current >= 0)) { latencyStr = format('{0} ms, ', desktop.latency.current); } if (desktop.latency && (desktop.latency.current >= 0)) { latencyStr = format('{0} ms', desktop.latency.current); }
seconds = Math.floor((new Date() - desktop.startTime) / 1000); seconds = Math.floor((new Date() - desktop.startTime) / 1000);
QH('DeskTimer', latencyStr + zeroPad(Math.floor(seconds / 3600), 2) + ':' + zeroPad((Math.floor(seconds / 60) % 60), 2) + ':' + zeroPad((seconds % 60), 2)); QH('DeskTimer', zeroPad(Math.floor(seconds / 3600), 2) + ':' + zeroPad((Math.floor(seconds / 60) % 60), 2) + ':' + zeroPad((seconds % 60), 2));
QH('DeskLatency', latencyStr);
} else { } else {
QH('DeskTimer', ''); QH('DeskTimer', '');
QH('DeskLatency', '');
} }
if (desktop == null) { clearInterval(updateSessionTimer); updateSessionTimer = null; } // Terminal
seconds = 0;
if (terminal && terminal.startTime) {
if (terminal.latency && (terminal.latency.current >= 0)) { latencyStr = format('{0} ms, ', terminal.latency.current); }
seconds = Math.floor((new Date() - terminal.startTime) / 1000);
QH('TermTimer', latencyStr + zeroPad(Math.floor(seconds / 3600), 2) + ':' + zeroPad((Math.floor(seconds / 60) % 60), 2) + ':' + zeroPad((seconds % 60), 2));
} else {
QH('TermTimer', '');
}
if ((desktop == null) && (terminal == null)) { clearInterval(updateSessionTimer); updateSessionTimer = null; }
} }
function showDesktopSettings() { function showDesktopSettings() {
@ -1373,20 +1388,6 @@
updateTerminalButtons(); updateTerminalButtons();
} }
function updateSessionTime() {
// Terminal
var latencyStr = '', seconds = 0;
if (terminal && terminal.startTime) {
if (terminal.latency && (terminal.latency.current >= 0)) { latencyStr = format('{0} ms, ', terminal.latency.current); }
seconds = Math.floor((new Date() - terminal.startTime) / 1000);
QH('TermTimer', latencyStr + zeroPad(Math.floor(seconds / 3600), 2) + ':' + zeroPad((Math.floor(seconds / 60) % 60), 2) + ':' + zeroPad((seconds % 60), 2));
} else {
QH('TermTimer', '');
}
if (terminal == null) { clearInterval(updateSessionTimer); updateSessionTimer = null; }
}
// DEBUG // DEBUG
var autoConnectTerminalTimer = null; var autoConnectTerminalTimer = null;
function autoConnectTerminal(e) { if (autoConnectTerminalTimer == null) { autoConnectTerminalTimer = setInterval(connectTerminal, 100); } else { clearInterval(autoConnectTerminalTimer); autoConnectTerminalTimer = null; } } function autoConnectTerminal(e) { if (autoConnectTerminalTimer == null) { autoConnectTerminalTimer = setInterval(connectTerminal, 100); } else { clearInterval(autoConnectTerminalTimer); autoConnectTerminalTimer = null; } }