mirror of https://github.com/ospab/ostp.git
feat(gui): make RTT and speed display optional
This commit is contained in:
parent
fbc37e9d39
commit
6361a87072
|
|
@ -762,6 +762,7 @@ fn launch_as_admin(exe: &std::path::PathBuf, token: &str, port: u16) -> anyhow::
|
||||||
let params_str = format!("--port {} --token-file \"{}\"", port, token_file.display());
|
let params_str = format!("--port {} --token-file \"{}\"", port, token_file.display());
|
||||||
let params_wstr: Vec<u16> = OsStr::new(¶ms_str).encode_wide().chain(Some(0)).collect();
|
let params_wstr: Vec<u16> = OsStr::new(¶ms_str).encode_wide().chain(Some(0)).collect();
|
||||||
#[link(name = "shell32")] extern "system" { fn ShellExecuteW(h: *mut std::ffi::c_void, op: *const u16, f: *const u16, p: *const u16, d: *const u16, s: i32) -> isize; }
|
#[link(name = "shell32")] extern "system" { fn ShellExecuteW(h: *mut std::ffi::c_void, op: *const u16, f: *const u16, p: *const u16, d: *const u16, s: i32) -> isize; }
|
||||||
|
#[link(name = "kernel32")] extern "system" { fn GetLastError() -> u32; }
|
||||||
|
|
||||||
// Use the GUI executable's directory as the working directory so dependencies are found
|
// Use the GUI executable's directory as the working directory so dependencies are found
|
||||||
let cwd_path = std::env::current_exe().unwrap_or_else(|_| std::path::PathBuf::from("."));
|
let cwd_path = std::env::current_exe().unwrap_or_else(|_| std::path::PathBuf::from("."));
|
||||||
|
|
|
||||||
|
|
@ -90,18 +90,18 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Live RTT + speeds -->
|
<!-- Live RTT + speeds -->
|
||||||
<div class="live-stats">
|
<div class="live-stats" id="live-stats-container">
|
||||||
<div class="live-stat">
|
<div class="live-stat" id="stat-rtt-box">
|
||||||
<span class="live-stat-label">RTT</span>
|
<span class="live-stat-label">RTT</span>
|
||||||
<span id="live-rtt" class="live-stat-value">--</span>
|
<span id="live-rtt" class="live-stat-value">--</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="live-stat-sep"></div>
|
<div class="live-stat-sep" id="stat-sep-1"></div>
|
||||||
<div class="live-stat">
|
<div class="live-stat" id="stat-down-box">
|
||||||
<span class="live-stat-label">↓</span>
|
<span class="live-stat-label">↓</span>
|
||||||
<span id="live-down-speed" class="live-stat-value">0 B/s</span>
|
<span id="live-down-speed" class="live-stat-value">0 B/s</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="live-stat-sep"></div>
|
<div class="live-stat-sep" id="stat-sep-2"></div>
|
||||||
<div class="live-stat">
|
<div class="live-stat" id="stat-up-box">
|
||||||
<span class="live-stat-label">↑</span>
|
<span class="live-stat-label">↑</span>
|
||||||
<span id="live-up-speed" class="live-stat-value">0 B/s</span>
|
<span id="live-up-speed" class="live-stat-value">0 B/s</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -280,6 +280,28 @@
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="toggle-row" style="border-top:none;">
|
||||||
|
<div class="toggle-text">
|
||||||
|
<span class="toggle-name">Show RTT</span>
|
||||||
|
<span class="toggle-hint">Display live ping on dashboard</span>
|
||||||
|
</div>
|
||||||
|
<label class="toggle">
|
||||||
|
<input type="checkbox" id="in-show-rtt" checked />
|
||||||
|
<span class="toggle-track"><span class="toggle-thumb"></span></span>
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="toggle-row" style="border-top:none;">
|
||||||
|
<div class="toggle-text">
|
||||||
|
<span class="toggle-name">Show Speed</span>
|
||||||
|
<span class="toggle-hint">Display traffic speed on dashboard</span>
|
||||||
|
</div>
|
||||||
|
<label class="toggle">
|
||||||
|
<input type="checkbox" id="in-show-speed" checked />
|
||||||
|
<span class="toggle-track"><span class="toggle-thumb"></span></span>
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
|
||||||
</div> <!-- client-settings-card -->
|
</div> <!-- client-settings-card -->
|
||||||
|
|
||||||
<div class="app-version" id="app-version">OSTP GUI</div>
|
<div class="app-version" id="app-version">OSTP GUI</div>
|
||||||
|
|
|
||||||
|
|
@ -154,6 +154,8 @@ const inExProcs = $('in-ex-procs');
|
||||||
const inAutoconnect = $('in-autoconnect');
|
const inAutoconnect = $('in-autoconnect');
|
||||||
const inLaunchStartup = $('in-launch-startup');
|
const inLaunchStartup = $('in-launch-startup');
|
||||||
const inDebug = $('in-debug');
|
const inDebug = $('in-debug');
|
||||||
|
const inShowRtt = $('in-show-rtt');
|
||||||
|
const inShowSpeed = $('in-show-speed');
|
||||||
const groupKillSwitch = $('group-kill-switch');
|
const groupKillSwitch = $('group-kill-switch');
|
||||||
const groupMuxSessions = $('group-mux-sessions');
|
const groupMuxSessions = $('group-mux-sessions');
|
||||||
|
|
||||||
|
|
@ -664,6 +666,8 @@ function loadSettingsIntoForm() {
|
||||||
inAutoconnect.checked = !!s.autoconnect;
|
inAutoconnect.checked = !!s.autoconnect;
|
||||||
inLaunchStartup.checked = !!s.launchStartup;
|
inLaunchStartup.checked = !!s.launchStartup;
|
||||||
inDebug.checked = !!s.debug;
|
inDebug.checked = !!s.debug;
|
||||||
|
inShowRtt.checked = s.showRtt !== false;
|
||||||
|
inShowSpeed.checked = s.showSpeed !== false;
|
||||||
updateClientVisibility();
|
updateClientVisibility();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -682,6 +686,8 @@ function collectAndSaveSettings() {
|
||||||
autoconnect: inAutoconnect.checked,
|
autoconnect: inAutoconnect.checked,
|
||||||
launchStartup: inLaunchStartup.checked,
|
launchStartup: inLaunchStartup.checked,
|
||||||
debug: inDebug.checked,
|
debug: inDebug.checked,
|
||||||
|
showRtt: inShowRtt.checked,
|
||||||
|
showSpeed: inShowSpeed.checked,
|
||||||
};
|
};
|
||||||
saveClientSettings(s);
|
saveClientSettings(s);
|
||||||
updateClientVisibility();
|
updateClientVisibility();
|
||||||
|
|
@ -703,6 +709,23 @@ function collectAndSaveSettings() {
|
||||||
function updateClientVisibility() {
|
function updateClientVisibility() {
|
||||||
groupKillSwitch.style.display = inTun.checked ? 'flex' : 'none';
|
groupKillSwitch.style.display = inTun.checked ? 'flex' : 'none';
|
||||||
groupMuxSessions.style.display = inMux.checked ? 'flex' : 'none';
|
groupMuxSessions.style.display = inMux.checked ? 'flex' : 'none';
|
||||||
|
|
||||||
|
const showRtt = inShowRtt.checked;
|
||||||
|
const showSpeed = inShowSpeed.checked;
|
||||||
|
const rttBox = $('stat-rtt-box');
|
||||||
|
const downBox = $('stat-down-box');
|
||||||
|
const upBox = $('stat-up-box');
|
||||||
|
const sep1 = $('stat-sep-1');
|
||||||
|
const sep2 = $('stat-sep-2');
|
||||||
|
const container = $('live-stats-container');
|
||||||
|
|
||||||
|
if (rttBox) rttBox.style.display = showRtt ? 'flex' : 'none';
|
||||||
|
if (downBox) downBox.style.display = showSpeed ? 'flex' : 'none';
|
||||||
|
if (upBox) upBox.style.display = showSpeed ? 'flex' : 'none';
|
||||||
|
|
||||||
|
if (sep1) sep1.style.display = (showRtt && showSpeed) ? 'block' : 'none';
|
||||||
|
if (sep2) sep2.style.display = showSpeed ? 'block' : 'none';
|
||||||
|
if (container) container.style.display = (showRtt || showSpeed) ? 'flex' : 'none';
|
||||||
}
|
}
|
||||||
|
|
||||||
// ── INIT ──────────────────────────────────────────────────────────────
|
// ── INIT ──────────────────────────────────────────────────────────────
|
||||||
|
|
@ -858,7 +881,7 @@ window.addEventListener('DOMContentLoaded', async () => {
|
||||||
wintunModal.addEventListener('click', e => { if (e.target === wintunModal) wintunModal.classList.add('hidden'); });
|
wintunModal.addEventListener('click', e => { if (e.target === wintunModal) wintunModal.classList.add('hidden'); });
|
||||||
|
|
||||||
// Client settings — wire all inputs
|
// Client settings — wire all inputs
|
||||||
[inTun, inKillSwitch, inMux, inAutoconnect, inLaunchStartup, inDebug]
|
[inTun, inKillSwitch, inMux, inAutoconnect, inLaunchStartup, inDebug, inShowRtt, inShowSpeed]
|
||||||
.forEach(el => el.addEventListener('change', collectAndSaveSettings));
|
.forEach(el => el.addEventListener('change', collectAndSaveSettings));
|
||||||
[inMuxSessions, inMtu, inDns, inSocks, inExDomains, inExIps, inExProcs]
|
[inMuxSessions, inMtu, inDns, inSocks, inExDomains, inExIps, inExProcs]
|
||||||
.forEach(el => {
|
.forEach(el => {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue