- 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,235 @@
|
||||
// Component operations (check, update, install, roll back) in one modal with
|
||||
// the updater's live log. Used by Components and wherever a feature installs
|
||||
// a missing package.
|
||||
|
||||
import { E } from '../e';
|
||||
import { api, type UpdateJob, type UpdatesStatus } from '../api';
|
||||
import { icon } from '../../shared/icons';
|
||||
import { button, iconButton } from '../ui/button';
|
||||
import { cancelButton, closeModal, modal } from '../ui/modal';
|
||||
import { copyText } from '../ui/files';
|
||||
import { errorText, notify } from '../ui/toast';
|
||||
import { NAME, checkVerdict, isOurJob, jobComponent, mmss, runningComponent, verText } from './jobs';
|
||||
|
||||
export interface OpOptions {
|
||||
/** Modal title, e.g. "Updating Dawnline". */
|
||||
title: string;
|
||||
/** Shown before the job reports its versions. */
|
||||
version?: string;
|
||||
/** After a check that found an update: what the Update button starts. */
|
||||
onUpdate?: (st: UpdatesStatus) => void;
|
||||
/** The page refreshes its cards with this. */
|
||||
onDone?: (st: UpdatesStatus | null) => void;
|
||||
/** As soon as the job this operation follows is known (its id). */
|
||||
onJob?: (job: UpdateJob) => void;
|
||||
}
|
||||
|
||||
const sleep = (ms: number) => new Promise((r) => setTimeout(r, ms));
|
||||
|
||||
/**
|
||||
* Start `what` (see updates_run) and follow it in a modal; resolves with the
|
||||
* finished job (null when it could not start). `follow` attaches to a job
|
||||
* that is already running instead.
|
||||
*/
|
||||
export async function runOperation(what: string | null, o: OpOptions, follow?: UpdateJob): Promise<UpdateJob | null> {
|
||||
const comp = follow ? runningComponent(follow) : jobComponent(what!);
|
||||
const isCheck = follow ? follow.action === 'check' : what!.startsWith('check');
|
||||
const opened = Date.now();
|
||||
const name = E('b', {}, NAME[comp] ?? (comp === 'all' ? 'All components' : 'Dawnline'));
|
||||
const ver = E('span', { class: 'dl-pill dl-mono' }, o.version ?? '');
|
||||
const phase = E('span', { class: 'dl-pill info', hidden: true });
|
||||
const timer = E('span', {}, '0:00');
|
||||
const log = E('pre', { class: 'dl-log' }, 'Operation started. Waiting for log output…');
|
||||
const result = E('div', {});
|
||||
const actions = E('div', { class: 'dl-op-actions' });
|
||||
let lines: string[] = [];
|
||||
const setActions = (nodes: Node[]) => dom.content(actions, nodes);
|
||||
const closeBtn = (danger = false) => cancelButton('Close', danger);
|
||||
|
||||
modal(
|
||||
o.title,
|
||||
E('div', { class: 'dl-op' }, [
|
||||
E('div', { class: 'dl-op-head' }, [
|
||||
name,
|
||||
o.version ? ver : '',
|
||||
phase,
|
||||
E('span', { class: 'dl-spacer' }),
|
||||
E('span', { class: 'dl-faint dl-op-timer' }, [icon('clock'), timer]),
|
||||
]),
|
||||
E('div', { class: 'dl-op-loghead' }, [
|
||||
E('b', {}, 'Operation log'),
|
||||
iconButton('copy', 'Copy log', () => copyText(lines.join('\n'), 'Log copied')),
|
||||
]),
|
||||
log,
|
||||
result,
|
||||
]),
|
||||
[actions],
|
||||
'wide',
|
||||
);
|
||||
setActions([
|
||||
E(
|
||||
'button',
|
||||
{ class: 'cbi-button cbi-button-neutral spinning', type: 'button', disabled: 'disabled' },
|
||||
isCheck ? 'Checking…' : 'Working…',
|
||||
),
|
||||
]);
|
||||
|
||||
let job: UpdateJob | null = follow ?? null;
|
||||
let id = follow?.id;
|
||||
// The job before the click and the router's clock then: a finished job from
|
||||
// before must never pass for the one this click starts.
|
||||
let prevId: string | undefined;
|
||||
let since = 0;
|
||||
const known = (j: UpdateJob) => {
|
||||
if (id === j.id) return;
|
||||
id = j.id;
|
||||
o.onJob?.(j);
|
||||
};
|
||||
if (follow) o.onJob?.(follow);
|
||||
else {
|
||||
try {
|
||||
const before = await api.updatesStatus().catch(() => null);
|
||||
prevId = before?.job?.id;
|
||||
since = before?.now ?? 0;
|
||||
const r = await api.updatesRun(what!);
|
||||
if (r.job && r.job.state === 'running' && r.job.id !== prevId) {
|
||||
job = r.job;
|
||||
known(r.job);
|
||||
}
|
||||
} catch (e) {
|
||||
lines = [errorText(e)];
|
||||
log.textContent = lines[0];
|
||||
dom.content(result, E('div', { class: 'dl-comp-status warn' }, [icon('alert'), E('span', {}, errorText(e))]));
|
||||
setActions([closeBtn(true)]);
|
||||
notify(errorText(e), 'error');
|
||||
return null;
|
||||
}
|
||||
}
|
||||
let st: UpdatesStatus | null = null;
|
||||
let errors = 0;
|
||||
// Follow the job: log, phase and timer every second.
|
||||
for (;;) {
|
||||
await sleep(1000);
|
||||
st = await api.updatesStatus().catch(() => null);
|
||||
if (!st) {
|
||||
// rpcd restarts during Dawnline's own update: keep waiting a while.
|
||||
if (++errors > 60) break;
|
||||
continue;
|
||||
}
|
||||
errors = 0;
|
||||
const j = st.job;
|
||||
if (!j || !isOurJob(j, id, prevId, since)) {
|
||||
if (Date.now() - opened > 15000) break;
|
||||
continue;
|
||||
}
|
||||
known(j);
|
||||
job = j;
|
||||
if (j.log.length) {
|
||||
lines = j.log;
|
||||
const atEnd = log.scrollTop + log.clientHeight >= log.scrollHeight - 8;
|
||||
log.textContent = lines.join('\n');
|
||||
if (atEnd) log.scrollTop = log.scrollHeight;
|
||||
}
|
||||
ver.textContent = verText(j, o.version ?? '');
|
||||
if (!ver.isConnected && ver.textContent) name.after(ver);
|
||||
timer.textContent = mmss((j.finished ?? st.now) - j.started);
|
||||
if (j.state === 'running') {
|
||||
phase.hidden = !j.phase;
|
||||
phase.textContent = j.phase;
|
||||
continue;
|
||||
}
|
||||
break;
|
||||
}
|
||||
log.scrollTop = log.scrollHeight;
|
||||
phase.hidden = false;
|
||||
if (!job || job.state === 'running') {
|
||||
phase.className = 'dl-pill warn';
|
||||
phase.textContent = 'No answer';
|
||||
dom.content(
|
||||
result,
|
||||
E('div', { class: 'dl-comp-status warn' }, [
|
||||
icon('alert'),
|
||||
E('span', {}, 'The router stopped answering. The job may still finish: reopen Components in a minute.'),
|
||||
]),
|
||||
);
|
||||
setActions([closeBtn()]);
|
||||
o.onDone?.(st);
|
||||
return job;
|
||||
}
|
||||
if (job.state === 'failed') {
|
||||
phase.className = 'dl-pill bad';
|
||||
phase.textContent = 'Failed';
|
||||
dom.content(
|
||||
result,
|
||||
E('div', { class: 'dl-comp-status bad' }, [
|
||||
icon('x'),
|
||||
E('span', {}, [E('b', {}, job.error ?? 'Operation failed'), isCheck ? '' : '. Nothing else was changed.']),
|
||||
]),
|
||||
);
|
||||
setActions([button('Copy log', () => copyText(lines.join('\n'), 'Log copied')), closeBtn(true)]);
|
||||
notify(`${NAME[comp] ?? 'Update'}: ${job.error ?? 'failed'}`, 'error');
|
||||
o.onDone?.(st);
|
||||
return job;
|
||||
}
|
||||
phase.className = 'dl-pill ok';
|
||||
phase.textContent = 'Finished';
|
||||
if (isCheck && st) {
|
||||
const v = checkVerdict(st, comp);
|
||||
dom.content(
|
||||
result,
|
||||
E('div', { class: `dl-comp-status ${v.tone}` }, [
|
||||
icon(v.tone === 'ok' ? 'check' : v.tone === 'warn' ? 'alert' : 'download'),
|
||||
E('span', {}, v.text),
|
||||
]),
|
||||
);
|
||||
notify(v.text, v.tone === 'warn' ? 'warning' : 'success');
|
||||
o.onDone?.(st);
|
||||
if (v.update && o.onUpdate) {
|
||||
const s = st;
|
||||
setActions([closeBtn(), button(`Update to ${v.update}`, () => o.onUpdate!(s), 'positive')]);
|
||||
} else {
|
||||
setActions([closeBtn()]);
|
||||
// Nothing to do: the modal goes away on its own (as in the check toast).
|
||||
if (v.tone === 'ok') setTimeout(() => result.isConnected && closeModal(), 1200);
|
||||
}
|
||||
return job;
|
||||
}
|
||||
// Dawnline itself: rpcd and the service restart; reload the page once they answer with the new version.
|
||||
if (comp === 'app' && job.to) {
|
||||
const target = job.to;
|
||||
const msg = E('span', {}, 'Waiting for the router to restart its services…');
|
||||
dom.content(
|
||||
result,
|
||||
E('div', { class: 'dl-comp-status ok' }, [icon('check'), E('span', {}, [E('b', {}, `Dawnline ${target} is installed. `), msg])]),
|
||||
);
|
||||
const reload = () => {
|
||||
ui.menu?.flushCache();
|
||||
location.reload();
|
||||
};
|
||||
setActions([closeBtn(), button('Reload now', reload, 'positive')]);
|
||||
notify(`Dawnline updated to ${target}`, 'success', 6000);
|
||||
for (let n = 1; n <= 30; n++) {
|
||||
msg.textContent = `Waiting for the router to restart its services (${n} of 30)…`;
|
||||
await sleep(1500);
|
||||
const s = await api.updatesStatus().catch(() => null);
|
||||
if (s?.version === target) {
|
||||
msg.textContent = 'Services are back. Reloading…';
|
||||
setTimeout(reload, 800);
|
||||
return job;
|
||||
}
|
||||
}
|
||||
msg.textContent = 'Services restarted. Reload the page to use the new version.';
|
||||
return job;
|
||||
}
|
||||
const done =
|
||||
comp === 'pkgs'
|
||||
? `Updated ${[...((job.result?.pkgs?.updated as string[]) ?? []), ...((job.result?.pkgs?.installed as string[]) ?? [])].join(', ') || 'system packages'}`
|
||||
: comp === 'amneziawg'
|
||||
? `AmneziaWG${job.to ? ` ${job.to}` : ''} is installed`
|
||||
: 'Operation completed';
|
||||
dom.content(result, E('div', { class: 'dl-comp-status ok' }, [icon('check'), E('span', {}, done)]));
|
||||
setActions([closeBtn()]);
|
||||
notify(done, 'success');
|
||||
o.onDone?.(st);
|
||||
return job;
|
||||
}
|
||||
Reference in new issue
Block a user