lightnet 4.8.0 → 4.9.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # lightnet
 
+## 4.9.0
+
+### Minor Changes
+
+- [#475](https://github.com/LightNetDev/LightNet/pull/475) [`24a5813`](https://github.com/LightNetDev/LightNet/commit/24a58138e83824c7f740b77c2373f152c6d02eb7) - Support `SoftwareApplication` and `WebPage` as media type structured data classifications in JSON definitions and the admin interface. For these types, use the first content entry's HTTP(S) link as the resource URL and identify the LightNet detail page with `mainEntityOfPage`. Retain the detail URL when the first entry is an upload or has no valid HTTP(S) URL.
+
 ## 4.8.0
 
 ### Minor Changes

package/package.json

@@ -3,7 +3,7 @@
   "description": "LightNet makes it easy to run your own digital media library.",
   "type": "module",
   "license": "MIT",
-  "version": "4.8.0",
+  "version": "4.9.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/LightNetDev/lightnet",

package/src/content/schema/media-type.ts

@@ -16,6 +16,8 @@ export const mediaTypeSchema = z.object({
    * Schema.org type of the work described on media detail pages.
    * Independent of the page layout and downloadable file formats.
    * If omitted, structured data is inferred from the layout and content.
+   * WebPage and SoftwareApplication use the first content entry's HTTP(S)
+   * link as the work URL, with the LightNet detail page as mainEntityOfPage.
    */
   schemaType: z
     .enum([
@@ -26,6 +28,8 @@ export const mediaTypeSchema = z.object({
       "AudioObject",
       "VideoObject",
       "ImageObject",
+      "SoftwareApplication",
+      "WebPage",
     ])
     .optional(),
   /**

package/src/pages/details-page/utils/create-media-item-json-ld.ts

@@ -61,13 +61,8 @@ export function createMediaItemJsonLd({
   }
 
   const media = item.content.map(({ url }, index) => {
-    let resolvedUrl: URL
-    try {
-      resolvedUrl = new URL(url, canonicalUrl)
-    } catch {
-      return undefined
-    }
-    if (!["http:", "https:"].includes(resolvedUrl.protocol)) {
+    const resolvedUrl = resolveHttpUrl(url, canonicalUrl)
+    if (!resolvedUrl) {
       return undefined
     }
 
@@ -92,6 +87,20 @@ export function createMediaItemJsonLd({
   })
 
   const encodings = media.filter((entry) => entry !== undefined)
+  if (schemaType === "SoftwareApplication" || schemaType === "WebPage") {
+    const primary = item.content[0]
+    const resourceUrl =
+      primary?.type === "link"
+        ? resolveHttpUrl(primary.url, canonicalUrl)
+        : undefined
+    return {
+      ...base,
+      url: resourceUrl?.href ?? canonicalUrl.href,
+      mainEntityOfPage: canonicalUrl.href,
+      encoding: encodings.length ? encodings : undefined,
+    }
+  }
+
   if (
     schemaType === "AudioObject" ||
     schemaType === "VideoObject" ||
@@ -145,6 +154,15 @@ export function createMediaItemJsonLd({
   return { ...base, encoding: encodings.length ? encodings : undefined }
 }
 
+function resolveHttpUrl(value: string, base: URL) {
+  try {
+    const url = new URL(value, base)
+    return ["http:", "https:"].includes(url.protocol) ? url : undefined
+  } catch {
+    return undefined
+  }
+}
+
 function getVideoEmbedUrl(url: URL) {
   if (url.hostname === "www.youtube.com" || url.hostname === "youtube.com") {
     const id = url.pathname.startsWith("/embed/")