- Components tab replaces Updates: Dawnline, the AmneziaWG build for this firmware (Slava-Shchipunov 2.0 or 2Grey 3.1, Russian translation) and the system packages Dawnline adds, each checked, installed, reinstalled or rolled back in place, with What's new, versions and an activity log - Automatic updates: daily check, install at a set time or right away, per component; AmneziaWG is left out by default and an automatic run never switches its build or generation - Downloads verified against GitHub's sha256; mirrors are used only when GitHub is unreachable and the hash is known - New installer: checks firmware, clock, space and DNS, lets you pick a release, shows the plan and asks first; --dry-run - New uninstaller removes everything Dawnline added (cron, nft, firewall, routing, interfaces, packages it installed); --dry-run - Works without AmneziaWG on the router: Overview, the setup wizard, Health and Components say what is missing and offer to install it - Overview shows failed health checks as notices with their fix - People list no longer reads the config from the browser: private keys stay on the router; personal links are fetched on demand - Config changes are serialized under one lock, the nft table loads atomically and fails closed, and Dawnline never touches network sections it did not create - The portal never opens system ports, keeps disabled devices disabled, rate-limits per address and counts days by the router's clock - Settings and Diagnostics load their heavy parts in the background - Release notes are written from the commits since the previous release - Backend and admin UI split into small single-purpose modules
This commit is contained in:
1 parent
70a932b8ea
commit
34293fb8e5
158 files changed
+17418
-10022
No files matched your search
@@ -0,0 +1,37 @@
|
||||
// Access choice cards (Add person): internet, home or both.
|
||||
|
||||
import type { Person } from '../../shared/types';
|
||||
import { E } from '../e';
|
||||
import { icon } from '../../shared/icons';
|
||||
import { ACCESS_LABEL } from '../../shared/format';
|
||||
|
||||
/** Returns the element and a getter. */
|
||||
export function accessPicker(initial: Person['access'], onChange?: (v: Person['access']) => void) {
|
||||
let value = initial;
|
||||
const opts: { v: Person['access']; ic: string; text: string }[] = [
|
||||
{ v: 'internet', ic: 'globe', text: 'Browse the internet through your router. No access to devices at home.' },
|
||||
{ v: 'lan', ic: 'home', text: 'Reach devices at home (NAS, printer, cameras). Internet stays on their own connection.' },
|
||||
{ v: 'both', ic: 'shield', text: 'Home devices and the internet, all through your router.' },
|
||||
];
|
||||
const el = E(
|
||||
'div',
|
||||
{ class: 'dl-choices' },
|
||||
opts.map((o) =>
|
||||
E(
|
||||
'button',
|
||||
{
|
||||
type: 'button',
|
||||
class: `dl-choice${o.v === value ? ' selected' : ''}`,
|
||||
'data-v': o.v,
|
||||
click: () => {
|
||||
value = o.v;
|
||||
el.querySelectorAll('.dl-choice').forEach((c) => c.classList.toggle('selected', (c as HTMLElement).dataset.v === o.v));
|
||||
onChange?.(o.v);
|
||||
},
|
||||
},
|
||||
[E('span', { class: 'dl-choice-title' }, [icon(o.ic), ACCESS_LABEL[o.v]]), E('span', { class: 'dl-choice-text' }, o.text)],
|
||||
),
|
||||
),
|
||||
);
|
||||
return { el, get: () => value };
|
||||
}
|
||||
@@ -0,0 +1,87 @@
|
||||
// Health checks outside the checklist: the button that fixes a check (shared
|
||||
// with Diagnostics → Health) and notices for the checks that failed, as the
|
||||
// server Overview shows them.
|
||||
|
||||
import type { HealthCheck } from '../../shared/types';
|
||||
import { E } from '../e';
|
||||
import { api, type Health, type Needs } from '../api';
|
||||
import { installFeature } from '../pkgs';
|
||||
import { button, type ButtonKind } from '../ui/button';
|
||||
import { confirmDialog } from '../ui/modal';
|
||||
import { attempt } from '../ui/toast';
|
||||
import { needRow } from '../ui/layout';
|
||||
|
||||
const FIX_LABEL: Record<string, string> = {
|
||||
apply: 'Repair',
|
||||
sync: 'Reload devices',
|
||||
restart: 'Restart service',
|
||||
netrestart: 'Restart network',
|
||||
updates: 'Open Components',
|
||||
};
|
||||
|
||||
/** Run a backend fix (a network restart asks first); the checks again, or null. */
|
||||
export async function runFix(fix: string): Promise<Health | null> {
|
||||
if (
|
||||
fix === 'netrestart' &&
|
||||
!(await confirmDialog('Restart the network?', 'Every interface restarts. Connections drop for a few seconds.', 'Restart network'))
|
||||
)
|
||||
return null;
|
||||
return (await attempt(() => api.healthFix(fix), 'Done')) ?? null;
|
||||
}
|
||||
|
||||
/**
|
||||
* The button for a check's fix, or '' when it has none. `run` performs a
|
||||
* backend fix; `refresh` runs the checks again after an install.
|
||||
*/
|
||||
export function fixAction(c: HealthCheck, run: (fix: string) => void, refresh: () => void, kind: ButtonKind = 'action'): Node | string {
|
||||
const fix = c.fix;
|
||||
if (!fix) return '';
|
||||
// install:awg installs AmneziaWG itself (the build for this firmware), the rest come from the feeds.
|
||||
if (fix.startsWith('install:')) return button('Install', () => installFeature(fix.slice(8) as keyof Needs, refresh), kind);
|
||||
if (fix === 'updates')
|
||||
return E('a', { class: `cbi-button cbi-button-${kind}`, href: L.url('admin/network/dawnline/updates') }, FIX_LABEL.updates);
|
||||
return button(FIX_LABEL[fix] ?? 'Fix', () => run(fix), kind);
|
||||
}
|
||||
|
||||
/** The icon tile of a check's notice, by what it is about. */
|
||||
function checkIcon(id: string): string {
|
||||
if (/^(awg|up_|peers_|fw_|reply_|port_|subnet_)/.test(id)) return 'shield';
|
||||
if (/^(portal|cert)/.test(id)) return 'link';
|
||||
if (/^(ep_|home_|resolver)/.test(id)) return 'globe';
|
||||
if (id === 'clock') return 'clock';
|
||||
if (id === 'agent') return 'activity';
|
||||
if (id === 'nft') return 'lock';
|
||||
return 'alert';
|
||||
}
|
||||
|
||||
/**
|
||||
* The failed checks as notices (errors first, at most `max`), with their fix
|
||||
* and a link to Diagnostics for the rest; '' when everything passed.
|
||||
*/
|
||||
export function healthNotices(checks: HealthCheck[], run: (fix: string) => void, refresh: () => void, max = 3): Node | string {
|
||||
const bad = checks
|
||||
.filter((c) => c.status === 'error' || c.status === 'warn')
|
||||
.sort((a, b) => (a.status === b.status ? 0 : a.status === 'error' ? -1 : 1));
|
||||
if (!bad.length) return '';
|
||||
const rest = bad.length - max;
|
||||
return E('div', { class: 'dl-list dl-notices' }, [
|
||||
...bad
|
||||
.slice(0, max)
|
||||
.map((c) =>
|
||||
needRow(
|
||||
checkIcon(c.id),
|
||||
c.status === 'error' ? 'bad' : 'warn',
|
||||
c.problem ?? c.title,
|
||||
c.detail,
|
||||
fixAction(c, run, refresh, c.status === 'error' ? 'positive' : 'neutral'),
|
||||
),
|
||||
),
|
||||
rest > 0
|
||||
? E('a', { class: 'dl-row dl-notices-more', href: L.url('admin/network/dawnline/diagnostics') }, [
|
||||
`${rest} more in Diagnostics`,
|
||||
E('span', { class: 'dl-spacer' }),
|
||||
'→',
|
||||
])
|
||||
: '',
|
||||
]);
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
// Tiny daily sparkline (oldest first, the last bar is today) with per-day tooltips.
|
||||
|
||||
import { E } from '../e';
|
||||
import { addDays, bytes, isoDay, parseDay } from '../../shared/format';
|
||||
import { attachTip } from '../ui/tooltip';
|
||||
|
||||
/** `today` is the router's day (YYYY-MM-DD), so the labels follow its calendar. */
|
||||
export function spark(values: number[], width = 120, height = 26, today = isoDay(new Date())): HTMLElement {
|
||||
const max = Math.max(1, ...values);
|
||||
const el = E('div', { class: 'dl-spark' });
|
||||
el.style.width = `${width}px`;
|
||||
el.style.height = `${height}px`;
|
||||
values.forEach((v, i) => {
|
||||
const b = E('i');
|
||||
b.style.height = `${Math.max(6, (v / max) * 100)}%`;
|
||||
if (!v) b.classList.add('zero');
|
||||
const back = values.length - 1 - i;
|
||||
attachTip(b, () => [
|
||||
E(
|
||||
'div',
|
||||
{ class: 'dl-tip-title' },
|
||||
back === 0
|
||||
? 'Today'
|
||||
: back === 1
|
||||
? 'Yesterday'
|
||||
: parseDay(addDays(today, -back)).toLocaleDateString('en-GB', { weekday: 'short', day: 'numeric', month: 'short' }),
|
||||
),
|
||||
E('div', { class: 'dl-muted' }, bytes(v)),
|
||||
]);
|
||||
el.appendChild(b);
|
||||
});
|
||||
return el;
|
||||
}
|
||||
@@ -0,0 +1,114 @@
|
||||
// Bento tiles shared by the server Overview and the person page: speed now
|
||||
// and the last 30 days.
|
||||
|
||||
import type { DayUsage } from '../../shared/types';
|
||||
import { E } from '../e';
|
||||
import { bits, bytes, parseDay } from '../../shared/format';
|
||||
import { attachTip } from '../ui/tooltip';
|
||||
import { svg } from '../ui/layout';
|
||||
|
||||
const dayLabel = (day: string) => parseDay(day).toLocaleDateString('en-GB', { day: 'numeric', month: 'short' });
|
||||
|
||||
/** Throughput over the last 15 minutes plus today's total. */
|
||||
export function speedTile(rate: [number, number, number][], now: number, today: [number, number]): HTMLElement {
|
||||
const pts = rate.slice(-15);
|
||||
const last = pts[pts.length - 1];
|
||||
const fresh = last && now - last[0] < 180;
|
||||
const down = fresh ? last[2] : 0,
|
||||
up = fresh ? last[1] : 0;
|
||||
const [rx, tx] = today;
|
||||
const W = 200,
|
||||
H = 40;
|
||||
const max = Math.max(1, ...pts.map((p) => Math.max(p[1], p[2])));
|
||||
const line = (k: 1 | 2) => pts.map((p, i) => `${pts.length > 1 ? (i / (pts.length - 1)) * W : W},${H - 2 - (p[k] / max) * (H - 6)}`);
|
||||
const dl = line(2),
|
||||
ul = line(1);
|
||||
const chart =
|
||||
pts.length > 1
|
||||
? svg(
|
||||
`<svg viewBox="0 0 ${W} ${H}" preserveAspectRatio="none" class="dl-speed-chart" aria-hidden="true">` +
|
||||
`<path d="M${dl.join(' L')} L${W},${H} L0,${H}Z" class="area"/><path d="M${dl.join(' L')}" class="line"/>` +
|
||||
`<path d="M${ul.join(' L')}" class="line up"/></svg>`,
|
||||
)
|
||||
: E('div', { class: 'dl-speed-wait' }, [E('i'), E('span', {}, 'Collecting… 1 point a minute')]);
|
||||
const col = (label: string, ic: string, cls: string, v: number) =>
|
||||
E('div', { class: 'dl-speed-col' }, [
|
||||
E('span', { class: 'dl-sub' }, [E('span', { class: cls }, ic), ` ${label}`]),
|
||||
E('span', { class: 'dl-speed-val' }, bits(v)),
|
||||
]);
|
||||
if (pts.length > 1)
|
||||
attachTip(chart, () => {
|
||||
const p = pts[pts.length - 1];
|
||||
return [
|
||||
E('div', { class: 'dl-tip-title' }, new Date(p[0] * 1000).toLocaleTimeString('en-GB', { hour: '2-digit', minute: '2-digit' })),
|
||||
E('div', {}, `↓ ${bits(p[2])} · ↑ ${bits(p[1])}`),
|
||||
];
|
||||
});
|
||||
return E('div', { class: 'dl-bento-tile' }, [
|
||||
E('div', { class: 'dl-bento-head' }, [
|
||||
E('span', { class: 'dl-metric-label' }, 'Speed now'),
|
||||
E('span', { class: 'dl-sub' }, 'last 15 min'),
|
||||
]),
|
||||
E('div', { class: 'dl-speed-cols' }, [col('Download', '↓', 'dl-dn', down), col('Upload', '↑', 'dl-up', up)]),
|
||||
chart,
|
||||
E('div', { class: 'dl-speed-today' }, [
|
||||
E('span', {}, ['Today ', E('b', {}, bytes(rx + tx))]),
|
||||
E('span', {}, [E('span', { class: 'dl-dn' }, '↓'), ` ${bytes(tx)} `, E('span', { class: 'dl-up' }, '↑'), ` ${bytes(rx)}`]),
|
||||
]),
|
||||
]);
|
||||
}
|
||||
|
||||
/** Daily traffic for the last 30 days, today on the right. */
|
||||
export function daysTile(series: DayUsage[], note: string): HTMLElement {
|
||||
const days = series.slice(-30);
|
||||
const vals = days.map((d) => d.rx + d.tx);
|
||||
const max = Math.max(1, ...vals);
|
||||
const total = vals.reduce((a, v) => a + v, 0);
|
||||
const peakI = vals.reduce((a, v, i) => (v > vals[a] ? i : a), 0);
|
||||
const bars = E(
|
||||
'div',
|
||||
{ class: 'dl-bento-bars' },
|
||||
days.map((d, i) => {
|
||||
const v = vals[i];
|
||||
const bar = E('i', { class: i === days.length - 1 ? 'hi' : '', style: `height:${Math.max(4, (v / max) * 100)}%` });
|
||||
attachTip(bar, () => [
|
||||
E('div', { class: 'dl-tip-title' }, i === days.length - 1 ? `Today · ${dayLabel(d.day)}` : dayLabel(d.day)),
|
||||
E('div', {}, bytes(v)),
|
||||
E('div', { class: 'dl-muted dl-mono' }, `↓ ${bytes(d.tx)} ↑ ${bytes(d.rx)}`),
|
||||
]);
|
||||
return bar;
|
||||
}),
|
||||
);
|
||||
return E('div', { class: 'dl-bento-tile month' }, [
|
||||
E('div', { class: 'dl-bento-head' }, [
|
||||
E('span', {}, [E('span', { class: 'dl-metric-label' }, 'Last 30 days'), E('b', { class: 'dl-bento-total' }, bytes(total))]),
|
||||
vals[peakI] > 0 ? E('span', { class: 'dl-sub' }, `peak ${bytes(vals[peakI])} · ${dayLabel(days[peakI].day)}`) : '',
|
||||
]),
|
||||
days.length ? bars : E('p', { class: 'dl-muted' }, 'No traffic yet.'),
|
||||
E('div', { class: 'dl-bento-head' }, [
|
||||
E('span', { class: 'dl-sub' }, days.length ? dayLabel(days[0].day) : ''),
|
||||
E('span', { class: 'dl-sub' }, note),
|
||||
E('span', { class: 'dl-sub' }, 'today'),
|
||||
]),
|
||||
]);
|
||||
}
|
||||
|
||||
/** Daily traffic of one device over the last 30 days, today on the right (person page device cards). */
|
||||
export function dayBars(series: DayUsage[]): HTMLElement {
|
||||
const days = series.slice(-30);
|
||||
const vals = days.map((x) => x.rx + x.tx);
|
||||
const max = Math.max(1, ...vals);
|
||||
return E(
|
||||
'div',
|
||||
{ class: 'dl-dbars' },
|
||||
days.map((x, i) => {
|
||||
const bar = E('i', { class: `${vals[i] ? '' : 'zero'}${i === days.length - 1 ? ' hi' : ''}` });
|
||||
bar.style.height = `${Math.max(8, (vals[i] / max) * 100)}%`;
|
||||
attachTip(bar, () => [
|
||||
E('div', { class: 'dl-tip-title' }, i === days.length - 1 ? `Today · ${dayLabel(x.day)}` : dayLabel(x.day)),
|
||||
E('div', {}, bytes(vals[i])),
|
||||
]);
|
||||
return bar;
|
||||
}),
|
||||
);
|
||||
}
|
||||
Reference in new issue
Block a user