fix: empty fonts array crashing frame render (#472)

* fix: empty `fonts` array crashing frame render * chore: changesets
wevm · Aug 13, 2024 · 8529049 · 8529049
1 parent 88f1b89
commit 8529049
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 8 deletions.
diff --git a/.changeset/quiet-pans-cough.md b/.changeset/quiet-pans-cough.md
@@ -0,0 +1,5 @@
+---
+"frog": patch
+---
+
+Fixed an issue where a frame without any fonts passed would crash the render process.
diff --git a/src/frog-base.tsx b/src/frog-base.tsx
@@ -583,12 +583,14 @@ export class FrogBase<
           const defaultImageOptionsFonts = defaultImageOptions?.fonts ?? []
           const imageOptionsFonts =
             (imageOptions as ImageOptions | undefined)?.fonts ?? []
-          return [
+          const fonts = [
             ...uiFonts,
             ...optionsFonts,
             ...defaultImageOptionsFonts,
             ...imageOptionsFonts,
           ]
+          if (fonts.length === 0) return undefined
+          return fonts
         })()
 
         return new ImageResponse(image_, {
@@ -859,19 +861,23 @@ export class FrogBase<
           const defaultImageOptionsFonts = defaultImageOptions?.fonts ?? []
           const imageOptionsFonts =
             (imageOptions as ImageOptions | undefined)?.fonts ?? []
-          return [
+          const fonts = [
             ...uiFonts,
             ...optionsFonts,
             ...defaultImageOptionsFonts,
             ...imageOptionsFonts,
           ]
+
+          if (fonts.length === 0) return undefined
+          return fonts
         })()
         const groupedFonts = new Map<string, NonNullable<typeof fonts>>()
-        for (const font of fonts) {
-          const key = `${font.source ? `${font.source}:` : ''}${font.name}`
-          if (groupedFonts.has(key)) groupedFonts.get(key)?.push(font)
-          else groupedFonts.set(key, [font])
-        }
+        if (fonts)
+          for (const font of fonts) {
+            const key = `${font.source ? `${font.source}:` : ''}${font.name}`
+            if (groupedFonts.has(key)) groupedFonts.get(key)?.push(font)
+            else groupedFonts.set(key, [font])
+          }
         const googleFonts = []
         for (const item of groupedFonts) {
           const [, fonts] = item
@@ -1067,12 +1073,15 @@ export class FrogBase<
         const defaultImageOptionsFonts = defaultImageOptions?.fonts ?? []
         const imageOptionsFonts = response.data.imageOptions?.fonts ?? []
 
-        return [
+        const fonts = [
           ...uiFonts,
           ...optionsFonts,
           ...defaultImageOptionsFonts,
           ...imageOptionsFonts,
         ]
+
+        if (fonts.length === 0) return undefined
+        return fonts
       })()
 
       const {