DB에 청크 업로드 경로를 저장하도록 변경

src/hooks.server.ts

@@ -7,7 +7,7 @@ import {
   cleanupExpiredSessions,
   cleanupExpiredSessionUpgradeChallenges,
 } from "$lib/server/db/session";
-import { cleanupExpiredUploadSessions } from "$lib/server/db/upload";
+import { cleanupExpiredUploadSessions } from "$lib/server/services/upload";
 import { authenticate, setAgentInfo } from "$lib/server/middlewares";
 
 export const init: ServerInit = async () => {

src/lib/constants/upload.ts

@@ -2,5 +2,5 @@ export const AES_GCM_IV_SIZE = 12;
 export const AES_GCM_TAG_SIZE = 16;
 export const ENCRYPTION_OVERHEAD = AES_GCM_IV_SIZE + AES_GCM_TAG_SIZE;
 
-export const CHUNK_SIZE = 4 * 1024 * 1024;
+export const CHUNK_SIZE = 4 * 1024 * 1024; // 4 MiB
 export const ENCRYPTED_CHUNK_SIZE = CHUNK_SIZE + ENCRYPTION_OVERHEAD;

src/lib/server/db/media.ts

@@ -14,13 +14,13 @@ interface FileThumbnail extends Thumbnail {
 }
 
 export const updateFileThumbnail = async (
+  trx: typeof db,
   userId: number,
   fileId: number,
   dekVersion: Date,
   path: string,
   encContentIv: string | null,
 ) => {
-  return await db.transaction().execute(async (trx) => {
   const file = await trx
     .selectFrom("file")
     .select("data_encryption_key_version")
@@ -61,7 +61,6 @@ export const updateFileThumbnail = async (
     )
     .execute();
   return thumbnail?.oldPath ?? null;
-  });
 };
 
 export const getFileThumbnail = async (userId: number, fileId: number) => {

src/lib/server/db/migrations/1768062380-AddChunkedUpload.ts

@@ -17,9 +17,10 @@ export const up = async (db: Kysely<any>) => {
   // upload.ts
   await db.schema
     .createTable("upload_session")
-    .addColumn("id", "uuid", (col) => col.primaryKey().defaultTo(sql`gen_random_uuid()`))
+    .addColumn("id", "uuid", (col) => col.primaryKey())
     .addColumn("type", "text", (col) => col.notNull())
     .addColumn("user_id", "integer", (col) => col.references("user.id").notNull())
+    .addColumn("path", "text", (col) => col.notNull())
     .addColumn("total_chunks", "integer", (col) => col.notNull())
     .addColumn("uploaded_chunks", sql`integer[]`, (col) => col.notNull().defaultTo(sql`'{}'`))
     .addColumn("expires_at", "timestamp(3)", (col) => col.notNull())

src/lib/server/db/schema/upload.ts

@@ -2,9 +2,10 @@ import type { Generated } from "kysely";
 import type { Ciphertext } from "./utils";
 
 interface UploadSessionTable {
-  id: Generated<string>;
+  id: string;
   type: "file" | "thumbnail";
   user_id: number;
+  path: string;
   total_chunks: number;
   uploaded_chunks: Generated<number[]>;
   expires_at: Date;

src/lib/server/db/upload.ts

@@ -6,6 +6,7 @@ import type { Ciphertext } from "./schema";
 interface BaseUploadSession {
   id: string;
   userId: number;
+  path: string;
   totalChunks: number;
   uploadedChunks: number[];
   expiresAt: Date;
@@ -31,9 +32,9 @@ interface ThumbnailUploadSession extends BaseUploadSession {
 }
 
 export const createFileUploadSession = async (
-  params: Omit<FileUploadSession, "id" | "type" | "uploadedChunks">,
+  params: Omit<FileUploadSession, "type" | "uploadedChunks">,
 ) => {
-  return await db.transaction().execute(async (trx) => {
+  await db.transaction().execute(async (trx) => {
     const mek = await trx
       .selectFrom("master_encryption_key")
       .select("version")
@@ -60,11 +61,13 @@ export const createFileUploadSession = async (
       }
     }
 
-    const { sessionId } = await trx
+    await trx
       .insertInto("upload_session")
       .values({
+        id: params.id,
         type: "file",
         user_id: params.userId,
+        path: params.path,
         total_chunks: params.totalChunks,
         expires_at: params.expiresAt,
         parent_id: params.parentId !== "root" ? params.parentId : null,
@@ -77,16 +80,14 @@ export const createFileUploadSession = async (
         encrypted_created_at: params.encCreatedAt,
         encrypted_last_modified_at: params.encLastModifiedAt,
       })
-      .returning("id as sessionId")
+      .execute();
-      .executeTakeFirstOrThrow();
-    return { id: sessionId };
   });
 };
 
 export const createThumbnailUploadSession = async (
-  params: Omit<ThumbnailUploadSession, "id" | "type" | "uploadedChunks" | "totalChunks">,
+  params: Omit<ThumbnailUploadSession, "type" | "uploadedChunks">,
 ) => {
-  return await db.transaction().execute(async (trx) => {
+  await db.transaction().execute(async (trx) => {
     const file = await trx
       .selectFrom("file")
       .select("data_encryption_key_version")
@@ -101,19 +102,19 @@ export const createThumbnailUploadSession = async (
       throw new IntegrityError("Invalid DEK version");
     }
 
-    const { sessionId } = await trx
+    await trx
       .insertInto("upload_session")
       .values({
+        id: params.id,
         type: "thumbnail",
         user_id: params.userId,
-        total_chunks: 1,
+        path: params.path,
+        total_chunks: params.totalChunks,
         expires_at: params.expiresAt,
         file_id: params.fileId,
         data_encryption_key_version: params.dekVersion,
       })
-      .returning("id as sessionId")
+      .execute();
-      .executeTakeFirstOrThrow();
-    return { id: sessionId };
   });
 };
 
@@ -126,14 +127,14 @@ export const getUploadSession = async (sessionId: string, userId: number) => {
     .where("expires_at", ">", new Date())
     .limit(1)
     .executeTakeFirst();
-
+  if (!session) {
-  if (!session) return null;
+    return null;
-
+  } else if (session.type === "file") {
-  if (session.type === "file") {
     return {
       type: "file",
       id: session.id,
       userId: session.user_id,
+      path: session.path,
       totalChunks: session.total_chunks,
       uploadedChunks: session.uploaded_chunks,
       expiresAt: session.expires_at,
@@ -152,6 +153,7 @@ export const getUploadSession = async (sessionId: string, userId: number) => {
       type: "thumbnail",
       id: session.id,
       userId: session.user_id,
+      path: session.path,
       totalChunks: session.total_chunks,
       uploadedChunks: session.uploaded_chunks,
       expiresAt: session.expires_at,
@@ -176,8 +178,8 @@ export const deleteUploadSession = async (trx: typeof db, sessionId: string) =>
 export const cleanupExpiredUploadSessions = async () => {
   const sessions = await db
     .deleteFrom("upload_session")
-    .where("expires_at", "<", new Date())
+    .where("expires_at", "<=", new Date())
-    .returning("id")
+    .returning("path")
     .execute();
-  return sessions.map(({ id }) => id);
+  return sessions.map(({ path }) => path);
 };

src/lib/server/modules/filesystem.ts

@@ -1,7 +1,10 @@
-import { unlink } from "fs/promises";
+import { rm, unlink } from "fs/promises";
-import env from "$lib/server/loadenv";
 
-export const getChunkDirectoryPath = (sessionId: string) => `${env.uploadsPath}/${sessionId}`;
+export const safeRecursiveRm = async (path: string | null | undefined) => {
+  if (path) {
+    await rm(path, { recursive: true }).catch(console.error);
+  }
+};
 
 export const safeUnlink = async (path: string | null | undefined) => {
   if (path) {

src/lib/server/services/upload.ts

@@ -2,9 +2,9 @@ import { error } from "@sveltejs/kit";
 import { createHash } from "crypto";
 import { createWriteStream } from "fs";
 import { Readable } from "stream";
-import { CHUNK_SIZE, ENCRYPTION_OVERHEAD } from "$lib/constants";
+import { ENCRYPTION_OVERHEAD, ENCRYPTED_CHUNK_SIZE } from "$lib/constants";
 import { UploadRepo } from "$lib/server/db";
-import { getChunkDirectoryPath, safeUnlink } from "$lib/server/modules/filesystem";
+import { safeRecursiveRm, safeUnlink } from "$lib/server/modules/filesystem";
 
 const chunkLocks = new Set<string>();
 
@@ -17,12 +17,12 @@ export const uploadChunk = async (
 ) => {
   const lockKey = `${sessionId}/${chunkIndex}`;
   if (chunkLocks.has(lockKey)) {
-    error(409, "Chunk already uploaded"); // TODO: Message
+    error(409, "Chunk upload already in progress");
   } else {
     chunkLocks.add(lockKey);
   }
 
-  const filePath = `${getChunkDirectoryPath(sessionId)}/${chunkIndex}`;
+  let filePath;
 
   try {
     const session = await UploadRepo.getUploadSession(sessionId, userId);
@@ -35,15 +35,16 @@ export const uploadChunk = async (
     }
 
     const isLastChunk = chunkIndex === session.totalChunks - 1;
+    filePath = `${session.path}/${chunkIndex}`;
 
-    let writtenBytes = 0;
     const hashStream = createHash("sha256");
     const writeStream = createWriteStream(filePath, { flags: "wx", mode: 0o600 });
+    let writtenBytes = 0;
 
     for await (const chunk of encChunkStream) {
-      writtenBytes += chunk.length;
       hashStream.update(chunk);
       writeStream.write(chunk);
+      writtenBytes += chunk.length;
     }
 
     await new Promise<void>((resolve, reject) => {
@@ -53,9 +54,8 @@ export const uploadChunk = async (
     if (hashStream.digest("base64") !== encChunkHash) {
       throw new Error("Invalid checksum");
     } else if (
-      (!isLastChunk && writtenBytes !== CHUNK_SIZE + ENCRYPTION_OVERHEAD) ||
+      (!isLastChunk && writtenBytes !== ENCRYPTED_CHUNK_SIZE) ||
-      (isLastChunk &&
+      (isLastChunk && (writtenBytes <= ENCRYPTION_OVERHEAD || writtenBytes > ENCRYPTED_CHUNK_SIZE))
-        (writtenBytes <= ENCRYPTION_OVERHEAD || writtenBytes > CHUNK_SIZE + ENCRYPTION_OVERHEAD))
     ) {
       throw new Error("Invalid chunk size");
     }
@@ -75,3 +75,8 @@ export const uploadChunk = async (
     chunkLocks.delete(lockKey);
   }
 };
+
+export const cleanupExpiredUploadSessions = async () => {
+  const paths = await UploadRepo.cleanupExpiredUploadSessions();
+  await Promise.all(paths.map(safeRecursiveRm));
+};

src/trpc/routers/upload.ts

@@ -1,7 +1,7 @@
 import { TRPCError } from "@trpc/server";
 import { createHash } from "crypto";
 import { createReadStream, createWriteStream } from "fs";
-import { mkdir, rename, rm } from "fs/promises";
+import { mkdir, rename } from "fs/promises";
 import mime from "mime";
 import { dirname } from "path";
 import { v4 as uuidv4 } from "uuid";
@@ -10,10 +10,17 @@ import { DirectoryIdSchema } from "$lib/schemas";
 import { FileRepo, MediaRepo, UploadRepo, IntegrityError } from "$lib/server/db";
 import db from "$lib/server/db/kysely";
 import env from "$lib/server/loadenv";
-import { getChunkDirectoryPath, safeUnlink } from "$lib/server/modules/filesystem";
+import { safeRecursiveRm, safeUnlink } from "$lib/server/modules/filesystem";
 import { router, roleProcedure } from "../init.server";
 
-const uploadLocks = new Set<string>();
+const sessionLocks = new Set<string>();
+
+const generateSessionId = async () => {
+  const id = uuidv4();
+  const path = `${env.uploadsPath}/${id}`;
+  await mkdir(path, { recursive: true });
+  return { id, path };
+};
 
 const uploadRouter = router({
   startFileUpload: roleProcedure["activeClient"]
@@ -45,9 +52,13 @@ const uploadRouter = router({
         throw new TRPCError({ code: "BAD_REQUEST", message: "Invalid DEK version" });
       }
 
+      const { id, path } = await generateSessionId();
+
       try {
-        const { id: sessionId } = await UploadRepo.createFileUploadSession({
+        await UploadRepo.createFileUploadSession({
+          id,
           userId: ctx.session.userId,
+          path,
           totalChunks: input.chunks,
           expiresAt: new Date(Date.now() + 24 * 60 * 60 * 1000), // 24 hours
           parentId: input.parent,
@@ -63,9 +74,10 @@ const uploadRouter = router({
               : null,
           encLastModifiedAt: { ciphertext: input.lastModifiedAt, iv: input.lastModifiedAtIv },
         });
-        await mkdir(getChunkDirectoryPath(sessionId), { recursive: true });
+        return { uploadId: id };
-        return { uploadId: sessionId };
       } catch (e) {
+        await safeRecursiveRm(path);
+
         if (e instanceof IntegrityError) {
           if (e.message === "Inactive MEK version") {
             throw new TRPCError({ code: "BAD_REQUEST", message: "Invalid MEK version" });
@@ -85,16 +97,22 @@ const uploadRouter = router({
       }),
     )
     .mutation(async ({ ctx, input }) => {
+      const { id, path } = await generateSessionId();
+
       try {
-        const { id: sessionId } = await UploadRepo.createThumbnailUploadSession({
+        await UploadRepo.createThumbnailUploadSession({
+          id,
           userId: ctx.session.userId,
+          path,
+          totalChunks: 1, // Up to 4 MiB
           expiresAt: new Date(Date.now() + 24 * 60 * 60 * 1000), // 24 hours
           fileId: input.file,
           dekVersion: input.dekVersion,
         });
-        await mkdir(getChunkDirectoryPath(sessionId), { recursive: true });
+        return { uploadId: id };
-        return { uploadId: sessionId };
       } catch (e) {
+        await safeRecursiveRm(path);
+
         if (e instanceof IntegrityError) {
           if (e.message === "File not found") {
             throw new TRPCError({ code: "NOT_FOUND", message: "File not found" });
@@ -115,14 +133,13 @@ const uploadRouter = router({
     )
     .mutation(async ({ ctx, input }) => {
       const { uploadId } = input;
-      if (uploadLocks.has(uploadId)) {
+      if (sessionLocks.has(uploadId)) {
-        throw new TRPCError({ code: "CONFLICT", message: "Upload already in progress" });
+        throw new TRPCError({ code: "CONFLICT", message: "Completion already in progress" });
       } else {
-        uploadLocks.add(uploadId);
+        sessionLocks.add(uploadId);
       }
 
-      const filePath = `${env.libraryPath}/${ctx.session.userId}/${uuidv4()}`;
+      let filePath = "";
-      await mkdir(dirname(filePath), { recursive: true });
 
       try {
         const session = await UploadRepo.getUploadSession(uploadId, ctx.session.userId);
@@ -132,17 +149,19 @@ const uploadRouter = router({
           (session.hskVersion && !input.contentHmac) ||
           (!session.hskVersion && input.contentHmac)
         ) {
-          throw new TRPCError({ code: "BAD_REQUEST", message: "Invalid content hmac" });
+          throw new TRPCError({ code: "BAD_REQUEST", message: "Invalid content HMAC" });
         } else if (session.uploadedChunks.length < session.totalChunks) {
-          throw new TRPCError({ code: "BAD_REQUEST", message: "Upload not complete" });
+          throw new TRPCError({ code: "BAD_REQUEST", message: "Upload not completed" });
         }
 
-        const chunkDirectoryPath = getChunkDirectoryPath(uploadId);
+        filePath = `${env.libraryPath}/${ctx.session.userId}/${uuidv4()}`;
+        await mkdir(dirname(filePath), { recursive: true });
+
         const hashStream = createHash("sha256");
         const writeStream = createWriteStream(filePath, { flags: "wx", mode: 0o600 });
 
         for (let i = 0; i < session.totalChunks; i++) {
-          for await (const chunk of createReadStream(`${chunkDirectoryPath}/${i}`)) {
+          for await (const chunk of createReadStream(`${session.path}/${i}`)) {
             hashStream.update(chunk);
             writeStream.write(chunk);
           }
@@ -166,13 +185,13 @@ const uploadRouter = router({
           return fileId;
         });
 
-        await rm(chunkDirectoryPath, { recursive: true }).catch((e) => console.error(e));
+        await safeRecursiveRm(session.path);
         return { file: fileId };
       } catch (e) {
         await safeUnlink(filePath);
         throw e;
       } finally {
-        uploadLocks.delete(uploadId);
+        sessionLocks.delete(uploadId);
       }
     }),
 
@@ -184,44 +203,39 @@ const uploadRouter = router({
     )
     .mutation(async ({ ctx, input }) => {
       const { uploadId } = input;
-      if (uploadLocks.has(uploadId)) {
+      if (sessionLocks.has(uploadId)) {
-        throw new TRPCError({ code: "CONFLICT", message: "Upload already in progress" });
+        throw new TRPCError({ code: "CONFLICT", message: "Completion already in progress" });
       } else {
-        uploadLocks.add(uploadId);
+        sessionLocks.add(uploadId);
       }
 
-      const thumbnailPath = `${env.thumbnailsPath}/${ctx.session.userId}/${uuidv4()}`;
+      let thumbnailPath = "";
-      await mkdir(dirname(thumbnailPath), { recursive: true });
 
       try {
         const session = await UploadRepo.getUploadSession(uploadId, ctx.session.userId);
         if (!session || session.type !== "thumbnail") {
           throw new TRPCError({ code: "NOT_FOUND", message: "Invalid upload id" });
         } else if (session.uploadedChunks.length < session.totalChunks) {
-          throw new TRPCError({ code: "BAD_REQUEST", message: "Upload not complete" });
+          throw new TRPCError({ code: "BAD_REQUEST", message: "Upload not completed" });
         }
 
-        const chunkDirectoryPath = getChunkDirectoryPath(uploadId);
+        thumbnailPath = `${env.thumbnailsPath}/${ctx.session.userId}/${uploadId}`;
-        const chunkPath = `${chunkDirectoryPath}/0`;
+        await mkdir(dirname(thumbnailPath), { recursive: true });
+        await rename(`${session.path}/0`, thumbnailPath);
 
-        // Move chunk file to thumbnail path (IV is prepended to the content)
+        const oldThumbnailPath = await db.transaction().execute(async (trx) => {
-        await rename(chunkPath, thumbnailPath);
-
-        // Update thumbnail in database (null IV since it's prepended to the file)
           const oldPath = await MediaRepo.updateFileThumbnail(
+            trx,
             ctx.session.userId,
             session.fileId,
             session.dekVersion,
             thumbnailPath,
             null,
           );
-        safeUnlink(oldPath); // Intended
-
-        await db.transaction().execute(async (trx) => {
           await UploadRepo.deleteUploadSession(trx, uploadId);
+          return oldPath;
         });
-
+        await Promise.all([safeUnlink(oldThumbnailPath), safeRecursiveRm(session.path)]);
-        await rm(chunkDirectoryPath, { recursive: true }).catch((e) => console.error(e));
       } catch (e) {
         await safeUnlink(thumbnailPath);
         if (e instanceof IntegrityError) {
@@ -233,7 +247,7 @@ const uploadRouter = router({
         }
         throw e;
       } finally {
-        uploadLocks.delete(uploadId);
+        sessionLocks.delete(uploadId);
       }
     }),
 });