Upgrade deps, fix for youtube (search multiple urls)

Author: zachleat

api/og.js

@@ -116,7 +116,7 @@ export async function GET(request, context) {
       maxWidth = 650;
     }
 
-    console.log( {url, size, imageFormat, cacheBuster} );
+    console.log( "Request", {url, size, imageFormat, cacheBuster} );
 
     // short circuit circular requests
     if(isFullUrl(url) && (new URL(url)).hostname.endsWith(".opengraph.11ty.dev")) {
@@ -138,14 +138,29 @@ export async function GET(request, context) {
     // TODO: when requests to https://v1.screenshot.11ty.dev/ show an error (the default SVG image)
     // this service should error with _that_ image and the error message headers.
 
-    let stats = await Promise.any(imageUrls.map(url => {
+    let settled = await Promise.allSettled(imageUrls.map(url => {
       return og.optimizeImage(url, imageFormat || FALLBACK_IMAGE_FORMAT, maxWidth);
     }));
 
-    let format = Object.keys(stats).pop();
-    let stat = stats[format][0];
+    let promises = settled.filter(p => {
+      if(p.status === "fulfilled" && p.value) {
+        return Object.keys(p.value).length > 0;
+      }
+      return false;
+    }).map(p => {
+      let format = Object.keys(p.value).pop();
+      return p.value[format][0];
+    }).sort((a, b) => {
+      // descending
+      return b.width - a.width;
+    });
+
+    if(promises.length === 0) {
+      throw new Error("No image found.");
+    }
 
-    console.log( "Found match", url, format, stat );
+    let stat = promises[0];
+    console.log( "Found match", url, { format: stat.format, width: stat.width, height: stat.height, size: stat.size } );
 
     return new Response(stat.buffer, {
       code: 200,

ogImageHtml.js

@@ -75,8 +75,9 @@ class OgImageHtml {
         // results.add(`https://i.ytimg.com/vi/${videoId}/hqdefault.jpg`);
       }
     }
+    // TODO youtu.be style https://github.com/11ty/api-opengraph-image/issues/8
 
-    console.log( "Found:", Array.from(results) );
+    console.log( "Found urls:", Array.from(results) );
 
     return Array.from(results);
   }

package.json

@@ -3,7 +3,6 @@
   "version": "1.0.0",
   "description": "A runtime service to extract avatar images from the HTML on a web site.",
   "scripts": {
-    "test": "node test/test.js",
     "start": "npx vercel dev"
   },
   "type": "module",
@@ -24,10 +23,10 @@
   },
   "homepage": "https://github.com/11ty/indieweb-avatar#readme",
   "dependencies": {
-    "@11ty/eleventy-img": "5.0.0-beta.6",
+    "@11ty/eleventy-img": "^6.0.1",
     "cheerio": "^1.0.0"
   },
   "devDependencies": {
-    "vercel": "^37.1.2"
+    "vercel": "^41.2.0"
   }
 }