Merge pull request #140 from remcovanmook/fix/images-origin

fix(frontend): serve logos from the R2 mirror again

Author: remcovanmook

frontend/js/config.js.example

@@ -4,8 +4,12 @@ export const AUTH_ORIGIN = 'https://auth.<your-domain>';
 /** Origin of the pdbfe-api worker (no trailing slash). */
 export const API_ORIGIN = 'https://api.<your-domain>';
 
-/** Public R2 bucket origin for mirrored entity logos (no trailing slash). Empty to use upstream logos. */
-export const IMAGES_ORIGIN = '';
+/**
+ * Public R2 bucket origin for mirrored entity logos (no trailing slash).
+ * Also enables the pdbfe extension fields (__pdbfe=1) that carry
+ * __logo_migrated. Set to '' to use upstream S3 logos only.
+ */
+export const IMAGES_ORIGIN = 'https://images.<your-domain>';
 
 /** S3 URL prefix to strip when building R2 logo paths. */
 export const S3_MEDIA_PREFIX = 'https://peeringdb-media-prod.s3.amazonaws.com/media/';

frontend/js/render.js

@@ -622,10 +622,16 @@ export function createDetailLayout(opts) {
         // Attach handlers BEFORE setting src — cached images fire
         // load synchronously and would be missed otherwise.
         logo.onload = () => { logo.style.display = ''; };
-        logo.onerror = () => { logo.remove(); };
         if (IMAGES_ORIGIN && opts.logoMigrated && opts.logoUrl.startsWith(S3_MEDIA_PREFIX)) {
+            // R2 mirror first; if it misses, fall back to the upstream URL once.
+            const upstream = opts.logoUrl;
+            logo.onerror = () => {
+                logo.onerror = () => { logo.remove(); };
+                logo.src = upstream;
+            };
             logo.src = `${IMAGES_ORIGIN}/${opts.logoUrl.slice(S3_MEDIA_PREFIX.length)}`;
         } else {
+            logo.onerror = () => { logo.remove(); };
             logo.src = opts.logoUrl;
         }