koguma 0.5.0 → 0.6.0

package/src/api/router.ts

@@ -37,8 +37,10 @@ import {
   serveMedia,
   uploadMedia,
   listMedia,
+  getMedia,
   deleteMedia,
-  renameMedia
+  renameMedia,
+  replaceMedia
 } from '../media/index.ts';
 
 export function createApiRouter(config: KogumaConfig): Hono {
@@ -219,6 +221,8 @@ export function createApiRouter(config: KogumaConfig): Hono {
 
   app.get('/api/admin/media', listMedia);
   app.post('/api/admin/media', uploadMedia);
+  app.get('/api/admin/media/:id', getMedia);
+  app.put('/api/admin/media/:id/replace', replaceMedia);
   app.patch('/api/admin/media/:id', renameMedia);
   app.delete('/api/admin/media/:id', deleteMedia);
 

package/src/media/index.ts

@@ -3,6 +3,61 @@
  */
 import type { Context } from 'hono';
 
+const MAX_FILE_SIZE = 10 * 1024 * 1024; // 10 MB
+
+// ── Shared helpers ──────────────────────────────────────────────────────────
+
+/** Parse a File from a multipart form and enforce size limit. */
+function parseFileFromForm(
+  formData: FormData
+): { file: File; title: string } | { error: string; status: 400 | 413 } {
+  const file = formData.get('file') as File | null;
+  const title = (formData.get('title') as string) ?? '';
+  if (!file) return { error: 'No file provided', status: 400 };
+  if (file.size > MAX_FILE_SIZE) {
+    return {
+      error: `File too large (${(file.size / 1024 / 1024).toFixed(1)} MB). Maximum is 10 MB.`,
+      status: 413
+    };
+  }
+  return { file, title };
+}
+
+/** Read a file, extract dimensions, and upload to R2. */
+async function processAndUploadFile(
+  media: R2Bucket,
+  file: File,
+  key: string
+): Promise<{ width: number | null; height: number | null }> {
+  const buf = await file.arrayBuffer();
+
+  let width: number | null = null;
+  let height: number | null = null;
+  try {
+    const blob = new Blob([buf], { type: file.type });
+    const bmp = await createImageBitmap(blob);
+    width = bmp.width;
+    height = bmp.height;
+    bmp.close();
+  } catch {
+    // Not decodable (SVG, etc.) — leave null
+  }
+
+  await media.put(key, buf, {
+    httpMetadata: { contentType: file.type }
+  });
+
+  return { width, height };
+}
+
+/** Build an R2 key from an ID and filename extension. */
+function buildKey(id: string, fileName: string): string {
+  const ext = fileName.split('.').pop() ?? '';
+  return `${id}${ext ? '.' + ext : ''}`;
+}
+
+// ── Handlers ────────────────────────────────────────────────────────────────
+
 /** Serve a media file from R2 */
 export async function serveMedia(c: Context): Promise<Response> {
   const media = (c.env as Record<string, R2Bucket>).MEDIA;
@@ -25,43 +80,67 @@ export async function uploadMedia(c: Context): Promise<Response> {
   const media = (c.env as Record<string, R2Bucket>).MEDIA;
   const db = (c.env as Record<string, D1Database>).DB;
 
-  const formData = await c.req.formData();
-  const file = formData.get('file') as File | null;
-  const title = (formData.get('title') as string) ?? '';
-
-  if (!file) {
-    return c.json({ error: 'No file provided' }, 400);
-  }
+  const parsed = parseFileFromForm(await c.req.formData());
+  if ('error' in parsed) return c.json({ error: parsed.error }, parsed.status);
+  const { file, title } = parsed;
 
   const id = crypto.randomUUID();
-  const ext = file.name.split('.').pop() ?? '';
-  const key = `${id}${ext ? '.' + ext : ''}`;
-
-  // Upload to R2
-  await media.put(key, await file.arrayBuffer(), {
-    httpMetadata: { contentType: file.type }
-  });
+  const key = buildKey(id, file.name);
+  const { width, height } = await processAndUploadFile(media, file, key);
 
-  // Register in _assets table
   const url = `/api/media/${key}`;
   await db
     .prepare(
-      `INSERT INTO _assets (id, title, url, content_type, file_size) VALUES (?, ?, ?, ?, ?)`
+      `INSERT INTO _assets (id, title, url, content_type, file_size, width, height) VALUES (?, ?, ?, ?, ?, ?, ?)`
     )
-    .bind(id, title || file.name, url, file.type, file.size)
+    .bind(id, title || file.name, url, file.type, file.size, width, height)
     .run();
 
-  return c.json({ id, url, title: title || file.name, contentType: file.type });
+  return c.json({
+    id,
+    url,
+    title: title || file.name,
+    contentType: file.type,
+    width,
+    height
+  });
 }
 
-/** List all media assets */
+/** List all media assets (lazy-backfills file_size from R2 when null) */
 export async function listMedia(c: Context): Promise<Response> {
   const db = (c.env as Record<string, D1Database>).DB;
+  const media = (c.env as Record<string, R2Bucket>).MEDIA;
   const result = await db
     .prepare('SELECT * FROM _assets ORDER BY created_at DESC')
     .all();
 
-  return c.json({ assets: result.results ?? [] });
+  const assets = (result.results ?? []) as Record<string, unknown>[];
+
+  // Lazy backfill: look up file_size from R2 for any assets missing it
+  const needsBackfill = assets.filter(a => a.file_size == null && a.url);
+  if (needsBackfill.length > 0) {
+    const backfillPromise = Promise.all(
+      needsBackfill.map(async asset => {
+        const key = (asset.url as string).replace('/api/media/', '');
+        try {
+          const head = await media.head(key);
+          if (head) {
+            asset.file_size = head.size;
+            await db
+              .prepare('UPDATE _assets SET file_size = ? WHERE id = ?')
+              .bind(head.size, asset.id)
+              .run();
+          }
+        } catch {
+          // R2 lookup failed — skip, will retry on next list
+        }
+      })
+    );
+    // Run backfill in background so the response isn't delayed
+    c.executionCtx.waitUntil(backfillPromise);
+  }
+
+  return c.json({ assets });
 }
 
 /** Rename a media asset (title only — ID and R2 key are unchanged) */
@@ -83,25 +162,75 @@ export async function renameMedia(c: Context): Promise<Response> {
   return c.json({ ok: true, id, title: title.trim() });
 }
 
+/** Delete a media asset from R2 and _assets table */
 export async function deleteMedia(c: Context): Promise<Response> {
   const media = (c.env as Record<string, R2Bucket>).MEDIA;
   const db = (c.env as Record<string, D1Database>).DB;
   const id = c.req.param('id');
 
-  // Get the asset to find the R2 key
   const asset = await db
     .prepare('SELECT * FROM _assets WHERE id = ?')
     .bind(id)
     .first();
-
   if (!asset) return c.notFound();
 
-  // Extract R2 key from URL (/api/media/{key})
-  const url = asset.url as string;
-  const key = url.replace('/api/media/', '');
-
+  const key = (asset.url as string).replace('/api/media/', '');
   await media.delete(key);
   await db.prepare('DELETE FROM _assets WHERE id = ?').bind(id).run();
 
   return c.json({ ok: true });
 }
+
+/** Get a single media asset by ID */
+export async function getMedia(c: Context): Promise<Response> {
+  const db = (c.env as Record<string, D1Database>).DB;
+  const id = c.req.param('id');
+  const asset = await db
+    .prepare('SELECT * FROM _assets WHERE id = ?')
+    .bind(id)
+    .first();
+  if (!asset) return c.notFound();
+  return c.json(asset);
+}
+
+/** Replace an existing asset's file (keeps the same DB row ID) */
+export async function replaceMedia(c: Context): Promise<Response> {
+  const media = (c.env as Record<string, R2Bucket>).MEDIA;
+  const db = (c.env as Record<string, D1Database>).DB;
+  const id = c.req.param('id');
+
+  const existing = await db
+    .prepare('SELECT * FROM _assets WHERE id = ?')
+    .bind(id)
+    .first();
+  if (!existing) return c.notFound();
+
+  const parsed = parseFileFromForm(await c.req.formData());
+  if ('error' in parsed) return c.json({ error: parsed.error }, parsed.status);
+  const { file } = parsed;
+
+  // Delete old R2 object
+  const oldKey = (existing.url as string).replace('/api/media/', '');
+  await media.delete(oldKey);
+
+  // Upload new file
+  const newKey = buildKey(id, file.name);
+  const { width, height } = await processAndUploadFile(media, file, newKey);
+
+  const newUrl = `/api/media/${newKey}`;
+  await db
+    .prepare(
+      `UPDATE _assets SET url = ?, content_type = ?, file_size = ?, width = ?, height = ?, updated_at = datetime('now') WHERE id = ?`
+    )
+    .bind(newUrl, file.type, file.size, width, height, id)
+    .run();
+
+  return c.json({
+    id,
+    url: newUrl,
+    content_type: file.type,
+    file_size: file.size,
+    width,
+    height
+  });
+}