@holo-js/media 0.3.27 → 0.3.28

package/dist/index.d.ts

@@ -216,12 +216,10 @@ type MediaSourceInput = string | BinaryContent | {
 } | {
     readonly url: string;
     readonly fileName?: string;
-    readonly mimeType?: string;
     readonly name?: string;
 } | {
     readonly contents: BinaryContent;
     readonly fileName?: string;
-    readonly mimeType?: string;
     readonly name?: string;
 };
 type MediaAddErrorCode = 'max_size_exceeded' | 'invalid_mime_type' | 'invalid_extension';
@@ -367,14 +365,5 @@ declare function dispatchQueuedMediaConversions(payload: MediaGenerateConversion
 
 declare function createDefaultMediaConversionExecutor(): MediaConversionExecutor;
 declare const defaultMediaConversionExecutor: MediaConversionExecutor;
-interface MediaImageInspection {
-    readonly mimeType: 'image/gif' | 'image/jpeg' | 'image/png' | 'image/webp';
-    readonly width: number;
-    readonly height: number;
-    readonly pages: number;
-}
-declare const mediaRuntimeInternals: Readonly<{
-    inspectImage(contents: Uint8Array, maximumPixels?: number): Promise<MediaImageInspection>;
-}>;
 
-export { type CollectionNamesOf, type ConversionNamesOf, MEDIA_GENERATE_CONVERSIONS_JOB, Media, type MediaAddResult, MediaAdder, type MediaCollectionBuilder, type MediaCollectionDefinition, type MediaConversionBuilder, type MediaConversionDefinition, type MediaConversionExecutor, type MediaConversionExecutorInput, type MediaConversionExecutorResult, type MediaConversionExecutorSource, type MediaConversionFit, type MediaConversionFormat, type MediaConversionPathInput, type MediaDefinitionFactory, type MediaDefinitionHelpers, type MediaDefinitionInput, type MediaEnabledEntity, type MediaEnabledModel, type MediaGenerateConversionsPayload, type MediaGenerateConversionsResult, MediaItem, type MediaOriginalPathInput, type MediaPathGenerator, type MediaSourceInput, type NormalizedMediaCollectionDefinition, type NormalizedMediaConversionDefinition, type NormalizedMediaDefinition, type StoredMediaConversion, collection, conversion, createDefaultMediaConversionExecutor, defaultMediaConversionExecutor, defineMediaModel, dispatchQueuedMediaConversions, ensureMediaQueueJobRegistered, getMediaConversionExecutor, getMediaDefinition, getMediaDefinitionForMorphClass, getMediaPathGenerator, mediaRuntimeInternals, normalizeCollectionDefinitions, normalizeConversionDefinitions, normalizeMediaDefinition, registerMediaDefinition, requireMediaDefinition, requireMediaDefinitionForMorphClass, resetMediaPathGenerator, resetMediaRuntime, resolveMediaCollection, resolveMediaConversion, resolveMediaDefinition, runMediaGenerateConversionsJob, setMediaConversionExecutor, setMediaPathGenerator };
+export { type CollectionNamesOf, type ConversionNamesOf, MEDIA_GENERATE_CONVERSIONS_JOB, Media, type MediaAddResult, MediaAdder, type MediaCollectionBuilder, type MediaCollectionDefinition, type MediaConversionBuilder, type MediaConversionDefinition, type MediaConversionExecutor, type MediaConversionExecutorInput, type MediaConversionExecutorResult, type MediaConversionExecutorSource, type MediaConversionFit, type MediaConversionFormat, type MediaConversionPathInput, type MediaDefinitionFactory, type MediaDefinitionHelpers, type MediaDefinitionInput, type MediaEnabledEntity, type MediaEnabledModel, type MediaGenerateConversionsPayload, type MediaGenerateConversionsResult, MediaItem, type MediaOriginalPathInput, type MediaPathGenerator, type MediaSourceInput, type NormalizedMediaCollectionDefinition, type NormalizedMediaConversionDefinition, type NormalizedMediaDefinition, type StoredMediaConversion, collection, conversion, createDefaultMediaConversionExecutor, defaultMediaConversionExecutor, defineMediaModel, dispatchQueuedMediaConversions, ensureMediaQueueJobRegistered, getMediaConversionExecutor, getMediaDefinition, getMediaDefinitionForMorphClass, getMediaPathGenerator, normalizeCollectionDefinitions, normalizeConversionDefinitions, normalizeMediaDefinition, registerMediaDefinition, requireMediaDefinition, requireMediaDefinitionForMorphClass, resetMediaPathGenerator, resetMediaRuntime, resolveMediaCollection, resolveMediaConversion, resolveMediaDefinition, runMediaGenerateConversionsJob, setMediaConversionExecutor, setMediaPathGenerator };

package/dist/index.mjs

@@ -9,33 +9,11 @@ import { Entity as Entity2 } from "@holo-js/db";
 // src/registry.ts
 import { Entity } from "@holo-js/db";
 
+// src/runtime/image.ts
+import { mimeTypeFromFileName } from "@holo-js/kernel/file-content";
+
 // src/runtime/binary.ts
 import { basename, extname } from "path";
-var MIME_TYPES = Object.freeze({
-  avif: "image/avif",
-  gif: "image/gif",
-  jpeg: "image/jpeg",
-  jpg: "image/jpeg",
-  json: "application/json",
-  pdf: "application/pdf",
-  png: "image/png",
-  svg: "image/svg+xml",
-  txt: "text/plain",
-  webp: "image/webp"
-});
-var IMAGE_EXTENSIONS = /* @__PURE__ */ new Set([
-  "avif",
-  "gif",
-  "heic",
-  "heif",
-  "jpeg",
-  "jpg",
-  "png",
-  "svg",
-  "tif",
-  "tiff",
-  "webp"
-]);
 var SHARP_OUTPUT_FORMATS = /* @__PURE__ */ new Set([
   "avif",
   "jpeg",
@@ -47,13 +25,6 @@ function sanitizeFileName(value) {
   const sanitized = value.trim().replace(/\\/g, "/").split("/").filter(Boolean).join("-");
   return sanitized || "media.bin";
 }
-function inferMimeType(fileName, explicit) {
-  if (explicit?.trim()) {
-    return explicit.trim();
-  }
-  const extension = extname(fileName).replace(/^\./, "").toLowerCase();
-  return MIME_TYPES[extension];
-}
 function getExtension(fileName) {
   const extension = extname(fileName).replace(/^\./, "").toLowerCase();
   return extension || void 0;
@@ -86,12 +57,6 @@ function getContentSize(value) {
   }
   return value.size;
 }
-function isImageSource(mimeType, extension) {
-  if (mimeType?.trim().toLowerCase().startsWith("image/")) {
-    return true;
-  }
-  return extension ? IMAGE_EXTENSIONS.has(extension.trim().toLowerCase()) : false;
-}
 function normalizeOutputFormat(extension, conversionFormat) {
   if (conversionFormat) {
     return conversionFormat;
@@ -131,7 +96,7 @@ function resolveFit(mode) {
 function createDefaultMediaConversionExecutor() {
   return {
     async generate({ source, conversion: conversion2 }) {
-      if (!isImageSource(source.mimeType, source.extension)) {
+      if (!source.mimeType?.toLowerCase().startsWith("image/")) {
         return null;
       }
       const outputFormat = normalizeOutputFormat(source.extension, conversion2.format);
@@ -181,7 +146,7 @@ function createDefaultMediaConversionExecutor() {
         return {
           contents,
           fileName,
-          mimeType: inferMimeType(fileName)
+          mimeType: mimeTypeFromFileName(fileName) ?? void 0
         };
       } catch (error) {
         throw new Error(
@@ -192,30 +157,6 @@ function createDefaultMediaConversionExecutor() {
   };
 }
 var defaultMediaConversionExecutor = createDefaultMediaConversionExecutor();
-var imageMimeTypes = {
-  gif: "image/gif",
-  jpeg: "image/jpeg",
-  png: "image/png",
-  webp: "image/webp"
-};
-var mediaRuntimeInternals = Object.freeze({
-  async inspectImage(contents, maximumPixels = 4e7) {
-    if (!Number.isSafeInteger(maximumPixels) || maximumPixels < 1) throw new TypeError("[Holo Media] Image pixel limits require a positive integer.");
-    const factory = await loadSharp();
-    try {
-      const image = factory(Buffer.from(contents), { animated: true, failOn: "warning", limitInputPixels: maximumPixels });
-      const metadata = await image.metadata();
-      const { width, height } = metadata;
-      const format = metadata.format;
-      if (format !== "gif" && format !== "jpeg" && format !== "png" && format !== "webp") throw new Error("[Holo Media] Unsupported raster image format.");
-      if (!width || !height || !Number.isSafeInteger(width) || !Number.isSafeInteger(height) || width * height > maximumPixels) throw new Error("[Holo Media] Image exceeds the pixel limit.");
-      await image.stats();
-      return { mimeType: imageMimeTypes[format], width, height: metadata.pageHeight ?? height, pages: metadata.pages ?? 1 };
-    } catch (error) {
-      throw new Error("[Holo Media] Image could not be decoded.", { cause: error });
-    }
-  }
-});
 
 // src/registry.ts
 var mediaRegistrySymbol = /* @__PURE__ */ Symbol.for("@holo-js/media.registry");
@@ -405,6 +346,7 @@ import { BlockList, isIP } from "net";
 import { tmpdir } from "os";
 import { basename as basename2, resolve, sep } from "path";
 import { Readable } from "stream";
+import { inspectFileContent } from "@holo-js/kernel/file-content";
 import { Storage as Storage4 } from "@holo-js/storage/runtime";
 
 // src/queue.ts
@@ -417,6 +359,7 @@ import {
 import { connectionAsyncContext } from "@holo-js/db";
 
 // src/model/conversions.ts
+import { mimeTypeFromFileName as mimeTypeFromFileName2 } from "@holo-js/kernel/file-content";
 import { Storage as Storage2 } from "@holo-js/storage/runtime";
 
 // src/model/mutation.ts
@@ -620,7 +563,7 @@ async function generateStoredConversions(options) {
       generatedFileName
     });
     const targetDisk = generated.disk ?? options.conversionsDisk;
-    const conversionMimeType = inferMimeType(generatedFileName, generated.mimeType);
+    const conversionMimeType = generated.mimeType?.trim() || mimeTypeFromFileName2(generatedFileName) || void 0;
     const conversionContents = await toBinaryContent(generated.contents);
     await options.mutation.put(targetDisk, conversionPath, conversionContents);
     generatedConversions[conversion2.name] = Object.freeze({
@@ -1044,6 +987,11 @@ async function readRemoteMediaContents(response, fileName, maxSize, collectionNa
   return contents;
 }
 async function resolveMediaSource(input, overrideFileName, overrideName, options) {
+  const source = await readMediaSource(input, overrideFileName, overrideName, options);
+  const { mimeType } = await inspectFileContent(source.contents, source.fileName);
+  return mimeType ? { ...source, mimeType } : source;
+}
+async function readMediaSource(input, overrideFileName, overrideName, options) {
   if (typeof input === "string" && /^https?:\/\//i.test(input)) {
     return resolveRemoteMediaSource(
       { url: input },
@@ -1069,7 +1017,6 @@ async function resolveMediaSource(input, overrideFileName, overrideName, options
     return {
       contents: contents2,
       fileName: fileName2,
-      mimeType: inferMimeType(fileName2),
       extension: getExtension(fileName2),
       size: contents2.byteLength,
       name: getDisplayName(fileName2, overrideName)
@@ -1081,7 +1028,6 @@ async function resolveMediaSource(input, overrideFileName, overrideName, options
     return {
       contents: contents2,
       fileName: fileName2,
-      mimeType: inferMimeType(fileName2, input.mimeType),
       extension: getExtension(fileName2),
       size: getContentSize(contents2),
       name: getDisplayName(fileName2, overrideName ?? input.name)
@@ -1092,7 +1038,6 @@ async function resolveMediaSource(input, overrideFileName, overrideName, options
   return {
     contents,
     fileName,
-    mimeType: inferMimeType(fileName, getBinaryMimeType(input)),
     extension: getExtension(fileName),
     size: getContentSize(contents),
     name: getDisplayName(fileName, overrideName)
@@ -1102,10 +1047,6 @@ function getBinaryFileName(input) {
   const name = input.name;
   return typeof name === "string" && name.trim() ? name : "media.bin";
 }
-function getBinaryMimeType(input) {
-  const type = input.type;
-  return typeof type === "string" && type.trim() ? type : void 0;
-}
 function isPathInput(input) {
   return typeof input === "object" && input !== null && "path" in input;
 }
@@ -1126,7 +1067,6 @@ async function resolveRemoteMediaSource(input, overrideFileName, overrideName, m
   const fileName = sanitizeFileName(
     overrideFileName ?? input.fileName ?? parseRemoteFileName(remoteUrl.toString())
   );
-  const responseMimeType = response.headers.get("content-type")?.split(";")[0];
   const contentLengthHeader = response.headers.get("content-length");
   const contentLength = contentLengthHeader?.trim() ? Number(contentLengthHeader) : Number.NaN;
   const resolvedMaxSize = typeof maxSize === "number" ? maxSize : DEFAULT_REMOTE_MEDIA_MAX_SIZE;
@@ -1142,7 +1082,6 @@ async function resolveRemoteMediaSource(input, overrideFileName, overrideName, m
   return {
     contents,
     fileName,
-    mimeType: inferMimeType(fileName, input.mimeType ?? responseMimeType ?? void 0),
     extension: getExtension(fileName),
     size: contents.byteLength,
     name: getDisplayName(fileName, overrideName ?? input.name)
@@ -1800,7 +1739,6 @@ export {
   getMediaDefinition,
   getMediaDefinitionForMorphClass,
   getMediaPathGenerator,
-  mediaRuntimeInternals,
   normalizeCollectionDefinitions,
   normalizeConversionDefinitions,
   normalizeMediaConfig,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@holo-js/media",
-  "version": "0.3.27",
+  "version": "0.3.28",
   "description": "Holo-JS Framework - media collections and conversions for Holo-JS models",
   "type": "module",
   "license": "MIT",
@@ -28,14 +28,16 @@
     "test": "vitest --run"
   },
   "dependencies": {
-    "@holo-js/config": "^0.3.27",
-    "@holo-js/db": "^0.3.27",
-    "@holo-js/queue": "^0.3.27",
-    "@holo-js/storage": "^0.3.27",
+    "@holo-js/config": "^0.3.28",
+    "@holo-js/db": "^0.3.28",
+    "@holo-js/kernel": "^0.3.28",
+    "@holo-js/queue": "^0.3.28",
+    "@holo-js/storage": "^0.3.28",
+    "file-type": "^22.2.0",
     "sharp": "^0.35.4"
   },
   "devDependencies": {
-    "@holo-js/db-sqlite": "^0.3.27",
+    "@holo-js/db-sqlite": "^0.3.28",
     "tsup": "^8.3.5",
     "typescript": "^5.7.2",
     "vitest": "^4.1.5"