@rmdes/indiekit-endpoint-microsub 1.0.41 → 1.0.43

package/index.js

@@ -9,7 +9,11 @@ import { readerController } from "./lib/controllers/reader.js";
 import { handleMediaProxy } from "./lib/media/proxy.js";
 import { startScheduler, stopScheduler } from "./lib/polling/scheduler.js";
 import { ensureActivityPubChannel } from "./lib/storage/channels.js";
-import { cleanupAllReadItems, createIndexes } from "./lib/storage/items.js";
+import {
+  cleanupAllReadItems,
+  cleanupStaleItems,
+  createIndexes,
+} from "./lib/storage/items.js";
 import { webmentionReceiver } from "./lib/webmention/receiver.js";
 import { websubHandler } from "./lib/websub/handler.js";
 
@@ -210,6 +214,11 @@ export default class MicrosubEndpoint {
       cleanupAllReadItems(indiekit).catch((error) => {
         console.warn("[Microsub] Startup cleanup failed:", error.message);
       });
+
+      // Delete stale items (stripped skeletons + unread older than 30 days)
+      cleanupStaleItems(indiekit).catch((error) => {
+        console.warn("[Microsub] Stale cleanup failed:", error.message);
+      });
     } else {
       console.warn(
         "[Microsub] Database not available at init, scheduler not started",

package/lib/controllers/timeline.js

@@ -6,7 +6,7 @@
 import { IndiekitError } from "@indiekit/error";
 
 import { proxyItemImages } from "../media/proxy.js";
-import { getChannel } from "../storage/channels.js";
+import { getChannel, getChannelById } from "../storage/channels.js";
 import {
   getTimelineItems,
   markItemsRead,
@@ -72,8 +72,16 @@ export async function action(request, response) {
 
   validateChannel(channel);
 
-  // Verify channel exists
-  const channelDocument = await getChannel(application, channel, userId);
+  // Verify channel exists — try by UID first, fall back to ObjectId
+  // (timeline view may send ObjectId string for items from orphan channels)
+  let channelDocument = await getChannel(application, channel, userId);
+  if (!channelDocument) {
+    try {
+      channelDocument = await getChannelById(application, channel);
+    } catch {
+      // Invalid ObjectId format — channel string is not a valid ObjectId
+    }
+  }
   if (!channelDocument) {
     throw new IndiekitError("Channel not found", {
       status: 404,

package/lib/storage/items.js

@@ -387,6 +387,10 @@ export async function countReadItems(application, channelId, userId) {
 // uid, readBy) so the poller doesn't re-ingest them as new unread entries.
 const MAX_FULL_READ_ITEMS = 200;
 
+// Maximum age (in days) for stripped skeletons and unread items.
+// After this period, both are hard-deleted to prevent unbounded growth.
+const MAX_ITEM_AGE_DAYS = 30;
+
 /**
  * Cleanup old read items by stripping content but preserving dedup skeletons.
  * This prevents the vicious cycle where deleted read items get re-ingested as
@@ -575,6 +579,63 @@ export async function cleanupAllReadItems(application) {
   return totalCleaned;
 }
 
+/**
+ * Delete stale items: stripped skeletons and unread items older than MAX_ITEM_AGE_DAYS.
+ * Stripped skeletons have served their dedup purpose; stale unread items are unlikely
+ * to be read. Both are hard-deleted to prevent unbounded collection growth.
+ * @param {object} application - Indiekit application
+ * @returns {Promise<number>} Total number of items deleted
+ */
+export async function cleanupStaleItems(application) {
+  const collection = getCollection(application);
+  const cutoff = new Date();
+  cutoff.setDate(cutoff.getDate() - MAX_ITEM_AGE_DAYS);
+
+  // Delete stripped skeletons older than cutoff
+  const strippedResult = await collection.deleteMany({
+    _stripped: true,
+    $or: [
+      { published: { $lt: cutoff } },
+      { published: { $exists: false }, createdAt: { $lt: cutoff.toISOString() } },
+    ],
+  });
+
+  // Delete unread items older than cutoff
+  const unreadResult = await collection.deleteMany({
+    readBy: { $in: [null, []] },
+    _stripped: { $ne: true },
+    $or: [
+      { published: { $lt: cutoff } },
+      { published: { $exists: false }, createdAt: { $lt: cutoff.toISOString() } },
+    ],
+  });
+
+  // Also catch items with no readBy field at all
+  const noReadByResult = await collection.deleteMany({
+    readBy: { $exists: false },
+    _stripped: { $ne: true },
+    $or: [
+      { published: { $lt: cutoff } },
+      { published: { $exists: false }, createdAt: { $lt: cutoff.toISOString() } },
+    ],
+  });
+
+  const total =
+    strippedResult.deletedCount +
+    unreadResult.deletedCount +
+    noReadByResult.deletedCount;
+
+  if (total > 0) {
+    console.info(
+      `[Microsub] Stale cleanup: deleted ${strippedResult.deletedCount} stripped skeletons, ` +
+        `${unreadResult.deletedCount + noReadByResult.deletedCount} stale unread items ` +
+        `(cutoff: ${MAX_ITEM_AGE_DAYS} days)`,
+    );
+  }
+
+  return total;
+}
+
 export async function markItemsRead(application, channelId, entryIds, userId) {
   const collection = getCollection(application);
   const channelObjectId =

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rmdes/indiekit-endpoint-microsub",
-  "version": "1.0.41",
+  "version": "1.0.43",
   "description": "Microsub endpoint for Indiekit. Enables subscribing to feeds and reading content using the Microsub protocol.",
   "keywords": [
     "indiekit",

package/views/partials/item-card.njk

@@ -203,6 +203,7 @@
             data-action="mark-read"
             data-item-id="{{ item._id }}"
             {% if item._channelUid %}data-channel-uid="{{ item._channelUid }}"{% endif %}
+            {% if item._channelId %}data-channel-id="{{ item._channelId }}"{% endif %}
             title="Mark as read">
       {{ icon("checkboxChecked") }}
       <span class="visually-hidden">Mark read</span>

package/views/timeline.njk

@@ -108,7 +108,8 @@
 
         const itemId = button.dataset.itemId;
         const channelUid = button.dataset.channelUid;
-        if (!itemId || !channelUid) return;
+        const channelId = button.dataset.channelId;
+        if (!itemId || (!channelUid && !channelId)) return;
 
         button.disabled = true;
 
@@ -116,7 +117,7 @@
           const formData = new URLSearchParams();
           formData.append('action', 'timeline');
           formData.append('method', 'mark_read');
-          formData.append('channel', channelUid);
+          formData.append('channel', channelUid || channelId);
           formData.append('entry', itemId);
 
           const response = await fetch(microsubApiUrl, {