fix: remove probe-image, roll our own solution (#1111)

Author: scissorsneedfoodtoo

package-lock.json

@@ -88,6 +88,7 @@
     "husky": "9.1.7",
     "i18next": "23.16.8",
     "i18next-fs-backend": "2.6.0",
+    "image-size": "2.0.1",
     "jest": "29.7.0",
     "jest-json-schema-extended": "1.0.1",
     "joi": "17.13.3",
@@ -102,7 +103,6 @@
     "npm-run-all2": "7.0.2",
     "piscina": "4.9.2",
     "prettier": "3.4.2",
-    "probe-image-size": "7.2.3",
     "shx": "0.4.0",
     "terser": "5.39.0",
     "typescript": "5.8.2"

package.json

@@ -1,14 +1,71 @@
-const probe = require('probe-image-size');
+const fetch = require('node-fetch');
+const { imageSize } = require('image-size');
 const errorLogger = require('./error-logger');
 const { getCache, setCache } = require('./cache');
 const defaultDimensions = { width: 600, height: 400 };
 
+// Minimum required bytes for common image formats (approximate)
+const imageMinBytes = {
+  jpg: 410,
+  png: 33,
+  gif: 14,
+  webp: 30,
+  bmp: 26,
+  default: 256 // Fallback for other image types
+};
+
+const probeImage = async url => {
+  const response = await fetch(url);
+  if (!response.ok)
+    throw new Error(`Failed to fetch image: ${response.statusText}`);
+
+  const chunks = [];
+  let totalLength = 0;
+  const reader = response.body;
+
+  for await (const chunk of reader) {
+    chunks.push(chunk);
+    totalLength += chunk.length;
+
+    try {
+      const buffer = Buffer.concat(chunks, totalLength);
+
+      // Try to detect image format (first few bytes)
+      const { type } = imageSize(buffer);
+      const minBytes = imageMinBytes[type] || imageMinBytes.default;
+
+      // Check buffer length before probing image
+      if (buffer.length < minBytes) continue;
+
+      // Get dimensions
+      const dimensions = imageSize(buffer);
+      if (dimensions.width && dimensions.height) {
+        response.body.destroy(); // Stop downloading
+        return dimensions;
+      }
+    } catch (err) {
+      // Continue reading if more data is needed
+    }
+  }
+
+  throw new Error('Could not determine image size');
+};
+
 const getImageDimensions = async (url, description) => {
   try {
+    if (url.startsWith('data:')) {
+      console.warn(`
+        ---------------------------------------------------------------
+        Warning: Skipping data URL for image dimensions in ${description.substring(0, 350)}...
+        ---------------------------------------------------------------
+        `);
+
+      throw new Error('Data URL');
+    }
     let imageDimensions = getCache(url);
     if (imageDimensions) return imageDimensions;
 
-    const res = await probe(url);
+    const res = await probeImage(url);
     imageDimensions = {
       width: res?.width ? res?.width : defaultDimensions.width,
       height: res?.height ? res?.height : defaultDimensions.height
@@ -17,7 +74,7 @@ const getImageDimensions = async (url, description) => {
 
     return imageDimensions;
   } catch (err) {
-    if (err.statusCode) errorLogger({ type: 'image', name: description }); // Only write HTTP status code errors to log
+    errorLogger({ type: 'image', name: description });
 
     return defaultDimensions;
   }