@commonpub/layer 0.15.4 → 0.15.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@commonpub/layer",
-  "version": "0.15.4",
+  "version": "0.15.6",
   "type": "module",
   "main": "./nuxt.config.ts",
   "files": [
@@ -53,12 +53,12 @@
     "vue": "^3.4.0",
     "vue-router": "^4.3.0",
     "zod": "^4.3.6",
-    "@commonpub/docs": "0.6.2",
-    "@commonpub/config": "0.10.0",
     "@commonpub/auth": "0.5.1",
-    "@commonpub/protocol": "0.9.9",
-    "@commonpub/learning": "0.5.0",
     "@commonpub/editor": "0.7.9",
+    "@commonpub/config": "0.10.0",
+    "@commonpub/docs": "0.6.2",
+    "@commonpub/learning": "0.5.0",
+    "@commonpub/protocol": "0.9.9",
     "@commonpub/ui": "0.8.5"
   },
   "devDependencies": {

package/server/{routes/hubs/[slug]/posts/[postId].ts → middleware/hub-post-ap.ts}

@@ -4,9 +4,13 @@ import { hubPosts, users } from '@commonpub/schema';
 import { eq } from 'drizzle-orm';
 
 /**
- * Hub post AP Note endpoint.
- * Serves the Note JSON-LD when requested with AP Accept header.
- * Remote instances dereference this URI when processing Announce activities.
+ * Middleware: serve ActivityPub Note JSON-LD for hub post URIs.
+ *
+ * Matches /hubs/{slug}/posts/{postId} with AP Accept headers.
+ * Non-AP requests pass through to the Nuxt page renderer.
+ *
+ * This MUST be a middleware (not a server route) because a server route
+ * returning undefined sends HTTP 204, which prevents the Nuxt page from rendering.
  */
 export default defineEventHandler(async (event) => {
   const accept = getRequestHeader(event, 'accept') ?? '';
@@ -16,13 +20,18 @@ export default defineEventHandler(async (event) => {
 
   if (!isAPRequest) return;
 
+  const path = getRequestURL(event).pathname;
+  // postId must be a UUID — anything else short-circuits before the drizzle
+  // query, which would otherwise throw on invalid UUID input and 500 for
+  // federation peers that probe bad URIs.
+  const match = path.match(/^\/hubs\/([a-z0-9][a-z0-9_-]*)\/posts\/([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})$/);
+  if (!match) return;
+
   const config = useConfig();
   if (!config.features.federation || !config.features.federateHubs) return;
 
-  const slug = getRouterParam(event, 'slug');
-  const postId = getRouterParam(event, 'postId');
-  if (!slug || !postId) return;
-
+  const slug = match[1]!;
+  const postId = match[2]!;
   const db = useDB();
   const domain = config.instance.domain;
 
@@ -51,7 +60,6 @@ export default defineEventHandler(async (event) => {
 
   setResponseHeader(event, 'content-type', 'application/activity+json');
 
-  // Build Note content — share posts need special handling
   let noteContent = escapeHtmlForAP(post.content);
   const ext: Record<string, unknown> = {};
 

package/server/routes/content/[slug].ts

@@ -3,12 +3,15 @@ import { contentItems, users } from '@commonpub/schema';
 import { eq, and, isNull } from 'drizzle-orm';
 
 /**
- * Content AP Article endpoint.
- * Serves Article JSON-LD when requested with AP Accept header.
- * Remote instances dereference this URI when processing:
- * - Create activities (content federation)
- * - Announce activities (hub share federation)
- * - Like/Boost activities targeting content
+ * Legacy content URI: /content/:slug
+ *
+ * AP clients (Accept: application/activity+json) get Article JSON-LD —
+ * remote instances still dereference this legacy URI when processing old
+ * Create/Announce/Like activities created before the URL restructure.
+ *
+ * Browsers get a 301 redirect to the canonical /u/:author/:type/:slug URL.
+ * Anything else would be a dead 204 (this is a server route, not middleware,
+ * and there's no Nuxt page at /content/:slug to fall through to).
  */
 export default defineEventHandler(async (event) => {
   const accept = getRequestHeader(event, 'accept') ?? '';
@@ -16,14 +19,12 @@ export default defineEventHandler(async (event) => {
     accept.includes('application/activity+json') ||
     accept.includes('application/ld+json');
 
-  if (!isAPRequest) return;
-
-  const config = useConfig();
-  if (!config.features.federation) return;
-
   const slug = getRouterParam(event, 'slug');
-  if (!slug) return;
+  if (!slug) {
+    throw createError({ statusCode: 404, statusMessage: 'Not Found' });
+  }
 
+  const config = useConfig();
   const db = useDB();
   const domain = config.instance.domain;
 
@@ -44,12 +45,23 @@ export default defineEventHandler(async (event) => {
     ))
     .limit(1);
 
-  if (!row) return;
+  if (!row) {
+    throw createError({ statusCode: 404, statusMessage: 'Content not found' });
+  }
+
+  // Browser: redirect to canonical URL.
+  if (!isAPRequest) {
+    return sendRedirect(event, `/u/${row.author.username}/${row.content.type}/${row.content.slug}`, 301);
+  }
+
+  // AP: serve Article JSON-LD.
+  if (!config.features.federation) {
+    throw createError({ statusCode: 404, statusMessage: 'Federation disabled' });
+  }
 
   setResponseHeader(event, 'content-type', 'application/activity+json');
 
-  // Render the content as an AP Article with all CommonPub extensions
-  const article = contentToArticle(
+  return contentToArticle(
     {
       id: row.content.id,
       type: row.content.type,
@@ -66,6 +78,4 @@ export default defineEventHandler(async (event) => {
     { username: row.author.username, displayName: row.author.displayName ?? row.author.username },
     domain,
   );
-
-  return article;
 });