fix: refactor image function

package.json

@@ -65,6 +65,8 @@
     "find-cache-dir": "^3.3.1",
     "find-up": "^5.0.0",
     "fs-extra": "^9.1.0",
+    "image-type": "^4.1.0",
+    "is-svg": "^4.3.1",
     "make-dir": "^3.1.0",
     "mime-types": "^2.1.30",
     "moize": "^6.0.0",

src/lib/templates/imageFunction.js

@@ -1,52 +1,95 @@
-const path = require('path')
 const { builder } = require('@netlify/functions')
 const sharp = require('sharp')
 const fetch = require('node-fetch')
+const imageType = require('image-type')
+const isSvg = require('is-svg')
 
-// Function used to mimic next/image and sharp
+function getImageType(buffer) {
+  const type = imageType(buffer)
+  if (type) {
+    return type
+  }
+  if (isSvg(buffer)) {
+    return { ext: 'svg', mime: 'image/svg' }
+  }
+  return null
+}
+
+const IGNORED_FORMATS = new Set(['svg', 'gif'])
+const OUTPUT_FORMATS = new Set(['png', 'jpg', 'webp', 'avif'])
+
+// Function used to mimic next/image
 const handler = async (event) => {
   const [, , url, w = 500, q = 75] = event.path.split('/')
-  const parsedUrl = decodeURIComponent(url)
+  // Work-around a bug in redirect handling. Remove when fixed.
+  const parsedUrl = decodeURIComponent(url).replace('+', '%20')
   const width = parseInt(w)
-  const quality = parseInt(q)
+
+  if (!width) {
+    return {
+      statusCode: 400,
+      body: 'Invalid image parameters',
+    }
+  }
+
+  const quality = parseInt(q) || 60
 
   const imageUrl = parsedUrl.startsWith('/')
     ? `${process.env.DEPLOY_URL || `http://${event.headers.host}`}${parsedUrl}`
     : parsedUrl
+
   const imageData = await fetch(imageUrl)
+
+  if (!imageData.ok) {
+    console.error(`Failed to download image ${imageUrl}. Status ${imageData.status} ${imageData.statusText}`)
+    return {
+      statusCode: imageData.status,
+      body: imageData.statusText,
+    }
+  }
+
   const bufferData = await imageData.buffer()
-  const ext = path.extname(imageUrl)
-  const mimeType = ext === 'jpg' ? `image/jpeg` : `image/${ext}`
-
-  let image
-  let imageBuffer
-
-  if (mimeType === 'image/gif') {
-    image = await sharp(bufferData, { animated: true })
-    // gif resizing in sharp seems unstable (https://github.com/lovell/sharp/issues/2275)
-    imageBuffer = await image.toBuffer()
-  } else {
-    image = await sharp(bufferData)
-    if (mimeType === 'image/webp') {
-      image = image.webp({ quality })
-    } else if (mimeType === 'image/jpeg') {
-      image = image.jpeg({ quality })
-    } else if (mimeType === 'image/png') {
-      image = image.png({ quality })
-    } else if (mimeType === 'image/avif') {
-      image = image.avif({ quality })
-    } else if (mimeType === 'image/tiff') {
-      image = image.tiff({ quality })
-    } else if (mimeType === 'image/heif') {
-      image = image.heif({ quality })
+
+  const type = getImageType(bufferData)
+
+  if (!type) {
+    return { statusCode: 400, body: 'Source does not appear to be an image' }
+  }
+
+  let { ext } = type
+
+  // For unsupported formats (gif, svg) we redirect to the original
+  if (IGNORED_FORMATS.has(ext)) {
+    return {
+      statusCode: 302,
+      headers: {
+        Location: imageUrl,
+      },
     }
-    imageBuffer = await image.resize(width).toBuffer()
   }
 
+  if (process.env.FORCE_WEBP_OUTPUT) {
+    ext = 'webp'
+  }
+
+  if (!OUTPUT_FORMATS.has(ext)) {
+    ext = 'jpg'
+  }
+
+  // The format methods are just to set options: they don't
+  // make it return that format.
+  const { info, data: imageBuffer } = await sharp(bufferData)
+    .jpeg({ quality, force: ext === 'jpg' })
+    .webp({ quality, force: ext === 'webp' })
+    .png({ quality, force: ext === 'png' })
+    .avif({ quality, force: ext === 'avif' })
+    .resize(width)
+    .toBuffer({ resolveWithObject: true })
+
   return {
     statusCode: 200,
     headers: {
-      'Content-Type': mimeType,
+      'Content-Type': `image/${info.format}`,
     },
     body: imageBuffer.toString('base64'),
     isBase64Encoded: true,