WIP: Refactor to use drivemanager

Author: ThisIsMissEm

.env.sample

@@ -12,12 +12,18 @@ LISTEN_PORT=3000
 # is implemented.
 ALLOW_PRIVATE_ADDRESS=false
 REMOTE_ACTOR_FETCH_POSTS=10
+
+# File uploads and media storage:
 DRIVE_DISK=
-ASSET_URL_BASE=
-FS_ASSET_PATH=
-AWS_ACCESS_KEY_ID=
-AWS_SECRET_ACCESS_KEY=
-S3_REGION=
-S3_ENDPOINT_URL=
-S3_BUCKET=
-S3_FORCE_PATH_STYLE=false
+STORAGE_URL_BASE=
+
+# If DRIVE_DISK is "fs":
+# FS_STORAGE_PATH=
+
+# If DRIVE_DISK is "s3":
+# AWS_ACCESS_KEY_ID=
+# AWS_SECRET_ACCESS_KEY=
+# S3_REGION=
+# S3_ENDPOINT_URL=
+# S3_BUCKET=
+# S3_FORCE_PATH_STYLE=false

src/api/v1/accounts.ts

@@ -53,7 +53,7 @@ import {
   pinnedPosts,
   posts,
 } from "../../schema";
-import { disk, getAssetUrl } from "../../storage";
+import { drive } from "../../storage";
 import { extractCustomEmojis, formatText } from "../../text";
 import { type Uuid, isUuid } from "../../uuid";
 import { timelineQuerySchema } from "./timelines";
@@ -107,6 +107,7 @@ app.patch(
     }),
   ),
   async (c) => {
+    const disk = drive.use();
     const owner = c.get("token").accountOwner;
     if (owner == null) {
       return c.json(
@@ -133,7 +134,7 @@ app.patch(
         contentLength: content.byteLength,
         visibility: "public",
       });
-      avatarUrl = getAssetUrl(`${path}?${Date.now()}`, c.req.url);
+      avatarUrl = await disk.getUrl(path);
     }
     let coverUrl = undefined;
     if (form.header instanceof File) {
@@ -156,7 +157,7 @@ app.patch(
       } catch (error) {
         return c.json({ error: "Failed to upload header image." }, 500);
       }
-      coverUrl = getAssetUrl(`${path}?${Date.now()}`, c.req.url);
+      coverUrl = await disk.getUrl(path);
     }
     const fedCtx = federation.createContext(c.req.raw, undefined);
     const fmtOpts = {

src/api/v1/media.ts

@@ -7,12 +7,13 @@ import { serializeMedium } from "../../entities/medium";
 import { makeVideoScreenshot, uploadThumbnail } from "../../media";
 import { type Variables, scopeRequired, tokenRequired } from "../../oauth";
 import { media } from "../../schema";
-import { disk, getAssetUrl } from "../../storage";
+import { drive } from "../../storage";
 import { isUuid, uuidv7 } from "../../uuid";
 
 const app = new Hono<{ Variables: Variables }>();
 
 export async function postMedia(c: Context<{ Variables: Variables }>) {
+  const disk = drive.use();
   const owner = c.get("token").accountOwner;
   if (owner == null) {
     return c.json({ error: "This method requires an authenticated user" }, 422);
@@ -47,7 +48,7 @@ export async function postMedia(c: Context<{ Variables: Variables }>) {
   } catch (error) {
     return c.json({ error: "Failed to save media file" }, 500);
   }
-  const url = getAssetUrl(path, c.req.url);
+  const url = await disk.getUrl(path);
   const result = await db
     .insert(media)
     .values({
@@ -57,7 +58,7 @@ export async function postMedia(c: Context<{ Variables: Variables }>) {
       width: fileMetadata.width!,
       height: fileMetadata.height!,
       description,
-      ...(await uploadThumbnail(id, image, c.req.url)),
+      ...(await uploadThumbnail(id, image)),
     })
     .returning();
   if (result.length < 1) {

src/federation/post.ts

@@ -416,7 +416,7 @@ export async function persistPost(
       }
       const image = sharp(imageBytes);
       metadata = await image.metadata();
-      thumbnail = await uploadThumbnail(id, image, baseUrl);
+      thumbnail = await uploadThumbnail(id, image);
     } catch {
       metadata = {
         width: attachment.width ?? 512,

src/index.tsx

@@ -10,7 +10,7 @@ import fedi from "./federation";
 import image from "./image";
 import oauth, { oauthAuthorizationServer } from "./oauth";
 import pages from "./pages";
-import { DRIVE_DISK, assetPath } from "./storage";
+import { DRIVE_DISK, FS_STORAGE_PATH } from "./storage";
 
 const app = new Hono();
 
@@ -23,7 +23,7 @@ if (DRIVE_DISK === "fs") {
   app.use(
     "/assets/*",
     serveStatic({
-      root: relative(process.cwd(), assetPath!),
+      root: relative(process.cwd(), FS_STORAGE_PATH!),
       rewriteRequestPath: (path) => path.substring("/assets".length),
     }),
   );

src/media.ts

@@ -4,8 +4,7 @@ import { tmpdir } from "node:os";
 import { join } from "node:path";
 import ffmpeg from "fluent-ffmpeg";
 import type { Sharp } from "sharp";
-import { disk } from "./storage";
-import { getAssetUrl } from "./storage";
+import { drive } from "./storage";
 
 const DEFAULT_THUMBNAIL_AREA = 230_400;
 
@@ -19,9 +18,9 @@ export interface Thumbnail {
 export async function uploadThumbnail(
   id: string,
   original: Sharp,
-  url: URL | string,
   thumbnailArea = DEFAULT_THUMBNAIL_AREA,
 ): Promise<Thumbnail> {
+  const disk = drive.use();
   const originalMetadata = await original.metadata();
   let width = originalMetadata.width!;
   let height = originalMetadata.height!;
@@ -55,7 +54,7 @@ export async function uploadThumbnail(
     throw error;
   }
   return {
-    thumbnailUrl: getAssetUrl(`media/${id}/thumbnail.webp`, url),
+    thumbnailUrl: await disk.getUrl(`media/${id}/thumbnail.webp`),
     thumbnailType: "image/webp",
     thumbnailWidth: thumbnailSize.width,
     thumbnailHeight: thumbnailSize.height,

src/pages/emojis.tsx

@@ -6,7 +6,7 @@ import { DashboardLayout } from "../components/DashboardLayout";
 import db from "../db";
 import { loginRequired } from "../login";
 import { accounts, customEmojis, posts, reactions } from "../schema";
-import { disk, getAssetUrl } from "../storage";
+import { drive } from "../storage";
 
 const logger = getLogger(["hollo", "pages", "emojis"]);
 
@@ -153,6 +153,7 @@ emojis.get("/new", async (c) => {
 });
 
 emojis.post("/", async (c) => {
+  const disk = drive.use();
   const form = await c.req.formData();
   const categoryValue = form.get("category")?.toString();
   const category = categoryValue?.startsWith("category:")
@@ -185,9 +186,10 @@ emojis.post("/", async (c) => {
       visibility: "public",
     });
   } catch (error) {
+    console.error(error);
     return c.text("Failed to store emoji image", 500);
   }
-  const url = getAssetUrl(path, c.req.url);
+  const url = await disk.getUrl(path);
   await db.insert(customEmojis).values({
     category,
     shortcode,