Support fontSources object as well as array of strings or objects

Author: danielhjacobs

web/packages/core/src/internal/player/inner.tsx

@@ -597,39 +597,57 @@ export class InnerPlayer {
         builder.setVolume(this.volumeSettings.get_volume());
 
         if (this.loadedConfig?.fontSources) {
-            for (const key in this.loadedConfig.fontSources) {
-                const fontSource = this.loadedConfig.fontSources[key];
-                if (typeof fontSource === "string") {
-                    // Handle old format (array of strings)
-                    try {
-                        const response = await fetch(fontSource);
-                        builder.addFont(
-                            fontSource,
-                            null, // No custom name
-                            null, // No bold override
-                            null, // No italic override
-                            new Uint8Array(await response.arrayBuffer()),
-                        );
-                    } catch (error) {
-                        console.warn(`Couldn't download font source from ${fontSource}`, error);
-                    }
-                } else if (typeof fontSource === "object") {
-                    // Handle new format (object with additional properties)
-                    for (const [url, fontInfo] of Object.entries(fontSource)) {
+            const fontSources  = this.loadedConfig.fontSources;
+            if (Array.isArray(fontSources)) {
+                for (const fontSource of fontSources) {
+                    if (typeof fontSource === "string") {
+                        // Handle old format (array of strings)
                         try {
-                            const response = await fetch(url);
+                            const response = await fetch(fontSource);
                             builder.addFont(
-                                url,
-                                fontInfo?.['name'] || null,
-                                fontInfo?.['bold'] ?? null,
-                                fontInfo?.['italics'] ?? null,
+                                fontSource,
+                                null, // No custom name
+                                null, // No bold override
+                                null, // No italic override
                                 new Uint8Array(await response.arrayBuffer()),
                             );
                         } catch (error) {
-                            console.warn(`Couldn't download font source from ${key}`, error);
+                            console.warn(`Couldn't download font source from ${fontSource}`, error);
+                        }
+                    } else if (typeof fontSource === "object") {
+                        // Handle new format (object with additional properties)
+                        for (const [url, fontInfo] of Object.entries(fontSource)) {
+                            try {
+                                const response = await fetch(url);
+                                builder.addFont(
+                                    url,
+                                    fontInfo?.['name'] || null,
+                                    fontInfo?.['bold'] ?? null,
+                                    fontInfo?.['italics'] ?? null,
+                                    new Uint8Array(await response.arrayBuffer()),
+                                );
+                            } catch (error) {
+                                console.warn(`Couldn't download font source from ${url}`, error);
+                            }
                         }
                     }
                 }
+            } else if (typeof fontSources === "object") {
+                // Handle the case where fontSources is a plain object
+                for (const [url, fontInfo] of Object.entries(fontSources)) {
+                    try {
+                        const response = await fetch(url);
+                        builder.addFont(
+                            url,
+                            fontInfo?.['name'] || null,
+                            fontInfo?.['bold'] ?? null,
+                            fontInfo?.['italics'] ?? null,
+                            new Uint8Array(await response.arrayBuffer()),
+                        );
+                    } catch (error) {
+                        console.warn(`Couldn't download font source from ${url}`, error);
+                    }
+                }
             }
         }
 

web/packages/core/src/public/config/load-options.ts

@@ -648,22 +648,30 @@ export interface BaseLoadOptions {
      *
      * These will be fetched by the browser as part of the loading of Flash content, which may slow down load times.
      *
-     * When using an SWF source, and each font embedded within that SWF will be used as device font by Flash content.
+     * When using an SWF source, each font embedded within that SWF will be used as device font by Flash content.
      *
      * If any URL fails to load (either it's an invalid file, or a network error occurs), Ruffle will log an error but continue without it.
      *
      * @default []
      */
-    fontSources?: Array<
-        | string
+    fontSources?:
         | {
               [key: string]: {
                   name?: string;
                   bold?: boolean;
                   italics?: boolean;
               };
           }
-    >;
+        | Array<
+              | string
+              | {
+                    [key: string]: {
+                        name?: string;
+                        bold?: boolean;
+                        italics?: boolean;
+                    };
+                }
+          >;
 
     /**
      * The font names to use for each "default" Flash device font.