Commit bc5017b0e58626345037c3bd2e32e6a2a1b576b4 | sitegen

author	clover caruso <git@paperclover.net> 2025-08-11 23:04:26-07:00
committer	clover caruso <git@paperclover.net> 2025-10-14 02:40:46-07:00
log	bc5017b0e58626345037c3bd2e32e6a2a1b576b4
tree	9e2a50c394352f533ee2dc8f3790836675a700ab
parent	98be3e2bd40a40c6595de522d087092df63cdbb7
signature	Commit is signed but in an unrecognized format.

feat: add sqlite database reloading

this is used by scan3 to notify active servers that there is new data to
be aware of.

3 files changed, 66 insertions(+), 14 deletions(-)

framework
- lib
  - sqlite.ts
src
- file-viewer
  - bin
    scan3.ts
- source-of-truth.ts

framework/lib/sqlite.ts+29-11

 @@ -1,29 +1,32 @@
 // Guard against reloads and bundler duplication.
+type DbMap = Map<string, WrappedDatabase>;
 // @ts-ignore
-const map = globalThis[Symbol.for("clover.db")] ??= new Map<
+const map = (globalThis[Symbol.for("clover.db")] as DbMap) ??= new Map();
-  string,
+for (const v of map.values()) {
-  WrappedDatabase
+  v.node.close();
->();
+}
+map.clear();
 export function getDb(file: string) {
-  let db: WrappedDatabase | null = map.get(file);
+  let db = map.get(file);
   if (db) return db;
   const fileWithExt = file.includes(".") ? file : file + ".sqlite";
   db = new WrappedDatabase(
-    new DatabaseSync(
+    path.join(process.env.CLOVER_DB ?? ".clover", fileWithExt),
-      path.join(process.env.CLOVER_DB ?? ".clover", fileWithExt),
-    ),
   );
   map.set(file, db);
   return db;
 }
 export class WrappedDatabase {
+  file: string;
   node: DatabaseSync;
+  stmts: Stmt[];
   stmtTableMigrate: WeakRef<StatementSync> | null = null;
-  constructor(node: DatabaseSync) {
+  constructor(file: string) {
-    this.node = node;
+    this.file = file;
+    this.node = new DatabaseSync(file);
     this.node.exec(`
       create table if not exists clover_migrations (
         key text not null primary key,
 @@ -66,7 +69,18 @@ export class WrappedDatabase {
       if (err) (err as { query: string }).query = query;
       throw err;
     }
-    return new Stmt(prepared);
+    const stmt = new Stmt<Args, Result>(prepared);
+    this.stmts.push(stmt);
+    return stmt;
+  }
+  reload() {
+    const newNode = new DatabaseSync(this.file);
+    this.node.close();
+    this.node = newNode;
+    for (const stmt of this.stmts) {
+      stmt["reload"](newNode);
+    }
   }
 }
 @@ -80,6 +94,10 @@ export class Stmt<Args extends unknown[] = unknown[], Row = unknown> {
     this.query = node.sourceSQL;
   }
+  private reload(db: DatabaseSync) {
+    this.#node = db.prepare(this.query);
+  }
   /** Get one row */
   get(...args: Args): Row | null {
     return this.#wrap(args, () => {

src/file-viewer/bin/scan3.ts+26-1

...	@@ -12,6 +12,7 @@	...	@@ -12,6 +12,7 @@
12	// quality cannot be written with AI.	12	// quality cannot be written with AI.
13	const root = path.resolve("/Volumes/clover/Published");	13	const root = path.resolve("/Volumes/clover/Published");
14	const workDir = path.resolve(".clover/derived");	14	const workDir = path.resolve(".clover/derived");
		15	const sotToken = UNWRAP(process.env.CLOVER_SOT_KEY);
15		16
16	export async function main() {	17	export async function main() {
17	const start = performance.now();	18	const start = performance.now();
...	@@ -337,13 +338,37 @@ export async function main() {	...	@@ -337,13 +338,37 @@ export async function main() {
337	console.info("No new derived assets");	338	console.info("No new derived assets");
338	}	339	}
339		340
		341	MediaFile.db.prepare("VACUUM").run();
		342	MediaFile.db.reload();
		343	// TODO: reload prod web instance
		344	await rsync.spawn({
		345	args: [
		346	MediaFile.db.file,
		347	"clo@zenith:/mnt/storage1/clover/Documents/Config/paperclover/cache.sqlite",
		348	],
		349	title: "Uploading Database",
		350	cwd: process.cwd(),
		351	});
		352	{
		353	const res = await fetch("https://db.paperclover.net/reload", {
		354	method: "post",
		355	headers: {
		356	Authorization: sotToken,
		357	},
		358	});
		359	if (!res.ok) {
		360	console.warn(
		361	`Failed to reload remote database ${res.status} ${res.statusText}`,
		362	);
		363	}
		364	}
		365
340	console.info(	366	console.info(
341	"Updated file viewer index in \x1b[1m" +	367	"Updated file viewer index in \x1b[1m" +
342	((performance.now() - start) / 1000).toFixed(1) +	368	((performance.now() - start) / 1000).toFixed(1) +
343	"s\x1b[0m",	369	"s\x1b[0m",
344	);	370	);
345		371
346	MediaFile.db.prepare("VACUUM").run();
347	const { duration, count } = MediaFile.db	372	const { duration, count } = MediaFile.db
348	.prepare<[], { count: number; duration: number }>(	373	.prepare<[], { count: number; duration: number }>(
349	`	374	`

src/source-of-truth.ts+11-2

 @@ -20,7 +20,7 @@
 const app = new Hono();
 export default app;
-const token = process.env.CLOVER_SOT_KEY;
+const token = UNWRAP(process.env.CLOVER_SOT_KEY);
 const nasRoot = process.platform === "win32"
   ? "\\\\zenith\\clover"
 @@ -48,12 +48,13 @@ const fds = new Map<string, Awaitable<{ fd: number; refs: number }>>();
 app.get("/file/*", async (c) => {
   const fullQuery = c.req.path.slice("/file".length);
   const [filePath, derivedAsset, ...invalid] = fullQuery.split("$/");
+  ASSERT(filePath != null);
   if (invalid.length > 0) return c.notFound();
   if (filePath.length <= 1) return c.notFound();
   const permissions = FilePermissions.getByPrefix(filePath);
   if (permissions !== 0) {
     if (c.req.header("Authorization") !== token) {
-      return c.json({ error: "invalid authorization header" });
+      return c.json({ error: "invalid authorization header" }, 401);
     }
   }
   const file = MediaFile.getByPath(filePath);
 @@ -104,6 +105,14 @@ app.get("/file/*", async (c) => {
   return c.body(stream.Readable.toWeb(nodeStream) as ReadableStream);
 });
+app.post("/reload", async (c) => {
+  if (c.req.header("Authorization") !== token) {
+    return c.json({ error: "invalid authorization header" }, 401);
+  }
+  MediaFile.db.reload();
+  return c.body(null, 204);
+});
 const openFile = util.promisify(fsCallbacks.open);
 const closeFile = util.promisify(fsCallbacks.close);