@everystack/server 0.3.1 → 0.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@everystack/server",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "Server runtime primitives for Lambda — event adapters, routing, SSR, image processing",
   "license": "AGPL-3.0-only",
   "author": "Scalable Technology, Inc. <licensing@scalable.technology>",
@@ -74,6 +74,11 @@
       "default": "./src/media.ts"
     }
   },
+  "scripts": {
+    "test": "jest",
+    "build": "tsc --build",
+    "lint": "tsc --noEmit"
+  },
   "peerDependencies": {
     "esbuild": ">=0.20.0",
     "@aws-sdk/client-cloudfront-keyvaluestore": ">=3.1053.0",
@@ -129,6 +134,8 @@
     "@aws-sdk/client-s3": "3.1053.0",
     "@aws-sdk/lib-storage": "3.1053.0",
     "@aws-sdk/signature-v4a": "3.1063.0",
+    "@everystack/auth": "workspace:*",
+    "@everystack/cli": "workspace:*",
     "@types/aws-lambda": "8.10.161",
     "@types/jest": "29.5.14",
     "@types/node": "22.19.18",
@@ -138,13 +145,6 @@
     "postgres": "3.4.9",
     "sst": "4.13.1",
     "ts-jest": "29.4.9",
-    "typescript": "5.9.3",
-    "@everystack/auth": "0.3.0",
-    "@everystack/cli": "0.3.3"
-  },
-  "scripts": {
-    "test": "jest",
-    "build": "tsc --build",
-    "lint": "tsc --noEmit"
+    "typescript": "5.9.3"
   }
-}
+}

package/src/image.ts

@@ -155,6 +155,63 @@ export function parseParams(query: Record<string, string | undefined>): Transfor
   return params;
 }
 
+/**
+ * ISOBMFF `ftyp` brands that mean "HEVC-coded HEIF" — i.e. a HEIC still image
+ * (iPhones shoot these by default). Sharp reports all of these as format
+ * `'heif'`, and our HEIC rescue path (heic-decode) can decode them.
+ */
+const HEIC_BRANDS = new Set([
+  'heic', 'heix', 'heim', 'heis', 'hevc', 'hevx', 'hevm', 'hevs', 'mif1', 'msf1',
+]);
+const AVIF_BRANDS = new Set(['avif', 'avis']);
+
+/**
+ * Identify an image format from its magic bytes, independently of Sharp.
+ *
+ * Sharp builds without libheif cannot even *identify* a HEIF container —
+ * `sharp(buf).metadata()` throws, format detection yields `undefined`, and a
+ * real HEIC photo is misrouted down the non-image passthrough path (413 when
+ * over the passthrough cap, or raw `image/heic` bytes that only Safari renders).
+ * Trusting the bytes instead of Sharp makes HEIC detection build-independent and
+ * lets the existing `heif` rescue path fire.
+ *
+ * Returns a Sharp-compatible format string (`jpeg`, `png`, `gif`, `webp`,
+ * `heif`, `avif`) or `undefined` when the bytes aren't a recognized image.
+ */
+export function sniffImageFormat(data: Buffer): string | undefined {
+  if (data.length < 3) return undefined;
+
+  // JPEG: FF D8 FF
+  if (data[0] === 0xff && data[1] === 0xd8 && data[2] === 0xff) return 'jpeg';
+  // PNG: 89 50 4E 47 0D 0A 1A 0A
+  if (
+    data[0] === 0x89 && data[1] === 0x50 && data[2] === 0x4e && data[3] === 0x47 &&
+    data[4] === 0x0d && data[5] === 0x0a && data[6] === 0x1a && data[7] === 0x0a
+  ) return 'png';
+  // GIF: "GIF87a" / "GIF89a"
+  if (data.toString('ascii', 0, 3) === 'GIF') return 'gif';
+  // WebP: "RIFF"...."WEBP"
+  if (data.toString('ascii', 0, 4) === 'RIFF' && data.toString('ascii', 8, 12) === 'WEBP') return 'webp';
+  // TIFF: "II*\0" / "MM\0*"
+  if (
+    (data[0] === 0x49 && data[1] === 0x49 && data[2] === 0x2a && data[3] === 0x00) ||
+    (data[0] === 0x4d && data[1] === 0x4d && data[2] === 0x00 && data[3] === 0x2a)
+  ) return 'tiff';
+
+  // ISOBMFF (HEIC/HEIF/AVIF): [4-byte size]["ftyp"][major brand][minor][compatible…]
+  if (data.toString('ascii', 4, 8) === 'ftyp') {
+    const boxSize = Math.min(data.readUInt32BE(0) || data.length, data.length);
+    const brands: string[] = [data.toString('ascii', 8, 12)];
+    for (let off = 16; off + 4 <= boxSize; off += 4) {
+      brands.push(data.toString('ascii', off, off + 4));
+    }
+    if (brands.some((b) => HEIC_BRANDS.has(b))) return 'heif';
+    if (brands.some((b) => AVIF_BRANDS.has(b))) return 'avif';
+  }
+
+  return undefined;
+}
+
 function isNotFound(error: any): boolean {
   return (
     error.name === 'NotFound' ||
@@ -367,7 +424,15 @@ export function createImageHandler(
         const meta = await sharp(originalData).metadata();
         detectedFormat = meta.format; // jpeg, png, webp, gif, tiff, heif, etc.
       } catch {
-        // Sharp can't parse it — not an image
+        // Sharp can't parse it — not an image, OR a HEIF container this Sharp
+        // build has no libheif to identify. Fall through to the magic-byte sniff.
+      }
+
+      // A Sharp build without libheif throws on HEIF and leaves detectedFormat
+      // undefined, misrouting real HEIC photos to the non-image passthrough
+      // below. Sniff the bytes so `heif` is detected and the rescue path fires.
+      if (!detectedFormat) {
+        detectedFormat = sniffImageFormat(originalData);
       }
 
       if (!detectedFormat) {