bare-media 1.6.0 → 1.7.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-media",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "main": "index.js",
   "type": "module",
   "scripts": {
@@ -26,6 +26,7 @@
     "bare-tiff": "^1.0.1",
     "bare-webp": "^1.0.3",
     "cross-worker": "^1.1.0",
+    "get-file-format": "^1.0.1",
     "get-mime-type": "^2.0.1",
     "hrpc": "^4.0.0",
     "hyperschema": "^1.12.3",

package/worker/media.js

@@ -1,10 +1,13 @@
 import b4a from 'b4a'
 import fs from 'bare-fs'
 import fetch from 'bare-fetch'
-import getMimeType from 'get-mime-type'
 
-import { importCodec, supportsQuality } from '../shared/codecs.js'
-import { calculateFitDimensions } from './util'
+import {
+  importCodec,
+  isCodecSupported,
+  supportsQuality
+} from '../shared/codecs.js'
+import { detectMimeType, calculateFitDimensions } from './util'
 
 const DEFAULT_PREVIEW_FORMAT = 'image/webp'
 
@@ -22,10 +25,15 @@ export async function createPreview({
   format,
   encoding
 }) {
-  mimetype = mimetype || getMimeType(path)
   format = format || DEFAULT_PREVIEW_FORMAT
 
   const buff = await getBuffer({ path, httpLink, buffer })
+  mimetype = mimetype || detectMimeType(buff, path)
+
+  if (!isCodecSupported(mimetype)) {
+    throw new Error(`Unsupported file type: No codec available for ${mimetype}`)
+  }
+
   const rgba = await decodeImageToRGBA(buff, mimetype, maxFrames)
   const { width, height } = rgba
 
@@ -118,6 +126,11 @@ export async function createPreview({
 
 export async function decodeImage({ path, httpLink, buffer, mimetype }) {
   const buff = await getBuffer({ path, httpLink, buffer })
+  mimetype = mimetype || detectMimeType(buff, path)
+
+  if (!isCodecSupported(mimetype)) {
+    throw new Error(`Unsupported file type: No codec available for ${mimetype}`)
+  }
 
   const rgba = await decodeImageToRGBA(buff, mimetype)
   const { width, height, data } = rgba

package/worker/util.js

@@ -1,5 +1,12 @@
+import getMimeType from 'get-mime-type'
+import getFileFormat from 'get-file-format'
+
 export const log = (...args) => console.log('[bare-media]', ...args)
 
+export function detectMimeType(buffer, path) {
+  return getMimeType(getFileFormat(buffer)) || getMimeType(path)
+}
+
 export function calculateFitDimensions(width, height, maxWidth, maxHeight) {
   if (width <= maxWidth && height <= maxHeight) {
     return { width, height }