@devultur/self-host 1.3.2 → 1.4.0

package/dist/index.d.ts

@@ -681,6 +681,9 @@ declare const ObjectMeta: {
     readonly SHA256_VERIFIED: "sha256Verified";
     /** Epoch ms. From then on the gate responds 410 (and an external sweeper may delete it). */
     readonly EXPIRES_AT: "expiresAt";
+    /** An image's intrinsic size (px), read from its header bytes on a single PUT. */
+    readonly IMAGE_WIDTH: "imageWidth";
+    readonly IMAGE_HEIGHT: "imageHeight";
 };
 
 /** The upload an upload URL (`/v1/upload/<key>?u=<id>`) points to, as plugins see it. */

package/dist/index.js

@@ -870,6 +870,95 @@ import {
   SHA256_VERIFIED_HEADER
 } from "@devultur/core";
 
+// src/routes/upload-image-size.ts
+import { IMAGE_HEIGHT_HEADER, IMAGE_WIDTH_HEADER } from "@devultur/core";
+
+// src/image/dimensions.ts
+function readImageDimensions(bytes, contentType) {
+  if (contentType === "image/jpeg") return readJpeg(bytes);
+  if (contentType === "image/png") return readPng(bytes);
+  if (contentType === "image/webp") return readWebp(bytes);
+  if (contentType === "image/avif") return readAvif(bytes);
+  if (contentType === "image/gif") return readGif(bytes);
+  return null;
+}
+var uint16BE = (bytes, offset) => bytes[offset] << 8 | bytes[offset + 1];
+var uint32BE = (bytes, offset) => (bytes[offset] << 24 | bytes[offset + 1] << 16 | bytes[offset + 2] << 8 | bytes[offset + 3]) >>> 0;
+var uint16LE = (bytes, offset) => bytes[offset] | bytes[offset + 1] << 8;
+var uint24LE = (bytes, offset) => bytes[offset] | bytes[offset + 1] << 8 | bytes[offset + 2] << 16;
+var isStartOfFrame = (marker) => marker >= 192 && marker <= 207 && marker !== 196 && marker !== 200 && marker !== 204;
+function readJpeg(bytes) {
+  if (bytes[0] !== 255 || bytes[1] !== 216) return null;
+  let offset = 2;
+  while (offset + 9 < bytes.length) {
+    if (bytes[offset] !== 255) return null;
+    const marker = bytes[offset + 1];
+    if (isStartOfFrame(marker)) {
+      return { height: uint16BE(bytes, offset + 5), width: uint16BE(bytes, offset + 7) };
+    }
+    offset += 2 + uint16BE(bytes, offset + 2);
+  }
+  return null;
+}
+function readPng(bytes) {
+  const isPng2 = bytes[0] === 137 && bytes[1] === 80 && bytes[2] === 78 && bytes[3] === 71;
+  if (!isPng2 || bytes.length < 24) return null;
+  return { width: uint32BE(bytes, 16), height: uint32BE(bytes, 20) };
+}
+function readWebp(bytes) {
+  if (bytes.length < 30) return null;
+  const chunk = String.fromCharCode(bytes[12], bytes[13], bytes[14], bytes[15]);
+  if (chunk === "VP8X") return { width: uint24LE(bytes, 24) + 1, height: uint24LE(bytes, 27) + 1 };
+  if (chunk === "VP8 ") return { width: uint16LE(bytes, 26) & 16383, height: uint16LE(bytes, 28) & 16383 };
+  if (chunk === "VP8L") {
+    const bits = bytes[21] | bytes[22] << 8 | bytes[23] << 16 | bytes[24] << 24;
+    return { width: (bits & 16383) + 1, height: (bits >> 14 & 16383) + 1 };
+  }
+  return null;
+}
+function readAvif(bytes) {
+  const limit = Math.min(bytes.length - 20, 64 * 1024);
+  for (let offset = 4; offset < limit; offset += 1) {
+    const isIspe = bytes[offset] === 105 && bytes[offset + 1] === 115 && bytes[offset + 2] === 112 && bytes[offset + 3] === 101;
+    if (isIspe) return { width: uint32BE(bytes, offset + 8), height: uint32BE(bytes, offset + 12) };
+  }
+  return null;
+}
+function readGif(bytes) {
+  if (bytes.length < 10) return null;
+  const signature = String.fromCharCode(...bytes.subarray(0, 6));
+  if (signature !== "GIF87a" && signature !== "GIF89a") return null;
+  return { width: uint16LE(bytes, 6), height: uint16LE(bytes, 8) };
+}
+var fourCC = (bytes, offset) => String.fromCharCode(bytes[offset], bytes[offset + 1], bytes[offset + 2], bytes[offset + 3]);
+function isAnimatedImage(bytes, contentType) {
+  if (contentType === "image/gif") return true;
+  if (contentType === "image/webp")
+    return bytes.length > 20 && fourCC(bytes, 12) === "VP8X" && (bytes[20] & 2) !== 0;
+  if (contentType === "image/png") return hasPngAnimationControl(bytes);
+  if (contentType === "image/avif") return hasAvifSequenceBrand(bytes);
+  return false;
+}
+function hasPngAnimationControl(bytes) {
+  let offset = 8;
+  while (offset + 8 <= bytes.length) {
+    const chunk = fourCC(bytes, offset + 4);
+    if (chunk === "acTL") return true;
+    if (chunk === "IDAT") return false;
+    offset += 12 + uint32BE(bytes, offset);
+  }
+  return false;
+}
+function hasAvifSequenceBrand(bytes) {
+  if (bytes.length < 16 || fourCC(bytes, 4) !== "ftyp") return false;
+  const boxEnd = Math.min(uint32BE(bytes, 0), bytes.length);
+  for (let offset = 8; offset + 4 <= boxEnd; offset += 4) {
+    if (offset === 12) continue;
+    if (fourCC(bytes, offset) === "avis") return true;
+  }
+  return false;
+}
+
 // src/routes/upload-integrity.ts
 import { normalizeSha256, SHA256_HEADER, sha256Hex } from "@devultur/core";
 var ObjectMeta = {
@@ -877,12 +966,17 @@ var ObjectMeta = {
   /** `"true"` = the worker hashed the bytes; `"false"` = sha256 declared by the client (multipart). */
   SHA256_VERIFIED: "sha256Verified",
   /** Epoch ms. From then on the gate responds 410 (and an external sweeper may delete it). */
-  EXPIRES_AT: "expiresAt"
+  EXPIRES_AT: "expiresAt",
+  /** An image's intrinsic size (px), read from its header bytes on a single PUT. */
+  IMAGE_WIDTH: "imageWidth",
+  IMAGE_HEIGHT: "imageHeight"
 };
 var WORKER_METADATA_KEYS = /* @__PURE__ */ new Set([
   "security",
   "enc",
   ObjectMeta.EXPIRES_AT.toLowerCase(),
+  ObjectMeta.IMAGE_WIDTH.toLowerCase(),
+  ObjectMeta.IMAGE_HEIGHT.toLowerCase(),
   "derivedfrom",
   LOCK_METADATA_KEY
 ]);
@@ -959,6 +1053,25 @@ async function discardStaleVariants(bucket, pending) {
   await deletePrefix(bucket, variantPrefix(pending.storageKey));
 }
 
+// src/routes/upload-image-size.ts
+var MAX_IMAGE_SIDE = 1e5;
+function isImageSide(value) {
+  return Number.isInteger(value) && value > 0 && value <= MAX_IMAGE_SIDE;
+}
+function imageSizeMetadata(contentType, body) {
+  if (!contentType.startsWith("image/")) return {};
+  const dimensions = readImageDimensions(new Uint8Array(body), contentType);
+  if (!dimensions || !isImageSide(dimensions.width) || !isImageSide(dimensions.height)) return {};
+  return { [ObjectMeta.IMAGE_WIDTH]: String(dimensions.width), [ObjectMeta.IMAGE_HEIGHT]: String(dimensions.height) };
+}
+function applyImageSizeHeaders(headers, customMetadata) {
+  const width = customMetadata?.[ObjectMeta.IMAGE_WIDTH];
+  const height = customMetadata?.[ObjectMeta.IMAGE_HEIGHT];
+  if (!width || !height) return;
+  headers.set(IMAGE_WIDTH_HEADER, width);
+  headers.set(IMAGE_HEIGHT_HEADER, height);
+}
+
 // src/routes/object-response.ts
 function objectExpiresAt(customMetadata) {
   const expiresAt = Number(customMetadata?.[ObjectMeta.EXPIRES_AT]);
@@ -1023,6 +1136,7 @@ async function streamObject(input) {
   headers.set("ETag", object.httpEtag);
   headers.set("Accept-Ranges", "bytes");
   applyIntegrityHeaders(headers, object.customMetadata);
+  applyImageSizeHeaders(headers, object.customMetadata);
   const enc = decodeEncryptionMeta2(object.customMetadata?.enc);
   const loaded = enc ? await loadStorageKey(input.keysBucket, input.fullKey, enc.keyId) : null;
   if (enc && !loaded) {
@@ -2565,85 +2679,6 @@ function hasTransformQuery(url) {
   return TRANSFORM_QUERY_PARAMS.some((param) => url.searchParams.has(param));
 }
 
-// src/image/dimensions.ts
-function readImageDimensions(bytes, contentType) {
-  if (contentType === "image/jpeg") return readJpeg(bytes);
-  if (contentType === "image/png") return readPng(bytes);
-  if (contentType === "image/webp") return readWebp(bytes);
-  if (contentType === "image/avif") return readAvif(bytes);
-  return null;
-}
-var uint16BE = (bytes, offset) => bytes[offset] << 8 | bytes[offset + 1];
-var uint32BE = (bytes, offset) => (bytes[offset] << 24 | bytes[offset + 1] << 16 | bytes[offset + 2] << 8 | bytes[offset + 3]) >>> 0;
-var uint16LE = (bytes, offset) => bytes[offset] | bytes[offset + 1] << 8;
-var uint24LE = (bytes, offset) => bytes[offset] | bytes[offset + 1] << 8 | bytes[offset + 2] << 16;
-var isStartOfFrame = (marker) => marker >= 192 && marker <= 207 && marker !== 196 && marker !== 200 && marker !== 204;
-function readJpeg(bytes) {
-  if (bytes[0] !== 255 || bytes[1] !== 216) return null;
-  let offset = 2;
-  while (offset + 9 < bytes.length) {
-    if (bytes[offset] !== 255) return null;
-    const marker = bytes[offset + 1];
-    if (isStartOfFrame(marker)) {
-      return { height: uint16BE(bytes, offset + 5), width: uint16BE(bytes, offset + 7) };
-    }
-    offset += 2 + uint16BE(bytes, offset + 2);
-  }
-  return null;
-}
-function readPng(bytes) {
-  const isPng2 = bytes[0] === 137 && bytes[1] === 80 && bytes[2] === 78 && bytes[3] === 71;
-  if (!isPng2 || bytes.length < 24) return null;
-  return { width: uint32BE(bytes, 16), height: uint32BE(bytes, 20) };
-}
-function readWebp(bytes) {
-  if (bytes.length < 30) return null;
-  const chunk = String.fromCharCode(bytes[12], bytes[13], bytes[14], bytes[15]);
-  if (chunk === "VP8X") return { width: uint24LE(bytes, 24) + 1, height: uint24LE(bytes, 27) + 1 };
-  if (chunk === "VP8 ") return { width: uint16LE(bytes, 26) & 16383, height: uint16LE(bytes, 28) & 16383 };
-  if (chunk === "VP8L") {
-    const bits = bytes[21] | bytes[22] << 8 | bytes[23] << 16 | bytes[24] << 24;
-    return { width: (bits & 16383) + 1, height: (bits >> 14 & 16383) + 1 };
-  }
-  return null;
-}
-function readAvif(bytes) {
-  const limit = Math.min(bytes.length - 20, 64 * 1024);
-  for (let offset = 4; offset < limit; offset += 1) {
-    const isIspe = bytes[offset] === 105 && bytes[offset + 1] === 115 && bytes[offset + 2] === 112 && bytes[offset + 3] === 101;
-    if (isIspe) return { width: uint32BE(bytes, offset + 8), height: uint32BE(bytes, offset + 12) };
-  }
-  return null;
-}
-var fourCC = (bytes, offset) => String.fromCharCode(bytes[offset], bytes[offset + 1], bytes[offset + 2], bytes[offset + 3]);
-function isAnimatedImage(bytes, contentType) {
-  if (contentType === "image/gif") return true;
-  if (contentType === "image/webp")
-    return bytes.length > 20 && fourCC(bytes, 12) === "VP8X" && (bytes[20] & 2) !== 0;
-  if (contentType === "image/png") return hasPngAnimationControl(bytes);
-  if (contentType === "image/avif") return hasAvifSequenceBrand(bytes);
-  return false;
-}
-function hasPngAnimationControl(bytes) {
-  let offset = 8;
-  while (offset + 8 <= bytes.length) {
-    const chunk = fourCC(bytes, offset + 4);
-    if (chunk === "acTL") return true;
-    if (chunk === "IDAT") return false;
-    offset += 12 + uint32BE(bytes, offset);
-  }
-  return false;
-}
-function hasAvifSequenceBrand(bytes) {
-  if (bytes.length < 16 || fourCC(bytes, 4) !== "ftyp") return false;
-  const boxEnd = Math.min(uint32BE(bytes, 0), bytes.length);
-  for (let offset = 8; offset + 4 <= boxEnd; offset += 4) {
-    if (offset === 12) continue;
-    if (fourCC(bytes, offset) === "avis") return true;
-  }
-  return false;
-}
-
 // src/image/storage.ts
 import { decodeEncryptionMeta as decodeEncryptionMeta6, decryptChunk as decryptChunk2 } from "@devultur/core";
 var HEADER_PROBE_BYTES = 256 * 1024;
@@ -5278,7 +5313,8 @@ upload.put("/:key{.+}", async (context) => {
     ...allowedUploadMetadata(pending?.uploadMetadata ?? getRequestState(context).config?.uploadMetadata),
     // A transcode output (no pending) expires with its video's raw.
     ...integrityMetadata(digest.sha256, true, pending?.expiresAt ?? await inheritedExpiresAt(context, key)),
-    ...lockMetadata(uploadLockOf(context, key, pending))
+    ...lockMetadata(uploadLockOf(context, key, pending)),
+    ...imageSizeMetadata(contentType, body)
   };
   if (resourceSecurity) customMetadata.security = JSON.stringify(resourceSecurity);
   const write = await prepareUploadWrite(context, pending?.key ?? key, pending, finalStorageKey);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devultur/self-host",
-  "version": "1.3.2",
+  "version": "1.4.0",
   "description": "Self-hosted media Worker for Cloudflare: R2 uploads, edge-cached delivery, image transforms, HLS transcode and captions",
   "keywords": [
     "cloudflare-workers",
@@ -46,7 +46,7 @@
     "@jsquash/resize": "2.1.1",
     "@jsquash/webp": "1.5.0",
     "hono": "^4.7.0",
-    "@devultur/core": "1.3.2"
+    "@devultur/core": "1.4.0"
   },
   "devDependencies": {
     "@cf-wasm/photon": "0.4.0",