@rmdes/indiekit-endpoint-microsub 1.0.0-beta.9 → 1.0.1

package/index.js

@@ -4,7 +4,9 @@ import express from "express";
 
 import { microsubController } from "./lib/controllers/microsub.js";
 import { readerController } from "./lib/controllers/reader.js";
+import { handleMediaProxy } from "./lib/media/proxy.js";
 import { startScheduler, stopScheduler } from "./lib/polling/scheduler.js";
+import { createIndexes } from "./lib/storage/items.js";
 import { webmentionReceiver } from "./lib/webmention/receiver.js";
 import { websubHandler } from "./lib/websub/handler.js";
 
@@ -67,6 +69,9 @@ export default class MicrosubEndpoint {
     // Webmention receiving endpoint
     router.post("/webmention", webmentionReceiver.receive);
 
+    // Media proxy endpoint
+    router.get("/media/:hash", handleMediaProxy);
+
     // Reader UI routes (mounted as sub-router for correct baseUrl)
     readerRouter.get("/", readerController.index);
     readerRouter.get("/channels", readerController.channels);
@@ -78,6 +83,7 @@ export default class MicrosubEndpoint {
       "/channels/:uid/settings",
       readerController.updateSettings,
     );
+    readerRouter.post("/channels/:uid/delete", readerController.deleteChannel);
     readerRouter.get("/channels/:uid/feeds", readerController.feeds);
     readerRouter.post("/channels/:uid/feeds", readerController.addFeed);
     readerRouter.post(
@@ -109,6 +115,9 @@ export default class MicrosubEndpoint {
     // Webmention endpoint must be public
     publicRouter.post("/webmention", webmentionReceiver.receive);
 
+    // Media proxy must be public for images to load
+    publicRouter.get("/media/:hash", handleMediaProxy);
+
     return publicRouter;
   }
 
@@ -142,6 +151,11 @@ export default class MicrosubEndpoint {
     if (indiekit.database) {
       console.info("[Microsub] Database available, starting scheduler");
       startScheduler(indiekit);
+
+      // Create indexes for optimal performance (runs in background)
+      createIndexes(indiekit).catch((error) => {
+        console.warn("[Microsub] Index creation failed:", error.message);
+      });
     } else {
       console.warn(
         "[Microsub] Database not available at init, scheduler not started",

package/lib/cache/redis.js

@@ -3,22 +3,56 @@
  * @module cache/redis
  */
 
+import Redis from "ioredis";
+
+let redisClient;
+
 /**
  * Get Redis client from application
  * @param {object} application - Indiekit application
  * @returns {object|undefined} Redis client or undefined
  */
 export function getRedisClient(application) {
-  // Check if Redis is configured
+  // Check if Redis is already initialized on the application
   if (application.redis) {
     return application.redis;
   }
 
+  // Check if we already created a client
+  if (redisClient) {
+    return redisClient;
+  }
+
   // Check for Redis URL in config
-  if (application.config?.application?.redisUrl) {
-    // Lazily create Redis connection
-    // This will be implemented when Redis support is added to Indiekit core
-    return;
+  const redisUrl = application.config?.application?.redisUrl;
+  if (redisUrl) {
+    try {
+      redisClient = new Redis(redisUrl, {
+        maxRetriesPerRequest: 3,
+        retryStrategy(times) {
+          const delay = Math.min(times * 50, 2000);
+          return delay;
+        },
+        lazyConnect: true,
+      });
+
+      redisClient.on("error", (error) => {
+        console.error("[Microsub] Redis error:", error.message);
+      });
+
+      redisClient.on("connect", () => {
+        console.info("[Microsub] Redis connected");
+      });
+
+      // Connect asynchronously
+      redisClient.connect().catch((error) => {
+        console.warn("[Microsub] Redis connection failed:", error.message);
+      });
+
+      return redisClient;
+    } catch (error) {
+      console.warn("[Microsub] Failed to initialize Redis:", error.message);
+    }
   }
 }
 
@@ -131,3 +165,17 @@ export async function subscribeToChannel(redis, channel, callback) {
     // Ignore subscription errors
   }
 }
+
+/**
+ * Cleanup Redis connection on shutdown
+ */
+export async function closeRedis() {
+  if (redisClient) {
+    try {
+      await redisClient.quit();
+      redisClient = undefined;
+    } catch {
+      // Ignore cleanup errors
+    }
+  }
+}

package/lib/controllers/block.js

@@ -4,6 +4,7 @@
  */
 
 import { deleteItemsByAuthorUrl } from "../storage/items.js";
+import { getUserId } from "../utils/auth.js";
 import { validateUrl } from "../utils/validation.js";
 
 /**
@@ -23,7 +24,7 @@ function getCollection(application) {
  */
 export async function list(request, response) {
   const { application } = request.app.locals;
-  const userId = request.session?.userId;
+  const userId = getUserId(request);
 
   const collection = getCollection(application);
   const blocked = await collection.find({ userId }).toArray();
@@ -40,7 +41,7 @@ export async function list(request, response) {
  */
 export async function block(request, response) {
   const { application } = request.app.locals;
-  const userId = request.session?.userId;
+  const userId = getUserId(request);
   const { url } = request.body;
 
   validateUrl(url);
@@ -71,7 +72,7 @@ export async function block(request, response) {
  */
 export async function unblock(request, response) {
   const { application } = request.app.locals;
-  const userId = request.session?.userId;
+  const userId = getUserId(request);
   const { url } = request.body;
 
   validateUrl(url);

package/lib/controllers/channels.js

@@ -13,6 +13,7 @@ import {
   deleteChannel,
   reorderChannels,
 } from "../storage/channels.js";
+import { getUserId } from "../utils/auth.js";
 import {
   validateChannel,
   validateChannelName,
@@ -27,7 +28,7 @@ import {
  */
 export async function list(request, response) {
   const { application } = request.app.locals;
-  const userId = request.session?.userId;
+  const userId = getUserId(request);
 
   const channels = await getChannels(application, userId);
 
@@ -42,7 +43,7 @@ export async function list(request, response) {
  */
 export async function action(request, response) {
   const { application } = request.app.locals;
-  const userId = request.session?.userId;
+  const userId = getUserId(request);
   const { method, name, uid } = request.body;
 
   // Delete channel
@@ -113,7 +114,7 @@ export async function action(request, response) {
  */
 export async function get(request, response) {
   const { application } = request.app.locals;
-  const userId = request.session?.userId;
+  const userId = getUserId(request);
   const { uid } = request.params;
 
   validateChannel(uid);

package/lib/controllers/events.js

@@ -9,6 +9,7 @@ import {
   sendEvent,
   subscribeClient,
 } from "../realtime/broker.js";
+import { getUserId } from "../utils/auth.js";
 
 /**
  * SSE stream endpoint
@@ -18,7 +19,7 @@ import {
  */
 export async function stream(request, response) {
   const { application } = request.app.locals;
-  const userId = request.session?.userId;
+  const userId = getUserId(request);
 
   // Set SSE headers
   response.setHeader("Content-Type", "text/event-stream");

package/lib/controllers/follow.js

@@ -10,10 +10,16 @@ import { getChannel } from "../storage/channels.js";
 import {
   createFeed,
   deleteFeed,
+  getFeedByUrl,
   getFeedsForChannel,
 } from "../storage/feeds.js";
+import { getUserId } from "../utils/auth.js";
 import { createFeedResponse } from "../utils/jf2.js";
 import { validateChannel, validateUrl } from "../utils/validation.js";
+import {
+  unsubscribe as websubUnsubscribe,
+  getCallbackUrl,
+} from "../websub/subscriber.js";
 
 /**
  * List followed feeds for a channel
@@ -23,7 +29,7 @@ import { validateChannel, validateUrl } from "../utils/validation.js";
  */
 export async function list(request, response) {
   const { application } = request.app.locals;
-  const userId = request.session?.userId;
+  const userId = getUserId(request);
   const { channel } = request.query;
 
   validateChannel(channel);
@@ -47,7 +53,7 @@ export async function list(request, response) {
  */
 export async function follow(request, response) {
   const { application } = request.app.locals;
-  const userId = request.session?.userId;
+  const userId = getUserId(request);
   const { channel, url } = request.body;
 
   validateChannel(channel);
@@ -67,12 +73,11 @@ export async function follow(request, response) {
   });
 
   // Trigger immediate fetch in background (don't await)
+  // This will also discover and subscribe to WebSub hubs
   refreshFeedNow(application, feed._id).catch((error) => {
     console.error(`[Microsub] Error fetching new feed ${url}:`, error.message);
   });
 
-  // TODO: Attempt WebSub subscription
-
   response.status(201).json(createFeedResponse(feed));
 }
 
@@ -84,7 +89,7 @@ export async function follow(request, response) {
  */
 export async function unfollow(request, response) {
   const { application } = request.app.locals;
-  const userId = request.session?.userId;
+  const userId = getUserId(request);
   const { channel, url } = request.body;
 
   validateChannel(channel);
@@ -95,13 +100,28 @@ export async function unfollow(request, response) {
     throw new IndiekitError("Channel not found", { status: 404 });
   }
 
+  // Get feed before deletion to check for WebSub subscription
+  const feed = await getFeedByUrl(application, channelDocument._id, url);
+
+  // Unsubscribe from WebSub hub if active
+  if (feed?.websub?.hub) {
+    const baseUrl = application.url;
+    if (baseUrl) {
+      const callbackUrl = getCallbackUrl(baseUrl, feed._id.toString());
+      websubUnsubscribe(application, feed, callbackUrl).catch((error) => {
+        console.error(
+          `[Microsub] WebSub unsubscribe error for ${url}:`,
+          error.message,
+        );
+      });
+    }
+  }
+
   const deleted = await deleteFeed(application, channelDocument._id, url);
   if (!deleted) {
     throw new IndiekitError("Feed not found", { status: 404 });
   }
 
-  // TODO: Cancel WebSub subscription if active
-
   response.json({ result: "ok" });
 }
 

package/lib/controllers/mute.js

@@ -5,6 +5,7 @@
 
 import { IndiekitError } from "@indiekit/error";
 
+import { getUserId } from "../utils/auth.js";
 import { validateChannel, validateUrl } from "../utils/validation.js";
 
 /**
@@ -24,7 +25,7 @@ function getCollection(application) {
  */
 export async function list(request, response) {
   const { application } = request.app.locals;
-  const userId = request.session?.userId;
+  const userId = getUserId(request);
   const { channel } = request.query;
 
   // Channel can be "global" or a specific channel UID
@@ -58,7 +59,7 @@ export async function list(request, response) {
  */
 export async function mute(request, response) {
   const { application } = request.app.locals;
-  const userId = request.session?.userId;
+  const userId = getUserId(request);
   const { channel, url } = request.body;
 
   validateUrl(url);
@@ -99,7 +100,7 @@ export async function mute(request, response) {
  */
 export async function unmute(request, response) {
   const { application } = request.app.locals;
-  const userId = request.session?.userId;
+  const userId = getUserId(request);
   const { channel, url } = request.body;
 
   validateUrl(url);

package/lib/controllers/reader.js

@@ -10,6 +10,7 @@ import {
   getChannel,
   createChannel,
   updateChannelSettings,
+  deleteChannel,
 } from "../storage/channels.js";
 import {
   getFeedsForChannel,
@@ -17,6 +18,7 @@ import {
   deleteFeed,
 } from "../storage/feeds.js";
 import { getTimelineItems, getItemById } from "../storage/items.js";
+import { getUserId } from "../utils/auth.js";
 import {
   validateChannelName,
   validateExcludeTypes,
@@ -39,7 +41,7 @@ export async function index(request, response) {
  */
 export async function channels(request, response) {
   const { application } = request.app.locals;
-  const userId = request.session?.userId;
+  const userId = getUserId(request);
 
   const channelList = await getChannels(application, userId);
 
@@ -69,7 +71,7 @@ export async function newChannel(request, response) {
  */
 export async function createChannelAction(request, response) {
   const { application } = request.app.locals;
-  const userId = request.session?.userId;
+  const userId = getUserId(request);
   const { name } = request.body;
 
   validateChannelName(name);
@@ -87,7 +89,7 @@ export async function createChannelAction(request, response) {
  */
 export async function channel(request, response) {
   const { application } = request.app.locals;
-  const userId = request.session?.userId;
+  const userId = getUserId(request);
   const { uid } = request.params;
   const { before, after } = request.query;
 
@@ -119,7 +121,7 @@ export async function channel(request, response) {
  */
 export async function settings(request, response) {
   const { application } = request.app.locals;
-  const userId = request.session?.userId;
+  const userId = getUserId(request);
   const { uid } = request.params;
 
   const channelDocument = await getChannel(application, uid, userId);
@@ -144,7 +146,7 @@ export async function settings(request, response) {
  */
 export async function updateSettings(request, response) {
   const { application } = request.app.locals;
-  const userId = request.session?.userId;
+  const userId = getUserId(request);
   const { uid } = request.params;
   const { excludeTypes, excludeRegex } = request.body;
 
@@ -171,6 +173,32 @@ export async function updateSettings(request, response) {
   response.redirect(`${request.baseUrl}/channels/${uid}`);
 }
 
+/**
+ * Delete channel
+ * @param {object} request - Express request
+ * @param {object} response - Express response
+ * @returns {Promise<void>}
+ */
+export async function deleteChannelAction(request, response) {
+  const { application } = request.app.locals;
+  const userId = getUserId(request);
+  const { uid } = request.params;
+
+  // Don't allow deleting notifications channel
+  if (uid === "notifications") {
+    return response.redirect(`${request.baseUrl}/channels`);
+  }
+
+  const channelDocument = await getChannel(application, uid, userId);
+  if (!channelDocument) {
+    return response.status(404).render("404");
+  }
+
+  await deleteChannel(application, uid, userId);
+
+  response.redirect(`${request.baseUrl}/channels`);
+}
+
 /**
  * View feeds for a channel
  * @param {object} request - Express request
@@ -179,7 +207,7 @@ export async function updateSettings(request, response) {
  */
 export async function feeds(request, response) {
   const { application } = request.app.locals;
-  const userId = request.session?.userId;
+  const userId = getUserId(request);
   const { uid } = request.params;
 
   const channelDocument = await getChannel(application, uid, userId);
@@ -205,7 +233,7 @@ export async function feeds(request, response) {
  */
 export async function addFeed(request, response) {
   const { application } = request.app.locals;
-  const userId = request.session?.userId;
+  const userId = getUserId(request);
   const { uid } = request.params;
   const { url } = request.body;
 
@@ -238,7 +266,7 @@ export async function addFeed(request, response) {
  */
 export async function removeFeed(request, response) {
   const { application } = request.app.locals;
-  const userId = request.session?.userId;
+  const userId = getUserId(request);
   const { uid } = request.params;
   const { url } = request.body;
 
@@ -260,7 +288,7 @@ export async function removeFeed(request, response) {
  */
 export async function item(request, response) {
   const { application } = request.app.locals;
-  const userId = request.session?.userId;
+  const userId = getUserId(request);
   const { id } = request.params;
 
   const itemDocument = await getItemById(application, id, userId);
@@ -282,25 +310,121 @@ export async function item(request, response) {
  * @returns {Promise<void>}
  */
 export async function compose(request, response) {
-  const { replyTo, likeOf, repostOf } = request.query;
+  const { replyTo, likeOf, repostOf, bookmarkOf } = request.query;
 
   response.render("compose", {
     title: request.__("microsub.compose.title"),
     replyTo,
     likeOf,
     repostOf,
+    bookmarkOf,
     baseUrl: request.baseUrl,
   });
 }
 
 /**
- * Submit composed response
+ * Submit composed response via Micropub
  * @param {object} request - Express request
  * @param {object} response - Express response
+ * @returns {Promise<void>}
  */
 export async function submitCompose(request, response) {
-  // TODO: Submit via Micropub
-  response.redirect(`${request.baseUrl}/channels`);
+  const { application } = request.app.locals;
+  const { content } = request.body;
+  const inReplyTo = request.body["in-reply-to"];
+  const likeOf = request.body["like-of"];
+  const repostOf = request.body["repost-of"];
+  const bookmarkOf = request.body["bookmark-of"];
+
+  // Get Micropub endpoint
+  const micropubEndpoint = application.micropubEndpoint;
+  if (!micropubEndpoint) {
+    return response.status(500).render("error", {
+      title: "Error",
+      error: { message: "Micropub endpoint not configured" },
+    });
+  }
+
+  // Build absolute Micropub URL
+  const micropubUrl = micropubEndpoint.startsWith("http")
+    ? micropubEndpoint
+    : new URL(micropubEndpoint, application.url).href;
+
+  // Get auth token from session
+  const token = request.session?.access_token;
+  if (!token) {
+    return response.redirect("/session/login?redirect=" + request.originalUrl);
+  }
+
+  // Build Micropub request body
+  const micropubData = new URLSearchParams();
+  micropubData.append("h", "entry");
+
+  if (likeOf) {
+    // Like post (no content needed)
+    micropubData.append("like-of", likeOf);
+  } else if (repostOf) {
+    // Repost (no content needed)
+    micropubData.append("repost-of", repostOf);
+  } else if (bookmarkOf) {
+    // Bookmark (content optional)
+    micropubData.append("bookmark-of", bookmarkOf);
+    if (content) {
+      micropubData.append("content", content);
+    }
+  } else if (inReplyTo) {
+    // Reply
+    micropubData.append("in-reply-to", inReplyTo);
+    micropubData.append("content", content || "");
+  } else {
+    // Regular note
+    micropubData.append("content", content || "");
+  }
+
+  try {
+    const micropubResponse = await fetch(micropubUrl, {
+      method: "POST",
+      headers: {
+        Authorization: `Bearer ${token}`,
+        "Content-Type": "application/x-www-form-urlencoded",
+        Accept: "application/json",
+      },
+      body: micropubData.toString(),
+    });
+
+    if (
+      micropubResponse.ok ||
+      micropubResponse.status === 201 ||
+      micropubResponse.status === 202
+    ) {
+      // Success - get the Location header for the new post URL
+      const location = micropubResponse.headers.get("Location");
+      console.info(
+        `[Microsub] Created post via Micropub: ${location || "success"}`,
+      );
+
+      // Redirect back to reader with success message
+      return response.redirect(`${request.baseUrl}/channels`);
+    }
+
+    // Handle error
+    const errorBody = await micropubResponse.text();
+    console.error(
+      `[Microsub] Micropub error: ${micropubResponse.status} ${errorBody}`,
+    );
+
+    return response.status(micropubResponse.status).render("error", {
+      title: "Error",
+      error: { message: `Micropub error: ${micropubResponse.statusText}` },
+    });
+  } catch (error) {
+    console.error(`[Microsub] Micropub request failed: ${error.message}`);
+
+    return response.status(500).render("error", {
+      title: "Error",
+      error: { message: `Failed to create post: ${error.message}` },
+    });
+  }
 }
 
 /**
@@ -311,7 +435,7 @@ export async function submitCompose(request, response) {
  */
 export async function searchPage(request, response) {
   const { application } = request.app.locals;
-  const userId = request.session?.userId;
+  const userId = getUserId(request);
 
   const channelList = await getChannels(application, userId);
 
@@ -330,7 +454,7 @@ export async function searchPage(request, response) {
  */
 export async function searchFeeds(request, response) {
   const { application } = request.app.locals;
-  const userId = request.session?.userId;
+  const userId = getUserId(request);
   const { query } = request.body;
 
   const channelList = await getChannels(application, userId);
@@ -362,7 +486,7 @@ export async function searchFeeds(request, response) {
  */
 export async function subscribe(request, response) {
   const { application } = request.app.locals;
-  const userId = request.session?.userId;
+  const userId = getUserId(request);
   const { url, channel: channelUid } = request.body;
 
   const channelDocument = await getChannel(application, channelUid, userId);
@@ -394,6 +518,7 @@ export const readerController = {
   channel,
   settings,
   updateSettings,
+  deleteChannel: deleteChannelAction,
   feeds,
   addFeed,
   removeFeed,

package/lib/controllers/search.js

@@ -8,6 +8,7 @@ import { IndiekitError } from "@indiekit/error";
 import { discoverFeeds } from "../feeds/hfeed.js";
 import { searchWithFallback } from "../search/query.js";
 import { getChannel } from "../storage/channels.js";
+import { getUserId } from "../utils/auth.js";
 import { validateChannel, validateUrl } from "../utils/validation.js";
 
 /**
@@ -77,7 +78,7 @@ export async function discover(request, response) {
  */
 export async function search(request, response) {
   const { application } = request.app.locals;
-  const userId = request.session?.userId;
+  const userId = getUserId(request);
   const { query, channel } = request.body;
 
   if (!query) {

package/lib/controllers/timeline.js

@@ -5,6 +5,7 @@
 
 import { IndiekitError } from "@indiekit/error";
 
+import { proxyItemImages } from "../media/proxy.js";
 import { getChannel } from "../storage/channels.js";
 import {
   getTimelineItems,
@@ -12,6 +13,7 @@ import {
   markItemsUnread,
   removeItems,
 } from "../storage/items.js";
+import { getUserId } from "../utils/auth.js";
 import {
   validateChannel,
   validateEntries,
@@ -26,7 +28,7 @@ import {
  */
 export async function get(request, response) {
   const { application } = request.app.locals;
-  const userId = request.session?.userId;
+  const userId = getUserId(request);
   const { channel, before, after, limit } = request.query;
 
   validateChannel(channel);
@@ -46,6 +48,14 @@ export async function get(request, response) {
     userId,
   });
 
+  // Proxy images if application URL is available
+  const baseUrl = application.url;
+  if (baseUrl && timeline.items) {
+    timeline.items = timeline.items.map((item) =>
+      proxyItemImages(item, baseUrl),
+    );
+  }
+
   response.json(timeline);
 }
 
@@ -57,7 +67,7 @@ export async function get(request, response) {
  */
 export async function action(request, response) {
   const { application } = request.app.locals;
-  const userId = request.session?.userId;
+  const userId = getUserId(request);
   const { method, channel } = request.body;
 
   validateChannel(channel);