모바일 환경에서 갤러리 페이지에서의 스크롤이 부자연스럽게 이뤄지는 버그 수정

.dockerignore

@@ -12,7 +12,6 @@ node_modules
 /data
 /library
 /thumbnails
-/uploads
 
 # OS
 .DS_Store

.env.example

@@ -12,4 +12,3 @@ USER_CLIENT_CHALLENGE_EXPIRES=
 SESSION_UPGRADE_CHALLENGE_EXPIRES=
 LIBRARY_PATH=
 THUMBNAILS_PATH=
-UPLOADS_PATH=

.github/workflows/docker.yaml

@@ -1,45 +0,0 @@
-name: Docker Image Build
-
-on:
-  release:
-    types: [published]
-
-jobs:
-  build-and-push:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v6
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Login to GHCR
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Extract Docker metadata
-        uses: docker/metadata-action@v5
-        id: meta
-        with:
-          images: ghcr.io/${{ github.repository }}
-          tags: |
-            type=semver,value={{version}}
-            type=raw,value=latest
-            type=sha
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max

.gitignore

@@ -10,7 +10,6 @@ node_modules
 /data
 /library
 /thumbnails
-/uploads
 
 # OS
 .DS_Store

docker-compose.yaml

@@ -9,7 +9,6 @@ services:
     volumes:
       - ./data/library:/app/data/library
       - ./data/thumbnails:/app/data/thumbnails
-      - ./data/uploads:/app/data/uploads
     environment:
       # ArkVault
       - DATABASE_HOST=database
@@ -21,7 +20,6 @@ services:
       - SESSION_UPGRADE_CHALLENGE_EXPIRES
       - LIBRARY_PATH=/app/data/library
       - THUMBNAILS_PATH=/app/data/thumbnails
-      - UPLOADS_PATH=/app/data/uploads
       # SvelteKit
       - ADDRESS_HEADER=${TRUST_PROXY:+X-Forwarded-For}
       - XFF_DEPTH=${TRUST_PROXY:-}

package.json

@@ -1,7 +1,7 @@
 {
   "name": "arkvault",
   "private": true,
-  "version": "0.8.0",
+  "version": "0.6.0",
   "type": "module",
   "scripts": {
     "dev": "vite dev",
@@ -16,14 +16,12 @@
     "db:migrate": "kysely migrate"
   },
   "devDependencies": {
-    "@eslint/compat": "^2.0.1",
+    "@eslint/compat": "^2.0.0",
-    "@eslint/js": "^9.39.2",
+    "@iconify-json/material-symbols": "^1.2.50",
-    "@iconify-json/material-symbols": "^1.2.51",
-    "@noble/hashes": "^2.0.1",
     "@sveltejs/adapter-node": "^5.4.0",
-    "@sveltejs/kit": "^2.49.4",
+    "@sveltejs/kit": "^2.49.2",
-    "@sveltejs/vite-plugin-svelte": "^6.2.4",
+    "@sveltejs/vite-plugin-svelte": "^6.2.1",
-    "@tanstack/svelte-virtual": "^3.13.18",
+    "@tanstack/svelte-virtual": "^3.13.13",
     "@trpc/client": "^11.8.1",
     "@types/file-saver": "^2.0.7",
     "@types/ms": "^0.7.34",
@@ -34,11 +32,11 @@
     "dexie": "^4.2.1",
     "eslint": "^9.39.2",
     "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-svelte": "^3.14.0",
+    "eslint-plugin-svelte": "^3.13.1",
     "eslint-plugin-tailwindcss": "^3.18.2",
-    "exifreader": "^4.35.0",
+    "exifreader": "^4.33.1",
     "file-saver": "^2.0.5",
-    "globals": "^17.0.0",
+    "globals": "^16.5.0",
     "heic2any": "^0.0.4",
     "kysely-ctl": "^0.19.0",
     "lru-cache": "^11.2.4",
@@ -51,11 +49,12 @@
     "svelte-check": "^4.3.5",
     "tailwindcss": "^3.4.19",
     "typescript": "^5.9.3",
-    "typescript-eslint": "^8.52.0",
+    "typescript-eslint": "^8.50.1",
     "unplugin-icons": "^22.5.0",
-    "vite": "^7.3.1"
+    "vite": "^7.3.0"
   },
   "dependencies": {
+    "@fastify/busboy": "^3.2.0",
     "@trpc/server": "^11.8.1",
     "argon2": "^0.44.0",
     "kysely": "^0.28.9",
@@ -64,7 +63,7 @@
     "pg": "^8.16.3",
     "superjson": "^2.2.6",
     "uuid": "^13.0.0",
-    "zod": "^4.3.5"
+    "zod": "^4.2.1"
   },
   "engines": {
     "node": "^22.0.0",

src/hooks.client.ts

@@ -1,6 +1,7 @@
 import type { ClientInit } from "@sveltejs/kit";
 import { cleanupDanglingInfos, getClientKey, getMasterKeys, getHmacSecrets } from "$lib/indexedDB";
 import { prepareFileCache } from "$lib/modules/file";
+import { prepareOpfs } from "$lib/modules/opfs";
 import { clientKeyStore, masterKeyStore, hmacSecretStore } from "$lib/stores";
 
 const requestPersistentStorage = async () => {
@@ -45,6 +46,7 @@ export const init: ClientInit = async () => {
     prepareClientKeyStore(),
     prepareMasterKeyStore(),
     prepareHmacSecretStore(),
+    prepareOpfs(),
   ]);
 
   cleanupDanglingInfos(); // Intended

src/hooks.server.ts

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

src/lib/components/atoms/RowVirtualizer.svelte

@@ -22,6 +22,7 @@
       count,
       estimateSize: itemHeight,
       gap: itemGap,
+      overscan: 5,
       scrollMargin,
     }),
   );
@@ -34,7 +35,7 @@
     if (!element) return;
 
     const observer = new ResizeObserver(() => {
-      scrollMargin = Math.round(element!.getBoundingClientRect().top + window.scrollY);
+      scrollMargin = element!.getBoundingClientRect().top + window.scrollY;
     });
     observer.observe(element.parentElement!);
     return () => observer.disconnect();
@@ -54,7 +55,7 @@
       </div>
     {/each}
   </div>
