@jant/core 0.3.8 → 0.3.9

package/src/services/__tests__/media.test.ts

@@ -22,7 +22,7 @@ describe("MediaService", () => {
     originalName: "photo.jpg",
     mimeType: "image/jpeg",
     size: 102400,
-    r2Key: "media/2025/01/0192a9f1-a2b7-7c3d-8e4f-5a6b7c8d9e0f.jpg",
+    storageKey: "media/2025/01/0192a9f1-a2b7-7c3d-8e4f-5a6b7c8d9e0f.jpg",
     width: 1920,
     height: 1080,
   };
@@ -36,9 +36,10 @@ describe("MediaService", () => {
       expect(media.originalName).toBe("photo.jpg");
       expect(media.mimeType).toBe("image/jpeg");
       expect(media.size).toBe(102400);
-      expect(media.r2Key).toBe(
+      expect(media.storageKey).toBe(
         "media/2025/01/0192a9f1-a2b7-7c3d-8e4f-5a6b7c8d9e0f.jpg",
       );
+      expect(media.provider).toBe("r2");
       expect(media.width).toBe(1920);
       expect(media.height).toBe(1080);
       expect(media.postId).toBeNull();
@@ -56,6 +57,20 @@ describe("MediaService", () => {
       expect(media.alt).toBe("A beautiful sunset");
     });
 
+    it("defaults provider to 'r2'", async () => {
+      const media = await mediaService.create(sampleMedia);
+      expect(media.provider).toBe("r2");
+    });
+
+    it("accepts provider 's3'", async () => {
+      const media = await mediaService.create({
+        ...sampleMedia,
+        storageKey: "media/2025/01/s3-upload.jpg",
+        provider: "s3",
+      });
+      expect(media.provider).toBe("s3");
+    });
+
     it("creates media with position and blurhash", async () => {
       const media = await mediaService.create({
         ...sampleMedia,
@@ -71,7 +86,7 @@ describe("MediaService", () => {
       const media1 = await mediaService.create(sampleMedia);
       const media2 = await mediaService.create({
         ...sampleMedia,
-        r2Key: "media/2025/01/other.jpg",
+        storageKey: "media/2025/01/other.jpg",
       });
 
       expect(media1.id).not.toBe(media2.id);
@@ -92,7 +107,7 @@ describe("MediaService", () => {
     it("auto-generates id when not provided", async () => {
       const media = await mediaService.create({
         ...sampleMedia,
-        r2Key: "media/2025/01/auto.jpg",
+        storageKey: "media/2025/01/auto.jpg",
       });
 
       expect(media.id).toBeTruthy();
@@ -122,11 +137,11 @@ describe("MediaService", () => {
     it("returns media for valid IDs", async () => {
       const m1 = await mediaService.create({
         ...sampleMedia,
-        r2Key: "media/a.jpg",
+        storageKey: "media/a.jpg",
       });
       const m2 = await mediaService.create({
         ...sampleMedia,
-        r2Key: "media/b.jpg",
+        storageKey: "media/b.jpg",
       });
 
       const results = await mediaService.getByIds([m1.id, m2.id]);
@@ -157,11 +172,11 @@ describe("MediaService", () => {
 
       const m1 = await mediaService.create({
         ...sampleMedia,
-        r2Key: "media/a.jpg",
+        storageKey: "media/a.jpg",
       });
       const m2 = await mediaService.create({
         ...sampleMedia,
-        r2Key: "media/b.jpg",
+        storageKey: "media/b.jpg",
       });
 
       await mediaService.attachToPost(post.id, [m2.id, m1.id]);
@@ -198,15 +213,15 @@ describe("MediaService", () => {
 
       const m1 = await mediaService.create({
         ...sampleMedia,
-        r2Key: "media/a.jpg",
+        storageKey: "media/a.jpg",
       });
       const m2 = await mediaService.create({
         ...sampleMedia,
-        r2Key: "media/b.jpg",
+        storageKey: "media/b.jpg",
       });
       const m3 = await mediaService.create({
         ...sampleMedia,
-        r2Key: "media/c.jpg",
+        storageKey: "media/c.jpg",
       });
 
       await mediaService.attachToPost(post1.id, [m1.id, m2.id]);
@@ -231,11 +246,11 @@ describe("MediaService", () => {
 
       const m1 = await mediaService.create({
         ...sampleMedia,
-        r2Key: "media/a.jpg",
+        storageKey: "media/a.jpg",
       });
       const m2 = await mediaService.create({
         ...sampleMedia,
-        r2Key: "media/b.jpg",
+        storageKey: "media/b.jpg",
       });
 
       await mediaService.attachToPost(post.id, [m2.id, m1.id]);
@@ -247,11 +262,11 @@ describe("MediaService", () => {
     });
   });
 
-  describe("getByR2Key", () => {
+  describe("getByStorageKey", () => {
     it("returns media by R2 key", async () => {
       await mediaService.create(sampleMedia);
 
-      const found = await mediaService.getByR2Key(
+      const found = await mediaService.getByStorageKey(
         "media/2025/01/0192a9f1-a2b7-7c3d-8e4f-5a6b7c8d9e0f.jpg",
       );
       expect(found).not.toBeNull();
@@ -259,7 +274,7 @@ describe("MediaService", () => {
     });
 
     it("returns null for non-existent R2 key", async () => {
-      const found = await mediaService.getByR2Key("nonexistent");
+      const found = await mediaService.getByStorageKey("nonexistent");
       expect(found).toBeNull();
     });
   });
@@ -271,8 +286,8 @@ describe("MediaService", () => {
     });
 
     it("returns media ordered by createdAt desc", async () => {
-      await mediaService.create({ ...sampleMedia, r2Key: "a.jpg" });
-      await mediaService.create({ ...sampleMedia, r2Key: "b.jpg" });
+      await mediaService.create({ ...sampleMedia, storageKey: "a.jpg" });
+      await mediaService.create({ ...sampleMedia, storageKey: "b.jpg" });
 
       const list = await mediaService.list();
       expect(list).toHaveLength(2);
@@ -280,7 +295,10 @@ describe("MediaService", () => {
 
     it("respects limit parameter", async () => {
       for (let i = 0; i < 5; i++) {
-        await mediaService.create({ ...sampleMedia, r2Key: `img${i}.jpg` });
+        await mediaService.create({
+          ...sampleMedia,
+          storageKey: `img${i}.jpg`,
+        });
       }
 
       const list = await mediaService.list(2);
@@ -297,11 +315,11 @@ describe("MediaService", () => {
 
       const m1 = await mediaService.create({
         ...sampleMedia,
-        r2Key: "media/a.jpg",
+        storageKey: "media/a.jpg",
       });
       const m2 = await mediaService.create({
         ...sampleMedia,
-        r2Key: "media/b.jpg",
+        storageKey: "media/b.jpg",
       });
 
       await mediaService.attachToPost(post.id, [m1.id, m2.id]);
@@ -322,15 +340,15 @@ describe("MediaService", () => {
 
       const m1 = await mediaService.create({
         ...sampleMedia,
-        r2Key: "media/a.jpg",
+        storageKey: "media/a.jpg",
       });
       const m2 = await mediaService.create({
         ...sampleMedia,
-        r2Key: "media/b.jpg",
+        storageKey: "media/b.jpg",
       });
       const m3 = await mediaService.create({
         ...sampleMedia,
-        r2Key: "media/c.jpg",
+        storageKey: "media/c.jpg",
       });
 
       await mediaService.attachToPost(post.id, [m1.id, m2.id]);
@@ -355,7 +373,7 @@ describe("MediaService", () => {
 
       const m1 = await mediaService.create({
         ...sampleMedia,
-        r2Key: "media/a.jpg",
+        storageKey: "media/a.jpg",
       });
 
       await mediaService.attachToPost(post.id, [m1.id]);
@@ -375,7 +393,7 @@ describe("MediaService", () => {
 
       const m1 = await mediaService.create({
         ...sampleMedia,
-        r2Key: "media/a.jpg",
+        storageKey: "media/a.jpg",
       });
 
       await mediaService.attachToPost(post.id, [m1.id]);

package/src/services/media.ts

@@ -1,7 +1,7 @@
 /**
  * Media Service
  *
- * Handles media upload and management with R2 storage
+ * Handles media upload and management with pluggable storage backends.
  */
 
 import { eq, desc, inArray, asc } from "drizzle-orm";
@@ -19,7 +19,7 @@ export interface MediaService {
   list(limit?: number): Promise<Media[]>;
   create(data: CreateMediaData): Promise<Media>;
   delete(id: string): Promise<boolean>;
-  getByR2Key(r2Key: string): Promise<Media | null>;
+  getByStorageKey(storageKey: string): Promise<Media | null>;
   attachToPost(postId: number, mediaIds: string[]): Promise<void>;
   detachFromPost(postId: number): Promise<void>;
 }
@@ -31,7 +31,8 @@ export interface CreateMediaData {
   originalName: string;
   mimeType: string;
   size: number;
-  r2Key: string;
+  storageKey: string;
+  provider?: string;
   width?: number;
   height?: number;
   alt?: string;
@@ -48,7 +49,8 @@ export function createMediaService(db: Database): MediaService {
       originalName: row.originalName,
       mimeType: row.mimeType,
       size: row.size,
-      r2Key: row.r2Key,
+      storageKey: row.storageKey,
+      provider: row.provider,
       width: row.width,
       height: row.height,
       alt: row.alt,
@@ -107,11 +109,11 @@ export function createMediaService(db: Database): MediaService {
       return result;
     },
 
-    async getByR2Key(r2Key) {
+    async getByStorageKey(storageKey) {
       const result = await db
         .select()
         .from(media)
-        .where(eq(media.r2Key, r2Key))
+        .where(eq(media.storageKey, storageKey))
         .limit(1);
       return result[0] ? toMedia(result[0]) : null;
     },
@@ -138,7 +140,8 @@ export function createMediaService(db: Database): MediaService {
           originalName: data.originalName,
           mimeType: data.mimeType,
           size: data.size,
-          r2Key: data.r2Key,
+          storageKey: data.storageKey,
+          provider: data.provider ?? "r2",
           width: data.width ?? null,
           height: data.height ?? null,
           alt: data.alt ?? null,

package/src/theme/components/PostForm.tsx

@@ -5,7 +5,11 @@
 import type { FC } from "hono/jsx";
 import type { Post, Media, Collection } from "../../types.js";
 import { useLingui } from "@lingui/react/macro";
-import { getMediaUrl, getImageUrl } from "../../lib/image.js";
+import {
+  getMediaUrl,
+  getImageUrl,
+  getPublicUrlForProvider,
+} from "../../lib/image.js";
 
 export interface PostFormProps {
   post?: Post;
@@ -13,6 +17,7 @@ export interface PostFormProps {
   mediaAttachments?: Media[];
   r2PublicUrl?: string;
   imageTransformUrl?: string;
+  s3PublicUrl?: string;
   collections?: Collection[];
   postCollectionIds?: number[];
 }
@@ -23,6 +28,7 @@ export const PostForm: FC<PostFormProps> = ({
   mediaAttachments,
   r2PublicUrl,
   imageTransformUrl,
+  s3PublicUrl,
   collections,
   postCollectionIds,
 }) => {
@@ -135,7 +141,12 @@ export const PostForm: FC<PostFormProps> = ({
         {mediaAttachments && mediaAttachments.length > 0 && (
           <div class="grid grid-cols-4 sm:grid-cols-6 gap-2 mb-2">
             {mediaAttachments.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,

package/src/types.ts

@@ -32,6 +32,9 @@ export const POST_TYPE_MEDIA_RULES: Record<PostType, [number, number] | null> =
     page: null,
   };
 
+export const STORAGE_DRIVERS = ["r2", "s3"] as const;
+export type StorageDriver = (typeof STORAGE_DRIVERS)[number];
+
 export const VISIBILITY_LEVELS = [
   "featured",
   "quiet",
@@ -57,6 +60,14 @@ export interface Bindings {
   SITE_NAME?: string;
   SITE_DESCRIPTION?: string;
   SITE_LANGUAGE?: string;
+  // S3-compatible storage (alternative to R2)
+  STORAGE_DRIVER?: string;
+  S3_ENDPOINT?: string;
+  S3_BUCKET?: string;
+  S3_ACCESS_KEY_ID?: string;
+  S3_SECRET_ACCESS_KEY?: string;
+  S3_REGION?: string;
+  S3_PUBLIC_URL?: string;
 }
 
 // =============================================================================
@@ -113,6 +124,34 @@ export const CONFIG_FIELDS = {
     defaultValue: "",
     envOnly: true,
   },
+  STORAGE_DRIVER: {
+    defaultValue: "r2",
+    envOnly: true,
+  },
+  S3_ENDPOINT: {
+    defaultValue: "",
+    envOnly: true,
+  },
+  S3_BUCKET: {
+    defaultValue: "",
+    envOnly: true,
+  },
+  S3_ACCESS_KEY_ID: {
+    defaultValue: "",
+    envOnly: true,
+  },
+  S3_SECRET_ACCESS_KEY: {
+    defaultValue: "",
+    envOnly: true,
+  },
+  S3_REGION: {
+    defaultValue: "auto",
+    envOnly: true,
+  },
+  S3_PUBLIC_URL: {
+    defaultValue: "",
+    envOnly: true,
+  },
 } as const;
 
 export type ConfigKey = keyof typeof CONFIG_FIELDS;
@@ -147,7 +186,8 @@ export interface Media {
   originalName: string;
   mimeType: string;
   size: number;
-  r2Key: string;
+  storageKey: string;
+  provider: string;
   width: number | null;
   height: number | null;
   alt: string | null;