LuCI admin (people, devices, limits, disguise, health, updates, backups) and a personal self-service portal, built as ipk (OpenWrt 24.10) and apk (OpenWrt 25.12) with the OpenWrt SDK. Successor of openwrt-liminal. - install.sh: checks the router, installs AmneziaWG for its firmware, then the release package verified against sha256sums.txt - CI: Prettier, types, tests, committed bundles, ShellCheck, ucode checks; tagged releases build both packages and publish them - Web bundles minified with esbuild (JS and CSS) - README with framed screenshots
This commit is contained in:
commit
a3910f8b97
105 files changed
+22278
No files matched your search
@@ -0,0 +1,356 @@
|
||||
// Health and Updates pages.
|
||||
|
||||
import type { HealthCheck } from '../../shared/types';
|
||||
import { E } from '../e';
|
||||
import { api, type AwgSource, type Needs, type UpdatesStatus } from '../api';
|
||||
import { installFeature } from '../pkgs';
|
||||
import { attempt, button, callout, confirmDialog } from '../ui';
|
||||
import { icon } from '../../shared/icons';
|
||||
import { clock } from '../../shared/format';
|
||||
|
||||
const ICON: Record<HealthCheck['status'], string> = { ok: 'check', warn: 'alert', error: 'x', skip: 'pause' };
|
||||
const FIX_LABEL: Record<string, string> = { apply: 'Repair', sync: 'Reload devices', restart: 'Restart service', updates: 'Open updates' };
|
||||
|
||||
export class HealthPage {
|
||||
root!: HTMLElement;
|
||||
|
||||
load() {
|
||||
return api.health();
|
||||
}
|
||||
|
||||
render(r: { checks: HealthCheck[] }) {
|
||||
this.root = E('div', { class: 'dl-root' });
|
||||
this.paint(r.checks);
|
||||
return E('div', {}, [
|
||||
E('h2', {}, 'Health'),
|
||||
E(
|
||||
'div',
|
||||
{ class: 'cbi-map-descr' },
|
||||
'Everything Dawnline depends on, checked live. Problems come with a fix button where one exists.',
|
||||
),
|
||||
this.root,
|
||||
]);
|
||||
}
|
||||
|
||||
paint(checks: HealthCheck[]) {
|
||||
const bad = checks.filter((c) => c.status === 'error').length;
|
||||
const warn = checks.filter((c) => c.status === 'warn').length;
|
||||
dom.content(this.root, [
|
||||
bad
|
||||
? callout('error', `${bad} problem${bad > 1 ? 's' : ''} need attention.`)
|
||||
: warn
|
||||
? callout('warn', `${warn} warning${warn > 1 ? 's' : ''}.`)
|
||||
: callout('ok', 'All checks passed.'),
|
||||
E('div', { class: 'dl-panel' }, [
|
||||
E('div', { class: 'dl-panel-head' }, [
|
||||
E('h3', {}, 'Checks'),
|
||||
E('span', { class: 'dl-spacer' }),
|
||||
button('Run again', async () => {
|
||||
const r = await attempt(() => api.health());
|
||||
if (r) this.paint(r.checks);
|
||||
}),
|
||||
]),
|
||||
E(
|
||||
'ul',
|
||||
{ class: 'dl-checks' },
|
||||
checks.map((c) =>
|
||||
E('li', {}, [
|
||||
E('span', { class: `dl-check-icon ${c.status}` }, icon(ICON[c.status])),
|
||||
E('div', { class: 'dl-check-body' }, [
|
||||
E('div', { class: 'dl-check-title' }, c.title),
|
||||
E('div', { class: 'dl-check-detail' }, c.detail),
|
||||
]),
|
||||
c.fix
|
||||
? c.fix.startsWith('install:')
|
||||
? button(
|
||||
'Install',
|
||||
() =>
|
||||
installFeature(c.fix!.slice(8) as keyof Needs, async () => {
|
||||
const r = await api.health().catch(() => null);
|
||||
if (r) this.paint(r.checks);
|
||||
}),
|
||||
'action',
|
||||
)
|
||||
: c.fix === 'updates'
|
||||
? E('a', { class: 'cbi-button cbi-button-action', href: L.url('admin/network/dawnline/updates') }, FIX_LABEL.updates)
|
||||
: button(
|
||||
FIX_LABEL[c.fix] ?? 'Fix',
|
||||
async () => {
|
||||
const r = await attempt(() => api.healthFix(c.fix!), 'Done');
|
||||
if (r) this.paint(r.checks);
|
||||
},
|
||||
'action',
|
||||
)
|
||||
: '',
|
||||
]),
|
||||
),
|
||||
),
|
||||
]),
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
/** What Dawnline adds to OpenWrt; the portal's HTTPS and certificates only matter while it is on. */
|
||||
const SYS_ITEMS: { title: string; sub: string; pkgs: string[]; feature: keyof Needs; optional?: boolean }[] = [
|
||||
{ title: 'ip-full · veth', sub: 'Policy routing and the home-like link', pkgs: ['ip-full', 'kmod-veth'], feature: 'home' },
|
||||
{ title: 'OpenSSL', sub: 'HTTPS for the personal portal', pkgs: ['libustream-openssl', 'openssl-util'], feature: 'https' },
|
||||
{ title: 'ACME', sub: 'Let’s Encrypt certificate for the portal', pkgs: ['acme', 'acme-acmesh-dnsapi'], feature: 'acme', optional: true },
|
||||
];
|
||||
|
||||
export class UpdatesPage {
|
||||
root!: HTMLElement;
|
||||
running = false;
|
||||
|
||||
load() {
|
||||
return api.updatesStatus();
|
||||
}
|
||||
|
||||
render(st: UpdatesStatus) {
|
||||
this.root = E('div', { class: 'dl-root dl-upd' });
|
||||
this.paint(st);
|
||||
poll.add(async () => {
|
||||
const n = await api.updatesStatus().catch(() => null);
|
||||
if (n && n.job?.state === 'running') this.paint(n);
|
||||
else if (n && this.running) {
|
||||
this.running = false;
|
||||
this.paint(n);
|
||||
// A new Dawnline is installed: load its pages instead of running the old bundle.
|
||||
if (n.job?.component === 'app' && n.job.state === 'done') setTimeout(() => location.reload(), 1500);
|
||||
}
|
||||
}, 3);
|
||||
return this.root;
|
||||
}
|
||||
|
||||
paint(st: UpdatesStatus) {
|
||||
const job = st.job;
|
||||
this.running = job?.state === 'running';
|
||||
const c = st.check?.components ?? {};
|
||||
const fw = st.firmware;
|
||||
const app = c.app,
|
||||
awg = c.amneziawg,
|
||||
pk = c.packages;
|
||||
const busy = { disabled: this.running };
|
||||
const pill = (tone: '' | 'ok' | 'accent' | 'warn' | 'bad', text: string) => E('span', { class: `dl-pill ${tone}` }, text);
|
||||
const row = (title: Node | string | (Node | string)[], sub: Node | string | (Node | string)[], right: Node | string) =>
|
||||
E('div', { class: 'dl-upd-row' }, [
|
||||
E('span', { class: 'dl-stack' }, [E('span', { class: 'dl-upd-name' }, title), E('span', { class: 'dl-sub' }, sub)]),
|
||||
right,
|
||||
]);
|
||||
const sec = (ic: string, title: string, sub: string, right: Node | string, rows: Node[] = []) =>
|
||||
E('section', { class: 'dl-setsec dl-upd-sec' }, [
|
||||
E('div', { class: 'dl-upd-head' }, [
|
||||
E('span', { class: 'dl-group-ic' }, icon(ic)),
|
||||
E('span', { class: 'dl-stack' }, [E('b', {}, title), E('span', { class: 'dl-sub' }, sub)]),
|
||||
right,
|
||||
]),
|
||||
...rows,
|
||||
]);
|
||||
const date = (d: string | null) =>
|
||||
d ? new Date(d).toLocaleDateString('en-GB', { day: 'numeric', month: 'short', year: 'numeric' }) : '';
|
||||
|
||||
// Dawnline
|
||||
const appSec = sec(
|
||||
'sunrise',
|
||||
'Dawnline',
|
||||
app?.repo ? `${st.version} · ${app.repo}` : st.version,
|
||||
!app
|
||||
? pill('', 'Not checked')
|
||||
: app.update
|
||||
? button(`Update to ${app.latest}`, () => this.run('app'), 'positive', busy)
|
||||
: app.latest
|
||||
? pill('ok', 'Up to date')
|
||||
: pill('', 'No releases yet'),
|
||||
);
|
||||
|
||||
// AmneziaWG: one row per build source, then the translation
|
||||
const srcs = awg?.sources ?? {};
|
||||
const ids = Object.keys(srcs) as AwgSource[];
|
||||
const awgRows = ids.map((id) => {
|
||||
const x = srcs[id]!;
|
||||
const mine = awg?.current === id;
|
||||
const sub: (Node | string)[] = [
|
||||
x.version
|
||||
? `${x.tag} build${x.date ? ` · ${date(x.date)}` : ''} · ${x.gen === '3.1' ? 'devices need AmneziaVPN with 3.1' : 'works with every AmneziaWG app'}`
|
||||
: `No build for OpenWrt ${fw?.version ?? ''}`,
|
||||
];
|
||||
const right = !x.version
|
||||
? pill('', 'No build')
|
||||
: mine
|
||||
? awg?.update
|
||||
? button('Update', () => this.runAwg(id, !!awg.ru, x.gen), 'positive', busy)
|
||||
: pill('ok', 'Installed')
|
||||
: button('Switch', () => this.runAwg(id, !!awg?.ru, x.gen), 'neutral', busy);
|
||||
return row([x.gen ? `AmneziaWG ${x.gen}` : 'AmneziaWG', E('span', { class: 'dl-faint' }, ` · ${x.label}`)], sub, right);
|
||||
});
|
||||
if (awg?.current && srcs[awg.current]?.version)
|
||||
awgRows.push(
|
||||
row(
|
||||
'Russian translation',
|
||||
'LuCI pages for AmneziaWG in Russian',
|
||||
button(awg.ru ? 'Remove' : 'Add', () => this.runAwg(awg.current!, !awg.ru, awg.gen), 'neutral', busy),
|
||||
),
|
||||
);
|
||||
const awgSec = sec(
|
||||
'shield',
|
||||
'AmneziaWG',
|
||||
awg?.installed ? `${awg.gen ? `${awg.gen} · ` : ''}${awg.installed} · changing it restarts every tunnel` : 'Not installed',
|
||||
!awg ? pill('', 'Not checked') : '',
|
||||
awgRows.length ? awgRows : [row('Builds for this router', 'Check for updates to see them.', '')],
|
||||
);
|
||||
|
||||
// System packages: one row per thing Dawnline adds
|
||||
const pkgs = pk?.pkgs ?? {};
|
||||
const rows: Node[] = [];
|
||||
// Only what the features in use need: the home-like link, and HTTPS and certificates while the portal is on.
|
||||
const items = SYS_ITEMS.filter((it) => (it.feature === 'home' ? st.home : st.portal));
|
||||
for (const it of items) {
|
||||
const present = it.pkgs.filter((p) => pkgs[p]?.installed);
|
||||
// The package itself and what is released with it (the rest of LuCI, libopenssl, rpcd)
|
||||
const upd = [...new Set(present.flatMap((p) => [...(pkgs[p]?.latest ? [p] : []), ...(pkgs[p]?.with ?? [])]))];
|
||||
// What the router lacks for this feature (any TLS module counts for HTTPS, not only OpenSSL's).
|
||||
const lacks = st.needs?.[it.feature] ?? it.pkgs.filter((p) => !pkgs[p]?.installed);
|
||||
if (lacks.length) {
|
||||
rows.push(
|
||||
row(
|
||||
it.title,
|
||||
it.optional ? `Not installed · ${it.sub}` : E('span', { class: 'dl-upd-bad' }, `Missing ${lacks.join(', ')} · ${it.sub}`),
|
||||
button('Install', () => this.runPkgs(lacks, it.title), 'neutral', busy),
|
||||
),
|
||||
);
|
||||
} else if (upd.length) {
|
||||
const main = present.find((p) => pkgs[p]?.latest);
|
||||
const v: (Node | string)[] = main
|
||||
? [E('span', { class: 'dl-mono' }, [`${pkgs[main]!.installed} → `, E('b', {}, pkgs[main]!.latest!)])]
|
||||
: [];
|
||||
const rel = upd.filter((p) => p !== main);
|
||||
if (rel.length)
|
||||
v.push(
|
||||
`${main ? ' · ' : ''}${rel.length <= 2 ? `${main ? 'with ' : ''}${rel.join(', ')}` : `${main ? '+' : ''}${rel.length} related packages`}`,
|
||||
);
|
||||
rows.push(
|
||||
row(
|
||||
it.title,
|
||||
v,
|
||||
button(
|
||||
'Update',
|
||||
() =>
|
||||
this.runPkgs(
|
||||
present.filter((p) => pkgs[p]?.latest || pkgs[p]?.with?.length),
|
||||
it.title,
|
||||
upd,
|
||||
),
|
||||
'neutral',
|
||||
busy,
|
||||
),
|
||||
),
|
||||
);
|
||||
} else rows.push(row(it.title, it.sub, pill('ok', 'Up to date')));
|
||||
}
|
||||
const shown = items.flatMap((it) => it.pkgs).filter((k) => pkgs[k]?.installed);
|
||||
const allUpd = [...new Set(shown.flatMap((k) => [...(pkgs[k].latest ? [k] : []), ...(pkgs[k].with ?? [])]))];
|
||||
const pkgSec = sec(
|
||||
'package',
|
||||
'System packages',
|
||||
!pk
|
||||
? 'What Dawnline adds to OpenWrt'
|
||||
: allUpd.length
|
||||
? `${allUpd.length} update${allUpd.length === 1 ? '' : 's'} from the OpenWrt ${fw?.version?.replace(/\.\d+$/, '') ?? ''} feeds`
|
||||
: 'What Dawnline adds to OpenWrt is current',
|
||||
!pk
|
||||
? pill('', 'Not checked')
|
||||
: allUpd.length
|
||||
? button(
|
||||
'Update all',
|
||||
() =>
|
||||
this.runPkgs(
|
||||
shown.filter((k) => pkgs[k].latest || pkgs[k].with?.length),
|
||||
'all packages',
|
||||
allUpd,
|
||||
),
|
||||
'positive',
|
||||
busy,
|
||||
)
|
||||
: '',
|
||||
pk ? rows : [],
|
||||
);
|
||||
|
||||
// The last job, folded
|
||||
const jobCard = job
|
||||
? E('details', { class: 'dl-params dl-upd-job', open: this.running ? 'open' : null }, [
|
||||
E('summary', {}, [
|
||||
icon('chevron'),
|
||||
E('span', {}, 'Last job'),
|
||||
pill(
|
||||
job.state === 'done' ? 'ok' : job.state === 'failed' ? 'bad' : 'warn',
|
||||
job.state === 'running' ? job.phase || 'Running' : job.state === 'done' ? 'Finished' : 'Failed',
|
||||
),
|
||||
E(
|
||||
'span',
|
||||
{ class: 'dl-sub' },
|
||||
`${job.action === 'check' ? 'check' : (job.component ?? '')} · ${clock(job.started)}${job.finished ? ` · ${job.finished - job.started} s` : ''}`,
|
||||
),
|
||||
]),
|
||||
job.error ? callout('error', job.error) : '',
|
||||
E('pre', { class: 'dl-log' }, job.log.join('\n')),
|
||||
])
|
||||
: '';
|
||||
|
||||
const total = allUpd.length + (app?.update ? 1 : 0) + (awg?.update ? 1 : 0);
|
||||
const facts = [
|
||||
fw?.version ? `OpenWrt ${fw.version} · ${fw.target}` : '',
|
||||
st.check ? (total ? `${total} update${total === 1 ? '' : 's'} ready` : 'everything is current') : 'not checked yet',
|
||||
st.check ? `checked ${clock(st.check.time)}` : '',
|
||||
]
|
||||
.filter(Boolean)
|
||||
.join(' · ');
|
||||
dom.content(this.root, [
|
||||
E('div', { class: 'dl-pagehead' }, [
|
||||
E('div', { class: 'dl-stack' }, [E('h2', { class: 'dl-h1' }, 'Updates'), E('span', { class: 'dl-faint' }, facts)]),
|
||||
button([icon('refresh'), ' Check now'], () => this.run('check'), 'neutral', busy),
|
||||
]),
|
||||
appSec,
|
||||
awgSec,
|
||||
pkgSec,
|
||||
jobCard,
|
||||
]);
|
||||
}
|
||||
|
||||
async runAwg(id: AwgSource, ru: boolean, gen: string | null | undefined) {
|
||||
const ok = await confirmDialog(
|
||||
gen ? `Install AmneziaWG ${gen}?` : 'Install AmneziaWG?',
|
||||
'Every AmneziaWG tunnel on the router restarts for a few seconds, HomeTunnel too. Devices stay configured.',
|
||||
'Install',
|
||||
);
|
||||
if (ok) this.start(`amneziawg:${id}${ru ? ':ru' : ''}`);
|
||||
}
|
||||
|
||||
/** names: Dawnline's own packages (the updater adds their family); shown: everything that will change. */
|
||||
async runPkgs(names: string[], what: string, shown = names) {
|
||||
const ok = await confirmDialog(
|
||||
`Update ${what}?`,
|
||||
`${shown.join(', ')} from the OpenWrt feeds. Services that use them restart for a moment.`,
|
||||
'Update',
|
||||
);
|
||||
if (ok) this.start(`pkgs:${names.join(',')}`);
|
||||
}
|
||||
|
||||
async run(what: string) {
|
||||
if (what !== 'check') {
|
||||
const ok = await confirmDialog(
|
||||
`Update ${what === 'app' ? 'Dawnline' : what}?`,
|
||||
'A backup is made first. The page reloads when it finishes.',
|
||||
'Update',
|
||||
);
|
||||
if (!ok) return;
|
||||
}
|
||||
this.start(what);
|
||||
}
|
||||
|
||||
async start(what: string) {
|
||||
if (await attempt(() => api.updatesRun(what))) {
|
||||
this.running = true;
|
||||
const n = await api.updatesStatus().catch(() => null);
|
||||
if (n) this.paint(n);
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user