@canopy-iiif/app 1.5.3 → 1.5.5

package/lib/build/iiif.js

@@ -28,6 +28,7 @@ const {
   buildIiifImageUrlForDimensions,
   findPrimaryCanvasImage,
   buildIiifImageSrcset,
+  isLevel0Service,
 } = require("../iiif/thumbnail");
 
 const IIIF_CACHE_DIR = path.resolve(".cache/iiif");
@@ -167,9 +168,29 @@ function ensureThumbnailValue(target, url, width, height) {
   return true;
 }
 
+function extractResourceThumbnail(resource) {
+  try {
+    const rawThumb = resource && resource.thumbnail;
+    const first = Array.isArray(rawThumb) ? rawThumb[0] : rawThumb;
+    if (!first) return null;
+    if (typeof first === "string") {
+      const trimmed = first.trim();
+      return trimmed ? {url: trimmed} : null;
+    }
+    const id = first.id || first["@id"];
+    if (!id) return null;
+    const width = typeof first.width === "number" ? first.width : undefined;
+    const height = typeof first.height === "number" ? first.height : undefined;
+    return {url: String(id), width, height};
+  } catch (_) {
+    return null;
+  }
+}
+
 async function resolveHeroMedia(manifest) {
   if (!manifest) return null;
   try {
+    const manifestThumb = extractResourceThumbnail(manifest);
     const heroSource = (() => {
       if (manifest && manifest.thumbnail) {
         const clone = { ...manifest };
@@ -191,15 +212,11 @@ async function resolveHeroMedia(manifest) {
     const heroService =
       (canvasImage && canvasImage.service) ||
       (heroRep && heroRep.service);
+    const serviceIsLevel0 = isLevel0Service(heroService);
     const heroPreferred = buildIiifImageUrlFromService(
-      heroService,
+      serviceIsLevel0 ? null : heroService,
       HERO_THUMBNAIL_SIZE
     );
-    const heroFallbackId = (() => {
-      if (canvasImage && canvasImage.id) return String(canvasImage.id);
-      if (heroRep && heroRep.id) return String(heroRep.id);
-      return '';
-    })();
     const heroWidth = (() => {
       if (canvasImage && typeof canvasImage.width === 'number')
         return canvasImage.width;
@@ -213,21 +230,59 @@ async function resolveHeroMedia(manifest) {
         return heroRep.height;
       return undefined;
     })();
-    const heroSrcset = buildIiifImageSrcset(heroService);
-    const ogImage = heroService
-      ? buildIiifImageUrlForDimensions(
-          heroService,
-          OG_IMAGE_WIDTH,
-          OG_IMAGE_HEIGHT
-        )
-      : '';
+    const heroSrcset = serviceIsLevel0
+      ? ''
+      : buildIiifImageSrcset(heroService);
+    const ogFromService =
+      !serviceIsLevel0 && heroService
+        ? buildIiifImageUrlForDimensions(
+            heroService,
+            OG_IMAGE_WIDTH,
+            OG_IMAGE_HEIGHT
+          )
+        : '';
+    const annotationImageId =
+      canvasImage && canvasImage.isImageBody && canvasImage.id
+        ? String(canvasImage.id)
+        : '';
+    let heroThumbnail = heroPreferred || '';
+    let heroThumbWidth = heroWidth;
+    let heroThumbHeight = heroHeight;
+    if (!heroThumbnail && manifestThumb && manifestThumb.url) {
+      heroThumbnail = manifestThumb.url;
+      if (typeof manifestThumb.width === 'number')
+        heroThumbWidth = manifestThumb.width;
+      if (typeof manifestThumb.height === 'number')
+        heroThumbHeight = manifestThumb.height;
+    }
+    if (!heroThumbnail) {
+      if (annotationImageId) {
+        heroThumbnail = annotationImageId;
+      } else if (!serviceIsLevel0 && heroRep && heroRep.id) {
+        heroThumbnail = String(heroRep.id);
+      }
+    }
+    let ogImage = '';
+    let ogImageWidth;
+    let ogImageHeight;
+    if (ogFromService) {
+      ogImage = ogFromService;
+      ogImageWidth = OG_IMAGE_WIDTH;
+      ogImageHeight = OG_IMAGE_HEIGHT;
+    } else if (heroThumbnail) {
+      ogImage = heroThumbnail;
+      if (typeof heroThumbWidth === 'number') ogImageWidth = heroThumbWidth;
+      if (typeof heroThumbHeight === 'number') ogImageHeight = heroThumbHeight;
+    }
     return {
-      heroThumbnail: heroPreferred || heroFallbackId || '',
-      heroThumbnailWidth: heroWidth,
-      heroThumbnailHeight: heroHeight,
+      heroThumbnail: heroThumbnail || '',
+      heroThumbnailWidth: heroThumbWidth,
+      heroThumbnailHeight: heroThumbHeight,
       heroThumbnailSrcset: heroSrcset || '',
       heroThumbnailSizes: heroSrcset ? HERO_IMAGE_SIZES_ATTR : '',
       ogImage: ogImage || '',
+      ogImageWidth,
+      ogImageHeight,
     };
   } catch (_) {
     return null;
@@ -987,14 +1042,28 @@ async function ensureFeaturedInCache(cfg) {
             }
           }
           if (heroMedia && heroMedia.ogImage) {
-            if (entry.ogImage !== heroMedia.ogImage) touched = true;
-            entry.ogImage = heroMedia.ogImage;
-            entry.ogImageWidth = OG_IMAGE_WIDTH;
-            entry.ogImageHeight = OG_IMAGE_HEIGHT;
+            if (entry.ogImage !== heroMedia.ogImage) {
+              entry.ogImage = heroMedia.ogImage;
+              touched = true;
+            }
+            if (typeof heroMedia.ogImageWidth === 'number') {
+              if (entry.ogImageWidth !== heroMedia.ogImageWidth) touched = true;
+              entry.ogImageWidth = heroMedia.ogImageWidth;
+            } else if (entry.ogImageWidth !== undefined) {
+              delete entry.ogImageWidth;
+              touched = true;
+            }
+            if (typeof heroMedia.ogImageHeight === 'number') {
+              if (entry.ogImageHeight !== heroMedia.ogImageHeight) touched = true;
+              entry.ogImageHeight = heroMedia.ogImageHeight;
+            } else if (entry.ogImageHeight !== undefined) {
+              delete entry.ogImageHeight;
+              touched = true;
+            }
           } else if (entry.ogImage !== undefined) {
             delete entry.ogImage;
-            delete entry.ogImageWidth;
-            delete entry.ogImageHeight;
+            if (entry.ogImageWidth !== undefined) delete entry.ogImageWidth;
+            if (entry.ogImageHeight !== undefined) delete entry.ogImageHeight;
             touched = true;
           }
           if (
@@ -1236,8 +1305,12 @@ async function rebuildManifestIndexFromCache() {
           }
           if (heroMedia.ogImage) {
             entry.ogImage = heroMedia.ogImage;
-            entry.ogImageWidth = OG_IMAGE_WIDTH;
-            entry.ogImageHeight = OG_IMAGE_HEIGHT;
+            if (typeof heroMedia.ogImageWidth === 'number')
+              entry.ogImageWidth = heroMedia.ogImageWidth;
+            else delete entry.ogImageWidth;
+            if (typeof heroMedia.ogImageHeight === 'number')
+              entry.ogImageHeight = heroMedia.ogImageHeight;
+            else delete entry.ogImageHeight;
           }
           ensureThumbnailValue(
             entry,
@@ -2006,12 +2079,18 @@ async function buildIiifCollectionPages(CONFIG) {
                     entry.ogImage = heroMedia.ogImage;
                     touched = true;
                   }
-                  if (entry.ogImageWidth !== OG_IMAGE_WIDTH) {
-                    entry.ogImageWidth = OG_IMAGE_WIDTH;
+                  if (typeof heroMedia.ogImageWidth === 'number') {
+                    if (entry.ogImageWidth !== heroMedia.ogImageWidth) touched = true;
+                    entry.ogImageWidth = heroMedia.ogImageWidth;
+                  } else if (entry.ogImageWidth !== undefined) {
+                    delete entry.ogImageWidth;
                     touched = true;
                   }
-                  if (entry.ogImageHeight !== OG_IMAGE_HEIGHT) {
-                    entry.ogImageHeight = OG_IMAGE_HEIGHT;
+                  if (typeof heroMedia.ogImageHeight === 'number') {
+                    if (entry.ogImageHeight !== heroMedia.ogImageHeight) touched = true;
+                    entry.ogImageHeight = heroMedia.ogImageHeight;
+                  } else if (entry.ogImageHeight !== undefined) {
+                    delete entry.ogImageHeight;
                     touched = true;
                   }
                 } else {

package/lib/iiif/thumbnail.js

@@ -12,6 +12,30 @@ function arrayify(value) {
   return Array.isArray(value) ? value : [value];
 }
 
+function normalizeBodyType(value) {
+  if (!value) return '';
+  if (typeof value === 'string') {
+    const trimmed = value.trim();
+    return trimmed;
+  }
+  if (Array.isArray(value)) {
+    for (const entry of value) {
+      const normalized = normalizeBodyType(entry);
+      if (normalized) return normalized;
+    }
+  }
+  return '';
+}
+
+function isImageBodyType(value) {
+  if (!value) return false;
+  try {
+    return /image/i.test(String(value));
+  } catch (_) {
+    return false;
+  }
+}
+
 function normalizeImageServiceCandidate(candidate) {
   if (!candidate || typeof candidate !== 'object') return null;
   const id = candidate.id || candidate['@id'];
@@ -41,6 +65,23 @@ function normalizeImageServiceCandidate(candidate) {
   };
 }
 
+function isLevel0Profile(profile) {
+  if (!profile) return false;
+  try {
+    return /level0/i.test(String(profile));
+  } catch (_) {
+    return false;
+  }
+}
+
+function isLevel0Service(candidate) {
+  if (!candidate || typeof candidate !== 'object') return false;
+  if (candidate.profile && isLevel0Profile(candidate.profile)) return true;
+  const normalized = normalizeImageServiceCandidate(candidate);
+  if (!normalized) return false;
+  return Boolean(normalized.profile && isLevel0Profile(normalized.profile));
+}
+
 function isIiifImageService(candidate) {
   if (!candidate) return false;
   const {type, profile} = candidate;
@@ -77,6 +118,7 @@ function extractImageService(value, seen = new Set()) {
 function normalizeImagePayload(body, canvas) {
   if (!body || typeof body !== 'object') return null;
   const id = body.id || body['@id'];
+  const bodyType = normalizeBodyType(body.type || body['@type']);
   const width =
     typeof body.width === 'number'
       ? body.width
@@ -95,6 +137,8 @@ function normalizeImagePayload(body, canvas) {
     width,
     height,
     service: service || undefined,
+    bodyType: bodyType || undefined,
+    isImageBody: Boolean(bodyType && isImageBodyType(bodyType)),
   };
 }
 
@@ -185,6 +229,7 @@ function selectServiceQuality(candidate) {
 
 function buildIiifImageUrlFromNormalizedService(service, preferredSize = 800) {
   if (!service || !isIiifImageService(service)) return '';
+  if (isLevel0Profile(service.profile)) return '';
   const baseId = normalizeServiceBaseId(service.id);
   if (!baseId) return '';
   const size = preferredSize && preferredSize > 0 ? preferredSize : 800;
@@ -202,6 +247,7 @@ function buildIiifImageUrlFromService(service, preferredSize = 800) {
 function buildIiifImageUrlForDimensions(service, width = 1200, height = 630) {
   const normalized = normalizeImageServiceCandidate(service);
   if (!normalized || !isIiifImageService(normalized)) return '';
+  if (isLevel0Profile(normalized.profile)) return '';
   const baseId = normalizeServiceBaseId(normalized.id);
   if (!baseId) return '';
   const safeWidth = Math.max(1, Math.floor(Number(width) || 0));
@@ -214,6 +260,7 @@ function buildIiifImageUrlForDimensions(service, width = 1200, height = 630) {
 function buildIiifImageSrcset(service, steps = [360, 640, 960, 1280, 1600]) {
   const normalized = normalizeImageServiceCandidate(service);
   if (!normalized || !isIiifImageService(normalized)) return '';
+  if (isLevel0Profile(normalized.profile)) return '';
   const uniqueSteps = Array.from(
     new Set(
       (Array.isArray(steps) ? steps : [])
@@ -354,4 +401,5 @@ module.exports = {
   buildIiifImageUrlForDimensions,
   findPrimaryCanvasImage,
   buildIiifImageSrcset,
+  isLevel0Service,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canopy-iiif/app",
-  "version": "1.5.3",
+  "version": "1.5.5",
   "private": false,
   "license": "MIT",
   "author": "Mat Jordan <mat@northwestern.edu>",