@rmdes/indiekit-endpoint-activitypub 3.8.5 → 3.8.7

package/index.js

@@ -387,38 +387,6 @@ export default class ActivityPubEndpoint {
     const router = express.Router(); // eslint-disable-line new-cap
     const self = this;
 
-    // Intercept Micropub delete actions to broadcast Delete to fediverse.
-    // Wraps res.json to detect successful delete responses, then fires
-    // broadcastDelete asynchronously so remote servers remove the post.
-    router.use((req, res, next) => {
-      if (req.method !== "POST") return next();
-      if (!req.path.endsWith("/micropub")) return next();
-
-      const action = req.query?.action || req.body?.action;
-      if (action !== "delete") return next();
-
-      const postUrl = req.query?.url || req.body?.url;
-      if (!postUrl) return next();
-
-      const originalJson = res.json.bind(res);
-      res.json = function (body) {
-        // Fire broadcastDelete after successful delete (status 200)
-        if (res.statusCode === 200 && body?.success === "delete") {
-          console.info(
-            `[ActivityPub] Micropub delete detected for ${postUrl}, broadcasting Delete to followers`,
-          );
-          self.broadcastDelete(postUrl).catch((error) => {
-            console.warn(
-              `[ActivityPub] broadcastDelete after Micropub delete failed: ${error.message}`,
-            );
-          });
-        }
-        return originalJson(body);
-      };
-
-      return next();
-    });
-
     // Let Fedify handle NodeInfo data (/nodeinfo/2.1)
     // Only pass GET/HEAD requests — POST/PUT/DELETE must not go through
     // Fedify here, because fromExpressRequest() consumes the body stream,
@@ -715,6 +683,9 @@ export default class ActivityPubEndpoint {
           return undefined;
         }
       },
+
+      delete: async (url) => this.delete(url),
+      update: async (properties) => this.update(properties),
     };
   }
 
@@ -1181,6 +1152,138 @@ export default class ActivityPubEndpoint {
     }
   }
 
