list and download every backup, back up now, and show the last failure and restore steps (v3.0.138)

@@ -1,6 +1,6 @@11 {22 	"name": "kepr",3-	"version": "3.0.137",3+	"version": "3.0.138",44 	"private": true,55 	"type": "module",66 	"scripts": {

@@ -4,11 +4,12 @@44 import { operatorIssues } from "../issues/store.ts";55 import { type Html, html } from "../pages/html.ts";66 import { type PageContext, page, plural, relativeTime } from "../pages/layout.ts";7-import { backups, newestBackupTarball } from "../server/backup.ts";7+import { backups } from "../server/backup.ts";88 import type { Config } from "../server/config.ts";99 import { connectKeys, MACHINES_LISTED } from "../server/connect.ts";1010 import { setting } from "../server/db.ts";1111 import { formToken } from "../server/login.ts";12+import { backupsPage } from "./backups.ts";1213 import { allRepos } from "./store.ts";1314 1415 export type AdminContext = PageContext & {@@ -132,26 +133,7 @@132133 /** §24's Status section at `/admin`: the bucket, each repo's format, backups, the running version. */133134 export function registerStatus(app: Hono, ctx: AdminContext): void {134135 	app.get("/admin", async (c) => {135-		if (c.req.query("section") === "backups") {136-			const newest = backups(ctx.dataDir).at(-1);137-			const backup = newest138-				? html`<p>Last backup: ${newest.replace(139-						/^(\d{4})(\d\d)(\d\d)T(\d\d)(\d\d)(\d\d)Z$/,140-						"$1-$2-$3 $4:$5:$6 UTC",141-					)}. <a href="/admin/backup">download backup</a></p>`142-				: html`<p>No backup yet.</p>`;143-			return c.html(144-				adminPage(145-					c,146-					ctx,147-					"backups",148-					html`${backup}149-<p>Kepr keeps the last 14 daily backups of its database and assets.</p>150-<p class="muted">Backups stay on this server. Keep a copy elsewhere, along with kepr.toml.</p>151-<p class="muted">Sessions and bucket credentials are not included.</p>`,152-				),153-			);154-		}136+		if (c.req.query("section") === "backups") return c.html(backupsPage(c, ctx));155137 		let bucket: Html;156138 		try {157139 			const repos = await listRepos(ctx.sync.bucket);@@ -218,14 +200,5 @@218200 <p>Running kepr ${version}: ${lines} lines of TypeScript.</p></details></section>`,219201 			),220202 		);221-	});222-223-	app.get("/admin/backup", (c) => {224-		const backup = newestBackupTarball(ctx.dataDir);225-		if (!backup) return c.notFound();226-		return c.body(backup.bytes, 200, {227-			"Content-Type": "application/gzip",228-			"Content-Disposition": `attachment; filename="kepr-backup-${backup.name}.tar.gz"`,229-		});230203 	});231204 }

@@ -3,6 +3,7 @@33 import { Hono } from "hono";44 import { bodyLimit } from "hono/body-limit";55 import { secureHeaders } from "hono/secure-headers";6+import { registerBackups } from "../admin/backups.ts";67 import { registerBucket } from "../admin/bucket.ts";78 import { registerStatus } from "../admin/console.ts";89 import { registerEmail } from "../admin/email.ts";@@ -129,6 +130,7 @@129130 	registerBucket(app, admin);130131 	registerNotifications(app, admin);131132 	registerEmail(app, admin);133+	registerBackups(app, admin);132134 	registerRepoText(app, admin);133135 	registerHousekeeping(app, ctx);134136 	registerFrontPages(app, ctx);

@@ -7,10 +7,11 @@77 	readFileSync,88 	renameSync,99 	rmSync,10+	statSync,1011 } from "node:fs";1112 import { join, relative } from "node:path";1213 import { buildTarball } from "../tarball/tar.ts";13-import { notify } from "./db.ts";14+import { notify, setting } from "./db.ts";1415 1516 const KEEP = 14;1617 const DAY_MS = 24 * 3600 * 1000;@@ -25,7 +26,8 @@2526 /** The backups in `data/backups/`, oldest first. */2627 export function backups(dataDir: string): string[] {2728 	const root = join(dataDir, "backups");28-	return existsSync(root)29+	// Not a folder is no backups, so the console still shows why the next one fails.30+	return existsSync(root) && statSync(root).isDirectory()2931 		? readdirSync(root)3032 				.filter((name) => NAME.test(name))3133 				.sort()@@ -68,36 +70,64 @@6870 6971 /** Daily backups: checked at startup and every hour, so a restart never skips a day. */7072 export function startBackupLoop(kepr: Database, dataDir: string): void {71-	// Only a backup that starts failing is told, not every hourly retry of one that keeps failing.72-	let failing = false;73-	const tick = () => {74-		try {75-			backupIfDue(kepr, dataDir);76-			failing = false;77-		} catch (error) {78-			console.error(`kepr: backup failed: ${error}`);79-			if (!failing)80-				notify(kepr, "backup_failed", `Backup failed: ${error}`, "/admin?section=backups");81-			failing = true;82-		}83-	};73+	const tick = () => attemptBackup(kepr, () => backupIfDue(kepr, dataDir));8474 	tick();8575 	setInterval(tick, CHECK_MS);8676 }8777 88-/** The newest backup as a `.tar.gz` for "download backup" (§24), or null when there is none. */89-export function newestBackupTarball(90-	dataDir: string,91-): { name: string; bytes: Uint8Array<ArrayBuffer> } | null {92-	const name = backups(dataDir).at(-1);93-	if (!name) return null;78+/**79+ * One backup attempt. A failure is kept for the console until a backup succeeds (§24), and only a80+ * backup that starts failing is told, not every hourly retry. Returns the failure, or null.81+ */82+export function attemptBackup(kepr: Database, make: () => unknown): string | null {83+	try {84+		make();85+		kepr.query("DELETE FROM settings WHERE key = 'backup_error'").run();86+		return null;87+	} catch (error) {88+		const message = String(error);89+		console.error(`kepr: backup failed: ${message}`);90+		if (!setting(kepr, "backup_error")) {91+			notify(kepr, "backup_failed", `Backup failed: ${message}`, "/admin?section=backups");92+		}93+		kepr94+			.query("INSERT OR REPLACE INTO settings (key, value) VALUES ('backup_error', ?)")95+			.run(message);96+		return message;97+	}98+}99+100+function backupFiles(dataDir: string, name: string): { path: string; full: string }[] {94101 	const dir = join(dataDir, "backups", name);95-	const files = readdirSync(dir, { recursive: true, withFileTypes: true })102+	return readdirSync(dir, { recursive: true, withFileTypes: true })96103 		.filter((entry) => entry.isFile())97104 		.map((entry) => {98-			const path = join(entry.parentPath, entry.name);99-			return { path: relative(dir, path), bytes: readFileSync(path) };105+			const full = join(entry.parentPath, entry.name);106+			return { path: relative(dir, full), full };100107 		});108+}109+110+/** What one backup takes on disk. */111+export function backupBytes(dataDir: string, name: string): number {112+	return backupFiles(dataDir, name).reduce((sum, file) => sum + statSync(file.full).size, 0);113+}114+115+/**116+ * A kept backup as a `.tar.gz` for the console's downloads (§24), the newest when no name is117+ * given; null when there is no such backup.118+ */119+export function backupTarball(120+	dataDir: string,121+	wanted?: string,122+): { name: string; bytes: Uint8Array<ArrayBuffer> } | null {123+	const kept = backups(dataDir);124+	// Only a name from the list, so a request can never reach outside data/backups/.125+	const name = wanted === undefined ? kept.at(-1) : kept.find((known) => known === wanted);126+	if (!name) return null;127+	const files = backupFiles(dataDir, name).map((file) => ({128+		path: file.path,129+		bytes: readFileSync(file.full),130+	}));101131 	// Owner-only once unpacked: kepr.db holds reporters' contact emails.102132 	return { name, bytes: buildTarball(`kepr-backup-${name}`, files, 0o600) };103133 }