@valentinkolb/filegate 2.3.0 → 2.3.2

package/README.md

@@ -245,6 +245,15 @@ const result = await client.thumbnail.image({
 
 **Supported input formats:** JPEG, PNG, WebP, AVIF, TIFF, GIF, SVG
 
+**Caching:** Thumbnails include `ETag`, `Last-Modified`, and `Cache-Control: immutable` headers. Simply pass through the response:
+
+```typescript
+const result = await client.thumbnail.image({ path: "/data/photo.jpg" });
+if (!result.ok) return c.json({ error: result.error }, result.status);
+
+return result.data; // Response with all headers
+```
+
 ### Chunked Uploads
 
 For large files, use chunked uploads. They support:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@valentinkolb/filegate",
-  "version": "2.3.0",
+  "version": "2.3.2",
   "type": "module",
   "license": "MIT",
   "repository": {
@@ -40,6 +40,7 @@
     "typescript": "^5"
   },
   "dependencies": {
+    "@henrygd/semaphore": "^0.1.0",
     "@hono/standard-validator": "^0.2.2",
     "@scalar/hono-api-reference": "^0.9.37",
     "@scalar/openapi-to-markdown": "^0.3.31",

package/src/handlers/thumbnail.ts

@@ -1,5 +1,6 @@
 import { Hono } from "hono";
 import { describeRoute } from "hono-openapi";
+import { stat } from "node:fs/promises";
 import sharp from "sharp";
 import { validatePath } from "../lib/path";
 import { jsonResponse, requiresAuth } from "../lib/openapi";
@@ -8,6 +9,13 @@ import { ImageThumbnailQuerySchema, ErrorSchema } from "../schemas";
 
 const app = new Hono();
 
+// Generate ETag from path, mtime, and thumbnail parameters
+const generateETag = (path: string, mtime: Date, params: string): string => {
+  const hasher = new Bun.CryptoHasher("sha256");
+  hasher.update(`${path}:${mtime.getTime()}:${params}`);
+  return `"${hasher.digest("hex").slice(0, 16)}"`;
+};
+
 // Supported image MIME types
 const SUPPORTED_IMAGE_TYPES = new Set([
   "image/jpeg",
@@ -74,6 +82,27 @@ app.get(
       );
     }
 
+    // Get file stats for Last-Modified and ETag
+    const fileStat = await stat(result.realPath);
+    const lastModified = fileStat.mtime;
+    const paramsKey = `${width}x${height}:${fit}:${position}:${format}:${quality}`;
+    const etag = generateETag(result.realPath, lastModified, paramsKey);
+
+    // Check If-None-Match (ETag)
+    const ifNoneMatch = c.req.header("If-None-Match");
+    if (ifNoneMatch === etag) {
+      return new Response(null, { status: 304 });
+    }
+
+    // Check If-Modified-Since
+    const ifModifiedSince = c.req.header("If-Modified-Since");
+    if (ifModifiedSince) {
+      const clientDate = new Date(ifModifiedSince);
+      if (lastModified <= clientDate) {
+        return new Response(null, { status: 304 });
+      }
+    }
+
     try {
       // Read file and process with Sharp
       const buffer = await file.arrayBuffer();
@@ -105,6 +134,8 @@ app.get(
         headers: {
           "Content-Type": FORMAT_MIME[format],
           "Cache-Control": "public, max-age=31536000, immutable",
+          "Last-Modified": lastModified.toUTCString(),
+          ETag: etag,
         },
       });
     } catch (err) {

package/src/handlers/upload.ts

@@ -2,6 +2,7 @@ import { Hono } from "hono";
 import { describeRoute } from "hono-openapi";
 import { mkdir, readdir, rm, stat, rename, readFile, writeFile } from "node:fs/promises";
 import { join, dirname } from "node:path";
+import { getSemaphore } from "@henrygd/semaphore";
 import { validatePath } from "../lib/path";
 import { applyOwnership, type Ownership } from "../lib/ownership";
 import { jsonResponse, requiresAuth } from "../lib/openapi";
@@ -80,56 +81,64 @@ const cleanupUpload = async (id: string): Promise<void> => {
 };
 
 const assembleFile = async (meta: UploadMeta): Promise<string | null> => {
-  const chunks = await getUploadedChunks(meta.uploadId);
-  if (chunks.length !== meta.totalChunks) return "missing chunks";
-
-  // Verify all expected chunk indices are present (0 to totalChunks-1)
-  const expectedChunks = Array.from({ length: meta.totalChunks }, (_, i) => i);
-  const missingChunks = expectedChunks.filter((i) => !chunks.includes(i));
-  if (missingChunks.length > 0) {
-    return `missing chunk indices: ${missingChunks.join(", ")}`;
-  }
+  // Use semaphore to prevent concurrent assembly of the same upload
+  const semaphore = getSemaphore(`assemble:${meta.uploadId}`, 1);
+  await semaphore.acquire();
 
-  const fullPath = join(meta.path, meta.filename);
-  const pathResult = await validatePath(fullPath);
-  if (!pathResult.ok) return pathResult.error;
+  try {
+    const chunks = await getUploadedChunks(meta.uploadId);
+    if (chunks.length !== meta.totalChunks) return "missing chunks";
+
+    // Verify all expected chunk indices are present (0 to totalChunks-1)
+    const expectedChunks = Array.from({ length: meta.totalChunks }, (_, i) => i);
+    const missingChunks = expectedChunks.filter((i) => !chunks.includes(i));
+    if (missingChunks.length > 0) {
+      return `missing chunk indices: ${missingChunks.join(", ")}`;
+    }
 
-  await mkdir(dirname(pathResult.realPath), { recursive: true });
+    const fullPath = join(meta.path, meta.filename);
+    const pathResult = await validatePath(fullPath);
+    if (!pathResult.ok) return pathResult.error;
 
-  const hasher = new Bun.CryptoHasher("sha256");
-  const file = Bun.file(pathResult.realPath);
-  const writer = file.writer();
+    await mkdir(dirname(pathResult.realPath), { recursive: true });
 
-  try {
-    for (let i = 0; i < meta.totalChunks; i++) {
-      // Stream each chunk instead of loading entirely into memory
-      const chunkFile = Bun.file(chunkPath(meta.uploadId, i));
-      for await (const data of chunkFile.stream()) {
-        hasher.update(data);
-        writer.write(data);
+    const hasher = new Bun.CryptoHasher("sha256");
+    const file = Bun.file(pathResult.realPath);
+    const writer = file.writer();
+
+    try {
+      for (let i = 0; i < meta.totalChunks; i++) {
+        // Stream each chunk instead of loading entirely into memory
+        const chunkFile = Bun.file(chunkPath(meta.uploadId, i));
+        for await (const data of chunkFile.stream()) {
+          hasher.update(data);
+          writer.write(data);
+        }
       }
+      await writer.end();
+    } catch (e) {
+      writer.end();
+      await rm(pathResult.realPath).catch(() => {});
+      throw e;
     }
-    await writer.end();
-  } catch (e) {
-    writer.end();
-    await rm(pathResult.realPath).catch(() => {});
-    throw e;
-  }
 
-  const finalChecksum = `sha256:${hasher.digest("hex")}`;
-  if (finalChecksum !== meta.checksum) {
-    await rm(pathResult.realPath).catch(() => {});
-    return `checksum mismatch: expected ${meta.checksum}, got ${finalChecksum}`;
-  }
+    const finalChecksum = `sha256:${hasher.digest("hex")}`;
+    if (finalChecksum !== meta.checksum) {
+      await rm(pathResult.realPath).catch(() => {});
+      return `checksum mismatch: expected ${meta.checksum}, got ${finalChecksum}`;
+    }
 
-  const ownershipError = await applyOwnership(pathResult.realPath, meta.ownership);
-  if (ownershipError) {
-    await rm(pathResult.realPath).catch(() => {});
-    return ownershipError;
-  }
+    const ownershipError = await applyOwnership(pathResult.realPath, meta.ownership);
+    if (ownershipError) {
+      await rm(pathResult.realPath).catch(() => {});
+      return ownershipError;
+    }
 
-  await cleanupUpload(meta.uploadId);
-  return null;
+    await cleanupUpload(meta.uploadId);
+    return null;
+  } finally {
+    semaphore.release();
+  }
 };
 
 // POST /upload/start