-
-
diff --git a/frontend/src/lib/Settings.svelte b/frontend/src/lib/Settings.svelte
index a948e35..de6fa7c 100644
--- a/frontend/src/lib/Settings.svelte
+++ b/frontend/src/lib/Settings.svelte
@@ -136,10 +136,6 @@
tray_icon_style: 'color',
auto_update_check: true,
compact_list: false,
- wifi_rules: {
- trusted_ssids: [],
- per_tunnel: {},
- },
};
let loaded = false;
let appVersion = '';
@@ -162,12 +158,6 @@
// the Go side becomes undefined here; default to true to match
// Settings.AutoUpdateCheckEnabled() semantics.
settings.auto_update_check = (s.auto_update_check === false) ? false : true;
- if (s.wifi_rules) {
- settings.wifi_rules = {
- trusted_ssids: s.wifi_rules.trusted_ssids || [],
- per_tunnel: s.wifi_rules.per_tunnel || {},
- };
- }
}
} catch (e) {
console.error('load settings:', e);
@@ -180,8 +170,8 @@
// Re-fetch the freshest settings.json before writing so per-tunnel
// wifi rule edits made in TunnelDetail (which calls SaveSettings
// independently with its own modified per_tunnel map) aren't
- // silently overwritten. We own only `trusted_ssids` in wifi_rules;
- // `per_tunnel` belongs to TunnelDetail. If the fresh fetch fails
+ // silently overwritten. This screen owns NO part of wifi_rules —
+ // both halves are carried from the fresh fetch. If the fresh fetch fails
// (helper restarting, IPC flake) we abort rather than write our
// potentially-stale per_tunnel snapshot — a deferred save is far
// better than clobbering the user's per-tunnel edits.
@@ -216,8 +206,13 @@
// them from the fresh fetch so saving a Settings toggle never
// wipes them.
automation: fresh?.automation,
+ // Legacy Wi-Fi trust rules have no UI on this screen — carry both
+ // halves from the fresh fetch (not a load-time snapshot) so a
+ // Settings toggle can't clobber CLI edits made while it is open.
+ // The Go side still migrates trusted_ssids/per_tunnel into the
+ // Automation model, so the round-trip itself must stay.
wifi_rules: {
- trusted_ssids: settings.wifi_rules?.trusted_ssids || [],
+ trusted_ssids: fresh?.wifi_rules?.trusted_ssids || [],
per_tunnel: perTunnel,
},
});
diff --git a/frontend/src/lib/SplitTunnelUI.svelte b/frontend/src/lib/SplitTunnelUI.svelte
deleted file mode 100644
index 7177952..0000000
--- a/frontend/src/lib/SplitTunnelUI.svelte
+++ /dev/null
@@ -1,149 +0,0 @@
-
-
-
-
-
-
-
-
- {#if mode === 'custom'}
-
- {#each customIPs as ip}
-
- {ip}
-
-
- {/each}
- {#if customIPs.length === 0}
-
{$t('split_tunnel.no_subnets')}
- {/if}
-
-
-
-
-
- {/if}
-
-
-
diff --git a/frontend/src/lib/TunnelDetail.svelte b/frontend/src/lib/TunnelDetail.svelte
index 8d0d2d4..90f8b89 100644
--- a/frontend/src/lib/TunnelDetail.svelte
+++ b/frontend/src/lib/TunnelDetail.svelte
@@ -145,22 +145,26 @@
latencyTargetSaveTimer = setTimeout(saveLatencyTarget, 600);
}
- function autoLatencyTarget() {
- if (!detail) return { label: $selectedTunnel?.endpoint || '—', fallback: true };
- for (const peer of detail.Peers || []) {
+ // Takes its inputs as parameters (not via closure) so the `$:` below
+ // actually re-runs: the compiler only tracks dependencies referenced in
+ // the reactive statement itself, and a dep-less statement runs exactly
+ // once — which froze this on the first tunnel's endpoint forever.
+ function autoLatencyTarget(det, sel) {
+ if (!det) return { label: sel?.endpoint || '—', fallback: true };
+ for (const peer of det.Peers || []) {
for (const allowed of peer.AllowedIPs || []) {
if (allowed.endsWith('/32')) return { label: allowed.slice(0, -3), fallback: false };
if (allowed.endsWith('/128')) return { label: allowed.slice(0, -4), fallback: false };
}
}
- const fullTunnel = (detail.Peers || []).some(peer =>
+ const fullTunnel = (det.Peers || []).some(peer =>
(peer.AllowedIPs || []).some(ip => ip === '0.0.0.0/0' || ip === '::/0')
);
if (fullTunnel) return { label: '8.8.8.8', fallback: false };
- return { label: $selectedTunnel?.endpoint || '—', fallback: true };
+ return { label: sel?.endpoint || '—', fallback: true };
}
- $: autoLatency = autoLatencyTarget();
+ $: autoLatency = autoLatencyTarget(detail, $selectedTunnel);
$: latencyTargetDisplay = latencyTargetSaved
? latencyTargetSaved
: `${$t('tunnel.latency_target_placeholder')}: ${autoLatency.fallback ? $t('tunnel.endpoint') : autoLatency.label}`;
diff --git a/frontend/src/lib/TunnelList.svelte b/frontend/src/lib/TunnelList.svelte
index 251196a..1c8a651 100644
--- a/frontend/src/lib/TunnelList.svelte
+++ b/frontend/src/lib/TunnelList.svelte
@@ -115,7 +115,7 @@
{$t('tunnel.drop_hint')}
{:else}
- {#each sorted as tun}
+ {#each sorted as tun (tun.name)}