Improve schema

proxy.js

···
 const doc = await resolveDid(did);
 const pds = doc.service[0].serviceEndpoint;
 
+let record = await getRecord(pds, did, collection, rkey);
+let updating = false;
+
+async function updateRecord() {
+	if (updating) return;
+	try {
+		updating = true;
+		record = await getRecord(pds, did, collection, rkey);
+	} finally {
+		updating = false;
+	}
+}
+
+/**
+ *
+ * @param {number} status
+ * @param {string} message
+ */
+function error(res, status, message) {
+	res.statusCode = status;
+	res.end(message);
+}
+
 const server = createServer(async (req, res) => {
 	process.stdout.write(`${req.method} ${req.url} `);
-	if (req.method !== "GET") {
-		res.statusCode = 405;
-		res.end("Method not supported");
-		return;
-	}
+	const start = performance.now();
 
-	// TODO: keep leading slash
-	const path = req.url.slice(1);
+	try {
+		if (req.method !== "GET") return error(res, 405, "Method not supported");
+		queueMicrotask(updateRecord);
 
-	const record = await getRecord(pds, did, collection, rkey);
+		let asset = record.value.assets[req.url.slice(1)];
+		if (!asset) {
+			const path = req.url.slice(1).split("/"),
+				filename = path.pop();
+			if (!/^.+\..+$/.test(filename)) {
+				asset = record.value.assets[path.concat("index.html").join("/")];
+			}
+		}
 
-	for (const asset of record.value.assets) {
-		if (asset.path !== path) continue;
+		if (!asset) return error(res, 404, "Not found");
 
 		try {
-			const blob = await getBlob(pds, did, asset.file.ref.$link);
+			const blob = await getBlob(pds, did, asset.ref.$link);
 
-			if (!blob.ok) {
-				console.error(`Upstream error ${blob.status}: ${blob.statusText}`);
-				throw new Error("Response not ok");
-			}
-
-			if (!blob.body) {
-				console.error(`Blob body missing`);
-				throw new Error("Blob body missing");
-			}
+			if (!blob.ok) throw new Error(`Upstream error ${blob.status}: ${blob.statusText}`);
+			if (!blob.body) throw new Error("Blob body missing");
 
 			const contentType = blob.headers.get("content-type") || asset.file.mimeType;
 			res.setHeader("content-type", contentType);
···
 				if (done) break;
 				res.write(value);
 			}
-
 			res.end();
-			process.stdout.write(`${res.statusCode} \n`);
-			return;
 		} catch (error) {
-			res.statusCode = 502;
-			res.end("Error streaming blob");
-			process.stdout.write(`${res.statusCode} \n`);
-			return;
+			console.error(error);
+			return error(res, 502, "Bad gateway");
 		}
+	} finally {
+		const ms = performance.now() - start;
+		process.stdout.write(`${res.statusCode} - ${Math.round(ms)}ms\n`);
 	}
-
-	res.statusCode = 404;
-	res.end("Not Found");
-	process.stdout.write(`${res.statusCode} \n`);
 });
 
 const port = Number.parseInt(values.port) || 3000;

src/routes/~/sites/[name]/+page.svelte

···
 		goto("/~/");
 	}
 
+	interface Bundle {
+		description?: string;
+		assets: Record<
+			string,
+			{ $type: "blob"; ref: { $link: string }; mimeType: string; size: number }
+		>;
+		createdAt: string;
+	}
+
 	async function deployBundle(e: SubmitEvent & { currentTarget: HTMLFormElement }) {
 		e.preventDefault();
 		const form = e.currentTarget;
···
 		if (typeof description !== "string" || !description) description = "Uploaded on website";
 
 		const files = formdata.getAll("files");
-		const assets: { path: string; file: any }[] = [];
+		const bundle: Bundle = { description, assets: {}, createdAt: new Date().toISOString() };
 		for (const file of files) {
 			if (!(file instanceof File)) continue;
 
 			const { data } = await rpc.post("com.atproto.repo.uploadBlob", { input: file });
 			if (isXRPCErrorPayload(data)) throw new Error("couldn't upload file");
 
-			assets.push({
-				path: file.name,
-				file: { $type: "blob", ref: data.blob.ref, mimeType: file.type, size: file.size },
-			});
+			const filepath = file.webkitRelativePath?.replace(/^.+\//, "") ?? file.name;
+			bundle.assets[filepath] = {
+				$type: "blob",
+				ref: data.blob.ref,
+				mimeType: file.type,
+				size: file.size,
+			};
 		}
 
-		const record = { description, assets, createdAt: new Date().toISOString() };
 		await rpc.post("com.atproto.repo.putRecord", {
-			input: { repo: data.did, collection: "com.jakelazaroff.test", rkey, record },
+			input: {
+				repo: data.did,
+				collection: "com.jakelazaroff.test",
+				rkey,
+				record: bundle as any,
+			},
 		});
 		if (isXRPCErrorPayload(data)) throw new Error("couldn't deploy");
 
 		invalidate(`rkey:${rkey}`);
+		form.reset();
 	}
 </script>
 
···
 		<time>{data.record.value.createdAt}</time>
 	</summary>
 	<ul>
-		{#each data.record.value.assets as asset}
+		{#each Object.entries(data.record.value.assets) as [path, file]}
 			<li>
-				<span>{asset.path}</span>
+				<span>{path}</span>
 				<a
 					target="_blank"
-					href="{data.pds}xrpc/com.atproto.sync.getBlob?did={data.did}&cid={asset.file.ref.$link}"
-					>open</a
+					href="{data.pds}xrpc/com.atproto.sync.getBlob?did={data.did}&cid={file.ref.$link}">open</a
 				>
 			</li>
 		{/each}
 	</ul>
 </details>
 
+<h3>upload</h3>
 <form onsubmit={deployBundle}>
 	<input type="hidden" name="rkey" value={params.name} />
-	<input name="description" />
-	<input type="file" name="files" />
+	<label>
+		<span>description</span>
+		<input name="description" />
+	</label>
+	<input type="file" name="files" webkitdirectory />
 	<button>upload</button>
 </form>
 
+<h3>settings</h3>
+<form>
+	<label>
+		<span>not found</span>
+		<input name="notfound" />
+	</label>
+	<button>save</button>
+</form>
+
+<h3>danger zone</h3>
 <form onsubmit={deleteBundle}>
-	<input name="rkey" pattern={params.name.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")} />
+	<label>
+		<span>name</span>
+		<input name="rkey" pattern={params.name.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")} />
+	</label>
 	<button>delete</button>
 </form>

src/routes/~/sites/[name]/+page.ts

···
 import type {} from "@atcute/atproto";
 import { isXRPCErrorPayload } from "@atcute/client";
+import { redirect } from "@sveltejs/kit";
 
 import { client, configure } from "~/lib/oauth";
 
 import type { PageLoad } from "./$types";
-import { redirect } from "@sveltejs/kit";
 
 configure();