@jant/core 0.3.8 → 0.3.9

package/src/routes/api/posts.ts

@@ -12,7 +12,11 @@ import {
   validateMediaForPostType,
 } from "../../lib/schemas.js";
 import { requireAuthApi } from "../../middleware/auth.js";
-import { getMediaUrl, getImageUrl } from "../../lib/image.js";
+import {
+  getMediaUrl,
+  getImageUrl,
+  getPublicUrlForProvider,
+} from "../../lib/image.js";
 
 type Env = { Bindings: Bindings; Variables: AppVariables };
 
@@ -25,8 +29,14 @@ function toMediaAttachment(
   m: Media,
   r2PublicUrl?: string,
   imageTransformUrl?: string,
+  s3PublicUrl?: string,
 ) {
-  const url = getMediaUrl(m.id, m.r2Key, r2PublicUrl);
+  const publicUrl = getPublicUrlForProvider(
+    m.provider,
+    r2PublicUrl,
+    s3PublicUrl,
+  );
+  const url = getMediaUrl(m.id, m.storageKey, publicUrl);
   const previewUrl = getImageUrl(url, imageTransformUrl, {
     width: 400,
     quality: 80,
@@ -66,13 +76,14 @@ postsApiRoutes.get("/", async (c) => {
   const mediaMap = await c.var.services.media.getByPostIds(postIds);
   const r2PublicUrl = c.env.R2_PUBLIC_URL;
   const imageTransformUrl = c.env.IMAGE_TRANSFORM_URL;
+  const s3PublicUrl = c.env.S3_PUBLIC_URL;
 
   return c.json({
     posts: posts.map((p) => ({
       ...p,
       sqid: sqid.encode(p.id),
       mediaAttachments: (mediaMap.get(p.id) ?? []).map((m) =>
-        toMediaAttachment(m, r2PublicUrl, imageTransformUrl),
+        toMediaAttachment(m, r2PublicUrl, imageTransformUrl, s3PublicUrl),
       ),
     })),
 
@@ -94,12 +105,13 @@ postsApiRoutes.get("/:id", async (c) => {
   const mediaList = await c.var.services.media.getByPostId(post.id);
   const r2PublicUrl = c.env.R2_PUBLIC_URL;
   const imageTransformUrl = c.env.IMAGE_TRANSFORM_URL;
+  const s3PublicUrl = c.env.S3_PUBLIC_URL;
 
   return c.json({
     ...post,
     sqid: sqid.encode(post.id),
     mediaAttachments: mediaList.map((m) =>
-      toMediaAttachment(m, r2PublicUrl, imageTransformUrl),
+      toMediaAttachment(m, r2PublicUrl, imageTransformUrl, s3PublicUrl),
     ),
   });
 });
@@ -157,13 +169,14 @@ postsApiRoutes.post("/", requireAuthApi(), async (c) => {
   const mediaList = await c.var.services.media.getByPostId(post.id);
   const r2PublicUrl = c.env.R2_PUBLIC_URL;
   const imageTransformUrl = c.env.IMAGE_TRANSFORM_URL;
+  const s3PublicUrl = c.env.S3_PUBLIC_URL;
 
   return c.json(
     {
       ...post,
       sqid: sqid.encode(post.id),
       mediaAttachments: mediaList.map((m) =>
-        toMediaAttachment(m, r2PublicUrl, imageTransformUrl),
+        toMediaAttachment(m, r2PublicUrl, imageTransformUrl, s3PublicUrl),
       ),
     },
     201,
@@ -233,12 +246,13 @@ postsApiRoutes.put("/:id", requireAuthApi(), async (c) => {
   const mediaList = await c.var.services.media.getByPostId(post.id);
   const r2PublicUrl = c.env.R2_PUBLIC_URL;
   const imageTransformUrl = c.env.IMAGE_TRANSFORM_URL;
+  const s3PublicUrl = c.env.S3_PUBLIC_URL;
 
   return c.json({
     ...post,
     sqid: sqid.encode(post.id),
     mediaAttachments: mediaList.map((m) =>
-      toMediaAttachment(m, r2PublicUrl, imageTransformUrl),
+      toMediaAttachment(m, r2PublicUrl, imageTransformUrl, s3PublicUrl),
     ),
   });
 });

package/src/routes/api/timeline.tsx

@@ -49,7 +49,13 @@ timelineApiRoutes.get("/", async (c) => {
   const rawMediaMap = await c.var.services.media.getByPostIds(postIds);
   const r2PublicUrl = c.env.R2_PUBLIC_URL;
   const imageTransformUrl = c.env.IMAGE_TRANSFORM_URL;
-  const mediaMap = buildMediaMap(rawMediaMap, r2PublicUrl, imageTransformUrl);
+  const s3PublicUrl = c.env.S3_PUBLIC_URL;
+  const mediaMap = buildMediaMap(
+    rawMediaMap,
+    r2PublicUrl,
+    imageTransformUrl,
+    s3PublicUrl,
+  );
 
   // Get reply counts to identify thread roots
   const replyCounts = await c.var.services.posts.getReplyCounts(postIds);
@@ -74,6 +80,7 @@ timelineApiRoutes.get("/", async (c) => {
           await c.var.services.media.getByPostIds(previewReplyIds),
           r2PublicUrl,
           imageTransformUrl,
+          s3PublicUrl,
         )
       : new Map();
 

package/src/routes/api/upload.ts

@@ -11,7 +11,11 @@ import { uuidv7 } from "uuidv7";
 import type { Bindings } from "../../types.js";
 import type { AppVariables } from "../../app.js";
 import { requireAuthApi } from "../../middleware/auth.js";
-import { getMediaUrl, getImageUrl } from "../../lib/image.js";
+import {
+  getMediaUrl,
+  getImageUrl,
+  getPublicUrlForProvider,
+} from "../../lib/image.js";
 import { sse, dsSignals } from "../../lib/sse.js";
 
 type Env = { Bindings: Bindings; Variables: AppVariables };
@@ -27,16 +31,16 @@ uploadApiRoutes.use("*", requireAuthApi());
 function renderMediaCard(
   media: {
     id: string;
-    r2Key: string;
+    storageKey: string;
     mimeType: string;
     originalName: string;
     alt: string | null;
     size: number;
   },
-  r2PublicUrl?: string,
+  publicUrl?: string,
   imageTransformUrl?: string,
 ): string {
-  const fullUrl = getMediaUrl(media.id, media.r2Key, r2PublicUrl);
+  const fullUrl = getMediaUrl(media.id, media.storageKey, publicUrl);
   const thumbnailUrl = getImageUrl(fullUrl, imageTransformUrl, {
     width: 300,
     quality: 80,
@@ -116,11 +120,12 @@ function wantsSSE(c: {
 
 // Upload a file
 uploadApiRoutes.post("/", async (c) => {
-  if (!c.env.R2) {
+  const storage = c.var.storage;
+  if (!storage) {
     if (wantsSSE(c)) {
-      return dsSignals({ _uploadError: "R2 storage not configured" });
+      return dsSignals({ _uploadError: "Storage not configured" });
     }
-    return c.json({ error: "R2 storage not configured" }, 500);
+    return c.json({ error: "Storage not configured" }, 500);
   }
 
   const formData = await c.req.formData();
@@ -164,14 +169,12 @@ uploadApiRoutes.post("/", async (c) => {
   const year = date.getUTCFullYear();
   const month = String(date.getUTCMonth() + 1).padStart(2, "0");
   const filename = `${id}.${ext}`;
-  const r2Key = `media/${year}/${month}/${filename}`;
+  const storageKey = `media/${year}/${month}/${filename}`;
 
   try {
-    // Upload to R2
-    await c.env.R2.put(r2Key, file.stream(), {
-      httpMetadata: {
-        contentType: file.type,
-      },
+    // Upload to storage
+    await storage.put(storageKey, file.stream(), {
+      contentType: file.type,
     });
 
     // Save to database
@@ -181,14 +184,21 @@ uploadApiRoutes.post("/", async (c) => {
       originalName: file.name,
       mimeType: file.type,
       size: file.size,
-      r2Key,
+      storageKey,
+      provider: c.env.STORAGE_DRIVER || "r2",
     });
 
     // SSE response for Datastar
     if (wantsSSE(c)) {
+      const provider = c.env.STORAGE_DRIVER || "r2";
+      const mediaPublicUrl = getPublicUrlForProvider(
+        provider,
+        c.env.R2_PUBLIC_URL,
+        c.env.S3_PUBLIC_URL,
+      );
       const cardHtml = renderMediaCard(
         media,
-        c.env.R2_PUBLIC_URL,
+        mediaPublicUrl,
         c.env.IMAGE_TRANSFORM_URL,
       );
 
@@ -203,7 +213,13 @@ uploadApiRoutes.post("/", async (c) => {
     }
 
     // JSON response for API clients
-    const publicUrl = getMediaUrl(media.id, r2Key, c.env.R2_PUBLIC_URL);
+    const provider = c.env.STORAGE_DRIVER || "r2";
+    const mediaPublicUrl = getPublicUrlForProvider(
+      provider,
+      c.env.R2_PUBLIC_URL,
+      c.env.S3_PUBLIC_URL,
+    );
+    const publicUrl = getMediaUrl(media.id, storageKey, mediaPublicUrl);
     return c.json({
       id: media.id,
       filename: media.filename,
@@ -229,12 +245,18 @@ uploadApiRoutes.post("/", async (c) => {
 uploadApiRoutes.get("/", async (c) => {
   const limit = parseInt(c.req.query("limit") ?? "50", 10);
   const mediaList = await c.var.services.media.list(limit);
+  const r2PublicUrl = c.env.R2_PUBLIC_URL;
+  const s3PublicUrl = c.env.S3_PUBLIC_URL;
 
   return c.json({
     media: mediaList.map((m) => ({
       id: m.id,
       filename: m.filename,
-      url: getMediaUrl(m.id, m.r2Key, c.env.R2_PUBLIC_URL),
+      url: getMediaUrl(
+        m.id,
+        m.storageKey,
+        getPublicUrlForProvider(m.provider, r2PublicUrl, s3PublicUrl),
+      ),
       mimeType: m.mimeType,
       size: m.size,
       createdAt: m.createdAt,
@@ -250,13 +272,14 @@ uploadApiRoutes.delete("/:id", async (c) => {
     return c.json({ error: "Not found" }, 404);
   }
 
-  // Delete from R2
-  if (c.env.R2) {
+  // Delete from storage
+  const storage = c.var.storage;
+  if (storage) {
     try {
-      await c.env.R2.delete(media.r2Key);
+      await storage.delete(media.storageKey);
     } catch (err) {
       // eslint-disable-next-line no-console -- Error logging is intentional
-      console.error("R2 delete error:", err);
+      console.error("Storage delete error:", err);
     }
   }
 

package/src/routes/dash/media.tsx

@@ -13,7 +13,11 @@ import type { AppVariables } from "../../app.js";
 import { DashLayout } from "../../theme/layouts/index.js";
 import { EmptyState, DangerZone } from "../../theme/components/index.js";
 import * as time from "../../lib/time.js";
-import { getMediaUrl, getImageUrl } from "../../lib/image.js";
+import {
+  getMediaUrl,
+  getImageUrl,
+  getPublicUrlForProvider,
+} from "../../lib/image.js";
 import { dsRedirect } from "../../lib/sse.js";
 
 type Env = { Bindings: Bindings; Variables: AppVariables };
@@ -36,12 +40,19 @@ function MediaCard({
   media,
   r2PublicUrl,
   imageTransformUrl,
+  s3PublicUrl,
 }: {
   media: Media;
   r2PublicUrl?: string;
   imageTransformUrl?: string;
+  s3PublicUrl?: string;
 }) {
-  const fullUrl = getMediaUrl(media.id, media.r2Key, r2PublicUrl);
+  const publicUrl = getPublicUrlForProvider(
+    media.provider,
+    r2PublicUrl,
+    s3PublicUrl,
+  );
+  const fullUrl = getMediaUrl(media.id, media.storageKey, publicUrl);
   const thumbnailUrl = getImageUrl(fullUrl, imageTransformUrl, {
     width: 300,
     quality: 80,
@@ -96,10 +107,12 @@ function MediaListContent({
   mediaList,
   r2PublicUrl,
   imageTransformUrl,
+  s3PublicUrl,
 }: {
   mediaList: Media[];
   r2PublicUrl?: string;
   imageTransformUrl?: string;
+  s3PublicUrl?: string;
 }) {
   const { t } = useLingui();
 
@@ -187,6 +200,7 @@ function MediaListContent({
                 media={m}
                 r2PublicUrl={r2PublicUrl}
                 imageTransformUrl={imageTransformUrl}
+                s3PublicUrl={s3PublicUrl}
               />
             ))}
           </div>
@@ -217,13 +231,20 @@ function ViewMediaContent({
   media,
   r2PublicUrl,
   imageTransformUrl,
+  s3PublicUrl,
 }: {
   media: Media;
   r2PublicUrl?: string;
   imageTransformUrl?: string;
+  s3PublicUrl?: string;
 }) {
   const { t } = useLingui();
-  const url = getMediaUrl(media.id, media.r2Key, r2PublicUrl);
+  const publicUrl = getPublicUrlForProvider(
+    media.provider,
+    r2PublicUrl,
+    s3PublicUrl,
+  );
+  const url = getMediaUrl(media.id, media.storageKey, publicUrl);
   const thumbnailUrl = getImageUrl(url, imageTransformUrl, {
     width: 600,
     quality: 85,
@@ -401,6 +422,7 @@ mediaRoutes.get("/", async (c) => {
   const siteName = await getSiteName(c);
   const r2PublicUrl = c.env.R2_PUBLIC_URL;
   const imageTransformUrl = c.env.IMAGE_TRANSFORM_URL;
+  const s3PublicUrl = c.env.S3_PUBLIC_URL;
 
   return c.html(
     <DashLayout
@@ -413,6 +435,7 @@ mediaRoutes.get("/", async (c) => {
         mediaList={mediaList}
         r2PublicUrl={r2PublicUrl}
         imageTransformUrl={imageTransformUrl}
+        s3PublicUrl={s3PublicUrl}
       />
     </DashLayout>,
   );
@@ -424,6 +447,7 @@ mediaRoutes.get("/picker", async (c) => {
   const mediaList = await c.var.services.media.list(100);
   const r2PublicUrl = c.env.R2_PUBLIC_URL;
   const imageTransformUrl = c.env.IMAGE_TRANSFORM_URL;
+  const s3PublicUrl = c.env.S3_PUBLIC_URL;
 
   if (mediaList.length === 0) {
     return c.html(
@@ -438,7 +462,12 @@ mediaRoutes.get("/picker", async (c) => {
       {mediaList
         .filter((m) => m.mimeType.startsWith("image/"))
         .map((m) => {
-          const url = getMediaUrl(m.id, m.r2Key, r2PublicUrl);
+          const pUrl = getPublicUrlForProvider(
+            m.provider,
+            r2PublicUrl,
+            s3PublicUrl,
+          );
+          const url = getMediaUrl(m.id, m.storageKey, pUrl);
           const thumbUrl = getImageUrl(url, imageTransformUrl, {
             width: 150,
             quality: 80,
@@ -477,6 +506,7 @@ mediaRoutes.get("/:id", async (c) => {
   const siteName = await getSiteName(c);
   const r2PublicUrl = c.env.R2_PUBLIC_URL;
   const imageTransformUrl = c.env.IMAGE_TRANSFORM_URL;
+  const s3PublicUrl = c.env.S3_PUBLIC_URL;
 
   return c.html(
     <DashLayout
@@ -489,6 +519,7 @@ mediaRoutes.get("/:id", async (c) => {
         media={media}
         r2PublicUrl={r2PublicUrl}
         imageTransformUrl={imageTransformUrl}
+        s3PublicUrl={s3PublicUrl}
       />
     </DashLayout>,
   );
@@ -500,13 +531,14 @@ mediaRoutes.post("/:id/delete", async (c) => {
   const media = await c.var.services.media.getById(id);
   if (!media) return c.notFound();
 
-  // Delete from R2
-  if (c.env.R2) {
+  // Delete from storage
+  const storage = c.var.storage;
+  if (storage) {
     try {
-      await c.env.R2.delete(media.r2Key);
+      await storage.delete(media.storageKey);
     } catch (err) {
       // eslint-disable-next-line no-console -- Error logging is intentional
-      console.error("R2 delete error:", err);
+      console.error("Storage delete error:", err);
     }
   }
 

package/src/routes/dash/posts.tsx

@@ -168,6 +168,7 @@ function EditPostContent({
   mediaAttachments,
   r2PublicUrl,
   imageTransformUrl,
+  s3PublicUrl,
   collections,
   postCollectionIds,
 }: {
@@ -175,6 +176,7 @@ function EditPostContent({
   mediaAttachments: Media[];
   r2PublicUrl?: string;
   imageTransformUrl?: string;
+  s3PublicUrl?: string;
   collections: Collection[];
   postCollectionIds: number[];
 }) {
@@ -190,6 +192,7 @@ function EditPostContent({
         mediaAttachments={mediaAttachments}
         r2PublicUrl={r2PublicUrl}
         imageTransformUrl={imageTransformUrl}
+        s3PublicUrl={s3PublicUrl}
         collections={collections}
         postCollectionIds={postCollectionIds}
       />
@@ -232,6 +235,7 @@ postsRoutes.get("/:id/edit", async (c) => {
   const mediaAttachments = await c.var.services.media.getByPostId(post.id);
   const r2PublicUrl = c.env.R2_PUBLIC_URL;
   const imageTransformUrl = c.env.IMAGE_TRANSFORM_URL;
+  const s3PublicUrl = c.env.S3_PUBLIC_URL;
   const collections = await c.var.services.collections.list();
   const postCollections =
     await c.var.services.collections.getCollectionsForPost(post.id);
@@ -249,6 +253,7 @@ postsRoutes.get("/:id/edit", async (c) => {
         mediaAttachments={mediaAttachments}
         r2PublicUrl={r2PublicUrl}
         imageTransformUrl={imageTransformUrl}
+        s3PublicUrl={s3PublicUrl}
         collections={collections}
         postCollectionIds={postCollectionIds}
       />

package/src/routes/feed/rss.ts

@@ -7,7 +7,7 @@ import type { Bindings } from "../../types.js";
 import type { AppVariables } from "../../app.js";
 import * as sqid from "../../lib/sqid.js";
 import * as time from "../../lib/time.js";
-import { getMediaUrl } from "../../lib/image.js";
+import { getMediaUrl, getPublicUrlForProvider } from "../../lib/image.js";
 
 type Env = { Bindings: Bindings; Variables: AppVariables };
 
@@ -20,6 +20,7 @@ rssRoutes.get("/", async (c) => {
   const siteDescription = all["SITE_DESCRIPTION"] ?? "";
   const siteUrl = c.env.SITE_URL;
   const r2PublicUrl = c.env.R2_PUBLIC_URL;
+  const s3PublicUrl = c.env.S3_PUBLIC_URL;
 
   const posts = await c.var.services.posts.list({
     visibility: ["featured", "quiet"],
@@ -40,7 +41,7 @@ rssRoutes.get("/", async (c) => {
       const postMedia = mediaMap.get(post.id);
       const firstMedia = postMedia?.[0];
       const enclosure = firstMedia
-        ? `\n      <enclosure url="${getMediaUrl(firstMedia.id, firstMedia.r2Key, r2PublicUrl)}" length="${firstMedia.size}" type="${firstMedia.mimeType}"/>`
+        ? `\n      <enclosure url="${getMediaUrl(firstMedia.id, firstMedia.storageKey, getPublicUrlForProvider(firstMedia.provider, r2PublicUrl, s3PublicUrl))}" length="${firstMedia.size}" type="${firstMedia.mimeType}"/>`
         : "";
 
       return `

package/src/routes/pages/home.tsx

@@ -70,7 +70,13 @@ homeRoutes.get("/", async (c) => {
   const rawMediaMap = await c.var.services.media.getByPostIds(postIds);
   const r2PublicUrl = c.env.R2_PUBLIC_URL;
   const imageTransformUrl = c.env.IMAGE_TRANSFORM_URL;
-  const mediaMap = buildMediaMap(rawMediaMap, r2PublicUrl, imageTransformUrl);
+  const s3PublicUrl = c.env.S3_PUBLIC_URL;
+  const mediaMap = buildMediaMap(
+    rawMediaMap,
+    r2PublicUrl,
+    imageTransformUrl,
+    s3PublicUrl,
+  );
 
   // Get reply counts to identify thread roots
   const replyCounts = await c.var.services.posts.getReplyCounts(postIds);
@@ -95,6 +101,7 @@ homeRoutes.get("/", async (c) => {
           await c.var.services.media.getByPostIds(previewReplyIds),
           r2PublicUrl,
           imageTransformUrl,
+          s3PublicUrl,
         )
       : new Map();
 

package/src/routes/pages/post.tsx

@@ -10,7 +10,11 @@ import { BaseLayout, SiteLayout } from "../../theme/layouts/index.js";
 import { MediaGallery } from "../../theme/components/index.js";
 import * as sqid from "../../lib/sqid.js";
 import * as time from "../../lib/time.js";
-import { getMediaUrl, getImageUrl } from "../../lib/image.js";
+import {
+  getMediaUrl,
+  getImageUrl,
+  getPublicUrlForProvider,
+} from "../../lib/image.js";
 import { getNavigationData } from "../../lib/navigation.js";
 
 type Env = { Bindings: Bindings; Variables: AppVariables };
@@ -87,22 +91,30 @@ postRoutes.get("/:id", async (c) => {
   const rawMedia = await c.var.services.media.getByPostId(post.id);
   const r2PublicUrl = c.env.R2_PUBLIC_URL;
   const imageTransformUrl = c.env.IMAGE_TRANSFORM_URL;
-
-  const mediaAttachments: MediaAttachment[] = rawMedia.map((m) => ({
-    id: m.id,
-    url: getMediaUrl(m.id, m.r2Key, r2PublicUrl),
-    previewUrl: getImageUrl(
-      getMediaUrl(m.id, m.r2Key, r2PublicUrl),
-      imageTransformUrl,
-      { width: 400, quality: 80, format: "auto", fit: "cover" },
-    ),
-    alt: m.alt,
-    blurhash: m.blurhash,
-    width: m.width,
-    height: m.height,
-    position: m.position,
-    mimeType: m.mimeType,
-  }));
+  const s3PublicUrl = c.env.S3_PUBLIC_URL;
+
+  const mediaAttachments: MediaAttachment[] = rawMedia.map((m) => {
+    const publicUrl = getPublicUrlForProvider(
+      m.provider,
+      r2PublicUrl,
+      s3PublicUrl,
+    );
+    return {
+      id: m.id,
+      url: getMediaUrl(m.id, m.storageKey, publicUrl),
+      previewUrl: getImageUrl(
+        getMediaUrl(m.id, m.storageKey, publicUrl),
+        imageTransformUrl,
+        { width: 400, quality: 80, format: "auto", fit: "cover" },
+      ),
+      alt: m.alt,
+      blurhash: m.blurhash,
+      width: m.width,
+      height: m.height,
+      position: m.position,
+      mimeType: m.mimeType,
+    };
+  });
 
   const navData = await getNavigationData(c);
   const title = post.title || navData.siteName;