+  /**
+   * Called by post-content.js when a Micropub delete succeeds.
+   * Broadcasts an ActivityPub Delete activity to all followers.
+   * @param {string} url - Full URL of the deleted post
+   */
+  async delete(url) {
+    await this.broadcastDelete(url).catch((err) =>
+      console.warn(`[ActivityPub] broadcastDelete failed for ${url}: ${err.message}`)
+    );
+  }
+
+  /**
+   * Called by post-content.js when a Micropub update succeeds.
+   * Broadcasts an ActivityPub Update activity for the post to all followers.
+   * @param {object} properties - JF2 post properties (must include url)
+   */
+  async update(properties) {
+    await this.broadcastPostUpdate(properties).catch((err) =>
+      console.warn(`[ActivityPub] broadcastPostUpdate failed for ${properties?.url}: ${err.message}`)
+    );
+  }
+
+  /**
+   * Send an Update activity to all followers for a modified post.
+   * Mirrors broadcastDelete() pattern: batch delivery with shared inbox dedup.
+   * @param {object} properties - JF2 post properties
+   */
+  async broadcastPostUpdate(properties) {
+    if (!this._federation) return;
+
+    try {
+      const { Update } = await import("@fedify/fedify/vocab");
+      const actorUrl = this._getActorUrl();
+      const handle = this.options.actor.handle;
+      const ctx = this._federation.createContext(
+        new URL(this._publicationUrl),
+        { handle, publicationUrl: this._publicationUrl },
+      );
+
+      // Build the Note/Article object by calling jf2ToAS2Activity() and
+      // extracting the wrapped object from the returned Create activity.
+      // For post edits, Fediverse servers expect an Update activity wrapping
+      // the updated object — NOT a second Create activity.
+      const createActivity = jf2ToAS2Activity(
+        properties,
+        actorUrl,
+        this._publicationUrl,
+        { visibility: this.options.defaultVisibility },
+      );
+
+      if (!createActivity) {
+        console.warn(`[ActivityPub] broadcastPostUpdate: could not convert post to AS2 for ${properties?.url}`);
+        return;
+      }
+
+      // Extract the Note/Article object from the Create wrapper, then build
+      // an Update activity around it — matching broadcastActorUpdate() pattern.
+      const noteObject = await createActivity.getObject();
+      const activity = new Update({
+        actor: ctx.getActorUri(handle),
+        object: noteObject,
+      });
+
+      const followers = await this._collections.ap_followers
+        .find({})
+        .project({ actorUrl: 1, inbox: 1, sharedInbox: 1 })
+        .toArray();
+
+      const inboxMap = new Map();
+      for (const f of followers) {
+        const key = f.sharedInbox || f.inbox;
+        if (key && !inboxMap.has(key)) {
+          inboxMap.set(key, f);
+        }
+      }
+
+      const uniqueRecipients = [...inboxMap.values()];
+      const BATCH_SIZE = 25;
+      const BATCH_DELAY_MS = 5000;
+      let delivered = 0;
+      let failed = 0;
+
+      console.info(
+        `[ActivityPub] Broadcasting Update for ${properties.url} to ${uniqueRecipients.length} unique inboxes`,
+      );
+
+      for (let i = 0; i < uniqueRecipients.length; i += BATCH_SIZE) {
+        const batch = uniqueRecipients.slice(i, i + BATCH_SIZE);
+        const recipients = batch.map((f) => ({
+          id: new URL(f.actorUrl),
+          inboxId: new URL(f.inbox || f.sharedInbox),
+          endpoints: f.sharedInbox
+            ? { sharedInbox: new URL(f.sharedInbox) }
+            : undefined,
+        }));
+
+        try {
+          await ctx.sendActivity(
+            { identifier: handle },
+            recipients,
+            activity,
+            { preferSharedInbox: true },
+          );
+          delivered += batch.length;
+        } catch (error) {
+          failed += batch.length;
+          console.warn(
+            `[ActivityPub] Update batch ${Math.floor(i / BATCH_SIZE) + 1} failed: ${error.message}`,
+          );
+        }
+
+        if (i + BATCH_SIZE < uniqueRecipients.length) {
+          await new Promise((resolve) => setTimeout(resolve, BATCH_DELAY_MS));
+        }
+      }
+
+      console.info(
+        `[ActivityPub] Update broadcast complete for ${properties.url}: ${delivered} delivered, ${failed} failed`,
+      );
+
+      await logActivity(this._collections.ap_activities, {
+        direction: "outbound",
+        type: "Update",
+        actorUrl: this._publicationUrl,
+        objectUrl: properties.url,
+        summary: `Sent Update for ${properties.url} to ${delivered} inboxes`,
+      }).catch(() => {});
+    } catch (error) {
+      console.warn("[ActivityPub] broadcastPostUpdate failed:", error.message);
+    }
+  }
+
   /**
    * Build the full actor URL from config.
    * @returns {string}
@@ -1615,6 +1718,7 @@ export default class ActivityPubEndpoint {
     }, 10_000);
 
     // Run one-time migrations (idempotent — safe to run on every startup)
+    console.info("[ActivityPub] Init: starting post-refollow setup");
     runSeparateMentionsMigration(this._collections).then(({ skipped, updated }) => {
       if (!skipped) {
         console.log(`[ActivityPub] Migration separate-mentions: updated ${updated} timeline items`);
@@ -1661,6 +1765,7 @@ export default class ActivityPubEndpoint {
     });
 
     // Start async inbox queue processor (processes one item every 3s)
+    console.info("[ActivityPub] Init: starting inbox queue processor");
     this._inboxProcessorInterval = startInboxProcessor(
       this._collections,
       () => this._federation?.createContext(new URL(this._publicationUrl), {

package/lib/inbox-queue.js

@@ -28,10 +28,9 @@ async function processNextItem(collections, ctx, handle) {
 
   try {
     await routeToHandler(item, collections, ctx, handle);
-    await ap_inbox_queue.updateOne(
-      { _id: item._id },
-      { $set: { status: "completed", processedAt: new Date().toISOString() } },
-    );
+    // Delete completed items immediately — prevents unbounded collection growth
+    // that caused the inbox processor to hang on restart (95K+ documents).
+    await ap_inbox_queue.deleteOne({ _id: item._id });
   } catch (error) {
     const attempts = (item.attempts || 0) + 1;
     await ap_inbox_queue.updateOne(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rmdes/indiekit-endpoint-activitypub",
-  "version": "3.8.5",
+  "version": "3.8.7",
   "description": "ActivityPub federation endpoint for Indiekit via Fedify. Adds full fediverse support: actor, inbox, outbox, followers, following, syndication, and Mastodon migration.",
   "keywords": [
     "indiekit",