@anthusai/papyrus 1.0.0-next.29 → 1.0.0-next.30

package/app/api/media/[...path]/route.ts

@@ -1,4 +1,5 @@
 import { NextResponse } from "next/server";
+import { buildMediaRouteResponse } from "../../../../lib/media-route-response";
 import { isGuestReadableStoragePath, signStorageUrl } from "../../../../lib/reader-storage-url";
 
 export const dynamic = "force-dynamic";
@@ -16,20 +17,8 @@ export async function GET(_request: Request, context: MediaRouteContext) {
     return NextResponse.json({ error: "Forbidden storage path." }, { status: 403 });
   }
 
-  const signedUrl = await signStorageUrl(storagePath);
-  const upstream = await fetch(signedUrl, { cache: "no-store" });
-  if (!upstream.ok) {
-    return NextResponse.json(
-      { error: `Upstream media fetch failed (${upstream.status}).` },
-      { status: upstream.status === 404 ? 404 : 502 },
-    );
-  }
-
-  const headers = new Headers();
-  const contentType = upstream.headers.get("content-type");
-  if (contentType) {
-    headers.set("content-type", contentType);
-  }
-  headers.set("cache-control", "public, max-age=3600, stale-while-revalidate=86400");
-  return new NextResponse(upstream.body, { status: 200, headers });
+  return buildMediaRouteResponse(storagePath, {
+    signStorageUrl,
+    fetchUpstream: (signedUrl) => fetch(signedUrl, { cache: "no-store" }),
+  });
 }

package/lib/media-route-response.ts

@@ -0,0 +1,45 @@
+const PROXIED_IMAGE_EXTENSIONS = new Set(["jpg", "jpeg", "png", "gif", "webp", "avif", "svg"]);
+
+export type MediaRouteDependencies = {
+  signStorageUrl: (storagePath: string) => Promise<string>;
+  fetchUpstream: (signedUrl: string) => Promise<Response>;
+};
+
+export function isProxiedImagePath(storagePath: string): boolean {
+  const lastSegment = storagePath.split("/").pop() ?? "";
+  const dotIndex = lastSegment.lastIndexOf(".");
+  if (dotIndex < 0) {
+    return false;
+  }
+  return PROXIED_IMAGE_EXTENSIONS.has(lastSegment.slice(dotIndex + 1).toLowerCase());
+}
+
+export async function buildMediaRouteResponse(
+  storagePath: string,
+  dependencies: MediaRouteDependencies,
+): Promise<Response> {
+  const signedUrl = await dependencies.signStorageUrl(storagePath);
+
+  if (!isProxiedImagePath(storagePath)) {
+    return new Response(null, {
+      status: 307,
+      headers: { location: signedUrl, "cache-control": "private, max-age=300" },
+    });
+  }
+
+  const upstream = await dependencies.fetchUpstream(signedUrl);
+  if (!upstream.ok) {
+    return Response.json(
+      { error: `Upstream media fetch failed (${upstream.status}).` },
+      { status: upstream.status === 404 ? 404 : 502 },
+    );
+  }
+
+  const headers = new Headers();
+  const contentType = upstream.headers.get("content-type");
+  if (contentType) {
+    headers.set("content-type", contentType);
+  }
+  headers.set("cache-control", "public, max-age=3600, stale-while-revalidate=86400");
+  return new Response(upstream.body, { status: 200, headers });
+}

package/package.json

@@ -163,6 +163,7 @@
     "./lib/markus-ir": "./lib/markus-ir.ts",
     "./lib/markus-projection": "./lib/markus-projection.ts",
     "./lib/markus-to-article": "./lib/markus-to-article.ts",
+    "./lib/media-route-response": "./lib/media-route-response.ts",
     "./lib/news-desk-session": "./lib/news-desk-session.ts",
     "./lib/newspaper-layout": "./lib/newspaper-layout.ts",
     "./lib/newsroom-articles": "./lib/newsroom-articles.ts",
@@ -294,7 +295,7 @@
       "optional": true
     }
   },
-  "version": "1.0.0-next.29",
+  "version": "1.0.0-next.30",
   "dependencies": {
     "@aws-amplify/adapter-nextjs": "^1.7.3",
     "@aws-sdk/client-cognito-identity-provider": "3.1045.0",

package/routes.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-next.29",
+  "version": "1.0.0-next.30",
   "routes": [
     {
       "file": "app/%5F_preview/[[...path]]/route.ts",