-  {#if placeholder && count === 0}
+  {#if placeholder && $virtualizer.getVirtualItems().length === 0}
     {@render placeholder()}
   {/if}
 </div>

src/lib/components/atoms/buttons/FileThumbnailButton.svelte

@@ -1,6 +1,7 @@
 <script lang="ts">
-  import { getFileThumbnail } from "$lib/modules/file";
+  import { browser } from "$app/environment";
   import type { SummarizedFileInfo } from "$lib/modules/filesystem";
+  import { requestFileThumbnailDownload } from "$lib/services/file";
 
   interface Props {
     info: SummarizedFileInfo;
@@ -9,16 +10,25 @@
 
   let { info, onclick }: Props = $props();
 
-  let thumbnail = $derived(getFileThumbnail(info));
+  let showThumbnail = $derived(
+    browser && (info.contentType.startsWith("image/") || info.contentType.startsWith("video/")),
+  );
+  let thumbnailPromise = $derived(
+    showThumbnail ? requestFileThumbnailDownload(info.id, info.dataKey?.key) : null,
+  );
 </script>
 
 <button
   onclick={onclick && (() => setTimeout(() => onclick(info), 100))}
   class="aspect-square overflow-hidden rounded transition active:scale-95 active:brightness-90"
 >
-  {#if $thumbnail}
+  {#await thumbnailPromise}
-    <img src={$thumbnail} alt={info.name} class="h-full w-full object-cover" />
+    <div class="h-full w-full bg-gray-100"></div>
+  {:then thumbnail}
+    {#if thumbnail}
+      <img src={thumbnail} alt={info.name} class="h-full w-full object-cover" />
     {:else}
       <div class="h-full w-full bg-gray-100"></div>
     {/if}
+  {/await}
 </button>

src/lib/components/molecules/Categories.svelte

@@ -25,7 +25,7 @@
 
   let { categories, categoryMenuIcon, onCategoryClick, onCategoryMenuClick }: Props = $props();
 
-  let categoriesWithName = $derived(sortEntries([...categories]));
+  let categoriesWithName = $derived(sortEntries($state.snapshot(categories)));
 </script>
 
 {#if categoriesWithName.length > 0}

src/lib/components/organisms/Category/Category.svelte

@@ -0,0 +1,93 @@
+<script lang="ts">
+  import { CheckBox, RowVirtualizer } from "$lib/components/atoms";
+  import { SubCategories, type SelectedCategory } from "$lib/components/molecules";
+  import { updateCategoryInfo } from "$lib/indexedDB";
+  import type { CategoryInfo } from "$lib/modules/filesystem";
+  import { sortEntries } from "$lib/utils";
+  import File from "./File.svelte";
+  import type { SelectedFile } from "./service";
+
+  import IconMoreVert from "~icons/material-symbols/more-vert";
+
+  interface Props {
+    info: CategoryInfo;
+    isFileRecursive: boolean | undefined;
+    onFileClick: (file: SelectedFile) => void;
+    onFileRemoveClick: (file: SelectedFile) => void;
+    onSubCategoryClick: (subCategory: SelectedCategory) => void;
+    onSubCategoryCreateClick: () => void;
+    onSubCategoryMenuClick: (subCategory: SelectedCategory) => void;
+  }
+
+  let {
+    info,
+    onFileClick,
+    onFileRemoveClick,
+    onSubCategoryClick,
+    onSubCategoryCreateClick,
+    onSubCategoryMenuClick,
+    isFileRecursive = $bindable(),
+  }: Props = $props();
+
+  let lastCategoryId = $state<CategoryInfo["id"] | undefined>();
+  let lastIsFileRecursive = $state<boolean | undefined>();
+
+  let files = $derived(
+    sortEntries(
+      info.files
+        ?.map((file) => ({ name: file.name, details: file }))
+        .filter(({ details }) => isFileRecursive || !details.isRecursive) ?? [],
+    ),
+  );
+
+  $effect(() => {
+    if (info.id === "root" || isFileRecursive === undefined) return;
+    if (lastCategoryId !== info.id) {
+      lastCategoryId = info.id;
+      lastIsFileRecursive = isFileRecursive;
+      return;
+    }
+    if (lastIsFileRecursive === isFileRecursive) return;
+
+    lastIsFileRecursive = isFileRecursive;
+    void updateCategoryInfo(info.id, { isFileRecursive });
+  });
+</script>
+
+<div class="space-y-4">
+  <div class="space-y-4 bg-white p-4">
+    {#if info.id !== "root"}
+      <p class="text-lg font-bold text-gray-800">하위 카테고리</p>
+    {/if}
+    <SubCategories
+      {info}
+      {onSubCategoryClick}
+      {onSubCategoryCreateClick}
+      {onSubCategoryMenuClick}
+      subCategoryMenuIcon={IconMoreVert}
+    />
+  </div>
+  {#if info.id !== "root"}
+    <div class="space-y-4 bg-white p-4">
+      <div class="flex items-center justify-between">
+        <p class="text-lg font-bold text-gray-800">파일</p>
+        <CheckBox bind:checked={isFileRecursive}>
+          <p class="font-medium">하위 카테고리의 파일</p>
+        </CheckBox>
+      </div>
+      <RowVirtualizer count={files.length} itemHeight={() => 48} itemGap={4}>
+        {#snippet item(index)}
+          {@const { details } = files[index]!}
+          <File
+            info={details}
+            onclick={onFileClick}
+            onRemoveClick={!details.isRecursive ? onFileRemoveClick : undefined}
+          />
+        {/snippet}
+        {#snippet placeholder()}
+          <p class="text-center text-gray-500">이 카테고리에 추가된 파일이 없어요.</p>
+        {/snippet}
+      </RowVirtualizer>
+    </div>
+  {/if}
+</div>

src/lib/components/organisms/Category/File.svelte

@@ -1,9 +1,10 @@
 <script lang="ts">
+  import { browser } from "$app/environment";
   import { ActionEntryButton } from "$lib/components/atoms";
   import { DirectoryEntryLabel } from "$lib/components/molecules";
-  import { getFileThumbnail } from "$lib/modules/file";
   import type { CategoryFileInfo } from "$lib/modules/filesystem";
-  import type { SelectedFile } from "./service.svelte";
+  import { requestFileThumbnailDownload } from "$lib/services/file";
+  import type { SelectedFile } from "./service";
 
   import IconClose from "~icons/material-symbols/close";
 
@@ -15,7 +16,12 @@
 
   let { info, onclick, onRemoveClick }: Props = $props();
 
-  let thumbnail = $derived(getFileThumbnail(info));
+  let showThumbnail = $derived(
+    browser && (info.contentType.startsWith("image/") || info.contentType.startsWith("video/")),
+  );
+  let thumbnailPromise = $derived(
+    showThumbnail ? requestFileThumbnailDownload(info.id, info.dataKey?.key) : null,
+  );
 </script>
 
 <ActionEntryButton
@@ -24,5 +30,9 @@
   actionButtonIcon={onRemoveClick && IconClose}
   onActionButtonClick={() => onRemoveClick?.(info)}
 >
-  <DirectoryEntryLabel type="file" thumbnail={$thumbnail} name={info.name} />
+  {#await thumbnailPromise}
+    <DirectoryEntryLabel type="file" name={info.name} />
+  {:then thumbnail}
+    <DirectoryEntryLabel type="file" thumbnail={thumbnail ?? undefined} name={info.name} />
+  {/await}
 </ActionEntryButton>

src/lib/components/organisms/Category/index.ts

@@ -0,0 +1,2 @@
+export { default } from "./Category.svelte";
+export * from "./service";

src/lib/components/organisms/Category/service.ts

@@ -0,0 +1,4 @@
+export interface SelectedFile {
+  id: number;
+  name: string;
+}

src/lib/components/organisms/Gallery.svelte

@@ -0,0 +1,78 @@
+<script lang="ts">
+  import { FileThumbnailButton, RowVirtualizer } from "$lib/components/atoms";
+  import type { SummarizedFileInfo } from "$lib/modules/filesystem";
+  import { formatDate, formatDateSortable, SortBy, sortEntries } from "$lib/utils";
+
+  interface Props {
+    files: SummarizedFileInfo[];
+    onFileClick?: (file: SummarizedFileInfo) => void;
+  }
+
+  let { files, onFileClick }: Props = $props();
+
+  type Row =
+    | { type: "header"; label: string }
+    | { type: "items"; files: SummarizedFileInfo[]; isLast: boolean };
+
+  let rows = $derived.by(() => {
+    const groups = Map.groupBy(
+      files.filter(
+        (file) => file.contentType.startsWith("image/") || file.contentType.startsWith("video/"),
+      ),
+      (file) => formatDateSortable(file.createdAt ?? file.lastModifiedAt),
+    );
+    return Array.from(groups.entries())
+      .sort(([dateA], [dateB]) => dateB.localeCompare(dateA))
+      .flatMap(([_, entries]) => {
+        const sortedEntries = [...entries];
+        sortEntries(sortedEntries, SortBy.DATE_DESC);
+
+        return [
+          {
+            type: "header",
+            label: formatDate(sortedEntries[0]!.createdAt ?? sortedEntries[0]!.lastModifiedAt),
+          },
+          ...Array.from({ length: Math.ceil(sortedEntries.length / 4) }, (_, i) => {
+            const start = i * 4;
+            const end = start + 4;
+            return {
+              type: "items" as const,
+              files: sortedEntries.slice(start, end),
+              isLast: end >= sortedEntries.length,
+            };
+          }),
+        ] satisfies Row[];
+      });
+  });
+</script>
+
+<RowVirtualizer
+  count={rows.length}
+  itemHeight={(index) =>
+    rows[index]!.type === "header" ? 28 : 185 + (rows[index]!.isLast ? 16 : 0)}
+  class="flex flex-grow flex-col"
+>
+  {#snippet item(index)}
+    {@const row = rows[index]!}
+    {#if row.type === "header"}
+      <p class="pb-2 text-sm font-medium">{row.label}</p>
+    {:else}
+      <div class={["grid grid-cols-4 gap-x-1", row.isLast ? "pb-4" : "pb-1"]}>
+        {#each row.files as file (file.id)}
+          <FileThumbnailButton info={file} onclick={onFileClick} />
+        {/each}
+      </div>
+    {/if}
+  {/snippet}
+  {#snippet placeholder()}
+    <div class="flex h-full flex-grow items-center justify-center">
+      <p class="text-gray-500">
+        {#if files.length === 0}
+          업로드된 파일이 없어요.
+        {:else}
+          사진 또는 동영상이 없어요.
+        {/if}
+      </p>
+    </div>
+  {/snippet}
+</RowVirtualizer>

src/lib/components/organisms/index.ts

@@ -1 +1,4 @@
+export * from "./Category";
+export { default as Category } from "./Category";
+export { default as Gallery } from "./Gallery.svelte";
 export * from "./modals";

src/lib/constants/index.ts

@@ -1,2 +0,0 @@
-export * from "./serviceWorker";
-export * from "./upload";

src/lib/constants/serviceWorker.ts

@@ -1 +0,0 @@
-export const DECRYPTED_FILE_URL_PREFIX = "/_internal/decryptedFile/";

src/lib/constants/upload.ts

@@ -1,6 +0,0 @@
-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; // 4 MiB
-export const ENCRYPTED_CHUNK_SIZE = CHUNK_SIZE + ENCRYPTION_OVERHEAD;

src/lib/indexedDB/filesystem.ts

@@ -13,15 +13,15 @@ interface FileInfo {
   contentType: string;
   createdAt?: Date;
   lastModifiedAt: Date;
-  categoryIds?: number[];
+  categoryIds: number[];
 }
 
 interface CategoryInfo {
   id: number;
   parentId: CategoryId;
   name: string;
-  files?: { id: number; isRecursive: boolean }[];
+  files: { id: number; isRecursive: boolean }[];
-  isFileRecursive?: boolean;
+  isFileRecursive: boolean;
 }
 
 const filesystem = new Dexie("filesystem") as Dexie & {
@@ -55,23 +55,13 @@ export const getDirectoryInfo = async (id: number) => {
 };
 
 export const storeDirectoryInfo = async (directoryInfo: DirectoryInfo) => {
-  await filesystem.directory.upsert(directoryInfo.id, { ...directoryInfo });
+  await filesystem.directory.put(directoryInfo);
 };
 
 export const deleteDirectoryInfo = async (id: number) => {
   await filesystem.directory.delete(id);
 };
 
-export const deleteDanglingDirectoryInfos = async (
-  parentId: DirectoryId,
-  validIds: Set<number>,
-) => {
-  await filesystem.directory
-    .where({ parentId })
-    .and((directory) => !validIds.has(directory.id))
-    .delete();
-};
-
 export const getAllFileInfos = async () => {
   return await filesystem.file.toArray();
 };
@@ -89,24 +79,13 @@ export const bulkGetFileInfos = async (ids: number[]) => {
 };
 
 export const storeFileInfo = async (fileInfo: FileInfo) => {
-  await filesystem.file.upsert(fileInfo.id, { ...fileInfo });
+  await filesystem.file.put(fileInfo);
 };
 
 export const deleteFileInfo = async (id: number) => {
   await filesystem.file.delete(id);
 };
 
-export const bulkDeleteFileInfos = async (ids: number[]) => {
-  await filesystem.file.bulkDelete(ids);
-};
-
-export const deleteDanglingFileInfos = async (parentId: DirectoryId, validIds: Set<number>) => {
-  await filesystem.file
-    .where({ parentId })
-    .and((file) => !validIds.has(file.id))
-    .delete();
-};
-
 export const getCategoryInfos = async (parentId: CategoryId) => {
   return await filesystem.category.where({ parentId }).toArray();
 };
@@ -116,7 +95,7 @@ export const getCategoryInfo = async (id: number) => {
 };
 
 export const storeCategoryInfo = async (categoryInfo: CategoryInfo) => {
-  await filesystem.category.upsert(categoryInfo.id, { ...categoryInfo });
+  await filesystem.category.put(categoryInfo);
 };
 
 export const updateCategoryInfo = async (id: number, changes: { isFileRecursive?: boolean }) => {
@@ -127,13 +106,6 @@ export const deleteCategoryInfo = async (id: number) => {
   await filesystem.category.delete(id);
 };
 
-export const deleteDanglingCategoryInfos = async (parentId: CategoryId, validIds: Set<number>) => {
-  await filesystem.category
-    .where({ parentId })
-    .and((category) => !validIds.has(category.id))
-    .delete();
-};
-
 export const cleanupDanglingInfos = async () => {
   const validDirectoryIds: number[] = [];
   const validFileIds: number[] = [];

src/lib/indexedDB/keyStore.ts

@@ -70,12 +70,12 @@ export const storeMasterKeys = async (keys: MasterKey[]) => {
 };
 
 export const getHmacSecrets = async () => {
-  return (await keyStore.hmacSecret.toArray()).filter(({ secret }) => secret.extractable);
+  return await keyStore.hmacSecret.toArray();
 };
 
 export const storeHmacSecrets = async (secrets: HmacSecret[]) => {
-  if (secrets.some(({ secret }) => !secret.extractable)) {
+  if (secrets.some(({ secret }) => secret.extractable)) {
-    throw new Error("Hmac secrets must be extractable");
+    throw new Error("Hmac secrets must be nonextractable");
   }
   await keyStore.hmacSecret.bulkPut(secrets);
 };

src/lib/modules/crypto/aes.ts

@@ -1,15 +1,8 @@
-import { AES_GCM_IV_SIZE } from "$lib/constants";
+import { encodeString, decodeString, encodeToBase64, decodeFromBase64 } from "./util";
-import {
-  encodeString,
-  decodeString,
-  encodeToBase64,
-  decodeFromBase64,
-  concatenateBuffers,
-} from "./utils";
 
 export const generateMasterKey = async () => {
   return {
-    masterKey: await crypto.subtle.generateKey(
+    masterKey: await window.crypto.subtle.generateKey(
       {
         name: "AES-KW",
         length: 256,
@@ -22,7 +15,7 @@ export const generateMasterKey = async () => {
 
 export const generateDataKey = async () => {
   return {
-    dataKey: await crypto.subtle.generateKey(
+    dataKey: await window.crypto.subtle.generateKey(
       {
         name: "AES-GCM",
         length: 256,
@@ -35,9 +28,9 @@ export const generateDataKey = async () => {
 };
 
 export const makeAESKeyNonextractable = async (key: CryptoKey) => {
-  return await crypto.subtle.importKey(
+  return await window.crypto.subtle.importKey(
     "raw",
-    await crypto.subtle.exportKey("raw", key),
+    await window.crypto.subtle.exportKey("raw", key),
     key.algorithm,
     false,
     key.usages,
@@ -45,12 +38,12 @@ export const makeAESKeyNonextractable = async (key: CryptoKey) => {
 };
 
 export const wrapDataKey = async (dataKey: CryptoKey, masterKey: CryptoKey) => {
-  return encodeToBase64(await crypto.subtle.wrapKey("raw", dataKey, masterKey, "AES-KW"));
+  return encodeToBase64(await window.crypto.subtle.wrapKey("raw", dataKey, masterKey, "AES-KW"));
 };
 
 export const unwrapDataKey = async (dataKeyWrapped: string, masterKey: CryptoKey) => {
   return {
-    dataKey: await crypto.subtle.unwrapKey(
+    dataKey: await window.crypto.subtle.unwrapKey(
       "raw",
       decodeFromBase64(dataKeyWrapped),
       masterKey,
@@ -63,12 +56,12 @@ export const unwrapDataKey = async (dataKeyWrapped: string, masterKey: CryptoKey
 };
 
 export const wrapHmacSecret = async (hmacSecret: CryptoKey, masterKey: CryptoKey) => {
-  return encodeToBase64(await crypto.subtle.wrapKey("raw", hmacSecret, masterKey, "AES-KW"));
+  return encodeToBase64(await window.crypto.subtle.wrapKey("raw", hmacSecret, masterKey, "AES-KW"));
 };
 
 export const unwrapHmacSecret = async (hmacSecretWrapped: string, masterKey: CryptoKey) => {
   return {
-    hmacSecret: await crypto.subtle.unwrapKey(
+    hmacSecret: await window.crypto.subtle.unwrapKey(
       "raw",
       decodeFromBase64(hmacSecretWrapped),
       masterKey,
@@ -77,15 +70,15 @@ export const unwrapHmacSecret = async (hmacSecretWrapped: string, masterKey: Cry
         name: "HMAC",
         hash: "SHA-256",
       } satisfies HmacImportParams,
-      true, // Extractable
+      false, // Nonextractable
       ["sign", "verify"],
     ),
   };
 };
 
 export const encryptData = async (data: BufferSource, dataKey: CryptoKey) => {
-  const iv = crypto.getRandomValues(new Uint8Array(12));
+  const iv = window.crypto.getRandomValues(new Uint8Array(12));
-  const ciphertext = await crypto.subtle.encrypt(
+  const ciphertext = await window.crypto.subtle.encrypt(
     {
       name: "AES-GCM",
       iv,
@@ -93,18 +86,14 @@ export const encryptData = async (data: BufferSource, dataKey: CryptoKey) => {
     dataKey,
     data,
   );
-  return { ciphertext, iv: iv.buffer };
+  return { ciphertext, iv: encodeToBase64(iv.buffer) };
 };
 
-export const decryptData = async (
+export const decryptData = async (ciphertext: BufferSource, iv: string, dataKey: CryptoKey) => {
-  ciphertext: BufferSource,
+  return await window.crypto.subtle.decrypt(
-  iv: string | BufferSource,
-  dataKey: CryptoKey,
-) => {
-  return await crypto.subtle.decrypt(
     {
       name: "AES-GCM",
-      iv: typeof iv === "string" ? decodeFromBase64(iv) : iv,
+      iv: decodeFromBase64(iv),
     } satisfies AesGcmParams,
     dataKey,
     ciphertext,
@@ -113,22 +102,9 @@ export const decryptData = async (
 
 export const encryptString = async (plaintext: string, dataKey: CryptoKey) => {
   const { ciphertext, iv } = await encryptData(encodeString(plaintext), dataKey);
-  return { ciphertext: encodeToBase64(ciphertext), iv: encodeToBase64(iv) };
+  return { ciphertext: encodeToBase64(ciphertext), iv };
 };
 
 export const decryptString = async (ciphertext: string, iv: string, dataKey: CryptoKey) => {
   return decodeString(await decryptData(decodeFromBase64(ciphertext), iv, dataKey));
 };
-
-export const encryptChunk = async (chunk: ArrayBuffer, dataKey: CryptoKey) => {
-  const { ciphertext, iv } = await encryptData(chunk, dataKey);
-  return concatenateBuffers(iv, ciphertext).buffer;
-};
-
-export const decryptChunk = async (encryptedChunk: ArrayBuffer, dataKey: CryptoKey) => {
-  return await decryptData(
-    encryptedChunk.slice(AES_GCM_IV_SIZE),
-    encryptedChunk.slice(0, AES_GCM_IV_SIZE),
-    dataKey,
-  );
-};

src/lib/modules/crypto/index.ts

@@ -1,4 +1,4 @@
 export * from "./aes";
 export * from "./rsa";
 export * from "./sha";
-export * from "./utils";
+export * from "./util";

src/lib/modules/crypto/rsa.ts

@@ -1,7 +1,7 @@
-import { encodeString, encodeToBase64, decodeFromBase64 } from "./utils";
+import { encodeString, encodeToBase64, decodeFromBase64 } from "./util";
 
 export const generateEncryptionKeyPair = async () => {
-  const keyPair = await crypto.subtle.generateKey(
+  const keyPair = await window.crypto.subtle.generateKey(
     {
       name: "RSA-OAEP",
       modulusLength: 4096,
@@ -18,7 +18,7 @@ export const generateEncryptionKeyPair = async () => {
 };
 
 export const generateSigningKeyPair = async () => {
-  const keyPair = await crypto.subtle.generateKey(
+  const keyPair = await window.crypto.subtle.generateKey(
     {
       name: "RSA-PSS",
       modulusLength: 4096,
@@ -37,7 +37,7 @@ export const generateSigningKeyPair = async () => {
 export const exportRSAKey = async (key: CryptoKey) => {
   const format = key.type === "public" ? ("spki" as const) : ("pkcs8" as const);
   return {
-    key: await crypto.subtle.exportKey(format, key),
+    key: await window.crypto.subtle.exportKey(format, key),
     format,
   };
 };
@@ -54,14 +54,14 @@ export const importEncryptionKeyPairFromBase64 = async (
     name: "RSA-OAEP",
     hash: "SHA-256",
   };
-  const encryptKey = await crypto.subtle.importKey(
+  const encryptKey = await window.crypto.subtle.importKey(
     "spki",
     decodeFromBase64(encryptKeyBase64),
     algorithm,
     true,
     ["encrypt", "wrapKey"],
   );
-  const decryptKey = await crypto.subtle.importKey(
+  const decryptKey = await window.crypto.subtle.importKey(
     "pkcs8",
     decodeFromBase64(decryptKeyBase64),
     algorithm,
@@ -79,14 +79,14 @@ export const importSigningKeyPairFromBase64 = async (
     name: "RSA-PSS",
     hash: "SHA-256",
   };
-  const signKey = await crypto.subtle.importKey(
+  const signKey = await window.crypto.subtle.importKey(
     "pkcs8",
     decodeFromBase64(signKeyBase64),
     algorithm,
     true,
     ["sign"],
   );
-  const verifyKey = await crypto.subtle.importKey(
+  const verifyKey = await window.crypto.subtle.importKey(
     "spki",
     decodeFromBase64(verifyKeyBase64),
     algorithm,
@@ -98,11 +98,17 @@ export const importSigningKeyPairFromBase64 = async (
 
 export const makeRSAKeyNonextractable = async (key: CryptoKey) => {
   const { key: exportedKey, format } = await exportRSAKey(key);
-  return await crypto.subtle.importKey(format, exportedKey, key.algorithm, false, key.usages);
+  return await window.crypto.subtle.importKey(
+    format,
+    exportedKey,
+    key.algorithm,
+    false,
+    key.usages,
+  );
 };
 
 export const decryptChallenge = async (challenge: string, decryptKey: CryptoKey) => {
-  return await crypto.subtle.decrypt(
+  return await window.crypto.subtle.decrypt(
     {
       name: "RSA-OAEP",
     } satisfies RsaOaepParams,
@@ -113,7 +119,7 @@ export const decryptChallenge = async (challenge: string, decryptKey: CryptoKey)
 
 export const wrapMasterKey = async (masterKey: CryptoKey, encryptKey: CryptoKey) => {
   return encodeToBase64(
-    await crypto.subtle.wrapKey("raw", masterKey, encryptKey, {
+    await window.crypto.subtle.wrapKey("raw", masterKey, encryptKey, {
       name: "RSA-OAEP",
     } satisfies RsaOaepParams),
   );
@@ -125,7 +131,7 @@ export const unwrapMasterKey = async (
   extractable = false,
 ) => {
   return {
-    masterKey: await crypto.subtle.unwrapKey(
+    masterKey: await window.crypto.subtle.unwrapKey(
       "raw",
       decodeFromBase64(masterKeyWrapped),
       decryptKey,
@@ -140,7 +146,7 @@ export const unwrapMasterKey = async (
 };
 
 export const signMessageRSA = async (message: BufferSource, signKey: CryptoKey) => {
-  return await crypto.subtle.sign(
+  return await window.crypto.subtle.sign(
     {
       name: "RSA-PSS",
       saltLength: 32, // SHA-256
@@ -155,7 +161,7 @@ export const verifySignatureRSA = async (
   signature: BufferSource,
   verifyKey: CryptoKey,
 ) => {
-  return await crypto.subtle.verify(
+  return await window.crypto.subtle.verify(
     {
       name: "RSA-PSS",
       saltLength: 32, // SHA-256

src/lib/modules/crypto/sha.ts

@@ -1,13 +1,10 @@
-import HmacWorker from "$workers/hmac?worker";
-import type { ComputeMessage, ResultMessage } from "$workers/hmac";
-
 export const digestMessage = async (message: BufferSource) => {
-  return await crypto.subtle.digest("SHA-256", message);
+  return await window.crypto.subtle.digest("SHA-256", message);
 };
 
 export const generateHmacSecret = async () => {
   return {
-    hmacSecret: await crypto.subtle.generateKey(
+    hmacSecret: await window.crypto.subtle.generateKey(
       {
         name: "HMAC",
         hash: "SHA-256",
@@ -18,24 +15,6 @@ export const generateHmacSecret = async () => {
   };
 };
 
-export const signMessageHmac = async (message: Blob, hmacSecret: CryptoKey) => {
+export const signMessageHmac = async (message: BufferSource, hmacSecret: CryptoKey) => {
-  const stream = message.stream();
+  return await window.crypto.subtle.sign("HMAC", hmacSecret, message);
-  const hmacSecretRaw = new Uint8Array(await crypto.subtle.exportKey("raw", hmacSecret));
-  const worker = new HmacWorker();
-
-  return new Promise<Uint8Array>((resolve, reject) => {
-    worker.onmessage = ({ data }: MessageEvent<ResultMessage>) => {
-      resolve(data.result);
-      worker.terminate();
-    };
-
-    worker.onerror = ({ error }) => {
-      reject(error);
-      worker.terminate();
-    };
-
-    worker.postMessage({ stream, key: hmacSecretRaw } satisfies ComputeMessage, {
-      transfer: [stream, hmacSecretRaw.buffer],
-    });
-  });
 };

src/lib/modules/crypto/util.ts

@@ -9,8 +9,8 @@ export const decodeString = (data: ArrayBuffer) => {
   return textDecoder.decode(data);
 };
 
-export const encodeToBase64 = (data: ArrayBuffer | Uint8Array) => {
+export const encodeToBase64 = (data: ArrayBuffer) => {
-  return btoa(String.fromCharCode(...(data instanceof ArrayBuffer ? new Uint8Array(data) : data)));
+  return btoa(String.fromCharCode(...new Uint8Array(data)));
 };
 
 export const decodeFromBase64 = (data: string) => {

src/lib/modules/file/cache.ts

@@ -1,12 +1,15 @@
+import { LRUCache } from "lru-cache";
 import {
   getFileCacheIndex as getFileCacheIndexFromIndexedDB,
   storeFileCacheIndex,
   deleteFileCacheIndex,
   type FileCacheIndex,
 } from "$lib/indexedDB";
-import { readFile, writeFile, deleteFile } from "$lib/modules/opfs";
+import { readFile, writeFile, deleteFile, deleteDirectory } from "$lib/modules/opfs";
+import { getThumbnailUrl } from "$lib/modules/thumbnail";
 
 const fileCacheIndex = new Map<number, FileCacheIndex>();
+const loadedThumbnails = new LRUCache<number, string>({ max: 100 });
 
 export const prepareFileCache = async () => {
   for (const cache of await getFileCacheIndexFromIndexedDB()) {
@@ -48,3 +51,30 @@ export const deleteFileCache = async (fileId: number) => {
   await deleteFile(`/cache/${fileId}`);
   await deleteFileCacheIndex(fileId);
 };
+
+export const getFileThumbnailCache = async (fileId: number) => {
+  const thumbnail = loadedThumbnails.get(fileId);
+  if (thumbnail) return thumbnail;
+
+  const thumbnailBuffer = await readFile(`/thumbnail/file/${fileId}`);
+  if (!thumbnailBuffer) return null;
+
+  const thumbnailUrl = getThumbnailUrl(thumbnailBuffer);
+  loadedThumbnails.set(fileId, thumbnailUrl);
+  return thumbnailUrl;
+};
+
+export const storeFileThumbnailCache = async (fileId: number, thumbnailBuffer: ArrayBuffer) => {
+  await writeFile(`/thumbnail/file/${fileId}`, thumbnailBuffer);
+  loadedThumbnails.set(fileId, getThumbnailUrl(thumbnailBuffer));
+};
+
+export const deleteFileThumbnailCache = async (fileId: number) => {
+  loadedThumbnails.delete(fileId);
+  await deleteFile(`/thumbnail/file/${fileId}`);
+};
+
+export const deleteAllFileThumbnailCaches = async () => {
+  loadedThumbnails.clear();
+  await deleteDirectory("/thumbnail/file");
+};

src/lib/modules/file/download.svelte.ts

@@ -1,7 +1,6 @@
 import axios from "axios";
 import { limitFunction } from "p-limit";
-import { ENCRYPTED_CHUNK_SIZE } from "$lib/constants";
+import { decryptData } from "$lib/modules/crypto";
-import { decryptChunk, concatenateBuffers } from "$lib/modules/crypto";
 
 export interface FileDownloadState {
   id: number;
@@ -66,21 +65,13 @@ const decryptFile = limitFunction(
   async (
     state: FileDownloadState,
     fileEncrypted: ArrayBuffer,
-    encryptedChunkSize: number,
+    fileEncryptedIv: string,
     dataKey: CryptoKey,
   ) => {
     state.status = "decrypting";
 
-    const chunks: ArrayBuffer[] = [];
+    const fileBuffer = await decryptData(fileEncrypted, fileEncryptedIv, dataKey);
-    let offset = 0;
 
-    while (offset < fileEncrypted.byteLength) {
-      const nextOffset = Math.min(offset + encryptedChunkSize, fileEncrypted.byteLength);
-      chunks.push(await decryptChunk(fileEncrypted.slice(offset, nextOffset), dataKey));
-      offset = nextOffset;
-    }
-
-    const fileBuffer = concatenateBuffers(...chunks).buffer;
     state.status = "decrypted";
     state.result = fileBuffer;
     return fileBuffer;
@@ -88,7 +79,7 @@ const decryptFile = limitFunction(
   { concurrency: 4 },
 );
 
-export const downloadFile = async (id: number, dataKey: CryptoKey, isLegacy: boolean) => {
+export const downloadFile = async (id: number, fileEncryptedIv: string, dataKey: CryptoKey) => {
   downloadingFiles.push({
     id,
     status: "download-pending",
@@ -96,13 +87,7 @@ export const downloadFile = async (id: number, dataKey: CryptoKey, isLegacy: boo
   const state = downloadingFiles.at(-1)!;
 
   try {
-    const fileEncrypted = await requestFileDownload(state, id);
+    return await decryptFile(state, await requestFileDownload(state, id), fileEncryptedIv, dataKey);
-    return await decryptFile(
-      state,
-      fileEncrypted,
-      isLegacy ? fileEncrypted.byteLength : ENCRYPTED_CHUNK_SIZE,
-      dataKey,
-    );
   } catch (e) {
     state.status = "error";
     throw e;

src/lib/modules/file/index.ts

@@ -1,4 +1,3 @@
 export * from "./cache";
 export * from "./download.svelte";
-export * from "./thumbnail";
 export * from "./upload.svelte";

src/lib/modules/file/thumbnail.ts

@@ -1,77 +0,0 @@
-import { LRUCache } from "lru-cache";
-import { writable, type Writable } from "svelte/store";
-import { browser } from "$app/environment";
-import { decryptChunk } from "$lib/modules/crypto";
-import type { SummarizedFileInfo } from "$lib/modules/filesystem";
-import { readFile, writeFile, deleteFile, deleteDirectory } from "$lib/modules/opfs";
-import { getThumbnailUrl } from "$lib/modules/thumbnail";
-
-const loadedThumbnails = new LRUCache<number, Writable<string>>({ max: 100 });
-const loadingThumbnails = new Map<number, Writable<string | undefined>>();
-
-const fetchFromOpfs = async (fileId: number) => {
-  const thumbnailBuffer = await readFile(`/thumbnail/file/${fileId}`);
-  if (thumbnailBuffer) {
-    return getThumbnailUrl(thumbnailBuffer);
-  }
-};
-
-const fetchFromServer = async (fileId: number, dataKey: CryptoKey) => {
-  const res = await fetch(`/api/file/${fileId}/thumbnail/download`);
-  if (!res.ok) return null;
-
-  const thumbnailBuffer = await decryptChunk(await res.arrayBuffer(), dataKey);
-
-  void writeFile(`/thumbnail/file/${fileId}`, thumbnailBuffer);
-  return getThumbnailUrl(thumbnailBuffer);
-};
-
-export const getFileThumbnail = (file: SummarizedFileInfo) => {
-  if (
-    !browser ||
-    !(file.contentType.startsWith("image/") || file.contentType.startsWith("video/"))
-  ) {
-    return undefined;
-  }
-
-  const thumbnail = loadedThumbnails.get(file.id);
-  if (thumbnail) return thumbnail;
-
-  let loadingThumbnail = loadingThumbnails.get(file.id);
-  if (loadingThumbnail) return loadingThumbnail;
-
-  loadingThumbnail = writable(undefined);
-  loadingThumbnails.set(file.id, loadingThumbnail);
-
-  fetchFromOpfs(file.id)
-    .then((thumbnail) => thumbnail ?? (file.dataKey && fetchFromServer(file.id, file.dataKey.key)))
-    .then((thumbnail) => {
-      if (thumbnail) {
-        loadingThumbnail.set(thumbnail);
-        loadedThumbnails.set(file.id, loadingThumbnail as Writable<string>);
-      }
-      loadingThumbnails.delete(file.id);
-    });
-  return loadingThumbnail;
-};
-
-export const storeFileThumbnailCache = async (fileId: number, thumbnailBuffer: ArrayBuffer) => {
-  await writeFile(`/thumbnail/file/${fileId}`, thumbnailBuffer);
-
-  const oldThumbnail = loadedThumbnails.get(fileId);
-  if (oldThumbnail) {
-    oldThumbnail.set(getThumbnailUrl(thumbnailBuffer));
-  } else {
-    loadedThumbnails.set(fileId, writable(getThumbnailUrl(thumbnailBuffer)));
-  }
-};
-
-export const deleteFileThumbnailCache = async (fileId: number) => {
-  loadedThumbnails.delete(fileId);
-  await deleteFile(`/thumbnail/file/${fileId}`);
-};
-
-export const deleteAllFileThumbnailCaches = async () => {
-  loadedThumbnails.clear();
-  await deleteDirectory(`/thumbnail/file`);
-};

src/lib/modules/file/upload.svelte.ts

@@ -1,19 +1,28 @@
+import axios from "axios";
 import ExifReader from "exifreader";
 import { limitFunction } from "p-limit";
-import { CHUNK_SIZE } from "$lib/constants";
+import {
-import { encodeToBase64, generateDataKey, wrapDataKey, encryptString } from "$lib/modules/crypto";
+  encodeToBase64,
-import { signMessageHmac } from "$lib/modules/crypto";
+  generateDataKey,
+  wrapDataKey,
+  encryptData,
+  encryptString,
+  digestMessage,
+  signMessageHmac,
+} from "$lib/modules/crypto";
 import { generateThumbnail } from "$lib/modules/thumbnail";
-import { uploadBlob } from "$lib/modules/upload";
+import type {
+  FileThumbnailUploadRequest,
+  FileUploadRequest,
+  FileUploadResponse,
+} from "$lib/server/schemas";
 import type { MasterKey, HmacSecret } from "$lib/stores";
-import { Scheduler } from "$lib/utils";
 import { trpc } from "$trpc/client";
 
 export interface FileUploadState {
   name: string;
   parentId: DirectoryId;
   status:
-    | "queued"
     | "encryption-pending"
     | "encrypting"
     | "upload-pending"
@@ -27,16 +36,13 @@ export interface FileUploadState {
 }
 
 export type LiveFileUploadState = FileUploadState & {
-  status: "queued" | "encryption-pending" | "encrypting" | "upload-pending" | "uploading";
+  status: "encryption-pending" | "encrypting" | "upload-pending" | "uploading";
 };
 
-const scheduler = new Scheduler<
-  { fileId: number; fileBuffer?: ArrayBuffer; thumbnailBuffer?: ArrayBuffer } | undefined
->();
 let uploadingFiles: FileUploadState[] = $state([]);
 
 const isFileUploading = (status: FileUploadState["status"]) =>
-  ["queued", "encryption-pending", "encrypting", "upload-pending", "uploading"].includes(status);
+  ["encryption-pending", "encrypting", "upload-pending", "uploading"].includes(status);
 
 export const getUploadingFiles = (parentId?: DirectoryId) => {
   return uploadingFiles.filter(
@@ -50,21 +56,16 @@ export const clearUploadedFiles = () => {
 };
 
 const requestDuplicateFileScan = limitFunction(
-  async (
+  async (file: File, hmacSecret: HmacSecret, onDuplicate: () => Promise<boolean>) => {
-    state: FileUploadState,
+    const fileBuffer = await file.arrayBuffer();
-    file: File,
+    const fileSigned = encodeToBase64(await signMessageHmac(fileBuffer, hmacSecret.secret));
-    hmacSecret: HmacSecret,
-    onDuplicate: () => Promise<boolean>,
-  ) => {
-    state.status = "encryption-pending";
 
-    const fileSigned = encodeToBase64(await signMessageHmac(file, hmacSecret.secret));
     const files = await trpc().file.listByHash.query({
       hskVersion: hmacSecret.version,
       contentHmac: fileSigned,
     });
     if (files.length === 0 || (await onDuplicate())) {
-      return { fileSigned };
+      return { fileBuffer, fileSigned };
     } else {
       return {};
     }
@@ -104,98 +105,74 @@ const extractExifDateTime = (fileBuffer: ArrayBuffer) => {
   return new Date(utcDate - offsetMs);
 };
 
-interface FileMetadata {
+const encryptFile = limitFunction(
-  parentId: "root" | number;
+  async (state: FileUploadState, file: File, fileBuffer: ArrayBuffer, masterKey: MasterKey) => {
-  name: string;
-  createdAt?: Date;
-  lastModifiedAt: Date;
-}
-
-const requestFileMetadataEncryption = limitFunction(
-  async (
-    state: FileUploadState,
-    file: Blob,
-    fileMetadata: FileMetadata,
-    masterKey: MasterKey,
-    hmacSecret: HmacSecret,
-  ) => {
     state.status = "encrypting";
 
+    const fileType = getFileType(file);
+
+    let createdAt;
+    if (fileType.startsWith("image/")) {
+      createdAt = extractExifDateTime(fileBuffer);
+    }
+
     const { dataKey, dataKeyVersion } = await generateDataKey();
     const dataKeyWrapped = await wrapDataKey(dataKey, masterKey.key);
 
-    const [nameEncrypted, createdAtEncrypted, lastModifiedAtEncrypted, thumbnailBuffer] =
+    const fileEncrypted = await encryptData(fileBuffer, dataKey);
-      await Promise.all([
+    const fileEncryptedHash = encodeToBase64(await digestMessage(fileEncrypted.ciphertext));
-        encryptString(fileMetadata.name, dataKey),
-        fileMetadata.createdAt &&
-          encryptString(fileMetadata.createdAt.getTime().toString(), dataKey),
-        encryptString(fileMetadata.lastModifiedAt.getTime().toString(), dataKey),
-        generateThumbnail(file).then((blob) => blob?.arrayBuffer()),
-      ]);
 
-    const { uploadId } = await trpc().upload.startFileUpload.mutate({
+    const nameEncrypted = await encryptString(file.name, dataKey);
-      chunks: Math.ceil(file.size / CHUNK_SIZE),
+    const createdAtEncrypted =
-      parent: fileMetadata.parentId,
+      createdAt && (await encryptString(createdAt.getTime().toString(), dataKey));
-      mekVersion: masterKey.version,
+    const lastModifiedAtEncrypted = await encryptString(file.lastModified.toString(), dataKey);
-      dek: dataKeyWrapped,
+
-      dekVersion: dataKeyVersion,
+    const thumbnail = await generateThumbnail(fileBuffer, fileType);
-      hskVersion: hmacSecret.version,
+    const thumbnailBuffer = await thumbnail?.arrayBuffer();
-      contentType: file.type,
+    const thumbnailEncrypted = thumbnailBuffer && (await encryptData(thumbnailBuffer, dataKey));
-      name: nameEncrypted.ciphertext,
-      nameIv: nameEncrypted.iv,
-      createdAt: createdAtEncrypted?.ciphertext,
-      createdAtIv: createdAtEncrypted?.iv,
-      lastModifiedAt: lastModifiedAtEncrypted.ciphertext,
-      lastModifiedAtIv: lastModifiedAtEncrypted.iv,
-    });
 
     state.status = "upload-pending";
-    return { uploadId, thumbnailBuffer, dataKey, dataKeyVersion };
+
+    return {
+      dataKeyWrapped,
+      dataKeyVersion,
+      fileType,
+      fileEncrypted,
+      fileEncryptedHash,
+      nameEncrypted,
+      createdAtEncrypted,
+      lastModifiedAtEncrypted,
+      thumbnail: thumbnailEncrypted && { plaintext: thumbnailBuffer, ...thumbnailEncrypted },
+    };
   },
   { concurrency: 4 },
 );
 
 const requestFileUpload = limitFunction(
-  async (
+  async (state: FileUploadState, form: FormData, thumbnailForm: FormData | null) => {
-    state: FileUploadState,
-    uploadId: string,
-    file: Blob,
-    fileSigned: string,
-    thumbnailBuffer: ArrayBuffer | undefined,
-    dataKey: CryptoKey,
-    dataKeyVersion: Date,
-  ) => {
     state.status = "uploading";
 
-    await uploadBlob(uploadId, file, dataKey, {
+    const res = await axios.post("/api/file/upload", form, {
-      onProgress(s) {
+      onUploadProgress: ({ progress, rate, estimated }) => {
-        state.progress = s.progress;
+        state.progress = progress;
-        state.rate = s.rate;
+        state.rate = rate;
+        state.estimated = estimated;
       },
     });
+    const { file }: FileUploadResponse = res.data;
 
-    const { file: fileId } = await trpc().upload.completeFileUpload.mutate({
+    if (thumbnailForm) {
-      uploadId,
-      contentHmac: fileSigned,
-    });
-
-    if (thumbnailBuffer) {
       try {
-        const { uploadId } = await trpc().upload.startFileThumbnailUpload.mutate({
+        await axios.post(`/api/file/${file}/thumbnail/upload`, thumbnailForm);
-          file: fileId,
-          dekVersion: dataKeyVersion,
-        });
-
-        await uploadBlob(uploadId, new Blob([thumbnailBuffer]), dataKey);
-
-        await trpc().upload.completeFileThumbnailUpload.mutate({ uploadId });
       } catch (e) {
+        // TODO
         console.error(e);
       }
     }
 
     state.status = "uploaded";
-    return { fileId };
+
+    return { fileId: file };
   },
   { concurrency: 1 },
 );
@@ -203,59 +180,83 @@ const requestFileUpload = limitFunction(
 export const uploadFile = async (
   file: File,
   parentId: "root" | number,
-  masterKey: MasterKey,
   hmacSecret: HmacSecret,
+  masterKey: MasterKey,
   onDuplicate: () => Promise<boolean>,
-) => {
+): Promise<
+  { fileId: number; fileBuffer: ArrayBuffer; thumbnailBuffer?: ArrayBuffer } | undefined
+> => {
   uploadingFiles.push({
     name: file.name,
     parentId,
-    status: "queued",
+    status: "encryption-pending",
   });
   const state = uploadingFiles.at(-1)!;
 
-  return await scheduler.schedule(file.size, async () => {
   try {
-      const { fileSigned } = await requestDuplicateFileScan(state, file, hmacSecret, onDuplicate);
+    const { fileBuffer, fileSigned } = await requestDuplicateFileScan(
-
+      file,
-      if (!fileSigned) {
+      hmacSecret,
+      onDuplicate,
+    );
+    if (!fileBuffer || !fileSigned) {
       state.status = "canceled";
       uploadingFiles = uploadingFiles.filter((file) => file !== state);
-        return;
+      return undefined;
     }
 
-      let fileBuffer;
+    const {
-      const fileType = getFileType(file);
+      dataKeyWrapped,
-      const fileMetadata: FileMetadata = {
-        parentId,
-        name: file.name,
-        lastModifiedAt: new Date(file.lastModified),
-      };
-
-      if (fileType.startsWith("image/")) {
-        fileBuffer = await file.arrayBuffer();
-        fileMetadata.createdAt = extractExifDateTime(fileBuffer);
-      }
-
-      const blob = new Blob([file], { type: fileType });
-
-      const { uploadId, thumbnailBuffer, dataKey, dataKeyVersion } =
-        await requestFileMetadataEncryption(state, blob, fileMetadata, masterKey, hmacSecret);
-
-      const { fileId } = await requestFileUpload(
-        state,
-        uploadId,
-        blob,
-        fileSigned,
-        thumbnailBuffer,
-        dataKey,
       dataKeyVersion,
-      );
+      fileType,
+      fileEncrypted,
+      fileEncryptedHash,
+      nameEncrypted,
+      createdAtEncrypted,
+      lastModifiedAtEncrypted,
+      thumbnail,
+    } = await encryptFile(state, file, fileBuffer, masterKey);
 
-      return { fileId, fileBuffer, thumbnailBuffer };
+    const form = new FormData();
+    form.set(
+      "metadata",
+      JSON.stringify({
+        parent: parentId,
+        mekVersion: masterKey.version,
+        dek: dataKeyWrapped,
+        dekVersion: dataKeyVersion.toISOString(),
+        hskVersion: hmacSecret.version,
+        contentHmac: fileSigned,
+        contentType: fileType,
+        contentIv: fileEncrypted.iv,
+        name: nameEncrypted.ciphertext,
+        nameIv: nameEncrypted.iv,
+        createdAt: createdAtEncrypted?.ciphertext,
+        createdAtIv: createdAtEncrypted?.iv,
+        lastModifiedAt: lastModifiedAtEncrypted.ciphertext,
+        lastModifiedAtIv: lastModifiedAtEncrypted.iv,
+      } satisfies FileUploadRequest),
+    );
+    form.set("content", new Blob([fileEncrypted.ciphertext]));
+    form.set("checksum", fileEncryptedHash);
+
+    let thumbnailForm = null;
+    if (thumbnail) {
+      thumbnailForm = new FormData();
+      thumbnailForm.set(
+        "metadata",
+        JSON.stringify({
+          dekVersion: dataKeyVersion.toISOString(),
+          contentIv: thumbnail.iv,
+        } satisfies FileThumbnailUploadRequest),
+      );
+      thumbnailForm.set("content", new Blob([thumbnail.ciphertext]));
+    }
+
+    const { fileId } = await requestFileUpload(state, form, thumbnailForm);
+    return { fileId, fileBuffer, thumbnailBuffer: thumbnail?.plaintext };
   } catch (e) {
     state.status = "error";
     throw e;
   }
-  });
 };

src/lib/modules/filesystem/category.ts

@@ -1,22 +1,22 @@
 import * as IndexedDB from "$lib/indexedDB";
 import { trpc, isTRPCClientError } from "$trpc/client";
 import { FilesystemCache, decryptFileMetadata, decryptCategoryMetadata } from "./internal.svelte";
-import type { CategoryInfo, MaybeCategoryInfo } from "./types";
+import type { MaybeCategoryInfo } from "./types";
 
-const cache = new FilesystemCache<CategoryId, MaybeCategoryInfo>({
+const cache = new FilesystemCache<CategoryId, MaybeCategoryInfo, Partial<MaybeCategoryInfo>>();
-  async fetchFromIndexedDB(id) {
+
+const fetchFromIndexedDB = async (id: CategoryId) => {
   const [category, subCategories] = await Promise.all([
     id !== "root" ? IndexedDB.getCategoryInfo(id) : undefined,
     IndexedDB.getCategoryInfos(id),
   ]);
-    const files = category?.files
+  const files = category
     ? await Promise.all(
         category.files.map(async (file) => {
           const fileInfo = await IndexedDB.getFileInfo(file.id);
           return fileInfo
             ? {
                 id: file.id,
-                  parentId: fileInfo.parentId,
                 contentType: fileInfo.contentType,
                 name: fileInfo.name,
                 createdAt: fileInfo.createdAt,
@@ -31,91 +31,134 @@ const cache = new FilesystemCache<CategoryId, MaybeCategoryInfo>({
   if (id === "root") {
     return {
       id,
-        exists: true,
+      exists: true as const,
       subCategories,
     };
   } else if (category) {
     return {
       id,
-        exists: true,
+      exists: true as const,
-        parentId: category.parentId,
       name: category.name,
       subCategories,
-        files: files?.filter((file) => !!file) ?? [],
+      files: files!.filter((file) => !!file),
-        isFileRecursive: category.isFileRecursive ?? false,
+      isFileRecursive: category.isFileRecursive,
     };
   }
-  },
+};
 
-  async fetchFromServer(id, cachedInfo, masterKey) {
+const fetchFromServer = async (id: CategoryId, masterKey: CryptoKey) => {
   try {
-      const category = await trpc().category.get.query({ id, recurse: true });
+    const {
-      const [subCategories, files, metadata] = await Promise.all([
+      metadata,
-        Promise.all(
+      subCategories: subCategoriesRaw,
-          category.subCategories.map(async (category) => ({
+      files: filesRaw,
+    } = await trpc().category.get.query({ id, recurse: true });
+    const subCategories = await Promise.all(
+      subCategoriesRaw.map(async (category) => {
+        const decrypted = await decryptCategoryMetadata(category, masterKey);
+        const existing = await IndexedDB.getCategoryInfo(category.id);
+        await IndexedDB.storeCategoryInfo({
           id: category.id,
           parentId: id,
-            ...(await decryptCategoryMetadata(category, masterKey)),
+          name: decrypted.name,
-          })),
+          files: existing?.files ?? [],
-        ),
+          isFileRecursive: existing?.isFileRecursive ?? false,
-        category.files &&
+        });
-          Promise.all(
+        return {
-            category.files.map(async (file) => ({
+          id: category.id,
+          ...decrypted,
+        };
+      }),
+    );
+
+    const existingFiles = filesRaw
+      ? await IndexedDB.bulkGetFileInfos(filesRaw.map((file) => file.id))
+      : [];
+    const files = filesRaw
+      ? await Promise.all(
+          filesRaw.map(async (file, index) => {
+            const decrypted = await decryptFileMetadata(file, masterKey);
+            const existing = existingFiles[index];
+            if (existing) {
+              const categoryIds = file.isRecursive
+                ? existing.categoryIds
+                : Array.from(new Set([...existing.categoryIds, id as number]));
+              await IndexedDB.storeFileInfo({
+                id: file.id,
+                parentId: existing.parentId,
+                contentType: file.contentType,
+                name: decrypted.name,
+                createdAt: decrypted.createdAt,
+                lastModifiedAt: decrypted.lastModifiedAt,
+                categoryIds,
+              });
+            }
+            return {
               id: file.id,
-              parentId: file.parent,
               contentType: file.contentType,
               isRecursive: file.isRecursive,
-              ...(await decryptFileMetadata(file, masterKey)),
+              ...decrypted,
-            })),
+            };
-          ),
+          }),
-        category.metadata && decryptCategoryMetadata(category.metadata, masterKey),
+        )
-      ]);
+      : undefined;
 
-      return storeToIndexedDB(
+    const decryptedMetadata = metadata
-        id !== "root"
+      ? await decryptCategoryMetadata(metadata, masterKey)
-          ? {
+      : undefined;
-              id,
+    if (id !== "root" && metadata && decryptedMetadata) {
-              parentId: category.metadata!.parent,
+      const existingCategory = await IndexedDB.getCategoryInfo(id);
-              subCategories,
+      await IndexedDB.storeCategoryInfo({
-              files: files!,
+        id: id as number,
-              isFileRecursive: cachedInfo?.isFileRecursive ?? false,
+        parentId: metadata.parent,
-              ...metadata!,
+        name: decryptedMetadata.name,
+        files:
+          files?.map((file) => ({
+            id: file.id,
+            isRecursive: file.isRecursive,
+          })) ??
+          existingCategory?.files ??
+          [],
+        isFileRecursive: existingCategory?.isFileRecursive ?? false,
+      });
+    }
+
+    if (id === "root") {
+      return {
+        id,
+        exists: true as const,
+        subCategories,
+      };
+    } else {
+      return {
+        id,
+        exists: true as const,
+        subCategories,
+        files,
+        ...decryptedMetadata!,
+      };
     }
-          : { id, subCategories },
-      );
   } catch (e) {
     if (isTRPCClientError(e) && e.data?.code === "NOT_FOUND") {
       await IndexedDB.deleteCategoryInfo(id as number);
-        return { id, exists: false };
+      return { id, exists: false as const };
     }
     throw e;
   }
-  },
+};
-});
 
-const storeToIndexedDB = (info: CategoryInfo) => {
+export const getCategoryInfo = async (id: CategoryId, masterKey: CryptoKey) => {
-  if (info.id !== "root") {
+  return await cache.get(id, async (isInitial, resolve) => {
-    void IndexedDB.storeCategoryInfo(info);
+    if (isInitial) {
-
+      const info = await fetchFromIndexedDB(id);
-    // TODO: Bulk Upsert
+      if (info) {
-    new Map(info.files.map((file) => [file.id, file])).forEach((file) => {
+        resolve(info);
-      void IndexedDB.storeFileInfo(file);
+      }
-    });
     }
 
-  // TODO: Bulk Upsert
+    const info = await fetchFromServer(id, masterKey);
-  info.subCategories.forEach((category) => {
+    if (info) {
-    void IndexedDB.storeCategoryInfo(category);
+      resolve(info);
+    }
   });
-
-  void IndexedDB.deleteDanglingCategoryInfos(
-    info.id,
-    new Set(info.subCategories.map(({ id }) => id)),
-  );
-
-  return { ...info, exists: true as const };
-};
-
-export const getCategoryInfo = (id: CategoryId, masterKey: CryptoKey) => {
-  return cache.get(id, masterKey);
 };

src/lib/modules/filesystem/directory.ts

@@ -1,10 +1,12 @@
 import * as IndexedDB from "$lib/indexedDB";
+import { monotonicResolve } from "$lib/utils";
 import { trpc, isTRPCClientError } from "$trpc/client";
 import { FilesystemCache, decryptDirectoryMetadata, decryptFileMetadata } from "./internal.svelte";
-import type { DirectoryInfo, MaybeDirectoryInfo } from "./types";
+import type { MaybeDirectoryInfo } from "./types";
 
-const cache = new FilesystemCache<DirectoryId, MaybeDirectoryInfo>({
+const cache = new FilesystemCache<DirectoryId, MaybeDirectoryInfo>();
-  async fetchFromIndexedDB(id) {
+
+const fetchFromIndexedDB = async (id: DirectoryId) => {
   const [directory, subDirectories, files] = await Promise.all([
     id !== "root" ? IndexedDB.getDirectoryInfo(id) : undefined,
     IndexedDB.getDirectoryInfos(id),
@@ -14,55 +16,92 @@ const cache = new FilesystemCache<DirectoryId, MaybeDirectoryInfo>({
   if (id === "root") {
     return {
       id,
-        exists: true,
+      exists: true as const,
       subDirectories,
       files,
     };
   } else if (directory) {
     return {
       id,
-        exists: true,
+      exists: true as const,
       parentId: directory.parentId,
       name: directory.name,
       subDirectories,
       files,
     };
   }
-  },
+};
 
-  async fetchFromServer(id, _cachedInfo, masterKey) {
+const fetchFromServer = async (id: DirectoryId, masterKey: CryptoKey) => {
   try {
-      const directory = await trpc().directory.get.query({ id });
+    const {
-      const [subDirectories, files, metadata] = await Promise.all([
+      metadata,
+      subDirectories: subDirectoriesRaw,
+      files: filesRaw,
+    } = await trpc().directory.get.query({ id });
+    const existingFiles = await IndexedDB.bulkGetFileInfos(filesRaw.map((file) => file.id));
+    const [subDirectories, files, decryptedMetadata] = await Promise.all([
       Promise.all(
-          directory.subDirectories.map(async (directory) => ({
+        subDirectoriesRaw.map(async (directory) => {
+          const decrypted = await decryptDirectoryMetadata(directory, masterKey);
+          await IndexedDB.storeDirectoryInfo({
             id: directory.id,
             parentId: id,
-            ...(await decryptDirectoryMetadata(directory, masterKey)),
+            name: decrypted.name,
-          })),
+          });
+          return {
+            id: directory.id,
+            ...decrypted,
+          };
+        }),
       ),
       Promise.all(
-          directory.files.map(async (file) => ({
+        filesRaw.map(async (file, index) => {
+          const decrypted = await decryptFileMetadata(file, masterKey);
+          await IndexedDB.storeFileInfo({
             id: file.id,
             parentId: id,
             contentType: file.contentType,
-            ...(await decryptFileMetadata(file, masterKey)),
+            name: decrypted.name,
-          })),
+            createdAt: decrypted.createdAt,
+            lastModifiedAt: decrypted.lastModifiedAt,
+            categoryIds: existingFiles[index]?.categoryIds ?? [],
+          });
+          return {
+            id: file.id,
+            contentType: file.contentType,
+            ...decrypted,
+          };
+        }),
       ),
-        directory.metadata && decryptDirectoryMetadata(directory.metadata, masterKey),
+      metadata ? decryptDirectoryMetadata(metadata, masterKey) : undefined,
     ]);
 
-      return storeToIndexedDB(
+    if (id !== "root" && metadata && decryptedMetadata) {
-        id !== "root"
+      await IndexedDB.storeDirectoryInfo({
-          ? {
         id,
-              parentId: directory.metadata!.parent,
+        parentId: metadata.parent,
+        name: decryptedMetadata.name,
+      });
+    }
+
+    if (id === "root") {
+      return {
+        id,
+        exists: true as const,
         subDirectories,
         files,
-              ...metadata!,
+      };
+    } else {
+      return {
+        id,
+        exists: true as const,
+        parentId: metadata!.parent,
+        subDirectories,
+        files,
+        ...decryptedMetadata!,
+      };
     }
-          : { id, subDirectories, files },
-      );
   } catch (e) {
     if (isTRPCClientError(e) && e.data?.code === "NOT_FOUND") {
       await IndexedDB.deleteDirectoryInfo(id as number);
@@ -70,33 +109,13 @@ const cache = new FilesystemCache<DirectoryId, MaybeDirectoryInfo>({
     }
     throw e;
   }
-  },
+};
-});
 
-const storeToIndexedDB = (info: DirectoryInfo) => {
+export const getDirectoryInfo = async (id: DirectoryId, masterKey: CryptoKey) => {
-  if (info.id !== "root") {
+  return await cache.get(id, (isInitial, resolve) =>
-    void IndexedDB.storeDirectoryInfo(info);
+    monotonicResolve(
-  }
+      [isInitial && fetchFromIndexedDB(id), fetchFromServer(id, masterKey)],
-
+      resolve,
-  // TODO: Bulk Upsert
+    ),
-  info.subDirectories.forEach((subDirectory) => {
-    void IndexedDB.storeDirectoryInfo(subDirectory);
-  });
-
-  // TODO: Bulk Upsert
-  info.files.forEach((file) => {
-    void IndexedDB.storeFileInfo(file);
-  });
-
-  void IndexedDB.deleteDanglingDirectoryInfos(
-    info.id,
-    new Set(info.subDirectories.map(({ id }) => id)),
   );
-  void IndexedDB.deleteDanglingFileInfos(info.id, new Set(info.files.map(({ id }) => id)));
-
-  return { ...info, exists: true as const };
-};
-
-export const getDirectoryInfo = (id: DirectoryId, masterKey: CryptoKey) => {
-  return cache.get(id, masterKey);
 };

src/lib/modules/filesystem/file.ts

@@ -1,18 +1,18 @@
 import * as IndexedDB from "$lib/indexedDB";
+import { monotonicResolve } from "$lib/utils";
 import { trpc, isTRPCClientError } from "$trpc/client";
 import { FilesystemCache, decryptFileMetadata, decryptCategoryMetadata } from "./internal.svelte";
-import type { FileInfo, MaybeFileInfo } from "./types";
+import type { MaybeFileInfo } from "./types";
 
-const cache = new FilesystemCache<number, MaybeFileInfo>({
+const cache = new FilesystemCache<number, MaybeFileInfo>();
-  async fetchFromIndexedDB(id) {
+
+const fetchFromIndexedDB = async (id: number) => {
   const file = await IndexedDB.getFileInfo(id);
-    const categories = file?.categoryIds
+  const categories = file
     ? await Promise.all(
         file.categoryIds.map(async (categoryId) => {
           const category = await IndexedDB.getCategoryInfo(categoryId);
-            return category
+          return category ? { id: category.id, name: category.name } : undefined;
-              ? { id: category.id, parentId: category.parentId, name: category.name }
-              : undefined;
         }),
       )
     : undefined;
@@ -20,42 +20,81 @@ const cache = new FilesystemCache<number, MaybeFileInfo>({
   if (file) {
     return {
       id,
-        exists: true,
+      exists: true as const,
       parentId: file.parentId,
       contentType: file.contentType,
       name: file.name,
       createdAt: file.createdAt,
       lastModifiedAt: file.lastModifiedAt,
-        categories: categories?.filter((category) => !!category) ?? [],
+      categories: categories!.filter((category) => !!category),
     };
   }
-  },
+};
 
-  async fetchFromServer(id, _cachedInfo, masterKey) {
+const bulkFetchFromIndexedDB = async (ids: number[]) => {
+  const files = await IndexedDB.bulkGetFileInfos(ids);
+  const categories = await Promise.all(
+    files.map(async (file) =>
+      file
+        ? await Promise.all(
+            file.categoryIds.map(async (categoryId) => {
+              const category = await IndexedDB.getCategoryInfo(categoryId);
+              return category ? { id: category.id, name: category.name } : undefined;
+            }),
+          )
+        : undefined,
+    ),
+  );
+  return new Map(
+    files
+      .map((file, index) =>
+        file
+          ? ([
+              file.id,
+              {
+                ...file,
+                exists: true,
+                categories: categories[index]!.filter((category) => !!category),
+              },
+            ] as const)
+          : undefined,
+      )
+      .filter((file) => !!file),
+  );
+};
+
+const fetchFromServer = async (id: number, masterKey: CryptoKey) => {
   try {
-      const file = await trpc().file.get.query({ id });
+    const { categories: categoriesRaw, ...metadata } = await trpc().file.get.query({ id });
-      const [categories, metadata] = await Promise.all([
+    const [categories, decryptedMetadata] = await Promise.all([
       Promise.all(
-          file.categories.map(async (category) => ({
+        categoriesRaw.map(async (category) => ({
           id: category.id,
-            parentId: category.parent,
           ...(await decryptCategoryMetadata(category, masterKey)),
         })),
       ),
-        decryptFileMetadata(file, masterKey),
+      decryptFileMetadata(metadata, masterKey),
     ]);
 
-      return storeToIndexedDB({
+    await IndexedDB.storeFileInfo({
       id,
-        isLegacy: file.isLegacy,
+      parentId: metadata.parent,
-        parentId: file.parent,
+      contentType: metadata.contentType,
-        dataKey: metadata.dataKey,
+      name: decryptedMetadata.name,
-        contentType: file.contentType,
+      createdAt: decryptedMetadata.createdAt,
-        name: metadata.name,
+      lastModifiedAt: decryptedMetadata.lastModifiedAt,
-        createdAt: metadata.createdAt,
+      categoryIds: categories.map((category) => category.id),
-        lastModifiedAt: metadata.lastModifiedAt,
-        categories,
     });
+
+    return {
+      id,
+      exists: true as const,
+      parentId: metadata.parent,
+      contentType: metadata.contentType,
+      contentIv: metadata.contentIv,
+      categories,
+      ...decryptedMetadata,
+    };
   } catch (e) {
     if (isTRPCClientError(e) && e.data?.code === "NOT_FOUND") {
       await IndexedDB.deleteFileInfo(id);
@@ -63,115 +102,74 @@ const cache = new FilesystemCache<number, MaybeFileInfo>({
     }
     throw e;
   }
-  },
+};
 
-  async bulkFetchFromIndexedDB(ids) {
+const bulkFetchFromServer = async (ids: number[], masterKey: CryptoKey) => {
-    const files = await IndexedDB.bulkGetFileInfos([...ids]);
+  const filesRaw = await trpc().file.bulkGet.query({ ids });
-    const categories = await Promise.all(
-      files.map(async (file) =>
-        file?.categoryIds
-          ? await Promise.all(
-              file.categoryIds.map(async (categoryId) => {
-                const category = await IndexedDB.getCategoryInfo(categoryId);
-                return category
-                  ? { id: category.id, parentId: category.parentId, name: category.name }
-                  : undefined;
-              }),
-            )
-          : undefined,
-      ),
-    );
-
-    return new Map(
-      files
-        .filter((file) => !!file)
-        .map((file, index) => [
-          file.id,
-          {
-            ...file,
-            exists: true,
-            categories: categories[index]?.filter((category) => !!category) ?? [],
-          },
-        ]),
-    );
-  },
-
-  async bulkFetchFromServer(ids, masterKey) {
-    const idsArray = [...ids.keys()];
-
-    const filesRaw = await trpc().file.bulkGet.query({ ids: idsArray });
   const files = await Promise.all(
-      filesRaw.map(async ({ id, categories: categoriesRaw, ...metadataRaw }) => {
+    filesRaw.map(async (file) => {
-        const [categories, metadata] = await Promise.all([
+      const [categories, decryptedMetadata] = await Promise.all([
         Promise.all(
-            categoriesRaw.map(async (category) => ({
+          file.categories.map(async (category) => ({
             id: category.id,
-              parentId: category.parent,
             ...(await decryptCategoryMetadata(category, masterKey)),
           })),
         ),
-          decryptFileMetadata(metadataRaw, masterKey),
+        decryptFileMetadata(file, masterKey),
       ]);
 
+      await IndexedDB.storeFileInfo({
+        id: file.id,
+        parentId: file.parent,
+        contentType: file.contentType,
+        name: decryptedMetadata.name,
+        createdAt: decryptedMetadata.createdAt,
+        lastModifiedAt: decryptedMetadata.lastModifiedAt,
+        categoryIds: categories.map((category) => category.id),
+      });
       return {
-          id,
+        id: file.id,
         exists: true as const,
-          isLegacy: metadataRaw.isLegacy,
+        parentId: file.parent,
-          parentId: metadataRaw.parent,
+        contentType: file.contentType,
-          contentType: metadataRaw.contentType,
+        contentIv: file.contentIv,
         categories,
-          ...metadata,
+        ...decryptedMetadata,
       };
     }),
   );
 
   const existingIds = new Set(filesRaw.map(({ id }) => id));
-    const deletedIds = idsArray.filter((id) => !existingIds.has(id));
-
-    void IndexedDB.bulkDeleteFileInfos(deletedIds);
   return new Map<number, MaybeFileInfo>([
-      ...bulkStoreToIndexedDB(files),
+    ...files.map((file) => [file.id, file] as const),
-      ...deletedIds.map((id) => [id, { id, exists: false }] as const),
+    ...ids.filter((id) => !existingIds.has(id)).map((id) => [id, { id, exists: false }] as const),
   ]);
-  },
-});
-
-const storeToIndexedDB = (info: FileInfo) => {
-  void IndexedDB.storeFileInfo({
-    ...info,
-    categoryIds: info.categories.map(({ id }) => id),
-  });
-
-  info.categories.forEach((category) => {
-    void IndexedDB.storeCategoryInfo(category);
-  });
-
-  return { ...info, exists: true as const };
 };
 
-const bulkStoreToIndexedDB = (infos: FileInfo[]) => {
+export const getFileInfo = async (id: number, masterKey: CryptoKey) => {
-  // TODO: Bulk Upsert
+  return await cache.get(id, (isInitial, resolve) =>
-  infos.forEach((info) => {
+    monotonicResolve(
-    void IndexedDB.storeFileInfo({
+      [isInitial && fetchFromIndexedDB(id), fetchFromServer(id, masterKey)],
-      ...info,
+      resolve,
-      categoryIds: info.categories.map(({ id }) => id),
+    ),
-    });
+  );
-  });
-
-  // TODO: Bulk Upsert
-  new Map(
-    infos.flatMap(({ categories }) => categories).map((category) => [category.id, category]),
-  ).forEach((category) => {
-    void IndexedDB.storeCategoryInfo(category);
-  });
-
-  return infos.map((info) => [info.id, { ...info, exists: true }] as const);
 };
 
-export const getFileInfo = (id: number, masterKey: CryptoKey) => {
+export const bulkGetFileInfo = async (ids: number[], masterKey: CryptoKey) => {
-  return cache.get(id, masterKey);
+  return await cache.bulkGet(new Set(ids), (keys, resolve) =>
-};
+    monotonicResolve(
-
+      [
-export const bulkGetFileInfo = (ids: number[], masterKey: CryptoKey) => {
+        bulkFetchFromIndexedDB(
-  return cache.bulkGet(new Set(ids), masterKey);
+          Array.from(
+            keys
+              .entries()
+              .filter(([, isInitial]) => isInitial)
+              .map(([key]) => key),
+          ),
+        ),
+        bulkFetchFromServer(Array.from(keys.keys()), masterKey),
+      ],
+      resolve,
+    ),
+  );
 };

src/lib/modules/filesystem/internal.svelte.ts

@@ -1,124 +1,82 @@
-import { untrack } from "svelte";
 import { unwrapDataKey, decryptString } from "$lib/modules/crypto";
 
-interface FilesystemCacheOptions<K, V> {
+export class FilesystemCache<K, V extends RV, RV = V> {
-  fetchFromIndexedDB: (key: K) => Promise<V | undefined>;
+  private map = new Map<K, V | Promise<V>>();
-  fetchFromServer: (key: K, cachedValue: V | undefined, masterKey: CryptoKey) => Promise<V>;
+
-  bulkFetchFromIndexedDB?: (keys: Set<K>) => Promise<Map<K, V>>;
+  get(key: K, loader: (isInitial: boolean, resolve: (value: RV | undefined) => void) => void) {
-  bulkFetchFromServer?: (
+    const info = this.map.get(key);
-    keys: Map<K, { cachedValue: V | undefined }>,
+    if (info instanceof Promise) {
-    masterKey: CryptoKey,
+      return info;
-  ) => Promise<Map<K, V>>;
     }
 
-export class FilesystemCache<K, V extends object> {
+    const { promise, resolve } = Promise.withResolvers<V>();
-  private map = new Map<K, { value?: V; promise?: Promise<V> }>();
+    if (!info) {
-
+      this.map.set(key, promise);
-  constructor(private readonly options: FilesystemCacheOptions<K, V>) {}
-
-  get(key: K, masterKey: CryptoKey) {
-    return untrack(() => {
-      let state = this.map.get(key);
-      if (state?.promise) return state.value ?? state.promise;
-
-      const { promise: newPromise, resolve } = Promise.withResolvers<V>();
-
-      if (!state) {
-        const newState = $state({});
-        state = newState;
-        this.map.set(key, newState);
     }
 
-      (state.value
+    loader(!info, (loadedInfo) => {
-        ? Promise.resolve(state.value)
+      if (!loadedInfo) return;
-        : this.options.fetchFromIndexedDB(key).then((loadedInfo) => {
+
-            if (loadedInfo) {
+      const info = this.map.get(key)!;
-              state.value = loadedInfo;
+      if (info instanceof Promise) {
-              resolve(state.value);
+        const state = $state(loadedInfo);
-            }
+        this.map.set(key, state as V);
-            return loadedInfo;
+        resolve(state as V);
-          })
-      )
-        .then((cachedInfo) => this.options.fetchFromServer(key, cachedInfo, masterKey))
-        .then((loadedInfo) => {
-          if (state.value) {
-            Object.assign(state.value, loadedInfo);
       } else {
-            state.value = loadedInfo;
+        Object.assign(info, loadedInfo);
+        resolve(info);
       }
-          resolve(state.value);
-        })
-        .finally(() => {
-          state.promise = undefined;
     });
 
-      state.promise = newPromise;
+    return info ?? promise;
-      return state.value ?? newPromise;
-    });
   }
 
-  bulkGet(keys: Set<K>, masterKey: CryptoKey) {
+  async bulkGet(
-    return untrack(() => {
+    keys: Set<K>,
-      const newPromises = new Map(
+    loader: (keys: Map<K, boolean>, resolve: (values: Map<K, RV>) => void) => void,
-        keys
+  ) {
-          .keys()
+    const states = new Map<K, V>();
-          .filter((key) => this.map.get(key)?.promise === undefined)
+    const promises = new Map<K, Promise<V>>();
-          .map((key) => [key, Promise.withResolvers<V>()]),
+    const resolvers = new Map<K, (value: V) => void>();
-      );
+
-      newPromises.forEach(({ promise }, key) => {
+    keys.forEach((key) => {
-        const state = this.map.get(key);
+      const info = this.map.get(key);
-        if (state) {
+      if (info instanceof Promise) {
-          state.promise = promise;
+        promises.set(key, info);
+      } else if (info) {
+        states.set(key, info);
       } else {
-          const newState = $state({ promise });
+        const { promise, resolve } = Promise.withResolvers<V>();
-          this.map.set(key, newState);
+        this.map.set(key, promise);
+        promises.set(key, promise);
+        resolvers.set(key, resolve);
       }
     });
 
-      const resolve = (loadedInfos: Map<K, V>) => {
+    loader(
+      new Map([
+        ...states.keys().map((key) => [key, false] as const),
+        ...resolvers.keys().map((key) => [key, true] as const),
+      ]),
+      (loadedInfos) =>
         loadedInfos.forEach((loadedInfo, key) => {
-          const state = this.map.get(key)!;
+          const info = this.map.get(key)!;
-          if (state.value) {
+          const resolve = resolvers.get(key);
-            Object.assign(state.value, loadedInfo);
+          if (info instanceof Promise) {
+            const state = $state(loadedInfo);
+            this.map.set(key, state as V);
+            resolve?.(state as V);
           } else {
-            state.value = loadedInfo;
+            Object.assign(info, loadedInfo);
+            resolve?.(info);
           }
-          newPromises.get(key)!.resolve(state.value);
+        }),
-        });
-        return loadedInfos;
-      };
-
-      this.options.bulkFetchFromIndexedDB!(
-        new Set(newPromises.keys().filter((key) => this.map.get(key)!.value === undefined)),
-      )
-        .then(resolve)
-        .then(() =>
-          this.options.bulkFetchFromServer!(
-            new Map(
-              newPromises.keys().map((key) => [key, { cachedValue: this.map.get(key)!.value }]),
-            ),
-            masterKey,
-          ),
-        )
-        .then(resolve)
-        .finally(() => {
-          newPromises.forEach((_, key) => {
-            this.map.get(key)!.promise = undefined;
-          });
-        });
-
-      const bottleneckPromises = Array.from(
-        keys
-          .keys()
-          .filter((key) => this.map.get(key)!.value === undefined)
-          .map((key) => this.map.get(key)!.promise!),
     );
-      const makeResult = () =>
+
-        new Map(keys.keys().map((key) => [key, this.map.get(key)!.value!] as const));
+    const newStates = await Promise.all(
-      return bottleneckPromises.length > 0
+      promises.entries().map(async ([key, promise]) => [key, await promise] as const),
-        ? Promise.all(bottleneckPromises).then(makeResult)
+    );
-        : makeResult();
+    return new Map([...states, ...newStates]);
-    });
   }
 }
 

src/lib/modules/filesystem/types.ts

@@ -20,34 +20,31 @@ interface RootDirectoryInfo {
 }
 
 export type DirectoryInfo = LocalDirectoryInfo | RootDirectoryInfo;
+export type SubDirectoryInfo = Omit<LocalDirectoryInfo, "parentId" | "subDirectories" | "files">;
 export type MaybeDirectoryInfo =
   | (DirectoryInfo & { exists: true })
   | ({ id: DirectoryId; exists: false } & AllUndefined<Omit<DirectoryInfo, "id">>);
 
-export type SubDirectoryInfo = Omit<LocalDirectoryInfo, "subDirectories" | "files">;
-
 export interface FileInfo {
   id: number;
-  isLegacy?: boolean;
   parentId: DirectoryId;
   dataKey?: DataKey;
   contentType: string;
+  contentIv?: string;
   name: string;
   createdAt?: Date;
   lastModifiedAt: Date;
-  categories: FileCategoryInfo[];
+  categories: { id: number; name: string }[];
 }
 
+export type SummarizedFileInfo = Omit<FileInfo, "parentId" | "contentIv" | "categories">;
+export type CategoryFileInfo = SummarizedFileInfo & { isRecursive: boolean };
 export type MaybeFileInfo =
   | (FileInfo & { exists: true })
   | ({ id: number; exists: false } & AllUndefined<Omit<FileInfo, "id">>);
 
-export type SummarizedFileInfo = Omit<FileInfo, "categories">;
-export type CategoryFileInfo = SummarizedFileInfo & { isRecursive: boolean };
-
 interface LocalCategoryInfo {
   id: number;
-  parentId: DirectoryId;
   dataKey?: DataKey;
   name: string;
   subCategories: SubCategoryInfo[];
@@ -57,7 +54,6 @@ interface LocalCategoryInfo {
 
 interface RootCategoryInfo {
   id: "root";
-  parentId?: undefined;
   dataKey?: undefined;
   name?: undefined;
   subCategories: SubCategoryInfo[];
@@ -66,12 +62,10 @@ interface RootCategoryInfo {
 }
 
 export type CategoryInfo = LocalCategoryInfo | RootCategoryInfo;
-export type MaybeCategoryInfo =
-  | (CategoryInfo & { exists: true })
-  | ({ id: CategoryId; exists: false } & AllUndefined<Omit<CategoryInfo, "id">>);
-
 export type SubCategoryInfo = Omit<
   LocalCategoryInfo,
   "subCategories" | "files" | "isFileRecursive"
 >;
-export type FileCategoryInfo = Omit<SubCategoryInfo, "dataKey">;
+export type MaybeCategoryInfo =
+  | (CategoryInfo & { exists: true })
+  | ({ id: CategoryId; exists: false } & AllUndefined<Omit<CategoryInfo, "id">>);

src/lib/modules/http.ts

@@ -1,22 +0,0 @@
-export const parseRangeHeader = (value: string | null) => {
-  if (!value) return undefined;
-
-  const firstRange = value.split(",")[0]!.trim();
-  const parts = firstRange.replace(/bytes=/, "").split("-");
-  return {
-    start: parts[0] ? parseInt(parts[0], 10) : undefined,
-    end: parts[1] ? parseInt(parts[1], 10) : undefined,
-  };
-};
-
-export const getContentRangeHeader = (range?: { start: number; end: number; total: number }) => {
-  return range && { "Content-Range": `bytes ${range.start}-${range.end}/${range.total}` };
-};
-
-export const parseContentDigestHeader = (value: string | null) => {
-  if (!value) return undefined;
-
-  const firstDigest = value.split(",")[0]!.trim();
-  const match = firstDigest.match(/^sha-256=:([A-Za-z0-9+/=]+):$/);
-  return match?.[1];
-};

src/lib/modules/key.ts

@@ -2,7 +2,7 @@ import { z } from "zod";
 import { storeClientKey } from "$lib/indexedDB";
 import type { ClientKeys } from "$lib/stores";
 
-const SerializedClientKeysSchema = z.intersection(
+const serializedClientKeysSchema = z.intersection(
   z.object({
     generator: z.literal("ArkVault"),
     exportedAt: z.iso.datetime(),
@@ -16,7 +16,7 @@ const SerializedClientKeysSchema = z.intersection(
   }),
 );
 
-type SerializedClientKeys = z.infer<typeof SerializedClientKeysSchema>;
+type SerializedClientKeys = z.infer<typeof serializedClientKeysSchema>;
 
 type DeserializedClientKeys = {
   encryptKeyBase64: string;
@@ -43,7 +43,7 @@ export const serializeClientKeys = ({
 };
 
 export const deserializeClientKeys = (serialized: string) => {
-  const zodRes = SerializedClientKeysSchema.safeParse(JSON.parse(serialized));
+  const zodRes = serializedClientKeysSchema.safeParse(JSON.parse(serialized));
   if (zodRes.success) {
     return {
       encryptKeyBase64: zodRes.data.encryptKey,

src/lib/modules/opfs.ts

@@ -1,5 +1,13 @@
+let rootHandle: FileSystemDirectoryHandle | null = null;
+
+export const prepareOpfs = async () => {
+  rootHandle = await navigator.storage.getDirectory();
+};
+
 const getFileHandle = async (path: string, create = true) => {
-  if (path[0] !== "/") {
+  if (!rootHandle) {
+    throw new Error("OPFS not prepared");
+  } else if (path[0] !== "/") {
     throw new Error("Path must be absolute");
   }
 
@@ -9,7 +17,7 @@ const getFileHandle = async (path: string, create = true) => {
   }
 
   try {
-    let directoryHandle = await navigator.storage.getDirectory();
+    let directoryHandle = rootHandle;
     for (const part of parts.slice(0, -1)) {
       if (!part) continue;
       directoryHandle = await directoryHandle.getDirectoryHandle(part, { create });
@@ -26,15 +34,12 @@ const getFileHandle = async (path: string, create = true) => {
   }
 };
 
-export const getFile = async (path: string) => {
+export const readFile = async (path: string) => {
   const { fileHandle } = await getFileHandle(path, false);
   if (!fileHandle) return null;
 
-  return await fileHandle.getFile();
+  const file = await fileHandle.getFile();
-};
+  return await file.arrayBuffer();
-
-export const readFile = async (path: string) => {
-  return (await getFile(path))?.arrayBuffer() ?? null;
 };
 
 export const writeFile = async (path: string, data: ArrayBuffer) => {
@@ -56,7 +61,9 @@ export const deleteFile = async (path: string) => {
 };
 
 const getDirectoryHandle = async (path: string) => {
-  if (path[0] !== "/") {
+  if (!rootHandle) {
+    throw new Error("OPFS not prepared");
+  } else if (path[0] !== "/") {
     throw new Error("Path must be absolute");
   }
 
@@ -66,7 +73,7 @@ const getDirectoryHandle = async (path: string) => {
   }
 
   try {
-    let directoryHandle = await navigator.storage.getDirectory();
+    let directoryHandle = rootHandle;
     let parentHandle;
     for (const part of parts.slice(1)) {
       if (!part) continue;

src/lib/modules/thumbnail.ts

@@ -52,6 +52,7 @@ const generateImageThumbnail = (imageUrl: string) => {
         .catch(reject);
     };
     image.onerror = reject;
+
     image.src = imageUrl;
   });
 };
@@ -84,27 +85,31 @@ const generateVideoThumbnail = (videoUrl: string, time = 0) => {
   });
 };
 
-export const generateThumbnail = async (blob: Blob) => {
+export const generateThumbnail = async (fileBuffer: ArrayBuffer, fileType: string) => {
   let url;
   try {
-    if (blob.type.startsWith("image/")) {
+    if (fileType.startsWith("image/")) {
-      url = URL.createObjectURL(blob);
+      const fileBlob = new Blob([fileBuffer], { type: fileType });
+      url = URL.createObjectURL(fileBlob);
+
       try {
         return await generateImageThumbnail(url);
       } catch {
         URL.revokeObjectURL(url);
         url = undefined;
 
-        if (blob.type === "image/heic") {
+        if (fileType === "image/heic") {
           const { default: heic2any } = await import("heic2any");
-          url = URL.createObjectURL((await heic2any({ blob, toType: "image/png" })) as Blob);
+          url = URL.createObjectURL(
+            (await heic2any({ blob: fileBlob, toType: "image/png" })) as Blob,
+          );
           return await generateImageThumbnail(url);
         } else {
           return null;
         }
       }
-    } else if (blob.type.startsWith("video/")) {
+    } else if (fileType.startsWith("video/")) {
-      url = URL.createObjectURL(blob);
+      url = URL.createObjectURL(new Blob([fileBuffer], { type: fileType }));
       return await generateVideoThumbnail(url);
     }
     return null;

src/lib/modules/upload.ts

@@ -1,183 +0,0 @@
-import axios from "axios";
-import pLimit from "p-limit";
-import { ENCRYPTION_OVERHEAD, CHUNK_SIZE } from "$lib/constants";
-import { encryptChunk, digestMessage, encodeToBase64 } from "$lib/modules/crypto";
-import { BoundedQueue } from "$lib/utils";
-
-interface UploadStats {
-  progress: number;
-  rate: number;
-}
-
-interface EncryptedChunk {
-  index: number;
-  data: ArrayBuffer;
-  hash: string;
-}
-
-const createSpeedMeter = (timeWindow = 3000, minInterval = 200, warmupPeriod = 500) => {
-  const samples: { t: number; b: number }[] = [];
-  let lastSpeed = 0;
-  let startTime: number | null = null;
-
-  return (bytesNow?: number) => {
-    if (bytesNow === undefined) return lastSpeed;
-
-    const now = performance.now();
-
-    // Initialize start time on first call
-    if (startTime === null) {
-      startTime = now;
-    }
-
-    // Check if enough time has passed since the last sample
-    const lastSample = samples[samples.length - 1];
-    if (lastSample && now - lastSample.t < minInterval) {
-      return lastSpeed;
-    }
-
-    samples.push({ t: now, b: bytesNow });
-
-    // Remove old samples outside the time window
-    const cutoff = now - timeWindow;
-    while (samples.length > 2 && samples[0]!.t < cutoff) samples.shift();
-
-    // Need at least 2 samples to calculate speed
-    if (samples.length < 2) {
-      return lastSpeed;
-    }
-
-    const first = samples[0]!;
-    const dt = now - first.t;
-    const db = bytesNow - first.b;
-
-    if (dt >= minInterval) {
-      const instantSpeed = (db / dt) * 1000;
-      // Apply EMA for smoother speed transitions
-      const alpha = 0.3;
-      const rawSpeed =
-        lastSpeed === 0 ? instantSpeed : alpha * instantSpeed + (1 - alpha) * lastSpeed;
-
-      // Apply warmup ramp to prevent initial overestimation
-      const elapsed = now - startTime;
-      const warmupWeight = Math.min(1, elapsed / warmupPeriod);
-      lastSpeed = rawSpeed * warmupWeight;
-    }
-
-    return lastSpeed;
-  };
-};
-
-const encryptChunkData = async (
-  chunk: Blob,
-  dataKey: CryptoKey,
-): Promise<{ data: ArrayBuffer; hash: string }> => {
-  const encrypted = await encryptChunk(await chunk.arrayBuffer(), dataKey);
-  const hash = encodeToBase64(await digestMessage(encrypted));
-  return { data: encrypted, hash };
-};
-
-const uploadEncryptedChunk = async (
-  uploadId: string,
-  chunkIndex: number,
-  encrypted: ArrayBuffer,
-  hash: string,
-  onChunkProgress: (chunkIndex: number, loaded: number) => void,
-) => {
-  await axios.post(`/api/upload/${uploadId}/chunks/${chunkIndex + 1}`, encrypted, {
-    headers: {
-      "Content-Type": "application/octet-stream",
-      "Content-Digest": `sha-256=:${hash}:`,
-    },
-    onUploadProgress(e) {
-      onChunkProgress(chunkIndex, e.loaded ?? 0);
-    },
-  });
-
-  onChunkProgress(chunkIndex, encrypted.byteLength);
-};
-
-export const uploadBlob = async (
-  uploadId: string,
-  blob: Blob,
-  dataKey: CryptoKey,
-  options?: { concurrency?: number; onProgress?: (s: UploadStats) => void },
-) => {
-  const onProgress = options?.onProgress;
-  const networkConcurrency = options?.concurrency ?? 4;
-  const maxQueueSize = 8;
-
-  const totalChunks = Math.ceil(blob.size / CHUNK_SIZE);
-  const totalBytes = blob.size + totalChunks * ENCRYPTION_OVERHEAD;
-
-  const uploadedByChunk = new Array<number>(totalChunks).fill(0);
-  const speedMeter = createSpeedMeter(3000, 200);
-
-  const emit = () => {
-    if (!onProgress) return;
-
-    const uploadedBytes = uploadedByChunk.reduce((a, b) => a + b, 0);
-    const rate = speedMeter(uploadedBytes);
-    const progress = Math.min(1, uploadedBytes / totalBytes);
-
-    onProgress({ progress, rate });
-  };
-
-  const onChunkProgress = (idx: number, loaded: number) => {
-    uploadedByChunk[idx] = loaded;
-    emit();
-  };
-
-  const queue = new BoundedQueue<EncryptedChunk>(maxQueueSize);
-  let encryptionError: Error | null = null;
-
-  // Producer: encrypt chunks and push to queue
-  const encryptionProducer = async () => {
-    try {
-      for (let i = 0; i < totalChunks; i++) {
-        const chunk = blob.slice(i * CHUNK_SIZE, (i + 1) * CHUNK_SIZE);
-        const { data, hash } = await encryptChunkData(chunk, dataKey);
-        await queue.push({ index: i, data, hash });
-      }
-    } catch (e) {
-      encryptionError = e instanceof Error ? e : new Error(String(e));
-    } finally {
-      queue.close();
-    }
-  };
-
-  // Consumer: upload chunks from queue with concurrency limit
-  const uploadConsumer = async () => {
-    const limit = pLimit(networkConcurrency);
-    const activeTasks = new Set<Promise<void>>();
-
-    while (true) {
-      const item = await queue.pop();
-      if (item === null) break;
-      if (encryptionError) throw encryptionError;
-
-      const task = limit(async () => {
-        try {
-          await uploadEncryptedChunk(uploadId, item.index, item.data, item.hash, onChunkProgress);
-        } finally {
-          // @ts-ignore
-          item.data = null;
-        }
-      });
-
-      activeTasks.add(task);
-      task.finally(() => activeTasks.delete(task));
-
-      if (activeTasks.size >= networkConcurrency) {
-        await Promise.race(activeTasks);
-      }
-    }
-
-    await Promise.all(activeTasks);
-  };
-
-  // Run producer and consumer concurrently
-  await Promise.all([encryptionProducer(), uploadConsumer()]);
-
-  onProgress?.({ progress: 1, rate: speedMeter() });
-};

src/lib/schemas/filesystem.ts

@@ -1,4 +0,0 @@
-import { z } from "zod";
-
-export const DirectoryIdSchema = z.union([z.literal("root"), z.int().positive()]);
-export const CategoryIdSchema = z.union([z.literal("root"), z.int().positive()]);

src/lib/schemas/index.ts

@@ -1 +0,0 @@
-export * from "./filesystem";

src/lib/server/db/error.ts

@@ -9,7 +9,6 @@ type IntegrityErrorMessages =
   // File
   | "Directory not found"
   | "File not found"
-  | "File is not legacy"
   | "File not found in category"
   | "File already added to category"
   | "Invalid DEK version"

src/lib/server/db/file.ts

@@ -15,6 +15,8 @@ interface Directory {
   encName: Ciphertext;
 }
 
+export type NewDirectory = Omit<Directory, "id">;
+
 interface File {
   id: number;
   parentId: DirectoryId;
@@ -26,23 +28,24 @@ interface File {
   hskVersion: number | null;
   contentHmac: string | null;
   contentType: string;
-  encContentIv: string | null;
+  encContentIv: string;
   encContentHash: string;
   encName: Ciphertext;
   encCreatedAt: Ciphertext | null;
   encLastModifiedAt: Ciphertext;
 }
 
+export type NewFile = Omit<File, "id">;
+
 interface FileCategory {
   id: number;
-  parentId: CategoryId;
   mekVersion: number;
   encDek: string;
   dekVersion: Date;
   encName: Ciphertext;
 }
 
-export const registerDirectory = async (params: Omit<Directory, "id">) => {
+export const registerDirectory = async (params: NewDirectory) => {
   await db.transaction().execute(async (trx) => {
     const mek = await trx
       .selectFrom("master_encryption_key")
@@ -210,11 +213,38 @@ export const unregisterDirectory = async (userId: number, directoryId: number) =
     });
 };
 
-export const registerFile = async (trx: typeof db, params: Omit<File, "id">) => {
+export const registerFile = async (params: NewFile) => {
   if ((params.hskVersion && !params.contentHmac) || (!params.hskVersion && params.contentHmac)) {
     throw new Error("Invalid arguments");
   }
 
+  return await db.transaction().execute(async (trx) => {
+    const mek = await trx
+      .selectFrom("master_encryption_key")
+      .select("version")
+      .where("user_id", "=", params.userId)
+      .where("state", "=", "active")
+      .limit(1)
+      .forUpdate()
+      .executeTakeFirst();
+    if (mek?.version !== params.mekVersion) {
+      throw new IntegrityError("Inactive MEK version");
+    }
+
+    if (params.hskVersion) {
+      const hsk = await trx
+        .selectFrom("hmac_secret_key")
+        .select("version")
+        .where("user_id", "=", params.userId)
+        .where("state", "=", "active")
+        .limit(1)
+        .forUpdate()
+        .executeTakeFirst();
+      if (hsk?.version !== params.hskVersion) {
+        throw new IntegrityError("Inactive HSK version");
+      }
+    }
+
     const { fileId } = await trx
       .insertInto("file")
       .values({
@@ -245,6 +275,7 @@ export const registerFile = async (trx: typeof db, params: Omit<File, "id">) =>
       })
       .execute();
     return { id: fileId };
+  });
 };
 
 export const getAllFilesByParent = async (userId: number, parentId: DirectoryId) => {
@@ -334,16 +365,6 @@ export const getAllFileIds = async (userId: number) => {
   return files.map(({ id }) => id);
 };
 
-export const getLegacyFileIds = async (userId: number) => {
-  const files = await db
-    .selectFrom("file")
-    .select("id")
-    .where("user_id", "=", userId)
-    .where("encrypted_content_iv", "is not", null)
-    .execute();
-  return files.map(({ id }) => id);
-};
-
 export const getAllFileIdsByContentHmac = async (
   userId: number,
   hskVersion: number,
@@ -424,7 +445,6 @@ export const getFilesWithCategories = async (userId: number, fileIds: number[])
         encLastModifiedAt: file.encrypted_last_modified_at,
         categories: file.categories.map((category) => ({
           id: category.id,
-          parentId: category.parent_id ?? "root",
           mekVersion: category.master_encryption_key_version,
           encDek: category.encrypted_data_encryption_key,
           dekVersion: new Date(category.data_encryption_key_version),
@@ -492,51 +512,6 @@ export const unregisterFile = async (userId: number, fileId: number) => {
   });
 };
 
-export const migrateFileContent = async (
-  trx: typeof db,
-  userId: number,
-  fileId: number,
-  newPath: string,
-  dekVersion: Date,
-  encContentHash: string,
-) => {
-  const file = await trx
-    .selectFrom("file")
-    .select(["path", "data_encryption_key_version", "encrypted_content_iv"])
-    .where("id", "=", fileId)
-    .where("user_id", "=", userId)
-    .limit(1)
-    .forUpdate()
-    .executeTakeFirst();
-  if (!file) {
-    throw new IntegrityError("File not found");
-  } else if (file.data_encryption_key_version.getTime() !== dekVersion.getTime()) {
-    throw new IntegrityError("Invalid DEK version");
-  } else if (!file.encrypted_content_iv) {
-    throw new IntegrityError("File is not legacy");
-  }
-
-  await trx
-    .updateTable("file")
-    .set({
-      path: newPath,
-      encrypted_content_iv: null,
-      encrypted_content_hash: encContentHash,
-    })
-    .where("id", "=", fileId)
-    .where("user_id", "=", userId)
-    .execute();
-  await trx
-    .insertInto("file_log")
-    .values({
-      file_id: fileId,
-      timestamp: new Date(),
-      action: "migrate",
-    })
-    .execute();
-  return { oldPath: file.path };
-};
-
 export const addFileToCategory = async (fileId: number, categoryId: number) => {
   await db.transaction().execute(async (trx) => {
     try {
@@ -573,7 +548,6 @@ export const getAllFileCategories = async (fileId: number) => {
     (category) =>
       ({
         id: category.id,
-        parentId: category.parent_id ?? "root",
         mekVersion: category.master_encryption_key_version,
         encDek: category.encrypted_data_encryption_key,
         dekVersion: category.data_encryption_key_version,

src/lib/server/db/index.ts

@@ -5,7 +5,6 @@ export * as HskRepo from "./hsk";
 export * as MediaRepo from "./media";
 export * as MekRepo from "./mek";
 export * as SessionRepo from "./session";
-export * as UploadRepo from "./upload";
 export * as UserRepo from "./user";
 
 export * from "./error";

src/lib/server/db/media.ts

@@ -6,7 +6,7 @@ interface Thumbnail {
   id: number;
   path: string;
   updatedAt: Date;
-  encContentIv: string | null;
+  encContentIv: string;
 }
 
 interface FileThumbnail extends Thumbnail {
@@ -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,
+  encContentIv: string,
 ) => {
+  return await db.transaction().execute(async (trx) => {
     const file = await trx
       .selectFrom("file")
       .select("data_encryption_key_version")
@@ -61,6 +61,7 @@ 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

@@ -1,74 +0,0 @@
-import { Kysely, sql } from "kysely";
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const up = async (db: Kysely<any>) => {
-  // file.ts
-  await db.schema
-    .alterTable("file")
-    .alterColumn("encrypted_content_iv", (col) => col.dropNotNull())
-    .execute();
-
-  // media.ts
-  await db.schema
-    .alterTable("thumbnail")
-    .alterColumn("encrypted_content_iv", (col) => col.dropNotNull())
-    .execute();
-
-  // upload.ts
-  await db.schema
-    .createTable("upload_session")
-    .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("bitmap", "bytea", (col) => col.notNull())
-    .addColumn("total_chunks", "integer", (col) => col.notNull())
-    .addColumn("uploaded_chunks", "integer", (col) =>
-      col
-        .generatedAlwaysAs(sql`bit_count(bitmap)`)
-        .stored()
-        .notNull(),
-    )
-    .addColumn("expires_at", "timestamp(3)", (col) => col.notNull())
-    .addColumn("parent_id", "integer", (col) => col.references("directory.id"))
-    .addColumn("master_encryption_key_version", "integer")
-    .addColumn("encrypted_data_encryption_key", "text")
-    .addColumn("data_encryption_key_version", "timestamp(3)")
-    .addColumn("hmac_secret_key_version", "integer")
-    .addColumn("content_type", "text")
-    .addColumn("encrypted_name", "json")
-    .addColumn("encrypted_created_at", "json")
-    .addColumn("encrypted_last_modified_at", "json")
-    .addColumn("file_id", "integer", (col) => col.references("file.id"))
-    .addForeignKeyConstraint(
-      "upload_session_fk01",
-      ["user_id", "master_encryption_key_version"],
-      "master_encryption_key",
-      ["user_id", "version"],
-    )
-    .addForeignKeyConstraint(
-      "upload_session_fk02",
-      ["user_id", "hmac_secret_key_version"],
-      "hmac_secret_key",
-      ["user_id", "version"],
-    )
-    .addCheckConstraint(
-      "upload_session_ck01",
-      sql`length(bitmap) = ceil(total_chunks / 8.0)::integer`,
-    )
-    .addCheckConstraint("upload_session_ck02", sql`uploaded_chunks <= total_chunks`)
-    .execute();
-};
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const down = async (db: Kysely<any>) => {
-  await db.schema.dropTable("upload_session").execute();
-  await db.schema
-    .alterTable("thumbnail")
-    .alterColumn("encrypted_content_iv", (col) => col.setNotNull())
-    .execute();
-  await db.schema
-    .alterTable("file")
-    .alterColumn("encrypted_content_iv", (col) => col.setNotNull())
-    .execute();
-};

src/lib/server/db/migrations/index.ts

@@ -1,11 +1,9 @@
 import * as Initial1737357000 from "./1737357000-Initial";
 import * as AddFileCategory1737422340 from "./1737422340-AddFileCategory";
 import * as AddThumbnail1738409340 from "./1738409340-AddThumbnail";
-import * as AddChunkedUpload1768062380 from "./1768062380-AddChunkedUpload";
 
 export default {
   "1737357000-Initial": Initial1737357000,
   "1737422340-AddFileCategory": AddFileCategory1737422340,
   "1738409340-AddThumbnail": AddThumbnail1738409340,
-  "1768062380-AddChunkedUpload": AddChunkedUpload1768062380,
 };

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

@@ -1,5 +1,5 @@
 import type { Generated } from "kysely";
-import type { Ciphertext } from "./utils";
+import type { Ciphertext } from "./util";
 
 interface CategoryTable {
   id: Generated<number>;

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

@@ -1,5 +1,5 @@
 import type { ColumnType, Generated } from "kysely";
-import type { Ciphertext } from "./utils";
+import type { Ciphertext } from "./util";
 
 interface DirectoryTable {
   id: Generated<number>;
@@ -30,7 +30,7 @@ interface FileTable {
   hmac_secret_key_version: number | null;
   content_hmac: string | null; // Base64
   content_type: string;
-  encrypted_content_iv: string | null; // Base64
+  encrypted_content_iv: string; // Base64
   encrypted_content_hash: string; // Base64
   encrypted_name: Ciphertext;
   encrypted_created_at: Ciphertext | null;
@@ -41,7 +41,7 @@ interface FileLogTable {
   id: Generated<number>;
   file_id: number;
   timestamp: ColumnType<Date, Date, never>;
-  action: "create" | "rename" | "migrate" | "add-to-category" | "remove-from-category";
+  action: "create" | "rename" | "add-to-category" | "remove-from-category";
   new_name: Ciphertext | null;
   category_id: number | null;
 }

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

@@ -5,9 +5,8 @@ export * from "./hsk";
 export * from "./media";
 export * from "./mek";
 export * from "./session";
-export * from "./upload";
 export * from "./user";
-export * from "./utils";
+export * from "./util";
 
 // eslint-disable-next-line @typescript-eslint/no-empty-object-type
 export interface Database {}

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

@@ -7,7 +7,7 @@ interface ThumbnailTable {
   category_id: number | null;
   path: string;
   updated_at: Date;
-  encrypted_content_iv: string | null; // Base64
+  encrypted_content_iv: string; // Base64
 }
 
 declare module "./index" {

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

@@ -1,30 +0,0 @@
-import type { Generated } from "kysely";
-import type { Ciphertext } from "./utils";
-
-interface UploadSessionTable {
-  id: string;
-  type: "file" | "thumbnail" | "migration";
-  user_id: number;
-  path: string;
-  bitmap: Buffer;
-  total_chunks: number;
-  uploaded_chunks: Generated<number>;
-  expires_at: Date;
-
-  parent_id: number | null;
-  master_encryption_key_version: number | null;
-  encrypted_data_encryption_key: string | null; // Base64
-  data_encryption_key_version: Date | null;
-  hmac_secret_key_version: number | null;
-  content_type: string | null;
-  encrypted_name: Ciphertext | null;
-  encrypted_created_at: Ciphertext | null;
-  encrypted_last_modified_at: Ciphertext | null;
-  file_id: number | null;
-}
-
-declare module "./index" {
-  interface Database {
-    upload_session: UploadSessionTable;
-  }
-}

src/lib/server/db/upload.ts

@@ -1,192 +0,0 @@
-import { sql } from "kysely";
-import { IntegrityError } from "./error";
-import db from "./kysely";
-import type { Ciphertext } from "./schema";
-
-interface BaseUploadSession {
-  id: string;
-  userId: number;
-  path: string;
-  bitmap: Buffer;
-  totalChunks: number;
-  uploadedChunks: number;
-  expiresAt: Date;
-}
-
-interface FileUploadSession extends BaseUploadSession {
-  type: "file";
-  parentId: DirectoryId;
-  mekVersion: number;
-  encDek: string;
-  dekVersion: Date;
-  hskVersion: number | null;
-  contentType: string;
-  encName: Ciphertext;
-  encCreatedAt: Ciphertext | null;
-  encLastModifiedAt: Ciphertext;
-}
-
-interface ThumbnailOrMigrationUploadSession extends BaseUploadSession {
-  type: "thumbnail" | "migration";
-  fileId: number;
-  dekVersion: Date;
-}
-
-export const createFileUploadSession = async (
-  params: Omit<FileUploadSession, "type" | "bitmap" | "uploadedChunks">,
-) => {
-  await db.transaction().execute(async (trx) => {
-    const mek = await trx
-      .selectFrom("master_encryption_key")
-      .select("version")
-      .where("user_id", "=", params.userId)
-      .where("state", "=", "active")
-      .limit(1)
-      .forUpdate()
-      .executeTakeFirst();
-    if (mek?.version !== params.mekVersion) {
-      throw new IntegrityError("Inactive MEK version");
-    }
-
-    if (params.hskVersion) {
-      const hsk = await trx
-        .selectFrom("hmac_secret_key")
-        .select("version")
-        .where("user_id", "=", params.userId)
-        .where("state", "=", "active")
-        .limit(1)
-        .forUpdate()
-        .executeTakeFirst();
-      if (hsk?.version !== params.hskVersion) {
-        throw new IntegrityError("Inactive HSK version");
-      }
-    }
-
-    await trx
-      .insertInto("upload_session")
-      .values({
-        id: params.id,
-        type: "file",
-        user_id: params.userId,
-        path: params.path,
-        bitmap: Buffer.alloc(Math.ceil(params.totalChunks / 8)),
-        total_chunks: params.totalChunks,
-        expires_at: params.expiresAt,
-        parent_id: params.parentId !== "root" ? params.parentId : null,
-        master_encryption_key_version: params.mekVersion,
-        encrypted_data_encryption_key: params.encDek,
-        data_encryption_key_version: params.dekVersion,
-        hmac_secret_key_version: params.hskVersion,
-        content_type: params.contentType,
-        encrypted_name: params.encName,
-        encrypted_created_at: params.encCreatedAt,
-        encrypted_last_modified_at: params.encLastModifiedAt,
-      })
-      .execute();
-  });
-};
-
-export const createThumbnailOrMigrationUploadSession = async (
-  params: Omit<ThumbnailOrMigrationUploadSession, "bitmap" | "uploadedChunks">,
-) => {
-  await db.transaction().execute(async (trx) => {
-    const file = await trx
-      .selectFrom("file")
-      .select("data_encryption_key_version")
-      .where("id", "=", params.fileId)
-      .where("user_id", "=", params.userId)
-      .limit(1)
-      .forUpdate()
-      .executeTakeFirst();
-    if (!file) {
-      throw new IntegrityError("File not found");
-    } else if (file.data_encryption_key_version.getTime() !== params.dekVersion.getTime()) {
-      throw new IntegrityError("Invalid DEK version");
-    }
-
-    await trx
-      .insertInto("upload_session")
-      .values({
-        id: params.id,
-        type: params.type,
-        user_id: params.userId,
-        path: params.path,
-        bitmap: Buffer.alloc(Math.ceil(params.totalChunks / 8)),
-        total_chunks: params.totalChunks,
-        expires_at: params.expiresAt,
-        file_id: params.fileId,
-        data_encryption_key_version: params.dekVersion,
-      })
-      .execute();
-  });
-};
-
-export const getUploadSession = async (sessionId: string, userId: number) => {
-  const session = await db
-    .selectFrom("upload_session")
-    .selectAll()
-    .where("id", "=", sessionId)
-    .where("user_id", "=", userId)
-    .where("expires_at", ">", new Date())
-    .limit(1)
-    .executeTakeFirst();
-  if (!session) {
-    return null;
-  } else if (session.type === "file") {
-    return {
-      type: "file",
-      id: session.id,
-      userId: session.user_id,
-      path: session.path,
-      bitmap: session.bitmap,
-      totalChunks: session.total_chunks,
-      uploadedChunks: session.uploaded_chunks,
-      expiresAt: session.expires_at,
-      parentId: session.parent_id ?? "root",
-      mekVersion: session.master_encryption_key_version!,
-      encDek: session.encrypted_data_encryption_key!,
-      dekVersion: session.data_encryption_key_version!,
-      hskVersion: session.hmac_secret_key_version,
-      contentType: session.content_type!,
-      encName: session.encrypted_name!,
-      encCreatedAt: session.encrypted_created_at,
-      encLastModifiedAt: session.encrypted_last_modified_at!,
-    } satisfies FileUploadSession;
-  } else {
-    return {
-      type: session.type,
-      id: session.id,
-      userId: session.user_id,
-      path: session.path,
-      bitmap: session.bitmap,
-      totalChunks: session.total_chunks,
-      uploadedChunks: session.uploaded_chunks,
-      expiresAt: session.expires_at,
-      fileId: session.file_id!,
-      dekVersion: session.data_encryption_key_version!,
-    } satisfies ThumbnailOrMigrationUploadSession;
-  }
-};
-
-export const markChunkAsUploaded = async (sessionId: string, chunkIndex: number) => {
-  await db
-    .updateTable("upload_session")
-    .set({
-      bitmap: sql`set_bit(${sql.ref("bitmap")}, ${chunkIndex - 1}, 1)`,
-    })
-    .where("id", "=", sessionId)
-    .execute();
-};
-
-export const deleteUploadSession = async (trx: typeof db, sessionId: string) => {
-  await trx.deleteFrom("upload_session").where("id", "=", sessionId).execute();
-};
-
-export const cleanupExpiredUploadSessions = async () => {
-  const sessions = await db
-    .deleteFrom("upload_session")
-    .where("expires_at", "<=", new Date())
-    .returning("path")
-    .execute();
-  return sessions.map(({ path }) => path);
-};

src/lib/server/loadenv.ts

@@ -26,5 +26,4 @@ export default {
   },
   libraryPath: env.LIBRARY_PATH || "library",
   thumbnailsPath: env.THUMBNAILS_PATH || "thumbnails",
-  uploadsPath: env.UPLOADS_PATH || "uploads",
 };

src/lib/server/modules/filesystem.ts

@@ -1,10 +1,4 @@
-import { rm, unlink } from "fs/promises";
+import { unlink } from "fs/promises";
-
-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/schemas/category.ts

@@ -0,0 +1,3 @@
+import { z } from "zod";
+
+export const categoryIdSchema = z.union([z.literal("root"), z.int().positive()]);

src/lib/server/schemas/directory.ts

@@ -0,0 +1,3 @@
+import { z } from "zod";
+
+export const directoryIdSchema = z.union([z.literal("root"), z.int().positive()]);

src/lib/server/schemas/file.ts

@@ -0,0 +1,36 @@
+import mime from "mime";
+import { z } from "zod";
+import { directoryIdSchema } from "./directory";
+
+export const fileThumbnailUploadRequest = z.object({
+  dekVersion: z.iso.datetime(),
+  contentIv: z.base64().nonempty(),
+});
+export type FileThumbnailUploadRequest = z.input<typeof fileThumbnailUploadRequest>;
+
+export const fileUploadRequest = z.object({
+  parent: directoryIdSchema,
+  mekVersion: z.int().positive(),
+  dek: z.base64().nonempty(),
+  dekVersion: z.iso.datetime(),
+  hskVersion: z.int().positive(),
+  contentHmac: z.base64().nonempty(),
+  contentType: z
+    .string()
+    .trim()
+    .nonempty()
+    .refine((value) => mime.getExtension(value) !== null), // MIME type
+  contentIv: z.base64().nonempty(),
+  name: z.base64().nonempty(),
+  nameIv: z.base64().nonempty(),
+  createdAt: z.base64().nonempty().optional(),
+  createdAtIv: z.base64().nonempty().optional(),
+  lastModifiedAt: z.base64().nonempty(),
+  lastModifiedAtIv: z.base64().nonempty(),
+});
+export type FileUploadRequest = z.input<typeof fileUploadRequest>;
+
+export const fileUploadResponse = z.object({
+  file: z.int().positive(),
+});
+export type FileUploadResponse = z.output<typeof fileUploadResponse>;

src/lib/server/schemas/index.ts

@@ -0,0 +1,3 @@
+export * from "./category";
+export * from "./directory";
+export * from "./file";

src/lib/server/services/file.ts

@@ -1,74 +1,126 @@
 import { error } from "@sveltejs/kit";
-import { createReadStream } from "fs";
+import { createHash } from "crypto";
-import { stat } from "fs/promises";
+import { createReadStream, createWriteStream } from "fs";
+import { mkdir, stat } from "fs/promises";
+import { dirname } from "path";
 import { Readable } from "stream";
-import { FileRepo, MediaRepo } from "$lib/server/db";
+import { pipeline } from "stream/promises";
+import { v4 as uuidv4 } from "uuid";
+import { FileRepo, MediaRepo, IntegrityError } from "$lib/server/db";
+import env from "$lib/server/loadenv";
+import { safeUnlink } from "$lib/server/modules/filesystem";
 
-const createEncContentStream = async (
+export const getFileStream = async (userId: number, fileId: number) => {
-  path: string,
-  iv?: Buffer,
-  range?: { start?: number; end?: number },
-) => {
-  const { size: fileSize } = await stat(path);
-  const ivSize = iv?.byteLength ?? 0;
-  const totalSize = fileSize + ivSize;
-
-  const start = range?.start ?? 0;
-  const end = range?.end ?? totalSize - 1;
-  if (start > end || start < 0 || end >= totalSize) {
-    error(416, "Invalid range");
-  }
-
-  return {
-    encContentStream: Readable.toWeb(
-      Readable.from(
-        (async function* () {
-          if (start < ivSize) {
-            yield iv!.subarray(start, Math.min(end + 1, ivSize));
-          }
-          if (end >= ivSize) {
-            yield* createReadStream(path, {
-              start: Math.max(0, start - ivSize),
-              end: end - ivSize,
-            });
-          }
-        })(),
-      ),
-    ),
-    range: { start, end, total: totalSize },
-  };
-};
-
-export const getFileStream = async (
-  userId: number,
-  fileId: number,
-  range?: { start?: number; end?: number },
-) => {
   const file = await FileRepo.getFile(userId, fileId);
   if (!file) {
     error(404, "Invalid file id");
   }
 
-  return createEncContentStream(
+  const { size } = await stat(file.path);
-    file.path,
+  return {
-    file.encContentIv ? Buffer.from(file.encContentIv, "base64") : undefined,
+    encContentStream: Readable.toWeb(createReadStream(file.path)),
-    range,
+    encContentSize: size,
-  );
+  };
 };
 
-export const getFileThumbnailStream = async (
+export const getFileThumbnailStream = async (userId: number, fileId: number) => {
-  userId: number,
-  fileId: number,
-  range?: { start?: number; end?: number },
-) => {
   const thumbnail = await MediaRepo.getFileThumbnail(userId, fileId);
   if (!thumbnail) {
     error(404, "File or its thumbnail not found");
   }
 
-  return createEncContentStream(
+  const { size } = await stat(thumbnail.path);
-    thumbnail.path,
+  return {
-    thumbnail.encContentIv ? Buffer.from(thumbnail.encContentIv, "base64") : undefined,
+    encContentStream: Readable.toWeb(createReadStream(thumbnail.path)),
-    range,
+    encContentSize: size,
-  );
+  };
+};
+
+export const uploadFileThumbnail = async (
+  userId: number,
+  fileId: number,
+  dekVersion: Date,
+  encContentIv: string,
+  encContentStream: Readable,
+) => {
+  const path = `${env.thumbnailsPath}/${userId}/${uuidv4()}`;
+  await mkdir(dirname(path), { recursive: true });
+
+  try {
+    await pipeline(encContentStream, createWriteStream(path, { flags: "wx", mode: 0o600 }));
+
+    const oldPath = await MediaRepo.updateFileThumbnail(
+      userId,
+      fileId,
+      dekVersion,
+      path,
+      encContentIv,
+    );
+    safeUnlink(oldPath); // Intended
+  } catch (e) {
+    await safeUnlink(path);
+
+    if (e instanceof IntegrityError) {
+      if (e.message === "File not found") {
+        error(404, "File not found");
+      } else if (e.message === "Invalid DEK version") {
+        error(400, "Mismatched DEK version");
+      }
+    }
+    throw e;
+  }
+};
+
+export const uploadFile = async (
+  params: Omit<FileRepo.NewFile, "path" | "encContentHash">,
+  encContentStream: Readable,
+  encContentHash: Promise<string>,
+) => {
+  const oneDayAgo = new Date(Date.now() - 24 * 60 * 60 * 1000);
+  const oneMinuteLater = new Date(Date.now() + 60 * 1000);
+  if (params.dekVersion <= oneDayAgo || params.dekVersion >= oneMinuteLater) {
+    error(400, "Invalid DEK version");
+  }
+
+  const path = `${env.libraryPath}/${params.userId}/${uuidv4()}`;
+  await mkdir(dirname(path), { recursive: true });
+
+  try {
+    const hashStream = createHash("sha256");
+    const [, hash] = await Promise.all([
+      pipeline(
+        encContentStream,
+        async function* (source) {
+          for await (const chunk of source) {
+            hashStream.update(chunk);
+            yield chunk;
+          }
+        },
+        createWriteStream(path, { flags: "wx", mode: 0o600 }),
+      ),
+      encContentHash,
+    ]);
+    if (hashStream.digest("base64") !== hash) {
+      throw new Error("Invalid checksum");
+    }
+
+    const { id: fileId } = await FileRepo.registerFile({
+      ...params,
+      path,
+      encContentHash: hash,
+    });
+    return { fileId };
+  } catch (e) {
+    await safeUnlink(path);
+
+    if (e instanceof IntegrityError && e.message === "Inactive MEK version") {
+      error(400, "Invalid MEK version");
+    } else if (
+      e instanceof Error &&
+      (e.message === "Invalid request body" || e.message === "Invalid checksum")
+    ) {
+      error(400, "Invalid request body");
+    }
+    throw e;
+  }
 };

src/lib/server/services/upload.ts

@@ -1,88 +0,0 @@
-import { error } from "@sveltejs/kit";
-import { createHash } from "crypto";
-import { createWriteStream } from "fs";
-import { Readable } from "stream";
-import { ENCRYPTION_OVERHEAD, ENCRYPTED_CHUNK_SIZE } from "$lib/constants";
-import { UploadRepo } from "$lib/server/db";
-import { safeRecursiveRm, safeUnlink } from "$lib/server/modules/filesystem";
-
-const chunkLocks = new Set<string>();
-
-const isChunkUploaded = (bitmap: Buffer, chunkIndex: number) => {
-  chunkIndex -= 1;
-  const byte = bitmap[Math.floor(chunkIndex / 8)];
-  return !!byte && (byte & (1 << (chunkIndex % 8))) !== 0; // Postgres sucks
-};
-
-export const uploadChunk = async (
-  userId: number,
-  sessionId: string,
-  chunkIndex: number,
-  encChunkStream: Readable,
-  encChunkHash: string,
-) => {
-  const lockKey = `${sessionId}/${chunkIndex}`;
-  if (chunkLocks.has(lockKey)) {
-    error(409, "Chunk upload already in progress");
-  } else {
-    chunkLocks.add(lockKey);
-  }
-
-  let filePath;
-
-  try {
-    const session = await UploadRepo.getUploadSession(sessionId, userId);
-    if (!session) {
-      error(404, "Invalid upload id");
-    } else if (chunkIndex > session.totalChunks) {
-      error(400, "Invalid chunk index");
-    } else if (isChunkUploaded(session.bitmap, chunkIndex)) {
-      error(409, "Chunk already uploaded");
-    }
-
-    const isLastChunk = chunkIndex === session.totalChunks;
-    filePath = `${session.path}/${chunkIndex}`;
-
-    const hashStream = createHash("sha256");
-    const writeStream = createWriteStream(filePath, { flags: "wx", mode: 0o600 });
-    let writtenBytes = 0;
-
-    for await (const chunk of encChunkStream) {
-      hashStream.update(chunk);
-      writeStream.write(chunk);
-      writtenBytes += chunk.length;
-    }
-
-    await new Promise<void>((resolve, reject) => {
-      writeStream.end((e: any) => (e ? reject(e) : resolve()));
-    });
-
-    if (hashStream.digest("base64") !== encChunkHash) {
-      throw new Error("Invalid checksum");
-    } else if (
-      (!isLastChunk && writtenBytes !== ENCRYPTED_CHUNK_SIZE) ||
-      (isLastChunk && (writtenBytes <= ENCRYPTION_OVERHEAD || writtenBytes > ENCRYPTED_CHUNK_SIZE))
-    ) {
-      throw new Error("Invalid chunk size");
-    }
-
-    await UploadRepo.markChunkAsUploaded(sessionId, chunkIndex);
-  } catch (e) {
-    await safeUnlink(filePath);
-
-    if (
-      e instanceof Error &&
-      (e.message === "Invalid checksum" || e.message === "Invalid chunk size")
-    ) {
-      error(400, "Invalid request body");
-    }
-    throw e;
-  } finally {
-    chunkLocks.delete(lockKey);
-  }
-};
-
-export const cleanupExpiredUploadSessions = async () => {
-  const paths = await UploadRepo.cleanupExpiredUploadSessions();
-  await Promise.all(paths.map(safeRecursiveRm));
-};

src/lib/serviceWorker/client.ts

@@ -1,39 +0,0 @@
-import { DECRYPTED_FILE_URL_PREFIX } from "$lib/constants";
-import type { FileMetadata, ServiceWorkerMessage, ServiceWorkerResponse } from "./types";
-
-const PREPARE_TIMEOUT_MS = 5000;
-
-const getServiceWorker = async () => {
-  const registration = await navigator.serviceWorker.ready;
-  const sw = registration.active;
-  if (!sw) {
-    throw new Error("Service worker not activated");
-  }
-  return sw;
-};
-
-export const prepareFileDecryption = async (id: number, metadata: FileMetadata) => {
-  const sw = await getServiceWorker();
-  return new Promise<void>((resolve, reject) => {
-    const timeout = setTimeout(
-      () => reject(new Error("Service worker timeout")),
-      PREPARE_TIMEOUT_MS,
-    );
-    const handler = (event: MessageEvent<ServiceWorkerResponse>) => {
-      if (event.data.type === "decryption-ready" && event.data.fileId === id) {
-        clearTimeout(timeout);
-        navigator.serviceWorker.removeEventListener("message", handler);
-        resolve();
-      }
-    };
-    navigator.serviceWorker.addEventListener("message", handler);
-
-    sw.postMessage({
-      type: "decryption-prepare",
-      fileId: id,
-      ...metadata,
-    } satisfies ServiceWorkerMessage);
-  });
-};
-
-export const getDecryptedFileUrl = (id: number) => `${DECRYPTED_FILE_URL_PREFIX}${id}`;

src/lib/serviceWorker/index.ts

@@ -1,2 +0,0 @@
-export * from "./client";
-export * from "./types";

src/lib/serviceWorker/types.ts

@@ -1,19 +0,0 @@
-export interface FileMetadata {
-  isLegacy: boolean;
-  dataKey: CryptoKey;
-  encContentSize: number;
-  contentType: string;
-}
-
-export interface DecryptionPrepareMessage extends FileMetadata {
-  type: "decryption-prepare";
-  fileId: number;
-}
-
-export interface DecryptionReadyMessage {
-  type: "decryption-ready";
-  fileId: number;
-}
-
-export type ServiceWorkerMessage = DecryptionPrepareMessage;
-export type ServiceWorkerResponse = DecryptionReadyMessage;

src/lib/services/file.ts

@@ -1,47 +1,70 @@
 import { getAllFileInfos } from "$lib/indexedDB/filesystem";
+import { decryptData } from "$lib/modules/crypto";
 import {
   getFileCache,
   storeFileCache,
   deleteFileCache,
-  downloadFile,
+  getFileThumbnailCache,
+  storeFileThumbnailCache,
   deleteFileThumbnailCache,
+  downloadFile,
 } from "$lib/modules/file";
-import { uploadBlob } from "$lib/modules/upload";
+import { getThumbnailUrl } from "$lib/modules/thumbnail";
+import type { FileThumbnailUploadRequest } from "$lib/server/schemas";
 import { trpc } from "$trpc/client";
 
 export const requestFileDownload = async (
   fileId: number,
+  fileEncryptedIv: string,
   dataKey: CryptoKey,
-  isLegacy: boolean,
 ) => {
   const cache = await getFileCache(fileId);
   if (cache) return cache;
 
-  const fileBuffer = await downloadFile(fileId, dataKey, isLegacy);
+  const fileBuffer = await downloadFile(fileId, fileEncryptedIv, dataKey);
   storeFileCache(fileId, fileBuffer); // Intended
   return fileBuffer;
 };
 
 export const requestFileThumbnailUpload = async (
   fileId: number,
-  thumbnail: Blob,
-  dataKey: CryptoKey,
   dataKeyVersion: Date,
+  thumbnailEncrypted: { ciphertext: ArrayBuffer; iv: string },
 ) => {
+  const form = new FormData();
+  form.set(
+    "metadata",
+    JSON.stringify({
+      dekVersion: dataKeyVersion.toISOString(),
+      contentIv: thumbnailEncrypted.iv,
+    } satisfies FileThumbnailUploadRequest),
+  );
+  form.set("content", new Blob([thumbnailEncrypted.ciphertext]));
+
+  return await fetch(`/api/file/${fileId}/thumbnail/upload`, { method: "POST", body: form });
+};
+
+export const requestFileThumbnailDownload = async (fileId: number, dataKey?: CryptoKey) => {
+  const cache = await getFileThumbnailCache(fileId);
+  if (cache || !dataKey) return cache;
+
+  let thumbnailInfo;
   try {
-    const { uploadId } = await trpc().upload.startFileThumbnailUpload.mutate({
+    thumbnailInfo = await trpc().file.thumbnail.query({ id: fileId });
-      file: fileId,
-      dekVersion: dataKeyVersion,
-    });
-
-    await uploadBlob(uploadId, thumbnail, dataKey);
-
-    await trpc().upload.completeFileThumbnailUpload.mutate({ uploadId });
-    return true;
   } catch {
     // TODO: Error Handling
-    return false;
+    return null;
   }
+  const { contentIv: thumbnailEncryptedIv } = thumbnailInfo;
+
+  const res = await fetch(`/api/file/${fileId}/thumbnail/download`);
+  if (!res.ok) return null;
+
+  const thumbnailEncrypted = await res.arrayBuffer();
+  const thumbnailBuffer = await decryptData(thumbnailEncrypted, thumbnailEncryptedIv, dataKey);
+
+  storeFileThumbnailCache(fileId, thumbnailBuffer); // Intended
+  return getThumbnailUrl(thumbnailBuffer);
 };
 
 export const requestDeletedFilesCleanup = async () => {

src/lib/utils/concurrency/BoundedQueue.ts

@@ -1,44 +0,0 @@
-export class BoundedQueue<T> {
-  private isClosed = false;
-  private reservedCount = 0;
-  private items: T[] = [];
-
-  private waitersNotFull: (() => void)[] = [];
-  private waitersNotEmpty: (() => void)[] = [];
-
-  constructor(private readonly maxSize: number) {}
-
-  async push(item: T) {
-    if (this.isClosed) {
-      throw new Error("Queue closed");
-    }
-
-    while (this.reservedCount >= this.maxSize) {
-      await new Promise<void>((resolve) => this.waitersNotFull.push(resolve));
-      if (this.isClosed) throw new Error("Queue closed");
-    }
-
-    this.reservedCount++;
-    this.items.push(item);
-    this.waitersNotEmpty.shift()?.();
-  }
-
-  async pop() {
-    while (this.items.length === 0) {
-      if (this.isClosed) return null;
-      await new Promise<void>((resolve) => this.waitersNotEmpty.push(resolve));
-    }
-
-    const item = this.items.shift()!;
-    this.reservedCount--;
-    this.waitersNotFull.shift()?.();
-
-    return item;
-  }
-
-  close() {
-    this.isClosed = true;
-    while (this.waitersNotEmpty.length > 0) this.waitersNotEmpty.shift()!();
-    while (this.waitersNotFull.length > 0) this.waitersNotFull.shift()!();
-  }
-}

src/lib/utils/concurrency/HybridPromise.ts

@@ -1,93 +0,0 @@
-type MaybePromise<T> = T | Promise<T> | HybridPromise<T>;
-
-type HybridPromiseState<T> =
-  | { mode: "sync"; status: "fulfilled"; value: T }
-  | { mode: "sync"; status: "rejected"; reason: unknown }
-  | { mode: "async"; promise: Promise<T> };
-
-export class HybridPromise<T> implements PromiseLike<T> {
-  private isConsumed = false;
-
-  private constructor(private readonly state: HybridPromiseState<T>) {
-    if (state.mode === "sync" && state.status === "rejected") {
-      queueMicrotask(() => {
-        if (!this.isConsumed) {
-          throw state.reason;
-        }
-      });
-    }
-  }
-
-  isSync(): boolean {
-    return this.state.mode === "sync";
-  }
-
-  toPromise(): Promise<T> {
-    this.isConsumed = true;
-
-    if (this.state.mode === "async") return this.state.promise;
-    return this.state.status === "fulfilled"
-      ? Promise.resolve(this.state.value)
-      : Promise.reject(this.state.reason);
-  }
-
-  static resolve<T>(value: MaybePromise<T>): HybridPromise<T> {
-    if (value instanceof HybridPromise) return value;
-    return new HybridPromise(
-      value instanceof Promise
-        ? { mode: "async", promise: value }
-        : { mode: "sync", status: "fulfilled", value },
-    );
-  }
-
-  static reject<T = never>(reason?: unknown): HybridPromise<T> {
-    return new HybridPromise({ mode: "sync", status: "rejected", reason });
-  }
-
-  then<TResult1 = T, TResult2 = never>(
-    onfulfilled?: ((value: T) => MaybePromise<TResult1>) | null | undefined,
-    onrejected?: ((reason: unknown) => MaybePromise<TResult2>) | null | undefined,
-  ): HybridPromise<TResult1 | TResult2> {
-    this.isConsumed = true;
-
-    if (this.state.mode === "async") {
-      return new HybridPromise({
-        mode: "async",
-        promise: this.state.promise.then(onfulfilled, onrejected) as any,
-      });
-    }
-
-    try {
-      if (this.state.status === "fulfilled") {
-        if (!onfulfilled) return HybridPromise.resolve(this.state.value as any);
-        return HybridPromise.resolve(onfulfilled(this.state.value));
-      } else {
-        if (!onrejected) return HybridPromise.reject(this.state.reason);
-        return HybridPromise.resolve(onrejected(this.state.reason));
-      }
-    } catch (e) {
-      return HybridPromise.reject(e);
-    }
-  }
-
-  catch<TResult = never>(
-    onrejected?: ((reason: unknown) => MaybePromise<TResult>) | null | undefined,
-  ): HybridPromise<T | TResult> {
-    return this.then<T, TResult>(null, onrejected);
-  }
-
-  finally(onfinally?: (() => void) | null | undefined): HybridPromise<T> {
-    this.isConsumed = true;
-
-    if (this.state.mode === "async") {
-      return new HybridPromise({ mode: "async", promise: this.state.promise.finally(onfinally) });
-    }
-
-    try {
-      onfinally?.();
-      return new HybridPromise(this.state);
-    } catch (e) {
-      return HybridPromise.reject(e);
-    }
-  }
-}

src/lib/utils/concurrency/Scheduler.ts

@@ -1,48 +0,0 @@
-export class Scheduler<T = void> {
-  private isEstimating = false;
-  private memoryUsage = 0;
-  private queue: (() => void)[] = [];
-
-  constructor(public readonly memoryLimit = 100 * 1024 * 1024 /* 100 MiB */) {}
-
-  private next() {
-    if (!this.isEstimating && this.memoryUsage < this.memoryLimit) {
-      const resolve = this.queue.shift();
-      if (resolve) {
-        this.isEstimating = true;
-        resolve();
-      }
-    }
-  }
-
-  async schedule(
-    estimateMemoryUsage: number | (() => number | Promise<number>),
-    task: () => Promise<T>,
-  ) {
-    if (this.isEstimating || this.memoryUsage >= this.memoryLimit) {
-      await new Promise<void>((resolve) => {
-        this.queue.push(resolve);
-      });
-    } else {
-      this.isEstimating = true;
-    }
-
-    let taskMemoryUsage = 0;
-
-    try {
-      taskMemoryUsage =
-        typeof estimateMemoryUsage === "number" ? estimateMemoryUsage : await estimateMemoryUsage();
-      this.memoryUsage += taskMemoryUsage;
-    } finally {
-      this.isEstimating = false;
-      this.next();
-    }
-
-    try {
-      return await task();
-    } finally {
-      this.memoryUsage -= taskMemoryUsage;
-      this.next();
-    }
-  }
-}

src/lib/utils/concurrency/index.ts

@@ -1,3 +0,0 @@
-export * from "./BoundedQueue";
-export * from "./HybridPromise";
-export * from "./Scheduler";

src/lib/utils/index.ts

@@ -1,4 +1,4 @@
-export * from "./concurrency";
 export * from "./format";
 export * from "./gotoStateful";
+export * from "./promise";
 export * from "./sort";

src/lib/utils/promise.ts

@@ -0,0 +1,16 @@
+export const monotonicResolve = <T>(
+  promises: (Promise<T> | false)[],
+  callback: (value: T) => void,
+) => {
+  let latestResolvedIndex = -1;
+  promises
+    .filter((promise) => !!promise)
+    .forEach((promise, index) => {
+      promise.then((value) => {
+        if (index > latestResolvedIndex) {
+          latestResolvedIndex = index;
+          callback(value);
+        }
+      });
+    });
+};

src/lib/utils/sort.ts

@@ -48,11 +48,10 @@ export const sortEntries = <T extends SortEntry>(entries: T[], sortBy = SortBy.N
     case SortBy.DATE_DESC:
       sortFunc = sortByDateDesc;
       break;
-    default: {
+    default:
       const exhaustive: never = sortBy;
       sortFunc = exhaustive;
   }
-  }
 
   entries.sort(sortFunc);
   return entries;

src/params/thumbnail.ts

@@ -1,5 +0,0 @@
-import type { ParamMatcher } from "@sveltejs/kit";
-
-export const match: ParamMatcher = (param) => {
-  return param === "thumbnail";
-};

src/routes/(fullscreen)/file/[id]/+page.svelte

@@ -5,11 +5,10 @@
   import { page } from "$app/state";
   import { FullscreenDiv } from "$lib/components/atoms";
   import { Categories, IconEntryButton, TopBar } from "$lib/components/molecules";
-  import { getFileInfo, type MaybeFileInfo } from "$lib/modules/filesystem";
+  import { getFileInfo, type FileInfo, type MaybeFileInfo } from "$lib/modules/filesystem";
   import { captureVideoThumbnail } from "$lib/modules/thumbnail";
   import { getFileDownloadState } from "$lib/modules/file";
   import { masterKeyStore } from "$lib/stores";
-  import { HybridPromise } from "$lib/utils";
   import AddToCategoryBottomSheet from "./AddToCategoryBottomSheet.svelte";
   import DownloadStatus from "./DownloadStatus.svelte";
   import {
@@ -17,7 +16,6 @@
     requestFileDownload,
     requestThumbnailUpload,
     requestFileAdditionToCategory,
-    requestVideoStream,
   } from "./service";
   import TopBarMenu from "./TopBarMenu.svelte";
 
@@ -28,7 +26,8 @@
 
   let { data } = $props();
 
-  let info: MaybeFileInfo | undefined = $state();
+  let infoPromise: Promise<MaybeFileInfo> | undefined = $state();
+  let info: FileInfo | null = $state(null);
   let downloadState = $derived(getFileDownloadState(data.id));
 
   let isMenuOpen = $state(false);
@@ -38,7 +37,6 @@
   let viewerType: "image" | "video" | undefined = $state();
   let fileBlob: Blob | undefined = $state();
   let fileBlobUrl: string | undefined = $state();
-  let videoStreamUrl: string | undefined = $state();
   let videoElement: HTMLVideoElement | undefined = $state();
 
   const updateViewer = async (buffer: ArrayBuffer, contentType: string) => {
@@ -67,20 +65,22 @@
   const addToCategory = async (categoryId: number) => {
     await requestFileAdditionToCategory(data.id, categoryId);
     isAddToCategoryBottomSheetOpen = false;
-    void getFileInfo(data.id, $masterKeyStore?.get(1)?.key!); // TODO: FIXME
+    infoPromise = getFileInfo(data.id, $masterKeyStore?.get(1)?.key!); // TODO: FIXME
   };
 
   const removeFromCategory = async (categoryId: number) => {
     await requestFileRemovalFromCategory(data.id, categoryId);
-    void getFileInfo(data.id, $masterKeyStore?.get(1)?.key!); // TODO: FIXME
+    infoPromise = getFileInfo(data.id, $masterKeyStore?.get(1)?.key!); // TODO: FIXME
   };
 
   $effect(() => {
-    HybridPromise.resolve(getFileInfo(data.id, $masterKeyStore?.get(1)?.key!)).then((result) => {
+    infoPromise = getFileInfo(data.id, $masterKeyStore?.get(1)?.key!).then((fileInfo) => {
-      if (data.id === result.id) {
+      if (fileInfo.exists) {
-        info = result;
+        info = fileInfo;
       }
+      return fileInfo;
     });
+    info = null;
     isDownloadRequested = false;
     viewerType = undefined;
   });
@@ -97,19 +97,7 @@
       untrack(() => {
         if (!downloadState && !isDownloadRequested) {
           isDownloadRequested = true;
-
+          requestFileDownload(data.id, info!.contentIv!, info!.dataKey!.key).then(
-          if (viewerType === "video" && !info!.isLegacy) {
-            requestVideoStream(data.id, info!.dataKey!.key, contentType).then((streamUrl) => {
-              if (streamUrl) {
-                videoStreamUrl = streamUrl;
-              } else {
-                requestFileDownload(data.id, info!.dataKey!.key, info!.isLegacy!).then((buffer) =>
-                  updateViewer(buffer, contentType),
-                );
-              }
-            });
-          } else {
-            requestFileDownload(data.id, info!.dataKey!.key, info!.isLegacy!).then(
             async (buffer) => {
               const blob = await updateViewer(buffer, contentType);
               if (!viewerType) {
@@ -118,16 +106,13 @@
             },
           );
         }
-        }
       });
     }
   });
 
   $effect(() => {
-    if (info?.exists && downloadState?.status === "decrypted") {
+    if (info && downloadState?.status === "decrypted") {
-      untrack(
+      untrack(() => !isDownloadRequested && updateViewer(downloadState.result!, info!.contentType));
-        () => !isDownloadRequested && updateViewer(downloadState.result!, info!.contentType!),
-      );
     }
   });
 
@@ -138,7 +123,8 @@
   <title>파일</title>
 </svelte:head>
 
-<TopBar title={info?.name}>
+{#if info}
+  <TopBar title={info.name}>
     <!-- svelte-ignore a11y_no_static_element_interactions -->
     <!-- svelte-ignore a11y_click_events_have_key_events -->
     <div onclick={(e) => e.stopPropagation()}>
@@ -151,11 +137,10 @@
       <TopBarMenu
         bind:isOpen={isMenuOpen}
         directoryId={["category", "gallery"].includes(page.url.searchParams.get("from") ?? "")
-        ? info?.parentId
+          ? info.parentId
           : undefined}
         {fileBlob}
-      downloadUrl={videoStreamUrl}
+        filename={info.name}
-      filename={info?.name}
       />
     </div>
   </TopBar>
@@ -164,7 +149,7 @@
       {#if downloadState}
         <DownloadStatus state={downloadState} />
       {/if}
-    {#if info && viewerType}
+      {#if viewerType}
         <div class="flex w-full justify-center">
           {#snippet viewerLoading(message: string)}
             <p class="text-gray-500">{message}</p>
@@ -177,10 +162,10 @@
               {@render viewerLoading("이미지를 불러오고 있어요.")}
             {/if}
           {:else if viewerType === "video"}
-          {#if videoStreamUrl || fileBlobUrl}
+            {#if fileBlobUrl}
               <div class="flex flex-col space-y-2">
-              <video bind:this={videoElement} src={videoStreamUrl ?? fileBlobUrl} controls muted
+                <!-- svelte-ignore a11y_media_has_caption -->
-              ></video>
+                <video bind:this={videoElement} src={fileBlobUrl} controls muted></video>
                 <IconEntryButton
                   icon={IconCamera}
                   onclick={() => updateThumbnail(info?.dataKey?.key!, info?.dataKey?.version!)}
@@ -199,7 +184,7 @@
         <p class="text-lg font-bold">카테고리</p>
         <div class="space-y-1">
           <Categories
-          categories={info?.categories ?? []}
+            categories={info.categories}
             categoryMenuIcon={IconClose}
             onCategoryClick={({ id }) => goto(`/category/${id}`)}
             onCategoryMenuClick={({ id }) => removeFromCategory(id)}
@@ -222,3 +207,4 @@
     bind:isOpen={isAddToCategoryBottomSheetOpen}
     onAddToCategoryClick={addToCategory}
   />
+{/if}

src/routes/(fullscreen)/file/[id]/AddToCategoryBottomSheet.svelte

@@ -4,7 +4,6 @@
   import { CategoryCreateModal } from "$lib/components/organisms";
   import { getCategoryInfo, type MaybeCategoryInfo } from "$lib/modules/filesystem";
   import { masterKeyStore } from "$lib/stores";
-  import { HybridPromise } from "$lib/utils";
   import { requestCategoryCreation } from "./service";
 
   interface Props {
@@ -14,19 +13,18 @@
 
   let { onAddToCategoryClick, isOpen = $bindable() }: Props = $props();
 
-  let categoryInfo: MaybeCategoryInfo | undefined = $state();
+  let categoryInfoPromise: Promise<MaybeCategoryInfo> | undefined = $state();
 
   let isCategoryCreateModalOpen = $state(false);
 
   $effect(() => {
     if (isOpen) {
-      HybridPromise.resolve(getCategoryInfo("root", $masterKeyStore?.get(1)?.key!)).then(
+      categoryInfoPromise = getCategoryInfo("root", $masterKeyStore?.get(1)?.key!);
-        (result) => (categoryInfo = result),
-      );
     }
   });
 </script>
 
+{#await categoryInfoPromise then categoryInfo}
   {#if categoryInfo?.exists}
     <BottomSheet bind:isOpen class="flex flex-col">
       <FullscreenDiv>
@@ -34,30 +32,29 @@
           class="py-4"
           info={categoryInfo}
           onSubCategoryClick={({ id }) =>
-          HybridPromise.resolve(getCategoryInfo(id, $masterKeyStore?.get(1)?.key!)).then(
+            (categoryInfoPromise = getCategoryInfo(id, $masterKeyStore?.get(1)?.key!))}
-            (result) => (categoryInfo = result),
-          )}
           onSubCategoryCreateClick={() => (isCategoryCreateModalOpen = true)}
           subCategoryCreatePosition="top"
         />
         {#if categoryInfo.id !== "root"}
           <BottomDiv>
-          <Button onclick={() => onAddToCategoryClick(categoryInfo!.id as number)} class="w-full">
+            <Button onclick={() => onAddToCategoryClick(categoryInfo.id)} class="w-full">
-            {categoryInfo!.name} 카테고리에 추가하기
+              이 카테고리에 추가하기
             </Button>
           </BottomDiv>
         {/if}
       </FullscreenDiv>
     </BottomSheet>
-{/if}
 
     <CategoryCreateModal
       bind:isOpen={isCategoryCreateModalOpen}
       onCreateClick={async (name: string) => {
-    if (await requestCategoryCreation(name, categoryInfo!.id, $masterKeyStore?.get(1)!)) {
+        if (await requestCategoryCreation(name, categoryInfo.id, $masterKeyStore?.get(1)!)) {
-      void getCategoryInfo(categoryInfo!.id, $masterKeyStore?.get(1)?.key!); // TODO: FIXME
+          categoryInfoPromise = getCategoryInfo(categoryInfo.id, $masterKeyStore?.get(1)?.key!); // TODO: FIXME
           return true;
         }
         return false;
       }}
     />
+  {/if}
+{/await}

src/routes/(fullscreen)/file/[id]/TopBarMenu.svelte

@@ -10,29 +10,17 @@
 
   interface Props {
     directoryId?: "root" | number;
-    downloadUrl?: string;
     fileBlob?: Blob;
     filename?: string;
     isOpen: boolean;
   }
 
-  let { directoryId, downloadUrl, fileBlob, filename, isOpen = $bindable() }: Props = $props();
+  let { directoryId, fileBlob, filename, isOpen = $bindable() }: Props = $props();
-
-  const handleDownload = () => {
-    if (fileBlob && filename) {
-      FileSaver.saveAs(fileBlob, filename);
-    } else if (downloadUrl && filename) {
-      // Use streaming download via Content-Disposition header
-      const url = new URL(downloadUrl, window.location.origin);
-      url.searchParams.set("download", filename);
-      window.open(url.toString(), "_blank");
-    }
-  };
 </script>
 
 <svelte:window onclick={() => (isOpen = false)} />
 
-{#if isOpen && (directoryId || downloadUrl || fileBlob)}
+{#if isOpen && (directoryId || fileBlob)}
   <div
     class="absolute right-2 top-full z-20 space-y-1 rounded-lg bg-white px-1 py-2 shadow-2xl"
     transition:fly={{ y: -8, duration: 200 }}
@@ -61,8 +49,10 @@
           ),
         )}
       {/if}
-      {#if fileBlob || downloadUrl}
+      {#if fileBlob}
-        {@render menuButton(IconCloudDownload, "다운로드", handleDownload)}
+        {@render menuButton(IconCloudDownload, "다운로드", () => {
+          FileSaver.saveAs(fileBlob, filename);
+        })}
       {/if}
     </div>
   </div>

src/routes/(fullscreen)/file/[id]/service.ts

@@ -1,41 +1,23 @@
+import { encryptData } from "$lib/modules/crypto";
 import { storeFileThumbnailCache } from "$lib/modules/file";
-import { prepareFileDecryption, getDecryptedFileUrl } from "$lib/serviceWorker";
 import { requestFileThumbnailUpload } from "$lib/services/file";
 import { trpc } from "$trpc/client";
 
 export { requestCategoryCreation, requestFileRemovalFromCategory } from "$lib/services/category";
 export { requestFileDownload } from "$lib/services/file";
 
-export const requestVideoStream = async (
-  fileId: number,
-  dataKey: CryptoKey,
-  contentType: string,
-) => {
-  const res = await fetch(`/api/file/${fileId}/download`, { method: "HEAD" });
-  if (!res.ok) return null;
-
-  const encContentSize = parseInt(res.headers.get("Content-Length") ?? "0", 10);
-  if (encContentSize <= 0) return null;
-
-  try {
-    await prepareFileDecryption(fileId, { isLegacy: false, dataKey, encContentSize, contentType });
-    return getDecryptedFileUrl(fileId);
-  } catch {
-    // TODO: Error Handling
-    return null;
-  }
-};
-
 export const requestThumbnailUpload = async (
   fileId: number,
   thumbnail: Blob,
   dataKey: CryptoKey,
   dataKeyVersion: Date,
 ) => {
-  const res = await requestFileThumbnailUpload(fileId, thumbnail, dataKey, dataKeyVersion);
+  const thumbnailBuffer = await thumbnail.arrayBuffer();
-  if (!res) return false;
+  const thumbnailEncrypted = await encryptData(thumbnailBuffer, dataKey);
+  const res = await requestFileThumbnailUpload(fileId, dataKeyVersion, thumbnailEncrypted);
+  if (!res.ok) return false;
 
-  void thumbnail.arrayBuffer().then((buffer) => storeFileThumbnailCache(fileId, buffer));
+  storeFileThumbnailCache(fileId, thumbnailBuffer); // Intended
   return true;
 };
 

src/routes/(fullscreen)/file/uploads/File.svelte

@@ -18,7 +18,7 @@
 
 <div class="flex h-14 items-center gap-x-4 p-2">
   <div class="flex-shrink-0 text-lg text-gray-600">
-    {#if state.status === "queued" || state.status === "encryption-pending"}
+    {#if state.status === "encryption-pending"}
       <IconPending />
     {:else if state.status === "encrypting"}
       <IconLockClock />
@@ -37,9 +37,7 @@
       {state.name}
     </p>
     <p class="text-xs text-gray-800">
-      {#if state.status === "queued"}
+      {#if state.status === "encryption-pending"}
-        대기 중
-      {:else if state.status === "encryption-pending"}
         준비 중
       {:else if state.status === "encrypting"}
         암호화하는 중

src/routes/(fullscreen)/gallery/+page.svelte

@@ -1,54 +1,15 @@
 <script lang="ts">
   import { onMount } from "svelte";
   import { goto } from "$app/navigation";
-  import { FileThumbnailButton, FullscreenDiv, RowVirtualizer } from "$lib/components/atoms";
+  import { FullscreenDiv } from "$lib/components/atoms";
   import { TopBar } from "$lib/components/molecules";
-  import {
+  import { Gallery } from "$lib/components/organisms";
-    bulkGetFileInfo,
+  import { bulkGetFileInfo, type MaybeFileInfo } from "$lib/modules/filesystem";
-    type MaybeFileInfo,
-    type SummarizedFileInfo,
-  } from "$lib/modules/filesystem";
   import { masterKeyStore } from "$lib/stores";
-  import { formatDate, formatDateSortable, SortBy, sortEntries } from "$lib/utils";
 
   let { data } = $props();
 
-  type Row =
-    | { type: "header"; label: string }
-    | { type: "items"; files: SummarizedFileInfo[]; isLast: boolean };
-
   let files: MaybeFileInfo[] = $state([]);
-  let rows: Row[] = $derived.by(() => {
-    const groups = Map.groupBy(
-      files
-        .filter((file) => file.exists)
-        .filter(
-          (file) => file.contentType.startsWith("image/") || file.contentType.startsWith("video/"),
-        )
-        .map((file) => ({ ...file, date: file.createdAt ?? file.lastModifiedAt })),
-      (file) => formatDateSortable(file.date),
-    );
-    return Array.from(groups.entries())
-      .sort(([dateA], [dateB]) => dateB.localeCompare(dateA))
-      .flatMap(([, entries]) => {
-        const sortedEntries = sortEntries([...entries], SortBy.DATE_DESC);
-        return [
-          {
-            type: "header",
-            label: formatDate(sortedEntries[0]!.date),
-          },
-          ...Array.from({ length: Math.ceil(sortedEntries.length / 4) }, (_, i) => {
-            const start = i * 4;
-            const end = start + 4;
-            return {
-              type: "items" as const,
-              files: sortedEntries.slice(start, end),
-              isLast: end >= sortedEntries.length,
-            };
-          }),
-        ];
-      });
-  });
 
   onMount(async () => {
     files = Array.from((await bulkGetFileInfo(data.files, $masterKeyStore?.get(1)?.key!)).values());
@@ -61,37 +22,8 @@
 
 <TopBar title="사진 및 동영상" />
 <FullscreenDiv>
-  <RowVirtualizer
+  <Gallery
-    count={rows.length}
+    files={files.filter((file) => file?.exists)}
-    itemHeight={(index) =>
+    onFileClick={({ id }) => goto(`/file/${id}?from=gallery`)}
-      rows[index]!.type === "header" ? 28 : 181 + (rows[index]!.isLast ? 16 : 4)}
-    class="flex flex-grow flex-col"
-  >
-    {#snippet item(index)}
-      {@const row = rows[index]!}
-      {#if row.type === "header"}
-        <p class="pb-2 text-sm font-medium">{row.label}</p>
-      {:else}
-        <div class={["grid grid-cols-4 gap-x-1", row.isLast ? "pb-4" : "pb-1"]}>
-          {#each row.files as file (file.id)}
-            <FileThumbnailButton
-              info={file}
-              onclick={() => goto(`/file/${file.id}?from=gallery`)}
   />
-          {/each}
-        </div>
-      {/if}
-    {/snippet}
-    {#snippet placeholder()}
-      <div class="flex h-full flex-grow items-center justify-center">
-        <p class="text-gray-500">
-          {#if files.length === 0}
-            업로드된 파일이 없어요.
-          {:else}
-            사진 또는 동영상이 없어요.
-          {/if}
-        </p>
-      </div>
-    {/snippet}
-  </RowVirtualizer>
 </FullscreenDiv>

src/routes/(fullscreen)/settings/migration/+page.server.ts

@@ -1,7 +0,0 @@
-import { createCaller } from "$trpc/router.server";
-import type { PageServerLoad } from "./$types";
-
-export const load: PageServerLoad = async (event) => {
-  const files = await createCaller(event).file.listLegacy();
-  return { files };
-};

src/routes/(fullscreen)/settings/migration/+page.svelte

@@ -1,79 +0,0 @@
-<script lang="ts">
-  import { onMount } from "svelte";
-  import { goto } from "$app/navigation";
-  import { BottomDiv, Button, FullscreenDiv } from "$lib/components/atoms";
-  import { TopBar } from "$lib/components/molecules";
-  import { bulkGetFileInfo, type MaybeFileInfo } from "$lib/modules/filesystem";
-  import { masterKeyStore } from "$lib/stores";
-  import { sortEntries } from "$lib/utils";
-  import File from "./File.svelte";
-  import { getMigrationState, clearMigrationStates, requestFileMigration } from "./service.svelte";
-
-  let { data } = $props();
-
-  let fileInfos: MaybeFileInfo[] = $state([]);
-  let files = $derived(
-    fileInfos
-      .map((info) => ({
-        info,
-        state: getMigrationState(info.id),
-      }))
-      .filter((file) => file.state?.status !== "uploaded"),
-  );
-
-  const migrateAllFiles = () => {
-    files.forEach(({ info }) => {
-      if (info.exists) {
-        requestFileMigration(info);
-      }
-    });
-  };
-
-  onMount(async () => {
-    fileInfos = sortEntries(
-      Array.from((await bulkGetFileInfo(data.files, $masterKeyStore?.get(1)?.key!)).values()),
-    );
-  });
-
-  $effect(() => clearMigrationStates);
-</script>
-
-<svelte:head>
-  <title>암호화 마이그레이션</title>
-</svelte:head>
-
-<TopBar title="암호화 마이그레이션" />
-<FullscreenDiv>
-  {#if files.length > 0}
-    <div class="space-y-4 pb-4">
-      <p class="break-keep text-gray-800">
-        이전 버전의 ArkVault에서 업로드된 {files.length}개 파일을 다시 암호화할 수 있어요.
-      </p>
-      <div class="space-y-2">
-        {#each files as { info, state } (info.id)}
-          {#if info.exists}
-            <File
-              {info}
-              {state}
-              onclick={({ id }) => goto(`/file/${id}`)}
-              onMigrateClick={requestFileMigration}
-            />
-          {/if}
-        {/each}
-      </div>
-    </div>
-    <BottomDiv>
-      <Button onclick={migrateAllFiles} class="w-full">모두 다시 암호화하기</Button>
-    </BottomDiv>
-  {:else}
-    <div class="flex flex-grow items-center justify-center">
-      <p class="text-gray-500">
-        {#if data.files.length === 0}
-          마이그레이션할 파일이 없어요.
-        {:else}
-          파일 목록을 불러오고 있어요.
-        {/if}
-      </p>
-    </div>
-  {/if}
-</FullscreenDiv>

src/routes/(fullscreen)/settings/migration/File.svelte

@@ -1,52 +0,0 @@
-<script module lang="ts">
-  const subtexts = {
-    queued: "대기 중",
-    downloading: "다운로드하는 중",
-    "upload-pending": "업로드를 기다리는 중",
-    uploaded: "",
-    error: "실패",
-  } as const;
-</script>
-
-<script lang="ts">
-  import { ActionEntryButton } from "$lib/components/atoms";
-  import { DirectoryEntryLabel } from "$lib/components/molecules";
-  import type { FileInfo } from "$lib/modules/filesystem";
-  import { formatDateTime, formatNetworkSpeed } from "$lib/utils";
-  import type { MigrationState } from "./service.svelte";
-
-  import IconSync from "~icons/material-symbols/sync";
-
-  type FileInfoWithExists = FileInfo & { exists: true };
-
-  interface Props {
-    info: FileInfoWithExists;
-    onclick: (file: FileInfo) => void;
-    onMigrateClick: (file: FileInfoWithExists) => void;
-    state: MigrationState | undefined;
-  }
-
-  let { info, onclick, onMigrateClick, state }: Props = $props();
-
-  let subtext = $derived.by(() => {
-    if (!state) {
-      return formatDateTime(info.createdAt ?? info.lastModifiedAt);
-    }
-    if (state.status === "uploading") {
-      const progress = Math.floor((state.progress ?? 0) * 100);
-      const speed = formatNetworkSpeed((state.rate ?? 0) * 8);
-      return `전송됨 ${progress}% · ${speed}`;
-    }
-    return subtexts[state.status] ?? state.status;
-  });
-</script>
-
-<ActionEntryButton
-  class="h-14"
-  onclick={() => onclick(info)}
-  actionButtonIcon={!state || state.status === "error" ? IconSync : undefined}
-  onActionButtonClick={() => onMigrateClick(info)}
-  actionButtonClass="text-gray-800"
->
-  <DirectoryEntryLabel type="file" name={info.name} {subtext} />
-</ActionEntryButton>

src/routes/(fullscreen)/settings/migration/service.svelte.ts

@@ -1,105 +0,0 @@
-import { limitFunction } from "p-limit";
-import { SvelteMap } from "svelte/reactivity";
-import { CHUNK_SIZE } from "$lib/constants";
-import type { FileInfo } from "$lib/modules/filesystem";
-import { uploadBlob } from "$lib/modules/upload";
-import { requestFileDownload } from "$lib/services/file";
-import { Scheduler } from "$lib/utils";
-import { trpc } from "$trpc/client";
-
-export type MigrationStatus =
-  | "queued"
-  | "downloading"
-  | "upload-pending"
-  | "uploading"
-  | "uploaded"
-  | "error";
-
-export interface MigrationState {
-  status: MigrationStatus;
-  progress?: number;
-  rate?: number;
-}
-
-const scheduler = new Scheduler();
-const states = new SvelteMap<number, MigrationState>();
-
-const createState = (status: MigrationStatus): MigrationState => {
-  const state = $state({ status });
-  return state;
-};
-
-export const getMigrationState = (fileId: number) => {
-  return states.get(fileId);
-};
-
-export const clearMigrationStates = () => {
-  for (const [id, state] of states) {
-    if (state.status === "uploaded" || state.status === "error") {
-      states.delete(id);
-    }
-  }
-};
-
-const requestFileUpload = limitFunction(
-  async (
-    state: MigrationState,
-    fileId: number,
-    fileBuffer: ArrayBuffer,
-    dataKey: CryptoKey,
-    dataKeyVersion: Date,
-  ) => {
-    state.status = "uploading";
-
-    const { uploadId } = await trpc().upload.startMigrationUpload.mutate({
-      file: fileId,
-      chunks: Math.ceil(fileBuffer.byteLength / CHUNK_SIZE),
-      dekVersion: dataKeyVersion,
-    });
-
-    await uploadBlob(uploadId, new Blob([fileBuffer]), dataKey, {
-      onProgress(s) {
-        state.progress = s.progress;
-        state.rate = s.rate;
-      },
-    });
-
-    await trpc().upload.completeMigrationUpload.mutate({ uploadId });
-    state.status = "uploaded";
-  },
-  { concurrency: 1 },
-);
-
-export const requestFileMigration = async (fileInfo: FileInfo) => {
-  let state = states.get(fileInfo.id);
-  if (state) {
-    if (state.status !== "error") return;
-    state.status = "queued";
-    state.progress = undefined;
-    state.rate = undefined;
-  } else {
-    state = createState("queued");
-    states.set(fileInfo.id, state);
-  }
-
-  try {
-    const dataKey = fileInfo.dataKey;
-    if (!dataKey) {
-      throw new Error("Data key not available");
-    }
-
-    let fileBuffer: ArrayBuffer | undefined;
-
-    await scheduler.schedule(
-      async () => {
-        state.status = "downloading";
-        fileBuffer = await requestFileDownload(fileInfo.id, dataKey.key, true);
-        return fileBuffer.byteLength;
-      },
-      () => requestFileUpload(state, fileInfo.id, fileBuffer!, dataKey.key, dataKey.version),
-    );
-  } catch (e) {
-    state.status = "error";
-    throw e;
-  }
-};

src/routes/(fullscreen)/settings/thumbnail/+page.svelte

@@ -4,36 +4,17 @@
   import { BottomDiv, Button, FullscreenDiv } from "$lib/components/atoms";
   import { IconEntryButton, TopBar } from "$lib/components/molecules";
   import { deleteAllFileThumbnailCaches } from "$lib/modules/file";
-  import { bulkGetFileInfo, type MaybeFileInfo } from "$lib/modules/filesystem";
+  import { bulkGetFileInfo } from "$lib/modules/filesystem";
   import { masterKeyStore } from "$lib/stores";
-  import { sortEntries } from "$lib/utils";
   import File from "./File.svelte";
-  import {
+  import { persistentStates, requestThumbnailGeneration } from "./service.svelte";
-    getThumbnailGenerationStatus,
-    clearThumbnailGenerationStatuses,
-    requestThumbnailGeneration,
-    type GenerationStatus,
-  } from "./service";
 
   import IconDelete from "~icons/material-symbols/delete";
 
   let { data } = $props();
 
-  let fileInfos: MaybeFileInfo[] = $state([]);
-  let files = $derived(
-    fileInfos
-      .map((info) => ({
-        info,
-        status: getThumbnailGenerationStatus(info.id),
-      }))
-      .filter(
-        (file): file is { info: MaybeFileInfo; status: Exclude<GenerationStatus, "uploaded"> } =>
-          file.status !== "uploaded",
-      ),
-  );
-
   const generateAllThumbnails = () => {
-    files.forEach(({ info }) => {
+    persistentStates.files.forEach(({ info }) => {
       if (info.exists) {
         requestThumbnailGeneration(info);
       }
@@ -41,12 +22,13 @@
   };
 
   onMount(async () => {
-    fileInfos = sortEntries(
+    const fileInfos = await bulkGetFileInfo(data.files, $masterKeyStore?.get(1)?.key!);
-      Array.from((await bulkGetFileInfo(data.files, $masterKeyStore?.get(1)?.key!)).values()),
+    persistentStates.files = persistentStates.files.map(({ id, status }) => ({
-    );
+      id,
+      info: fileInfos.get(id)!,
+      status,
+    }));
   });
-
-  $effect(() => clearThumbnailGenerationStatuses);
 </script>
 
 <svelte:head>
@@ -61,19 +43,19 @@
         저장된 썸네일 모두 삭제하기
       </IconEntryButton>
     </div>
-    {#if files.length > 0}
+    {#if persistentStates.files.length > 0}
       <div class="flex-grow space-y-2 bg-white p-4">
         <p class="text-lg font-bold text-gray-800">썸네일이 누락된 파일</p>
         <div class="space-y-4">
           <p class="break-keep text-gray-800">
-            {files.length}개 파일의 썸네일이 존재하지 않아요.
+            {persistentStates.files.length}개 파일의 썸네일이 존재하지 않아요.
           </p>
           <div class="space-y-2">
-            {#each files as { info, status } (info.id)}
+            {#each persistentStates.files as { info, status } (info.id)}
               {#if info.exists}
                 <File
                   {info}
-                  {status}
+                  generationStatus={status}
                   onclick={({ id }) => goto(`/file/${id}`)}
                   onGenerateThumbnailClick={requestThumbnailGeneration}
                 />
@@ -84,7 +66,7 @@
       </div>
     {/if}
   </div>
-  {#if files.length > 0}
+  {#if persistentStates.files.length > 0}
     <BottomDiv class="px-4">
       <Button onclick={generateAllThumbnails} class="w-full">모두 썸네일 생성하기</Button>
     </BottomDiv>

src/routes/(fullscreen)/settings/thumbnail/File.svelte

@@ -3,17 +3,19 @@
     queued: "대기 중",
     "generation-pending": "준비 중",
     generating: "생성하는 중",
+    "upload-pending": "업로드를 기다리는 중",
     uploading: "업로드하는 중",
     error: "실패",
   } as const;
 </script>
 
 <script lang="ts">
+  import type { Writable } from "svelte/store";
   import { ActionEntryButton } from "$lib/components/atoms";
   import { DirectoryEntryLabel } from "$lib/components/molecules";
   import type { FileInfo } from "$lib/modules/filesystem";
   import { formatDateTime } from "$lib/utils";
-  import type { GenerationStatus } from "./service";
+  import type { GenerationStatus } from "./service.svelte";
 
   import IconCamera from "~icons/material-symbols/camera";
 
@@ -21,21 +23,22 @@
     info: FileInfo;
     onclick: (file: FileInfo) => void;
     onGenerateThumbnailClick: (file: FileInfo) => void;
-    status: Exclude<GenerationStatus, "uploaded"> | undefined;
+    generationStatus?: Writable<GenerationStatus>;
   }
 
-  let { info, onclick, onGenerateThumbnailClick, status }: Props = $props();
+  let { info, onclick, onGenerateThumbnailClick, generationStatus }: Props = $props();
 </script>
 
 <ActionEntryButton
   class="h-14"
   onclick={() => onclick(info)}
-  actionButtonIcon={!status || status === "error" ? IconCamera : undefined}
+  actionButtonIcon={!$generationStatus || $generationStatus === "error" ? IconCamera : undefined}
   onActionButtonClick={() => onGenerateThumbnailClick(info)}
   actionButtonClass="text-gray-800"
 >
-  {@const subtext = status
+  {@const subtext =
-    ? subtexts[status]
+    $generationStatus && $generationStatus !== "uploaded"
+      ? subtexts[$generationStatus]
       : formatDateTime(info.createdAt ?? info.lastModifiedAt)}
   <DirectoryEntryLabel type="file" name={info.name} {subtext} />
 </ActionEntryButton>

src/routes/(fullscreen)/settings/thumbnail/service.svelte.ts

@@ -0,0 +1,162 @@
+import { limitFunction } from "p-limit";
+import { get, writable, type Writable } from "svelte/store";
+import { encryptData } from "$lib/modules/crypto";
+import { storeFileThumbnailCache } from "$lib/modules/file";
+import type { FileInfo, MaybeFileInfo } from "$lib/modules/filesystem";
+import { generateThumbnail as doGenerateThumbnail } from "$lib/modules/thumbnail";
+import { requestFileDownload, requestFileThumbnailUpload } from "$lib/services/file";
+
+export type GenerationStatus =
+  | "queued"
+  | "generation-pending"
+  | "generating"
+  | "upload-pending"
+  | "uploading"
+  | "uploaded"
+  | "error";
+
+interface File {
+  id: number;
+  info: MaybeFileInfo;
+  status?: Writable<GenerationStatus>;
+}
+
+const workingFiles = new Map<number, Writable<GenerationStatus>>();
+
+let queue: (() => void)[] = [];
+let memoryUsage = 0;
+const memoryLimit = 100 * 1024 * 1024; // 100 MiB
+
+export const persistentStates = $state({
+  files: [] as File[],
+});
+
+export const getGenerationStatus = (fileId: number) => {
+  return workingFiles.get(fileId);
+};
+
+const generateThumbnail = limitFunction(
+  async (
+    status: Writable<GenerationStatus>,
+    fileBuffer: ArrayBuffer,
+    fileType: string,
+    dataKey: CryptoKey,
+  ) => {
+    status.set("generating");
+
+    const thumbnail = await doGenerateThumbnail(fileBuffer, fileType);
+    if (!thumbnail) return null;
+
+    const thumbnailBuffer = await thumbnail.arrayBuffer();
+    const thumbnailEncrypted = await encryptData(thumbnailBuffer, dataKey);
+    status.set("upload-pending");
+    return { plaintext: thumbnailBuffer, ...thumbnailEncrypted };
+  },
+  { concurrency: 4 },
+);
+
+const requestThumbnailUpload = limitFunction(
+  async (
+    status: Writable<GenerationStatus>,
+    fileId: number,
+    dataKeyVersion: Date,
+    thumbnail: { plaintext: ArrayBuffer; ciphertext: ArrayBuffer; iv: string },
+  ) => {
+    status.set("uploading");
+
+    const res = await requestFileThumbnailUpload(fileId, dataKeyVersion, thumbnail);
+    if (!res.ok) return false;
+
+    status.set("uploaded");
+    workingFiles.delete(fileId);
+    persistentStates.files = persistentStates.files.filter(({ id }) => id != fileId);
+
+    storeFileThumbnailCache(fileId, thumbnail.plaintext); // Intended
+    return true;
+  },
+  { concurrency: 4 },
+);
+
+const enqueue = async (
+  status: Writable<GenerationStatus> | undefined,
+  fileInfo: FileInfo,
+  priority = false,
+) => {
+  if (status) {
+    status.set("queued");
+  } else {
+    status = writable("queued");
+    workingFiles.set(fileInfo.id, status);
+    persistentStates.files = persistentStates.files.map((file) =>
+      file.id === fileInfo.id ? { ...file, status } : file,
+    );
+  }
+
+  let resolver;
+  const promise = new Promise((resolve) => {
+    resolver = resolve;
+  });
+
+  if (priority) {
+    queue = [resolver!, ...queue];
+  } else {
+    queue.push(resolver!);
+  }
+
+  await promise;
+};
+
+export const requestThumbnailGeneration = async (fileInfo: FileInfo) => {
+  let status = workingFiles.get(fileInfo.id);
+  if (status && get(status) !== "error") return;
+
+  if (workingFiles.values().some((status) => get(status) !== "error")) {
+    await enqueue(status, fileInfo);
+  }
+  while (memoryUsage >= memoryLimit) {
+    await enqueue(status, fileInfo, true);
+  }
+
+  if (status) {
+    status.set("generation-pending");
+  } else {
+    status = writable("generation-pending");
+    workingFiles.set(fileInfo.id, status);
+    persistentStates.files = persistentStates.files.map((file) =>
+      file.id === fileInfo.id ? { ...file, status } : file,
+    );
+  }
+
+  let fileSize = 0;
+  try {
+    const file = await requestFileDownload(
+      fileInfo.id,
+      fileInfo.contentIv!,
+      fileInfo.dataKey?.key!,
+    );
+    fileSize = file.byteLength;
+
+    memoryUsage += fileSize;
+    if (memoryUsage < memoryLimit) {
+      queue.shift()?.();
+    }
+
+    const thumbnail = await generateThumbnail(
+      status,
+      file,
+      fileInfo.contentType,
+      fileInfo.dataKey?.key!,
+    );
+    if (
+      !thumbnail ||
+      !(await requestThumbnailUpload(status, fileInfo.id, fileInfo.dataKey?.version!, thumbnail))
+    ) {
+      status.set("error");
+    }
+  } catch {
+    status.set("error");
+  } finally {
+    memoryUsage -= fileSize;
+    queue.shift()?.();
+  }
+};

src/routes/(fullscreen)/settings/thumbnail/service.ts

@@ -1,85 +0,0 @@
-import { limitFunction } from "p-limit";
-import { SvelteMap } from "svelte/reactivity";
-import { storeFileThumbnailCache } from "$lib/modules/file";
-import type { FileInfo } from "$lib/modules/filesystem";
-import { generateThumbnail } from "$lib/modules/thumbnail";
-import { requestFileDownload, requestFileThumbnailUpload } from "$lib/services/file";
-import { Scheduler } from "$lib/utils";
-
-export type GenerationStatus =
-  | "queued"
-  | "generation-pending"
-  | "generating"
-  | "uploading"
-  | "uploaded"
-  | "error";
-
-const scheduler = new Scheduler();
-const statuses = new SvelteMap<number, GenerationStatus>();
-
-export const getThumbnailGenerationStatus = (fileId: number) => {
-  return statuses.get(fileId);
-};
-
-export const clearThumbnailGenerationStatuses = () => {
-  for (const [id, status] of statuses) {
-    if (status === "uploaded" || status === "error") {
-      statuses.delete(id);
-    }
-  }
-};
-
-const requestThumbnailUpload = limitFunction(
-  async (fileInfo: FileInfo, fileBuffer: ArrayBuffer) => {
-    statuses.set(fileInfo.id, "generating");
-
-    const thumbnail = await generateThumbnail(
-      new Blob([fileBuffer], { type: fileInfo.contentType }),
-    );
-    if (!thumbnail) return false;
-
-    statuses.set(fileInfo.id, "uploading");
-
-    const res = await requestFileThumbnailUpload(
-      fileInfo.id,
-      thumbnail,
-      fileInfo.dataKey?.key!,
-      fileInfo.dataKey?.version!,
-    );
-    if (!res) return false;
-
-    statuses.set(fileInfo.id, "uploaded");
-    void thumbnail.arrayBuffer().then((buffer) => storeFileThumbnailCache(fileInfo.id, buffer));
-    return true;
-  },
-  { concurrency: 4 },
-);
-
-export const requestThumbnailGeneration = async (fileInfo: FileInfo) => {
-  const status = statuses.get(fileInfo.id);
-  if (status) {
-    if (status !== "error") return;
-  } else {
-    statuses.set(fileInfo.id, "queued");
-  }
-
-  try {
-    let file: ArrayBuffer | undefined;
-
-    await scheduler.schedule(
-      async () => {
-        statuses.set(fileInfo.id, "generation-pending");
-        file = await requestFileDownload(fileInfo.id, fileInfo.dataKey?.key!, fileInfo.isLegacy!);
-        return file.byteLength;
-      },
-      async () => {
-        if (!(await requestThumbnailUpload(fileInfo, file!))) {
-          statuses.set(fileInfo.id, "error");
-        }
-      },
-    );
-  } catch (e) {
-    statuses.set(fileInfo.id, "error");
-    throw e;
-  }
-};

src/routes/(main)/category/[[id]]/+page.svelte

@@ -1,16 +1,12 @@
 <script lang="ts">
   import { goto } from "$app/navigation";
-  import { CheckBox, RowVirtualizer } from "$lib/components/atoms";
+  import { TopBar } from "$lib/components/molecules";
-  import { SubCategories, TopBar } from "$lib/components/molecules";
+  import { Category, CategoryCreateModal } from "$lib/components/organisms";
-  import { CategoryCreateModal } from "$lib/components/organisms";
-  import { updateCategoryInfo } from "$lib/indexedDB";
   import { getCategoryInfo, type MaybeCategoryInfo } from "$lib/modules/filesystem";
   import { masterKeyStore } from "$lib/stores";
-  import { HybridPromise, sortEntries } from "$lib/utils";
   import CategoryDeleteModal from "./CategoryDeleteModal.svelte";
   import CategoryMenuBottomSheet from "./CategoryMenuBottomSheet.svelte";
   import CategoryRenameModal from "./CategoryRenameModal.svelte";
-  import File from "./File.svelte";
   import {
     createContext,
     requestCategoryCreation,
@@ -19,50 +15,18 @@
     requestCategoryDeletion,
   } from "./service.svelte";
 
-  import IconMoreVert from "~icons/material-symbols/more-vert";
-
   let { data } = $props();
   let context = createContext();
 
-  let info: MaybeCategoryInfo | undefined = $state();
+  let infoPromise: Promise<MaybeCategoryInfo> | undefined = $state();
 
   let isCategoryCreateModalOpen = $state(false);
   let isCategoryMenuBottomSheetOpen = $state(false);
   let isCategoryRenameModalOpen = $state(false);
   let isCategoryDeleteModalOpen = $state(false);
 
-  let lastCategoryId: CategoryId | undefined = $state();
-  let lastIsFileRecursive: boolean | undefined = $state();
-
-  let files = $derived(
-    sortEntries(
-      info?.files
-        ?.map((file) => ({ name: file.name, details: file }))
-        .filter(({ details }) => info?.isFileRecursive || !details.isRecursive) ?? [],
-    ),
-  );
-
   $effect(() => {
-    if (!info || info.id === "root" || info.isFileRecursive === undefined) return;
+    infoPromise = getCategoryInfo(data.id, $masterKeyStore?.get(1)?.key!);
-    if (lastCategoryId !== info.id) {
-      lastCategoryId = info.id;
-      lastIsFileRecursive = info.isFileRecursive;
-      return;
-    }
-    if (lastIsFileRecursive === info.isFileRecursive) return;
-
-    lastIsFileRecursive = info.isFileRecursive;
-    void updateCategoryInfo(info.id, { isFileRecursive: info.isFileRecursive });
-  });
-
-  $effect(() => {
-    HybridPromise.resolve(getCategoryInfo(data.id, $masterKeyStore?.get(1)?.key!)).then(
-      (result) => {
-        if (data.id === result.id) {
-          info = result;
-        }
-      },
-    );
   });
 </script>
 
@@ -70,64 +34,34 @@
   <title>카테고리</title>
 </svelte:head>
 
-{#if info?.id !== "root"}
+{#await infoPromise then info}
-  <TopBar title={info?.name} />
+  {#if info?.exists}
+    {#if info.id !== "root"}
+      <TopBar title={info.name} />
     {/if}
     <div class="min-h-full bg-gray-100 pb-[5.5em]">
-  {#if info?.exists}
+      <Category
-    <div class="space-y-4">
+        bind:isFileRecursive={info.isFileRecursive}
-      <div class="space-y-4 bg-white p-4">
-        {#if info.id !== "root"}
-          <p class="text-lg font-bold text-gray-800">하위 카테고리</p>
-        {/if}
-        <SubCategories
         {info}
+        onFileClick={({ id }) => goto(`/file/${id}?from=category`)}
+        onFileRemoveClick={async ({ id }) => {
+          await requestFileRemovalFromCategory(id, data.id as number);
+          infoPromise = getCategoryInfo(data.id, $masterKeyStore?.get(1)?.key!); // TODO: FIXME
+        }}
         onSubCategoryClick={({ id }) => goto(`/category/${id}`)}
         onSubCategoryCreateClick={() => (isCategoryCreateModalOpen = true)}
         onSubCategoryMenuClick={(subCategory) => {
           context.selectedCategory = subCategory;
           isCategoryMenuBottomSheetOpen = true;
         }}
-          subCategoryMenuIcon={IconMoreVert}
       />
     </div>
-      {#if info.id !== "root"}
-        <div class="space-y-4 bg-white p-4">
-          <div class="flex items-center justify-between">
-            <p class="text-lg font-bold text-gray-800">파일</p>
-            <CheckBox bind:checked={info.isFileRecursive}>
-              <p class="font-medium">하위 카테고리의 파일</p>
-            </CheckBox>
-          </div>
-          <RowVirtualizer count={files.length} itemHeight={() => 48} itemGap={4}>
-            {#snippet item(index)}
-              {@const { details } = files[index]!}
-              <File
-                info={details}
-                onclick={({ id }) => goto(`/file/${id}?from=category`)}
-                onRemoveClick={!details.isRecursive
-                  ? async ({ id }) => {
-                      await requestFileRemovalFromCategory(id, data.id as number);
-                      void getCategoryInfo(data.id, $masterKeyStore?.get(1)?.key!); // TODO: FIXME
-                    }
-                  : undefined}
-              />
-            {/snippet}
-            {#snippet placeholder()}
-              <p class="text-center text-gray-500">이 카테고리에 추가된 파일이 없어요.</p>
-            {/snippet}
-          </RowVirtualizer>
-        </div>
-      {/if}
-    </div>
-  {/if}
-</div>
 
     <CategoryCreateModal
       bind:isOpen={isCategoryCreateModalOpen}
       onCreateClick={async (name: string) => {
         if (await requestCategoryCreation(name, data.id, $masterKeyStore?.get(1)!)) {
-      void getCategoryInfo(data.id, $masterKeyStore?.get(1)?.key!); // TODO: FIXME
+          infoPromise = getCategoryInfo(data.id, $masterKeyStore?.get(1)?.key!); // TODO: FIXME
           return true;
         }
         return false;
@@ -149,7 +83,7 @@
       bind:isOpen={isCategoryRenameModalOpen}
       onRenameClick={async (newName: string) => {
         if (await requestCategoryRename(context.selectedCategory!, newName)) {
-      void getCategoryInfo(data.id, $masterKeyStore?.get(1)?.key!); // TODO: FIXME
+          infoPromise = getCategoryInfo(data.id, $masterKeyStore?.get(1)?.key!); // TODO: FIXME
           return true;
         }
         return false;
@@ -159,9 +93,11 @@
       bind:isOpen={isCategoryDeleteModalOpen}
       onDeleteClick={async () => {
         if (await requestCategoryDeletion(context.selectedCategory!)) {
-      void getCategoryInfo(data.id, $masterKeyStore?.get(1)?.key!); // TODO: FIXME
+          infoPromise = getCategoryInfo(data.id, $masterKeyStore?.get(1)?.key!); // TODO: FIXME
           return true;
         }
         return false;
       }}
     />
+  {/if}
+{/await}

src/routes/(main)/category/[[id]]/service.svelte.ts

@@ -5,11 +5,6 @@ import { trpc } from "$trpc/client";
 
 export { requestCategoryCreation, requestFileRemovalFromCategory } from "$lib/services/category";
 
-export interface SelectedFile {
-  id: number;
-  name: string;
-}
-
 export const createContext = () => {
   const context = $state({
     selectedCategory: undefined as SelectedCategory | undefined,

src/routes/(main)/directory/[[id]]/+page.svelte

@@ -6,7 +6,6 @@
   import { TopBar } from "$lib/components/molecules";
   import { getDirectoryInfo, type MaybeDirectoryInfo } from "$lib/modules/filesystem";
   import { masterKeyStore, hmacSecretStore } from "$lib/stores";
-  import { HybridPromise } from "$lib/utils";
   import DirectoryCreateModal from "./DirectoryCreateModal.svelte";
   import DirectoryEntries from "./DirectoryEntries";
   import DownloadStatusCard from "./DownloadStatusCard.svelte";
@@ -30,7 +29,7 @@
   let { data } = $props();
   let context = createContext();
 
-  let info: MaybeDirectoryInfo | undefined = $state();
+  let infoPromise: Promise<MaybeDirectoryInfo> | undefined = $state();
   let fileInput: HTMLInputElement | undefined = $state();
   let duplicatedFile: File | undefined = $state();
   let resolveForDuplicateFileModal: ((res: boolean) => void) | undefined = $state();
@@ -51,7 +50,7 @@
     if (!files || files.length === 0) return;
 
     for (const file of files) {
-      requestFileUpload(file, data.id, $masterKeyStore?.get(1)!, $hmacSecretStore?.get(1)!, () => {
+      requestFileUpload(file, data.id, $hmacSecretStore?.get(1)!, $masterKeyStore?.get(1)!, () => {
         return new Promise((resolve) => {
           duplicatedFile = file;
           resolveForDuplicateFileModal = resolve;
@@ -61,7 +60,7 @@
         .then((res) => {
           if (!res) return;
           // TODO: FIXME
-          void getDirectoryInfo(data.id, $masterKeyStore?.get(1)?.key!);
+          infoPromise = getDirectoryInfo(data.id, $masterKeyStore?.get(1)?.key!);
         })
         .catch((e: Error) => {
           // TODO: FIXME
@@ -79,13 +78,7 @@
   });
 
   $effect(() => {
-    HybridPromise.resolve(getDirectoryInfo(data.id, $masterKeyStore?.get(1)?.key!)).then(
+    infoPromise = getDirectoryInfo(data.id, $masterKeyStore?.get(1)?.key!);
-      (result) => {
-        if (data.id === result.id) {
-          info = result;
-        }
-      },
-    );
   });
 </script>
 
@@ -95,17 +88,17 @@
 
 <input bind:this={fileInput} onchange={uploadFile} type="file" multiple class="hidden" />
 
+{#await infoPromise then info}
+  {#if info?.exists}
     <div class="flex h-full flex-col">
       {#if showTopBar}
-    <TopBar title={info?.name} class="flex-shrink-0" />
+        <TopBar title={info.name} class="flex-shrink-0" />
       {/if}
-  {#if info?.exists}
       <div class={["flex flex-grow flex-col px-4 pb-4", !showTopBar && "pt-4"]}>
         <div class="flex gap-x-2">
           <UploadStatusCard onclick={() => goto("/file/uploads")} />
           <DownloadStatusCard onclick={() => goto("/file/downloads")} />
         </div>
-      {#key info.id}
         <DirectoryEntries
           {info}
           onEntryClick={({ type, id }) => goto(`/${type}/${id}`)}
@@ -116,14 +109,12 @@
           showParentEntry={isFromFilePage && info.parentId !== undefined}
           onParentClick={() =>
             goto(
-              info!.parentId === "root"
+              info.parentId === "root"
                 ? "/directory?from=file"
-                : `/directory/${info!.parentId}?from=file`,
+                : `/directory/${info.parentId}?from=file`,
             )}
         />
-      {/key}
       </div>
-  {/if}
     </div>
 
     <FloatingButton
@@ -148,7 +139,7 @@
       bind:isOpen={isDirectoryCreateModalOpen}
       onCreateClick={async (name) => {
         if (await requestDirectoryCreation(name, data.id, $masterKeyStore?.get(1)!)) {
-      void getDirectoryInfo(data.id, $masterKeyStore?.get(1)?.key!); // TODO: FIXME
+          infoPromise = getDirectoryInfo(data.id, $masterKeyStore?.get(1)?.key!); // TODO: FIXME
           return true;
         }
         return false;
@@ -182,7 +173,7 @@
       bind:isOpen={isEntryRenameModalOpen}
       onRenameClick={async (newName: string) => {
         if (await requestEntryRename(context.selectedEntry!, newName)) {
-      void getDirectoryInfo(data.id, $masterKeyStore?.get(1)?.key!); // TODO: FIXME
+          infoPromise = getDirectoryInfo(data.id, $masterKeyStore?.get(1)?.key!); // TODO: FIXME
           return true;
         }
         return false;
@@ -192,9 +183,11 @@
       bind:isOpen={isEntryDeleteModalOpen}
       onDeleteClick={async () => {
         if (await requestEntryDeletion(context.selectedEntry!)) {
-      void getDirectoryInfo(data.id, $masterKeyStore?.get(1)?.key!); // TODO: FIXME
+          infoPromise = getDirectoryInfo(data.id, $masterKeyStore?.get(1)?.key!); // TODO: FIXME
           return true;
         }
         return false;
       }}
     />
+  {/if}
+{/await}

src/routes/(main)/directory/[[id]]/DirectoryEntries/File.svelte

@@ -1,8 +1,9 @@
 <script lang="ts">
+  import { browser } from "$app/environment";
   import { ActionEntryButton } from "$lib/components/atoms";
   import { DirectoryEntryLabel } from "$lib/components/molecules";
-  import { getFileThumbnail } from "$lib/modules/file";
   import type { SummarizedFileInfo } from "$lib/modules/filesystem";
+  import { requestFileThumbnailDownload } from "$lib/services/file";
   import { formatDateTime } from "$lib/utils";
   import type { SelectedEntry } from "../service.svelte";
 
@@ -16,7 +17,12 @@
 
   let { info, onclick, onOpenMenuClick }: Props = $props();
 
-  let thumbnail = $derived(getFileThumbnail(info));
+  let showThumbnail = $derived(
+    browser && (info.contentType.startsWith("image/") || info.contentType.startsWith("video/")),
+  );
+  let thumbnailPromise = $derived(
+    showThumbnail ? requestFileThumbnailDownload(info.id, info.dataKey?.key) : null,
+  );
 
   const action = (callback: typeof onclick) => {
     callback({ type: "file", id: info.id, dataKey: info.dataKey, name: info.name });
@@ -29,10 +35,18 @@
   actionButtonIcon={IconMoreVert}
   onActionButtonClick={() => action(onOpenMenuClick)}
 >
+  {#await thumbnailPromise}
     <DirectoryEntryLabel
       type="file"
-    thumbnail={$thumbnail}
       name={info.name}
       subtext={formatDateTime(info.createdAt ?? info.lastModifiedAt)}
     />
+  {:then thumbnail}
+    <DirectoryEntryLabel
+      type="file"
+      thumbnail={thumbnail ?? undefined}
+      name={info.name}
+      subtext={formatDateTime(info.createdAt ?? info.lastModifiedAt)}
+    />
+  {/await}
 </ActionEntryButton>

src/routes/(main)/directory/[[id]]/DirectoryEntries/UploadingFile.svelte

@@ -20,9 +20,7 @@
       {state.name}
     </p>
     <p class="text-xs">
-      {#if state.status === "queued"}
+      {#if state.status === "encryption-pending"}
-        대기 중
-      {:else if state.status === "encryption-pending"}
         준비 중
       {:else if state.status === "encrypting"}
         암호화하는 중

src/routes/(main)/directory/[[id]]/service.svelte.ts

@@ -81,16 +81,14 @@ export const requestDirectoryCreation = async (
 export const requestFileUpload = async (
   file: File,
   parentId: "root" | number,
-  masterKey: MasterKey,
   hmacSecret: HmacSecret,
+  masterKey: MasterKey,
   onDuplicate: () => Promise<boolean>,
 ) => {
-  const res = await uploadFile(file, parentId, masterKey, hmacSecret, onDuplicate);
+  const res = await uploadFile(file, parentId, hmacSecret, masterKey, onDuplicate);
   if (!res) return false;
 
-  if (res.fileBuffer) {
   storeFileCache(res.fileId, res.fileBuffer); // Intended
-  }
   if (res.thumbnailBuffer) {
     storeFileThumbnailCache(res.fileId, res.thumbnailBuffer); // Intended
   }

src/routes/(main)/home/+page.svelte

@@ -2,13 +2,22 @@
   import { onMount } from "svelte";
   import { goto } from "$app/navigation";
   import { EntryButton, FileThumbnailButton } from "$lib/components/atoms";
-  import { type SummarizedFileInfo } from "$lib/modules/filesystem";
+  import { bulkGetFileInfo, type MaybeFileInfo } from "$lib/modules/filesystem";
+  import { masterKeyStore } from "$lib/stores";
   import { requestFreshMediaFilesRetrieval } from "./service";
 
-  let mediaFiles: SummarizedFileInfo[] = $state([]);
+  let mediaFiles: MaybeFileInfo[] = $state([]);
 
   onMount(async () => {
-    mediaFiles = await requestFreshMediaFilesRetrieval();
+    const files = await requestFreshMediaFilesRetrieval();
+    mediaFiles = Array.from(
+      (
+        await bulkGetFileInfo(
+          files.map(({ id }) => id),
+          $masterKeyStore?.get(1)?.key!,
+        )
+      ).values(),
+    );
   });
 </script>
 
@@ -25,7 +34,9 @@
     {#if mediaFiles.length > 0}
       <div class="grid grid-cols-4 gap-2 p-2">
         {#each mediaFiles as file (file.id)}
+          {#if file.exists}
             <FileThumbnailButton info={file} onclick={({ id }) => goto(`/file/${id}`)} />
+          {/if}
         {/each}
       </div>
     {/if}

src/routes/(main)/menu/+page.svelte

@@ -5,7 +5,6 @@
 
   import IconStorage from "~icons/material-symbols/storage";
   import IconImage from "~icons/material-symbols/image";
-  import IconLockReset from "~icons/material-symbols/lock-reset";
   import IconPassword from "~icons/material-symbols/password";
   import IconLogout from "~icons/material-symbols/logout";
 
@@ -42,13 +41,6 @@
     >
       썸네일
     </MenuEntryButton>
-    <MenuEntryButton
-      onclick={() => goto("/settings/migration")}
-      icon={IconLockReset}
-      iconColor="text-teal-500"
-    >
-      암호화 마이그레이션
-    </MenuEntryButton>
   </div>
   <div class="space-y-2">
     <p class="font-semibold">보안</p>