@rmdes/indiekit-endpoint-syndicate 1.0.0-beta.44 → 1.0.0-beta.46

package/lib/utils.js

@@ -1,23 +1,18 @@
 /**
  * Get post data for a single post
+ * Get every post awaiting syndication
+ *
+ * A post is awaiting syndication while `mp-syndicate-to` remains: it is
+ * deleted once every target has returned a URL, and replaced with the
+ * targets that failed otherwise. Posts already syndicated to some of their
+ * targets are therefore still awaiting the rest, and `syndicateToTargets`
+ * skips the ones already done. Oldest first, so a backlog is syndicated in
+ * the order it was published.
  * @param {object} postsCollection - Posts database collection
- * @param {string} url - URL of existing post (optional)
- * @returns {Promise<object>} Post data for given URL else oldest post awaiting syndication
+ * @returns {Promise<Array<object>>} Post data, oldest first
  */
-export const getPostData = async (postsCollection, url) => {
-  if (url) {
-    return postsCollection.findOne({
-      "properties.url": url,
-    });
-  }
-
-  // A post is awaiting syndication while `mp-syndicate-to` remains: it is
-  // deleted once every target has returned a URL, and replaced with the
-  // targets that failed otherwise. Posts already syndicated to some of their
-  // targets are therefore still awaiting the rest, and `syndicateToTargets`
-  // skips the ones already done. Oldest first, so a backlog is syndicated in
-  // the order it was published.
-  const items = await postsCollection
+export const getPostsAwaitingSyndication = async (postsCollection) => {
+  return postsCollection
     .find({
       "properties.mp-syndicate-to": {
         $exists: true,
@@ -27,10 +22,24 @@ export const getPostData = async (postsCollection, url) => {
       },
     })
     .sort({ "properties.published": 1 })
-    .limit(1)
     .toArray();
+};
 
-  return items[0];
+/**
+ * Get post data
+ * @param {object} postsCollection - Posts database collection
+ * @param {string} url - URL of existing post (optional)
+ * @returns {Promise<object>} Post data for given URL else oldest post awaiting syndication
+ */
+export const getPostData = async (postsCollection, url) => {
+  if (url) {
+    return postsCollection.findOne({
+      "properties.url": url,
+    });
+  }
+
+  const [oldest] = await getPostsAwaitingSyndication(postsCollection);
+  return oldest;
 };
 
 /**
@@ -221,39 +230,6 @@ export const syndicateToTargets = async (
   };
 };
 
-/**
- * Derive OG image slug from a post URL path.
- * Matches Eleventy theme's ogSlug filter logic.
- *
- * Date-based: /type/YYYY/MM/DD/slug → YYYY-MM-DD-slug
- * Non-date:   /about/ → about
- * @param {string} postUrl - Full post URL
- * @returns {string|null} OG slug or null
- */
-export function urlToOgSlug(postUrl) {
-  try {
-    const pathname = new URL(postUrl).pathname;
-    const segments = pathname.split("/").filter(Boolean);
-
-    // Date-based URL: /type/yyyy/MM/dd/slug → 5 segments
-    if (segments.length === 5) {
-      const [, year, month, day, slug] = segments;
-      if (
-        /^\d{4}$/.test(year) &&
-        /^\d{2}$/.test(month) &&
-        /^\d{2}$/.test(day)
-      ) {
-        return `${year}-${month}-${day}-${slug}`;
-      }
-    }
-
-    // Fallback: last segment
-    return segments.at(-1);
-  } catch {
-    return;
-  }
-}
-
 /**
  * HEAD a URL and report its status, 0 on network error or timeout
  * @param {string} url - URL to check
@@ -276,30 +252,63 @@ const headCheck = async (url) => {
 };
 
 /**
- * Check if a post and its OG image are live on the public site.
- * Uses HTTP HEAD requests with a 5-second timeout.
+ * GET a page and return its status plus the og:image it declares.
+ * @param {string} url - Page URL
+ * @returns {Promise<{status: number, ogImage?: string}>}
+ */
+const fetchOgImage = async (url) => {
+  try {
+    const controller = new AbortController();
+    const timeoutId = setTimeout(() => controller.abort(), 5000);
+    const response = await fetch(url, {
+      redirect: "follow",
+      signal: controller.signal,
+    });
+    clearTimeout(timeoutId);
+    if (response.status !== 200) return { status: response.status };
+    const html = await response.text();
+    const match = html.match(/<meta\s+property="og:image"\s+content="([^"]+)"/);
+    return { status: 200, ogImage: match?.[1] };
+  } catch {
+    return { status: 0 };
+  }
+};
+
+/**
+ * Check if a post and its OG card are live on the public site.
+ *
+ * Reads the og:image the POST ITSELF declares rather than re-deriving its
+ * filename. The removed helper's own docstring said "Matches Eleventy theme's
+ * ogSlug filter logic" — a hand-copied convention from another repo, and on
+ * 2026-09-13 that convention changed: the theme added the post type to the
+ * cache key so a like and a reply sharing a basename stop colliding. This gate
+ * kept asking for the old type-less name, got 404 for cards that were
+ * demonstrably live, and silently blocked syndication for every new post.
+ *
+ * Reading the page removes the coupling: whatever the page says its card is, we
+ * check that. It also makes `skipOg` unnecessary in principle — a photo post
+ * declares its photo as og:image and that HEADs the same way — though the flag
+ * is kept for callers that still pass it.
+ *
+ * Costs one GET instead of one HEAD, for posts awaiting syndication only.
  * @param {string} postUrl - Full public URL of the post
- * @param {string} me - Publication URL (e.g., "https://rmendes.net")
+ * @param {string} me - Publication URL (no longer used to build the card URL; kept for the signature)
  * @param {object} [options] - Options
- * @param {boolean} [options.skipOg] - Skip OG image check (e.g., photo posts
- *   where Eleventy uses the photo itself as og:image instead of generating /og/*.png)
+ * @param {boolean} [options.skipOg] - Don't wait on any og:image
  * @returns {Promise<{ready: boolean, postStatus: number, ogStatus: number}>}
  */
 export async function isPostReady(postUrl, me, options = {}) {
   const { skipOg = false } = options;
-  const ogSlug = urlToOgSlug(postUrl);
-  const meNorm = me?.replace(/\/$/, "");
-  const ogUrl =
-    !skipOg && ogSlug && meNorm ? `${meNorm}/og/${ogSlug}.png` : undefined;
+  const { status: postStatus, ogImage } = await fetchOgImage(postUrl);
 
-  const [postStatus, ogStatus] = await Promise.all([
-    headCheck(postUrl),
-    ogUrl ? headCheck(ogUrl) : Promise.resolve(200),
-  ]);
+  if (postStatus !== 200) {
+    return { ready: false, postStatus, ogStatus: 0 };
+  }
+  // No card declared (or explicitly skipped) → nothing to wait for.
+  if (skipOg || !ogImage) {
+    return { ready: true, postStatus, ogStatus: 200 };
+  }
 
-  return {
-    ready: postStatus === 200 && ogStatus === 200,
-    postStatus,
-    ogStatus,
-  };
+  const ogStatus = await headCheck(ogImage);
+  return { ready: ogStatus === 200, postStatus, ogStatus };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rmdes/indiekit-endpoint-syndicate",
-  "version": "1.0.0-beta.44",
+  "version": "1.0.0-beta.46",
   "description": "Syndication endpoint for Indiekit. Fork of @indiekit/endpoint-syndicate with batch syndication support and bug fixes.",
   "keywords": [
     "indiekit",
@@ -29,7 +29,7 @@
   },
   "dependencies": {
     "@indiekit/error": "^1.0.0-beta.28",
-    "express": "^5.2.1",
+    "express": "^5.3.0",
     "jsonwebtoken": "^9.0.3"
   },
   "publishConfig": {