Merge pull request #953 from Merit-Systems/debug-null-metadata

fix: resolve relative OG image URLs in origin metadata upsert

Author: onchainlu

apps/scan/src/app/api/resources/sync/route.ts

@@ -180,13 +180,21 @@ export const GET = async (request: NextRequest) => {
             description: metadata?.description ?? og?.ogDescription,
             favicon: favicon ?? undefined,
             ogImages:
-              og?.ogImage?.map(image => ({
-                url: image.url,
-                height: image.height,
-                width: image.width,
-                title: og.ogTitle,
-                description: og.ogDescription,
-              })) ?? [],
+              og?.ogImage?.flatMap(image => {
+                try {
+                  return [
+                    {
+                      url: new URL(image.url, origin).toString(),
+                      height: image.height,
+                      width: image.width,
+                      title: og.ogTitle,
+                      description: og.ogDescription,
+                    },
+                  ];
+                } catch {
+                  return [];
+                }
+              }) ?? [],
           };
 
           // Upsert origin to database

apps/scan/src/lib/resources.ts

@@ -258,13 +258,21 @@ export async function registerSiwxResource(
           description: description ?? undefined,
           favicon: favicon ?? undefined,
           ogImages:
-            og?.ogImage?.map(image => ({
-              url: image.url,
-              height: image.height,
-              width: image.width,
-              title: og.ogTitle,
-              description: og.ogDescription,
-            })) ?? [],
+            og?.ogImage?.flatMap(image => {
+              try {
+                return [
+                  {
+                    url: new URL(image.url, origin).toString(),
+                    height: image.height,
+                    width: image.width,
+                    title: og.ogTitle,
+                    description: og.ogDescription,
+                  },
+                ];
+              } catch {
+                return [];
+              }
+            }) ?? [],
         });
       } catch (err) {
         console.error(
@@ -524,15 +532,31 @@ export const registerResource = async (
     description: description ?? undefined,
     favicon: favicon ?? undefined,
     ogImages:
-      og?.ogImage?.map(image => ({
-        url: image.url,
-        height: image.height,
-        width: image.width,
-        title: og.ogTitle,
-        description: og.ogDescription,
-      })) ?? [],
-  }).catch(() => {
-    // P2002 or other race — another call already upserted this origin.
+      og?.ogImage?.flatMap(image => {
+        try {
+          return [
+            {
+              url: new URL(image.url, origin).toString(),
+              height: image.height,
+              width: image.width,
+              title: og.ogTitle,
+              description: og.ogDescription,
+            },
+          ];
+        } catch {
+          return [];
+        }
+      }) ?? [],
+  }).catch(err => {
+    // P2002: another concurrent call already upserted this origin — safe to ignore.
+    // Log anything else so metadata failures aren't silent.
+    const isP2002 =
+      err instanceof Error &&
+      'code' in err &&
+      (err as { code: string }).code === 'P2002';
+    if (!isP2002) {
+      console.error('[registerResource] Origin metadata upsert failed:', err);
+    }
   });
 
   await upsertResourceResponse(

apps/scan/src/services/db/resources/resource.ts

@@ -441,9 +441,7 @@ export const deprecateStaleResources = async (
     return 0;
   }
 
-  const activeKeys = new Set(
-    activeResources.map(r => `${r.method}::${r.url}`)
-  );
+  const activeKeys = new Set(activeResources.map(r => `${r.method}::${r.url}`));
   const staleIds = allResources
     .filter(r => !activeKeys.has(`${r.method}::${r.resource}`))
     .map(r => r.id);