Replace probe-image-size with image-dimensions and fetch

fabon-f · Dec 20, 2023 · 6228ff5 · 6228ff5
1 parent 06ca843
commit 6228ff5
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 87 deletions.
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ High-performance metadata scraper for Node.js
 
 * Don't download whole contents to get site metadata.
   * Fetch and parse the content of the `head` element only. Interrupt HTTP request when the `<body>` element starts.
-  * Download only first few kilobytes to determine image size (by `probe-image-size` package)
+  * Download only first few kilobytes to determine image size (by `image-dimensions` package)
 
 ## Install
 

diff --git a/package.json b/package.json
@@ -34,7 +34,7 @@
   "dependencies": {
     "entities": "^4.5.0",
     "html-rewriter-wasm": "^0.4.1",
-    "probe-image-size": "^7.2.3"
+    "image-dimensions": "^2.3.0"
   },
   "devDependencies": {
     "@tsconfig/strictest": "^2.0.1",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/fetch-image-size.ts b/src/fetch-image-size.ts
@@ -0,0 +1,15 @@
+import { imageDimensionsFromStream } from 'image-dimensions'
+
+export default async function fetchImageSize(url: string, options: RequestInit) {
+    const controller = new AbortController()
+    const response = await fetch(url, {
+        ...options,
+        signal: controller.signal
+    })
+    if (!response.body) {
+        return undefined
+    }
+    const result = await imageDimensionsFromStream(response.body)
+    controller.abort()
+    return result
+}
diff --git a/src/index.ts b/src/index.ts
@@ -1,4 +1,4 @@
-import imageSize from 'probe-image-size'
+import fetchImageSize from './fetch-image-size.js'
 
 import extractMetadata from './extract-metadata.js'
 import type { ImageInfo, Metadata } from './extract-metadata.js'
@@ -38,7 +38,7 @@ const defaultFavicon = async (baseUrl: string, fetchOptions: RequestInit) => {
   return response.ok ? defaultFaviconUrl : undefined
 }
 
-const fetchImageInfo = async (info: ImageInfo) => {
+const fetchImageInfo = async (info: ImageInfo, fetchOptions: RequestInit) => {
   const intRegex = /0|[1-9][0-9]*/
   if (info.width !== undefined && info.height !== undefined && intRegex.test(info.width) && intRegex.test(info.height)) {
     return {
@@ -48,17 +48,16 @@ const fetchImageInfo = async (info: ImageInfo) => {
       alt: info.alt
     }
   }
-  try {
-    const actualSize = await imageSize(info.src)
+  const actualSize = await fetchImageSize(info.src, fetchOptions)
+  if (actualSize) {
     return {
       src: info.src,
       width: actualSize.width.toString(),
       height: actualSize.height.toString(),
       alt: info.alt
     }
-  } catch {
-    return info
   }
+  return info
 }
 
 type IntrinsicOptions = {
@@ -104,7 +103,7 @@ export default async function fetchSiteMetadata(url: string | URL, options: Opti
 
   const [iconUrl, imageInfo] = await Promise.all([
     typeof metadata.icon === 'string' ? Promise.resolve(metadata.icon) : defaultFavicon(urlString, fetchOptions),
-    metadata.image === undefined ? Promise.resolve(undefined) : fetchImageInfo(metadata.image)
+    metadata.image === undefined ? Promise.resolve(undefined) : fetchImageInfo(metadata.image, fetchOptions)
   ])
 
   return {